diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
index a18ef2d259..06ac847d31 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
+++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
@@ -138,6 +138,12 @@
                                 (showProcessDiagram)="onShowProcessDiagram($event)"
                                 (taskClick)="onProcessDetailsTaskClick($event)">
                             </activiti-process-instance-details>
+                            <hr>
+                            <h5>Attachments</h5>
+                            <adf-process-attachment-list *ngIf="currentProcessInstanceId"
+                                                      [processInstanceId]="currentProcessInstanceId"
+                                                      (attachmentClick)="onAttachmentClick($event)">
+                            </adf-process-attachment-list>
                         </div>
                         <div class="mdl-cell mdl-cell--10-col task-column mdl-shadow--2dp" *ngIf="isStartProcessMode()">
                             <activiti-start-process [appId]="appId" (start)="onStartProcessInstance($event)"></activiti-start-process>
diff --git a/ng2-components/ng2-activiti-processlist/README.md b/ng2-components/ng2-activiti-processlist/README.md
index 4b4f657f97..a0976a6038 100644
--- a/ng2-components/ng2-activiti-processlist/README.md
+++ b/ng2-components/ng2-activiti-processlist/README.md
@@ -411,8 +411,8 @@ No events are emitted by this component
 This component displays attached documents on a specified process instance
 
 ```html
-<activiti-process-attachment-list [processInstanceId]="YOUR_PROCESS_INSTANCE_ID" 
-(attachmentClick)="YOUR_ATTACHMENT_CLICK_EMITTER_HANDLER"></activiti-process-attachment-list>
+<adf-process-attachment-list [processInstanceId]="YOUR_PROCESS_INSTANCE_ID" 
+(attachmentClick)="YOUR_ATTACHMENT_CLICK_EMITTER_HANDLER"></adf-process-attachment-list>
 ```
 ![process-attachment-list-sample](docs/assets/process-attachment-list.png)
 
diff --git a/ng2-components/ng2-activiti-processlist/index.ts b/ng2-components/ng2-activiti-processlist/index.ts
index d4abc2f117..dea333cfb9 100644
--- a/ng2-components/ng2-activiti-processlist/index.ts
+++ b/ng2-components/ng2-activiti-processlist/index.ts
@@ -41,7 +41,7 @@ export * from './src/components/activiti-processlist.component';
 export * from './src/components/activiti-filters.component';
 export * from './src/components/activiti-process-instance-details.component';
 export * from './src/components/activiti-start-process.component';
-export * from './src/components/activiti-process-attachment-list.component';
+export * from './src/components/adf-process-attachment-list.component';
 export * from './src/components/activiti-create-process-attachment.component';
 
 // models
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-attachment-list.component.css b/ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.css
similarity index 100%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-process-attachment-list.component.css
rename to ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.css
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-attachment-list.component.html b/ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.html
similarity index 100%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-process-attachment-list.component.html
rename to ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.html
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-attachment-list.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.spec.ts
similarity index 98%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-process-attachment-list.component.spec.ts
rename to ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.spec.ts
index a9e11fdaec..541e270b39 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-attachment-list.component.spec.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.spec.ts
@@ -24,7 +24,7 @@ import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 import { ActivitiContentService } from 'ng2-activiti-form';
 import { DataTableModule } from 'ng2-alfresco-datatable';
 
-import { ActivitiProcessAttachmentListComponent } from './activiti-process-attachment-list.component';
+import { ActivitiProcessAttachmentListComponent } from './adf-process-attachment-list.component';
 import { TranslationMock } from './../assets/translation.service.mock';
 
 describe('Activiti Process Instance Attachment List', () => {
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-attachment-list.component.ts b/ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.ts
similarity index 96%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-process-attachment-list.component.ts
rename to ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.ts
index 16139580e1..e003afba06 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-attachment-list.component.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.ts
@@ -20,9 +20,9 @@ import { AlfrescoTranslationService, ContentService } from 'ng2-alfresco-core';
 import { ActivitiContentService } from 'ng2-activiti-form';
 
 @Component({
-    selector: 'activiti-process-attachment-list',
-    styleUrls: ['./activiti-process-attachment-list.component.css'],
-    templateUrl: './activiti-process-attachment-list.component.html'
+    selector: 'adf-process-attachment-list',
+    styleUrls: ['./adf-process-attachment-list.component.css'],
+    templateUrl: './adf-process-attachment-list.component.html'
 })
 export class ActivitiProcessAttachmentListComponent implements OnChanges {
 
diff --git a/ng2-components/ng2-activiti-processlist/src/components/index.ts b/ng2-components/ng2-activiti-processlist/src/components/index.ts
index 32baa76c79..80600270a9 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/index.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/index.ts
@@ -23,5 +23,5 @@ export * from './activiti-process-instance-variables.component';
 export * from './activiti-process-comments.component';
 export * from './activiti-process-instance-details.component';
 export * from './activiti-start-process.component';
-export * from './activiti-process-attachment-list.component';
+export * from './adf-process-attachment-list.component';
 export * from './activiti-create-process-attachment.component';