diff --git a/gulpfile.js b/gulpfile.js
index 1fc070779..d68894aa8 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -292,9 +292,9 @@ var templatesSrc = [
         './src/components/**/*.html',
         './src/core/**/components/**/*.html',
         './src/core/**/component/**/*.html',
-        // Only some addon components are injected to compile to decrease load time. Copy only the ones that are needed.
-        './src/addon/mod/assign/components/**/*.html',
-        './src/addon/mod/workshop/components/**/*.html'
+        // Copy all addon components because any component can be injected using extraImports.
+        './src/addon/**/components/**/*.html',
+        './src/addon/**/component/**/*.html'
     ],
     templatesDest = './www/templates';
 
diff --git a/src/addon/mod/workshop/assessment/accumulative/component/accumulative.ts b/src/addon/mod/workshop/assessment/accumulative/component/accumulative.ts
index 98385f1f0..eabb8bf09 100644
--- a/src/addon/mod/workshop/assessment/accumulative/component/accumulative.ts
+++ b/src/addon/mod/workshop/assessment/accumulative/component/accumulative.ts
@@ -20,7 +20,7 @@ import { AddonModWorkshopAssessmentStrategyComponentBase } from '../../../classe
  */
 @Component({
     selector: 'addon-mod-workshop-assessment-strategy-accumulative',
-    templateUrl: 'accumulative.html',
+    templateUrl: 'addon-mod-workshop-assessment-strategy-accumulative.html',
 })
 export class AddonModWorkshopAssessmentStrategyAccumulativeComponent extends AddonModWorkshopAssessmentStrategyComponentBase {
 }
diff --git a/src/addon/mod/workshop/assessment/accumulative/component/accumulative.html b/src/addon/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html
similarity index 100%
rename from src/addon/mod/workshop/assessment/accumulative/component/accumulative.html
rename to src/addon/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html
diff --git a/src/addon/mod/workshop/assessment/comments/component/comments.html b/src/addon/mod/workshop/assessment/comments/component/addon-mod-workshop-assessment-strategy-comments.html
similarity index 100%
rename from src/addon/mod/workshop/assessment/comments/component/comments.html
rename to src/addon/mod/workshop/assessment/comments/component/addon-mod-workshop-assessment-strategy-comments.html
diff --git a/src/addon/mod/workshop/assessment/comments/component/comments.ts b/src/addon/mod/workshop/assessment/comments/component/comments.ts
index 2f963dc84..61a187536 100644
--- a/src/addon/mod/workshop/assessment/comments/component/comments.ts
+++ b/src/addon/mod/workshop/assessment/comments/component/comments.ts
@@ -20,7 +20,7 @@ import { AddonModWorkshopAssessmentStrategyComponentBase } from '../../../classe
  */
 @Component({
     selector: 'addon-mod-workshop-assessment-strategy-comments',
-    templateUrl: 'comments.html',
+    templateUrl: 'addon-mod-workshop-assessment-strategy-comments.html',
 })
 export class AddonModWorkshopAssessmentStrategyCommentsComponent extends AddonModWorkshopAssessmentStrategyComponentBase {
 }
diff --git a/src/addon/mod/workshop/assessment/numerrors/component/numerrors.html b/src/addon/mod/workshop/assessment/numerrors/component/addon-mod-workshop-assessment-strategy-numerrors.html
similarity index 100%
rename from src/addon/mod/workshop/assessment/numerrors/component/numerrors.html
rename to src/addon/mod/workshop/assessment/numerrors/component/addon-mod-workshop-assessment-strategy-numerrors.html
diff --git a/src/addon/mod/workshop/assessment/numerrors/component/numerrors.ts b/src/addon/mod/workshop/assessment/numerrors/component/numerrors.ts
index ead73dcaf..cffa93995 100644
--- a/src/addon/mod/workshop/assessment/numerrors/component/numerrors.ts
+++ b/src/addon/mod/workshop/assessment/numerrors/component/numerrors.ts
@@ -20,7 +20,7 @@ import { AddonModWorkshopAssessmentStrategyComponentBase } from '../../../classe
  */
 @Component({
     selector: 'addon-mod-workshop-assessment-strategy-numerrors',
-    templateUrl: 'numerrors.html',
+    templateUrl: 'addon-mod-workshop-assessment-strategy-numerrors.html',
 })
 export class AddonModWorkshopAssessmentStrategyNumErrorsComponent extends AddonModWorkshopAssessmentStrategyComponentBase {
 }
diff --git a/src/addon/mod/workshop/assessment/rubric/component/rubric.html b/src/addon/mod/workshop/assessment/rubric/component/addon-mod-workshop-assessment-strategy-rubric.html
similarity index 100%
rename from src/addon/mod/workshop/assessment/rubric/component/rubric.html
rename to src/addon/mod/workshop/assessment/rubric/component/addon-mod-workshop-assessment-strategy-rubric.html
diff --git a/src/addon/mod/workshop/assessment/rubric/component/rubric.ts b/src/addon/mod/workshop/assessment/rubric/component/rubric.ts
index d28b3f578..fda33b4d3 100644
--- a/src/addon/mod/workshop/assessment/rubric/component/rubric.ts
+++ b/src/addon/mod/workshop/assessment/rubric/component/rubric.ts
@@ -20,7 +20,7 @@ import { AddonModWorkshopAssessmentStrategyComponentBase } from '../../../classe
  */
 @Component({
     selector: 'addon-mod-workshop-assessment-strategy-rubric',
-    templateUrl: 'rubric.html',
+    templateUrl: 'addon-mod-workshop-assessment-strategy-rubric.html',
 })
 export class AddonModWorkshopAssessmentStrategyRubricComponent extends AddonModWorkshopAssessmentStrategyComponentBase {
 }