93803: Ensure data services are called *DataService

src/app/collection-page/collection-form/collection-form.component.ts

@@ -16,7 +16,7 @@ import { CommunityDataService } from '../../core/data/community-data.service';
 import { AuthService } from '../../core/auth/auth.service';
 import { RequestService } from '../../core/data/request.service';
 import { ObjectCacheService } from '../../core/cache/object-cache.service';
-import { EntityTypeService } from '../../core/data/entity-type.service';
+import { EntityTypeDataService } from '../../core/data/entity-type-data.service';
 import { ItemType } from '../../core/shared/item-relationships/item-type.model';
 import { MetadataValue } from '../../core/shared/metadata.models';
 import { getFirstSucceededRemoteListPayload } from '../../core/shared/operators';
@@ -61,7 +61,7 @@ export class CollectionFormComponent extends ComColFormComponent<Collection> imp
                      protected dsoService: CommunityDataService,
                      protected requestService: RequestService,
                      protected objectCache: ObjectCacheService,
-                     protected entityTypeService: EntityTypeService) {
+                     protected entityTypeService: EntityTypeDataService) {
     super(formService, translate, notificationsService, authService, requestService, objectCache);
   }
 

src/app/core/config/config-data.service.spec.ts

@@ -1,7 +1,7 @@
 import { getTestScheduler } from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
-import { ConfigService } from './config.service';
+import { ConfigDataService } from './config-data.service';
 import { RequestService } from '../data/request.service';
 import { GetRequest } from '../data/request.models';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
@@ -14,7 +14,7 @@ import { ObjectCacheService } from '../cache/object-cache.service';
 const LINK_NAME = 'test';
 const BROWSE = 'search/findByCollection';
 
