diff --git a/demo-shell-ng2/app/components/home/home.component.css b/demo-shell-ng2/app/components/home/home.component.css
index 0de97b445c..06940591fb 100644
--- a/demo-shell-ng2/app/components/home/home.component.css
+++ b/demo-shell-ng2/app/components/home/home.component.css
@@ -29,6 +29,13 @@
     margin-right: 4px;
 }
 
+
+.home--card__text {
+    font-size: 16px;
+    line-height: 18px;
+}
+
+
 .home--feature-list {
     list-style: none;
     padding-left: 0;
diff --git a/demo-shell-ng2/app/components/home/home.component.html b/demo-shell-ng2/app/components/home/home.component.html
index 6be4519ac1..00ee6d9a15 100644
--- a/demo-shell-ng2/app/components/home/home.component.html
+++ b/demo-shell-ng2/app/components/home/home.component.html
@@ -3,11 +3,11 @@
         <div class="mdl-card__title mdl-card--expand" routerLink="/files">
             <h2 class="mdl-card__title-text">
                 <i class="material-icons home--card__icon">dvr</i>
-                <span>DocumentList - ECM</span>
+                <span class="home--card__text">DocumentList - Content Services</span>
             </h2>
         </div>
     <div class="mdl-card__supporting-text">
-        Demonstrates multiple Alfresco ECM components used together to display the files of your ECM instance:
+        Demonstrates multiple Alfresco Content Services components used together to display the files of your Content Services instance:
         <ul class="home--feature-list">
             <li>
                 <i class="material-icons home--feature-list__icon">brightness_1</i>
@@ -39,11 +39,11 @@
         <div class="mdl-card__title mdl-card--expand" routerLink="/activiti">
             <h2 class="mdl-card__title-text">
                 <i class="material-icons home--card__icon">apps</i>
-                <span>Activiti - BPM</span>
+                <span class="home--card__text">Process Services</span>
             </h2>
         </div>
     <div class="mdl-card__supporting-text">
-        Demonstrates multiple Alfresco BPM components used together to show your BPM process and tasks:
+        Demonstrates multiple Alfresco Process Services components used together to show your Process Services process and tasks:
         <ul class="home--feature-list">
             <li>
                 <i class="material-icons home--feature-list__icon">brightness_1</i>
@@ -91,7 +91,7 @@
         <div class="mdl-card__title mdl-card--expand" routerLink="/datatable">
             <h2 class="mdl-card__title-text">
                 <i class="material-icons home--card__icon">view_module</i>
-                <span>DataTable-ECM&BPM</span>
+                <span class="home--card__text">DataTable - Content Services & Process Services</span>
             </h2>
         </div>
     <div class="mdl-card__supporting-text">
@@ -111,11 +111,11 @@
         <div class="mdl-card__title mdl-card--expand" routerLink="/uploader">
             <h2 class="mdl-card__title-text">
                 <i class="material-icons home--card__icon">file_upload</i>
-                <span>Uploader - ECM</span>
+                <span class="home--card__text">Uploader - Content Services</span>
             </h2>
         </div>
     <div class="mdl-card__supporting-text">
-        Basic table uploader component for the ECM and BPM:
+        Basic table uploader component for the Content Services & Process Services:
         <ul class="home--feature-list">
             <li>
                 <i class="material-icons home--feature-list__icon">brightness_1</i>
@@ -131,11 +131,11 @@
         <div class="mdl-card__title mdl-card--expand" routerLink="/login">
             <h2 class="mdl-card__title-text">
                 <i class="material-icons home--card__icon">account_circle</i>
-                <span>Login - ECM & BPM</span>
+                <span class="home--card__text">Login - Content Services & Process Services</span>
             </h2>
         </div>
     <div class="mdl-card__supporting-text">
-        Login component for the ECM and BPM:
+        Login component for the Content Services and Process Services:
         <ul class="home--feature-list">
             <li>
                 <i class="material-icons home--feature-list__icon">brightness_1</i>
@@ -151,11 +151,11 @@
     <div class="mdl-card__title mdl-card--expand" routerLink="/webscript">
         <h2 class="mdl-card__title-text">
             <i class="material-icons home--card__icon">extension</i>
-            <span>Webscript - ECM</span>
+            <span class="home--card__text">Webscript - Content Services</span>
         </h2>
     </div>
     <div class="mdl-card__supporting-text">
-        Displays and creates webscripts in your ECM instance:
+        Displays and creates webscripts in your Content Services instance:
         <ul class="home--feature-list">
             <li>
                 <i class="material-icons home--feature-list__icon">brightness_1</i>
@@ -171,11 +171,11 @@
         <div class="mdl-card__title mdl-card--expand" routerLink="/tag">
             <h2 class="mdl-card__title-text">
                 <i class="material-icons home--card__icon">local_offer</i>
-                <span>Tag - ECM</span>
+                <span class="home--card__text">Tag - Content Services</span>
             </h2>
         </div>
     <div class="mdl-card__supporting-text">
-        Displays and adds tags to the node of your ECM instance:
+        Displays and adds tags to the node of your Content Services instance:
         <ul class="home--feature-list">
             <li>
                 <i class="material-icons home--feature-list__icon">brightness_1</i>
diff --git a/demo-shell-ng2/app/components/login/login-demo.component.html b/demo-shell-ng2/app/components/login/login-demo.component.html
index c8e5f3a2aa..8c7c83bc86 100644
--- a/demo-shell-ng2/app/components/login/login-demo.component.html
+++ b/demo-shell-ng2/app/components/login/login-demo.component.html
@@ -5,14 +5,14 @@
         <label for="switch1" class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
             <input type="checkbox" id="switch1" [checked]="isECM" class="mdl-switch__input"
                    (click)="toggleECM()">
-            <span class="mdl-switch__label">ECM</span>
+            <span class="mdl-switch__label">Content Services</span>
         </label>
     </p>
     <p class="toggle">
         <label for="switch2" class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
             <input type="checkbox" id="switch2" [checked]="isBPM" class="mdl-switch__input"
                    (click)="toggleBPM()">
-            <span class="mdl-switch__label">BPM</span>
+            <span class="mdl-switch__label">Process Services</span>
         </label>
     </p>
     <p class="toggle">
@@ -49,14 +49,14 @@
             <label for="switch1-mobile" class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
                 <input type="checkbox" id="switch1-mobile" [checked]="isECM" class="mdl-switch__input"
                        (click)="toggleECM()">
-                <span class="mdl-switch__label">ECM</span>
+                <span class="mdl-switch__label">Content Services</span>
             </label>
         </p>
         <p>
             <label for="switch2-mobile" class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
                 <input type="checkbox" id="switch2-mobile" [checked]="isBPM" class="mdl-switch__input"
                        (click)="toggleBPM()">
-                <span class="mdl-switch__label">BPM</span>
+                <span class="mdl-switch__label">Process Services</span>
             </label>
         </p>
         <p>
diff --git a/demo-shell-ng2/app/components/setting/setting.component.html b/demo-shell-ng2/app/components/setting/setting.component.html
index 29566444e1..0f1115108f 100644
--- a/demo-shell-ng2/app/components/setting/setting.component.html
+++ b/demo-shell-ng2/app/components/setting/setting.component.html
@@ -7,7 +7,7 @@
             </div>
             <div class="mdl-card__actions mdl-card--border">
                 <div class="mdl-card__supporting-text">
-                    ECM host URL configuration
+                    Content Services host URL configuration
                 </div>
                 <nav class="mdl-navigation">
                     <div class="icon material-icons icon-margin">link</div>
diff --git a/ng2-components/ng2-activiti-processlist/demo/package.json b/ng2-components/ng2-activiti-processlist/demo/package.json
index 603b378777..daf16e9174 100644
--- a/ng2-components/ng2-activiti-processlist/demo/package.json
+++ b/ng2-components/ng2-activiti-processlist/demo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng2-activiti-processlist-demo",
-  "description": "Show available processes from the Activiti BPM suite - Demo",
+  "description": "Show available processes from the Activiti Process Services suite - Demo",
   "version": "0.1.0",
   "author": "Will Abson",
   "main": "index.js",
diff --git a/ng2-components/ng2-activiti-processlist/package.json b/ng2-components/ng2-activiti-processlist/package.json
index 06da47e6dc..3831a82c71 100644
--- a/ng2-components/ng2-activiti-processlist/package.json
+++ b/ng2-components/ng2-activiti-processlist/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng2-activiti-processlist",
-  "description": "Show active processes from the Activiti BPM suite",
+  "description": "Show active processes from the Activiti Process Services suite",
   "version": "1.1.0",
   "author": "Alfresco Software, Ltd.",
   "scripts": {
diff --git a/ng2-components/ng2-alfresco-login/src/i18n/en.json b/ng2-components/ng2-alfresco-login/src/i18n/en.json
index 6abc552965..3ca1c4cb95 100644
--- a/ng2-components/ng2-alfresco-login/src/i18n/en.json
+++ b/ng2-components/ng2-alfresco-login/src/i18n/en.json
@@ -16,7 +16,7 @@
             "LOGIN-SUCCESS": "Login successful",
             "LOGIN-ERROR-CORS": "CORS exception, check your server configuration",
             "LOGIN-ERROR-CSRF": "CSRF exception, set [disableCsrf]=\"true\" in alfresco-login component",
-            "LOGIN-ECM-LICENSE": "The ECM is in read-only mode"
+            "LOGIN-ECM-LICENSE": "Content Services repository is in read-only mode"
         },
         "BUTTON": {
             "LOGIN": "SIGN IN"
diff --git a/ng2-components/ng2-alfresco-login/src/i18n/it.json b/ng2-components/ng2-alfresco-login/src/i18n/it.json
index b1c50a86bf..44856a3682 100644
--- a/ng2-components/ng2-alfresco-login/src/i18n/it.json
+++ b/ng2-components/ng2-alfresco-login/src/i18n/it.json
@@ -15,7 +15,7 @@
             "LOGIN-SUCCESS": "Login effettuata con successo",
             "LOGIN-ERROR-CORS": "CORS exception, controlla le configurazioni del tuo server",
             "LOGIN-ERROR-CSRF": "CSRF exception, set [disableCsrf]=\"true\" in alfresco-login component",
-            "LOGIN-ECM-LICENSE": "l'ECM e' in read-only mode"
+            "LOGIN-ECM-LICENSE": "l'Content Services e' in read-only mode"
         },
         "BUTTON": {
             "LOGIN": "Accedi"
diff --git a/ng2-components/ng2-alfresco-login/src/i18n/ru.json b/ng2-components/ng2-alfresco-login/src/i18n/ru.json
index dc8a898ebe..29a02225ac 100644
--- a/ng2-components/ng2-alfresco-login/src/i18n/ru.json
+++ b/ng2-components/ng2-alfresco-login/src/i18n/ru.json
@@ -16,7 +16,7 @@
             "LOGIN-SUCCESS": "Вы успешно авторизовались",
             "LOGIN-ERROR-CORS": "CORS exception, проверьте настройки на сервере",
             "LOGIN-ERROR-CSRF": "CSRF exception, установите [disableCsrf]=\"true\" в alfresco-login компоненте",
-            "LOGIN-ECM-LICENSE": "ECM находится в режиме для чтения"
+            "LOGIN-ECM-LICENSE": "Content Services находится в режиме для чтения"
         },
         "BUTTON": {
             "LOGIN": "ВОЙТИ"
diff --git a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html
index cc90f10709..4cd58d5c4b 100644
--- a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html
+++ b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html
@@ -13,8 +13,8 @@
              for="user-profile" (click)="stopClosing($event)">
             <div class="mdl-tabs mdl-js-tabs mdl-js-ripple-effect menu-container__items">
                 <div id="tab-bar-env" class="mdl-tabs__tab-bar" [hidden]="!(ecmUser && bpmUser)">
-                    <a href="#ecm-panel" id="ecm-tab" class="mdl-tabs__tab is-active">ECM</a>
-                    <a href="#bpm-panel" id="bpm-tab" class="mdl-tabs__tab">BPM</a>
+                    <a href="#ecm-panel" id="ecm-tab" class="mdl-tabs__tab is-active">Content Services</a>
+                    <a href="#bpm-panel" id="bpm-tab" class="mdl-tabs__tab">Process Services</a>
                 </div>
                 <div class="mdl-tabs__panel" [class.is-active]="ecmUser?true:false" id="ecm-panel">
                     <div class="detail-user-profile-list-mdl mdl-list" *ngIf="ecmUser">