diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
index b24f4a4865..455c1075ef 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
@@ -131,7 +131,7 @@ export function dsDynamicFormControlMapFn(model: DynamicFormControlModel): Type<
 }
 
 @Component({
-  selector: 'ds-dynamic-form-control',
+  selector: 'ds-dynamic-form-control-container',
   styleUrls: ['./ds-dynamic-form-control-container.component.scss'],
   templateUrl: './ds-dynamic-form-control-container.component.html',
   changeDetection: ChangeDetectionStrategy.Default
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.html
index ea151726f4..4d8123a4b9 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.html
@@ -1,12 +1,12 @@
-<ds-dynamic-form-control *ngFor="let model of formModel; trackBy: trackByFn"
-                         [formId]="formId"
-                         [group]="formGroup"
-                         [hasErrorMessaging]="model.hasErrorMessages"
-                         [hidden]="model.hidden"
-                         [layout]="formLayout"
-                         [model]="model"
-                         [ngClass]="[getClass(model, 'element', 'host'), getClass(model, 'grid', 'host')]"
-                         [templates]="templates"
-                         (dfBlur)="onEvent($event, 'blur')"
-                         (dfChange)="onEvent($event, 'change')"
-                         (dfFocus)="onEvent($event, 'focus')"></ds-dynamic-form-control>
+<ds-dynamic-form-control-container *ngFor="let model of formModel; trackBy: trackByFn"
+                                   [formId]="formId"
+                                   [group]="formGroup"
+                                   [hasErrorMessaging]="model.hasErrorMessages"
+                                   [hidden]="model.hidden"
+                                   [layout]="formLayout"
+                                   [model]="model"
+                                   [ngClass]="[getClass(model, 'element', 'host'), getClass(model, 'grid', 'host')]"
+                                   [templates]="templates"
+                                   (dfBlur)="onEvent($event, 'blur')"
+                                   (dfChange)="onEvent($event, 'change')"
+                                   (dfFocus)="onEvent($event, 'focus')"></ds-dynamic-form-control-container>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
index 56524523d1..9d56d7d1b3 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
@@ -9,7 +9,7 @@
 
             <ng-container *ngTemplateOutlet="startTemplate?.templateRef; context: groupModel"></ng-container>
 
-            <ds-dynamic-form-control *ngFor="let _model of groupModel.group"
+            <ds-dynamic-form-control-container *ngFor="let _model of groupModel.group"
                                                [bindId]="false"
                                                [context]="groupModel"
                                                [group]="control.at(idx)"
@@ -21,7 +21,7 @@
                                                (dfBlur)="onBlur($event)"
                                                (dfChange)="onChange($event)"
                                                (dfFocus)="onFocus($event)"
-                                               (ngbEvent)="onCustomEvent($event, null, true)"></ds-dynamic-form-control>
+                                               (ngbEvent)="onCustomEvent($event, null, true)"></ds-dynamic-form-control-container>
 
             <ng-container *ngTemplateOutlet="endTemplate?.templateRef; context: groupModel"></ng-container>
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.html
index c8443c640d..6fede2eff0 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.html
@@ -5,7 +5,7 @@
        [formGroupName]="model.id"
        [ngClass]="getClass('element','control')">
 
-    <ds-dynamic-form-control *ngFor="let _model of model.group"
+    <ds-dynamic-form-control-container *ngFor="let _model of model.group"
                                        [asBootstrapFormGroup]="true"
                                        [formId]="formId"
                                        [group]="control"
@@ -18,7 +18,7 @@
                                        (dfBlur)="onBlur($event)"
                                        (dfChange)="onChange($event)"
                                        (dfFocus)="onFocus($event)"
-                                       (ngbEvent)="onCustomEvent($event, null, true)"></ds-dynamic-form-control>
+                                       (ngbEvent)="onCustomEvent($event, null, true)"></ds-dynamic-form-control-container>
   </div>
 
 </ng-container>