diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
index 6078d2b5a9..f51c2f78f4 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
@@ -10,7 +10,7 @@ import {
 } from '@ng-dynamic-forms/core';
 
 @Component({
-  selector: 'ds-date-picker-inline',
+  selector: 'ds-dynamic-date-picker-inline',
   templateUrl: './dynamic-date-picker-inline.component.html'
 })
 export class DsDatePickerInlineComponent extends DynamicFormControlComponent {
diff --git a/src/app/submission/edit/submission-edit.component.html b/src/app/submission/edit/submission-edit.component.html
index 21b20997cf..dcd8d84edc 100644
--- a/src/app/submission/edit/submission-edit.component.html
+++ b/src/app/submission/edit/submission-edit.component.html
@@ -1,7 +1,7 @@
 <div class="submission-submit-container" >
-  <ds-submission-submit-form [collectionId]="collectionId"
-                             [sections]="sections"
-                             [selfUrl]="selfUrl"
-                             [submissionDefinition]="submissionDefinition"
-                             [submissionId]="submissionId"></ds-submission-submit-form>
+  <ds-submission-form [collectionId]="collectionId"
+                      [sections]="sections"
+                      [selfUrl]="selfUrl"
+                      [submissionDefinition]="submissionDefinition"
+                      [submissionId]="submissionId"></ds-submission-form>
 </div>
diff --git a/src/app/submission/form/submission-form.component.spec.ts b/src/app/submission/form/submission-form.component.spec.ts
index bf29f50b05..c8e10da518 100644
--- a/src/app/submission/form/submission-form.component.spec.ts
+++ b/src/app/submission/form/submission-form.component.spec.ts
@@ -63,10 +63,10 @@ describe('SubmissionFormComponent Component', () => {
     // synchronous beforeEach
     beforeEach(() => {
       const html = `
-        <ds-submission-submit-form [collectionId]="collectionId"
+        <ds-submission-form [collectionId]="collectionId"
                                    [selfUrl]="selfUrl"
                                    [submissionDefinition]="submissionDefinition"
-                                   [submissionId]="submissionId"></ds-submission-submit-form>`;
+                                   [submissionId]="submissionId"></ds-submission-form>`;
 
       testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
       testComp = testFixture.componentInstance;
diff --git a/src/app/submission/form/submission-form.component.ts b/src/app/submission/form/submission-form.component.ts
index 58725d79ff..b592972839 100644
--- a/src/app/submission/form/submission-form.component.ts
+++ b/src/app/submission/form/submission-form.component.ts
@@ -19,7 +19,7 @@ import { SubmissionObject } from '../../core/submission/models/submission-object
  * This component represents the submission form.
  */
 @Component({
-  selector: 'ds-submission-submit-form',
+  selector: 'ds-submission-form',
   styleUrls: ['./submission-form.component.scss'],
   templateUrl: './submission-form.component.html',
 })
diff --git a/src/app/submission/submit/submission-submit.component.html b/src/app/submission/submit/submission-submit.component.html
index 7cd58069ac..c9e8c6b51a 100644
--- a/src/app/submission/submit/submission-submit.component.html
+++ b/src/app/submission/submit/submission-submit.component.html
@@ -1,8 +1,8 @@
 <div class="submission-submit-container">
   <div class="submission-submit-container">
-    <ds-submission-submit-form [collectionId]="collectionId"
-                               [selfUrl]="selfUrl"
-                               [submissionDefinition]="submissionDefinition"
-                               [submissionId]="submissionId"></ds-submission-submit-form>
+    <ds-submission-form [collectionId]="collectionId"
+                        [selfUrl]="selfUrl"
+                        [submissionDefinition]="submissionDefinition"
+                        [submissionId]="submissionId"></ds-submission-form>
   </div>
 </div>