diff --git a/src/app/submission/form/submission-form.component.html b/src/app/submission/form/submission-form.component.html
index 21f92c9cf1..31e46e2ccc 100644
--- a/src/app/submission/form/submission-form.component.html
+++ b/src/app/submission/form/submission-form.component.html
@@ -24,9 +24,9 @@
   <div class="submission-form-content">
     <ds-loading *ngIf="(isLoading() | async)" message="Loading..."></ds-loading>
     <ng-container *ngFor="let object of (submissionSections | async)">
-      <ds-submission-form-section-container [collectionId]="collectionId"
-                                            [submissionId]="submissionId"
-                                            [sectionData]="object"></ds-submission-form-section-container>
+      <ds-submission-section-container [collectionId]="collectionId"
+                                       [submissionId]="submissionId"
+                                       [sectionData]="object"></ds-submission-section-container>
     </ng-container>
   </div>
   <div *ngIf="!(isLoading() | async)" class="submission-form-footer mt-3 mb-3 position-sticky">
diff --git a/src/app/submission/sections/container/section-container.component.spec.ts b/src/app/submission/sections/container/section-container.component.spec.ts
index 4aa713180f..778aa4ab84 100644
--- a/src/app/submission/sections/container/section-container.component.spec.ts
+++ b/src/app/submission/sections/container/section-container.component.spec.ts
@@ -7,7 +7,7 @@ import { of as observableOf } from 'rxjs';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { SectionContainerComponent } from './section-container.component';
+import { SubmissionSectionContainerComponent } from './section-container.component';
 import { createTestComponent } from '../../../shared/testing/utils';
 import { SectionsType } from '../sections-type';
 import { SectionsDirective } from '../sections.directive';
@@ -41,11 +41,11 @@ const sectionObject: SectionDataObject = {
   sectionType:	SectionsType.SubmissionForm
 };
 
-describe('SectionContainerComponent test suite', () => {
+describe('SubmissionSectionContainerComponent test suite', () => {
 
-  let comp: SectionContainerComponent;
+  let comp: SubmissionSectionContainerComponent;
   let compAsAny: any;
-  let fixture: ComponentFixture<SectionContainerComponent>;
+  let fixture: ComponentFixture<SubmissionSectionContainerComponent>;
 
   let submissionServiceStub: SubmissionServiceStub;
   let sectionsServiceStub: SectionsServiceStub;
@@ -71,14 +71,14 @@ describe('SectionContainerComponent test suite', () => {
         TranslateModule.forRoot()
       ],
       declarations: [
-        SectionContainerComponent,
+        SubmissionSectionContainerComponent,
         SectionsDirective,
         TestComponent,
       ], // declare the test component
       providers: [
         { provide: SectionsService, useClass: SectionsServiceStub },
         { provide: SubmissionService, useClass: SubmissionServiceStub },
-        SectionContainerComponent
+        SubmissionSectionContainerComponent
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA]
     }).compileComponents();
@@ -93,16 +93,16 @@ describe('SectionContainerComponent test suite', () => {
     // synchronous beforeEach
     beforeEach(() => {
       html = `
-        <ds-submission-form-section-container [collectionId]="collectionId"
+        <ds-submission-section-container [collectionId]="collectionId"
                                               [submissionId]="submissionId"
-                                              [sectionData]="object"></ds-submission-form-section-container>`;
+                                              [sectionData]="object"></ds-submission-section-container>`;
 
       testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
       testComp = testFixture.componentInstance;
       init();
     });
 
-    it('should create SectionContainerComponent', inject([SectionContainerComponent], (app: SectionContainerComponent) => {
+    it('should create SubmissionSectionContainerComponent', inject([SubmissionSectionContainerComponent], (app: SubmissionSectionContainerComponent) => {
       expect(app).toBeDefined();
     }));
   });
@@ -110,7 +110,7 @@ describe('SectionContainerComponent test suite', () => {
   describe('', () => {
     beforeEach(() => {
       init();
-      fixture = TestBed.createComponent(SectionContainerComponent);
+      fixture = TestBed.createComponent(SubmissionSectionContainerComponent);
       comp = fixture.componentInstance;
       compAsAny = comp;
       comp.submissionId = submissionId;
diff --git a/src/app/submission/sections/container/section-container.component.ts b/src/app/submission/sections/container/section-container.component.ts
index cc7ef0bf87..f040288667 100644
--- a/src/app/submission/sections/container/section-container.component.ts
+++ b/src/app/submission/sections/container/section-container.component.ts
@@ -9,11 +9,11 @@ import { AlertType } from '../../../shared/alert/aletr-type';
  * This component represents a section that contains the submission license form.
  */
 @Component({
-  selector: 'ds-submission-form-section-container',
+  selector: 'ds-submission-section-container',
   templateUrl: './section-container.component.html',
   styleUrls: ['./section-container.component.scss']
 })
-export class SectionContainerComponent implements OnInit {
+export class SubmissionSectionContainerComponent implements OnInit {
 
   /**
    * The collection id this submission belonging to
diff --git a/src/app/submission/submission.module.ts b/src/app/submission/submission.module.ts
index f3893344fe..e6c24226e2 100644
--- a/src/app/submission/submission.module.ts
+++ b/src/app/submission/submission.module.ts
@@ -10,7 +10,7 @@ import { SubmissionFormCollectionComponent } from './form/collection/submission-
 import { SubmissionFormFooterComponent } from './form/footer/submission-form-footer.component';
 import { SubmissionFormComponent } from './form/submission-form.component';
 import { SubmissionFormSectionAddComponent } from './form/section-add/submission-form-section-add.component';
-import { SectionContainerComponent } from './sections/container/section-container.component';
+import { SubmissionSectionContainerComponent } from './sections/container/section-container.component';
 import { CommonModule } from '@angular/common';
 import { StoreModule } from '@ngrx/store';
 import { EffectsModule } from '@ngrx/effects';
@@ -43,7 +43,7 @@ import { SubmissionSubmitComponent } from './submit/submission-submit.component'
     SubmissionSectionformComponent,
     SubmissionSectionLicenseComponent,
     SectionsDirective,
-    SectionContainerComponent,
+    SubmissionSectionContainerComponent,
     SubmissionEditComponent,
     SubmissionFormSectionAddComponent,
     SubmissionFormCollectionComponent,
@@ -59,7 +59,7 @@ import { SubmissionSubmitComponent } from './submit/submission-submit.component'
     SubmissionSectionUploadComponent,
     SubmissionSectionformComponent,
     SubmissionSectionLicenseComponent,
-    SectionContainerComponent],
+    SubmissionSectionContainerComponent],
   exports: [
     SubmissionEditComponent,
     SubmissionFormComponent,