#1471 rollback className change (#1472)

demo-shell-ng2/app/app.component.ts

@@ -17,7 +17,7 @@
 
 import { Component } from '@angular/core';
 import { Router } from '@angular/router';
-import { AlfrescoTranslateService, AuthService, SettingsService, StorageService, LogService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService, AlfrescoAuthenticationService, AlfrescoSettingsService, StorageService, LogService } from 'ng2-alfresco-core';
 
 declare var document: any;
 
@@ -32,10 +32,10 @@ export class AppComponent {
     ecmHost: string = 'http://' + window.location.hostname + ':8080';
     bpmHost: string = 'http://' + window.location.hostname + ':9999';
 
-    constructor(private authService: AuthService,
+    constructor(private authService: AlfrescoAuthenticationService,
                 private router: Router,
-                private settingsService: SettingsService,
+                private settingsService: AlfrescoSettingsService,
-                private translateService: AlfrescoTranslateService,
+                private translateService: AlfrescoTranslationService,
                 private storage: StorageService,
                 private logService: LogService) {
         this.setEcmHost();

demo-shell-ng2/app/components/files/files.component.ts

@@ -17,7 +17,7 @@
 
 import { Component, OnInit, Optional, ViewChild } from '@angular/core';
 import { ActivatedRoute, Params, Router } from '@angular/router';
-import { AuthService, LogService } from 'ng2-alfresco-core';
+import { AlfrescoAuthenticationService, LogService } from 'ng2-alfresco-core';
 import { DocumentActionsService, DocumentListComponent, ContentActionHandler, DocumentActionModel, FolderActionModel } from 'ng2-alfresco-documentlist';
 import { FormService } from 'ng2-activiti-form';
 
@@ -43,7 +43,7 @@ export class FilesComponent implements OnInit {
     documentList: DocumentListComponent;
 
     constructor(private documentActions: DocumentActionsService,
-                private authService: AuthService,
+                private authService: AlfrescoAuthenticationService,
                 private formService: FormService,
                 private logService: LogService,
                 private router: Router,

demo-shell-ng2/app/components/search/search-bar.component.ts

@@ -17,7 +17,7 @@
 
 import { Component, EventEmitter, Output } from '@angular/core';
 import { Router } from '@angular/router';
-import { AuthService } from 'ng2-alfresco-core';
+import { AlfrescoAuthenticationService } from 'ng2-alfresco-core';
 import { MinimalNodeEntity } from 'alfresco-js-api';
 
 @Component({
@@ -34,7 +34,7 @@ export class SearchBarComponent {
     expand = new EventEmitter();
 
     constructor(public router: Router,
-                public authService: AuthService) {
+                public authService: AlfrescoAuthenticationService) {
     }
 
     isLoggedIn(): boolean {

demo-shell-ng2/app/components/setting/setting.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { Component } from '@angular/core';
-import { SettingsService, StorageService, LogService } from 'ng2-alfresco-core';
+import { AlfrescoSettingsService, StorageService, LogService } from 'ng2-alfresco-core';
 
 @Component({
     selector: 'alfresco-setting-demo',
@@ -28,7 +28,7 @@ export class SettingComponent {
     ecmHost: string;
     bpmHost: string;
 
-    constructor(private settingsService: SettingsService,
+    constructor(private settingsService: AlfrescoSettingsService,
                 private storage: StorageService,
                 private logService: LogService) {
         this.ecmHost = this.settingsService.ecmHost;

ng2-components/ng2-activiti-analytics/demo/src/main.ts

@@ -18,7 +18,7 @@
 import { NgModule, Component, OnInit } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-import { CoreModule, SettingsService, AuthService, StorageService, LogService } from 'ng2-alfresco-core';
+import { CoreModule, AlfrescoSettingsService, AlfrescoAuthenticationService, StorageService, LogService } from 'ng2-alfresco-core';
 import { AnalyticsModule } from 'ng2-activiti-analytics';
 
 @Component({
@@ -57,8 +57,8 @@ export class AnalyticsDemoComponent implements OnInit {
     host: string = 'http://localhost:9999';
     ticket: string;
 
-    constructor(private authService: AuthService,
+    constructor(private authService: AlfrescoAuthenticationService,
-                private settingsService: SettingsService,
+                private settingsService: AlfrescoSettingsService,
                 private storage: StorageService,
                 private logService: LogService) {
         settingsService.bpmHost = this.host;

ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.spec.ts

@@ -18,7 +18,7 @@
 import { DebugElement } from '@angular/core';
 import { ComponentFixture, TestBed, async } from '@angular/core/testing';
 import { Observable } from 'rxjs/Rx';
-import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core';
+import { CoreModule, AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { DiagramsModule } from 'ng2-activiti-diagrams';
 import { AnalyticsReportHeatMapComponent } from '../components/analytics-report-heat-map.component';
 import { WIDGET_DIRECTIVES } from '../components/widgets/index';
@@ -57,7 +57,7 @@ describe('AnalyticsReportHeatMapComponent', () => {
             ]
         }).compileComponents();
 
-        let translateService = TestBed.get(AlfrescoTranslateService);
+        let translateService = TestBed.get(AlfrescoTranslationService);
         spyOn(translateService, 'addTranslationFolder').and.stub();
         spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); });
 

ng2-components/ng2-activiti-analytics/src/components/analytics-report-heat-map.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
-import { AlfrescoTranslateService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { AnalyticsService } from '../services/analytics.service';
 import { FormGroup, FormBuilder, FormControl } from '@angular/forms';
 
@@ -43,7 +43,7 @@ export class AnalyticsReportHeatMapComponent implements  OnInit {
     currentMetricColors: string;
     metricType: string;
 
-    constructor(private translateService: AlfrescoTranslateService,
+    constructor(private translateService: AlfrescoTranslationService,
                 private analyticsService: AnalyticsService,
                 private formBuilder: FormBuilder) {
         if (translateService) {

ng2-components/ng2-activiti-analytics/src/components/analytics-report-list.component.spec.ts

@@ -18,7 +18,7 @@
 import { DebugElement } from '@angular/core';
 import { ComponentFixture, TestBed, async } from '@angular/core/testing';
 import { Observable } from 'rxjs/Rx';
-import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core';
+import { CoreModule, AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { AnalyticsReportListComponent } from '../components/analytics-report-list.component';
 import { AnalyticsService } from '../services/analytics.service';
 
@@ -54,7 +54,7 @@ describe('AnalyticsReportListComponent', () => {
             ]
         }).compileComponents();
 
-        let translateService = TestBed.get(AlfrescoTranslateService);
+        let translateService = TestBed.get(AlfrescoTranslationService);
         spyOn(translateService, 'addTranslationFolder').and.stub();
         spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); });
     }));

ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.spec.ts

@@ -19,7 +19,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing';
 import { DebugElement, SimpleChange } from '@angular/core';
 import { Observable } from 'rxjs/Rx';
 import * as moment from 'moment';
-import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core';
+import { CoreModule, AlfrescoTranslationService } from 'ng2-alfresco-core';
 
 import { AnalyticsReportParametersComponent } from '../components/analytics-report-parameters.component';
 import { WIDGET_DIRECTIVES } from '../components/widgets/index';
@@ -53,7 +53,7 @@ describe('AnalyticsReportParametersComponent', () => {
             ]
         }).compileComponents();
 
-        let translateService = TestBed.get(AlfrescoTranslateService);
+        let translateService = TestBed.get(AlfrescoTranslationService);
         spyOn(translateService, 'addTranslationFolder').and.stub();
         spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); });
 

ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts

@@ -18,7 +18,7 @@
 import { Component, EventEmitter, OnInit, OnChanges, Input, Output, SimpleChanges, OnDestroy, AfterViewChecked } from '@angular/core';
 import { FormGroup, FormBuilder, FormControl } from '@angular/forms';
 import * as moment from 'moment';
-import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core';
 import { AnalyticsService } from '../services/analytics.service';
 import { ReportParametersModel, ReportQuery, ParameterValueModel, ReportParameterDetailsModel } from '../models/report.model';
 
@@ -70,7 +70,7 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges, On
     private paramOpts;
     private isEditable: boolean = false;
 
-    constructor(private translateService: AlfrescoTranslateService,
+    constructor(private translateService: AlfrescoTranslationService,
                 private analyticsService: AnalyticsService,
                 private formBuilder: FormBuilder,
                 private logService: LogService) {

ng2-components/ng2-activiti-analytics/src/components/analytics.component.spec.ts

@@ -19,7 +19,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing';
 import { DebugElement, SimpleChange } from '@angular/core';
 import { Observable } from 'rxjs/Rx';
 import { CHART_DIRECTIVES } from 'ng2-charts/ng2-charts';
-import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core';
+import { CoreModule, AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { DiagramsModule } from 'ng2-activiti-diagrams';
 
 import { AnalyticsReportListComponent } from '../components/analytics-report-list.component';
@@ -70,7 +70,7 @@ describe('AnalyticsComponent', () => {
             ]
         }).compileComponents();
 
-        let translateService = TestBed.get(AlfrescoTranslateService);
+        let translateService = TestBed.get(AlfrescoTranslationService);
         spyOn(translateService, 'addTranslationFolder').and.stub();
         spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); });
     }));

ng2-components/ng2-activiti-analytics/src/components/analytics.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { Component, EventEmitter, OnChanges, Input, Output, SimpleChanges } from '@angular/core';
-import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core';
 import { AnalyticsService } from '../services/analytics.service';
 import { ReportQuery } from '../models/report.model';
 import { Chart } from '../models/chart.model';
@@ -70,7 +70,7 @@ export class AnalyticsComponent implements OnChanges {
         }
     };
 
-    constructor(private translateService: AlfrescoTranslateService,
+    constructor(private translateService: AlfrescoTranslationService,
                 private analyticsService: AnalyticsService,
                 private logService: LogService) {
         logService.info('AnalyticsComponent');

ng2-components/ng2-activiti-diagrams/demo/src/main.ts

@@ -19,7 +19,7 @@ import { NgModule, Component } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
-import { CoreModule, SettingsService, AuthService, StorageService, LogService } from 'ng2-alfresco-core';
+import { CoreModule, AlfrescoSettingsService, AlfrescoAuthenticationService, StorageService, LogService } from 'ng2-alfresco-core';
 import { DiagramsModule } from 'ng2-activiti-diagrams';
 
 @Component({
@@ -48,8 +48,8 @@ export class DiagramDemoComponent {
     host: string = 'http://localhost:9999';
     ticket: string;
 
-    constructor(private authService: AuthService,
+    constructor(private authService: AlfrescoAuthenticationService,
-                private settingsService: SettingsService,
+                private settingsService: AlfrescoSettingsService,
                 private storage: StorageService,
                 private logService: LogService) {
         settingsService.bpmHost = this.host;

ng2-components/ng2-activiti-diagrams/src/components/diagram.component.spec.ts

@@ -16,7 +16,7 @@
  */
 
 import { ComponentFixture, TestBed, async } from '@angular/core/testing';
-import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core';
+import { CoreModule, AlfrescoTranslationService } from 'ng2-alfresco-core';
 
 import { DIAGRAM_DIRECTIVES, DIAGRAM_PROVIDERS } from './index';
 import { RAPHAEL_DIRECTIVES, RAPHAEL_PROVIDERS } from './raphael/index';
@@ -56,7 +56,7 @@ describe('Test ng2-activiti-diagrams ', () => {
             providers: [
                 ...DIAGRAM_PROVIDERS,
                 ...RAPHAEL_PROVIDERS,
-                {provide: AlfrescoTranslateService, useClass: TranslationMock}
+                {provide: AlfrescoTranslationService, useClass: TranslationMock}
             ]
         }).compileComponents();
     }));

ng2-components/ng2-activiti-diagrams/src/components/diagram.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { Component, ElementRef, Input, Output, EventEmitter, SimpleChanges } from '@angular/core';
-import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core';
 import { DiagramsService } from '../services/diagrams.service';
 import { DiagramColorService } from '../services/diagram-color.service';
 import { RaphaelService } from './raphael/raphael.service';
@@ -59,7 +59,7 @@ export class DiagramComponent {
     private diagram: DiagramModel;
 
     constructor(private elementRef: ElementRef,
-                private translateService: AlfrescoTranslateService,
+                private translateService: AlfrescoTranslationService,
                 private diagramColorService: DiagramColorService,
                 private raphaelService: RaphaelService,
                 private diagramsService: DiagramsService,

ng2-components/ng2-activiti-diagrams/src/services/diagrams.service.ts

@@ -18,14 +18,14 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs/Rx';
 import { Response, Http, Headers, RequestOptions } from '@angular/http';
-import { AuthService, SettingsService, LogService } from 'ng2-alfresco-core';
+import { AlfrescoAuthenticationService, AlfrescoSettingsService, LogService } from 'ng2-alfresco-core';
 
 @Injectable()
 export class DiagramsService {
 
-    constructor(private authService: AuthService,
+    constructor(private authService: AlfrescoAuthenticationService,
                 private http: Http,
-                private settingsService: SettingsService,
+                private settingsService: AlfrescoSettingsService,
                 private logService: LogService) {
     }
 

ng2-components/ng2-activiti-form/demo/src/main.ts

@@ -18,7 +18,7 @@
 import { NgModule, Component, OnInit } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-import { CoreModule, SettingsService, AuthService, StorageService, LogService } from 'ng2-alfresco-core';
+import { CoreModule, AlfrescoSettingsService, AlfrescoAuthenticationService, StorageService, LogService } from 'ng2-alfresco-core';
 import { ActivitiFormModule } from 'ng2-activiti-form';
 
 @Component({
@@ -47,8 +47,8 @@ export class FormDemoComponent implements OnInit {
     host: string = 'http://localhost:9999';
     ticket: string;
 
-    constructor(private authService: AuthService,
+    constructor(private authService: AlfrescoAuthenticationService,
-                private settingsService: SettingsService,
+                private settingsService: AlfrescoSettingsService,
                 private storage: StorageService,
                 private logService: LogService) {
         settingsService.bpmHost = this.host;

ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.spec.ts

@@ -25,7 +25,7 @@ import { WIDGET_DIRECTIVES } from './widgets/index';
 import { FormService } from './../services/form.service';
 import { EcmModelService } from './../services/ecm-model.service';
 import { WidgetVisibilityService } from './../services/widget-visibility.service';
-import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 import { TranslationMock } from './../assets/translation.service.mock';
 
 describe('ActivitiStartForm', () => {
@@ -48,7 +48,7 @@ describe('ActivitiStartForm', () => {
                 ...WIDGET_DIRECTIVES
             ],
             providers: [
-                { provide: AlfrescoTranslateService, useClass: TranslationMock },
+                { provide: AlfrescoTranslationService, useClass: TranslationMock },
                 EcmModelService,
                 FormService,
                 WidgetVisibilityService

ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts

@@ -26,7 +26,7 @@ import {
     Output,
     EventEmitter
 } from '@angular/core';
-import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core';
 import { ActivitiForm } from './activiti-form.component';
 import { FormService } from './../services/form.service';
 import { WidgetVisibilityService }  from './../services/widget-visibility.service';
@@ -75,7 +75,7 @@ export class ActivitiStartForm extends ActivitiForm implements AfterViewChecked,
     @ViewChild('outcomesContainer', {})
     outcomesContainer: ElementRef = null;
 
-    constructor(private translate: AlfrescoTranslateService,
+    constructor(private translate: AlfrescoTranslationService,
                 formService: FormService,
                 visibilityService: WidgetVisibilityService,
                 logService: LogService) {

ng2-components/ng2-activiti-processlist/demo/src/main.ts

@@ -28,7 +28,7 @@ import {
     ActivitiStartProcessInstance,
     ProcessInstance
 } from 'ng2-activiti-processlist';
-import { AuthService, SettingsService, StorageService } from 'ng2-alfresco-core';
+import { AlfrescoAuthenticationService, AlfrescoSettingsService, StorageService } from 'ng2-alfresco-core';
 import { ObjectDataTableAdapter } from 'ng2-alfresco-datatable';
 
 const currentProcessIdNew = '__NEW__';
@@ -160,8 +160,8 @@ class MyDemoApp implements OnInit {
 
     dataProcesses: ObjectDataTableAdapter;
 
-    constructor(private authService: AuthService,
+    constructor(private authService: AlfrescoAuthenticationService,
-                private settingsService: SettingsService,
+                private settingsService: AlfrescoSettingsService,
                 private storage: StorageService,
                 private logService: LogService) {
         settingsService.bpmHost = this.host;

ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts

@@ -17,7 +17,7 @@
 
 import { Component, Output, EventEmitter, OnInit, Input, OnChanges, SimpleChanges } from '@angular/core';
 import { Observable, Observer } from 'rxjs/Rx';
-import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core';
 import { FilterProcessRepresentationModel } from './../models/filter-process.model';
 import { ActivitiProcessService } from './../services/activiti-process.service';
 
@@ -53,7 +53,7 @@ export class ActivitiProcessFilters implements OnInit, OnChanges {
 
     filters: FilterProcessRepresentationModel [] = [];
 
-    constructor(private translate: AlfrescoTranslateService,
+    constructor(private translate: AlfrescoTranslationService,
                 private activiti: ActivitiProcessService,
                 private logService: LogService) {
         this.filter$ = new Observable<FilterProcessRepresentationModel>(observer => this.filterObserver = observer).share();

ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.spec.ts

@@ -20,7 +20,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { Observable } from 'rxjs/Rx';
 
-import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 import { ActivitiFormModule } from 'ng2-activiti-form';
 
 import { ActivitiProcessComments } from './activiti-process-comments.component';
@@ -46,7 +46,7 @@ describe('ActivitiProcessInstanceComments', () => {
                 ActivitiProcessComments
             ],
             providers: [
-                { provide: AlfrescoTranslateService, useClass: TranslationMock },
+                { provide: AlfrescoTranslationService, useClass: TranslationMock },
                 ActivitiProcessService
             ]
         }).compileComponents();

ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { Component, EventEmitter, Input, Output, ViewChild, OnChanges, SimpleChanges } from '@angular/core';
-import { AlfrescoTranslateService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { ActivitiProcessService } from './../services/activiti-process.service';
 import { Comment } from 'ng2-activiti-tasklist';
 import { Observer } from 'rxjs/Observer';
@@ -56,7 +56,7 @@ export class ActivitiProcessComments implements OnChanges {
      * @param translate Translation service
      * @param activitiProcess Process service
      */
-    constructor(private translate: AlfrescoTranslateService,
+    constructor(private translate: AlfrescoTranslationService,
                 private activitiProcess: ActivitiProcessService) {
 
         if (translate) {

ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.spec.ts

@@ -20,7 +20,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { Observable } from 'rxjs/Rx';
 
-import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 import { ActivitiFormModule, FormService } from 'ng2-activiti-form';
 import { ActivitiTaskListModule } from 'ng2-activiti-tasklist';
 
@@ -50,7 +50,7 @@ describe('ActivitiProcessInstanceDetails', () => {
                 ActivitiProcessInstanceDetails
             ],
             providers: [
-                { provide: AlfrescoTranslateService, useClass: TranslationMock },
+                { provide: AlfrescoTranslationService, useClass: TranslationMock },
                 ActivitiProcessService
             ],
             schemas: [ NO_ERRORS_SCHEMA ]

ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { Component, Input, ViewChild, Output, EventEmitter, OnChanges, SimpleChanges } from '@angular/core';
-import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core';
 import { TaskDetailsEvent } from 'ng2-activiti-tasklist';
 
 import { ActivitiProcessService } from './../services/activiti-process.service';
@@ -60,7 +60,7 @@ export class ActivitiProcessInstanceDetails implements OnChanges {
      * @param translate Translation service
      * @param activitiProcess   Process service
      */
-    constructor(private translate: AlfrescoTranslateService,
+    constructor(private translate: AlfrescoTranslationService,
                 private activitiProcess: ActivitiProcessService,
                 private logService: LogService) {
 

ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.spec.ts

@@ -17,7 +17,7 @@
 
 import { ComponentFixture, TestBed, async } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 import { ActivitiProcessInstanceHeader } from './activiti-process-instance-header.component';
 import { TranslationMock } from './../assets/translation.service.mock';
 import { exampleProcess } from './../assets/activiti-process.model.mock';
@@ -42,7 +42,7 @@ describe('ActivitiProcessInstanceHeader', () => {
             ],
             providers: [
                 ActivitiProcessService,
-                {provide: AlfrescoTranslateService, useClass: TranslationMock}
+                {provide: AlfrescoTranslationService, useClass: TranslationMock}
             ]
         }).compileComponents();
     }));

ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { Component, Input, Output, EventEmitter } from '@angular/core';
-import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core';
 import { ProcessInstance } from '../models/process-instance.model';
 import { DatePipe } from '@angular/common';
 
@@ -36,7 +36,7 @@ export class ActivitiProcessInstanceHeader {
     @Output()
     onError: EventEmitter<any> = new EventEmitter<any>();
 
-    constructor(private translate: AlfrescoTranslateService,
+    constructor(private translate: AlfrescoTranslationService,
                 private logService: LogService) {
 
         if (translate) {

ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.spec.ts

@@ -20,7 +20,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { Observable } from 'rxjs/Rx';
 
-import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 import { TaskDetailsModel } from 'ng2-activiti-tasklist';
 
 import { ActivitiProcessInstanceTasks } from './activiti-process-instance-tasks.component';
@@ -49,7 +49,7 @@ describe('ActivitiProcessInstanceTasks', () => {
                 ActivitiProcessInstanceTasks
             ],
             providers: [
-                { provide: AlfrescoTranslateService, useClass: TranslationMock },
+                { provide: AlfrescoTranslationService, useClass: TranslationMock },
                 ActivitiProcessService
             ],
             schemas: [NO_ERRORS_SCHEMA]

ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts

@@ -18,7 +18,7 @@
 import { Component, Input, OnInit, ViewChild, Output, EventEmitter, OnChanges, SimpleChanges } from '@angular/core';
 import { DatePipe } from '@angular/common';
 import { Observable, Observer } from 'rxjs/Rx';
-import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core';
 import { ActivitiProcessService } from './../services/activiti-process.service';
 import { TaskDetailsModel, TaskDetailsEvent } from 'ng2-activiti-tasklist';
 import { ProcessInstance } from '../models/process-instance.model';
@@ -64,7 +64,7 @@ export class ActivitiProcessInstanceTasks implements OnInit, OnChanges {
     @Output()
     taskClick: EventEmitter<TaskDetailsEvent> = new EventEmitter<TaskDetailsEvent>();
 
-    constructor(private translate: AlfrescoTranslateService,
+    constructor(private translate: AlfrescoTranslationService,
                 private activitiProcess: ActivitiProcessService,
                 private logService: LogService) {
         if (translate) {

ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.spec.ts

@@ -20,7 +20,7 @@ import { ComponentFixture, TestBed, async, fakeAsync, tick } from '@angular/core
 import { By } from '@angular/platform-browser';
 import { Observable } from 'rxjs/Rx';
 
-import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 import { DataTableModule, ObjectDataTableAdapter, ObjectDataRow } from 'ng2-alfresco-datatable';
 
 import { ActivitiProcessInstanceVariables } from './activiti-process-instance-variables.component';
@@ -47,7 +47,7 @@ describe('ActivitiProcessInstanceVariables', () => {
                 ActivitiProcessInstanceVariables
             ],
             providers: [
-                { provide: AlfrescoTranslateService, useClass: TranslationMock },
+                { provide: AlfrescoTranslationService, useClass: TranslationMock },
                 ActivitiProcessService
             ]
         }).compileComponents();

ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.ts

@@ -17,7 +17,7 @@
 
 import { Component, DebugElement, EventEmitter, Input, Output, OnInit, ViewChild, OnChanges, SimpleChanges } from '@angular/core';
 
-import { AlfrescoTranslateService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { ObjectDataTableAdapter, DataTableAdapter, ObjectDataRow } from 'ng2-alfresco-datatable';
 import { ProcessInstanceVariable } from './../models/process-instance-variable.model';
 import { ActivitiProcessService } from './../services/activiti-process.service';
@@ -67,7 +67,7 @@ export class ActivitiProcessInstanceVariables implements OnInit, OnChanges {
      * @param translate Translation service
      * @param activitiProcess Process service
      */
-    constructor(private translate: AlfrescoTranslateService,
+    constructor(private translate: AlfrescoTranslationService,
                 private activitiProcess: ActivitiProcessService) {
 
         if (translate) {

ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts

@@ -20,7 +20,7 @@ import { ComponentFixture, TestBed, async, fakeAsync, tick } from '@angular/core
 import { Observable } from 'rxjs/Rx';
 import { ActivitiProcessInstanceListComponent } from './activiti-processlist.component';
 
-import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 import { DataTableModule, ObjectDataRow, DataRowEvent, ObjectDataTableAdapter, DataSorting } from 'ng2-alfresco-datatable';
 
 import { TranslationMock } from './../assets/translation.service.mock';
@@ -65,7 +65,7 @@ describe('ActivitiProcessInstanceListComponent', () => {
             declarations: [ ActivitiProcessInstanceListComponent ],
             providers: [
                 ActivitiProcessService,
-                {provide: AlfrescoTranslateService, useClass: TranslationMock}
+                {provide: AlfrescoTranslationService, useClass: TranslationMock}
             ]
         }).compileComponents().then(() => {
             fixture = TestBed.createComponent(ActivitiProcessInstanceListComponent);

ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { Component, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges } from '@angular/core';
-import { AlfrescoTranslateService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { ObjectDataTableAdapter, DataTableAdapter, DataRowEvent, ObjectDataRow, DataSorting } from 'ng2-alfresco-datatable';
 import { ProcessFilterRequestRepresentation } from '../models/process-instance-filter.model';
 import { ProcessInstance } from '../models/process-instance.model';
@@ -69,7 +69,7 @@ export class ActivitiProcessInstanceListComponent implements OnInit, OnChanges {
     ];
 
     constructor(private processService: ActivitiProcessService,
-                private translate: AlfrescoTranslateService) {
+                private translate: AlfrescoTranslationService) {
         if (translate !== null) {
             translate.addTranslationFolder('ng2-activiti-processlist', 'node_modules/ng2-activiti-processlist/src');
         }

ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.spec.ts

@@ -19,7 +19,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { DebugElement, SimpleChange } from '@angular/core';
 import { Observable } from 'rxjs/Rx';
-import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 import { ActivitiFormModule, FormService } from 'ng2-activiti-form';
 
 import { TranslationMock } from './../assets/translation.service.mock';
@@ -49,7 +49,7 @@ describe('ActivitiStartProcessInstance', () => {
                 ActivitiStartProcessInstance
             ],
             providers: [
-                { provide: AlfrescoTranslateService, useClass: TranslationMock },
+                { provide: AlfrescoTranslationService, useClass: TranslationMock },
                 ActivitiProcessService,
                 FormService
             ]

ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { Component, EventEmitter, Input, Output, ViewChild, OnChanges, SimpleChanges } from '@angular/core';
-import { AlfrescoTranslateService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { ActivitiStartForm } from 'ng2-activiti-form';
 import { ProcessInstance } from './../models/process-instance.model';
 import { ProcessDefinitionRepresentation } from './../models/process-definition.model';
@@ -53,7 +53,7 @@ export class ActivitiStartProcessInstance implements OnChanges {
 
     errorMessageId: string = '';
 
-    constructor(private translate: AlfrescoTranslateService,
+    constructor(private translate: AlfrescoTranslationService,
                 private activitiProcess: ActivitiProcessService) {
 
         if (translate) {

ng2-components/ng2-activiti-tasklist/demo/src/main.ts

@@ -26,7 +26,7 @@ import {
     ActivitiTaskList
 } from 'ng2-activiti-tasklist';
 import { CoreModule, LogService } from 'ng2-alfresco-core';
-import { AuthService, SettingsService, StorageService } from 'ng2-alfresco-core';
+import { AlfrescoAuthenticationService, AlfrescoSettingsService, StorageService } from 'ng2-alfresco-core';
 import { ObjectDataTableAdapter } from 'ng2-alfresco-datatable';
 
 @Component({
@@ -144,8 +144,8 @@ class MyDemoApp implements OnInit {
 
     dataTasks: ObjectDataTableAdapter;
 
-    constructor(private authService: AuthService,
+    constructor(private authService: AlfrescoAuthenticationService,
-                private settingsService: SettingsService,
+                private settingsService: AlfrescoSettingsService,
                 private storage: StorageService,
                 private logService: LogService) {
         settingsService.bpmHost = this.host;

ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.spec.ts

@@ -19,7 +19,7 @@ import { DebugElement } from '@angular/core';
 import { ComponentFixture, TestBed, async } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { Observable } from 'rxjs/Rx';
-import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core';
+import { CoreModule, AlfrescoTranslationService } from 'ng2-alfresco-core';
 
 import { ActivitiApps } from './activiti-apps.component';
 import { ActivitiTaskListService } from './../services/activiti-tasklist.service';
@@ -47,7 +47,7 @@ describe('ActivitiApps', () => {
             ]
         }).compileComponents();
 
-        let translateService = TestBed.get(AlfrescoTranslateService);
+        let translateService = TestBed.get(AlfrescoTranslationService);
         spyOn(translateService, 'addTranslationFolder').and.stub();
         spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); });
     }));

ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { Component, OnInit, Output, EventEmitter, Input } from '@angular/core';
-import { AlfrescoTranslateService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { ActivitiTaskListService } from './../services/activiti-tasklist.service';
 import { AppDefinitionRepresentationModel } from '../models/filter.model';
 import { IconModel } from '../models/icon.model';
@@ -65,7 +65,7 @@ export class ActivitiApps implements OnInit {
      * @param translate Translate service
      * @param activitiTaskList Task service
      */
-    constructor(private translateService: AlfrescoTranslateService,
+    constructor(private translateService: AlfrescoTranslationService,
                 private activitiTaskList: ActivitiTaskListService) {
 
         if (translateService) {

ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.spec.ts

@@ -18,7 +18,7 @@
 import { SimpleChange } from '@angular/core';
 import { ComponentFixture, TestBed, async } from '@angular/core/testing';
 import { Observable } from 'rxjs/Rx';
-import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core';
+import { CoreModule, AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { ActivitiTaskListService } from '../services/activiti-tasklist.service';
 import { ActivitiChecklist } from './activiti-checklist.component';
 import { TaskDetailsModel } from '../models/task-details.model';
@@ -49,7 +49,7 @@ describe('ActivitiChecklist', () => {
                 ActivitiTaskListService
             ]
         }).compileComponents().then(() => {
-            let translateService = TestBed.get(AlfrescoTranslateService);
+            let translateService = TestBed.get(AlfrescoTranslationService);
             spyOn(translateService, 'addTranslationFolder').and.stub();
             spyOn(translateService, 'get').and.callFake((key) => {
                 return Observable.of(key);

ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { Component, Input, OnInit, ViewChild, OnChanges, SimpleChanges, EventEmitter, Output } from '@angular/core';
-import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core';
 import { ActivitiTaskListService } from './../services/activiti-tasklist.service';
 import { TaskDetailsModel } from '../models/task-details.model';
 import { Observer, Observable } from 'rxjs/Rx';
@@ -59,7 +59,7 @@ export class ActivitiChecklist implements OnInit, OnChanges {
      * @param auth
      * @param translate
      */
-    constructor(private translateService: AlfrescoTranslateService,
+    constructor(private translateService: AlfrescoTranslationService,
                 private activitiTaskList: ActivitiTaskListService,
                 private logService: LogService) {
 

ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.spec.ts

@@ -20,7 +20,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { Observable } from 'rxjs/Rx';
 
-import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core';
+import { CoreModule, AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { ActivitiFormModule } from 'ng2-activiti-form';
 
 import { ActivitiComments } from './activiti-comments.component';
@@ -49,7 +49,7 @@ describe('ActivitiComments', () => {
             ]
         }).compileComponents();
 
-        let translateService = TestBed.get(AlfrescoTranslateService);
+        let translateService = TestBed.get(AlfrescoTranslationService);
         spyOn(translateService, 'addTranslationFolder').and.stub();
         spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); });
     }));

ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { Component, Input, Output, ViewChild, OnChanges, SimpleChanges, EventEmitter } from '@angular/core';
-import { AlfrescoTranslateService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { ActivitiTaskListService } from './../services/activiti-tasklist.service';
 import { Comment } from '../models/comment.model';
 import { Observer, Observable } from 'rxjs/Rx';
@@ -56,7 +56,7 @@ export class ActivitiComments implements OnChanges {
      * @param translate Translation service
      * @param activitiTaskList Task service
      */
-    constructor(private translateService: AlfrescoTranslateService,
+    constructor(private translateService: AlfrescoTranslationService,
                 private activitiTaskList: ActivitiTaskListService) {
 
         if (translateService) {

ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts

@@ -17,7 +17,7 @@
 
 import { Component, Output, EventEmitter, OnInit, Input, SimpleChanges, OnChanges } from '@angular/core';
 import { Observer, Observable } from 'rxjs/Rx';
-import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core';
 import { ActivitiTaskListService } from './../services/activiti-tasklist.service';
 import { FilterRepresentationModel } from '../models/filter.model';
 
@@ -54,7 +54,7 @@ export class ActivitiFilters implements OnInit, OnChanges {
 
     filters: FilterRepresentationModel [] = [];
 
-    constructor(private translateService: AlfrescoTranslateService,
+    constructor(private translateService: AlfrescoTranslationService,
                 private activiti: ActivitiTaskListService,
                 private logService: LogService) {
         this.filter$ = new Observable<FilterRepresentationModel>(observer => this.filterObserver = observer).share();

ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.spec.ts

@@ -17,7 +17,7 @@
 
 import { ComponentFixture, TestBed, async } from '@angular/core/testing';
 import { Observable } from 'rxjs/Observable';
-import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core';
+import { CoreModule, AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { ActivitiPeopleSearch } from './activiti-people-search.component';
 import { User } from '../models/user.model';
 
@@ -56,7 +56,7 @@ describe('ActivitiPeopleSearch', () => {
             ]
         }).compileComponents().then(() => {
 
-            let translateService = TestBed.get(AlfrescoTranslateService);
+            let translateService = TestBed.get(AlfrescoTranslationService);
             spyOn(translateService, 'addTranslationFolder').and.stub();
             spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); });
 

ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts

@@ -19,7 +19,7 @@ import { Component, Input, Output, EventEmitter, OnInit, AfterViewInit } from '@
 import { FormControl } from '@angular/forms';
 import { User } from '../models/user.model';
 import { Observable } from 'rxjs/Observable';
-import { AlfrescoTranslateService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService } from 'ng2-alfresco-core';
 
 declare let componentHandler: any;
 
@@ -45,7 +45,7 @@ export class ActivitiPeopleSearch implements OnInit, AfterViewInit {
 
     userList: User[] = [];
 
-    constructor(private translateService: AlfrescoTranslateService) {
+    constructor(private translateService: AlfrescoTranslationService) {
         if (translateService) {
             translateService.addTranslationFolder('ng2-activiti-tasklist', 'node_modules/ng2-activiti-tasklist/src');
         }

ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.spec.ts

@@ -17,7 +17,7 @@
 
 import { ComponentFixture, TestBed, async } from '@angular/core/testing';
 import { Observable } from 'rxjs/Rx';
-import { CoreModule, AlfrescoTranslateService, LogService } from 'ng2-alfresco-core';
+import { CoreModule, AlfrescoTranslationService, LogService } from 'ng2-alfresco-core';
 import { ActivitiPeopleService } from '../services/activiti-people.service';
 import { ActivitiPeople } from './activiti-people.component';
 import { ActivitiPeopleSearch } from './activiti-people-search.component';
@@ -62,7 +62,7 @@ describe('ActivitiPeople', () => {
         }).compileComponents().then(() => {
             logService = TestBed.get(LogService);
 
-            let translateService = TestBed.get(AlfrescoTranslateService);
+            let translateService = TestBed.get(AlfrescoTranslationService);
             spyOn(translateService, 'addTranslationFolder').and.stub();
             spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); });
 

ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts

@@ -17,7 +17,7 @@
 
 import { Component, Input, ViewChild } from '@angular/core';
 import { Observer, Observable } from 'rxjs/Rx';
-import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core';
 import { User } from '../models/user.model';
 import { ActivitiPeopleService } from '../services/activiti-people.service';
 
@@ -51,7 +51,7 @@ export class ActivitiPeople {
      * @param translate
      * @param people service
      */
-    constructor(private translateService: AlfrescoTranslateService,
+    constructor(private translateService: AlfrescoTranslationService,
                 private peopleService: ActivitiPeopleService,
                 private logService: LogService) {
         if (translateService) {

ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.spec.ts

@@ -17,7 +17,7 @@
 
 import { ComponentFixture, TestBed, async } from '@angular/core/testing';
 import { Observable } from 'rxjs/Rx';
-import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core';
+import { CoreModule, AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { ActivitiTaskListService } from '../services/activiti-tasklist.service';
 import { ActivitiStartTaskButton } from './activiti-start-task.component';
 
@@ -43,7 +43,7 @@ describe('ActivitiStartTaskButton', () => {
                 ActivitiTaskListService
             ]
         }).compileComponents().then(() => {
-            let translateService = TestBed.get(AlfrescoTranslateService);
+            let translateService = TestBed.get(AlfrescoTranslationService);
             spyOn(translateService, 'addTranslationFolder').and.stub();
             spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); });
 

ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core';
-import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core';
 import { TaskDetailsModel } from '../models/task-details.model';
 import { ActivitiTaskListService } from './../services/activiti-tasklist.service';
 import { Form } from '../models/form.model';
@@ -54,7 +54,7 @@ export class ActivitiStartTaskButton {
      * @param translate
      * @param taskService
      */
-    constructor(private translateService: AlfrescoTranslateService,
+    constructor(private translateService: AlfrescoTranslationService,
                 private taskService: ActivitiTaskListService,
                 private logService: LogService) {
 

ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.spec.ts

@@ -20,7 +20,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { Observable } from 'rxjs/Rx';
 
-import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core';
+import { CoreModule, AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { ActivitiFormModule, FormModel, FormOutcomeEvent, FormOutcomeModel, FormService } from 'ng2-activiti-form';
 
 import { ActivitiTaskDetails } from './activiti-task-details.component';
@@ -57,7 +57,7 @@ describe('ActivitiTaskDetails', () => {
             schemas: [ NO_ERRORS_SCHEMA ]
         }).compileComponents();
 
-        let translateService = TestBed.get(AlfrescoTranslateService);
+        let translateService = TestBed.get(AlfrescoTranslationService);
         spyOn(translateService, 'addTranslationFolder').and.stub();
         spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); });
     }));

ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { Component, Input, OnInit, ViewChild, Output, EventEmitter, TemplateRef, OnChanges, SimpleChanges, DebugElement} from '@angular/core';
-import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core';
 import { ActivitiTaskListService } from './../services/activiti-tasklist.service';
 import { TaskDetailsModel } from '../models/task-details.model';
 import { User } from '../models/user.model';
@@ -93,7 +93,7 @@ export class ActivitiTaskDetails implements OnInit, OnChanges {
      * @param activitiForm Form service
      * @param activitiTaskList Task service
      */
-    constructor(private translateService: AlfrescoTranslateService,
+    constructor(private translateService: AlfrescoTranslationService,
                 private activitiForm: FormService,
                 private activitiTaskList: ActivitiTaskListService,
                 private logService: LogService) {

ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.spec.ts

@@ -18,7 +18,7 @@
 import { ComponentFixture, TestBed, async } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { Observable } from 'rxjs/Rx';
-import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core';
+import { CoreModule, AlfrescoTranslationService } from 'ng2-alfresco-core';
 
 import { ActivitiTaskHeader } from './activiti-task-header.component';
 import { taskDetailsMock } from './../assets/task-details.mock';
@@ -45,7 +45,7 @@ describe('ActivitiTaskHeader', () => {
             ]
         }).compileComponents();
 
-        let translateService = TestBed.get(AlfrescoTranslateService);
+        let translateService = TestBed.get(AlfrescoTranslationService);
         spyOn(translateService, 'addTranslationFolder').and.stub();
         spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); });
     }));

ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { Component, Input, Output, EventEmitter } from '@angular/core';
-import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core';
 import { TaskDetailsModel } from '../models/task-details.model';
 import { ActivitiTaskListService } from './../services/activiti-tasklist.service';
 
@@ -37,7 +37,7 @@ export class ActivitiTaskHeader {
     @Output()
     claim: EventEmitter<any> = new EventEmitter<any>();
 
-    constructor(private translateService: AlfrescoTranslateService,
+    constructor(private translateService: AlfrescoTranslationService,
                 private activitiTaskService: ActivitiTaskListService,
                 private logService: LogService) {
         if (translateService) {

ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts

@@ -17,7 +17,7 @@
 
 import { SimpleChange } from '@angular/core';
 import { ComponentFixture, TestBed, async } from '@angular/core/testing';
-import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core';
+import { CoreModule, AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { DataTableModule } from 'ng2-alfresco-datatable';
 import { ActivitiTaskList } from './activiti-tasklist.component';
 import { Observable } from 'rxjs/Rx';
@@ -73,7 +73,7 @@ describe('ActivitiTaskList', () => {
             ]
         }).compileComponents();
 
-        let translateService = TestBed.get(AlfrescoTranslateService);
+        let translateService = TestBed.get(AlfrescoTranslationService);
         spyOn(translateService, 'addTranslationFolder').and.stub();
         spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); });
     }));

ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { Component, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges } from '@angular/core';
-import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core';
 import { ObjectDataTableAdapter, DataTableAdapter, DataRowEvent, ObjectDataRow } from 'ng2-alfresco-datatable';
 import { ActivitiTaskListService } from './../services/activiti-tasklist.service';
 import { TaskQueryRequestRepresentationModel } from '../models/filter.model';
@@ -75,7 +75,7 @@ export class ActivitiTaskList implements OnInit, OnChanges {
         {type: 'text', key: 'created', title: 'Created', sortable: true}
     ];
 
-    constructor(private translateService: AlfrescoTranslateService,
+    constructor(private translateService: AlfrescoTranslationService,
                 private taskListService: ActivitiTaskListService,
                 private logService: LogService) {
         if (translateService) {

ng2-components/ng2-alfresco-core/index.ts

@@ -22,23 +22,18 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { TranslateModule, TranslateLoader } from 'ng2-translate/ng2-translate';
 
 import {
-    AuthService,
+    AlfrescoAuthenticationService,
-    ContentService,
+    AlfrescoContentService,
-    SettingsService,
+    AlfrescoSettingsService,
     StorageService,
     AlfrescoApiService,
     AlfrescoTranslateLoader,
-    AlfrescoTranslateService,
+    AlfrescoTranslationService,
     RenditionsService,
     AuthGuard,
     AuthGuardEcm,
     AuthGuardBpm,
-    LogService, LogServiceMock,
+    LogService, LogServiceMock
-
-    /** @deprecated */ AlfrescoSettingsService,
-    /** @deprecated */ AlfrescoTranslationService,
-    /** @deprecated */ AlfrescoAuthenticationService,
-    /** @deprecated */ AlfrescoContentService
 } from './src/services/index';
 
 import { MATERIAL_DESIGN_DIRECTIVES } from './src/components/material/index';
@@ -50,23 +45,18 @@ export * from './src/utils/index';
 
 export const ALFRESCO_CORE_PROVIDERS: any[] = [
     LogService, LogServiceMock,
-    AuthService,
+    AlfrescoAuthenticationService,
-    ContentService,
+    AlfrescoContentService,
-    SettingsService,
+    AlfrescoSettingsService,
     StorageService,
     AlfrescoApiService,
     AlfrescoTranslateLoader,
-    AlfrescoTranslateService,
+    AlfrescoTranslationService,
     RenditionsService,
     AuthGuard,
     AuthGuardEcm,
     AuthGuardBpm,
-    ...CONTEXT_MENU_PROVIDERS,
+    ...CONTEXT_MENU_PROVIDERS
-
-    /** @deprecated */ AlfrescoAuthenticationService,
-    /** @deprecated */ AlfrescoContentService,
-    /** @deprecated */ AlfrescoSettingsService,
-    /** @deprecated */ AlfrescoTranslationService
 ];
 
 export function createTranslateLoader(http: Http, logService: LogService) {

ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.ts

@@ -1,33 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Injectable } from '@angular/core';
-import { LogService } from './log.service';
-import { SettingsService } from './settings.service';
-import { StorageService } from './storage.service';
-import { AlfrescoApiService } from './alfresco-api.service';
-
-/** @deprecated AlfrescoAuthenticationService is deprecated. Use AuthService instead */
-@Injectable()
-export class AlfrescoAuthenticationService {
-    constructor(settingsService: SettingsService,
-                apiService: AlfrescoApiService,
-                storage: StorageService,
-                logService: LogService) {
-        logService.error('ERROR: AlfrescoAuthenticationService is deprecated. Use AuthService instead.');
-    }
-}

ng2-components/ng2-alfresco-core/src/services/AlfrescoContent.service.ts

@@ -1,32 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Injectable } from '@angular/core';
-import { LogService } from './log.service';
-import { AuthService } from './auth.service';
-import { AlfrescoApiService } from './alfresco-api.service';
-
-/** @deprecated AlfrescoContentService is deprecated. Use ContentService instead */
-@Injectable()
-export class AlfrescoContentService {
-
-    constructor(authService: AuthService,
-                apiService: AlfrescoApiService,
-                logService: LogService) {
-        logService.error('ERROR: AlfrescoContentService is deprecated. Use ContentService instead.');
-    }
-}

ng2-components/ng2-alfresco-core/src/services/AlfrescoSettings.service.ts

@@ -1,28 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Injectable } from '@angular/core';
-import { LogService } from './log.service';
-
-/** @deprecated AlfrescoSettingsService is deprecated. Use SettingsService instead */
-@Injectable()
-export class AlfrescoSettingsService {
-
-    constructor(logService: LogService) {
-        logService.error('ERROR: AlfrescoSettingsService is deprecated. Use SettingsService instead.');
-    }
-}

ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslation.service.ts

@@ -1,31 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Injectable } from '@angular/core';
-import { TranslateService } from 'ng2-translate/ng2-translate';
-import { LogService } from './log.service';
-
-/** @deprecated AlfrescoTranslationService is deprecated. Use AlfrescoTranslateService instead */
-@Injectable()
-export class AlfrescoTranslationService {
-
-    constructor(translate: TranslateService,
-                logService: LogService) {
-        logService.error('ERROR: AlfrescoTranslationService is deprecated. Use AlfrescoTranslateService instead.');
-    }
-
-}

ng2-components/ng2-alfresco-core/src/services/alfresco-api.service.ts

@@ -18,7 +18,7 @@
 import { Injectable } from '@angular/core';
 import { AlfrescoApi } from  'alfresco-js-api';
 import * as alfrescoApi from  'alfresco-js-api';
-import { SettingsService } from './settings.service';
+import { AlfrescoSettingsService } from './alfresco-settings.service';
 import { StorageService } from './storage.service';
 
 @Injectable()
@@ -44,7 +44,7 @@ export class AlfrescoApiService {
         return this.alfrescoApi;
     }
 
-    constructor(private settingsService: SettingsService,
+    constructor(private settingsService: AlfrescoSettingsService,
                 private storage: StorageService) {
 
         this.provider = this.settingsService.getProviders();

ng2-components/ng2-alfresco-core/src/services/alfresco-authentication.service.spec.ts

@@ -16,31 +16,31 @@
  */
 
 import { ReflectiveInjector } from '@angular/core';
-import { SettingsService } from './settings.service';
+import { AlfrescoSettingsService } from './alfresco-settings.service';
-import { AuthService } from './auth.service';
+import { AlfrescoAuthenticationService } from './alfresco-authentication.service';
 import { AlfrescoApiService } from './alfresco-api.service';
 import { StorageService } from './storage.service';
 import { LogService } from './log.service';
 
 declare let jasmine: any;
 
-describe('AuthService', () => {
+describe('AlfrescoAuthenticationService', () => {
     let injector;
-    let authService: AuthService;
+    let authService: AlfrescoAuthenticationService;
-    let settingsService: SettingsService;
+    let settingsService: AlfrescoSettingsService;
     let storage: StorageService;
 
     beforeEach(() => {
         injector = ReflectiveInjector.resolveAndCreate([
-            SettingsService,
+            AlfrescoSettingsService,
             AlfrescoApiService,
-            AuthService,
+            AlfrescoAuthenticationService,
             StorageService,
             LogService
         ]);
 
-        authService = injector.get(AuthService);
+        authService = injector.get(AlfrescoAuthenticationService);
-        settingsService = injector.get(SettingsService);
+        settingsService = injector.get(AlfrescoSettingsService);
         storage = injector.get(StorageService);
         storage.clear();
 

ng2-components/ng2-alfresco-core/src/services/alfresco-authentication.service.ts

@@ -17,17 +17,17 @@
 
 import { Injectable } from '@angular/core';
 import { Observable, Subject } from 'rxjs/Rx';
-import { SettingsService } from './settings.service';
+import { AlfrescoSettingsService } from './alfresco-settings.service';
 import { StorageService } from './storage.service';
 import { LogService } from './log.service';
 import { AlfrescoApiService } from './alfresco-api.service';
 
 @Injectable()
-export class AuthService {
+export class AlfrescoAuthenticationService {
     loginSubject: Subject<any> = new Subject<any>();
     logoutSubject: Subject<any> = new Subject<any>();
 
-    constructor(private settingsService: SettingsService,
+    constructor(private settingsService: AlfrescoSettingsService,
                 public alfrescoApi: AlfrescoApiService,
                 private storage: StorageService,
                 private logService: LogService) {

ng2-components/ng2-alfresco-core/src/services/alfresco-content.service.spec.ts

@@ -16,20 +16,20 @@
  */
 
 import { ReflectiveInjector } from '@angular/core';
-import { SettingsService } from './settings.service';
+import { AlfrescoSettingsService } from './alfresco-settings.service';
-import { AuthService } from './auth.service';
+import { AlfrescoAuthenticationService } from './alfresco-authentication.service';
-import { ContentService } from './content.service';
+import { AlfrescoContentService } from './alfresco-content.service';
 import { AlfrescoApiService } from './alfresco-api.service';
 import { StorageService } from './storage.service';
 import { LogService } from './log.service';
 
 declare let jasmine: any;
 
-describe('ContentService', () => {
+describe('AlfrescoContentService', () => {
 
-    let injector, contentService: ContentService;
+    let injector, contentService: AlfrescoContentService;
-    let authService: AuthService;
+    let authService: AlfrescoAuthenticationService;
-    let settingsService: SettingsService;
+    let settingsService: AlfrescoSettingsService;
     let storage: StorageService;
     let node: any;
 
@@ -38,16 +38,16 @@ describe('ContentService', () => {
     beforeEach(() => {
         injector = ReflectiveInjector.resolveAndCreate([
             AlfrescoApiService,
-            ContentService,
+            AlfrescoContentService,
-            AuthService,
+            AlfrescoAuthenticationService,
-            SettingsService,
+            AlfrescoSettingsService,
             StorageService,
             LogService
         ]);
 
-        authService = injector.get(AuthService);
+        authService = injector.get(AlfrescoAuthenticationService);
-        settingsService = injector.get(SettingsService);
+        settingsService = injector.get(AlfrescoSettingsService);
-        contentService = injector.get(ContentService);
+        contentService = injector.get(AlfrescoContentService);
         storage = injector.get(StorageService);
         storage.clear();
 

ng2-components/ng2-alfresco-core/src/services/alfresco-content.service.ts

@@ -17,13 +17,13 @@
 
 import { Injectable } from '@angular/core';
 
-import { AuthService } from './auth.service';
+import { AlfrescoAuthenticationService } from './alfresco-authentication.service';
 import { AlfrescoApiService } from './alfresco-api.service';
 
 @Injectable()
-export class ContentService {
+export class AlfrescoContentService {
 
-    constructor(public authService: AuthService,
+    constructor(public authService: AlfrescoAuthenticationService,
                 public apiService: AlfrescoApiService) {
     }
 

ng2-components/ng2-alfresco-core/src/services/alfresco-settings.service.spec.ts

@@ -15,18 +15,18 @@
  * limitations under the License.
  */
 
-import { SettingsService } from './settings.service';
+import { AlfrescoSettingsService } from './alfresco-settings.service';
 
-describe('SettingsService', () => {
+describe('AlfrescoSettingsService', () => {
 
-    let service: SettingsService;
+    let service: AlfrescoSettingsService;
 
     beforeEach(() => {
-        service = new SettingsService();
+        service = new AlfrescoSettingsService();
     });
 
     it('should have default ECM host', () => {
-        expect(service.ecmHost).toBe(SettingsService.DEFAULT_ECM_ADDRESS);
+        expect(service.ecmHost).toBe(AlfrescoSettingsService.DEFAULT_ECM_ADDRESS);
     });
 
     it('should change host ECM', () => {
@@ -37,7 +37,7 @@ describe('SettingsService', () => {
     });
 
     it('should have default BPM host', () => {
-        expect(service.bpmHost).toBe(SettingsService.DEFAULT_BPM_ADDRESS);
+        expect(service.bpmHost).toBe(AlfrescoSettingsService.DEFAULT_BPM_ADDRESS);
     });
 
     it('should change host BPM', () => {

ng2-components/ng2-alfresco-core/src/services/alfresco-settings.service.ts

@@ -19,7 +19,7 @@ import { Injectable } from '@angular/core';
 import { Subject } from 'rxjs/Subject';
 
 @Injectable()
-export class SettingsService {
+export class AlfrescoSettingsService {
 
     static DEFAULT_ECM_ADDRESS: string = 'http://' + window.location.hostname + ':8080';
     static DEFAULT_BPM_ADDRESS: string = 'http://' + window.location.hostname + ':9999';
@@ -27,11 +27,11 @@ export class SettingsService {
 
     static DEFAULT_BPM_CONTEXT_PATH: string = '/activiti-app';
 
-    private _ecmHost: string = SettingsService.DEFAULT_ECM_ADDRESS;
+    private _ecmHost: string = AlfrescoSettingsService.DEFAULT_ECM_ADDRESS;
-    private _bpmHost: string = SettingsService.DEFAULT_BPM_ADDRESS;
+    private _bpmHost: string = AlfrescoSettingsService.DEFAULT_BPM_ADDRESS;
-    private _csrfDisabled: boolean = SettingsService.DEFAULT_CSRF_CONFIG;
+    private _csrfDisabled: boolean = AlfrescoSettingsService.DEFAULT_CSRF_CONFIG;
 
-    private _bpmContextPath = SettingsService.DEFAULT_BPM_CONTEXT_PATH;
+    private _bpmContextPath = AlfrescoSettingsService.DEFAULT_BPM_CONTEXT_PATH;
 
     private providers: string = 'ALL'; // ECM, BPM , ALL
 

ng2-components/ng2-alfresco-core/src/services/alfresco-translate-loader.spec.ts

@@ -21,8 +21,8 @@ import { ResponseOptions, Response, XHRBackend, HttpModule } from '@angular/http
 import { MockBackend, MockConnection } from '@angular/http/testing';
 import {getTestBed, TestBed} from '@angular/core/testing';
 
-import { AlfrescoTranslateLoader } from './translate-loader.service';
+import { AlfrescoTranslateLoader } from './alfresco-translate-loader.service';
-import { AlfrescoTranslateService } from './translate.service';
+import { AlfrescoTranslationService } from './alfresco-translation.service';
 import { LogService } from './log.service';
 
 let componentJson1 = ' {"TEST": "This is a test", "TEST2": "This is another test"} ' ;
@@ -34,7 +34,7 @@ const mockBackendResponse = (connection: MockConnection, response: string) => {
 describe('TranslateLoader', () => {
     let injector: Injector;
     let backend: MockBackend;
-    let alfrescoTranslationService: AlfrescoTranslateService;
+    let alfrescoTranslationService: AlfrescoTranslationService;
     let connection: MockConnection; // this will be set when a new connection is emitted from the backend.
     let customLoader;
 
@@ -48,14 +48,14 @@ describe('TranslateLoader', () => {
                 })
             ],
             providers: [
-                AlfrescoTranslateService,
+                AlfrescoTranslationService,
                 LogService,
                 {provide: XHRBackend, useClass: MockBackend}
             ]
         });
         injector = getTestBed();
         backend = injector.get(XHRBackend);
-        alfrescoTranslationService = injector.get(AlfrescoTranslateService);
+        alfrescoTranslationService = injector.get(AlfrescoTranslationService);
         backend.connections.subscribe((c: MockConnection) => connection = c);
         customLoader = alfrescoTranslationService.translate.currentLoader;
     });

ng2-components/ng2-alfresco-core/src/services/alfresco-translation.service.spec.ts

@@ -21,18 +21,18 @@ import { ResponseOptions, Response, XHRBackend, HttpModule } from '@angular/http
 import { MockBackend, MockConnection } from '@angular/http/testing';
 import { getTestBed, TestBed } from '@angular/core/testing';
 
-import { AlfrescoTranslateService } from './translate.service';
+import { AlfrescoTranslationService } from './alfresco-translation.service';
-import { AlfrescoTranslateLoader } from './translate-loader.service';
+import { AlfrescoTranslateLoader } from './alfresco-translate-loader.service';
 import { LogService } from './log.service';
 
 const mockBackendResponse = (connection: MockConnection, response: string) => {
     connection.mockRespond(new Response(new ResponseOptions({body: response})));
 };
 
-describe('AlfrescoTranslateService', () => {
+describe('AlfrescoTranslationService', () => {
     let injector: Injector;
     let backend: MockBackend;
-    let alfrescoTranslationService: AlfrescoTranslateService;
+    let alfrescoTranslationService: AlfrescoTranslationService;
     let connection: MockConnection; // this will be set when a new connection is emitted from the backend.
 
     beforeEach(() => {
@@ -45,21 +45,21 @@ describe('AlfrescoTranslateService', () => {
                 })
             ],
             providers: [
-                AlfrescoTranslateService,
+                AlfrescoTranslationService,
                 LogService,
                 {provide: XHRBackend, useClass: MockBackend}
             ]
         });
         injector = getTestBed();
         backend = injector.get(XHRBackend);
-        alfrescoTranslationService = injector.get(AlfrescoTranslateService);
+        alfrescoTranslationService = injector.get(AlfrescoTranslationService);
         backend.connections.subscribe((c: MockConnection) => connection = c);
         alfrescoTranslationService.addTranslationFolder('fake-name', 'fake-path');
     });
 
     it('is defined', () => {
-        expect(AlfrescoTranslateService).toBeDefined();
+        expect(AlfrescoTranslationService).toBeDefined();
-        expect(alfrescoTranslationService instanceof AlfrescoTranslateService).toBeTruthy();
+        expect(alfrescoTranslationService instanceof AlfrescoTranslationService).toBeTruthy();
     });
 
     it('should be able to get translations of the KEY: TEST', () => {

ng2-components/ng2-alfresco-core/src/services/alfresco-translation.service.ts

@@ -18,10 +18,10 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs/Rx';
 import { TranslateService } from 'ng2-translate/ng2-translate';
-import { AlfrescoTranslateLoader } from './translate-loader.service';
+import { AlfrescoTranslateLoader } from './alfresco-translate-loader.service';
 
 @Injectable()
-export class AlfrescoTranslateService {
+export class AlfrescoTranslationService {
     userLang: string = 'en';
     customLoader: AlfrescoTranslateLoader;
 

ng2-components/ng2-alfresco-core/src/services/auth-guard-bpm.service.ts

@@ -22,11 +22,11 @@ import {
   RouterStateSnapshot
 } from '@angular/router';
 
-import { AuthService } from './auth.service';
+import { AlfrescoAuthenticationService } from './alfresco-authentication.service';
 
 @Injectable()
 export class AuthGuardBpm implements CanActivate, CanActivateChild {
-    constructor(private authService: AuthService, private router: Router) {}
+    constructor(private authService: AlfrescoAuthenticationService, private router: Router) {}
 
     canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
         let url: string = state.url;

ng2-components/ng2-alfresco-core/src/services/auth-guard-ecm.service.ts

@@ -22,11 +22,11 @@ import {
   RouterStateSnapshot
 } from '@angular/router';
 
-import { AuthService } from './auth.service';
+import { AlfrescoAuthenticationService } from './alfresco-authentication.service';
 
 @Injectable()
 export class AuthGuardEcm implements CanActivate, CanActivateChild {
-    constructor(private authService: AuthService, private router: Router) {}
+    constructor(private authService: AlfrescoAuthenticationService, private router: Router) {}
 
     canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
         let url: string = state.url;

ng2-components/ng2-alfresco-core/src/services/auth-guard.service.ts

@@ -22,11 +22,11 @@ import {
   RouterStateSnapshot
 } from '@angular/router';
 
-import { AuthService } from './auth.service';
+import { AlfrescoAuthenticationService } from './alfresco-authentication.service';
 
 @Injectable()
 export class AuthGuard implements CanActivate, CanActivateChild {
-    constructor(private authService: AuthService, private router: Router) {}
+    constructor(private authService: AlfrescoAuthenticationService, private router: Router) {}
 
     canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
         let url: string = state.url;

ng2-components/ng2-alfresco-core/src/services/index.ts

@@ -17,18 +17,14 @@
 
 export * from './storage.service';
 export * from './alfresco-api.service';
-export * from './AlfrescoSettings.service';
+export * from './alfresco-settings.service';
-export * from './AlfrescoTranslation.service';
+export * from './alfresco-content.service';
-export * from './AlfrescoAuthentication.service';
-export * from './AlfrescoContent.service';
 export * from './renditions.service';
 export * from './auth-guard.service';
 export * from './auth-guard-ecm.service';
 export * from './auth-guard-bpm.service';
 
 export * from './log.service';
-export * from './auth.service';
+export * from './alfresco-authentication.service';
-export * from './content.service';
+export * from './alfresco-translation.service';
-export * from './settings.service';
+export * from './alfresco-translate-loader.service';
-export * from './translate.service';
-export * from './translate-loader.service';

ng2-components/ng2-alfresco-core/src/services/renditions.service.spec.ts

@@ -18,7 +18,7 @@
 import { ReflectiveInjector } from '@angular/core';
 import { AlfrescoApiService } from './alfresco-api.service';
 import { RenditionsService } from './renditions.service';
-import { SettingsService } from './settings.service';
+import { AlfrescoSettingsService } from './alfresco-settings.service';
 import { StorageService } from './storage.service';
 import { LogService } from './log.service';
 import { fakeRedition, fakeReditionCreated, fakeReditionsList } from '../assets/renditionsService.mock';
@@ -33,7 +33,7 @@ describe('RenditionsService', () => {
         injector = ReflectiveInjector.resolveAndCreate([
             AlfrescoApiService,
             RenditionsService,
-            SettingsService,
+            AlfrescoSettingsService,
             StorageService,
             LogService
         ]);

ng2-components/ng2-alfresco-documentlist/demo/src/main.ts

@@ -19,7 +19,7 @@ import { NgModule, Component, OnInit, ViewChild } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { DocumentListModule, DocumentListComponent, DocumentActionsService } from 'ng2-alfresco-documentlist';
-import { CoreModule, StorageService, SettingsService, AuthService, AlfrescoTranslateService, LogService } from 'ng2-alfresco-core';
+import { CoreModule, StorageService, AlfrescoSettingsService, AlfrescoAuthenticationService, AlfrescoTranslationService, LogService } from 'ng2-alfresco-core';
 
 @Component({
     selector: 'alfresco-app-demo',
@@ -127,9 +127,9 @@ class DocumentListDemo implements OnInit {
     @ViewChild(DocumentListComponent)
     documentList: DocumentListComponent;
 
-    constructor(private authService: AuthService,
+    constructor(private authService: AlfrescoAuthenticationService,
-                private settingsService: SettingsService,
+                private settingsService: AlfrescoSettingsService,
-                private translateService: AlfrescoTranslateService,
+                private translateService: AlfrescoTranslationService,
                 private documentActions: DocumentActionsService,
                 private storage: StorageService,
                 private logService: LogService) {

ng2-components/ng2-alfresco-documentlist/src/assets/document-list.service.mock.ts

@@ -20,9 +20,9 @@ import { NodePaging } from './../models/document-library.model';
 import { PageNode } from './document-library.model.mock';
 import { DocumentListService } from './../services/document-list.service';
 import {
-    SettingsService,
+    AlfrescoSettingsService,
-    AuthService,
+    AlfrescoAuthenticationService,
-    ContentService,
+    AlfrescoContentService,
     AlfrescoApiService,
     LogService
 } from 'ng2-alfresco-core';
@@ -34,9 +34,9 @@ export class DocumentListServiceMock extends DocumentListService {
     getFolderRejectError: string = 'Error';
 
     constructor(
-        settings?: SettingsService,
+        settings?: AlfrescoSettingsService,
-        authService?: AuthService,
+        authService?: AlfrescoAuthenticationService,
-        contentService?: ContentService,
+        contentService?: AlfrescoContentService,
         apiService?: AlfrescoApiService,
         logService?: LogService,
     ) {

ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts

@@ -18,7 +18,7 @@
 import { Component, OnInit, Input, OnChanges, Output, SimpleChanges, EventEmitter, AfterContentInit, TemplateRef, NgZone, ViewChild, HostListener } from '@angular/core';
 import { Subject } from 'rxjs/Rx';
 import { MinimalNodeEntity, MinimalNodeEntryEntity } from 'alfresco-js-api';
-import { AlfrescoTranslateService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { DataRowEvent, DataTableComponent, ObjectDataColumn } from 'ng2-alfresco-datatable';
 import { DocumentListService } from './../services/document-list.service';
 import { ContentActionModel } from './../models/content-action.model';
@@ -118,7 +118,7 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni
     constructor(
         private documentListService: DocumentListService,
         private ngZone: NgZone,
-        private translateService: AlfrescoTranslateService) {
+        private translateService: AlfrescoTranslationService) {
 
         this.data = new ShareDataTableAdapter(this.documentListService, './', []);
 

ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { Component, Input, Output, EventEmitter, ViewChild } from '@angular/core';
-import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core';
 import { MinimalNodeEntity } from 'alfresco-js-api';
 
 import { DocumentListService } from './../services/document-list.service';
@@ -53,7 +53,7 @@ export class DocumentMenuActionComponent {
     folderName: string = '';
 
     constructor(private documentListService: DocumentListService,
-                private translateService: AlfrescoTranslateService,
+                private translateService: AlfrescoTranslationService,
                 private logService: LogService) {
 
         if (translateService) {

ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.spec.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ContentService } from 'ng2-alfresco-core';
+import { AlfrescoContentService } from 'ng2-alfresco-core';
 import { ContentActionHandler } from '../models/content-action.model';
 import { DocumentActionsService } from './document-actions.service';
 import { DocumentListServiceMock } from '../assets/document-list.service.mock';
@@ -26,11 +26,11 @@ describe('DocumentActionsService', () => {
 
     let service: DocumentActionsService;
     let documentListService: DocumentListService;
-    let contentService: ContentService;
+    let contentService: AlfrescoContentService;
 
     beforeEach(() => {
         documentListService = new DocumentListServiceMock();
-        contentService = new ContentService(null, null);
+        contentService = new AlfrescoContentService(null, null);
         service = new DocumentActionsService(documentListService, contentService);
     });
 

ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.ts

@@ -18,14 +18,14 @@
 import { Injectable } from '@angular/core';
 import { ContentActionHandler } from '../models/content-action.model';
 import { DocumentListService } from './document-list.service';
-import { ContentService } from 'ng2-alfresco-core';
+import { AlfrescoContentService } from 'ng2-alfresco-core';
 
 @Injectable()
 export class DocumentActionsService {
     private handlers: { [id: string]: ContentActionHandler; } = {};
 
     constructor(private documentListService?: DocumentListService,
-                private contentService?: ContentService) {
+                private contentService?: AlfrescoContentService) {
         this.setupActionHandlers();
     }
 

ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.spec.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { SettingsService, AuthService, AlfrescoApiService, StorageService, ContentService, LogService, LogServiceMock } from 'ng2-alfresco-core';
+import { AlfrescoSettingsService, AlfrescoAuthenticationService, AlfrescoApiService, StorageService, AlfrescoContentService, LogService, LogServiceMock } from 'ng2-alfresco-core';
 import { FileNode } from '../assets/document-library.model.mock';
 import { ReflectiveInjector } from '@angular/core';
 import { DocumentListService } from './document-list.service';
@@ -26,8 +26,8 @@ describe('DocumentListService', () => {
 
     let injector;
     let service: DocumentListService;
-    let settingsService: SettingsService;
+    let settingsService: AlfrescoSettingsService;
-    let authService: AuthService;
+    let authService: AlfrescoAuthenticationService;
     let alfrescoApiService: AlfrescoApiService;
 
     let fakeEntryNode = {
@@ -94,17 +94,17 @@ describe('DocumentListService', () => {
     beforeEach(() => {
         injector = ReflectiveInjector.resolveAndCreate([
             AlfrescoApiService,
-            AuthService,
+            AlfrescoAuthenticationService,
-            SettingsService,
+            AlfrescoSettingsService,
             AlfrescoApiService,
-            ContentService,
+            AlfrescoContentService,
             DocumentListService,
             StorageService,
             { provide: LogService, useClass: LogServiceMock }
         ]);
 
-        settingsService = injector.get(SettingsService);
+        settingsService = injector.get(AlfrescoSettingsService);
-        authService = injector.get(AuthService);
+        authService = injector.get(AlfrescoAuthenticationService);
         alfrescoApiService = injector.get(AlfrescoApiService);
         service = injector.get(DocumentListService);
         jasmine.Ajax.install();

ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts

@@ -19,7 +19,7 @@ import { Injectable } from '@angular/core';
 import { Response } from '@angular/http';
 import { Observable } from 'rxjs/Rx';
 import { NodePaging, MinimalNodeEntity, MinimalNodeEntryEntity } from 'alfresco-js-api';
-import { AuthService, ContentService, AlfrescoApiService, LogService } from 'ng2-alfresco-core';
+import { AlfrescoAuthenticationService, AlfrescoContentService, AlfrescoApiService, LogService } from 'ng2-alfresco-core';
 
 @Injectable()
 export class DocumentListService {
@@ -57,8 +57,8 @@ export class DocumentListService {
         'application/vnd.apple.numbers': 'ft_ic_spreadsheet.svg'
     };
 
-    constructor(private authService: AuthService,
+    constructor(private authService: AlfrescoAuthenticationService,
-                private contentService: ContentService,
+                private contentService: AlfrescoContentService,
                 private apiService: AlfrescoApiService,
                 private logService: LogService) {
     }

ng2-components/ng2-alfresco-login/demo/src/main.ts

@@ -19,7 +19,7 @@ import { NgModule, Component, OnInit } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
-import { CoreModule, SettingsService, AuthService, StorageService, LogService } from 'ng2-alfresco-core';
+import { CoreModule, AlfrescoSettingsService, AlfrescoAuthenticationService, StorageService, LogService } from 'ng2-alfresco-core';
 import { LoginModule } from 'ng2-alfresco-login';
 
 @Component({
@@ -70,8 +70,8 @@ export class AppComponent implements OnInit {
     isECM: boolean = true;
     isBPM: boolean = false;
 
-    constructor(private authService: AuthService,
+    constructor(private authService: AlfrescoAuthenticationService,
-                private settingsService: SettingsService,
+                private settingsService: AlfrescoSettingsService,
                 private storage: StorageService,
                 private logService: LogService) {
 

ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts

@@ -17,8 +17,8 @@
 
 import { ComponentFixture, TestBed, async } from '@angular/core/testing';
 import { DebugElement }    from '@angular/core';
-import { AuthService, CoreModule } from 'ng2-alfresco-core';
+import { AlfrescoAuthenticationService, CoreModule } from 'ng2-alfresco-core';
-import { AlfrescoTranslateService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { AlfrescoLoginComponent } from './alfresco-login.component';
 import { AuthenticationMock } from './../assets/authentication.service.mock';
 import { TranslationMock } from './../assets/translation.service.mock';
@@ -38,8 +38,8 @@ describe('AlfrescoLogin', () => {
             ],
             declarations: [AlfrescoLoginComponent],
             providers: [
-                {provide: AuthService, useClass: AuthenticationMock},
+                {provide: AlfrescoAuthenticationService, useClass: AuthenticationMock},
-                {provide: AlfrescoTranslateService, useClass: TranslationMock}
+                {provide: AlfrescoTranslationService, useClass: TranslationMock}
             ]
         }).compileComponents();
     }));

ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts

@@ -17,7 +17,7 @@
 
 import { Component, Input, Output, EventEmitter, OnInit } from '@angular/core';
 import { FormGroup, FormBuilder, Validators } from '@angular/forms';
-import { AlfrescoTranslateService, AuthService, SettingsService, LogService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService, AlfrescoAuthenticationService, AlfrescoSettingsService, LogService } from 'ng2-alfresco-core';
 import { FormSubmitEvent } from '../models/form-submit-event.model';
 
 declare let componentHandler: any;
@@ -75,9 +75,9 @@ export class AlfrescoLoginComponent implements OnInit {
      * @param translate
      */
     constructor(private _fb: FormBuilder,
-                private authService: AuthService,
+                private authService: AlfrescoAuthenticationService,
-                private settingsService: SettingsService,
+                private settingsService: AlfrescoSettingsService,
-                private translateService: AlfrescoTranslateService,
+                private translateService: AlfrescoTranslationService,
                 private logService: LogService) {
 
         if (translateService) {

ng2-components/ng2-alfresco-search/demo/src/main.ts

@@ -23,9 +23,9 @@ import { CoreModule, LogService } from 'ng2-alfresco-core';
 import { SearchModule } from 'ng2-alfresco-search';
 
 import {
-    SettingsService,
+    AlfrescoSettingsService,
-    AuthService,
+    AlfrescoAuthenticationService,
-    AlfrescoTranslateService
+    AlfrescoTranslationService
 } from 'ng2-alfresco-core';
 
 @Component({
@@ -54,9 +54,9 @@ class SearchDemo implements OnInit {
     ecmHost: string = 'http://localhost:8080';
     ticket: string;
 
-    constructor(private authService: AuthService,
+    constructor(private authService: AlfrescoAuthenticationService,
-                private settingsService: SettingsService,
+                private settingsService: AlfrescoSettingsService,
-                translation: AlfrescoTranslateService,
+                translation: AlfrescoTranslationService,
                 private logService: LogService) {
 
         settingsService.ecmHost = this.ecmHost;

ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.spec.ts

@@ -23,10 +23,10 @@ import { result, results, folderResult, noResult, errorJson } from './../assets/
 import { AlfrescoSearchService } from '../services/alfresco-search.service';
 import {
     AlfrescoApiService,
-    SettingsService,
+    AlfrescoSettingsService,
-    AuthService,
+    AlfrescoAuthenticationService,
-    ContentService,
+    AlfrescoContentService,
-    AlfrescoTranslateService,
+    AlfrescoTranslationService,
     CoreModule
 } from 'ng2-alfresco-core';
 
@@ -48,12 +48,12 @@ describe('AlfrescoSearchAutocompleteComponent', () => {
             ],
             declarations: [ AlfrescoSearchAutocompleteComponent ], // declare the test component
             providers: [
-                {provide: AlfrescoTranslateService, useClass: TranslationMock},
+                {provide: AlfrescoTranslationService, useClass: TranslationMock},
                 AlfrescoThumbnailService,
-                SettingsService,
+                AlfrescoSettingsService,
                 AlfrescoApiService,
-                AuthService,
+                AlfrescoAuthenticationService,
-                ContentService,
+                AlfrescoContentService,
                 AlfrescoSearchService
             ]
         }).compileComponents().then(() => {
@@ -64,7 +64,7 @@ describe('AlfrescoSearchAutocompleteComponent', () => {
     }));
 
     it('should setup i18n folder', () => {
-        let translationService = fixture.debugElement.injector.get(AlfrescoTranslateService);
+        let translationService = fixture.debugElement.injector.get(AlfrescoTranslationService);
         spyOn(translationService, 'addTranslationFolder');
         fixture.detectChanges();
         expect(translationService.addTranslationFolder).toHaveBeenCalledWith('ng2-alfresco-search', 'node_modules/ng2-alfresco-search/src');

ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { Component, ElementRef, EventEmitter, Input, OnInit, OnChanges, Output, ViewChild } from '@angular/core';
-import { AlfrescoTranslateService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { MinimalNodeEntity } from 'alfresco-js-api';
 import { AlfrescoSearchService, SearchOptions } from './../services/alfresco-search.service';
 import { AlfrescoThumbnailService } from './../services/alfresco-thumbnail.service';
@@ -71,7 +71,7 @@ export class AlfrescoSearchAutocompleteComponent implements OnInit, OnChanges {
     baseComponentPath: string = module.id.replace('/components/alfresco-search.component.js', '');
 
     constructor(private searchService: AlfrescoSearchService,
-                private translateService: AlfrescoTranslateService,
+                private translateService: AlfrescoTranslationService,
                 private thumbnailService: AlfrescoThumbnailService) {
     }
 

ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.spec.ts

@@ -22,11 +22,11 @@ import { AlfrescoThumbnailService } from './../services/alfresco-thumbnail.servi
 import { TranslationMock } from './../assets/translation.service.mock';
 import { result } from './../assets/alfresco-search.component.mock';
 import {
-    SettingsService,
+    AlfrescoSettingsService,
     AlfrescoApiService,
-    AuthService,
+    AlfrescoAuthenticationService,
-    ContentService,
+    AlfrescoContentService,
-    AlfrescoTranslateService,
+    AlfrescoTranslationService,
     CoreModule
 } from 'ng2-alfresco-core';
 import { AlfrescoSearchService } from '../services/alfresco-search.service';
@@ -49,12 +49,12 @@ describe('AlfrescoSearchControlComponent', () => {
                 AlfrescoSearchAutocompleteComponent
             ],
             providers: [
-                {provide: AlfrescoTranslateService, useClass: TranslationMock},
+                {provide: AlfrescoTranslationService, useClass: TranslationMock},
                 AlfrescoThumbnailService,
-                SettingsService,
+                AlfrescoSettingsService,
                 AlfrescoApiService,
-                AuthService,
+                AlfrescoAuthenticationService,
-                ContentService,
+                AlfrescoContentService,
                 AlfrescoSearchService
             ]
         }).compileComponents().then(() => {
@@ -65,7 +65,7 @@ describe('AlfrescoSearchControlComponent', () => {
     }));
 
     it('should setup i18n folder', () => {
-        let translationService = fixture.debugElement.injector.get(AlfrescoTranslateService);
+        let translationService = fixture.debugElement.injector.get(AlfrescoTranslationService);
         spyOn(translationService, 'addTranslationFolder');
         fixture.detectChanges();
         expect(translationService.addTranslationFolder)

ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts

@@ -18,7 +18,7 @@
 import { FormControl, Validators } from '@angular/forms';
 import { Component, Input, Output, OnInit, OnDestroy, ElementRef, EventEmitter, ViewChild } from '@angular/core';
 import { Observable, Subject } from 'rxjs/Rx';
-import { AlfrescoTranslateService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { AlfrescoSearchAutocompleteComponent } from './alfresco-search-autocomplete.component';
 import { SearchTermValidator } from './../forms/search-term-validator';
 
@@ -86,7 +86,7 @@ export class AlfrescoSearchControlComponent implements OnInit, OnDestroy {
 
     private focusSubject = new Subject<FocusEvent>();
 
-    constructor(private translateService: AlfrescoTranslateService) {
+    constructor(private translateService: AlfrescoTranslationService) {
 
         this.searchControl = new FormControl(
             this.searchTerm,

ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts

@@ -25,10 +25,10 @@ import { AlfrescoThumbnailService } from './../services/alfresco-thumbnail.servi
 import { TranslationMock } from './../assets/translation.service.mock';
 import { AlfrescoSearchService } from '../services/alfresco-search.service';
 import {
-    SettingsService,
+    AlfrescoSettingsService,
     AlfrescoApiService,
-    AuthService,
+    AlfrescoAuthenticationService,
-    AlfrescoTranslateService,
+    AlfrescoTranslationService,
     CoreModule,
     StorageService,
     LogService
@@ -107,7 +107,7 @@ describe('AlfrescoSearchComponent', () => {
             declarations: [ AlfrescoSearchComponent ], // declare the test component
             providers: [
                 AlfrescoSearchService,
-                {provide: AlfrescoTranslateService, useClass: TranslationMock},
+                {provide: AlfrescoTranslationService, useClass: TranslationMock},
                 AlfrescoThumbnailService
             ]
         }).compileComponents().then(() => {
@@ -133,8 +133,8 @@ describe('AlfrescoSearchComponent', () => {
     it('should have a null search term if no query param provided via RouteParams', () => {
         let injector = ReflectiveInjector.resolveAndCreate([
             AlfrescoSearchService,
-            AuthService,
+            AlfrescoAuthenticationService,
-            SettingsService,
+            AlfrescoSettingsService,
             AlfrescoApiService,
             StorageService,
             LogService,
@@ -146,7 +146,7 @@ describe('AlfrescoSearchComponent', () => {
     });
 
     it('should setup i18n folder', () => {
-        let translationService = fixture.debugElement.injector.get(AlfrescoTranslateService);
+        let translationService = fixture.debugElement.injector.get(AlfrescoTranslationService);
         spyOn(translationService, 'addTranslationFolder');
         fixture.detectChanges();
         expect(translationService.addTranslationFolder).toHaveBeenCalledWith('ng2-alfresco-search', 'node_modules/ng2-alfresco-search/src');

ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts

@@ -19,7 +19,7 @@ import { Component, EventEmitter, Input, Output, Optional, OnChanges, SimpleChan
 import { ActivatedRoute, Params } from '@angular/router';
 import { AlfrescoSearchService, SearchOptions } from './../services/alfresco-search.service';
 import { AlfrescoThumbnailService } from './../services/alfresco-thumbnail.service';
-import { AlfrescoTranslateService } from 'ng2-alfresco-core';
+import { AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { MinimalNodeEntity } from 'alfresco-js-api';
 
 @Component({
@@ -66,7 +66,7 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit {
     baseComponentPath: string = module.id.replace('/components/alfresco-search.component.js', '');
 
     constructor(private searchService: AlfrescoSearchService,
-                private translateService: AlfrescoTranslateService,
+                private translateService: AlfrescoTranslationService,
                 private thumbnailService: AlfrescoThumbnailService,
                 @Optional() private route: ActivatedRoute) {
     }

ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.spec.ts

@@ -17,7 +17,7 @@
 
 import { ReflectiveInjector } from '@angular/core';
 import { AlfrescoSearchService } from './alfresco-search.service';
-import { AuthService, SettingsService, AlfrescoApiService, StorageService, LogService } from 'ng2-alfresco-core';
+import { AlfrescoAuthenticationService, AlfrescoSettingsService, AlfrescoApiService, StorageService, LogService } from 'ng2-alfresco-core';
 import { fakeApi, fakeSearch, fakeError } from '../assets/alfresco-search.service.mock';
 
 declare let jasmine: any;
@@ -31,9 +31,9 @@ describe('AlfrescoSearchService', () => {
     beforeEach(() => {
         injector = ReflectiveInjector.resolveAndCreate([
             AlfrescoSearchService,
-            SettingsService,
+            AlfrescoSettingsService,
             AlfrescoApiService,
-            AuthService,
+            AlfrescoAuthenticationService,
             StorageService,
             LogService
         ]);

ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts

@@ -17,7 +17,7 @@
 
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs/Rx';
-import { AuthService, AlfrescoApiService } from 'ng2-alfresco-core';
+import { AlfrescoAuthenticationService, AlfrescoApiService } from 'ng2-alfresco-core';
 
 /**
  * Internal service used by Document List component.
@@ -25,7 +25,7 @@ import { AuthService, AlfrescoApiService } from 'ng2-alfresco-core';
 @Injectable()
 export class AlfrescoSearchService {
 
-    constructor(public authService: AuthService,
+    constructor(public authService: AlfrescoAuthenticationService,
                 private apiService: AlfrescoApiService) {
     }
 

ng2-components/ng2-alfresco-search/src/services/alfresco-thumbnail.service.spec.ts

@@ -17,7 +17,7 @@
 
 import { ReflectiveInjector }    from '@angular/core';
 import { AlfrescoThumbnailService } from './alfresco-thumbnail.service';
-import { AlfrescoApiService, AuthService, ContentService, SettingsService, StorageService, LogService } from 'ng2-alfresco-core';
+import { AlfrescoApiService, AlfrescoAuthenticationService, AlfrescoContentService, AlfrescoSettingsService, StorageService, LogService } from 'ng2-alfresco-core';
 
 describe('AlfrescoThumbnailService', () => {
 
@@ -27,9 +27,9 @@ describe('AlfrescoThumbnailService', () => {
     beforeEach(() => {
         injector = ReflectiveInjector.resolveAndCreate([
             AlfrescoApiService,
-            AuthService,
+            AlfrescoAuthenticationService,
-            ContentService,
+            AlfrescoContentService,
-            SettingsService,
+            AlfrescoSettingsService,
             AlfrescoThumbnailService,
             StorageService,
             LogService

ng2-components/ng2-alfresco-search/src/services/alfresco-thumbnail.service.ts

@@ -16,7 +16,7 @@
  */
 
 import { Injectable } from '@angular/core';
-import { ContentService } from 'ng2-alfresco-core';
+import { AlfrescoContentService } from 'ng2-alfresco-core';
 
 @Injectable()
 export class AlfrescoThumbnailService {
@@ -50,7 +50,7 @@ export class AlfrescoThumbnailService {
         'application/vnd.apple.numbers': 'ft_ic_spreadsheet'
     };
 
-    constructor(public contentService: ContentService) {
+    constructor(public contentService: AlfrescoContentService) {
     }
 
     /**

ng2-components/ng2-alfresco-tag/demo/src/main.ts

@@ -19,7 +19,7 @@ import { NgModule, Component, Input, OnInit } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
-import { CoreModule, SettingsService, AuthService, StorageService, LogService } from 'ng2-alfresco-core';
+import { CoreModule, AlfrescoSettingsService, AlfrescoAuthenticationService, StorageService, LogService } from 'ng2-alfresco-core';
 import { TagModule } from 'ng2-alfresco-tag';
 
 @Component({
@@ -57,8 +57,8 @@ class TagDemo implements OnInit {
     ecmHost: string = 'http://127.0.0.1:8080';
     ticket: string;
 
-    constructor(private authService: AuthService,
+    constructor(private authService: AlfrescoAuthenticationService,
-                private settingsService: SettingsService,
+                private settingsService: AlfrescoSettingsService,
                 private storage: StorageService,
                 private logService: LogService) {
 

ng2-components/ng2-alfresco-tag/src/services/tag.service.spec.ts

@@ -17,8 +17,8 @@
 
 import { ReflectiveInjector } from '@angular/core';
 import {
-    AuthService,
+    AlfrescoAuthenticationService,
-    SettingsService,
+    AlfrescoSettingsService,
     AlfrescoApiService,
     StorageService,
     LogService
@@ -33,9 +33,9 @@ describe('Tag service', () => {
 
     beforeEach(() => {
         injector = ReflectiveInjector.resolveAndCreate([
-            SettingsService,
+            AlfrescoSettingsService,
             AlfrescoApiService,
-            AuthService,
+            AlfrescoAuthenticationService,
             TagService,
             StorageService,
             LogService