diff --git a/src/app/admin/admin-notifications/admin-notifications.module.ts b/src/app/admin/admin-notifications/admin-notifications.module.ts
index ba0c6eee58..159baedfec 100644
--- a/src/app/admin/admin-notifications/admin-notifications.module.ts
+++ b/src/app/admin/admin-notifications/admin-notifications.module.ts
@@ -5,8 +5,8 @@ import { SharedModule } from '../../shared/shared.module';
 import { AdminNotificationsRoutingModule } from './admin-notifications-routing.module';
 import { AdminQualityAssuranceTopicsPageComponent } from './admin-quality-assurance-topics-page/admin-quality-assurance-topics-page.component';
 import { AdminQualityAssuranceEventsPageComponent } from './admin-quality-assurance-events-page/admin-quality-assurance-events-page.component';
-import { NotificationsModule } from '../../notifications/notifications.module';
 import { AdminQualityAssuranceSourcePageComponent } from './admin-quality-assurance-source-page-component/admin-quality-assurance-source-page.component';
+import {SuggestionNotificationsModule} from '../../suggestion-notifications/suggestion-notifications.module';
 
 @NgModule({
   imports: [
@@ -14,7 +14,7 @@ import { AdminQualityAssuranceSourcePageComponent } from './admin-quality-assura
     SharedModule,
     CoreModule.forRoot(),
     AdminNotificationsRoutingModule,
-    NotificationsModule
+    SuggestionNotificationsModule
   ],
   declarations: [
     AdminQualityAssuranceTopicsPageComponent,
diff --git a/src/app/admin/admin-notifications/admin-quality-assurance-source-page-component/admin-quality-assurance-source-data.reslover.ts b/src/app/admin/admin-notifications/admin-quality-assurance-source-page-component/admin-quality-assurance-source-data.reslover.ts
index 6201e0a743..8475732aed 100644
--- a/src/app/admin/admin-notifications/admin-quality-assurance-source-page-component/admin-quality-assurance-source-data.reslover.ts
+++ b/src/app/admin/admin-notifications/admin-quality-assurance-source-page-component/admin-quality-assurance-source-data.reslover.ts
@@ -3,8 +3,8 @@ import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot, Router } from '@a
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
-import { QualityAssuranceSourceService } from '../../../notifications/qa/source/quality-assurance-source.service';
+import { QualityAssuranceSourceObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceSourceService } from '../../../suggestion-notifications/qa/source/quality-assurance-source.service';
 /**
  * This class represents a resolver that retrieve the route data before the route is activated.
  */
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index fcc8160f88..6832d0b8d2 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -167,9 +167,9 @@ import { SequenceService } from './shared/sequence.service';
 import { CoreState } from './core-state.model';
 import { GroupDataService } from './eperson/group-data.service';
 import { SubmissionAccessesModel } from './config/models/config-submission-accesses.model';
-import { QualityAssuranceTopicObject } from './notifications/qa/models/quality-assurance-topic.model';
-import { QualityAssuranceEventObject } from './notifications/qa/models/quality-assurance-event.model';
-import { QualityAssuranceSourceObject } from './notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceTopicObject } from './suggestion-notifications/qa/models/quality-assurance-topic.model';
+import { QualityAssuranceEventObject } from './suggestion-notifications/qa/models/quality-assurance-event.model';
+import { QualityAssuranceSourceObject } from './suggestion-notifications/qa/models/quality-assurance-source.model';
 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';
diff --git a/src/app/core/notifications/qa/events/quality-assurance-event-rest.service.spec.ts b/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-rest.service.spec.ts
similarity index 100%
rename from src/app/core/notifications/qa/events/quality-assurance-event-rest.service.spec.ts
rename to src/app/core/suggestion-notifications/qa/events/quality-assurance-event-rest.service.spec.ts
diff --git a/src/app/core/notifications/qa/events/quality-assurance-event-rest.service.ts b/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-rest.service.ts
similarity index 100%
rename from src/app/core/notifications/qa/events/quality-assurance-event-rest.service.ts
rename to src/app/core/suggestion-notifications/qa/events/quality-assurance-event-rest.service.ts
diff --git a/src/app/core/notifications/qa/models/quality-assurance-event-object.resource-type.ts b/src/app/core/suggestion-notifications/qa/models/quality-assurance-event-object.resource-type.ts
similarity index 100%
rename from src/app/core/notifications/qa/models/quality-assurance-event-object.resource-type.ts
rename to src/app/core/suggestion-notifications/qa/models/quality-assurance-event-object.resource-type.ts
diff --git a/src/app/core/notifications/qa/models/quality-assurance-event.model.ts b/src/app/core/suggestion-notifications/qa/models/quality-assurance-event.model.ts
similarity index 100%
rename from src/app/core/notifications/qa/models/quality-assurance-event.model.ts
rename to src/app/core/suggestion-notifications/qa/models/quality-assurance-event.model.ts
diff --git a/src/app/core/notifications/qa/models/quality-assurance-source-object.resource-type.ts b/src/app/core/suggestion-notifications/qa/models/quality-assurance-source-object.resource-type.ts
similarity index 100%
rename from src/app/core/notifications/qa/models/quality-assurance-source-object.resource-type.ts
rename to src/app/core/suggestion-notifications/qa/models/quality-assurance-source-object.resource-type.ts
diff --git a/src/app/core/notifications/qa/models/quality-assurance-source.model.ts b/src/app/core/suggestion-notifications/qa/models/quality-assurance-source.model.ts
similarity index 100%
rename from src/app/core/notifications/qa/models/quality-assurance-source.model.ts
rename to src/app/core/suggestion-notifications/qa/models/quality-assurance-source.model.ts
diff --git a/src/app/core/notifications/qa/models/quality-assurance-topic-object.resource-type.ts b/src/app/core/suggestion-notifications/qa/models/quality-assurance-topic-object.resource-type.ts
similarity index 100%
rename from src/app/core/notifications/qa/models/quality-assurance-topic-object.resource-type.ts
rename to src/app/core/suggestion-notifications/qa/models/quality-assurance-topic-object.resource-type.ts
diff --git a/src/app/core/notifications/qa/models/quality-assurance-topic.model.ts b/src/app/core/suggestion-notifications/qa/models/quality-assurance-topic.model.ts
similarity index 100%
rename from src/app/core/notifications/qa/models/quality-assurance-topic.model.ts
rename to src/app/core/suggestion-notifications/qa/models/quality-assurance-topic.model.ts
diff --git a/src/app/core/notifications/qa/source/quality-assurance-source-rest.service.spec.ts b/src/app/core/suggestion-notifications/qa/source/quality-assurance-source-rest.service.spec.ts
similarity index 100%
rename from src/app/core/notifications/qa/source/quality-assurance-source-rest.service.spec.ts
rename to src/app/core/suggestion-notifications/qa/source/quality-assurance-source-rest.service.spec.ts
diff --git a/src/app/core/notifications/qa/source/quality-assurance-source-rest.service.ts b/src/app/core/suggestion-notifications/qa/source/quality-assurance-source-rest.service.ts
similarity index 100%
rename from src/app/core/notifications/qa/source/quality-assurance-source-rest.service.ts
rename to src/app/core/suggestion-notifications/qa/source/quality-assurance-source-rest.service.ts
diff --git a/src/app/core/notifications/qa/topics/quality-assurance-topic-rest.service.spec.ts b/src/app/core/suggestion-notifications/qa/topics/quality-assurance-topic-rest.service.spec.ts
similarity index 100%
rename from src/app/core/notifications/qa/topics/quality-assurance-topic-rest.service.spec.ts
rename to src/app/core/suggestion-notifications/qa/topics/quality-assurance-topic-rest.service.spec.ts
diff --git a/src/app/core/notifications/qa/topics/quality-assurance-topic-rest.service.ts b/src/app/core/suggestion-notifications/qa/topics/quality-assurance-topic-rest.service.ts
similarity index 100%
rename from src/app/core/notifications/qa/topics/quality-assurance-topic-rest.service.ts
rename to src/app/core/suggestion-notifications/qa/topics/quality-assurance-topic-rest.service.ts
diff --git a/src/app/shared/mocks/notifications.mock.ts b/src/app/shared/mocks/notifications.mock.ts
index 04cd6f1f24..b423be3f58 100644
--- a/src/app/shared/mocks/notifications.mock.ts
+++ b/src/app/shared/mocks/notifications.mock.ts
@@ -1,9 +1,9 @@
 import { of as observableOf } from 'rxjs';
 import { ResourceType } from '../../core/shared/resource-type';
-import { QualityAssuranceTopicObject } from '../../core/notifications/qa/models/quality-assurance-topic.model';
-import { QualityAssuranceEventObject } from '../../core/notifications/qa/models/quality-assurance-event.model';
-import { QualityAssuranceTopicRestService } from '../../core/notifications/qa/topics/quality-assurance-topic-rest.service';
-import { QualityAssuranceEventRestService } from '../../core/notifications/qa/events/quality-assurance-event-rest.service';
+import { QualityAssuranceTopicObject } from '../../core/suggestion-notifications/qa/models/quality-assurance-topic.model';
+import { QualityAssuranceEventObject } from '../../core/suggestion-notifications/qa/models/quality-assurance-event.model';
+import { QualityAssuranceTopicRestService } from '../../core/suggestion-notifications/qa/topics/quality-assurance-topic-rest.service';
+import { QualityAssuranceEventRestService } from '../../core/suggestion-notifications/qa/events/quality-assurance-event-rest.service';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { NotificationsStateService } from '../../notifications/notifications-state.service';
 import { Item } from '../../core/shared/item.model';
@@ -13,7 +13,7 @@ import {
   createSuccessfulRemoteDataObject$
 } from '../remote-data.utils';
 import { SearchResult } from '../search/models/search-result.model';
-import { QualityAssuranceSourceObject } from '../../core/notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceSourceObject } from '../../core/suggestion-notifications/qa/models/quality-assurance-source.model';
 
 // REST Mock ---------------------------------------------------------------------
 // -------------------------------------------------------------------------------
@@ -1781,7 +1781,7 @@ export const qualityAssuranceEventObjectMissingProjectNotFound: QualityAssurance
 // -------------------------------------------------------------------------------
 
 /**
- * Mock for [[NotificationsStateService]]
+ * Mock for [[SuggestionNotificationsStateService]]
  */
 export function getMockNotificationsStateService(): any {
   return jasmine.createSpyObj('NotificationsStateService', {
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.html b/src/app/suggestion-notifications/qa/events/quality-assurance-events.component.html
similarity index 100%
rename from src/app/notifications/qa/events/quality-assurance-events.component.html
rename to src/app/suggestion-notifications/qa/events/quality-assurance-events.component.html
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts b/src/app/suggestion-notifications/qa/events/quality-assurance-events.component.spec.ts
similarity index 98%
rename from src/app/notifications/qa/events/quality-assurance-events.component.spec.ts
rename to src/app/suggestion-notifications/qa/events/quality-assurance-events.component.spec.ts
index 976d8540e3..41358b20a5 100644
--- a/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts
+++ b/src/app/suggestion-notifications/qa/events/quality-assurance-events.component.spec.ts
@@ -5,7 +5,7 @@ import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/t
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { of as observableOf } from 'rxjs';
-import { QualityAssuranceEventRestService } from '../../../core/notifications/qa/events/quality-assurance-event-rest.service';
+import { QualityAssuranceEventRestService } from '../../../core/suggestion-notifications/qa/events/quality-assurance-event-rest.service';
 import { QualityAssuranceEventsComponent } from './quality-assurance-events.component';
 import {
   getMockQualityAssuranceEventRestService,
@@ -22,7 +22,7 @@ import { getMockTranslateService } from '../../../shared/mocks/translate.service
 import { createTestComponent } from '../../../shared/testing/utils.test';
 import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { QualityAssuranceEventObject } from '../../../core/notifications/qa/models/quality-assurance-event.model';
+import { QualityAssuranceEventObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-event.model';
 import { QualityAssuranceEventData } from '../project-entry-import-modal/project-entry-import-modal.component';
 import { TestScheduler } from 'rxjs/testing';
 import { getTestScheduler } from 'jasmine-marbles';
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.ts b/src/app/suggestion-notifications/qa/events/quality-assurance-events.component.ts
similarity index 98%
rename from src/app/notifications/qa/events/quality-assurance-events.component.ts
rename to src/app/suggestion-notifications/qa/events/quality-assurance-events.component.ts
index 6e3dd8d010..edac869f8e 100644
--- a/src/app/notifications/qa/events/quality-assurance-events.component.ts
+++ b/src/app/suggestion-notifications/qa/events/quality-assurance-events.component.ts
@@ -12,8 +12,8 @@ import { RemoteData } from '../../../core/data/remote-data';
 import {
   QualityAssuranceEventObject,
   OpenaireQualityAssuranceEventMessageObject
-} from '../../../core/notifications/qa/models/quality-assurance-event.model';
-import { QualityAssuranceEventRestService } from '../../../core/notifications/qa/events/quality-assurance-event-rest.service';
+} from '../../../core/suggestion-notifications/qa/models/quality-assurance-event.model';
+import { QualityAssuranceEventRestService } from '../../../core/suggestion-notifications/qa/events/quality-assurance-event-rest.service';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 import { Metadata } from '../../../core/shared/metadata.utils';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
diff --git a/src/app/notifications/qa/events/quality-assurance-events.scomponent.scss b/src/app/suggestion-notifications/qa/events/quality-assurance-events.scomponent.scss
similarity index 100%
rename from src/app/notifications/qa/events/quality-assurance-events.scomponent.scss
rename to src/app/suggestion-notifications/qa/events/quality-assurance-events.scomponent.scss
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html b/src/app/suggestion-notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
similarity index 100%
rename from src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
rename to src/app/suggestion-notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.scss b/src/app/suggestion-notifications/qa/project-entry-import-modal/project-entry-import-modal.component.scss
similarity index 100%
rename from src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.scss
rename to src/app/suggestion-notifications/qa/project-entry-import-modal/project-entry-import-modal.component.scss
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts b/src/app/suggestion-notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts
similarity index 100%
rename from src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts
rename to src/app/suggestion-notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts b/src/app/suggestion-notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
similarity index 98%
rename from src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
rename to src/app/suggestion-notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
index 64a2df30ba..bde97f364c 100644
--- a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
+++ b/src/app/suggestion-notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
@@ -16,7 +16,7 @@ import {
   QualityAssuranceEventObject,
   QualityAssuranceEventMessageObject,
   OpenaireQualityAssuranceEventMessageObject,
-} from '../../../core/notifications/qa/models/quality-assurance-event.model';
+} from '../../../core/suggestion-notifications/qa/models/quality-assurance-event.model';
 import { hasValue, isNotEmpty } from '../../../shared/empty.util';
 import { Item } from '../../../core/shared/item.model';
 
diff --git a/src/app/notifications/qa/source/quality-assurance-source.actions.ts b/src/app/suggestion-notifications/qa/source/quality-assurance-source.actions.ts
similarity index 85%
rename from src/app/notifications/qa/source/quality-assurance-source.actions.ts
rename to src/app/suggestion-notifications/qa/source/quality-assurance-source.actions.ts
index 7a22e7a9ae..4dcecf7b27 100644
--- a/src/app/notifications/qa/source/quality-assurance-source.actions.ts
+++ b/src/app/suggestion-notifications/qa/source/quality-assurance-source.actions.ts
@@ -1,6 +1,6 @@
 import { Action } from '@ngrx/store';
 import { type } from '../../../shared/ngrx/type';
-import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceSourceObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-source.model';
 
 /**
  * For each action type in an action group, make a simple
@@ -11,9 +11,9 @@ import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/mod
  * action types in the application are unique.
  */
 export const QualityAssuranceSourceActionTypes = {
-  ADD_SOURCE: type('dspace/integration/notifications/qa/ADD_SOURCE'),
-  RETRIEVE_ALL_SOURCE: type('dspace/integration/notifications/qa/RETRIEVE_ALL_SOURCE'),
-  RETRIEVE_ALL_SOURCE_ERROR: type('dspace/integration/notifications/qa/RETRIEVE_ALL_SOURCE_ERROR'),
+  ADD_SOURCE: type('dspace/integration/suggestion-notifications/qa/ADD_SOURCE'),
+  RETRIEVE_ALL_SOURCE: type('dspace/integration/suggestion-notifications/qa/RETRIEVE_ALL_SOURCE'),
+  RETRIEVE_ALL_SOURCE_ERROR: type('dspace/integration/suggestion-notifications/qa/RETRIEVE_ALL_SOURCE_ERROR'),
 };
 
 /* tslint:disable:max-classes-per-file */
diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.html b/src/app/suggestion-notifications/qa/source/quality-assurance-source.component.html
similarity index 100%
rename from src/app/notifications/qa/source/quality-assurance-source.component.html
rename to src/app/suggestion-notifications/qa/source/quality-assurance-source.component.html
diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.scss b/src/app/suggestion-notifications/qa/source/quality-assurance-source.component.scss
similarity index 100%
rename from src/app/notifications/qa/source/quality-assurance-source.component.scss
rename to src/app/suggestion-notifications/qa/source/quality-assurance-source.component.scss
diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.spec.ts b/src/app/suggestion-notifications/qa/source/quality-assurance-source.component.spec.ts
similarity index 96%
rename from src/app/notifications/qa/source/quality-assurance-source.component.spec.ts
rename to src/app/suggestion-notifications/qa/source/quality-assurance-source.component.spec.ts
index ba3a903cc5..512530f8de 100644
--- a/src/app/notifications/qa/source/quality-assurance-source.component.spec.ts
+++ b/src/app/suggestion-notifications/qa/source/quality-assurance-source.component.spec.ts
@@ -11,7 +11,7 @@ import {
   qualityAssuranceSourceObjectMorePid
 } from '../../../shared/mocks/notifications.mock';
 import { QualityAssuranceSourceComponent } from './quality-assurance-source.component';
-import { NotificationsStateService } from '../../notifications-state.service';
+import { SuggestionNotificationsStateService } from '../../notifications-state.service';
 import { cold } from 'jasmine-marbles';
 import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
 import { PaginationService } from '../../../core/pagination/pagination.service';
@@ -40,7 +40,7 @@ describe('QualityAssuranceSourceComponent test suite', () => {
         TestComponent,
       ],
       providers: [
-        { provide: NotificationsStateService, useValue: mockNotificationsStateService },
+        { provide: SuggestionNotificationsStateService, useValue: mockNotificationsStateService },
         { provide: ActivatedRoute, useValue: { data: observableOf(activatedRouteParams), params: observableOf({}) } },
         { provide: PaginationService, useValue: paginationService },
         QualityAssuranceSourceComponent
diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.ts b/src/app/suggestion-notifications/qa/source/quality-assurance-source.component.ts
similarity index 92%
rename from src/app/notifications/qa/source/quality-assurance-source.component.ts
rename to src/app/suggestion-notifications/qa/source/quality-assurance-source.component.ts
index fde1afec43..372dc654ff 100644
--- a/src/app/notifications/qa/source/quality-assurance-source.component.ts
+++ b/src/app/suggestion-notifications/qa/source/quality-assurance-source.component.ts
@@ -3,9 +3,9 @@ import { PaginationService } from '../../../core/pagination/pagination.service';
 import { Observable, Subscription } from 'rxjs';
 import { distinctUntilChanged, take } from 'rxjs/operators';
 import { SortOptions } from '../../../core/cache/models/sort-options.model';
-import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceSourceObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-source.model';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { NotificationsStateService } from '../../notifications-state.service';
+import { SuggestionNotificationsStateService } from '../../suggestion-notifications-state.service';
 import { AdminQualityAssuranceSourcePageParams } from '../../../admin/admin-notifications/admin-quality-assurance-source-page-component/admin-quality-assurance-source-page-resolver.service';
 import { hasValue } from '../../../shared/empty.util';
 
@@ -47,11 +47,11 @@ export class QualityAssuranceSourceComponent implements OnInit {
   /**
    * Initialize the component variables.
    * @param {PaginationService} paginationService
-   * @param {NotificationsStateService} notificationsStateService
+   * @param {SuggestionNotificationsStateService} notificationsStateService
    */
   constructor(
     private paginationService: PaginationService,
-    private notificationsStateService: NotificationsStateService,
+    private notificationsStateService: SuggestionNotificationsStateService,
   ) { }
 
   /**
diff --git a/src/app/notifications/qa/source/quality-assurance-source.effects.ts b/src/app/suggestion-notifications/qa/source/quality-assurance-source.effects.ts
similarity index 93%
rename from src/app/notifications/qa/source/quality-assurance-source.effects.ts
rename to src/app/suggestion-notifications/qa/source/quality-assurance-source.effects.ts
index e21b87c842..2d758d2625 100644
--- a/src/app/notifications/qa/source/quality-assurance-source.effects.ts
+++ b/src/app/suggestion-notifications/qa/source/quality-assurance-source.effects.ts
@@ -11,11 +11,11 @@ import {
  RetrieveAllSourceErrorAction,
 } from './quality-assurance-source.actions';
 
-import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceSourceObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-source.model';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { QualityAssuranceSourceService } from './quality-assurance-source.service';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { QualityAssuranceSourceRestService } from '../../../core/notifications/qa/source/quality-assurance-source-rest.service';
+import { QualityAssuranceSourceRestService } from '../../../core/suggestion-notifications/qa/source/quality-assurance-source-rest.service';
 
 /**
  * Provides effect methods for the Quality Assurance source actions.
diff --git a/src/app/notifications/qa/source/quality-assurance-source.reducer.spec.ts b/src/app/suggestion-notifications/qa/source/quality-assurance-source.reducer.spec.ts
similarity index 100%
rename from src/app/notifications/qa/source/quality-assurance-source.reducer.spec.ts
rename to src/app/suggestion-notifications/qa/source/quality-assurance-source.reducer.spec.ts
diff --git a/src/app/notifications/qa/source/quality-assurance-source.reducer.ts b/src/app/suggestion-notifications/qa/source/quality-assurance-source.reducer.ts
similarity index 93%
rename from src/app/notifications/qa/source/quality-assurance-source.reducer.ts
rename to src/app/suggestion-notifications/qa/source/quality-assurance-source.reducer.ts
index 08e26a177a..d83a0e4341 100644
--- a/src/app/notifications/qa/source/quality-assurance-source.reducer.ts
+++ b/src/app/suggestion-notifications/qa/source/quality-assurance-source.reducer.ts
@@ -1,4 +1,4 @@
-import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceSourceObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-source.model';
 import { QualityAssuranceSourceActionTypes, QualityAssuranceSourceActions } from './quality-assurance-source.actions';
 
 /**
diff --git a/src/app/notifications/qa/source/quality-assurance-source.service.spec.ts b/src/app/suggestion-notifications/qa/source/quality-assurance-source.service.spec.ts
similarity index 97%
rename from src/app/notifications/qa/source/quality-assurance-source.service.spec.ts
rename to src/app/suggestion-notifications/qa/source/quality-assurance-source.service.spec.ts
index 06f020be1d..208e45e387 100644
--- a/src/app/notifications/qa/source/quality-assurance-source.service.spec.ts
+++ b/src/app/suggestion-notifications/qa/source/quality-assurance-source.service.spec.ts
@@ -11,7 +11,7 @@ import {
 import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
 import { cold } from 'jasmine-marbles';
 import { buildPaginatedList } from '../../../core/data/paginated-list.model';
-import { QualityAssuranceSourceRestService } from '../../../core/notifications/qa/source/quality-assurance-source-rest.service';
+import { QualityAssuranceSourceRestService } from '../../../core/suggestion-notifications/qa/source/quality-assurance-source-rest.service';
 import { RequestParam } from '../../../core/cache/models/request-param.model';
 import {FindListOptions} from '../../../core/data/find-list-options.model';
 
diff --git a/src/app/notifications/qa/source/quality-assurance-source.service.ts b/src/app/suggestion-notifications/qa/source/quality-assurance-source.service.ts
similarity index 90%
rename from src/app/notifications/qa/source/quality-assurance-source.service.ts
rename to src/app/suggestion-notifications/qa/source/quality-assurance-source.service.ts
index 30a889d3e2..2d413a906d 100644
--- a/src/app/notifications/qa/source/quality-assurance-source.service.ts
+++ b/src/app/suggestion-notifications/qa/source/quality-assurance-source.service.ts
@@ -1,11 +1,11 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { find, map } from 'rxjs/operators';
-import { QualityAssuranceSourceRestService } from '../../../core/notifications/qa/source/quality-assurance-source-rest.service';
+import { QualityAssuranceSourceRestService } from '../../../core/suggestion-notifications/qa/source/quality-assurance-source-rest.service';
 import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceSourceObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-source.model';
 import {FindListOptions} from '../../../core/data/find-list-options.model';
 
 /**
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.actions.ts b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.actions.ts
similarity index 84%
rename from src/app/notifications/qa/topics/quality-assurance-topics.actions.ts
rename to src/app/suggestion-notifications/qa/topics/quality-assurance-topics.actions.ts
index 0506806587..991a40ada1 100644
--- a/src/app/notifications/qa/topics/quality-assurance-topics.actions.ts
+++ b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.actions.ts
@@ -1,6 +1,6 @@
 import { Action } from '@ngrx/store';
 import { type } from '../../../shared/ngrx/type';
-import { QualityAssuranceTopicObject } from '../../../core/notifications/qa/models/quality-assurance-topic.model';
+import { QualityAssuranceTopicObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-topic.model';
 
 /**
  * For each action type in an action group, make a simple
@@ -11,9 +11,9 @@ import { QualityAssuranceTopicObject } from '../../../core/notifications/qa/mode
  * action types in the application are unique.
  */
 export const QualityAssuranceTopicActionTypes = {
-  ADD_TOPICS: type('dspace/integration/notifications/qa/topic/ADD_TOPICS'),
-  RETRIEVE_ALL_TOPICS: type('dspace/integration/notifications/qa/topic/RETRIEVE_ALL_TOPICS'),
-  RETRIEVE_ALL_TOPICS_ERROR: type('dspace/integration/notifications/qa/topic/RETRIEVE_ALL_TOPICS_ERROR'),
+  ADD_TOPICS: type('dspace/integration/suggestion-notifications/qa/topic/ADD_TOPICS'),
+  RETRIEVE_ALL_TOPICS: type('dspace/integration/suggestion-notifications/qa/topic/RETRIEVE_ALL_TOPICS'),
+  RETRIEVE_ALL_TOPICS_ERROR: type('dspace/integration/suggestion-notifications/qa/topic/RETRIEVE_ALL_TOPICS_ERROR'),
 };
 
 /* tslint:disable:max-classes-per-file */
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.html b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.html
similarity index 100%
rename from src/app/notifications/qa/topics/quality-assurance-topics.component.html
rename to src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.html
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.scss b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.scss
similarity index 100%
rename from src/app/notifications/qa/topics/quality-assurance-topics.component.scss
rename to src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.scss
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.spec.ts
similarity index 96%
rename from src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts
rename to src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.spec.ts
index 8e154eca99..01e1cc2fc8 100644
--- a/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts
+++ b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.spec.ts
@@ -11,7 +11,7 @@ import {
   qualityAssuranceTopicObjectMorePid
 } from '../../../shared/mocks/notifications.mock';
 import { QualityAssuranceTopicsComponent } from './quality-assurance-topics.component';
-import { NotificationsStateService } from '../../notifications-state.service';
+import { SuggestionNotificationsStateService } from '../../notifications-state.service';
 import { cold } from 'jasmine-marbles';
 import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
 import { PaginationService } from '../../../core/pagination/pagination.service';
@@ -41,7 +41,7 @@ describe('QualityAssuranceTopicsComponent test suite', () => {
         TestComponent,
       ],
       providers: [
-        { provide: NotificationsStateService, useValue: mockNotificationsStateService },
+        { provide: SuggestionNotificationsStateService, useValue: mockNotificationsStateService },
         { provide: ActivatedRoute, useValue: { data: observableOf(activatedRouteParams), snapshot: {
           paramMap: {
             get: () => 'openaire',
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.ts b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.ts
similarity index 93%
rename from src/app/notifications/qa/topics/quality-assurance-topics.component.ts
rename to src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.ts
index f825358f3b..a99944af6a 100644
--- a/src/app/notifications/qa/topics/quality-assurance-topics.component.ts
+++ b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.ts
@@ -4,10 +4,10 @@ import { Observable, Subscription } from 'rxjs';
 import { distinctUntilChanged, map, take } from 'rxjs/operators';
 
 import { SortOptions } from '../../../core/cache/models/sort-options.model';
-import { QualityAssuranceTopicObject } from '../../../core/notifications/qa/models/quality-assurance-topic.model';
+import { QualityAssuranceTopicObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-topic.model';
 import { hasValue } from '../../../shared/empty.util';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { NotificationsStateService } from '../../notifications-state.service';
+import { SuggestionNotificationsStateService } from '../../suggestion-notifications-state.service';
 import { AdminQualityAssuranceTopicsPageParams } from '../../../admin/admin-notifications/admin-quality-assurance-topics-page/admin-quality-assurance-topics-page-resolver.service';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { ActivatedRoute } from '@angular/router';
@@ -59,12 +59,12 @@ export class QualityAssuranceTopicsComponent implements OnInit {
   /**
    * Initialize the component variables.
    * @param {PaginationService} paginationService
-   * @param {NotificationsStateService} notificationsStateService
+   * @param {SuggestionNotificationsStateService} notificationsStateService
    */
   constructor(
     private paginationService: PaginationService,
     private activatedRoute: ActivatedRoute,
-    private notificationsStateService: NotificationsStateService,
+    private notificationsStateService: SuggestionNotificationsStateService,
     private qualityAssuranceTopicsService: QualityAssuranceTopicsService
   ) {
   }
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.effects.ts b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.effects.ts
similarity index 94%
rename from src/app/notifications/qa/topics/quality-assurance-topics.effects.ts
rename to src/app/suggestion-notifications/qa/topics/quality-assurance-topics.effects.ts
index 71b5c64256..880a2d2318 100644
--- a/src/app/notifications/qa/topics/quality-assurance-topics.effects.ts
+++ b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.effects.ts
@@ -11,11 +11,11 @@ import {
   RetrieveAllTopicsErrorAction,
 } from './quality-assurance-topics.actions';
 
-import { QualityAssuranceTopicObject } from '../../../core/notifications/qa/models/quality-assurance-topic.model';
+import { QualityAssuranceTopicObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-topic.model';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { QualityAssuranceTopicsService } from './quality-assurance-topics.service';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { QualityAssuranceTopicRestService } from '../../../core/notifications/qa/topics/quality-assurance-topic-rest.service';
+import { QualityAssuranceTopicRestService } from '../../../core/suggestion-notifications/qa/topics/quality-assurance-topic-rest.service';
 
 /**
  * Provides effect methods for the Quality Assurance topics actions.
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.reducer.spec.ts b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.reducer.spec.ts
similarity index 100%
rename from src/app/notifications/qa/topics/quality-assurance-topics.reducer.spec.ts
rename to src/app/suggestion-notifications/qa/topics/quality-assurance-topics.reducer.spec.ts
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.reducer.ts b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.reducer.ts
similarity index 93%
rename from src/app/notifications/qa/topics/quality-assurance-topics.reducer.ts
rename to src/app/suggestion-notifications/qa/topics/quality-assurance-topics.reducer.ts
index ff94f1b8bb..355ace977d 100644
--- a/src/app/notifications/qa/topics/quality-assurance-topics.reducer.ts
+++ b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.reducer.ts
@@ -1,4 +1,4 @@
-import { QualityAssuranceTopicObject } from '../../../core/notifications/qa/models/quality-assurance-topic.model';
+import { QualityAssuranceTopicObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-topic.model';
 import { QualityAssuranceTopicActionTypes, QualityAssuranceTopicsActions } from './quality-assurance-topics.actions';
 
 /**
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.service.spec.ts b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.service.spec.ts
similarity index 97%
rename from src/app/notifications/qa/topics/quality-assurance-topics.service.spec.ts
rename to src/app/suggestion-notifications/qa/topics/quality-assurance-topics.service.spec.ts
index 6d945446b2..ba1399fcd4 100644
--- a/src/app/notifications/qa/topics/quality-assurance-topics.service.spec.ts
+++ b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.service.spec.ts
@@ -2,7 +2,7 @@ import { TestBed } from '@angular/core/testing';
 import { of as observableOf } from 'rxjs';
 import { QualityAssuranceTopicsService } from './quality-assurance-topics.service';
 import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
-import { QualityAssuranceTopicRestService } from '../../../core/notifications/qa/topics/quality-assurance-topic-rest.service';
+import { QualityAssuranceTopicRestService } from '../../../core/suggestion-notifications/qa/topics/quality-assurance-topic-rest.service';
 import { PageInfo } from '../../../core/shared/page-info.model';
 import {
   getMockQualityAssuranceTopicRestService,
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.service.ts b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.service.ts
similarity index 92%
rename from src/app/notifications/qa/topics/quality-assurance-topics.service.ts
rename to src/app/suggestion-notifications/qa/topics/quality-assurance-topics.service.ts
index c09a0750e0..e3e4b1aa93 100644
--- a/src/app/notifications/qa/topics/quality-assurance-topics.service.ts
+++ b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.service.ts
@@ -1,11 +1,11 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { find, map } from 'rxjs/operators';
-import { QualityAssuranceTopicRestService } from '../../../core/notifications/qa/topics/quality-assurance-topic-rest.service';
+import { QualityAssuranceTopicRestService } from '../../../core/suggestion-notifications/qa/topics/quality-assurance-topic-rest.service';
 import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { QualityAssuranceTopicObject } from '../../../core/notifications/qa/models/quality-assurance-topic.model';
+import { QualityAssuranceTopicObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-topic.model';
 import { RequestParam } from '../../../core/cache/models/request-param.model';
 import {FindListOptions} from '../../../core/data/find-list-options.model';
 
diff --git a/src/app/notifications/selectors.ts b/src/app/suggestion-notifications/selectors.ts
similarity index 66%
rename from src/app/notifications/selectors.ts
rename to src/app/suggestion-notifications/selectors.ts
index a47495a950..c5947e3196 100644
--- a/src/app/notifications/selectors.ts
+++ b/src/app/suggestion-notifications/selectors.ts
@@ -1,18 +1,18 @@
 import { createFeatureSelector, createSelector, MemoizedSelector } from '@ngrx/store';
 import { subStateSelector } from '../shared/selector.util';
-import { notificationsSelector, NotificationsState } from './notifications.reducer';
-import { QualityAssuranceTopicObject } from '../core/notifications/qa/models/quality-assurance-topic.model';
+import { suggestionNotificationsSelector, SuggestionNotificationsState } from './suggestion-notifications.reducer';
+import { QualityAssuranceTopicObject } from '../core/suggestion-notifications/qa/models/quality-assurance-topic.model';
 import { QualityAssuranceTopicState } from './qa/topics/quality-assurance-topics.reducer';
 import { QualityAssuranceSourceState } from './qa/source/quality-assurance-source.reducer';
-import { QualityAssuranceSourceObject } from '../core/notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceSourceObject } from '../core/suggestion-notifications/qa/models/quality-assurance-source.model';
 
 /**
  * Returns the Notifications state.
  * @function _getNotificationsState
  * @param {AppState} state Top level state.
- * @return {NotificationsState}
+ * @return {SuggestionNotificationsState}
  */
-const _getNotificationsState = createFeatureSelector<NotificationsState>('notifications');
+const _getNotificationsState = createFeatureSelector<SuggestionNotificationsState>('notifications');
 
 // Quality Assurance topics
 // ----------------------------------------------------------------------------
@@ -22,8 +22,8 @@ const _getNotificationsState = createFeatureSelector<NotificationsState>('notifi
  * @function qualityAssuranceTopicsStateSelector
  * @return {QualityAssuranceTopicState}
  */
-export function qualityAssuranceTopicsStateSelector(): MemoizedSelector<NotificationsState, QualityAssuranceTopicState> {
-  return subStateSelector<NotificationsState,QualityAssuranceTopicState>(notificationsSelector, 'qaTopic');
+export function qualityAssuranceTopicsStateSelector(): MemoizedSelector<SuggestionNotificationsState, QualityAssuranceTopicState> {
+  return subStateSelector<SuggestionNotificationsState,QualityAssuranceTopicState>(suggestionNotificationsSelector, 'qaTopic');
 }
 
 /**
@@ -31,8 +31,8 @@ export function qualityAssuranceTopicsStateSelector(): MemoizedSelector<Notifica
  * @function qualityAssuranceTopicsObjectSelector
  * @return {QualityAssuranceTopicObject[]}
  */
-export function qualityAssuranceTopicsObjectSelector(): MemoizedSelector<NotificationsState, QualityAssuranceTopicObject[]> {
-  return subStateSelector<NotificationsState, QualityAssuranceTopicObject[]>(qualityAssuranceTopicsStateSelector(), 'topics');
+export function qualityAssuranceTopicsObjectSelector(): MemoizedSelector<SuggestionNotificationsState, QualityAssuranceTopicObject[]> {
+  return subStateSelector<SuggestionNotificationsState, QualityAssuranceTopicObject[]>(qualityAssuranceTopicsStateSelector(), 'topics');
 }
 
 /**
@@ -41,7 +41,7 @@ export function qualityAssuranceTopicsObjectSelector(): MemoizedSelector<Notific
  * @return {boolean}
  */
 export const isQualityAssuranceTopicsLoadedSelector = createSelector(_getNotificationsState,
-  (state: NotificationsState) => state.qaTopic.loaded
+  (state: SuggestionNotificationsState) => state.qaTopic.loaded
 );
 
 /**
@@ -50,7 +50,7 @@ export const isQualityAssuranceTopicsLoadedSelector = createSelector(_getNotific
  * @return {boolean}
  */
 export const isQualityAssuranceTopicsProcessingSelector = createSelector(_getNotificationsState,
-  (state: NotificationsState) => state.qaTopic.processing
+  (state: SuggestionNotificationsState) => state.qaTopic.processing
 );
 
 /**
@@ -59,7 +59,7 @@ export const isQualityAssuranceTopicsProcessingSelector = createSelector(_getNot
  * @return {number}
  */
 export const getQualityAssuranceTopicsTotalPagesSelector = createSelector(_getNotificationsState,
-  (state: NotificationsState) => state.qaTopic.totalPages
+  (state: SuggestionNotificationsState) => state.qaTopic.totalPages
 );
 
 /**
@@ -68,7 +68,7 @@ export const getQualityAssuranceTopicsTotalPagesSelector = createSelector(_getNo
  * @return {number}
  */
 export const getQualityAssuranceTopicsCurrentPageSelector = createSelector(_getNotificationsState,
-  (state: NotificationsState) => state.qaTopic.currentPage
+  (state: SuggestionNotificationsState) => state.qaTopic.currentPage
 );
 
 /**
@@ -77,7 +77,7 @@ export const getQualityAssuranceTopicsCurrentPageSelector = createSelector(_getN
  * @return {number}
  */
 export const getQualityAssuranceTopicsTotalsSelector = createSelector(_getNotificationsState,
-  (state: NotificationsState) => state.qaTopic.totalElements
+  (state: SuggestionNotificationsState) => state.qaTopic.totalElements
 );
 
 // Quality Assurance source
@@ -88,8 +88,8 @@ export const getQualityAssuranceTopicsTotalsSelector = createSelector(_getNotifi
  * @function qualityAssuranceSourceStateSelector
  * @return {QualityAssuranceSourceState}
  */
- export function qualityAssuranceSourceStateSelector(): MemoizedSelector<NotificationsState, QualityAssuranceSourceState> {
-  return subStateSelector<NotificationsState,QualityAssuranceSourceState>(notificationsSelector, 'qaSource');
+ export function qualityAssuranceSourceStateSelector(): MemoizedSelector<SuggestionNotificationsState, QualityAssuranceSourceState> {
+  return subStateSelector<SuggestionNotificationsState,QualityAssuranceSourceState>(suggestionNotificationsSelector, 'qaSource');
 }
 
 /**
@@ -97,8 +97,8 @@ export const getQualityAssuranceTopicsTotalsSelector = createSelector(_getNotifi
  * @function qualityAssuranceSourceObjectSelector
  * @return {QualityAssuranceSourceObject[]}
  */
-export function qualityAssuranceSourceObjectSelector(): MemoizedSelector<NotificationsState, QualityAssuranceSourceObject[]> {
-  return subStateSelector<NotificationsState, QualityAssuranceSourceObject[]>(qualityAssuranceSourceStateSelector(), 'source');
+export function qualityAssuranceSourceObjectSelector(): MemoizedSelector<SuggestionNotificationsState, QualityAssuranceSourceObject[]> {
+  return subStateSelector<SuggestionNotificationsState, QualityAssuranceSourceObject[]>(qualityAssuranceSourceStateSelector(), 'source');
 }
 
 /**
@@ -107,7 +107,7 @@ export function qualityAssuranceSourceObjectSelector(): MemoizedSelector<Notific
  * @return {boolean}
  */
 export const isQualityAssuranceSourceLoadedSelector = createSelector(_getNotificationsState,
-  (state: NotificationsState) => state.qaSource.loaded
+  (state: SuggestionNotificationsState) => state.qaSource.loaded
 );
 
 /**
@@ -116,7 +116,7 @@ export const isQualityAssuranceSourceLoadedSelector = createSelector(_getNotific
  * @return {boolean}
  */
 export const isQualityAssuranceSourceProcessingSelector = createSelector(_getNotificationsState,
-  (state: NotificationsState) => state.qaSource.processing
+  (state: SuggestionNotificationsState) => state.qaSource.processing
 );
 
 /**
@@ -125,7 +125,7 @@ export const isQualityAssuranceSourceProcessingSelector = createSelector(_getNot
  * @return {number}
  */
 export const getQualityAssuranceSourceTotalPagesSelector = createSelector(_getNotificationsState,
-  (state: NotificationsState) => state.qaSource.totalPages
+  (state: SuggestionNotificationsState) => state.qaSource.totalPages
 );
 
 /**
@@ -134,7 +134,7 @@ export const getQualityAssuranceSourceTotalPagesSelector = createSelector(_getNo
  * @return {number}
  */
 export const getQualityAssuranceSourceCurrentPageSelector = createSelector(_getNotificationsState,
-  (state: NotificationsState) => state.qaSource.currentPage
+  (state: SuggestionNotificationsState) => state.qaSource.currentPage
 );
 
 /**
@@ -143,5 +143,5 @@ export const getQualityAssuranceSourceCurrentPageSelector = createSelector(_getN
  * @return {number}
  */
 export const getQualityAssuranceSourceTotalsSelector = createSelector(_getNotificationsState,
-  (state: NotificationsState) => state.qaSource.totalElements
+  (state: SuggestionNotificationsState) => state.qaSource.totalElements
 );
diff --git a/src/app/notifications/notifications.effects.ts b/src/app/suggestion-notifications/suggestion-notifications-effects.ts
similarity index 84%
rename from src/app/notifications/notifications.effects.ts
rename to src/app/suggestion-notifications/suggestion-notifications-effects.ts
index bf70a05855..ac5d9f8f92 100644
--- a/src/app/notifications/notifications.effects.ts
+++ b/src/app/suggestion-notifications/suggestion-notifications-effects.ts
@@ -1,7 +1,7 @@
 import { QualityAssuranceSourceEffects } from './qa/source/quality-assurance-source.effects';
 import { QualityAssuranceTopicsEffects } from './qa/topics/quality-assurance-topics.effects';
 
-export const notificationsEffects = [
+export const suggestionNotificationsEffects = [
   QualityAssuranceTopicsEffects,
   QualityAssuranceSourceEffects
 ];
diff --git a/src/app/notifications/notifications-state.service.spec.ts b/src/app/suggestion-notifications/suggestion-notifications-state.service.spec.ts
similarity index 90%
rename from src/app/notifications/notifications-state.service.spec.ts
rename to src/app/suggestion-notifications/suggestion-notifications-state.service.spec.ts
index 8c191415b7..b04368cfad 100644
--- a/src/app/notifications/notifications-state.service.spec.ts
+++ b/src/app/suggestion-notifications/suggestion-notifications-state.service.spec.ts
@@ -2,8 +2,8 @@ import { TestBed } from '@angular/core/testing';
 import { Store, StoreModule } from '@ngrx/store';
 import { provideMockStore } from '@ngrx/store/testing';
 import { cold } from 'jasmine-marbles';
-import { notificationsReducers } from './notifications.reducer';
-import { NotificationsStateService } from './notifications-state.service';
+import { suggestionNotificationsReducers } from './suggestion-notifications.reducer';
+import { SuggestionNotificationsStateService } from './suggestion-notifications-state.service';
 import {
   qualityAssuranceSourceObjectMissingPid,
   qualityAssuranceSourceObjectMoreAbstract,
@@ -16,7 +16,7 @@ import { RetrieveAllTopicsAction } from './qa/topics/quality-assurance-topics.ac
 import { RetrieveAllSourceAction } from './qa/source/quality-assurance-source.actions';
 
 describe('NotificationsStateService', () => {
-  let service: NotificationsStateService;
+  let service: SuggestionNotificationsStateService;
   let serviceAsAny: any;
   let store: any;
   let initialState: any;
@@ -63,18 +63,18 @@ describe('NotificationsStateService', () => {
         init('empty');
         TestBed.configureTestingModule({
           imports: [
-            StoreModule.forRoot({ notifications: notificationsReducers } as any),
+            StoreModule.forRoot({ notifications: suggestionNotificationsReducers } as any),
           ],
           providers: [
             provideMockStore({ initialState }),
-            { provide: NotificationsStateService, useValue: service }
+            { provide: SuggestionNotificationsStateService, useValue: service }
           ]
         }).compileComponents();
       });
 
       beforeEach(() => {
         store = TestBed.get(Store);
-        service = new NotificationsStateService(store);
+        service = new SuggestionNotificationsStateService(store);
         serviceAsAny = service;
         spyOn(store, 'dispatch');
       });
@@ -155,18 +155,18 @@ describe('NotificationsStateService', () => {
         init('full');
         TestBed.configureTestingModule({
           imports: [
-            StoreModule.forRoot({ notifications: notificationsReducers } as any),
+            StoreModule.forRoot({ notifications: suggestionNotificationsReducers } as any),
           ],
           providers: [
             provideMockStore({ initialState }),
-            { provide: NotificationsStateService, useValue: service }
+            { provide: SuggestionNotificationsStateService, useValue: service }
           ]
         }).compileComponents();
       });
 
       beforeEach(() => {
         store = TestBed.get(Store);
-        service = new NotificationsStateService(store);
+        service = new SuggestionNotificationsStateService(store);
         serviceAsAny = service;
         spyOn(store, 'dispatch');
       });
@@ -251,18 +251,18 @@ describe('NotificationsStateService', () => {
         init('full');
         TestBed.configureTestingModule({
           imports: [
-            StoreModule.forRoot({ notifications: notificationsReducers } as any),
+            StoreModule.forRoot({ notifications: suggestionNotificationsReducers } as any),
           ],
           providers: [
             provideMockStore({ initialState }),
-            { provide: NotificationsStateService, useValue: service }
+            { provide: SuggestionNotificationsStateService, useValue: service }
           ]
         }).compileComponents();
       });
 
       beforeEach(() => {
         store = TestBed.get(Store);
-        service = new NotificationsStateService(store);
+        service = new SuggestionNotificationsStateService(store);
         serviceAsAny = service;
         spyOn(store, 'dispatch');
       });
@@ -321,18 +321,18 @@ describe('NotificationsStateService', () => {
         init('empty');
         TestBed.configureTestingModule({
           imports: [
-            StoreModule.forRoot({ notifications: notificationsReducers } as any),
+            StoreModule.forRoot({ notifications: suggestionNotificationsReducers } as any),
           ],
           providers: [
             provideMockStore({ initialState }),
-            { provide: NotificationsStateService, useValue: service }
+            { provide: SuggestionNotificationsStateService, useValue: service }
           ]
         }).compileComponents();
       });
 
       beforeEach(() => {
         store = TestBed.get(Store);
-        service = new NotificationsStateService(store);
+        service = new SuggestionNotificationsStateService(store);
         serviceAsAny = service;
         spyOn(store, 'dispatch');
       });
@@ -413,18 +413,18 @@ describe('NotificationsStateService', () => {
         init('full');
         TestBed.configureTestingModule({
           imports: [
-            StoreModule.forRoot({ notifications: notificationsReducers } as any),
+            StoreModule.forRoot({ notifications: suggestionNotificationsReducers } as any),
           ],
           providers: [
             provideMockStore({ initialState }),
-            { provide: NotificationsStateService, useValue: service }
+            { provide: SuggestionNotificationsStateService, useValue: service }
           ]
         }).compileComponents();
       });
 
       beforeEach(() => {
         store = TestBed.get(Store);
-        service = new NotificationsStateService(store);
+        service = new SuggestionNotificationsStateService(store);
         serviceAsAny = service;
         spyOn(store, 'dispatch');
       });
@@ -509,18 +509,18 @@ describe('NotificationsStateService', () => {
         init('full');
         TestBed.configureTestingModule({
           imports: [
-            StoreModule.forRoot({ notifications: notificationsReducers } as any),
+            StoreModule.forRoot({ notifications: suggestionNotificationsReducers } as any),
           ],
           providers: [
             provideMockStore({ initialState }),
-            { provide: NotificationsStateService, useValue: service }
+            { provide: SuggestionNotificationsStateService, useValue: service }
           ]
         }).compileComponents();
       });
 
       beforeEach(() => {
         store = TestBed.get(Store);
-        service = new NotificationsStateService(store);
+        service = new SuggestionNotificationsStateService(store);
         serviceAsAny = service;
         spyOn(store, 'dispatch');
       });
diff --git a/src/app/notifications/notifications-state.service.ts b/src/app/suggestion-notifications/suggestion-notifications-state.service.ts
similarity index 93%
rename from src/app/notifications/notifications-state.service.ts
rename to src/app/suggestion-notifications/suggestion-notifications-state.service.ts
index 99605a54fa..ec1ea2e039 100644
--- a/src/app/notifications/notifications-state.service.ts
+++ b/src/app/suggestion-notifications/suggestion-notifications-state.service.ts
@@ -16,23 +16,23 @@ import {
   getQualityAssuranceSourceCurrentPageSelector,
   getQualityAssuranceSourceTotalsSelector
 } from './selectors';
-import { QualityAssuranceTopicObject } from '../core/notifications/qa/models/quality-assurance-topic.model';
-import { NotificationsState } from './notifications.reducer';
+import { QualityAssuranceTopicObject } from '../core/suggestion-notifications/qa/models/quality-assurance-topic.model';
+import { SuggestionNotificationsState } from './suggestion-notifications.reducer';
 import { RetrieveAllTopicsAction } from './qa/topics/quality-assurance-topics.actions';
-import { QualityAssuranceSourceObject } from '../core/notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceSourceObject } from '../core/suggestion-notifications/qa/models/quality-assurance-source.model';
 import { RetrieveAllSourceAction } from './qa/source/quality-assurance-source.actions';
 
 /**
  * The service handling the Notifications State.
  */
 @Injectable()
-export class NotificationsStateService {
+export class SuggestionNotificationsStateService {
 
   /**
    * Initialize the service variables.
-   * @param {Store<NotificationsState>} store
+   * @param {Store<SuggestionNotificationsState>} store
    */
-  constructor(private store: Store<NotificationsState>) { }
+  constructor(private store: Store<SuggestionNotificationsState>) { }
 
   // Quality Assurance topics
   // --------------------------------------------------------------------------
diff --git a/src/app/notifications/notifications.module.ts b/src/app/suggestion-notifications/suggestion-notifications.module.ts
similarity index 66%
rename from src/app/notifications/notifications.module.ts
rename to src/app/suggestion-notifications/suggestion-notifications.module.ts
index 27e34c8d51..f659d27a28 100644
--- a/src/app/notifications/notifications.module.ts
+++ b/src/app/suggestion-notifications/suggestion-notifications.module.ts
@@ -8,25 +8,25 @@ import { SharedModule } from '../shared/shared.module';
 import { storeModuleConfig } from '../app.reducer';
 import { QualityAssuranceTopicsComponent } from './qa/topics/quality-assurance-topics.component';
 import { QualityAssuranceEventsComponent } from './qa/events/quality-assurance-events.component';
-import { NotificationsStateService } from './notifications-state.service';
-import { notificationsReducers, NotificationsState } from './notifications.reducer';
-import { notificationsEffects } from './notifications.effects';
+import { SuggestionNotificationsStateService } from './suggestion-notifications-state.service';
+import { suggestionNotificationsReducers, SuggestionNotificationsState } from './suggestion-notifications.reducer';
+import { suggestionNotificationsEffects } from './suggestion-notifications-effects';
 import { QualityAssuranceTopicsService } from './qa/topics/quality-assurance-topics.service';
-import { QualityAssuranceTopicRestService } from '../core/notifications/qa/topics/quality-assurance-topic-rest.service';
-import { QualityAssuranceEventRestService } from '../core/notifications/qa/events/quality-assurance-event-rest.service';
+import { QualityAssuranceTopicRestService } from '../core/suggestion-notifications/qa/topics/quality-assurance-topic-rest.service';
+import { QualityAssuranceEventRestService } from '../core/suggestion-notifications/qa/events/quality-assurance-event-rest.service';
 import { ProjectEntryImportModalComponent } from './qa/project-entry-import-modal/project-entry-import-modal.component';
 import { TranslateModule } from '@ngx-translate/core';
 import { SearchModule } from '../shared/search/search.module';
 import { QualityAssuranceSourceComponent } from './qa/source/quality-assurance-source.component';
 import { QualityAssuranceSourceService } from './qa/source/quality-assurance-source.service';
-import { QualityAssuranceSourceRestService } from '../core/notifications/qa/source/quality-assurance-source-rest.service';
+import { QualityAssuranceSourceRestService } from '../core/suggestion-notifications/qa/source/quality-assurance-source-rest.service';
 
 const MODULES = [
   CommonModule,
   SharedModule,
   CoreModule.forRoot(),
-  StoreModule.forFeature('notifications', notificationsReducers, storeModuleConfig as StoreConfig<NotificationsState, Action>),
-  EffectsModule.forFeature(notificationsEffects),
+  StoreModule.forFeature('notifications', suggestionNotificationsReducers, storeModuleConfig as StoreConfig<SuggestionNotificationsState, Action>),
+  EffectsModule.forFeature(suggestionNotificationsEffects),
   TranslateModule
 ];
 
@@ -43,7 +43,7 @@ const ENTRY_COMPONENTS = [
 ];
 
 const PROVIDERS = [
-  NotificationsStateService,
+  SuggestionNotificationsStateService,
   QualityAssuranceTopicsService,
   QualityAssuranceSourceService,
   QualityAssuranceTopicRestService,
@@ -76,5 +76,5 @@ const PROVIDERS = [
 /**
  * This module handles all components that are necessary for the OpenAIRE components
  */
-export class NotificationsModule {
+export class SuggestionNotificationsModule {
 }
diff --git a/src/app/notifications/notifications.reducer.ts b/src/app/suggestion-notifications/suggestion-notifications.reducer.ts
similarity index 66%
rename from src/app/notifications/notifications.reducer.ts
rename to src/app/suggestion-notifications/suggestion-notifications.reducer.ts
index 4cce554f95..cc0cdd7101 100644
--- a/src/app/notifications/notifications.reducer.ts
+++ b/src/app/suggestion-notifications/suggestion-notifications.reducer.ts
@@ -5,14 +5,14 @@ import { qualityAssuranceTopicsReducer, QualityAssuranceTopicState, } from './qa
 /**
  * The OpenAIRE State
  */
-export interface NotificationsState {
+export interface SuggestionNotificationsState {
   'qaTopic': QualityAssuranceTopicState;
   'qaSource': QualityAssuranceSourceState;
 }
 
-export const notificationsReducers: ActionReducerMap<NotificationsState> = {
+export const suggestionNotificationsReducers: ActionReducerMap<SuggestionNotificationsState> = {
   qaTopic: qualityAssuranceTopicsReducer,
   qaSource: qualityAssuranceSourceReducer
 };
 
-export const notificationsSelector = createFeatureSelector<NotificationsState>('notifications');
+export const suggestionNotificationsSelector = createFeatureSelector<SuggestionNotificationsState>('notifications');