-class TestService extends ConfigService {
+class TestService extends ConfigDataService {
   protected linkPath = LINK_NAME;
   protected browseEndpoint = BROWSE;
 
@@ -28,7 +28,7 @@ class TestService extends ConfigService {
   }
 }
 
-describe('ConfigService', () => {
+describe('ConfigDataService', () => {
   let scheduler: TestScheduler;
   let service: TestService;
   let requestService: RequestService;

src/app/core/config/config-data.service.ts

@@ -6,7 +6,7 @@ import { getFirstCompletedRemoteData } from '../shared/operators';
 import { map } from 'rxjs/operators';
 import { BaseDataService } from '../data/base/base-data.service';
 
-export abstract class ConfigService extends BaseDataService<ConfigObject> {
+export abstract class ConfigDataService extends BaseDataService<ConfigObject> {
   public findByHref(href: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<ConfigObject>[]): Observable<RemoteData<ConfigObject>> {
     return super.findByHref(href, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow).pipe(
       getFirstCompletedRemoteData(),

src/app/core/config/submission-accesses-config-data.service.ts

@@ -1,20 +1,15 @@
 import { Injectable } from '@angular/core';
-import { ConfigService } from './config.service';
+import { ConfigDataService } from './config-data.service';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { SUBMISSION_ACCESSES_TYPE } from './models/config-type';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { Store } from '@ngrx/store';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { HttpClient } from '@angular/common/http';
-import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
 import { ConfigObject } from './models/config.model';
 import { SubmissionAccessesModel } from './models/config-submission-accesses.model';
 import { RemoteData } from '../data/remote-data';
 import { Observable } from 'rxjs';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { CoreState } from '../core-state.model';
 import { dataService } from '../data/base/data-service.decorator';
 
 /**
@@ -22,7 +17,7 @@ import { dataService } from '../data/base/data-service.decorator';
  */
 @Injectable()
 @dataService(SUBMISSION_ACCESSES_TYPE)
-export class SubmissionAccessesConfigService extends ConfigService {
+export class SubmissionAccessesConfigDataService extends ConfigDataService {
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,

src/app/core/config/submission-forms-config-data.service.ts

@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core';
-
+import { ConfigDataService } from './config-data.service';
-import { ConfigService } from './config.service';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
@@ -15,7 +14,7 @@ import { dataService } from '../data/base/data-service.decorator';
 
 @Injectable()
 @dataService(SUBMISSION_FORMS_TYPE)
-export class SubmissionFormsConfigService extends ConfigService {
+export class SubmissionFormsConfigDataService extends ConfigDataService {
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,

src/app/core/config/submission-uploads-config-data.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { ConfigService } from './config.service';
+import { ConfigDataService } from './config-data.service';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
@@ -17,7 +17,7 @@ import { dataService } from '../data/base/data-service.decorator';
  */
 @Injectable()
 @dataService(SUBMISSION_UPLOADS_TYPE)
-export class SubmissionUploadsConfigService extends ConfigService {
+export class SubmissionUploadsConfigDataService extends ConfigDataService {
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,

src/app/core/core.module.ts

@@ -36,7 +36,7 @@ import { SubmissionDefinitionsModel } from './config/models/config-submission-de
 import { SubmissionFormsModel } from './config/models/config-submission-forms.model';
 import { SubmissionSectionModel } from './config/models/config-submission-section.model';
 import { SubmissionUploadsModel } from './config/models/config-submission-uploads.model';
-import { SubmissionFormsConfigService } from './config/submission-forms-config.service';
+import { SubmissionFormsConfigDataService } from './config/submission-forms-config-data.service';
 import { coreEffects } from './core.effects';
 import { coreReducers } from './core.reducers';
 import { BitstreamFormatDataService } from './data/bitstream-format-data.service';
@@ -49,8 +49,8 @@ import { DSOChangeAnalyzer } from './data/dso-change-analyzer.service';
 import { DSOResponseParsingService } from './data/dso-response-parsing.service';
 import { DSpaceObjectDataService } from './data/dspace-object-data.service';
 import { EndpointMapResponseParsingService } from './data/endpoint-map-response-parsing.service';
-import { EntityTypeService } from './data/entity-type.service';
+import { EntityTypeDataService } from './data/entity-type-data.service';
-import { ExternalSourceService } from './data/external-source.service';
+import { ExternalSourceDataService } from './data/external-source-data.service';
 import { FacetConfigResponseParsingService } from './data/facet-config-response-parsing.service';
 import { FacetValueResponseParsingService } from './data/facet-value-response-parsing.service';
 import { FilteredDiscoveryPageResponseParsingService } from './data/filtered-discovery-page-response-parsing.service';
@@ -58,9 +58,9 @@ import { ItemDataService } from './data/item-data.service';
 import { LookupRelationService } from './data/lookup-relation.service';
 import { MyDSpaceResponseParsingService } from './data/mydspace-response-parsing.service';
 import { ObjectUpdatesService } from './data/object-updates/object-updates.service';
-import { RelationshipTypeService } from './data/relationship-type.service';
+import { RelationshipTypeDataService } from './data/relationship-type-data.service';
-import { RelationshipService } from './data/relationship.service';
+import { RelationshipDataService } from './data/relationship-data.service';
-import { ResourcePolicyService } from './resource-policy/resource-policy.service';
+import { ResourcePolicyDataService } from './resource-policy/resource-policy-data.service';
 import { SearchResponseParsingService } from './data/search-response-parsing.service';
 import { SiteDataService } from './data/site-data.service';
 import { DspaceRestService } from './dspace-rest/dspace-rest.service';
@@ -170,10 +170,10 @@ import { SubmissionAccessesModel } from './config/models/config-submission-acces
 import { AccessStatusObject } from '../shared/object-list/access-status-badge/access-status.model';
 import { AccessStatusDataService } from './data/access-status-data.service';
 import { LinkHeadService } from './services/link-head.service';
-import { ResearcherProfileService } from './profile/researcher-profile.service';
+import { ResearcherProfileDataService } from './profile/researcher-profile-data.service';
 import { ProfileClaimService } from '../profile-page/profile-claim/profile-claim.service';
 import { ResearcherProfile } from './profile/model/researcher-profile.model';
-import { OrcidQueueService } from './orcid/orcid-queue.service';
+import { OrcidQueueDataService } from './orcid/orcid-queue-data.service';
 import { OrcidHistoryDataService } from './orcid/orcid-history-data.service';
 import { OrcidQueue } from './orcid/model/orcid-queue.model';
 import { OrcidHistory } from './orcid/model/orcid-history.model';
@@ -225,7 +225,7 @@ const PROVIDERS = [
   MetadataService,
   ObjectCacheService,
   PaginationComponentOptions,
-  ResourcePolicyService,
+  ResourcePolicyDataService,
   RegistryService,
   BitstreamFormatDataService,
   RemoteDataBuildService,
@@ -240,7 +240,7 @@ const PROVIDERS = [
   AccessStatusDataService,
   SubmissionCcLicenseDataService,
   SubmissionCcLicenseUrlDataService,
-  SubmissionFormsConfigService,
+  SubmissionFormsConfigDataService,
   SubmissionRestService,
   SubmissionResponseParsingService,
   SubmissionJsonPatchOperationsService,
@@ -261,7 +261,7 @@ const PROVIDERS = [
   MenuService,
   ObjectUpdatesService,
   SearchService,
-  RelationshipService,
+  RelationshipDataService,
   MyDSpaceGuard,
   RoleService,
   TaskResponseParsingService,
@@ -269,7 +269,7 @@ const PROVIDERS = [
   PoolTaskDataService,
   BitstreamDataService,
   DsDynamicTypeBindRelationService,
-  EntityTypeService,
+  EntityTypeDataService,
   ContentSourceResponseParsingService,
   ItemTemplateDataService,
   SearchService,
@@ -278,8 +278,8 @@ const PROVIDERS = [
   SearchFilterService,
   SearchConfigurationService,
   SelectableListService,
-  RelationshipTypeService,
+  RelationshipTypeDataService,
-  ExternalSourceService,
+  ExternalSourceDataService,
   LookupRelationService,
   VersionDataService,
   VersionHistoryDataService,
@@ -308,10 +308,10 @@ const PROVIDERS = [
   SequenceService,
   GroupDataService,
   FeedbackDataService,
-  ResearcherProfileService,
+  ResearcherProfileDataService,
   ProfileClaimService,
   OrcidAuthService,
-  OrcidQueueService,
+  OrcidQueueDataService,
   OrcidHistoryDataService,
 ];
 

src/app/core/data/dso-redirect.service.ts

@@ -25,7 +25,7 @@ import { getDSORoute } from '../../app-routing-paths';
 const ID_ENDPOINT = 'pid';
 const UUID_ENDPOINT = 'dso';
 
-class DsoByIdOrUUIDService extends IdentifiableDataService<DSpaceObject> {
+class DsoByIdOrUUIDDataService extends IdentifiableDataService<DSpaceObject> {
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
@@ -58,7 +58,7 @@ class DsoByIdOrUUIDService extends IdentifiableDataService<DSpaceObject> {
 
 @Injectable()
 export class DsoRedirectService {
-  private dataService: DsoByIdOrUUIDService;
+  private dataService: DsoByIdOrUUIDDataService;
 
   constructor(
     protected requestService: RequestService,
@@ -67,7 +67,7 @@ export class DsoRedirectService {
     protected halService: HALEndpointService,
     private router: Router,
   ) {
-    this.dataService = new DsoByIdOrUUIDService(requestService, rdbService, objectCache, halService);
+    this.dataService = new DsoByIdOrUUIDDataService(requestService, rdbService, objectCache, halService);
   }
 
   findByIdAndIDType(id: string, identifierType = IdentifierType.UUID): Observable<RemoteData<DSpaceObject>> {

src/app/core/data/entity-type-data.service.ts

@@ -11,7 +11,7 @@ import { RelationshipType } from '../shared/item-relationships/relationship-type
 import { PaginatedList } from './paginated-list.model';
 import { ItemType } from '../shared/item-relationships/item-type.model';
 import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../shared/operators';
-import { RelationshipTypeService } from './relationship-type.service';
+import { RelationshipTypeDataService } from './relationship-type-data.service';
 import { FindListOptions } from './find-list-options.model';
 import { BaseDataService } from './base/base-data.service';
 import { SearchData, SearchDataImpl } from './base/search-data';
@@ -21,7 +21,7 @@ import { FindAllData, FindAllDataImpl } from './base/find-all-data';
  * Service handling all ItemType requests
  */
 @Injectable()
-export class EntityTypeService extends BaseDataService<ItemType> implements FindAllData<ItemType>, SearchData<ItemType> {
+export class EntityTypeDataService extends BaseDataService<ItemType> implements FindAllData<ItemType>, SearchData<ItemType> {
   private findAllData: FindAllData<ItemType>;
   private searchData: SearchDataImpl<ItemType>;
 
@@ -30,7 +30,7 @@ export class EntityTypeService extends BaseDataService<ItemType> implements Find
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    protected relationshipTypeService: RelationshipTypeService,
+    protected relationshipTypeService: RelationshipTypeDataService,
   ) {
     super('entitytypes', requestService, rdbService, objectCache, halService);
 

src/app/core/data/external-source-data.service.spec.ts

@@ -1,4 +1,4 @@
-import { ExternalSourceService } from './external-source.service';
+import { ExternalSourceDataService } from './external-source-data.service';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { createPaginatedList } from '../../shared/testing/utils.test';
 import { ExternalSourceEntry } from '../shared/external-source-entry.model';
@@ -6,7 +6,7 @@ import { of as observableOf } from 'rxjs';
 import { GetRequest } from './request.models';
 
 describe('ExternalSourceService', () => {
-  let service: ExternalSourceService;
+  let service: ExternalSourceDataService;
 
   let requestService;
   let rdbService;
@@ -50,7 +50,7 @@ describe('ExternalSourceService', () => {
     halService = jasmine.createSpyObj('halService', {
       getEndpoint: observableOf('external-sources-REST-endpoint'),
     });
-    service = new ExternalSourceService(requestService, rdbService, undefined, halService);
+    service = new ExternalSourceDataService(requestService, rdbService, undefined, halService);
   }
 
   beforeEach(() => {

src/app/core/data/external-source-data.service.ts

@@ -20,7 +20,7 @@ import { SearchData, SearchDataImpl } from './base/search-data';
  * A service handling all external source requests
  */
 @Injectable()
-export class ExternalSourceService extends IdentifiableDataService<ExternalSource> implements SearchData<ExternalSource> {
+export class ExternalSourceDataService extends IdentifiableDataService<ExternalSource> implements SearchData<ExternalSource> {
   private searchData: SearchData<ExternalSource>;
 
   constructor(

src/app/core/data/lookup-relation.service.spec.ts

@@ -1,5 +1,5 @@
 import { LookupRelationService } from './lookup-relation.service';
-import { ExternalSourceService } from './external-source.service';
+import { ExternalSourceDataService } from './external-source-data.service';
 import { SearchService } from '../shared/search/search.service';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { createPaginatedList } from '../../shared/testing/utils.test';
@@ -16,7 +16,7 @@ import { of as observableOf } from 'rxjs';
 
 describe('LookupRelationService', () => {
   let service: LookupRelationService;
-  let externalSourceService: ExternalSourceService;
+  let externalSourceService: ExternalSourceDataService;
   let searchService: SearchService;
   let requestService: RequestService;
 

src/app/core/data/lookup-relation.service.ts

@@ -1,4 +1,4 @@
-import { ExternalSourceService } from './external-source.service';
+import { ExternalSourceDataService } from './external-source-data.service';
 import { SearchService } from '../shared/search/search.service';
 import { concat, distinctUntilChanged, map, multicast, startWith, take, takeWhile } from 'rxjs/operators';
 import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
@@ -34,7 +34,7 @@ export class LookupRelationService {
     pageSize: 1
   });
 
-  constructor(protected externalSourceService: ExternalSourceService,
+  constructor(protected externalSourceService: ExternalSourceDataService,
               protected searchService: SearchService,
               protected requestService: RequestService) {
   }

src/app/core/data/relationship-data.service.spec.ts

@@ -7,7 +7,7 @@ import { Item } from '../shared/item.model';
 import { PageInfo } from '../shared/page-info.model';
 import { buildPaginatedList } from './paginated-list.model';
 import { DeleteRequest } from './request.models';
-import { RelationshipService } from './relationship.service';
+import { RelationshipDataService } from './relationship-data.service';
 import { RequestService } from './request.service';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
@@ -17,8 +17,8 @@ import { createPaginatedList } from '../../shared/testing/utils.test';
 import { RequestEntry } from './request-entry.model';
 import { FindListOptions } from './find-list-options.model';
 
-describe('RelationshipService', () => {
+describe('RelationshipDataService', () => {
-  let service: RelationshipService;
+  let service: RelationshipDataService;
   let requestService: RequestService;
 
   const restEndpointURL = 'https://rest.api/core';
@@ -122,7 +122,7 @@ describe('RelationshipService', () => {
   });
 
   function initTestService() {
-    return new RelationshipService(
+    return new RelationshipDataService(
       requestService,
       rdbService,
       halService,

src/app/core/data/relationship-data.service.ts

@@ -74,7 +74,7 @@ const compareItemsByUUID = (itemCheck: Item) =>
  */
 @Injectable()
 @dataService(RELATIONSHIP)
-export class RelationshipService extends IdentifiableDataService<Relationship> implements SearchData<Relationship> {
+export class RelationshipDataService extends IdentifiableDataService<Relationship> implements SearchData<Relationship> {
   private searchData: SearchData<Relationship>;
   private putData: PutData<Relationship>;
 
@@ -547,6 +547,15 @@ export class RelationshipService extends IdentifiableDataService<Relationship> i
     return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
+  /**
+   * Create the HREF for a specific object's search method with given options object
+   *
+   * @param searchMethod The search method for the object
+   * @param options The [[FindListOptions]] object
+   * @return {Observable<string>}
+   *    Return an observable that emits created HREF
+   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   */
   getSearchByHref(searchMethod: string, options: FindListOptions, ...linksToFollow: FollowLinkConfig<Relationship>[]): Observable<string> {
     return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
   }

src/app/core/data/relationship-type-data.service.spec.ts

@@ -5,14 +5,14 @@ import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-servic
 import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { ItemType } from '../shared/item-relationships/item-type.model';
 import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
-import { RelationshipTypeService } from './relationship-type.service';
+import { RelationshipTypeDataService } from './relationship-type-data.service';
 import { RequestService } from './request.service';
 import { createPaginatedList } from '../../shared/testing/utils.test';
 import { hasValueOperator } from '../../shared/empty.util';
 import { ObjectCacheService } from '../cache/object-cache.service';
 
-describe('RelationshipTypeService', () => {
+describe('RelationshipTypeDataService', () => {
-  let service: RelationshipTypeService;
+  let service: RelationshipTypeDataService;
   let requestService: RequestService;
   let restEndpointURL;
   let halService: any;
@@ -71,7 +71,7 @@ describe('RelationshipTypeService', () => {
   }
 
   function initTestService() {
-    return new RelationshipTypeService(
+    return new RelationshipTypeDataService(
       requestService,
       rdbService,
       objectCache,

src/app/core/data/relationship-type-data.service.ts

@@ -32,7 +32,7 @@ const checkSide = (typeRd: RemoteData<ItemType>, label: string): boolean =>
  */
 @Injectable()
 @dataService(RELATIONSHIP_TYPE)
-export class RelationshipTypeService extends BaseDataService<RelationshipType> {
+export class RelationshipTypeDataService extends BaseDataService<RelationshipType> {
   private searchData: SearchDataImpl<RelationshipType>;
   private findAllData: FindAllDataImpl<RelationshipType>;
 

src/app/core/orcid/orcid-auth.service.spec.ts

@@ -11,14 +11,14 @@ import { createPaginatedList } from '../../shared/testing/utils.test';
 import { NativeWindowRefMock } from '../../shared/mocks/mock-native-window-ref';
 import { URLCombiner } from '../url-combiner/url-combiner';
 import { OrcidAuthService } from './orcid-auth.service';
-import { ResearcherProfileService } from '../profile/researcher-profile.service';
+import { ResearcherProfileDataService } from '../profile/researcher-profile-data.service';
 
 describe('OrcidAuthService', () => {
   let scheduler: TestScheduler;
   let service: OrcidAuthService;
   let serviceAsAny: any;
 
-  let researcherProfileService: jasmine.SpyObj<ResearcherProfileService>;
+  let researcherProfileService: jasmine.SpyObj<ResearcherProfileDataService>;
   let configurationDataService: ConfigurationDataService;
   let nativeWindowService: NativeWindowRefMock;
   let routerStub: any;

src/app/core/orcid/orcid-auth.service.ts

@@ -5,7 +5,7 @@ import { combineLatest, Observable } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 import { AddOperation, RemoveOperation } from 'fast-json-patch';
 
-import { ResearcherProfileService } from '../profile/researcher-profile.service';
+import { ResearcherProfileDataService } from '../profile/researcher-profile-data.service';
 import { Item } from '../shared/item.model';
 import { isNotEmpty } from '../../shared/empty.util';
 import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../shared/operators';
@@ -22,7 +22,7 @@ export class OrcidAuthService {
   constructor(
     @Inject(NativeWindowService) protected _window: NativeWindowRef,
     private configurationService: ConfigurationDataService,
-    private researcherProfileService: ResearcherProfileService,
+    private researcherProfileService: ResearcherProfileDataService,
     private router: Router) {
   }
 

src/app/core/orcid/orcid-queue-data.service.ts

@@ -22,7 +22,7 @@ import { dataService } from '../data/base/data-service.decorator';
  */
 @Injectable()
 @dataService(ORCID_QUEUE)
-export class OrcidQueueService extends IdentifiableDataService<OrcidQueue> {
+export class OrcidQueueDataService extends IdentifiableDataService<OrcidQueue> {
   private searchData: SearchData<OrcidQueue>;
   private deleteData: DeleteData<OrcidQueue>;
 

src/app/core/profile/researcher-profile-data.service.spec.ts

@@ -18,7 +18,7 @@ import {
 } from '../../shared/remote-data.utils';
 import { RestResponse } from '../cache/response.models';
 import { RequestEntry } from '../data/request-entry.model';
-import { ResearcherProfileService } from './researcher-profile.service';
+import { ResearcherProfileDataService } from './researcher-profile-data.service';
 import { RouterMock } from '../../shared/mocks/router.mock';
 import { ResearcherProfile } from './model/researcher-profile.model';
 import { Item } from '../shared/item.model';
@@ -31,7 +31,7 @@ import { createPaginatedList } from '../../shared/testing/utils.test';
 
 describe('ResearcherProfileService', () => {
   let scheduler: TestScheduler;
-  let service: ResearcherProfileService;
+  let service: ResearcherProfileDataService;
   let serviceAsAny: any;
   let requestService: RequestService;
   let rdbService: RemoteDataBuildService;
@@ -247,7 +247,7 @@ describe('ResearcherProfileService', () => {
       findByHref: jasmine.createSpy('findByHref')
     });
 
-    service = new ResearcherProfileService(
+    service = new ResearcherProfileDataService(
       requestService,
       rdbService,
       objectCache,

src/app/core/profile/researcher-profile-data.service.ts

@@ -39,7 +39,7 @@ import { dataService } from '../data/base/data-service.decorator';
  */
 @Injectable()
 @dataService(RESEARCHER_PROFILE)
-export class ResearcherProfileService extends IdentifiableDataService<ResearcherProfile> implements CreateData<ResearcherProfile>, SearchData<ResearcherProfile>, PatchData<ResearcherProfile>, DeleteData<ResearcherProfile> {
+export class ResearcherProfileDataService extends IdentifiableDataService<ResearcherProfile> implements CreateData<ResearcherProfile>, SearchData<ResearcherProfile>, PatchData<ResearcherProfile>, DeleteData<ResearcherProfile> {
   private createData: CreateDataImpl<ResearcherProfile>;
   private searchData: SearchDataImpl<ResearcherProfile>;
   private patchData: PatchDataImpl<ResearcherProfile>;

src/app/core/resource-policy/resource-policy-data.service.spec.ts

@@ -1,5 +1,3 @@
-import { HttpClient } from '@angular/common/http';
-
 import { cold, getTestScheduler, hot } from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
@@ -9,7 +7,7 @@ import { RemoteDataBuildService } from '../cache/builders/remote-data-build.serv
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { RequestService } from '../data/request.service';
-import { ResourcePolicyService } from './resource-policy.service';
+import { ResourcePolicyDataService } from './resource-policy-data.service';
 import { PolicyType } from './models/policy-type.model';
 import { ActionType } from './models/action-type.model';
 import { RequestParam } from '../cache/models/request-param.model';
@@ -24,7 +22,7 @@ import { GroupDataService } from '../eperson/group-data.service';
 
 describe('ResourcePolicyService', () => {
   let scheduler: TestScheduler;
-  let service: ResourcePolicyService;
+  let service: ResourcePolicyDataService;
   let requestService: RequestService;
   let rdbService: RemoteDataBuildService;
   let objectCache: ObjectCacheService;
@@ -133,7 +131,7 @@ describe('ResourcePolicyService', () => {
     const notificationsService = {} as NotificationsService;
     const comparator = {} as any;
 
-    service = new ResourcePolicyService(
+    service = new ResourcePolicyDataService(
       requestService,
       rdbService,
       objectCache,

src/app/core/resource-policy/resource-policy-data.service.ts

@@ -40,7 +40,7 @@ import { dataService } from '../data/base/data-service.decorator';
  */
 @Injectable()
 @dataService(RESOURCE_POLICY)
-export class ResourcePolicyService extends IdentifiableDataService<ResourcePolicy> {
+export class ResourcePolicyDataService extends IdentifiableDataService<ResourcePolicy> {
   protected searchByEPersonMethod = 'eperson';
   protected searchByGroupMethod = 'group';
   protected searchByResourceMethod = 'resource';

src/app/core/statistics/usage-report-data.service.ts

@@ -21,7 +21,7 @@ import { dataService } from '../data/base/data-service.decorator';
  */
 @Injectable()
 @dataService(USAGE_REPORT)
-export class UsageReportService extends IdentifiableDataService<UsageReport> implements SearchData<UsageReport> {
+export class UsageReportDataService extends IdentifiableDataService<UsageReport> implements SearchData<UsageReport> {
   private searchData: SearchDataImpl<UsageReport>;
 
   constructor(

src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts

@@ -14,7 +14,7 @@ import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-anal
 import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service';
 import { ItemDataService } from '../../../../core/data/item-data.service';
 import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
-import { RelationshipService } from '../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
@@ -83,7 +83,7 @@ describe('JournalComponent', () => {
       providers: [
         { provide: ItemDataService, useValue: {} },
         { provide: TruncatableService, useValue: {} },
-        { provide: RelationshipService, useValue: {} },
+        { provide: RelationshipDataService, useValue: {} },
         { provide: ObjectCacheService, useValue: {} },
         { provide: UUIDService, useValue: {} },
         { provide: Store, useValue: {} },

src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.spec.ts

@@ -14,7 +14,7 @@ import { DefaultChangeAnalyzer } from '../../../../../core/data/default-change-a
 import { DSOChangeAnalyzer } from '../../../../../core/data/dso-change-analyzer.service';
 import { ItemDataService } from '../../../../../core/data/item-data.service';
 import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
-import { RelationshipService } from '../../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
 import { RemoteData } from '../../../../../core/data/remote-data';
 import { Bitstream } from '../../../../../core/shared/bitstream.model';
 import { HALEndpointService } from '../../../../../core/shared/hal-endpoint.service';
@@ -101,7 +101,7 @@ describe('OrgUnitSearchResultListSubmissionElementComponent', () => {
       declarations: [OrgUnitSearchResultListSubmissionElementComponent, TruncatePipe],
       providers: [
         { provide: TruncatableService, useValue: {} },
-        { provide: RelationshipService, useValue: mockRelationshipService },
+        { provide: RelationshipDataService, useValue: mockRelationshipService },
         { provide: NotificationsService, useValue: {} },
         { provide: TranslateService, useValue: {} },
         { provide: NgbModal, useValue: {} },

src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts

@@ -6,7 +6,7 @@ import { listableObjectComponent } from '../../../../../shared/object-collection
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { Item } from '../../../../../core/shared/item.model';
 import { Context } from '../../../../../core/shared/context.model';
-import { RelationshipService } from '../../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { take } from 'rxjs/operators';
 import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
@@ -36,7 +36,7 @@ export class OrgUnitSearchResultListSubmissionElementComponent extends SearchRes
   useNameVariants = false;
 
   constructor(protected truncatableService: TruncatableService,
-              private relationshipService: RelationshipService,
+              private relationshipService: RelationshipDataService,
               private notificationsService: NotificationsService,
               private translateService: TranslateService,
               private modalService: NgbModal,

src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts

@@ -14,7 +14,7 @@ import { DefaultChangeAnalyzer } from '../../../../../core/data/default-change-a
 import { DSOChangeAnalyzer } from '../../../../../core/data/dso-change-analyzer.service';
 import { ItemDataService } from '../../../../../core/data/item-data.service';
 import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
-import { RelationshipService } from '../../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
 import { RemoteData } from '../../../../../core/data/remote-data';
 import { Bitstream } from '../../../../../core/shared/bitstream.model';
 import { HALEndpointService } from '../../../../../core/shared/hal-endpoint.service';
@@ -93,7 +93,7 @@ describe('PersonSearchResultListElementSubmissionComponent', () => {
       declarations: [PersonSearchResultListSubmissionElementComponent, TruncatePipe],
       providers: [
         { provide: TruncatableService, useValue: {} },
-        { provide: RelationshipService, useValue: mockRelationshipService },
+        { provide: RelationshipDataService, useValue: mockRelationshipService },
         { provide: NotificationsService, useValue: {} },
         { provide: TranslateService, useValue: {} },
         { provide: NgbModal, useValue: {} },

src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts

@@ -6,7 +6,7 @@ import { listableObjectComponent } from '../../../../../shared/object-collection
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { Item } from '../../../../../core/shared/item.model';
 import { Context } from '../../../../../core/shared/context.model';
-import { RelationshipService } from '../../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { take } from 'rxjs/operators';
 import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
@@ -34,7 +34,7 @@ export class PersonSearchResultListSubmissionElementComponent extends SearchResu
   alternativeField = 'dc.title.alternative';
 
   constructor(protected truncatableService: TruncatableService,
-              private relationshipService: RelationshipService,
+              private relationshipService: RelationshipDataService,
               private notificationsService: NotificationsService,
               private translateService: TranslateService,
               private modalService: NgbModal,

src/app/item-page/edit-item-page/item-delete/item-delete.component.spec.ts

@@ -19,12 +19,12 @@ import { ItemDeleteComponent } from './item-delete.component';
 import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { VarDirective } from '../../../shared/utils/var.directive';
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
-import { RelationshipService } from '../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
 import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model';
-import { EntityTypeService } from '../../../core/data/entity-type.service';
+import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
 import { getItemEditRoute } from '../../item-page-routing-paths';
 import { createPaginatedList } from '../../../shared/testing/utils.test';
-import { RelationshipTypeService } from '../../../core/data/relationship-type.service';
+import { RelationshipTypeDataService } from '../../../core/data/relationship-type-data.service';
 import { LinkService } from '../../../core/cache/builders/link.service';
 
 let comp: ItemDeleteComponent;
@@ -154,9 +154,9 @@ describe('ItemDeleteComponent', () => {
         { provide: ItemDataService, useValue: mockItemDataService },
         { provide: NotificationsService, useValue: notificationsServiceStub },
         { provide: ObjectUpdatesService, useValue: objectUpdatesServiceStub },
-        { provide: RelationshipService, useValue: relationshipService },
+        { provide: RelationshipDataService, useValue: relationshipService },
-        { provide: EntityTypeService, useValue: entityTypeService },
+        { provide: EntityTypeDataService, useValue: entityTypeService },
-        { provide: RelationshipTypeService, useValue: {} },
+        { provide: RelationshipTypeDataService, useValue: {} },
         { provide: LinkService, useValue: linkService },
       ], schemas: [
         CUSTOM_ELEMENTS_SCHEMA

src/app/item-page/edit-item-page/item-delete/item-delete.component.ts

@@ -29,8 +29,8 @@ import { NotificationsService } from '../../../shared/notifications/notification
 import { ItemDataService } from '../../../core/data/item-data.service';
 import { TranslateService } from '@ngx-translate/core';
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
-import { RelationshipService } from '../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
-import { EntityTypeService } from '../../../core/data/entity-type.service';
+import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
 import { LinkService } from '../../../core/cache/builders/link.service';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { getItemEditRoute } from '../../item-page-routing-paths';
@@ -100,8 +100,8 @@ export class ItemDeleteComponent
               protected translateService: TranslateService,
               protected modalService: NgbModal,
               protected objectUpdatesService: ObjectUpdatesService,
-              protected relationshipService: RelationshipService,
+              protected relationshipService: RelationshipDataService,
-              protected entityTypeService: EntityTypeService,
+              protected entityTypeService: EntityTypeDataService,
               protected linkService: LinkService,
   ) {
     super(

src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts

@@ -5,7 +5,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 import { LinkService } from '../../../../core/cache/builders/link.service';
 import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
-import { RelationshipService } from '../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
 import { ItemType } from '../../../../core/shared/item-relationships/item-type.model';
 import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
 import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
@@ -21,7 +21,7 @@ import { HostWindowService } from '../../../../shared/host-window.service';
 import { HostWindowServiceStub } from '../../../../shared/testing/host-window-service.stub';
 import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
 import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
-import { RelationshipTypeService } from '../../../../core/data/relationship-type.service';
+import { RelationshipTypeDataService } from '../../../../core/data/relationship-type-data.service';
 import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
 import { GroupDataService } from '../../../../core/eperson/group-data.service';
 import { ConfigurationDataService } from '../../../../core/data/configuration-data.service';
@@ -206,12 +206,12 @@ describe('EditRelationshipListComponent', () => {
       declarations: [EditRelationshipListComponent],
       providers: [
         { provide: ObjectUpdatesService, useValue: objectUpdatesService },
-        { provide: RelationshipService, useValue: relationshipService },
+        { provide: RelationshipDataService, useValue: relationshipService },
         { provide: SelectableListService, useValue: selectableListService },
         { provide: LinkService, useValue: linkService },
         { provide: PaginationService, useValue: paginationService },
         { provide: HostWindowService, useValue: hostWindowService },
-        { provide: RelationshipTypeService, useValue: relationshipTypeService },
+        { provide: RelationshipTypeDataService, useValue: relationshipTypeService },
         { provide: GroupDataService, useValue: groupDataService },
         { provide: Router, useValue: new RouterMock() },
         { provide: LinkHeadService, useValue: linkHeadService },

src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts

@@ -12,7 +12,7 @@ import {
 import {
   RelationshipIdentifiable
 } from '../../../../core/data/object-updates/object-updates.reducer';
-import { RelationshipService } from '../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
 import { Item } from '../../../../core/shared/item.model';
 import { defaultIfEmpty, map, mergeMap, startWith, switchMap, take, tap, toArray } from 'rxjs/operators';
 import { hasNoValue, hasValue, hasValueOperator } from '../../../../shared/empty.util';
@@ -35,7 +35,7 @@ import { RemoteData } from '../../../../core/data/remote-data';
 import { Collection } from '../../../../core/shared/collection.model';
 import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
-import { RelationshipTypeService } from '../../../../core/data/relationship-type.service';
+import { RelationshipTypeDataService } from '../../../../core/data/relationship-type-data.service';
 import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
 import { FieldUpdates } from '../../../../core/data/object-updates/field-updates.model';
 import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
@@ -142,8 +142,8 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
   constructor(
     protected objectUpdatesService: ObjectUpdatesService,
     protected linkService: LinkService,
-    protected relationshipService: RelationshipService,
+    protected relationshipService: RelationshipDataService,
-    protected relationshipTypeService: RelationshipTypeService,
+    protected relationshipTypeService: RelationshipTypeDataService,
     protected modalService: NgbModal,
     protected paginationService: PaginationService,
     protected selectableListService: SelectableListService,

src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts

@@ -7,10 +7,10 @@ import { combineLatest as observableCombineLatest, of as observableOf } from 'rx
 import { TestScheduler } from 'rxjs/testing';
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
 import { RestResponse } from '../../../core/cache/response.models';
-import { EntityTypeService } from '../../../core/data/entity-type.service';
+import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
 import { ItemDataService } from '../../../core/data/item-data.service';
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
-import { RelationshipService } from '../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
 import { RequestService } from '../../../core/data/request.service';
 import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
 import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model';
@@ -25,7 +25,7 @@ import { ItemRelationshipsComponent } from './item-relationships.component';
 import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
-import { RelationshipTypeService } from '../../../core/data/relationship-type.service';
+import { RelationshipTypeDataService } from '../../../core/data/relationship-type-data.service';
 import { relationshipTypes } from '../../../shared/testing/relationship-types.mock';
 import { ThemeService } from '../../../shared/theme-support/theme.service';
 import { getMockThemeService } from '../../../shared/mocks/theme-service.mock';
@@ -219,11 +219,11 @@ describe('ItemRelationshipsComponent', () => {
         { provide: Router, useValue: router },
         { provide: ActivatedRoute, useValue: routeStub },
         { provide: NotificationsService, useValue: notificationsService },
-        { provide: RelationshipService, useValue: relationshipService },
+        { provide: RelationshipDataService, useValue: relationshipService },
-        { provide: EntityTypeService, useValue: entityTypeService },
+        { provide: EntityTypeDataService, useValue: entityTypeService },
         { provide: ObjectCacheService, useValue: objectCache },
         { provide: RequestService, useValue: requestService },
-        { provide: RelationshipTypeService, useValue: relationshipTypeService },
+        { provide: RelationshipTypeDataService, useValue: relationshipTypeService },
         ChangeDetectorRef
       ], schemas: [
         NO_ERRORS_SCHEMA

src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts

@@ -13,21 +13,21 @@ import { ObjectUpdatesService } from '../../../core/data/object-updates/object-u
 import { ActivatedRoute, Router } from '@angular/router';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
-import { RelationshipService } from '../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
 import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../../../core/shared/operators';
 import { RequestService } from '../../../core/data/request.service';
 import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model';
 import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
-import { EntityTypeService } from '../../../core/data/entity-type.service';
+import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
 import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
 import { NoContent } from '../../../core/shared/NoContent.model';
 import { hasValue } from '../../../shared/empty.util';
 import { FieldUpdate } from '../../../core/data/object-updates/field-update.model';
 import { FieldUpdates } from '../../../core/data/object-updates/field-updates.model';
 import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
-import { RelationshipTypeService } from '../../../core/data/relationship-type.service';
+import { RelationshipTypeDataService } from '../../../core/data/relationship-type-data.service';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 
@@ -59,11 +59,11 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
     public notificationsService: NotificationsService,
     public translateService: TranslateService,
     public route: ActivatedRoute,
-    public relationshipService: RelationshipService,
+    public relationshipService: RelationshipDataService,
     public objectCache: ObjectCacheService,
     public requestService: RequestService,
-    public entityTypeService: EntityTypeService,
+    public entityTypeService: EntityTypeDataService,
-    protected relationshipTypeService: RelationshipTypeService,
+    protected relationshipTypeService: RelationshipTypeDataService,
     public cdr: ChangeDetectorRef,
     protected modalService: NgbModal,
   ) {

src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts

@@ -4,7 +4,7 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
 import { RouterTestingModule } from '@angular/router/testing';
 import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { OrcidQueueService } from '../../../core/orcid/orcid-queue.service';
+import { OrcidQueueDataService } from '../../../core/orcid/orcid-queue-data.service';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
@@ -22,7 +22,7 @@ describe('OrcidQueueComponent test suite', () => {
   let component: OrcidQueueComponent;
   let fixture: ComponentFixture<OrcidQueueComponent>;
   let debugElement: DebugElement;
-  let orcidQueueService: OrcidQueueService;
+  let orcidQueueService: OrcidQueueDataService;
   let orcidAuthService: jasmine.SpyObj<OrcidAuthService>;
 
   const testProfileItemId = 'test-owner-id';
@@ -120,7 +120,7 @@ describe('OrcidQueueComponent test suite', () => {
       declarations: [OrcidQueueComponent],
       providers: [
         { provide: OrcidAuthService, useValue: orcidAuthService },
-        { provide: OrcidQueueService, useValue: orcidQueueServiceSpy },
+        { provide: OrcidQueueDataService, useValue: orcidQueueServiceSpy },
         { provide: OrcidHistoryDataService, useValue: {} },
         { provide: PaginationService, useValue: new PaginationServiceStub() },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
@@ -128,7 +128,7 @@ describe('OrcidQueueComponent test suite', () => {
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
 
-    orcidQueueService = TestBed.inject(OrcidQueueService);
+    orcidQueueService = TestBed.inject(OrcidQueueDataService);
   }));
 
   beforeEach(() => {

src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts

@@ -9,7 +9,7 @@ import { RemoteData } from '../../../core/data/remote-data';
 import { OrcidHistory } from '../../../core/orcid/model/orcid-history.model';
 import { OrcidQueue } from '../../../core/orcid/model/orcid-queue.model';
 import { OrcidHistoryDataService } from '../../../core/orcid/orcid-history-data.service';
-import { OrcidQueueService } from '../../../core/orcid/orcid-queue.service';
+import { OrcidQueueDataService } from '../../../core/orcid/orcid-queue-data.service';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { hasValue } from '../../../shared/empty.util';
@@ -62,7 +62,7 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
   private subs: Subscription[] = [];
 
   constructor(private orcidAuthService: OrcidAuthService,
-              private orcidQueueService: OrcidQueueService,
+              private orcidQueueService: OrcidQueueDataService,
               protected translateService: TranslateService,
               private paginationService: PaginationService,
               private notificationsService: NotificationsService,

src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts

@@ -10,7 +10,7 @@ import { TestScheduler } from 'rxjs/testing';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { Operation } from 'fast-json-patch';
 
-import { ResearcherProfileService } from '../../../core/profile/researcher-profile.service';
+import { ResearcherProfileDataService } from '../../../core/profile/researcher-profile-data.service';
 import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { Item } from '../../../core/shared/item.model';
 import { createPaginatedList } from '../../../shared/testing/utils.test';
@@ -24,7 +24,7 @@ describe('OrcidSyncSettingsComponent test suite', () => {
   let comp: OrcidSyncSettingsComponent;
   let fixture: ComponentFixture<OrcidSyncSettingsComponent>;
   let scheduler: TestScheduler;
-  let researcherProfileService: jasmine.SpyObj<ResearcherProfileService>;
+  let researcherProfileService: jasmine.SpyObj<ResearcherProfileDataService>;
   let notificationsService;
   let formGroup: FormGroup;
 
@@ -149,7 +149,7 @@ describe('OrcidSyncSettingsComponent test suite', () => {
       declarations: [OrcidSyncSettingsComponent],
       providers: [
         { provide: NotificationsService, useClass: NotificationsServiceStub },
-        { provide: ResearcherProfileService, useValue: researcherProfileService }
+        { provide: ResearcherProfileDataService, useValue: researcherProfileService }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(OrcidSyncSettingsComponent, {

src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts

@@ -7,7 +7,7 @@ import { of } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 
 import { RemoteData } from '../../../core/data/remote-data';
-import { ResearcherProfileService } from '../../../core/profile/researcher-profile.service';
+import { ResearcherProfileDataService } from '../../../core/profile/researcher-profile-data.service';
 import { Item } from '../../../core/shared/item.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
@@ -70,7 +70,7 @@ export class OrcidSyncSettingsComponent implements OnInit {
    */
   @Output() settingsUpdated: EventEmitter<void> = new EventEmitter<void>();
 
-  constructor(private researcherProfileService: ResearcherProfileService,
+  constructor(private researcherProfileService: ResearcherProfileDataService,
               private notificationsService: NotificationsService,
               private translateService: TranslateService) {
   }

src/app/item-page/simple/item-types/publication/publication.component.spec.ts

@@ -12,7 +12,7 @@ import { CommunityDataService } from '../../../../core/data/community-data.servi
 import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service';
 import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service';
 import { ItemDataService } from '../../../../core/data/item-data.service';
-import { RelationshipService } from '../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
@@ -71,7 +71,7 @@ describe('PublicationComponent', () => {
       providers: [
         { provide: ItemDataService, useValue: {} },
         { provide: TruncatableService, useValue: {} },
-        { provide: RelationshipService, useValue: {} },
+        { provide: RelationshipDataService, useValue: {} },
         { provide: ObjectCacheService, useValue: {} },
         { provide: UUIDService, useValue: {} },
         { provide: Store, useValue: {} },

src/app/item-page/simple/item-types/shared/item.component.spec.ts

@@ -12,7 +12,7 @@ import { CommunityDataService } from '../../../../core/data/community-data.servi
 import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service';
 import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service';
 import { ItemDataService } from '../../../../core/data/item-data.service';
-import { RelationshipService } from '../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
@@ -38,7 +38,7 @@ import { VersionDataService } from '../../../../core/data/version-data.service';
 import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
 import { RouterTestingModule } from '@angular/router/testing';
 import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
-import { ResearcherProfileService } from '../../../../core/profile/researcher-profile.service';
+import { ResearcherProfileDataService } from '../../../../core/profile/researcher-profile-data.service';
 
 export function getIIIFSearchEnabled(enabled: boolean): MetadataValue {
   return Object.assign(new MetadataValue(), {
@@ -99,7 +99,7 @@ export function getItemPageFieldsTest(mockItem: Item, component) {
         providers: [
           { provide: ItemDataService, useValue: {} },
           { provide: TruncatableService, useValue: {} },
-          { provide: RelationshipService, useValue: {} },
+          { provide: RelationshipDataService, useValue: {} },
           { provide: ObjectCacheService, useValue: {} },
           { provide: UUIDService, useValue: {} },
           { provide: Store, useValue: {} },
@@ -117,7 +117,7 @@ export function getItemPageFieldsTest(mockItem: Item, component) {
           { provide: SearchService, useValue: {} },
           { provide: RouteService, useValue: {} },
           { provide: AuthorizationDataService, useValue: authorizationService },
-          { provide: ResearcherProfileService, useValue: {} }
+          { provide: ResearcherProfileDataService, useValue: {} }
         ],
 
         schemas: [NO_ERRORS_SCHEMA]

src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts

@@ -12,7 +12,7 @@ import { CommunityDataService } from '../../../../core/data/community-data.servi
 import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service';
 import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service';
 import { ItemDataService } from '../../../../core/data/item-data.service';
-import { RelationshipService } from '../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
@@ -72,7 +72,7 @@ describe('UntypedItemComponent', () => {
       providers: [
         { provide: ItemDataService, useValue: {} },
         { provide: TruncatableService, useValue: {} },
-        { provide: RelationshipService, useValue: {} },
+        { provide: RelationshipDataService, useValue: {} },
         { provide: ObjectCacheService, useValue: {} },
         { provide: UUIDService, useValue: {} },
         { provide: Store, useValue: {} },

src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts

@@ -2,7 +2,7 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { MetadataRepresentationListComponent } from './metadata-representation-list.component';
-import { RelationshipService } from '../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
 import { Item } from '../../../core/shared/item.model';
 import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
 import { createSuccessfulRemoteDataObject$, createFailedRemoteDataObject$ } from '../../../shared/remote-data.utils';
@@ -110,7 +110,7 @@ describe('MetadataRepresentationListComponent', () => {
       imports: [TranslateModule.forRoot()],
       declarations: [MetadataRepresentationListComponent, VarDirective],
       providers: [
-        { provide: RelationshipService, useValue: relationshipService }
+        { provide: RelationshipDataService, useValue: relationshipService }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(MetadataRepresentationListComponent, {

src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts

@@ -6,7 +6,7 @@ import {
   of as observableOf,
   zip as observableZip
 } from 'rxjs';
-import { RelationshipService } from '../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
 import { MetadataValue } from '../../../core/shared/metadata.models';
 import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
 import { filter, map, switchMap } from 'rxjs/operators';
@@ -61,7 +61,7 @@ export class MetadataRepresentationListComponent extends AbstractIncrementalList
    */
   total: number;
 
-  constructor(public relationshipService: RelationshipService) {
+  constructor(public relationshipService: RelationshipDataService) {
     super();
   }
 

src/app/item-page/simple/related-items/related-items-component.ts

@@ -4,7 +4,7 @@ import { Observable } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { ViewMode } from '../../../core/shared/view-mode.model';
-import { RelationshipService } from '../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
 import { AbstractIncrementalListComponent } from '../abstract-incremental-list/abstract-incremental-list.component';
 import { FindListOptions } from '../../../core/data/find-list-options.model';
 
@@ -53,7 +53,7 @@ export class RelatedItemsComponent extends AbstractIncrementalListComponent<Obse
    */
   viewMode = ViewMode.ListElement;
 
-  constructor(public relationshipService: RelationshipService) {
+  constructor(public relationshipService: RelationshipDataService) {
     super();
   }
 

src/app/item-page/simple/related-items/related-items.component.spec.ts

@@ -5,7 +5,7 @@ import { Item } from '../../../core/shared/item.model';
 import { By } from '@angular/platform-browser';
 import { createRelationshipsObservable } from '../item-types/shared/item.component.spec';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { RelationshipService } from '../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
 import { TranslateModule } from '@ngx-translate/core';
 import { VarDirective } from '../../../shared/utils/var.directive';
 import { of as observableOf } from 'rxjs';
@@ -28,7 +28,7 @@ const mockItem2: Item = Object.assign(new Item(), {
 });
 const mockItems = [mockItem1, mockItem2];
 const relationType = 'isItemOfItem';
-let relationshipService: RelationshipService;
+let relationshipService: RelationshipDataService;
 
 describe('RelatedItemsComponent', () => {
   let comp: RelatedItemsComponent;
@@ -45,7 +45,7 @@ describe('RelatedItemsComponent', () => {
       imports: [TranslateModule.forRoot()],
       declarations: [RelatedItemsComponent, VarDirective],
       providers: [
-        { provide: RelationshipService, useValue: relationshipService }
+        { provide: RelationshipDataService, useValue: relationshipService }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(RelatedItemsComponent, {

src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts

@@ -7,7 +7,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 import { createPaginatedList, createTestComponent } from '../../../shared/testing/utils.test';
 import { MyDSpaceNewExternalDropdownComponent } from './my-dspace-new-external-dropdown.component';
-import { EntityTypeService } from '../../../core/data/entity-type.service';
+import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
 import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
 import { ResourceType } from '../../../core/shared/resource-type';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
@@ -15,7 +15,7 @@ import { PageInfo } from '../../../core/shared/page-info.model';
 import { RouterStub } from '../../../shared/testing/router.stub';
 import { BrowserOnlyMockPipe } from '../../../shared/testing/browser-only-mock.pipe';
 
-export function getMockEntityTypeService(): EntityTypeService {
+export function getMockEntityTypeService(): EntityTypeDataService {
   const pageInfo = { elementsPerPage: 20, totalElements: 4, totalPages: 1, currentPage: 0 } as PageInfo;
   const type1: ItemType = {
     id: '1',
@@ -45,7 +45,7 @@ export function getMockEntityTypeService(): EntityTypeService {
   });
 }
 
-export function getMockEmptyEntityTypeService(): EntityTypeService {
+export function getMockEmptyEntityTypeService(): EntityTypeDataService {
   const pageInfo = { elementsPerPage: 20, totalElements: 1, totalPages: 1, currentPage: 0 } as PageInfo;
   const type1: ItemType = {
     id: '1',
@@ -88,7 +88,7 @@ describe('MyDSpaceNewExternalDropdownComponent test', () => {
           BrowserOnlyMockPipe
         ],
         providers: [
-          { provide: EntityTypeService, useValue: getMockEmptyEntityTypeService() },
+          { provide: EntityTypeDataService, useValue: getMockEmptyEntityTypeService() },
           { provide: Router, useValue: new RouterStub() },
           MyDSpaceNewExternalDropdownComponent
         ],
@@ -140,7 +140,7 @@ describe('MyDSpaceNewExternalDropdownComponent test', () => {
           BrowserOnlyMockPipe,
         ],
         providers: [
-          { provide: EntityTypeService, useValue: getMockEntityTypeService() },
+          { provide: EntityTypeDataService, useValue: getMockEntityTypeService() },
           { provide: Router, useValue: new RouterStub() },
           MyDSpaceNewExternalDropdownComponent
         ],

src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts

@@ -4,7 +4,7 @@ import { Router } from '@angular/router';
 import { Observable, of as observableOf, Subscription } from 'rxjs';
 import { map, mergeMap, take } from 'rxjs/operators';
 
-import { EntityTypeService } from '../../../core/data/entity-type.service';
+import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
 import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
 import { hasValue } from '../../../shared/empty.util';
 import { RemoteData } from '../../../core/data/remote-data';
@@ -50,10 +50,10 @@ export class MyDSpaceNewExternalDropdownComponent implements OnInit, OnDestroy {
   /**
    * Initialize instance variables
    *
-   * @param {EntityTypeService} entityTypeService
+   * @param {EntityTypeDataService} entityTypeService
    * @param {Router} router
    */
-  constructor(private entityTypeService: EntityTypeService,
+  constructor(private entityTypeService: EntityTypeDataService,
               private router: Router) { }
 
   /**

src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts

@@ -7,14 +7,14 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { of as observableOf } from 'rxjs';
 import { createPaginatedList, createTestComponent } from '../../../shared/testing/utils.test';
 import { MyDSpaceNewSubmissionDropdownComponent } from './my-dspace-new-submission-dropdown.component';
-import { EntityTypeService } from '../../../core/data/entity-type.service';
+import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
 import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
 import { ResourceType } from '../../../core/shared/resource-type';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { PageInfo } from '../../../core/shared/page-info.model';
 import { BrowserOnlyMockPipe } from '../../../shared/testing/browser-only-mock.pipe';
 
-export function getMockEntityTypeService(): EntityTypeService {
+export function getMockEntityTypeService(): EntityTypeDataService {
   const type1: ItemType = {
     id: '1',
     label: 'Publication',
@@ -43,7 +43,7 @@ export function getMockEntityTypeService(): EntityTypeService {
   });
 }
 
-export function getMockEmptyEntityTypeService(): EntityTypeService {
+export function getMockEmptyEntityTypeService(): EntityTypeDataService {
   const pageInfo = { elementsPerPage: 20, totalElements: 1, totalPages: 1, currentPage: 0 } as PageInfo;
   const type1: ItemType = {
     id: '1',
@@ -92,7 +92,7 @@ describe('MyDSpaceNewSubmissionDropdownComponent test', () => {
           BrowserOnlyMockPipe,
         ],
         providers: [
-          { provide: EntityTypeService, useValue: getMockEmptyEntityTypeService() },
+          { provide: EntityTypeDataService, useValue: getMockEmptyEntityTypeService() },
           { provide: NgbModal, useValue: modalStub },
           MyDSpaceNewSubmissionDropdownComponent
         ],
@@ -144,7 +144,7 @@ describe('MyDSpaceNewSubmissionDropdownComponent test', () => {
           BrowserOnlyMockPipe,
         ],
         providers: [
-          { provide: EntityTypeService, useValue: getMockEntityTypeService() },
+          { provide: EntityTypeDataService, useValue: getMockEntityTypeService() },
           { provide: NgbModal, useValue: modalStub },
           MyDSpaceNewSubmissionDropdownComponent
         ],

src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts

@@ -4,7 +4,7 @@ import { Observable, of as observableOf, Subscription } from 'rxjs';
 import { map, mergeMap, take } from 'rxjs/operators';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 
-import { EntityTypeService } from '../../../core/data/entity-type.service';
+import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
 import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
 import { hasValue } from '../../../shared/empty.util';
 import { CreateItemParentSelectorComponent } from '../../../shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
@@ -51,10 +51,10 @@ export class MyDSpaceNewSubmissionDropdownComponent implements OnInit, OnDestroy
   /**
    * Initialize instance variables
    *
-   * @param {EntityTypeService} entityTypeService
+   * @param {EntityTypeDataService} entityTypeService
    * @param {NgbModal} modalService
    */
-  constructor(private entityTypeService: EntityTypeService,
+  constructor(private entityTypeService: EntityTypeDataService,
               private modalService: NgbModal) { }
 
   /**

src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts

@@ -25,7 +25,7 @@ import { CookieService } from '../../core/services/cookie.service';
 import { CookieServiceMock } from '../../shared/mocks/cookie.service.mock';
 import { HttpXsrfTokenExtractorMock } from '../../shared/mocks/http-xsrf-token-extractor.mock';
 import { getMockEntityTypeService } from './my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec';
-import { EntityTypeService } from '../../core/data/entity-type.service';
+import { EntityTypeDataService } from '../../core/data/entity-type-data.service';
 
 describe('MyDSpaceNewSubmissionComponent test', () => {
 
@@ -63,7 +63,7 @@ describe('MyDSpaceNewSubmissionComponent test', () => {
         { provide: HttpXsrfTokenExtractor, useValue: new HttpXsrfTokenExtractorMock('mock-token') },
         { provide: CookieService, useValue: new CookieServiceMock() },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
-        { provide: EntityTypeService, useValue: getMockEntityTypeService() },
+        { provide: EntityTypeDataService, useValue: getMockEntityTypeService() },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();

src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.spec.ts

@@ -11,7 +11,7 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { ResearcherProfile } from '../../core/profile/model/researcher-profile.model';
-import { ResearcherProfileService } from '../../core/profile/researcher-profile.service';
+import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service';
 import { VarDirective } from '../../shared/utils/var.directive';
 import { ProfilePageResearcherFormComponent } from './profile-page-researcher-form.component';
 import { ProfileClaimService } from '../profile-claim/profile-claim.service';
@@ -28,7 +28,7 @@ describe('ProfilePageResearcherFormComponent', () => {
   let user: EPerson;
   let profile: ResearcherProfile;
 
-  let researcherProfileService: jasmine.SpyObj<ResearcherProfileService>;
+  let researcherProfileService: jasmine.SpyObj<ResearcherProfileDataService>;
 
   let notificationsServiceStub: NotificationsServiceStub;
 
@@ -75,7 +75,7 @@ describe('ProfilePageResearcherFormComponent', () => {
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       providers: [
         NgbModal,
-        { provide: ResearcherProfileService, useValue: researcherProfileService },
+        { provide: ResearcherProfileDataService, useValue: researcherProfileService },
         { provide: NotificationsService, useValue: notificationsServiceStub },
         { provide: ProfileClaimService, useValue: profileClaimService },
         { provide: AuthService, useValue: authService }

src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts

@@ -12,7 +12,7 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
 import { AuthService } from '../../core/auth/auth.service';
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { ResearcherProfile } from '../../core/profile/model/researcher-profile.model';
-import { ResearcherProfileService } from '../../core/profile/researcher-profile.service';
+import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service';
 import { ProfileClaimService } from '../profile-claim/profile-claim.service';
 import { RemoteData } from '../../core/data/remote-data';
 import { isNotEmpty } from '../../shared/empty.util';
@@ -56,7 +56,7 @@ export class ProfilePageResearcherFormComponent implements OnInit {
    */
   researcherProfileItemId: string;
 
-  constructor(protected researcherProfileService: ResearcherProfileService,
+  constructor(protected researcherProfileService: ResearcherProfileDataService,
               protected profileClaimService: ProfileClaimService,
               protected translationService: TranslateService,
               protected notificationService: NotificationsService,

src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.spec.ts

@@ -9,7 +9,7 @@ import { AuthorizationDataService } from '../../../core/data/feature-authorizati
 import { NotificationsService } from '../../notifications/notifications.service';
 import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
 import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
-import { ResearcherProfileService } from '../../../core/profile/researcher-profile.service';
+import { ResearcherProfileDataService } from '../../../core/profile/researcher-profile-data.service';
 import { RouteService } from '../../../core/services/route.service';
 import { routeServiceStub } from '../../testing/route-service.stub';
 import { Item } from '../../../core/shared/item.model';
@@ -102,7 +102,7 @@ describe('PersonPageClaimButtonComponent', () => {
       providers: [
         { provide: AuthorizationDataService, useValue: authorizationDataService },
         { provide: NotificationsService, useValue: notificationsService },
-        { provide: ResearcherProfileService, useValue: researcherProfileService },
+        { provide: ResearcherProfileDataService, useValue: researcherProfileService },
         { provide: RouteService, useValue: routeServiceStub },
       ]
     })

src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.ts

@@ -7,7 +7,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { RouteService } from '../../../core/services/route.service';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { NotificationsService } from '../../notifications/notifications.service';
-import { ResearcherProfileService } from '../../../core/profile/researcher-profile.service';
+import { ResearcherProfileDataService } from '../../../core/profile/researcher-profile-data.service';
 import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { RemoteData } from '../../../core/data/remote-data';
@@ -36,7 +36,7 @@ export class PersonPageClaimButtonComponent implements OnInit {
               protected authorizationService: AuthorizationDataService,
               protected notificationsService: NotificationsService,
               protected translate: TranslateService,
-              protected researcherProfileService: ResearcherProfileService) {
+              protected researcherProfileService: ResearcherProfileDataService) {
   }
 
   ngOnInit(): void {

src/app/shared/entity-dropdown/entity-dropdown.component.spec.ts

@@ -4,7 +4,7 @@ import { getTestScheduler } from 'jasmine-marbles';
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 import { ItemType } from '../../core/shared/item-relationships/item-type.model';
 import { ChangeDetectorRef, NO_ERRORS_SCHEMA, Pipe, PipeTransform } from '@angular/core';
-import { EntityTypeService } from '../../core/data/entity-type.service';
+import { EntityTypeDataService } from '../../core/data/entity-type-data.service';
 import { TestScheduler } from 'rxjs/testing';
 import { By } from '@angular/platform-browser';
 import { createPaginatedList } from '../testing/utils.test';
@@ -75,7 +75,7 @@ describe('EntityDropdownComponent', () => {
       imports: [],
       declarations: [EntityDropdownComponent, MockTranslatePipe],
       providers: [
-        { provide: EntityTypeService, useValue: entityTypeServiceMock },
+        { provide: EntityTypeDataService, useValue: entityTypeServiceMock },
         ChangeDetectorRef
       ],
       schemas: [NO_ERRORS_SCHEMA]

src/app/shared/entity-dropdown/entity-dropdown.component.ts

@@ -14,7 +14,7 @@ import { hasValue } from '../empty.util';
 import { reduce, startWith, switchMap } from 'rxjs/operators';
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginatedList } from '../../core/data/paginated-list.model';
-import { EntityTypeService } from '../../core/data/entity-type.service';
+import { EntityTypeDataService } from '../../core/data/entity-type-data.service';
 import { ItemType } from '../../core/shared/item-relationships/item-type.model';
 import { getFirstSucceededRemoteWithNotEmptyData } from '../../core/shared/operators';
 import { FindListOptions } from '../../core/data/find-list-options.model';
@@ -83,12 +83,12 @@ export class EntityDropdownComponent implements OnInit, OnDestroy {
    * Initialize instance variables
    *
    * @param {ChangeDetectorRef} changeDetectorRef
-   * @param {EntityTypeService} entityTypeService
+   * @param {EntityTypeDataService} entityTypeService
    * @param {ElementRef} el
    */
   constructor(
     private changeDetectorRef: ChangeDetectorRef,
-    private entityTypeService: EntityTypeService,
+    private entityTypeService: EntityTypeDataService,
     private el: ElementRef
   ) { }
 

src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts

@@ -66,7 +66,7 @@ import { DsDynamicFormGroupComponent } from './models/form-group/dynamic-form-gr
 import { DsDynamicRelationGroupComponent } from './models/relation-group/dynamic-relation-group.components';
 import { DsDatePickerInlineComponent } from './models/date-picker-inline/dynamic-date-picker-inline.component';
 import { DsDynamicTypeBindRelationService } from './ds-dynamic-type-bind-relation.service';
-import { RelationshipService } from '../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
 import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service';
 import { ItemDataService } from '../../../../core/data/item-data.service';
 import { Store } from '@ngrx/store';
@@ -215,11 +215,11 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
         DsDynamicFormControlContainerComponent,
         DynamicFormService,
         { provide: DsDynamicTypeBindRelationService, useValue: getMockDsDynamicTypeBindRelationService() },
-        { provide: RelationshipService, useValue: {} },
+        { provide: RelationshipDataService, useValue: {} },
         { provide: SelectableListService, useValue: {} },
         { provide: ItemDataService, useValue: {} },
         { provide: Store, useValue: {} },
-        { provide: RelationshipService, useValue: {} },
+        { provide: RelationshipDataService, useValue: {} },
         { provide: SelectableListService, useValue: {} },
         { provide: FormService, useValue: {} },
         { provide: FormBuilderService, useValue: {} },

src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts

@@ -85,7 +85,7 @@ import { DsDynamicTypeBindRelationService } from './ds-dynamic-type-bind-relatio
 import { SearchResult } from '../../../search/models/search-result.model';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
-import { RelationshipService } from '../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
 import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service';
 import { DsDynamicDisabledComponent } from './models/disabled/dynamic-disabled.component';
 import { DYNAMIC_FORM_CONTROL_TYPE_DISABLED } from './models/disabled/dynamic-disabled.model';
@@ -244,7 +244,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
     protected translateService: TranslateService,
     protected relationService: DynamicFormRelationService,
     private modalService: NgbModal,
-    private relationshipService: RelationshipService,
+    private relationshipService: RelationshipDataService,
     private selectableListService: SelectableListService,
     private itemService: ItemDataService,
     private zone: NgZone,

src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts

@@ -6,8 +6,8 @@ import { of as observableOf, Subscription } from 'rxjs';
 import { DsDynamicLookupRelationModalComponent } from './dynamic-lookup-relation-modal.component';
 import { NgbActiveModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
-import { RelationshipService } from '../../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
-import { RelationshipTypeService } from '../../../../../core/data/relationship-type.service';
+import { RelationshipTypeDataService } from '../../../../../core/data/relationship-type-data.service';
 import { Store } from '@ngrx/store';
 import { Item } from '../../../../../core/shared/item.model';
 import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
@@ -18,7 +18,7 @@ import { PaginatedSearchOptions } from '../../../../search/models/paginated-sear
 import { ExternalSource } from '../../../../../core/shared/external-source.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
 import { createPaginatedList } from '../../../../testing/utils.test';
-import { ExternalSourceService } from '../../../../../core/data/external-source.service';
+import { ExternalSourceDataService } from '../../../../../core/data/external-source-data.service';
 import { LookupRelationService } from '../../../../../core/data/lookup-relation.service';
 import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
 import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
@@ -111,15 +111,15 @@ describe('DsDynamicLookupRelationModalComponent', () => {
             paginatedSearchOptions: observableOf(pSearchOptions)
           }
         },
-        { provide: ExternalSourceService, useValue: externalSourceService },
+        { provide: ExternalSourceDataService, useValue: externalSourceService },
         { provide: LookupRelationService, useValue: lookupRelationService },
         {
           provide: SelectableListService, useValue: selectableListService
         },
         {
-          provide: RelationshipService, useValue: { getNameVariant: () => observableOf(nameVariant) }
+          provide: RelationshipDataService, useValue: { getNameVariant: () => observableOf(nameVariant) }
         },
-        { provide: RelationshipTypeService, useValue: {} },
+        { provide: RelationshipTypeDataService, useValue: {} },
         { provide: RemoteDataBuildService, useValue: rdbService },
         {
           provide: Store, useValue: {

src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts

@@ -16,14 +16,14 @@ import {
   RemoveRelationshipAction,
   UpdateRelationshipNameVariantAction,
 } from './relationship.actions';
-import { RelationshipService } from '../../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
-import { RelationshipTypeService } from '../../../../../core/data/relationship-type.service';
+import { RelationshipTypeDataService } from '../../../../../core/data/relationship-type-data.service';
 import { Store } from '@ngrx/store';
 import { AppState } from '../../../../../app.reducer';
 import { Context } from '../../../../../core/shared/context.model';
 import { LookupRelationService } from '../../../../../core/data/lookup-relation.service';
 import { ExternalSource } from '../../../../../core/shared/external-source.model';
-import { ExternalSourceService } from '../../../../../core/data/external-source.service';
+import { ExternalSourceDataService } from '../../../../../core/data/external-source-data.service';
 import { Router } from '@angular/router';
 import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
 import { getAllSucceededRemoteDataPayload } from '../../../../../core/shared/operators';
@@ -156,9 +156,9 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
   constructor(
     public modal: NgbActiveModal,
     private selectableListService: SelectableListService,
-    private relationshipService: RelationshipService,
+    private relationshipService: RelationshipDataService,
-    private relationshipTypeService: RelationshipTypeService,
+    private relationshipTypeService: RelationshipTypeDataService,
-    private externalSourceService: ExternalSourceService,
+    private externalSourceService: ExternalSourceDataService,
     private lookupRelationService: LookupRelationService,
     private searchConfigService: SearchConfigurationService,
     private rdbService: RemoteDataBuildService,

src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts

@@ -12,7 +12,7 @@ import {
   createPendingRemoteDataObject$,
   createSuccessfulRemoteDataObject$
 } from '../../../../../remote-data.utils';
-import { ExternalSourceService } from '../../../../../../core/data/external-source.service';
+import { ExternalSourceDataService } from '../../../../../../core/data/external-source-data.service';
 import { ExternalSource } from '../../../../../../core/shared/external-source.model';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { By } from '@angular/platform-browser';
@@ -107,7 +107,7 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
             paginatedSearchOptions: observableOf(pSearchOptions)
           }
         },
-        { provide: ExternalSourceService, useValue: externalSourceService },
+        { provide: ExternalSourceDataService, useValue: externalSourceService },
         { provide: SelectableListService, useValue: selectableListService },
         { provide: PaginationService, useValue: new PaginationServiceStub() }
       ],

src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts

@@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angu
 import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-page.component';
 import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
 import { Router } from '@angular/router';
-import { ExternalSourceService } from '../../../../../../core/data/external-source.service';
+import { ExternalSourceDataService } from '../../../../../../core/data/external-source-data.service';
 import { RemoteData } from '../../../../../../core/data/remote-data';
 import { PaginatedList } from '../../../../../../core/data/paginated-list.model';
 import { ExternalSourceEntry } from '../../../../../../core/shared/external-source-entry.model';
@@ -125,7 +125,7 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit
 
   constructor(private router: Router,
               public searchConfigService: SearchConfigurationService,
-              private externalSourceService: ExternalSourceService,
+              private externalSourceService: ExternalSourceDataService,
               private modalService: NgbModal,
               private selectableListService: SelectableListService,
               private paginationService: PaginationService

src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.spec.ts

@@ -6,8 +6,8 @@ import { RelationshipEffects } from './relationship.effects';
 import { AddRelationshipAction, RelationshipActionTypes, RemoveRelationshipAction } from './relationship.actions';
 import { Item } from '../../../../../core/shared/item.model';
 import { MetadataValue } from '../../../../../core/shared/metadata.models';
-import { RelationshipTypeService } from '../../../../../core/data/relationship-type.service';
+import { RelationshipTypeDataService } from '../../../../../core/data/relationship-type-data.service';
-import { RelationshipService } from '../../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
 import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
 import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model';
@@ -116,8 +116,8 @@ describe('RelationshipEffects', () => {
       providers: [
         RelationshipEffects,
         provideMockActions(() => actions),
-        { provide: RelationshipTypeService, useValue: mockRelationshipTypeService },
+        { provide: RelationshipTypeDataService, useValue: mockRelationshipTypeService },
-        { provide: RelationshipService, useValue: mockRelationshipService },
+        { provide: RelationshipDataService, useValue: mockRelationshipService },
         {
           provide: SubmissionObjectDataService, useValue: {
             findById: () => createSuccessfulRemoteDataObject$(new WorkspaceItem())

src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.ts

@@ -2,7 +2,7 @@ import { Inject, Injectable } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { filter, map, mergeMap, switchMap, take } from 'rxjs/operators';
 import { BehaviorSubject, Observable } from 'rxjs';
-import { RelationshipService } from '../../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
 import {
   getRemoteDataPayload,
   getFirstSucceededRemoteData, DEBOUNCE_TIME_OPERATOR
@@ -18,7 +18,7 @@ import { Item } from '../../../../../core/shared/item.model';
 import { hasNoValue, hasValue, hasValueOperator } from '../../../../empty.util';
 import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model';
 import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model';
-import { RelationshipTypeService } from '../../../../../core/data/relationship-type.service';
+import { RelationshipTypeDataService } from '../../../../../core/data/relationship-type-data.service';
 import { SubmissionObjectDataService } from '../../../../../core/submission/submission-object-data.service';
 import { SaveSubmissionSectionFormSuccessAction } from '../../../../../submission/objects/submission-objects.actions';
 import { SubmissionObject } from '../../../../../core/submission/models/submission-object.model';
@@ -150,8 +150,8 @@ export class RelationshipEffects {
     ));
 
   constructor(private actions$: Actions,
-              private relationshipService: RelationshipService,
+              private relationshipService: RelationshipDataService,
-              private relationshipTypeService: RelationshipTypeService,
+              private relationshipTypeService: RelationshipTypeDataService,
               private submissionObjectService: SubmissionObjectDataService,
               private store: Store<SubmissionState>,
               private objectCache: ObjectCacheService,

src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts

@@ -17,7 +17,7 @@ import { Item } from '../../../../../../core/shared/item.model';
 import { LookupRelationService } from '../../../../../../core/data/lookup-relation.service';
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
-import { RelationshipService } from '../../../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../../../core/data/relationship-data.service';
 import { relatedRelationships } from '../../../../../testing/related-relationships.mock';
 import { RelationshipType } from '../../../../../../core/shared/item-relationships/relationship-type.model';
 import { SearchObjects } from '../../../../../search/models/search-objects.model';
@@ -106,7 +106,7 @@ describe('DsDynamicLookupRelationSearchTabComponent', () => {
         },
         { provide: LookupRelationService, useValue: lookupRelationService },
         { provide: PaginationService, useValue: new PaginationServiceStub() },
-        { provide: RelationshipService, useValue: relationshipService }
+        { provide: RelationshipDataService, useValue: relationshipService }
 
       ],
       schemas: [NO_ERRORS_SCHEMA]

src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts

@@ -17,7 +17,7 @@ import { CollectionElementLinkType } from '../../../../../object-collection/coll
 import { Context } from '../../../../../../core/shared/context.model';
 import { LookupRelationService } from '../../../../../../core/data/lookup-relation.service';
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
-import { RelationshipService } from '../../../../../../core/data/relationship.service';
+import { RelationshipDataService } from '../../../../../../core/data/relationship-data.service';
 import { RelationshipType } from '../../../../../../core/shared/item-relationships/relationship-type.model';
 
 import { Relationship } from '../../../../../../core/shared/item-relationships/relationship.model';
@@ -151,7 +151,7 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
     private selectableListService: SelectableListService,
     public searchConfigService: SearchConfigurationService,
     public lookupRelationService: LookupRelationService,
-    private relationshipService: RelationshipService,
+    private relationshipService: RelationshipDataService,
     private paginationService: PaginationService
   ) {
   }

src/app/shared/mocks/external-source.service.mock.ts

@@ -1,4 +1,4 @@
-import { ExternalSourceService } from '../../core/data/external-source.service';
+import { ExternalSourceDataService } from '../../core/data/external-source-data.service';
 import { ExternalSource } from '../../core/shared/external-source.model';
 import { ResourceType } from '../../core/shared/resource-type';
 
@@ -59,7 +59,7 @@ export const externalSourceMyStaffDb: ExternalSource = {
 /**
  * Mock for [[ExternalSourceService]]
  */
-export function getMockExternalSourceService(): ExternalSourceService {
+export function getMockExternalSourceService(): ExternalSourceDataService {
   return jasmine.createSpyObj('ExternalSourceService', {
     findAll: jasmine.createSpy('findAll'),
     searchBy: jasmine.createSpy('searchBy'),

src/app/shared/mocks/mock-resource-policy-service.ts

@@ -1,6 +1,6 @@
-import { ResourcePolicyService } from '../../core/resource-policy/resource-policy.service';
+import { ResourcePolicyDataService } from '../../core/resource-policy/resource-policy-data.service';
 
-export function getMockResourcePolicyService(): ResourcePolicyService {
+export function getMockResourcePolicyService(): ResourcePolicyDataService {
   return jasmine.createSpyObj('resourcePolicyService', {
     searchByResource: jasmine.createSpy('searchByResource'),
     create: jasmine.createSpy('create'),

src/app/shared/mocks/section-accesses-config.service.mock.ts

@@ -1,4 +1,4 @@
-import { SubmissionFormsConfigService } from '../../core/config/submission-forms-config.service';
+import { SubmissionFormsConfigDataService } from '../../core/config/submission-forms-config-data.service';
 import { SubmissionFormsModel } from '../../core/config/models/config-submission-forms.model';
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 
@@ -73,14 +73,14 @@ const configResNotChangeDiscoverable = Object.assign(new SubmissionFormsModel(),
   }
 });
 
-export function getSubmissionAccessesConfigService(): SubmissionFormsConfigService {
+export function getSubmissionAccessesConfigService(): SubmissionFormsConfigDataService {
   return jasmine.createSpyObj('SubmissionAccessesConfigService', {
     findByHref: createSuccessfulRemoteDataObject$(configRes),
   });
 }
 
 
-export function getSubmissionAccessesConfigNotChangeDiscoverableService(): SubmissionFormsConfigService {
+export function getSubmissionAccessesConfigNotChangeDiscoverableService(): SubmissionFormsConfigDataService {
   return jasmine.createSpyObj('SubmissionAccessesConfigService', {
     findByHref: createSuccessfulRemoteDataObject$(configResNotChangeDiscoverable),
   });

src/app/shared/mocks/section-upload.service.mock.ts

@@ -1,9 +1,9 @@
-import { SubmissionFormsConfigService } from '../../core/config/submission-forms-config.service';
+import { SubmissionFormsConfigDataService } from '../../core/config/submission-forms-config-data.service';
 
 /**
  * Mock for [[SubmissionFormsConfigService]]
  */
-export function getMockSectionUploadService(): SubmissionFormsConfigService {
+export function getMockSectionUploadService(): SubmissionFormsConfigDataService {
   return jasmine.createSpyObj('SectionUploadService', {
     getUploadedFileList: jasmine.createSpy('getUploadedFileList'),
     getFileData: jasmine.createSpy('getFileData'),

src/app/shared/resource-policies/create/resource-policy-create.component.spec.ts

@@ -17,7 +17,7 @@ import { ResourcePolicyCreateComponent } from './resource-policy-create.componen
 import { LinkService } from '../../../core/cache/builders/link.service';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
-import { ResourcePolicyService } from '../../../core/resource-policy/resource-policy.service';
+import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
 import { getMockResourcePolicyService } from '../../mocks/mock-resource-policy-service';
 import { getMockLinkService } from '../../mocks/link-service.mock';
 import { RouterStub } from '../../testing/router.stub';
@@ -100,7 +100,7 @@ describe('ResourcePolicyCreateComponent test suite', () => {
         { provide: LinkService, useValue: linkService },
         { provide: ActivatedRoute, useValue: routeStub },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
-        { provide: ResourcePolicyService, useValue: resourcePolicyService },
+        { provide: ResourcePolicyDataService, useValue: resourcePolicyService },
         { provide: Router, useValue: routerStub },
         ResourcePolicyCreateComponent,
         ChangeDetectorRef,

src/app/shared/resource-policies/create/resource-policy-create.component.ts

@@ -6,7 +6,7 @@ import { map, take } from 'rxjs/operators';
 import { TranslateService } from '@ngx-translate/core';
 
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { ResourcePolicyService } from '../../../core/resource-policy/resource-policy.service';
+import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
@@ -42,7 +42,7 @@ export class ResourcePolicyCreateComponent implements OnInit {
    *
    * @param {DSONameService} dsoNameService
    * @param {NotificationsService} notificationsService
-   * @param {ResourcePolicyService} resourcePolicyService
+   * @param {ResourcePolicyDataService} resourcePolicyService
    * @param {ActivatedRoute} route
    * @param {Router} router
    * @param {TranslateService} translate
@@ -50,7 +50,7 @@ export class ResourcePolicyCreateComponent implements OnInit {
   constructor(
     private dsoNameService: DSONameService,
     private notificationsService: NotificationsService,
-    private resourcePolicyService: ResourcePolicyService,
+    private resourcePolicyService: ResourcePolicyDataService,
     private route: ActivatedRoute,
     private router: Router,
     private translate: TranslateService) {

src/app/shared/resource-policies/edit/resource-policy-edit.component.spec.ts

@@ -12,7 +12,7 @@ import { createTestComponent } from '../../testing/utils.test';
 import { LinkService } from '../../../core/cache/builders/link.service';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
-import { ResourcePolicyService } from '../../../core/resource-policy/resource-policy.service';
+import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
 import { getMockResourcePolicyService } from '../../mocks/mock-resource-policy-service';
 import { getMockLinkService } from '../../mocks/link-service.mock';
 import { RouterStub } from '../../testing/router.stub';
@@ -82,7 +82,7 @@ describe('ResourcePolicyEditComponent test suite', () => {
         { provide: LinkService, useValue: linkService },
         { provide: ActivatedRoute, useValue: routeStub },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
-        { provide: ResourcePolicyService, useValue: resourcePolicyService },
+        { provide: ResourcePolicyDataService, useValue: resourcePolicyService },
         { provide: Router, useValue: routerStub },
         ResourcePolicyEditComponent,
         ChangeDetectorRef,

src/app/shared/resource-policies/edit/resource-policy-edit.component.ts

@@ -5,7 +5,7 @@ import { BehaviorSubject, Observable, of, combineLatest as observableCombineLate
 import { map, take } from 'rxjs/operators';
 import { TranslateService } from '@ngx-translate/core';
 
-import { ResourcePolicyService } from '../../../core/resource-policy/resource-policy.service';
+import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
@@ -35,14 +35,14 @@ export class ResourcePolicyEditComponent implements OnInit {
    * Initialize instance variables
    *
    * @param {NotificationsService} notificationsService
-   * @param {ResourcePolicyService} resourcePolicyService
+   * @param {ResourcePolicyDataService} resourcePolicyService
    * @param {ActivatedRoute} route
    * @param {Router} router
    * @param {TranslateService} translate
    */
   constructor(
     private notificationsService: NotificationsService,
-    private resourcePolicyService: ResourcePolicyService,
+    private resourcePolicyService: ResourcePolicyDataService,
     private route: ActivatedRoute,
     private router: Router,
     private translate: TranslateService) {

src/app/shared/resource-policies/resolvers/resource-policy.resolver.ts

@@ -6,7 +6,7 @@ import { Observable } from 'rxjs';
 import { isEmpty } from '../../empty.util';
 import { RemoteData } from '../../../core/data/remote-data';
 import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
-import { ResourcePolicyService } from '../../../core/resource-policy/resource-policy.service';
+import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
 import { followLink } from '../../utils/follow-link-config.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 
@@ -16,7 +16,7 @@ import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 @Injectable()
 export class ResourcePolicyResolver implements Resolve<RemoteData<ResourcePolicy>> {
 
-  constructor(private resourcePolicyService: ResourcePolicyService, private router: Router) {
+  constructor(private resourcePolicyService: ResourcePolicyDataService, private router: Router) {
   }
 
   /**

src/app/shared/resource-policies/resource-policies.component.spec.ts

@@ -20,7 +20,7 @@ import { createPaginatedList, createTestComponent } from '../testing/utils.test'
 import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { NotificationsService } from '../notifications/notifications.service';
 import { NotificationsServiceStub } from '../testing/notifications-service.stub';
-import { ResourcePolicyService } from '../../core/resource-policy/resource-policy.service';
+import { ResourcePolicyDataService } from '../../core/resource-policy/resource-policy-data.service';
 import { getMockResourcePolicyService } from '../mocks/mock-resource-policy-service';
 import { GroupDataService } from '../../core/eperson/group-data.service';
 import { RequestService } from '../../core/data/request.service';
@@ -206,7 +206,7 @@ describe('ResourcePoliciesComponent test suite', () => {
         { provide: EPersonDataService, useValue: epersonService },
         { provide: GroupDataService, useValue: groupService },
         { provide: NotificationsService, useValue: notificationsServiceStub },
-        { provide: ResourcePolicyService, useValue: resourcePolicyService },
+        { provide: ResourcePolicyDataService, useValue: resourcePolicyService },
         { provide: RequestService, useValue: getMockRequestService() },
         { provide: Router, useValue: routerStub },
         ChangeDetectorRef,

src/app/shared/resource-policies/resource-policies.component.ts

@@ -14,7 +14,7 @@ import {
 } from 'rxjs/operators';
 import { TranslateService } from '@ngx-translate/core';
 
-import { ResourcePolicyService } from '../../core/resource-policy/resource-policy.service';
+import { ResourcePolicyDataService } from '../../core/resource-policy/resource-policy-data.service';
 import {
   getFirstSucceededRemoteDataPayload,
   getFirstSucceededRemoteDataWithNotEmptyPayload,
@@ -102,7 +102,7 @@ export class ResourcePoliciesComponent implements OnInit, OnDestroy {
    * @param {GroupDataService} groupService
    * @param {NotificationsService} notificationsService
    * @param {RequestService} requestService
-   * @param {ResourcePolicyService} resourcePolicyService
+   * @param {ResourcePolicyDataService} resourcePolicyService
    * @param {ActivatedRoute} route
    * @param {Router} router
    * @param {TranslateService} translate
@@ -114,7 +114,7 @@ export class ResourcePoliciesComponent implements OnInit, OnDestroy {
     private groupService: GroupDataService,
     private notificationsService: NotificationsService,
     private requestService: RequestService,
-    private resourcePolicyService: ResourcePolicyService,
+    private resourcePolicyService: ResourcePolicyDataService,
     private route: ActivatedRoute,
     private router: Router,
     private translate: TranslateService

src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.spec.ts

@@ -3,7 +3,7 @@ import { CollectionStatisticsPageComponent } from './collection-statistics-page.
 import { StatisticsTableComponent } from '../statistics-table/statistics-table.component';
 import { TranslateModule } from '@ngx-translate/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { UsageReportService } from '../../core/statistics/usage-report-data.service';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
 import { of as observableOf } from 'rxjs';
 import { Collection } from '../../core/shared/collection.model';
 import { DebugElement } from '@angular/core';
@@ -74,7 +74,7 @@ describe('CollectionStatisticsPageComponent', () => {
       providers: [
         { provide: ActivatedRoute, useValue: activatedRoute },
         { provide: Router, useValue: router },
-        { provide: UsageReportService, useValue: usageReportService },
+        { provide: UsageReportDataService, useValue: usageReportService },
         { provide: DSpaceObjectDataService, useValue: {} },
         { provide: DSONameService, useValue: nameService },
         { provide: AuthService, useValue: authService },

src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts

@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { StatisticsPageComponent } from '../statistics-page/statistics-page.component';
-import { UsageReportService } from '../../core/statistics/usage-report-data.service';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
 import { ActivatedRoute , Router} from '@angular/router';
 import { Collection } from '../../core/shared/collection.model';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
@@ -29,7 +29,7 @@ export class CollectionStatisticsPageComponent extends StatisticsPageComponent<C
   constructor(
     protected route: ActivatedRoute,
     protected router: Router,
-    protected usageReportService: UsageReportService,
+    protected usageReportService: UsageReportDataService,
     protected nameService: DSONameService,
     protected authService: AuthService
   ) {

src/app/statistics-page/community-statistics-page/community-statistics-page.component.spec.ts

@@ -3,7 +3,7 @@ import { CommunityStatisticsPageComponent } from './community-statistics-page.co
 import { StatisticsTableComponent } from '../statistics-table/statistics-table.component';
 import { TranslateModule } from '@ngx-translate/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { UsageReportService } from '../../core/statistics/usage-report-data.service';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
 import { of as observableOf } from 'rxjs';
 import { Community } from '../../core/shared/community.model';
 import { DebugElement } from '@angular/core';
@@ -74,7 +74,7 @@ describe('CommunityStatisticsPageComponent', () => {
       providers: [
         { provide: ActivatedRoute, useValue: activatedRoute },
         { provide: Router, useValue: router },
-        { provide: UsageReportService, useValue: usageReportService },
+        { provide: UsageReportDataService, useValue: usageReportService },
         { provide: DSpaceObjectDataService, useValue: {} },
         { provide: DSONameService, useValue: nameService },
         { provide: AuthService, useValue: authService },

src/app/statistics-page/community-statistics-page/community-statistics-page.component.ts

@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { StatisticsPageComponent } from '../statistics-page/statistics-page.component';
-import { UsageReportService } from '../../core/statistics/usage-report-data.service';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Community } from '../../core/shared/community.model';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
@@ -29,7 +29,7 @@ export class CommunityStatisticsPageComponent extends StatisticsPageComponent<Co
   constructor(
     protected route: ActivatedRoute,
     protected router: Router,
-    protected usageReportService: UsageReportService,
+    protected usageReportService: UsageReportDataService,
     protected nameService: DSONameService,
     protected authService: AuthService,
   ) {

src/app/statistics-page/item-statistics-page/item-statistics-page.component.spec.ts

@@ -3,7 +3,7 @@ import { ItemStatisticsPageComponent } from './item-statistics-page.component';
 import { StatisticsTableComponent } from '../statistics-table/statistics-table.component';
 import { TranslateModule } from '@ngx-translate/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { UsageReportService } from '../../core/statistics/usage-report-data.service';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
 import { of as observableOf } from 'rxjs';
 import { Item } from '../../core/shared/item.model';
 import { DebugElement } from '@angular/core';
@@ -74,7 +74,7 @@ describe('ItemStatisticsPageComponent', () => {
       providers: [
         { provide: ActivatedRoute, useValue: activatedRoute },
         { provide: Router, useValue: router },
-        { provide: UsageReportService, useValue: usageReportService },
+        { provide: UsageReportDataService, useValue: usageReportService },
         { provide: DSpaceObjectDataService, useValue: {} },
         { provide: DSONameService, useValue: nameService },
         { provide: AuthService, useValue: authService },

src/app/statistics-page/item-statistics-page/item-statistics-page.component.ts

@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { StatisticsPageComponent } from '../statistics-page/statistics-page.component';
-import { UsageReportService } from '../../core/statistics/usage-report-data.service';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Item } from '../../core/shared/item.model';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
@@ -30,7 +30,7 @@ export class ItemStatisticsPageComponent extends StatisticsPageComponent<Item> {
   constructor(
     protected route: ActivatedRoute,
     protected router: Router,
-    protected usageReportService: UsageReportService,
+    protected usageReportService: UsageReportDataService,
     protected nameService: DSONameService,
     protected authService: AuthService
   ) {

src/app/statistics-page/site-statistics-page/site-statistics-page.component.spec.ts

@@ -3,7 +3,7 @@ import { SiteStatisticsPageComponent } from './site-statistics-page.component';
 import { StatisticsTableComponent } from '../statistics-table/statistics-table.component';
 import { TranslateModule } from '@ngx-translate/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { UsageReportService } from '../../core/statistics/usage-report-data.service';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
 import { of as observableOf } from 'rxjs';
 import { Site } from '../../core/shared/site.model';
 import { DebugElement } from '@angular/core';
@@ -74,7 +74,7 @@ describe('SiteStatisticsPageComponent', () => {
       providers: [
         { provide: ActivatedRoute, useValue: activatedRoute },
         { provide: Router, useValue: router },
-        { provide: UsageReportService, useValue: usageReportService },
+        { provide: UsageReportDataService, useValue: usageReportService },
         { provide: DSpaceObjectDataService, useValue: {} },
         { provide: DSONameService, useValue: nameService },
         { provide: SiteDataService, useValue: siteService },

src/app/statistics-page/site-statistics-page/site-statistics-page.component.ts

@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { StatisticsPageComponent } from '../statistics-page/statistics-page.component';
 import { SiteDataService } from '../../core/data/site-data.service';
-import { UsageReportService } from '../../core/statistics/usage-report-data.service';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Site } from '../../core/shared/site.model';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
@@ -28,7 +28,7 @@ export class SiteStatisticsPageComponent extends StatisticsPageComponent<Site> {
   constructor(
     protected route: ActivatedRoute,
     protected router: Router,
-    protected usageReportService: UsageReportService,
+    protected usageReportService: UsageReportDataService,
     protected nameService: DSONameService,
     protected siteService: SiteDataService,
     protected authService: AuthService,

src/app/statistics-page/statistics-page.module.ts

@@ -4,7 +4,7 @@ import { CommonModule } from '@angular/common';
 import { CoreModule } from '../core/core.module';
 import { SharedModule } from '../shared/shared.module';
 import { StatisticsModule } from '../statistics/statistics.module';
-import { UsageReportService } from '../core/statistics/usage-report-data.service';
+import { UsageReportDataService } from '../core/statistics/usage-report-data.service';
 import { SiteStatisticsPageComponent } from './site-statistics-page/site-statistics-page.component';
 import { StatisticsTableComponent } from './statistics-table/statistics-table.component';
 import { ItemStatisticsPageComponent } from './item-statistics-page/item-statistics-page.component';
@@ -36,7 +36,7 @@ const components = [
   ],
   declarations: components,
   providers: [
-    UsageReportService,
+    UsageReportDataService,
   ],
   exports: components
 })

src/app/statistics-page/statistics-page/statistics-page.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { combineLatest, Observable } from 'rxjs';
-import { UsageReportService } from '../../core/statistics/usage-report-data.service';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
 import { map, switchMap } from 'rxjs/operators';
 import { UsageReport } from '../../core/statistics/models/usage-report.model';
 import { RemoteData } from '../../core/data/remote-data';
@@ -43,7 +43,7 @@ export abstract class StatisticsPageComponent<T extends DSpaceObject> implements
   constructor(
     protected route: ActivatedRoute,
     protected router: Router,
-    protected usageReportService: UsageReportService,
+    protected usageReportService: UsageReportDataService,
     protected nameService: DSONameService,
     protected authService: AuthService,
   ) {

src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.spec.ts

@@ -6,7 +6,7 @@ import {
   SourceElement,
   SubmissionImportExternalSearchbarComponent
 } from './submission-import-external-searchbar.component';
-import { ExternalSourceService } from '../../../core/data/external-source.service';
+import { ExternalSourceDataService } from '../../../core/data/external-source-data.service';
 import { createTestComponent } from '../../../shared/testing/utils.test';
 import {
   externalSourceCiencia,
@@ -48,7 +48,7 @@ describe('SubmissionImportExternalSearchbarComponent test suite', () => {
         TestComponent,
       ],
       providers: [
-        { provide: ExternalSourceService, useValue: mockExternalSourceService },
+        { provide: ExternalSourceDataService, useValue: mockExternalSourceService },
         ChangeDetectorRef,
         { provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
         SubmissionImportExternalSearchbarComponent

src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts

@@ -4,7 +4,7 @@ import { Observable, of as observableOf, Subscription } from 'rxjs';
 import { catchError, tap } from 'rxjs/operators';
 
 import { RequestParam } from '../../../core/cache/models/request-param.model';
-import { ExternalSourceService } from '../../../core/data/external-source.service';
+import { ExternalSourceDataService } from '../../../core/data/external-source-data.service';
 import { ExternalSource } from '../../../core/shared/external-source.model';
 import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
@@ -86,12 +86,12 @@ export class SubmissionImportExternalSearchbarComponent implements OnInit, OnDes
 
   /**
    * Initialize the component variables.
-   * @param {ExternalSourceService} externalService
+   * @param {ExternalSourceDataService} externalService
    * @param {ChangeDetectorRef} cdr
    * @param {HostWindowService} windowService
    */
   constructor(
-    private externalService: ExternalSourceService,
+    private externalService: ExternalSourceDataService,
     private cdr: ChangeDetectorRef,
     protected windowService: HostWindowService
   ) {

src/app/submission/import-external/submission-import-external.component.spec.ts

@@ -9,7 +9,7 @@ import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
 import { SubmissionImportExternalComponent } from './submission-import-external.component';
-import { ExternalSourceService } from '../../core/data/external-source.service';
+import { ExternalSourceDataService } from '../../core/data/external-source-data.service';
 import { getMockExternalSourceService } from '../../shared/mocks/external-source.service.mock';
 import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
 import { RouteService } from '../../core/services/route.service';
@@ -52,7 +52,7 @@ describe('SubmissionImportExternalComponent test suite', () => {
         VarDirective
       ],
       providers: [
-        { provide: ExternalSourceService, useValue: mockExternalSourceService },
+        { provide: ExternalSourceDataService, useValue: mockExternalSourceService },
         { provide: SearchConfigurationService, useValue: searchConfigServiceStub },
         { provide: RouteService, useValue: routeServiceStub },
         { provide: Router, useValue: new RouterStub() },

src/app/submission/import-external/submission-import-external.component.ts

@@ -5,7 +5,7 @@ import { BehaviorSubject, combineLatest, Subscription } from 'rxjs';
 import { filter, mergeMap, switchMap, take, tap } from 'rxjs/operators';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 
-import { ExternalSourceService } from '../../core/data/external-source.service';
+import { ExternalSourceDataService } from '../../core/data/external-source-data.service';
 import { ExternalSourceData } from './import-external-searchbar/submission-import-external-searchbar.component';
 import { RemoteData } from '../../core/data/remote-data';
 import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model';
@@ -93,14 +93,14 @@ export class SubmissionImportExternalComponent implements OnInit, OnDestroy {
   /**
    * Initialize the component variables.
    * @param {SearchConfigurationService} searchConfigService
-   * @param {ExternalSourceService} externalService
+   * @param {ExternalSourceDataService} externalService
    * @param {RouteService} routeService
    * @param {Router} router
    * @param {NgbModal} modalService
    */
   constructor(
     public searchConfigService: SearchConfigurationService,
-    private externalService: ExternalSourceService,
+    private externalService: ExternalSourceDataService,
     private routeService: RouteService,
     private router: Router,
     private modalService: NgbModal,

src/app/submission/sections/accesses/section-accesses.component.spec.ts

@@ -7,7 +7,7 @@ import { SectionsServiceStub } from '../../../shared/testing/sections-service.st
 
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
-import { SubmissionAccessesConfigService } from '../../../core/config/submission-accesses-config.service';
+import { SubmissionAccessesConfigDataService } from '../../../core/config/submission-accesses-config-data.service';
 import {
   getSubmissionAccessesConfigNotChangeDiscoverableService,
   getSubmissionAccessesConfigService
@@ -89,7 +89,7 @@ describe('SubmissionSectionAccessesComponent', () => {
         declarations: [SubmissionSectionAccessesComponent, FormComponent],
         providers: [
           { provide: SectionsService, useValue: sectionsServiceStub },
-          { provide: SubmissionAccessesConfigService, useValue: submissionAccessesConfigService },
+          { provide: SubmissionAccessesConfigDataService, useValue: submissionAccessesConfigService },
           { provide: SectionAccessesService, useValue: sectionAccessesService },
           { provide: SectionFormOperationsService, useValue: sectionFormOperationsService },
           { provide: JsonPatchOperationsBuilder, useValue: operationsBuilder },
@@ -181,7 +181,7 @@ describe('SubmissionSectionAccessesComponent', () => {
         providers: [
           { provide: SectionsService, useValue: sectionsServiceStub },
           { provide: FormBuilderService, useValue: builderService },
-          { provide: SubmissionAccessesConfigService, useValue: getSubmissionAccessesConfigNotChangeDiscoverableService() },
+          { provide: SubmissionAccessesConfigDataService, useValue: getSubmissionAccessesConfigNotChangeDiscoverableService() },
           { provide: SectionAccessesService, useValue: sectionAccessesService },
           { provide: SectionFormOperationsService, useValue: sectionFormOperationsService },
           { provide: JsonPatchOperationsBuilder, useValue: operationsBuilder },

src/app/submission/sections/accesses/section-accesses.component.ts

@@ -44,7 +44,7 @@ import { hasValue, isNotEmpty, isNotNull } from '../../../shared/empty.util';
 import {
   WorkspaceitemSectionAccessesObject
 } from '../../../core/submission/models/workspaceitem-section-accesses.model';
-import { SubmissionAccessesConfigService } from '../../../core/config/submission-accesses-config.service';
+import { SubmissionAccessesConfigDataService } from '../../../core/config/submission-accesses-config-data.service';
 import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
 import { FormComponent } from '../../../shared/form/form.component';
 import { FormService } from '../../../shared/form/form.service';
@@ -125,7 +125,7 @@ export class SubmissionSectionAccessesComponent extends SectionModelComponent {
    * @param {SectionFormOperationsService} formOperationsService
    * @param {FormBuilderService} formBuilderService
    * @param {TranslateService} translate
-   * @param {SubmissionAccessesConfigService} accessesConfigService
+   * @param {SubmissionAccessesConfigDataService} accessesConfigService
    * @param {SectionAccessesService} accessesService
    * @param {SubmissionJsonPatchOperationsService} operationsService
    * @param {string} injectedSubmissionId
@@ -133,7 +133,7 @@ export class SubmissionSectionAccessesComponent extends SectionModelComponent {
   constructor(
     protected sectionService: SectionsService,
     private formBuilderService: FormBuilderService,
-    private accessesConfigService: SubmissionAccessesConfigService,
+    private accessesConfigService: SubmissionAccessesConfigDataService,
     private accessesService: SectionAccessesService,
     protected formOperationsService: SectionFormOperationsService,
     protected operationsBuilder: JsonPatchOperationsBuilder,

src/app/submission/sections/form/section-form.component.spec.ts

@@ -19,7 +19,7 @@ import { getMockFormOperationsService } from '../../../shared/mocks/form-operati
 import { SectionFormOperationsService } from './section-form-operations.service';
 import { getMockFormService } from '../../../shared/mocks/form-service.mock';
 import { FormService } from '../../../shared/form/form.service';
-import { SubmissionFormsConfigService } from '../../../core/config/submission-forms-config.service';
+import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service';
 import { SectionDataObject } from '../models/section-data.model';
 import { SectionsType } from '../sections-type';
 import {
@@ -45,7 +45,7 @@ import { cold } from 'jasmine-marbles';
 import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
 import { SubmissionSectionError } from '../../objects/submission-section-error.model';
 
-function getMockSubmissionFormsConfigService(): SubmissionFormsConfigService {
+function getMockSubmissionFormsConfigService(): SubmissionFormsConfigDataService {
   return jasmine.createSpyObj('FormOperationsService', {
     getConfigAll: jasmine.createSpy('getConfigAll'),
     getConfigByHref: jasmine.createSpy('getConfigByHref'),
@@ -173,7 +173,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
         { provide: FormBuilderService, useValue: getMockFormBuilderService() },
         { provide: SectionFormOperationsService, useValue: getMockFormOperationsService() },
         { provide: FormService, useValue: formService },
-        { provide: SubmissionFormsConfigService, useValue: formConfigService },
+        { provide: SubmissionFormsConfigDataService, useValue: formConfigService },
         { provide: NotificationsService, useClass: NotificationsServiceStub },
         { provide: SectionsService, useValue: sectionsServiceStub },
         { provide: SubmissionService, useClass: SubmissionServiceStub },

src/app/submission/sections/form/section-form.component.ts

@@ -10,7 +10,7 @@ import { FormBuilderService } from '../../../shared/form/builder/form-builder.se
 import { FormComponent } from '../../../shared/form/form.component';
 import { FormService } from '../../../shared/form/form.service';
 import { SectionModelComponent } from '../models/section.model';
-import { SubmissionFormsConfigService } from '../../../core/config/submission-forms-config.service';
+import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service';
 import { hasValue, isEmpty, isNotEmpty, isUndefined } from '../../../shared/empty.util';
 import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
 import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model';
@@ -129,7 +129,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
    * @param {FormBuilderService} formBuilderService
    * @param {SectionFormOperationsService} formOperationsService
    * @param {FormService} formService
-   * @param {SubmissionFormsConfigService} formConfigService
+   * @param {SubmissionFormsConfigDataService} formConfigService
    * @param {NotificationsService} notificationsService
    * @param {SectionsService} sectionService
    * @param {SubmissionService} submissionService
@@ -145,7 +145,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
               protected formBuilderService: FormBuilderService,
               protected formOperationsService: SectionFormOperationsService,
               protected formService: FormService,
-              protected formConfigService: SubmissionFormsConfigService,
+              protected formConfigService: SubmissionFormsConfigDataService,
               protected notificationsService: NotificationsService,
               protected sectionService: SectionsService,
               protected submissionService: SubmissionService,

src/app/submission/sections/license/section-license.component.spec.ts

@@ -20,7 +20,7 @@ import { FormBuilderService } from '../../../shared/form/builder/form-builder.se
 import { getMockFormOperationsService } from '../../../shared/mocks/form-operations-service.mock';
 import { getMockFormService } from '../../../shared/mocks/form-service.mock';
 import { FormService } from '../../../shared/form/form.service';
-import { SubmissionFormsConfigService } from '../../../core/config/submission-forms-config.service';
+import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service';
 import { SectionDataObject } from '../models/section-data.model';
 import { SectionsType } from '../sections-type';
 import {
@@ -53,7 +53,7 @@ const mockCollection = Object.assign(new Collection(), {
   license: createSuccessfulRemoteDataObject$(Object.assign(new License(), { text: licenseText }))
 });
 
-function getMockSubmissionFormsConfigService(): SubmissionFormsConfigService {
+function getMockSubmissionFormsConfigService(): SubmissionFormsConfigDataService {
   return jasmine.createSpyObj('FormOperationsService', {
     getConfigAll: jasmine.createSpy('getConfigAll'),
     getConfigByHref: jasmine.createSpy('getConfigByHref'),
@@ -130,7 +130,7 @@ describe('SubmissionSectionLicenseComponent test suite', () => {
         { provide: SectionFormOperationsService, useValue: getMockFormOperationsService() },
         { provide: FormService, useValue: getMockFormService() },
         { provide: JsonPatchOperationsBuilder, useValue: jsonPatchOpBuilder },
-        { provide: SubmissionFormsConfigService, useValue: getMockSubmissionFormsConfigService() },
+        { provide: SubmissionFormsConfigDataService, useValue: getMockSubmissionFormsConfigService() },
         { provide: NotificationsService, useClass: NotificationsServiceStub },
         { provide: SectionsService, useValue: sectionsServiceStub },
         { provide: SubmissionService, useClass: SubmissionServiceStub },

src/app/submission/sections/upload/section-upload.component.spec.ts

@@ -14,7 +14,7 @@ import { SubmissionService } from '../../submission.service';
 import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
 import { SectionsService } from '../sections.service';
 import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
-import { SubmissionFormsConfigService } from '../../../core/config/submission-forms-config.service';
+import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service';
 import { SectionDataObject } from '../models/section-data.model';
 import { SectionsType } from '../sections-type';
 import {
@@ -26,21 +26,21 @@ import {
   mockUploadConfigResponseNotRequired,
   mockUploadFiles,
 } from '../../../shared/mocks/submission.mock';
-import { SubmissionUploadsConfigService } from '../../../core/config/submission-uploads-config.service';
+import { SubmissionUploadsConfigDataService } from '../../../core/config/submission-uploads-config-data.service';
 import { SectionUploadService } from './section-upload.service';
 import { SubmissionSectionUploadComponent } from './section-upload.component';
 import { CollectionDataService } from '../../../core/data/collection-data.service';
 import { GroupDataService } from '../../../core/eperson/group-data.service';
 import { Collection } from '../../../core/shared/collection.model';
 import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
-import { ResourcePolicyService } from '../../../core/resource-policy/resource-policy.service';
+import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
 import { Group } from '../../../core/eperson/models/group.model';
 import { getMockSectionUploadService } from '../../../shared/mocks/section-upload.service.mock';
 import { SubmissionUploadsModel } from '../../../core/config/models/config-submission-uploads.model';
 import { buildPaginatedList } from '../../../core/data/paginated-list.model';
 import { PageInfo } from '../../../core/shared/page-info.model';
 
-function getMockSubmissionUploadsConfigService(): SubmissionFormsConfigService {
+function getMockSubmissionUploadsConfigService(): SubmissionFormsConfigDataService {
   return jasmine.createSpyObj('SubmissionUploadsConfigService', {
     getConfigAll: jasmine.createSpy('getConfigAll'),
     getConfigByHref: jasmine.createSpy('getConfigByHref'),
@@ -63,7 +63,7 @@ function getMockGroupEpersonService(): GroupDataService {
   });
 }
 
-function getMockResourcePolicyService(): ResourcePolicyService {
+function getMockResourcePolicyService(): ResourcePolicyDataService {
   return jasmine.createSpyObj('ResourcePolicyService', {
     findByHref: jasmine.createSpy('findByHref')
   });
@@ -175,8 +175,8 @@ describe('SubmissionSectionUploadComponent test suite', () => {
       providers: [
         { provide: CollectionDataService, useValue: collectionDataService },
         { provide: GroupDataService, useValue: groupService },
-        { provide: ResourcePolicyService, useValue: resourcePolicyService },
+        { provide: ResourcePolicyDataService, useValue: resourcePolicyService },
-        { provide: SubmissionUploadsConfigService, useValue: uploadsConfigService },
+        { provide: SubmissionUploadsConfigDataService, useValue: uploadsConfigService },
         { provide: SectionsService, useClass: SectionsServiceStub },
         { provide: SubmissionService, useValue: submissionServiceStub },
         { provide: SectionUploadService, useValue: bitstreamService },