diff --git a/demo-shell-ng2/src/app/app.module.ts b/demo-shell-ng2/src/app/app.module.ts
index 28a6442059..58c9da980f 100644
--- a/demo-shell-ng2/src/app/app.module.ts
+++ b/demo-shell-ng2/src/app/app.module.ts
@@ -28,7 +28,7 @@ import { ActivitiProcessAttachmentsComponent } from './components/activiti/activ
 import { ActivitiShowDiagramComponent } from './components/activiti/activiti-show-diagram.component';
 import { FormViewerComponent } from './components/activiti/form-viewer.component';
 import { FormNodeViewerComponent } from './components/activiti/form-node-viewer.component';
-import { ActivitiAppsViewComponent } from './components/activiti/apps.view';
+import { ActivitiAppsViewComponent } from './components/activiti/apps-view.component';
 import { DataTableComponent } from './components/datatable/datatable.component';
 import { FilesComponent } from './components/files/files.component';
 import { FileViewComponent } from './components/file-view/file-view.component';
diff --git a/demo-shell-ng2/src/app/app.routes.ts b/demo-shell-ng2/src/app/app.routes.ts
index 929ad3cd63..269af56b0c 100644
--- a/demo-shell-ng2/src/app/app.routes.ts
+++ b/demo-shell-ng2/src/app/app.routes.ts
@@ -27,7 +27,7 @@ import { ActivitiComponent } from './components/activiti/activiti.component';
 import { ActivitiShowDiagramComponent } from './components/activiti/activiti-show-diagram.component';
 import { FormViewerComponent } from './components/activiti/form-viewer.component';
 import { FormNodeViewerComponent } from './components/activiti/form-node-viewer.component';
-import { ActivitiAppsViewComponent } from './components/activiti/apps.view';
+import { ActivitiAppsViewComponent } from './components/activiti/apps-view.component';
 import { SearchComponent } from './components/search/search.component';
 
 import { DataTableComponent } from './components/datatable/datatable.component';
diff --git a/demo-shell-ng2/src/app/components/activiti/activiti.component.html b/demo-shell-ng2/src/app/components/activiti/activiti.component.html
index aec1c7707f..96e9ae5db1 100644
--- a/demo-shell-ng2/src/app/components/activiti/activiti.component.html
+++ b/demo-shell-ng2/src/app/components/activiti/activiti.component.html
@@ -84,9 +84,9 @@
                     </div>
                     <mat-card>
                         <mat-card-content>
-                            <adf-task-attachments
+                            <adf-task-attachment-list
                                 [taskId]="currentTaskId">
-                            </adf-task-attachments>
+                            </adf-task-attachment-list>
                         </mat-card-content>
                     </mat-card>
                 </div>
@@ -170,10 +170,11 @@
                         <hr>
                     </div>
                     <mat-card>
+
                         <mat-card-content>
-                            <adf-process-attachments
-                                [processId]="currentProcessInstanceId">
-                            </adf-process-attachments>
+                            <adf-process-attachment-list
+                                []="currentProcessInstanceId">
+                            </adf-process-attachment-list>
                         </mat-card-content>
                     </mat-card>
                 </div>
diff --git a/demo-shell-ng2/src/app/components/activiti/apps-view.component.html b/demo-shell-ng2/src/app/components/activiti/apps-view.component.html
new file mode 100644
index 0000000000..092ca26c33
--- /dev/null
+++ b/demo-shell-ng2/src/app/components/activiti/apps-view.component.html
@@ -0,0 +1 @@
+<adf-apps (appClick)="onAppClicked($event)"></adf-apps>
diff --git a/demo-shell-ng2/src/app/components/activiti/apps.view.ts b/demo-shell-ng2/src/app/components/activiti/apps-view.component.ts
similarity index 91%
rename from demo-shell-ng2/src/app/components/activiti/apps.view.ts
rename to demo-shell-ng2/src/app/components/activiti/apps-view.component.ts
index 04898acd6d..4a4b0f1a04 100644
--- a/demo-shell-ng2/src/app/components/activiti/apps.view.ts
+++ b/demo-shell-ng2/src/app/components/activiti/apps-view.component.ts
@@ -21,9 +21,7 @@ import { AppDefinitionRepresentationModel } from 'ng2-activiti-tasklist';
 
 @Component({
     selector: 'activiti-apps-view',
-    template: `
-        <activiti-apps (appClick)="onAppClicked($event)"></activiti-apps>
-    `
+    templateUrl: './apps-view.component.html'
 })
 export class ActivitiAppsViewComponent {
 
diff --git a/ng2-components/ng2-alfresco-core/package.json b/ng2-components/ng2-alfresco-core/package.json
index 8e9e2cb0f4..30b362d771 100644
--- a/ng2-components/ng2-alfresco-core/package.json
+++ b/ng2-components/ng2-alfresco-core/package.json
@@ -56,7 +56,7 @@
     "@angular/platform-browser-dynamic": "4.4.5",
     "@angular/router": "4.4.5",
     "@ngx-translate/core": "7.0.0",
-    "alfresco-js-api": "^1.10.0-11228ed731b8894881989e2ec62e3f3390d91636",
+    "alfresco-js-api": "1.9.0",
     "core-js": "2.4.1",
     "hammerjs": "2.0.8",
     "moment": "2.15.2",