diff --git a/src/app/item-page/item-page.module.ts b/src/app/item-page/item-page.module.ts
index 2c4b57b249..d1be5a9cd8 100644
--- a/src/app/item-page/item-page.module.ts
+++ b/src/app/item-page/item-page.module.ts
@@ -6,11 +6,19 @@ import { SharedModule } from '../shared/shared.module';
 import { ItemPageComponent } from './simple/item-page.component';
 import { ItemPageRoutingModule } from './item-page-routing.module';
 import { MetadataUriValuesComponent } from './field-components/metadata-uri-values/metadata-uri-values.component';
-import { ItemPageAuthorFieldComponent } from './simple/field-components/specific-field/author/item-page-author-field.component';
-import { ItemPageDateFieldComponent } from './simple/field-components/specific-field/date/item-page-date-field.component';
-import { ItemPageAbstractFieldComponent } from './simple/field-components/specific-field/abstract/item-page-abstract-field.component';
+import {
+  ItemPageAuthorFieldComponent
+} from './simple/field-components/specific-field/author/item-page-author-field.component';
+import {
+  ItemPageDateFieldComponent
+} from './simple/field-components/specific-field/date/item-page-date-field.component';
+import {
+  ItemPageAbstractFieldComponent
+} from './simple/field-components/specific-field/abstract/item-page-abstract-field.component';
 import { ItemPageUriFieldComponent } from './simple/field-components/specific-field/uri/item-page-uri-field.component';
-import { ItemPageTitleFieldComponent } from './simple/field-components/specific-field/title/item-page-title-field.component';
+import {
+  ItemPageTitleFieldComponent
+} from './simple/field-components/specific-field/title/item-page-title-field.component';
 import { ItemPageFieldComponent } from './simple/field-components/specific-field/item-page-field.component';
 import { CollectionsComponent } from './field-components/collections/collections.component';
 import { FullItemPageComponent } from './full/full-item-page.component';
@@ -20,7 +28,9 @@ import { ItemComponent } from './simple/item-types/shared/item.component';
 import { EditItemPageModule } from './edit-item-page/edit-item-page.module';
 import { UploadBitstreamComponent } from './bitstreams/upload/upload-bitstream.component';
 import { StatisticsModule } from '../statistics/statistics.module';
-import { AbstractIncrementalListComponent } from './simple/abstract-incremental-list/abstract-incremental-list.component';
+import {
+  AbstractIncrementalListComponent
+} from './simple/abstract-incremental-list/abstract-incremental-list.component';
 import { UntypedItemComponent } from './simple/item-types/untyped-item/untyped-item.component';
 import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
 import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
@@ -37,7 +47,7 @@ import { ThemedFileSectionComponent } from './simple/field-components/file-secti
 import { OrcidAuthComponent } from './orcid-page/orcid-auth/orcid-auth.component';
 import { OrcidPageComponent } from './orcid-page/orcid-page.component';
 import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
-import { OrcidSettingComponent } from './orcid-page/orcid-sync/orcid-setting.component';
+import { OrcidSyncSettingsComponent } from './orcid-page/orcid-sync-settings/orcid-sync-settings.component';
 
 
 const ENTRY_COMPONENTS = [
@@ -73,7 +83,7 @@ const DECLARATIONS = [
   VersionPageComponent,
   OrcidPageComponent,
   OrcidAuthComponent,
-  OrcidSettingComponent
+  OrcidSyncSettingsComponent
 ];
 
 @NgModule({
diff --git a/src/app/item-page/orcid-page/orcid-page.component.html b/src/app/item-page/orcid-page/orcid-page.component.html
index 1921db3e92..6b49c4d224 100644
--- a/src/app/item-page/orcid-page/orcid-page.component.html
+++ b/src/app/item-page/orcid-page/orcid-page.component.html
@@ -9,4 +9,4 @@
 </div>
 
 <ds-orcid-auth *ngIf="(item | async)" [item]="(item | async)" (unlink)="updateItem()"></ds-orcid-auth>
-<ds-orcid-setting *ngIf="(item | async) && isLinkedToOrcid()" [item]="(item | async)"></ds-orcid-setting>
+<ds-orcid-sync-setting *ngIf="(item | async) && isLinkedToOrcid()" [item]="(item | async)"></ds-orcid-sync-setting>
diff --git a/src/app/item-page/orcid-page/orcid-sync/orcid-setting.component.html b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.html
similarity index 100%
rename from src/app/item-page/orcid-page/orcid-sync/orcid-setting.component.html
rename to src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.html
diff --git a/src/app/item-page/orcid-page/orcid-sync/orcid-setting.component.scss b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.scss
similarity index 100%
rename from src/app/item-page/orcid-page/orcid-sync/orcid-setting.component.scss
rename to src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.scss
diff --git a/src/app/item-page/orcid-page/orcid-sync/orcid-setting.component.ts b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
similarity index 96%
rename from src/app/item-page/orcid-page/orcid-sync/orcid-setting.component.ts
rename to src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
index 74b96f8859..111c7a08df 100644
--- a/src/app/item-page/orcid-page/orcid-sync/orcid-setting.component.ts
+++ b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
@@ -15,11 +15,11 @@ import { NotificationsService } from '../../../shared/notifications/notification
 import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
 
 @Component({
-  selector: 'ds-orcid-setting',
-  templateUrl: './orcid-setting.component.html',
-  styleUrls: ['./orcid-setting.component.scss']
+  selector: 'ds-orcid-sync-setting',
+  templateUrl: './orcid-sync-settings.component.html',
+  styleUrls: ['./orcid-sync-settings.component.scss']
 })
-export class OrcidSettingComponent implements OnInit {
+export class OrcidSyncSettingsComponent implements OnInit {
 
   /**
    * The item for which showing the orcid settings