diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettingsService.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettingsService.service.ts
index ad674857e6..327a7d1536 100644
--- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettingsService.service.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoSettingsService.service.ts
@@ -21,7 +21,7 @@ import { Injectable } from '@angular/core';
 export class AlfrescoSettingsService {
 
     static DEFAULT_ECM_ADDRESS: string = 'http://127.0.0.1:8080';
-    static DEFAULT_BPM_ADDRESS: string = 'http://127.0.0.1:8080';
+    static DEFAULT_BPM_ADDRESS: string = 'http://127.0.0.1:9999';
 
     static DEFAULT_ECM_CONTEXT_PATH: string = '/alfresco';
     static DEFAULT_BPM_CONTEXT_PATH: string = '/activiti-app';
diff --git a/ng2-components/ng2-alfresco-upload/src/assets/AlfrescoSettingsService.service.mock.ts b/ng2-components/ng2-alfresco-upload/src/assets/AlfrescoSettingsService.service.mock.ts
index 593b36c19f..354b652ed8 100644
--- a/ng2-components/ng2-alfresco-upload/src/assets/AlfrescoSettingsService.service.mock.ts
+++ b/ng2-components/ng2-alfresco-upload/src/assets/AlfrescoSettingsService.service.mock.ts
@@ -26,7 +26,7 @@ export class AlfrescoSettingsServiceMock {
 
     private _host: string = AlfrescoSettingsServiceMock.DEFAULT_HOST_ADDRESS;
 
-    public get host(): string {
+    public get ecmHost(): string {
         return this._host;
     }
 
diff --git a/ng2-components/ng2-alfresco-webscript/src/assets/AlfrescoSettingsService.service.mock.ts b/ng2-components/ng2-alfresco-webscript/src/assets/AlfrescoSettingsService.service.mock.ts
index 593b36c19f..354b652ed8 100644
--- a/ng2-components/ng2-alfresco-webscript/src/assets/AlfrescoSettingsService.service.mock.ts
+++ b/ng2-components/ng2-alfresco-webscript/src/assets/AlfrescoSettingsService.service.mock.ts
@@ -26,7 +26,7 @@ export class AlfrescoSettingsServiceMock {
 
     private _host: string = AlfrescoSettingsServiceMock.DEFAULT_HOST_ADDRESS;
 
-    public get host(): string {
+    public get ecmHost(): string {
         return this._host;
     }