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 e831c6d01f..9599799d10 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
+++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
@@ -25,8 +25,8 @@
                                 (onSuccess)="onStartTaskSuccess($event)">
                             </activiti-start-task>
                         </div>
-                        <accordion>
-                            <accordion-group [heading]="'Tasks'" [isSelected]="true" [headingIcon]="'assignment'">
+                        <adf-accordion>
+                            <adf-accordion-group [heading]="'Tasks'" [isSelected]="true" [isOpen]="true" [headingIcon]="'assignment'">
                                 <activiti-filters
                                     [appId]="appId"
                                     [hasIcon]="false"
@@ -34,8 +34,8 @@
                                     (onSuccess)="onSuccessTaskFilterList($event)"
                                     #activitifilter>
                                 </activiti-filters>
-                            </accordion-group>
-                        </accordion>
+                            </adf-accordion-group>
+                        </adf-accordion>
                     </div>
                     <div class="mdl-cell mdl-cell--3-col task-column mdl-shadow--2dp list-column">
                         <activiti-tasklist
@@ -92,15 +92,15 @@
                                     <span>START PROCESS</span>
                                 </button>
                             </div>
-                            <accordion>
-                                <accordion-group [heading]="'Processes'" [isSelected]="true" [headingIcon]="'assessment'">
+                            <adf-accordion>
+                                <adf-accordion-group [heading]="'Processes'" [isSelected]="true" [isOpen]="true" [headingIcon]="'assessment'">
                                     <activiti-process-instance-filters
                                         [appId]="appId"
                                         (filterClick)="onProcessFilterClick($event)"
                                         (onSuccess)="onSuccessProcessFilterList($event)">
                                     </activiti-process-instance-filters>
-                                </accordion-group>
-                            </accordion>
+                                </adf-accordion-group>
+                            </adf-accordion>
                         </div>
                         <div class="mdl-cell mdl-cell--3-col task-column list-column mdl-shadow--2dp" *ngIf="processFilter && !isStartProcessMode()">
                             <activiti-process-instance-list
diff --git a/ng2-components/ng2-activiti-processlist/README.md b/ng2-components/ng2-activiti-processlist/README.md
index bff347ddf6..af59e10333 100644
--- a/ng2-components/ng2-activiti-processlist/README.md
+++ b/ng2-components/ng2-activiti-processlist/README.md
@@ -254,15 +254,15 @@ You can create an accordion menu using the AccordionComponent that wrap the acti
 The AccordionComponent is exposed by the alfresco-core.
 
 ```html
-<accordion>
-    <accordion-group [heading]="'Processes'" [isSelected]="true" [headingIcon]="'assessment'">
+<adf-accordion>
+    <adf-accordion-group [heading]="'Processes'" [isSelected]="true" [headingIcon]="'assessment'">
         <activiti-process-instance-filters
             [appId]="appId"
             (filterClick)="onProcessFilterClick($event)"
             (onSuccess)="onSuccessProcessFilterList($event)">
         </activiti-process-instance-filters>
-    </accordion-group>
-</accordion>
+    </adf-accordion-group>
+</adf-accordion>
 ```
 
 ![how-create-accordion-menu](docs/assets/how-to-create-accordion-menu.png)
diff --git a/ng2-components/ng2-activiti-tasklist/README.md b/ng2-components/ng2-activiti-tasklist/README.md
index 205504f98a..c61f6334f3 100644
--- a/ng2-components/ng2-activiti-tasklist/README.md
+++ b/ng2-components/ng2-activiti-tasklist/README.md
@@ -361,8 +361,8 @@ You can create an accordion menu using the AccordionComponent that wrap the acti
 The AccordionComponent is exposed by the alfresco-core.
 
 ```html
-<accordion>
-    <accordion-group [heading]="'Tasks'" [isSelected]="true" [headingIcon]="'assignment'">
+<adf-accordion>
+    <adf-accordion-group [heading]="'Tasks'" [isSelected]="true" [headingIcon]="'assignment'">
         <activiti-filters
             [appId]="appId"
             [hasIcon]="false"
@@ -370,8 +370,8 @@ The AccordionComponent is exposed by the alfresco-core.
             (onSuccess)="onSuccessTaskFilterList($event)"
             #activitifilter>
         </activiti-filters>
-    </accordion-group>
-</accordion>
+    </adf-accordion-group>
+</adf-accordion>
 ```
 
 ![how-create-accordion-menu](docs/assets/how-to-create-accordion-menu.png)
diff --git a/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.ts b/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.ts
index 40a510b235..ad0fb22e46 100644
--- a/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.ts
+++ b/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.ts
@@ -19,7 +19,7 @@ import { Component, Input, OnDestroy } from '@angular/core';
 import { AccordionComponent } from './accordion.component';
 
 @Component({
-    selector: 'accordion-group',
+    selector: 'adf-accordion-group',
     moduleId: module.id,
     templateUrl: 'accordion-group.component.html',
     styleUrls: ['./accordion-group.component.css']
diff --git a/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion.component.ts b/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion.component.ts
index 54c52378ee..2356f90994 100644
--- a/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion.component.ts
+++ b/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion.component.ts
@@ -19,7 +19,7 @@ import { Component } from '@angular/core';
 import { AccordionGroupComponent } from './accordion-group.component';
 
 @Component({
-    selector: 'accordion',
+    selector: 'adf-accordion',
     template: `
         <ng-content></ng-content>
     `,