From a8eac42c0504594e96ddce3fa94623e8788ec674 Mon Sep 17 00:00:00 2001
From: Eugenio Romano <eromano@users.noreply.github.com>
Date: Sat, 15 Jul 2017 21:59:31 +0100
Subject: [PATCH] [ADF-1103] Add custom tslint rules to avoid unwanted Class
 and File name prefix (#2087)

* custom tslint rules adf project name files

* filename and class prefix rule

* filename process service mock

* fix spec filename

* fix demo shell

* rename mock

* alias deprecated name class

* core rename services

* fix pacakge.json adf-rules

* add exclude in whitelist
---
 .../activiti/activiti-demo.component.ts       |   50 +-
 .../activiti-process-attachments.component.ts |    6 +-
 ng2-components/adf-rules/adfClassNameRule.js  |   61 +
 ng2-components/adf-rules/adfClassNameRule.ts  |   61 +
 ng2-components/adf-rules/adfFileNameRule.js   |   67 +
 ng2-components/adf-rules/adfFileNameRule.ts   |   56 +
 ng2-components/adf-rules/package-lock.json    | 2128 +++++++++++++++++
 ng2-components/adf-rules/package.json         |   57 +
 ng2-components/adf-rules/tsconfig.json        |   22 +
 ng2-components/adf-rules/tslint.json          |    5 +
 ng2-components/ng2-activiti-form/index.ts     |   33 +-
 ...mponent.mock.ts => form.component.mock.ts} |    0
 ....component.css => form-list.component.css} |    0
 ...omponent.html => form-list.component.html} |    0
 ...nt.spec.ts => form-list.component.spec.ts} |   10 +-
 ...st.component.ts => form-list.component.ts} |    6 +-
 ...-form.component.css => form.component.css} |    0
 ...orm.component.html => form.component.html} |    0
 ...mponent.spec.ts => form.component.spec.ts} |   28 +-
 ...ti-form.component.ts => form.component.ts} |   14 +-
 ...mponent.html => start-form.component.html} |    0
 ...t.spec.ts => start-form.component.spec.ts} |   10 +-
 ...m.component.ts => start-form.component.ts} |   10 +-
 .../src/components/widgets/index.ts           |    1 -
 .../ng2-activiti-processlist/README.md        |    4 +-
 .../ng2-activiti-processlist/index.ts         |  108 +-
 ...mock.ts => process-instances-list.mock.ts} |    0
 ...ss.model.mock.ts => process.model.mock.ts} |    0
 ...ervice.mock.ts => process.service.mock.ts} |    5 +-
 ...ock.ts => start-process.component.mock.ts} |    0
 ...> create-process-attachment.component.css} |    0
 ... create-process-attachment.component.html} |    0
 ...eate-process-attachment.component.spec.ts} |   10 +-
 ...=> create-process-attachment.component.ts} |    6 +-
 .../src/components/index.ts                   |   27 -
 ... => process-attachment-list.component.css} |    0
 ...=> process-attachment-list.component.html} |    0
 ...process-attachment-list.component.spec.ts} |   12 +-
 ...s => process-attachment-list.component.ts} |    8 +-
 ...ent.css => process-comments.component.css} |    0
 ...t.html => process-comments.component.html} |    0
 ....ts => process-comments.component.spec.ts} |   18 +-
 ...onent.ts => process-comments.component.ts} |   12 +-
 ...nent.css => process-filters.component.css} |    0
 ...nt.html => process-filters.component.html} |    0
 ...c.ts => process-filters.component.spec.ts} |   12 +-
 ...ponent.ts => process-filters.component.ts} |   10 +-
 ...=> process-instance-details.component.css} |    0
 ...> process-instance-details.component.html} |    0
 ...rocess-instance-details.component.spec.ts} |   22 +-
 ... => process-instance-details.component.ts} |   22 +-
 ... => process-instance-header.component.css} |    0
 ...=> process-instance-header.component.html} |    0
 ...process-instance-header.component.spec.ts} |   22 +-
 ...s => process-instance-header.component.ts} |    6 +-
 ...s => process-instance-tasks.component.css} |    0
 ... => process-instance-tasks.component.html} |    0
 ... process-instance-tasks.component.spec.ts} |   20 +-
 ...ts => process-instance-tasks.component.ts} |   10 +-
 ... process-instance-variables.component.css} |    0
 ...process-instance-variables.component.html} |    0
 ...cess-instance-variables.component.spec.ts} |   20 +-
 ...> process-instance-variables.component.ts} |   12 +-
 ...omponent.css => processlist.component.css} |    0
 ...ponent.html => processlist.component.html} |    0
 ....spec.ts => processlist.component.spec.ts} |   22 +-
 ....component.ts => processlist.component.ts} |   10 +-
 ...ponent.css => start-process.component.css} |    0
 ...nent.html => start-process.component.html} |    0
 ...pec.ts => start-process.component.spec.ts} |   22 +-
 ...omponent.ts => start-process.component.ts} |   16 +-
 .../src/models/index.ts                       |   22 -
 ...ervice.spec.ts => process.service.spec.ts} |   14 +-
 ...-process.service.ts => process.service.ts} |    5 +-
 ng2-components/ng2-activiti-tasklist/index.ts |  162 +-
 ...ctiviti-apps.mock.ts => apps-list.mock.ts} |    0
 ....component.css => apps-grid.component.css} |    0
 ....component.css => apps-list.component.css} |    0
 ...omponent.html => apps-list.component.html} |    0
 ...nt.spec.ts => apps-list.component.spec.ts} |   26 +-
 ...ps.component.ts => apps-list.component.ts} |   30 +-
 ....component.css => checklist.component.css} |    0
 ...omponent.html => checklist.component.html} |    0
 ...nt.spec.ts => checklist.component.spec.ts} |   16 +-
 ...st.component.ts => checklist.component.ts} |   12 +-
 ...mponent.css => comment-list.component.css} |    0
 ...onent.html => comment-list.component.html} |    0
 ...spec.ts => comment-list.component.spec.ts} |   15 +-
 ...component.ts => comment-list.component.ts} |    9 +-
 ...s.component.css => comments.component.css} |    0
 ...component.html => comments.component.html} |    0
 ...ent.spec.ts => comments.component.spec.ts} |   24 +-
 ...nts.component.ts => comments.component.ts} |   12 +-
 ...s => create-task-attachment.component.css} |    0
 ... => create-task-attachment.component.html} |    0
 ... create-task-attachment.component.spec.ts} |   10 +-
 ...ts => create-task-attachment.component.ts} |    6 +-
 .../src/components/index.ts                   |   32 -
 ...no-task-detail-template.directive.spec.ts} |    8 +-
 ...s => no-task-detail-template.directive.ts} |    4 +-
 ...omponent.css => people-list.component.css} |    0
 ...ponent.html => people-list.component.html} |    0
 ....spec.ts => people-list.component.spec.ts} |    9 +-
 ....component.ts => people-list.component.ts} |    7 +-
 ...ponent.css => people-search.component.css} |    0
 ...nent.html => people-search.component.html} |    0
 ...pec.ts => people-search.component.spec.ts} |   40 +-
 ...omponent.ts => people-search.component.ts} |    6 +-
 ...ple.component.css => people.component.css} |    0
 ...e.component.html => people.component.html} |    0
 ...onent.spec.ts => people.component.spec.ts} |   22 +-
 ...eople.component.ts => people.component.ts} |   14 +-
 ...component.css => start-task.component.css} |    0
 ...mponent.html => start-task.component.html} |    0
 ...t.spec.ts => start-task.component.spec.ts} |   34 +-
 ...k.component.ts => start-task.component.ts} |   17 +-
 ...css => task-attachment-list.component.css} |    0
 ...ml => task-attachment-list.component.html} |    0
 ...=> task-attachment-list.component.spec.ts} |    2 +-
 ...t.ts => task-attachment-list.component.ts} |    4 +-
 ...mponent.css => task-details.component.css} |    0
 ...onent.html => task-details.component.html} |    0
 ...spec.ts => task-details.component.spec.ts} |   24 +-
 ...component.ts => task-details.component.ts} |   10 +-
 ...mponent.css => task-filters.component.css} |    0
 ...onent.html => task-filters.component.html} |    0
 ...spec.ts => task-filters.component.spec.ts} |   14 +-
 ...component.ts => task-filters.component.ts} |   12 +-
 ...ponent.html => task-header.component.html} |    0
 ...ponent.scss => task-header.component.scss} |    0
 ....spec.ts => task-header.component.spec.ts} |   20 +-
 ....component.ts => task-header.component.ts} |   12 +-
 ...t.component.css => tasklist.component.css} |    0
 ...component.html => tasklist.component.html} |    0
 ...ent.spec.ts => tasklist.component.spec.ts} |   20 +-
 ...ist.component.ts => tasklist.component.ts} |   12 +-
 .../ng2-activiti-tasklist/src/models/index.ts |   25 -
 ...service.spec.ts => people.service.spec.ts} |   10 +-
 ...ti-people.service.ts => people.service.ts} |    2 +-
 ...rvice.spec.ts => tasklist.service.spec.ts} |    8 +-
 ...asklist.service.ts => tasklist.service.ts} |    2 +-
 ng2-components/ng2-alfresco-core/README.md    |   22 +-
 ng2-components/ng2-alfresco-core/index.ts     |   76 +-
 .../components/toolbar/toolbar.component.ts   |    2 +-
 ...s => card-view-content-proxy.directive.ts} |    2 +-
 ...html => card-view-dateitem.component.html} |    0
 ...scss => card-view-dateitem.component.scss} |    0
 ...s => card-view-dateitem.component.spec.ts} |    4 +-
 ...ent.ts => card-view-dateitem.component.ts} |    6 +-
 ...rd-view-item-dispatcher.component.spec.ts} |    6 +-
 ...=> card-view-item-dispatcher.component.ts} |    6 +-
 ...html => card-view-textitem.component.html} |    0
 ...scss => card-view-textitem.component.scss} |    0
 ...s => card-view-textitem.component.spec.ts} |    4 +-
 ...ent.ts => card-view-textitem.component.ts} |    6 +-
 ...omponent.html => card-view.component.html} |    0
 ...omponent.scss => card-view.component.scss} |    0
 ...nt.spec.ts => card-view.component.spec.ts} |   14 +-
 ...ew.component.ts => card-view.component.ts} |    4 +-
 .../src/components/view/card-view.module.ts   |   12 +-
 .../services/alfresco-content.service.spec.ts |    8 +-
 .../src/services/alfresco-content.service.ts  |    4 +-
 .../services/auth-guard-bpm.service.spec.ts   |    8 +-
 .../src/services/auth-guard-bpm.service.ts    |    4 +-
 .../services/auth-guard-ecm.service.spec.ts   |    8 +-
 .../src/services/auth-guard-ecm.service.ts    |    4 +-
 .../src/services/auth-guard.service.spec.ts   |    8 +-
 .../src/services/auth-guard.service.ts        |    4 +-
 ...spec.ts => authentication.service.spec.ts} |   10 +-
 ...n.service.ts => authentication.service.ts} |    6 +-
 ...service.ts => card-view-update.service.ts} |    0
 .../ng2-alfresco-core/src/services/index.ts   |   36 -
 .../src/services/thumbnail.service.spec.ts    |    4 +-
 ...service.ts => translate-loader.service.ts} |    0
 ...oader.spec.ts => translate-loader.spec.ts} |   18 +-
 ...ce.spec.ts => translation.service.spec.ts} |   22 +-
 ...tion.service.ts => translation.service.ts} |    4 +-
 .../src/services/upload.service.spec.ts       |    4 +-
 .../ng2-alfresco-datatable/index.ts           |    6 +-
 ...component.css => empty-list.component.css} |    0
 ...mponent.html => empty-list.component.html} |    0
 ...t.spec.ts => empty-list.component.spec.ts} |   12 +-
 ...t.component.ts => empty-list.component.ts} |    6 +-
 .../ng2-alfresco-documentlist/README.md       |    1 +
 ng2-components/ng2-alfresco-login/index.ts    |   18 +-
 ...ogin.component.css => login.component.css} |    0
 ...in.component.html => login.component.html} |    0
 ...ponent.spec.ts => login.component.spec.ts} |   10 +-
 ...-login.component.ts => login.component.ts} |    6 +-
 .../directives/login-footer.directive.spec.ts |    4 +-
 .../src/directives/login-footer.directive.ts  |    4 +-
 .../directives/login-header.directive.spec.ts |    4 +-
 .../src/directives/login-header.directive.ts  |    4 +-
 .../ng2-alfresco-login/src/i18n/en.json       |    2 +-
 .../ng2-alfresco-login/src/i18n/it.json       |    2 +-
 ng2-components/ng2-alfresco-search/index.ts   |   34 +-
 ...onent.mock.ts => search.component.mock.ts} |    0
 ...service.mock.ts => search.service.mock.ts} |    0
 ....css => search-autocomplete.component.css} |    0
 ...tml => search-autocomplete.component.html} |    0
 ... => search-autocomplete.component.spec.ts} |   28 +-
 ...nt.ts => search-autocomplete.component.ts} |   10 +-
 ...onent.css => search-control.component.css} |    0
 ...ent.html => search-control.component.html} |    0
 ...ec.ts => search-control.component.spec.ts} |   24 +-
 ...mponent.ts => search-control.component.ts} |   14 +-
 ...rch.component.css => search.component.css} |    0
 ...h.component.html => search.component.html} |    0
 ...onent.spec.ts => search.component.spec.ts} |   36 +-
 ...earch.component.ts => search.component.ts} |   12 +-
 ...service.spec.ts => search.service.spec.ts} |   12 +-
 ...co-search.service.ts => search.service.ts} |    2 +-
 ng2-components/ng2-alfresco-tag/index.ts      |   14 +-
 ng2-components/package.json                   |    6 +-
 ng2-components/tslint.json                    |    7 +-
 215 files changed, 3442 insertions(+), 946 deletions(-)
 create mode 100644 ng2-components/adf-rules/adfClassNameRule.js
 create mode 100644 ng2-components/adf-rules/adfClassNameRule.ts
 create mode 100644 ng2-components/adf-rules/adfFileNameRule.js
 create mode 100644 ng2-components/adf-rules/adfFileNameRule.ts
 create mode 100644 ng2-components/adf-rules/package-lock.json
 create mode 100644 ng2-components/adf-rules/package.json
 create mode 100644 ng2-components/adf-rules/tsconfig.json
 create mode 100644 ng2-components/adf-rules/tslint.json
 rename ng2-components/ng2-activiti-form/src/assets/{activiti-form.component.mock.ts => form.component.mock.ts} (100%)
 rename ng2-components/ng2-activiti-form/src/components/{adf-form-list.component.css => form-list.component.css} (100%)
 rename ng2-components/ng2-activiti-form/src/components/{adf-form-list.component.html => form-list.component.html} (100%)
 rename ng2-components/ng2-activiti-form/src/components/{adf-form-list.component.spec.ts => form-list.component.spec.ts} (91%)
 rename ng2-components/ng2-activiti-form/src/components/{adf-form-list.component.ts => form-list.component.ts} (89%)
 rename ng2-components/ng2-activiti-form/src/components/{activiti-form.component.css => form.component.css} (100%)
 rename ng2-components/ng2-activiti-form/src/components/{activiti-form.component.html => form.component.html} (100%)
 rename ng2-components/ng2-activiti-form/src/components/{activiti-form.component.spec.ts => form.component.spec.ts} (97%)
 rename ng2-components/ng2-activiti-form/src/components/{activiti-form.component.ts => form.component.ts} (97%)
 rename ng2-components/ng2-activiti-form/src/components/{activiti-start-form.component.html => start-form.component.html} (100%)
 rename ng2-components/ng2-activiti-form/src/components/{activiti-start-form.component.spec.ts => start-form.component.spec.ts} (94%)
 rename ng2-components/ng2-activiti-form/src/components/{activiti-start-form.component.ts => start-form.component.ts} (95%)
 rename ng2-components/ng2-activiti-processlist/src/assets/{activiti-process-instances-list.mock.ts => process-instances-list.mock.ts} (100%)
 rename ng2-components/ng2-activiti-processlist/src/assets/{activiti-process.model.mock.ts => process.model.mock.ts} (100%)
 rename ng2-components/ng2-activiti-processlist/src/assets/{activiti-process.service.mock.ts => process.service.mock.ts} (91%)
 rename ng2-components/ng2-activiti-processlist/src/assets/{activiti-start-process.component.mock.ts => start-process.component.mock.ts} (100%)
 rename ng2-components/ng2-activiti-processlist/src/components/{adf-create-process-attachment.component.css => create-process-attachment.component.css} (100%)
 rename ng2-components/ng2-activiti-processlist/src/components/{adf-create-process-attachment.component.html => create-process-attachment.component.html} (100%)
 rename ng2-components/ng2-activiti-processlist/src/components/{adf-create-process-attachment.component.spec.ts => create-process-attachment.component.spec.ts} (91%)
 rename ng2-components/ng2-activiti-processlist/src/components/{adf-create-process-attachment.component.ts => create-process-attachment.component.ts} (91%)
 delete mode 100644 ng2-components/ng2-activiti-processlist/src/components/index.ts
 rename ng2-components/ng2-activiti-processlist/src/components/{adf-process-attachment-list.component.css => process-attachment-list.component.css} (100%)
 rename ng2-components/ng2-activiti-processlist/src/components/{adf-process-attachment-list.component.html => process-attachment-list.component.html} (100%)
 rename ng2-components/ng2-activiti-processlist/src/components/{adf-process-attachment-list.component.spec.ts => process-attachment-list.component.spec.ts} (95%)
 rename ng2-components/ng2-activiti-processlist/src/components/{adf-process-attachment-list.component.ts => process-attachment-list.component.ts} (95%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-process-comments.component.css => process-comments.component.css} (100%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-process-comments.component.html => process-comments.component.html} (100%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-process-comments.component.spec.ts => process-comments.component.spec.ts} (92%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-process-comments.component.ts => process-comments.component.ts} (90%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-filters.component.css => process-filters.component.css} (100%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-filters.component.html => process-filters.component.html} (100%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-filters.component.spec.ts => process-filters.component.spec.ts} (93%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-filters.component.ts => process-filters.component.ts} (95%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-process-instance-details.component.css => process-instance-details.component.css} (100%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-process-instance-details.component.html => process-instance-details.component.html} (100%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-process-instance-details.component.spec.ts => process-instance-details.component.spec.ts} (88%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-process-instance-details.component.ts => process-instance-details.component.ts} (83%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-process-instance-header.component.css => process-instance-header.component.css} (100%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-process-instance-header.component.html => process-instance-header.component.html} (100%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-process-instance-header.component.spec.ts => process-instance-header.component.spec.ts} (86%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-process-instance-header.component.ts => process-instance-header.component.ts} (93%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-process-instance-tasks.component.css => process-instance-tasks.component.css} (100%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-process-instance-tasks.component.html => process-instance-tasks.component.html} (100%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-process-instance-tasks.component.spec.ts => process-instance-tasks.component.spec.ts} (90%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-process-instance-tasks.component.ts => process-instance-tasks.component.ts} (94%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-process-instance-variables.component.css => process-instance-variables.component.css} (100%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-process-instance-variables.component.html => process-instance-variables.component.html} (100%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-process-instance-variables.component.spec.ts => process-instance-variables.component.spec.ts} (95%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-process-instance-variables.component.ts => process-instance-variables.component.ts} (95%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-processlist.component.css => processlist.component.css} (100%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-processlist.component.html => processlist.component.html} (100%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-processlist.component.spec.ts => processlist.component.spec.ts} (95%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-processlist.component.ts => processlist.component.ts} (96%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-start-process.component.css => start-process.component.css} (100%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-start-process.component.html => start-process.component.html} (100%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-start-process.component.spec.ts => start-process.component.spec.ts} (94%)
 rename ng2-components/ng2-activiti-processlist/src/components/{activiti-start-process.component.ts => start-process.component.ts} (90%)
 delete mode 100644 ng2-components/ng2-activiti-processlist/src/models/index.ts
 rename ng2-components/ng2-activiti-processlist/src/services/{activiti-process.service.spec.ts => process.service.spec.ts} (98%)
 rename ng2-components/ng2-activiti-processlist/src/services/{activiti-process.service.ts => process.service.ts} (98%)
 rename ng2-components/ng2-activiti-tasklist/src/assets/{activiti-apps.mock.ts => apps-list.mock.ts} (100%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-apps-grid.component.css => apps-grid.component.css} (100%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-apps.component.css => apps-list.component.css} (100%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-apps.component.html => apps-list.component.html} (100%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-apps.component.spec.ts => apps-list.component.spec.ts} (91%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-apps.component.ts => apps-list.component.ts} (82%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-checklist.component.css => checklist.component.css} (100%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-checklist.component.html => checklist.component.html} (100%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-checklist.component.spec.ts => checklist.component.spec.ts} (95%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-checklist.component.ts => checklist.component.ts} (92%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{adf-comment-list.component.css => comment-list.component.css} (100%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{adf-comment-list.component.html => comment-list.component.html} (100%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{adf-comment-list.component.spec.ts => comment-list.component.spec.ts} (93%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{adf-comment-list.component.ts => comment-list.component.ts} (91%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-comments.component.css => comments.component.css} (100%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-comments.component.html => comments.component.html} (100%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-comments.component.spec.ts => comments.component.spec.ts} (92%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-comments.component.ts => comments.component.ts} (91%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{adf-create-task-attachment.component.css => create-task-attachment.component.css} (100%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{adf-create-task-attachment.component.html => create-task-attachment.component.html} (100%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{adf-create-task-attachment.component.spec.ts => create-task-attachment.component.spec.ts} (89%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{adf-create-task-attachment.component.ts => create-task-attachment.component.ts} (91%)
 delete mode 100644 ng2-components/ng2-activiti-tasklist/src/components/index.ts
 rename ng2-components/ng2-activiti-tasklist/src/components/{no-task-detail-template.component.spec.ts => no-task-detail-template.directive.spec.ts} (82%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{no-task-detail-template.component.ts => no-task-detail-template.directive.ts} (87%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{adf-people-list.component.css => people-list.component.css} (100%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{adf-people-list.component.html => people-list.component.html} (100%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{adf-people-list.component.spec.ts => people-list.component.spec.ts} (93%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{adf-people-list.component.ts => people-list.component.ts} (92%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-people-search.component.css => people-search.component.css} (100%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-people-search.component.html => people-search.component.html} (100%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-people-search.component.spec.ts => people-search.component.spec.ts} (76%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-people-search.component.ts => people-search.component.ts} (94%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-people.component.css => people.component.css} (100%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-people.component.html => people.component.html} (100%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-people.component.spec.ts => people.component.spec.ts} (93%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-people.component.ts => people.component.ts} (91%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-start-task.component.css => start-task.component.css} (100%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-start-task.component.html => start-task.component.html} (100%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-start-task.component.spec.ts => start-task.component.spec.ts} (90%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-start-task.component.ts => start-task.component.ts} (86%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{adf-task-attachment-list.component.css => task-attachment-list.component.css} (100%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{adf-task-attachment-list.component.html => task-attachment-list.component.html} (100%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{adf-task-attachment-list.component.spec.ts => task-attachment-list.component.spec.ts} (98%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{adf-task-attachment-list.component.ts => task-attachment-list.component.ts} (97%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-task-details.component.css => task-details.component.css} (100%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-task-details.component.html => task-details.component.html} (100%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-task-details.component.spec.ts => task-details.component.spec.ts} (93%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-task-details.component.ts => task-details.component.ts} (96%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-filters.component.css => task-filters.component.css} (100%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-filters.component.html => task-filters.component.html} (100%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-filters.component.spec.ts => task-filters.component.spec.ts} (96%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-filters.component.ts => task-filters.component.ts} (95%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-task-header.component.html => task-header.component.html} (100%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-task-header.component.scss => task-header.component.scss} (100%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-task-header.component.spec.ts => task-header.component.spec.ts} (91%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-task-header.component.ts => task-header.component.ts} (90%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-tasklist.component.css => tasklist.component.css} (100%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-tasklist.component.html => tasklist.component.html} (100%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-tasklist.component.spec.ts => tasklist.component.spec.ts} (96%)
 rename ng2-components/ng2-activiti-tasklist/src/components/{activiti-tasklist.component.ts => tasklist.component.ts} (95%)
 delete mode 100644 ng2-components/ng2-activiti-tasklist/src/models/index.ts
 rename ng2-components/ng2-activiti-tasklist/src/services/{activiti-people.service.spec.ts => people.service.spec.ts} (95%)
 rename ng2-components/ng2-activiti-tasklist/src/services/{activiti-people.service.ts => people.service.ts} (98%)
 rename ng2-components/ng2-activiti-tasklist/src/services/{activiti-tasklist.service.spec.ts => tasklist.service.spec.ts} (99%)
 rename ng2-components/ng2-activiti-tasklist/src/services/{activiti-tasklist.service.ts => tasklist.service.ts} (99%)
 rename ng2-components/ng2-alfresco-core/src/components/view/{adf-card-view-content-proxy.directive.ts => card-view-content-proxy.directive.ts} (94%)
 rename ng2-components/ng2-alfresco-core/src/components/view/{adf-card-view-dateitem.component.html => card-view-dateitem.component.html} (100%)
 rename ng2-components/ng2-alfresco-core/src/components/view/{adf-card-view-dateitem.component.scss => card-view-dateitem.component.scss} (100%)
 rename ng2-components/ng2-alfresco-core/src/components/view/{adf-card-view-dateitem.component.spec.ts => card-view-dateitem.component.spec.ts} (97%)
 rename ng2-components/ng2-alfresco-core/src/components/view/{adf-card-view-dateitem.component.ts => card-view-dateitem.component.ts} (87%)
 rename ng2-components/ng2-alfresco-core/src/components/view/{adf-card-view-item-dispatcher.component.spec.ts => card-view-item-dispatcher.component.spec.ts} (95%)
 rename ng2-components/ng2-alfresco-core/src/components/view/{adf-card-view-item-dispatcher.component.ts => card-view-item-dispatcher.component.ts} (93%)
 rename ng2-components/ng2-alfresco-core/src/components/view/{adf-card-view-textitem.component.html => card-view-textitem.component.html} (100%)
 rename ng2-components/ng2-alfresco-core/src/components/view/{adf-card-view-textitem.component.scss => card-view-textitem.component.scss} (100%)
 rename ng2-components/ng2-alfresco-core/src/components/view/{adf-card-view-textitem.component.spec.ts => card-view-textitem.component.spec.ts} (97%)
 rename ng2-components/ng2-alfresco-core/src/components/view/{adf-card-view-textitem.component.ts => card-view-textitem.component.ts} (89%)
 rename ng2-components/ng2-alfresco-core/src/components/view/{adf-card-view.component.html => card-view.component.html} (100%)
 rename ng2-components/ng2-alfresco-core/src/components/view/{adf-card-view.component.scss => card-view.component.scss} (100%)
 rename ng2-components/ng2-alfresco-core/src/components/view/{adf-card-view.component.spec.ts => card-view.component.spec.ts} (90%)
 rename ng2-components/ng2-alfresco-core/src/components/view/{adf-card-view.component.ts => card-view.component.ts} (90%)
 rename ng2-components/ng2-alfresco-core/src/services/{alfresco-authentication.service.spec.ts => authentication.service.spec.ts} (98%)
 rename ng2-components/ng2-alfresco-core/src/services/{alfresco-authentication.service.ts => authentication.service.ts} (98%)
 rename ng2-components/ng2-alfresco-core/src/services/{adf-card-view-update.service.ts => card-view-update.service.ts} (100%)
 delete mode 100644 ng2-components/ng2-alfresco-core/src/services/index.ts
 rename ng2-components/ng2-alfresco-core/src/services/{alfresco-translate-loader.service.ts => translate-loader.service.ts} (100%)
 rename ng2-components/ng2-alfresco-core/src/services/{alfresco-translate-loader.spec.ts => translate-loader.spec.ts} (80%)
 rename ng2-components/ng2-alfresco-core/src/services/{alfresco-translation.service.spec.ts => translation.service.spec.ts} (76%)
 rename ng2-components/ng2-alfresco-core/src/services/{alfresco-translation.service.ts => translation.service.ts} (94%)
 rename ng2-components/ng2-alfresco-datatable/src/components/datatable/{adf-empty-list.component.css => empty-list.component.css} (100%)
 rename ng2-components/ng2-alfresco-datatable/src/components/datatable/{adf-empty-list.component.html => empty-list.component.html} (100%)
 rename ng2-components/ng2-alfresco-datatable/src/components/datatable/{adf-empty-list.component.spec.ts => empty-list.component.spec.ts} (88%)
 rename ng2-components/ng2-alfresco-datatable/src/components/datatable/{adf-empty-list.component.ts => empty-list.component.ts} (88%)
 rename ng2-components/ng2-alfresco-login/src/components/{alfresco-login.component.css => login.component.css} (100%)
 rename ng2-components/ng2-alfresco-login/src/components/{alfresco-login.component.html => login.component.html} (100%)
 rename ng2-components/ng2-alfresco-login/src/components/{alfresco-login.component.spec.ts => login.component.spec.ts} (98%)
 rename ng2-components/ng2-alfresco-login/src/components/{alfresco-login.component.ts => login.component.ts} (98%)
 rename ng2-components/ng2-alfresco-search/src/assets/{alfresco-search.component.mock.ts => search.component.mock.ts} (100%)
 rename ng2-components/ng2-alfresco-search/src/assets/{alfresco-search.service.mock.ts => search.service.mock.ts} (100%)
 rename ng2-components/ng2-alfresco-search/src/components/{alfresco-search-autocomplete.component.css => search-autocomplete.component.css} (100%)
 rename ng2-components/ng2-alfresco-search/src/components/{alfresco-search-autocomplete.component.html => search-autocomplete.component.html} (100%)
 rename ng2-components/ng2-alfresco-search/src/components/{alfresco-search-autocomplete.component.spec.ts => search-autocomplete.component.spec.ts} (93%)
 rename ng2-components/ng2-alfresco-search/src/components/{alfresco-search-autocomplete.component.ts => search-autocomplete.component.ts} (93%)
 rename ng2-components/ng2-alfresco-search/src/components/{alfresco-search-control.component.css => search-control.component.css} (100%)
 rename ng2-components/ng2-alfresco-search/src/components/{alfresco-search-control.component.html => search-control.component.html} (100%)
 rename ng2-components/ng2-alfresco-search/src/components/{alfresco-search-control.component.spec.ts => search-control.component.spec.ts} (95%)
 rename ng2-components/ng2-alfresco-search/src/components/{alfresco-search-control.component.ts => search-control.component.ts} (92%)
 rename ng2-components/ng2-alfresco-search/src/components/{alfresco-search.component.css => search.component.css} (100%)
 rename ng2-components/ng2-alfresco-search/src/components/{alfresco-search.component.html => search.component.html} (100%)
 rename ng2-components/ng2-alfresco-search/src/components/{alfresco-search.component.spec.ts => search.component.spec.ts} (91%)
 rename ng2-components/ng2-alfresco-search/src/components/{alfresco-search.component.ts => search.component.ts} (92%)
 rename ng2-components/ng2-alfresco-search/src/services/{alfresco-search.service.spec.ts => search.service.spec.ts} (91%)
 rename ng2-components/ng2-alfresco-search/src/services/{alfresco-search.service.ts => search.service.ts} (98%)

diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts
index 46eb00eb09..ec98fb0a34 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts
+++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts
@@ -20,20 +20,20 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { AnalyticsReportListComponent } from 'ng2-activiti-analytics';
 import { FormEvent, FormFieldEvent, FormRenderingService, FormService } from 'ng2-activiti-form';
 import {
-    ActivitiProcessFiltersComponent,
-    ActivitiProcessInstanceDetailsComponent,
-    ActivitiProcessInstanceListComponent,
-    ActivitiStartProcessInstanceComponent,
     FilterProcessRepresentationModel,
-    ProcessInstance
+    ProcessFiltersComponent,
+    ProcessInstance,
+    ProcessInstanceDetailsComponent,
+    ProcessInstanceListComponent,
+    StartProcessInstanceComponent
 } from 'ng2-activiti-processlist';
 import {
-    ActivitiAppsComponent,
-    ActivitiFiltersComponent,
-    ActivitiTaskDetailsComponent,
-    ActivitiTaskListComponent,
+    AppsListComponent,
     FilterRepresentationModel,
-    TaskDetailsEvent
+    TaskDetailsComponent,
+    TaskDetailsEvent,
+    TaskFiltersComponent,
+    TaskListComponent
 } from 'ng2-activiti-tasklist';
 import { AlfrescoApiService } from 'ng2-alfresco-core';
 import {
@@ -55,26 +55,26 @@ const currentProcessIdNew = '__NEW__';
 })
 export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
 
-    @ViewChild(ActivitiFiltersComponent)
-    activitifilter: ActivitiFiltersComponent;
+    @ViewChild(TaskFiltersComponent)
+    activitifilter: TaskFiltersComponent;
 
-    @ViewChild(ActivitiTaskListComponent)
-    taskList: ActivitiTaskListComponent;
+    @ViewChild(TaskListComponent)
+    taskList: TaskListComponent;
 
-    @ViewChild(ActivitiProcessFiltersComponent)
-    activitiprocessfilter: ActivitiProcessFiltersComponent;
+    @ViewChild(ProcessFiltersComponent)
+    activitiprocessfilter: ProcessFiltersComponent;
 
-    @ViewChild(ActivitiProcessInstanceListComponent)
-    processList: ActivitiProcessInstanceListComponent;
+    @ViewChild(ProcessInstanceListComponent)
+    processList: ProcessInstanceListComponent;
 
-    @ViewChild(ActivitiProcessInstanceDetailsComponent)
-    activitiprocessdetails: ActivitiProcessInstanceDetailsComponent;
+    @ViewChild(ProcessInstanceDetailsComponent)
+    activitiprocessdetails: ProcessInstanceDetailsComponent;
 
-    @ViewChild(ActivitiTaskDetailsComponent)
-    activitidetails: ActivitiTaskDetailsComponent;
+    @ViewChild(TaskDetailsComponent)
+    activitidetails: TaskDetailsComponent;
 
-    @ViewChild(ActivitiStartProcessInstanceComponent)
-    activitiStartProcess: ActivitiStartProcessInstanceComponent;
+    @ViewChild(StartProcessInstanceComponent)
+    activitiStartProcess: StartProcessInstanceComponent;
 
     @ViewChild(AnalyticsReportListComponent)
     analyticsreportlist: AnalyticsReportListComponent;
@@ -159,7 +159,7 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
             this.processFilter = null;
             this.currentProcessInstanceId = null;
         });
-        this.layoutType = ActivitiAppsComponent.LAYOUT_GRID;
+        this.layoutType = AppsListComponent.LAYOUT_GRID;
 
     }
 
diff --git a/demo-shell-ng2/app/components/activiti/activiti-process-attachments.component.ts b/demo-shell-ng2/app/components/activiti/activiti-process-attachments.component.ts
index 1bc0efcff4..0c317b6b9a 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-process-attachments.component.ts
+++ b/demo-shell-ng2/app/components/activiti/activiti-process-attachments.component.ts
@@ -16,7 +16,7 @@
  */
 
 import { Component, Input, OnInit, ViewChild } from '@angular/core';
-import { ActivitiProcessAttachmentListComponent, ProcessUploadService } from 'ng2-activiti-processlist';
+import { ProcessAttachmentListComponent, ProcessUploadService } from 'ng2-activiti-processlist';
 import { UploadService } from 'ng2-alfresco-core';
 
 @Component({
@@ -33,8 +33,8 @@ export class ActivitiProcessAttachmentsComponent implements OnInit {
     @Input()
     processId: string;
 
-    @ViewChild(ActivitiProcessAttachmentListComponent)
-    processAttachList: ActivitiProcessAttachmentListComponent;
+    @ViewChild(ProcessAttachmentListComponent)
+    processAttachList: ProcessAttachmentListComponent;
 
     fileShowed: boolean = false;
     content: Blob;
diff --git a/ng2-components/adf-rules/adfClassNameRule.js b/ng2-components/adf-rules/adfClassNameRule.js
new file mode 100644
index 0000000000..687d6548e1
--- /dev/null
+++ b/ng2-components/adf-rules/adfClassNameRule.js
@@ -0,0 +1,61 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var Lint = require("tslint");
+var sprintf_js_1 = require("sprintf-js");
+var walkerFactory_1 = require("codelyzer/walkerFactory/walkerFactory");
+var walkerFn_1 = require("codelyzer/walkerFactory/walkerFn");
+var function_1 = require("codelyzer/util/function");
+var Rule = (function (_super) {
+    __extends(Rule, _super);
+    function Rule() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Rule.invalidName = function (className) {
+        var whiteList = ['ActivitiContentComponent', 'ActivitiForm'];
+        var classNameReg = /^(alfresco|activiti|adf|activity)/ig;
+        var classNameMatch = classNameReg.exec(className);
+        var isWhiteListName = whiteList.find(function (currentWhiteListName) {
+            return currentWhiteListName === className;
+        });
+        if (classNameMatch && !isWhiteListName) {
+            return true;
+        }
+        return false;
+    };
+    Rule.prototype.apply = function (sourceFile) {
+        return this.applyWithWalker(Rule.walkerBuilder(sourceFile, this.getOptions()));
+    };
+    Rule.metadata = {
+        ruleName: 'adf-class-name',
+        type: 'maintainability',
+        description: "Enforce consistent name avoid prefix",
+        descriptionDetails: "See more at https://angular.io/styleguide#style-05-13.",
+        rationale: "Consistent conventions make it easy to quickly identify class when you search with autocomplete.",
+        options: null,
+        optionsDescription: "Not configurable.",
+        typescriptOnly: true,
+    };
+    Rule.FAILURE_STRING = 'The name of the class should not start with ADF Alfresco or Activiti prefix ';
+    Rule.walkerBuilder = walkerFn_1.all(walkerFn_1.validateComponent(function (meta, suffixList) {
+        return function_1.Maybe.lift(meta.controller)
+            .fmap(function (controller) { return controller.name; })
+            .fmap(function (name) {
+            var className = name.text;
+            if (Rule.invalidName(className)) {
+                return [new walkerFactory_1.Failure(name, sprintf_js_1.sprintf(Rule.FAILURE_STRING + className, className, suffixList))];
+            }
+        });
+    }));
+    return Rule;
+}(Lint.Rules.AbstractRule));
+exports.Rule = Rule;
diff --git a/ng2-components/adf-rules/adfClassNameRule.ts b/ng2-components/adf-rules/adfClassNameRule.ts
new file mode 100644
index 0000000000..18d527909d
--- /dev/null
+++ b/ng2-components/adf-rules/adfClassNameRule.ts
@@ -0,0 +1,61 @@
+import * as Lint from 'tslint';
+import * as ts from 'typescript';
+import {sprintf} from 'sprintf-js';
+import {ComponentMetadata} from 'codelyzer/angular/metadata';
+import {Failure} from 'codelyzer/walkerFactory/walkerFactory';
+import {all, validateComponent} from 'codelyzer/walkerFactory/walkerFn';
+import {Maybe, F2} from 'codelyzer/util/function';
+import {IOptions} from 'tslint';
+import {NgWalker} from 'codelyzer/angular/ngWalker';
+
+export class Rule extends Lint.Rules.AbstractRule {
+
+    public static metadata: Lint.IRuleMetadata = {
+        ruleName: 'adf-class-name',
+        type: 'maintainability',
+        description: `Enforce consistent name avoid prefix`,
+        descriptionDetails: `See more at https://angular.io/styleguide#style-05-13.`,
+        rationale: `Consistent conventions make it easy to quickly identify class when you search with autocomplete.`,
+        options: null,
+        optionsDescription: "Not configurable.",
+        typescriptOnly: true,
+    };
+
+    public static FAILURE_STRING = 'The name of the class should not start with ADF Alfresco or Activiti prefix ';
+
+    static walkerBuilder: F2<ts.SourceFile, IOptions, NgWalker> =
+        all(
+            validateComponent((meta: ComponentMetadata, suffixList?: string[]) =>
+                Maybe.lift(meta.controller)
+                    .fmap(controller => controller.name)
+                    .fmap(name => {
+                        const className = name.text;
+                        if (Rule.invalidName(className)) {
+                            return [new Failure(name, sprintf(Rule.FAILURE_STRING + className , className, suffixList))];
+                        }
+                    })
+            ));
+
+    static invalidName(className: string): boolean {
+        var whiteList = ['ActivitiContentComponent', 'ActivitiForm'];
+
+        var classNameReg = /^(alfresco|activiti|adf|activity)/ig;
+        var classNameMatch = classNameReg.exec(className);
+
+        var isWhiteListName = whiteList.find((currentWhiteListName)=>{
+            return currentWhiteListName === className;
+        });
+
+        if (classNameMatch && !isWhiteListName) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
+        return this.applyWithWalker(
+            Rule.walkerBuilder(sourceFile, this.getOptions())
+        );
+    }
+}
diff --git a/ng2-components/adf-rules/adfFileNameRule.js b/ng2-components/adf-rules/adfFileNameRule.js
new file mode 100644
index 0000000000..c323565482
--- /dev/null
+++ b/ng2-components/adf-rules/adfFileNameRule.js
@@ -0,0 +1,67 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var Lint = require("tslint");
+var Rule = (function (_super) {
+    __extends(Rule, _super);
+    function Rule() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Rule.prototype.apply = function (sourceFile) {
+        return this.applyWithWalker(new AdfFileName(sourceFile, this.getOptions()));
+    };
+    Rule.metadata = {
+        ruleName: 'adf-file-name',
+        type: 'maintainability',
+        description: "Enforce consistent name avoid prefix",
+        descriptionDetails: "See more at https://angular.io/styleguide#style-05-13.",
+        rationale: "Consistent conventions make it easy to quickly identify files when you search with autocomplete.",
+        options: null,
+        optionsDescription: "Not configurable.",
+        typescriptOnly: true,
+    };
+    Rule.FAILURE_STRING = 'The name of the File should not start with ADF Alfresco or Activiti prefix ';
+    return Rule;
+}(Lint.Rules.AbstractRule));
+exports.Rule = Rule;
+var AdfFileName = (function (_super) {
+    __extends(AdfFileName, _super);
+    function AdfFileName() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    AdfFileName.prototype.visitSourceFile = function (node) {
+        var whiteList = ['activiti-content.component.ts', 'activiti-alfresco.service.ts', 'activiti-content-service.ts',
+            'alfresco-api.service.ts', 'alfresco-settings.service.ts', 'alfresco-content.service.ts',
+            'activiti-content.component.spec.ts', 'activiti-alfresco.service.spec.ts', 'activiti-content-service.spec.ts',
+            'alfresco-api.service.spec.ts', 'alfresco-settings.service.spec.ts', 'alfresco-content.service.spec.ts',
+            'activiti-content.service.spec.ts', 'activiti-content.service.ts'];
+        var fileName = this.getFilename();
+        var fileNameReg = /^(alfresco|activiti|adf|activity)/ig;
+        var filenameMatch = fileNameReg.exec(fileName);
+        var isWhiteListName = whiteList.find(function (currentWhiteListName) {
+            return currentWhiteListName === fileName;
+        });
+        if (filenameMatch && !isWhiteListName) {
+            this.addFailure(this.createFailure(node.getStart(), node.getWidth(), Rule.FAILURE_STRING + fileName));
+            _super.prototype.visitSourceFile.call(this, node);
+        }
+    };
+    AdfFileName.prototype.getFilename = function () {
+        var filename = this.getSourceFile().fileName;
+        var lastSlash = filename.lastIndexOf('/');
+        if (lastSlash > -1) {
+            return filename.substring(lastSlash + 1);
+        }
+        return filename;
+    };
+    return AdfFileName;
+}(Lint.RuleWalker));
diff --git a/ng2-components/adf-rules/adfFileNameRule.ts b/ng2-components/adf-rules/adfFileNameRule.ts
new file mode 100644
index 0000000000..440c2edb31
--- /dev/null
+++ b/ng2-components/adf-rules/adfFileNameRule.ts
@@ -0,0 +1,56 @@
+import * as ts from "typescript";
+import * as Lint from "tslint";
+
+
+export class Rule extends Lint.Rules.AbstractRule {
+    public static metadata: Lint.IRuleMetadata = {
+        ruleName: 'adf-file-name',
+        type: 'maintainability',
+        description: `Enforce consistent name avoid prefix`,
+        descriptionDetails: `See more at https://angular.io/styleguide#style-05-13.`,
+        rationale: `Consistent conventions make it easy to quickly identify files when you search with autocomplete.`,
+        options: null,
+        optionsDescription: "Not configurable.",
+        typescriptOnly: true,
+    };
+
+    public static FAILURE_STRING =  'The name of the File should not start with ADF Alfresco or Activiti prefix ';
+
+    public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
+        return this.applyWithWalker(new AdfFileName(sourceFile, this.getOptions()));
+    }
+}
+
+// The walker takes care of all the work.
+class AdfFileName extends Lint.RuleWalker {
+    public visitSourceFile(node: ts.SourceFile) {
+        var whiteList = ['activiti-content.component.ts', 'activiti-alfresco.service.ts', 'activiti-content-service.ts',
+        'alfresco-api.service.ts', 'alfresco-settings.service.ts', 'alfresco-content.service.ts',
+            'activiti-content.component.spec.ts', 'activiti-alfresco.service.spec.ts', 'activiti-content-service.spec.ts',
+            'alfresco-api.service.spec.ts', 'alfresco-settings.service.spec.ts', 'alfresco-content.service.spec.ts',
+            'activiti-content.service.spec.ts', 'activiti-content.service.ts'];
+
+        var fileName = this.getFilename();
+
+        var fileNameReg = /^(alfresco|activiti|adf|activity)/ig;
+        var filenameMatch = fileNameReg.exec(fileName);
+
+        var isWhiteListName = whiteList.find((currentWhiteListName)=>{
+            return currentWhiteListName === fileName;
+        });
+
+        if (filenameMatch && !isWhiteListName) {
+            this.addFailure(this.createFailure(node.getStart(), node.getWidth(), Rule.FAILURE_STRING + fileName));
+            super.visitSourceFile(node);
+        }
+    }
+
+    private getFilename(): string {
+        const filename = this.getSourceFile().fileName;
+        const lastSlash = filename.lastIndexOf('/');
+        if (lastSlash > -1) {
+            return filename.substring(lastSlash + 1);
+        }
+        return filename;
+    }
+}
diff --git a/ng2-components/adf-rules/package-lock.json b/ng2-components/adf-rules/package-lock.json
new file mode 100644
index 0000000000..ef9ba37be4
--- /dev/null
+++ b/ng2-components/adf-rules/package-lock.json
@@ -0,0 +1,2128 @@
+{
+  "name": "ng2-alfresco-search",
+  "version": "1.6.1",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@angular/compiler": {
+      "version": "4.2.6",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.2.6.tgz",
+      "integrity": "sha1-ZndW1JXKDUXSBhJooQ1Sr4Ofr/Q=",
+      "dev": true,
+      "requires": {
+        "tslib": "1.7.1"
+      }
+    },
+    "@angular/core": {
+      "version": "4.2.6",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.2.6.tgz",
+      "integrity": "sha1-DByP8BV/B29KfAtyHKFCPxu+Fk4=",
+      "dev": true,
+      "requires": {
+        "tslib": "1.7.1"
+      }
+    },
+    "@types/chai": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-3.5.2.tgz",
+      "integrity": "sha1-wRzSgX06QBt7oPWkIPNcVhObHB4=",
+      "dev": true
+    },
+    "@types/js-yaml": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.9.0.tgz",
+      "integrity": "sha512-bNVEiBrpEdg5oWz/10gxLUSjQGeBx7HgJHgy2DfR1K7unn260FfRwjVYH/NngQucYeMqsg1hOSo0+heQLJAwZA==",
+      "dev": true
+    },
+    "@types/less": {
+      "version": "0.0.31",
+      "resolved": "https://registry.npmjs.org/@types/less/-/less-0.0.31.tgz",
+      "integrity": "sha1-n7aX4DBHy5qujURi1QIQbPKnSos=",
+      "dev": true
+    },
+    "@types/mocha": {
+      "version": "2.2.41",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.41.tgz",
+      "integrity": "sha1-4nzwgXFT658nE7LT9saPHhw8pgg=",
+      "dev": true
+    },
+    "@types/node": {
+      "version": "6.0.83",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.83.tgz",
+      "integrity": "sha512-Q92+tkWnX7nmT0ZG+/wFxzJr+idr00T12MgsY3p0sZIu8nfvYF8i5pbY3BVZw6ad6yS2MLF71sfMr+ySatc2Gw==",
+      "dev": true
+    },
+    "@types/node-sass": {
+      "version": "3.10.32",
+      "resolved": "https://registry.npmjs.org/@types/node-sass/-/node-sass-3.10.32.tgz",
+      "integrity": "sha1-spbM5xRP+rd7hAkMqtTx5Lvqjgk=",
+      "dev": true,
+      "requires": {
+        "@types/node": "6.0.83"
+      }
+    },
+    "@types/source-map": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@types/source-map/-/source-map-0.5.0.tgz",
+      "integrity": "sha1-3TS72OMv5OdPLj2KwH+KpbRaR6w=",
+      "dev": true
+    },
+    "@types/sprintf-js": {
+      "version": "0.0.27",
+      "resolved": "https://registry.npmjs.org/@types/sprintf-js/-/sprintf-js-0.0.27.tgz",
+      "integrity": "sha1-qoLB7ZoGjTZ8oSiRhWGzSL0w+ho=",
+      "dev": true
+    },
+    "abbrev": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
+      "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=",
+      "dev": true
+    },
+    "ajv": {
+      "version": "4.11.8",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
+      "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
+      "dev": true,
+      "requires": {
+        "co": "4.6.0",
+        "json-stable-stringify": "1.0.1"
+      }
+    },
+    "amdefine": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+      "dev": true
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+      "dev": true
+    },
+    "any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
+      "dev": true
+    },
+    "app-root-path": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.0.1.tgz",
+      "integrity": "sha1-zWLc+OT9WkF+/GZNLlsQZTxlG0Y="
+    },
+    "aproba": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz",
+      "integrity": "sha512-ZpYajIfO0j2cOFTO955KUMIKNmj6zhX8kVztMAxFsDaMwz+9Z9SV0uou2pC9HJqcfpffOsjnbrDMvkNy+9RXPw==",
+      "dev": true
+    },
+    "are-we-there-yet": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
+      "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
+      "dev": true,
+      "requires": {
+        "delegates": "1.0.0",
+        "readable-stream": "2.3.3"
+      }
+    },
+    "argparse": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
+      "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "1.0.3"
+      },
+      "dependencies": {
+        "sprintf-js": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+          "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+          "dev": true
+        }
+      }
+    },
+    "array-find-index": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
+      "dev": true
+    },
+    "arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+      "dev": true
+    },
+    "asn1": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
+      "dev": true
+    },
+    "assert-plus": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
+      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
+      "dev": true
+    },
+    "assertion-error": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.2.tgz",
+      "integrity": "sha1-E8pRXYYgbaC6xm6DTdOX2HWBCUw=",
+      "dev": true
+    },
+    "async-foreach": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
+      "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
+      "dev": true
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "dev": true
+    },
+    "aws-sign2": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
+      "dev": true
+    },
+    "aws4": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
+      "dev": true
+    },
+    "babel-code-frame": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz",
+      "integrity": "sha1-AnYgvuVnqIwyVhV05/0IAdMxGOQ=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "esutils": "2.0.2",
+        "js-tokens": "3.0.2"
+      }
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "tweetnacl": "0.14.5"
+      }
+    },
+    "block-stream": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3"
+      }
+    },
+    "boom": {
+      "version": "2.10.1",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
+      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+      "dev": true,
+      "requires": {
+        "hoek": "2.16.3"
+      }
+    },
+    "brace-expansion": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
+      "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
+      "dev": true,
+      "requires": {
+        "balanced-match": "1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "browser-stdout": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz",
+      "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=",
+      "dev": true
+    },
+    "builtin-modules": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
+      "dev": true
+    },
+    "camelcase": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+      "dev": true
+    },
+    "camelcase-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
+      "dev": true,
+      "requires": {
+        "camelcase": "2.1.1",
+        "map-obj": "1.0.1"
+      }
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+      "dev": true
+    },
+    "chai": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-3.5.0.tgz",
+      "integrity": "sha1-TQJjewZ/6Vi9v906QOxW/vc3Mkc=",
+      "dev": true,
+      "requires": {
+        "assertion-error": "1.0.2",
+        "deep-eql": "0.1.3",
+        "type-detect": "1.0.0"
+      }
+    },
+    "chai-spies": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/chai-spies/-/chai-spies-0.7.1.tgz",
+      "integrity": "sha1-ND2Z9RJEIS6LF+ZLk5lv97LCqbE=",
+      "dev": true
+    },
+    "chalk": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "2.2.1",
+        "escape-string-regexp": "1.0.5",
+        "has-ansi": "2.0.0",
+        "strip-ansi": "3.0.1",
+        "supports-color": "2.0.0"
+      },
+      "dependencies": {
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "cliui": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+      "dev": true,
+      "requires": {
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1",
+        "wrap-ansi": "2.1.0"
+      }
+    },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+      "dev": true
+    },
+    "code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+      "dev": true
+    },
+    "colors": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+      "dev": true
+    },
+    "combined-stream": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+      "dev": true,
+      "requires": {
+        "delayed-stream": "1.0.0"
+      }
+    },
+    "commander": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
+      "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
+      "dev": true,
+      "requires": {
+        "graceful-readlink": "1.0.1"
+      }
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+      "dev": true
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
+    },
+    "cross-spawn": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
+      "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
+      "dev": true,
+      "requires": {
+        "lru-cache": "4.1.1",
+        "which": "1.2.14"
+      }
+    },
+    "cryptiles": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+      "dev": true,
+      "requires": {
+        "boom": "2.10.1"
+      }
+    },
+    "css-selector-tokenizer": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz",
+      "integrity": "sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=",
+      "requires": {
+        "cssesc": "0.1.0",
+        "fastparse": "1.1.1",
+        "regexpu-core": "1.0.0"
+      }
+    },
+    "cssauron": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz",
+      "integrity": "sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=",
+      "requires": {
+        "through": "2.3.8"
+      }
+    },
+    "cssesc": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz",
+      "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q="
+    },
+    "currently-unhandled": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
+      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
+      "dev": true,
+      "requires": {
+        "array-find-index": "1.0.2"
+      }
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        }
+      }
+    },
+    "debug": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+      "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+      "dev": true,
+      "requires": {
+        "ms": "0.7.1"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
+    },
+    "deep-eql": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz",
+      "integrity": "sha1-71WKyrjeJSBs1xOQbXTlaTDrafI=",
+      "dev": true,
+      "requires": {
+        "type-detect": "0.1.1"
+      },
+      "dependencies": {
+        "type-detect": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz",
+          "integrity": "sha1-C6XsKohWQORw6k6FBZcZANrFiCI=",
+          "dev": true
+        }
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "dev": true
+    },
+    "delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+      "dev": true
+    },
+    "diff": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz",
+      "integrity": "sha1-fyjS657nsVqX79ic5j3P2qPMur8=",
+      "dev": true
+    },
+    "ecc-jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "jsbn": "0.1.1"
+      }
+    },
+    "error-ex": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
+      "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "0.2.1"
+      }
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "esprima": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
+      "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+      "dev": true
+    },
+    "extend": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
+      "dev": true
+    },
+    "extsprintf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
+      "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=",
+      "dev": true
+    },
+    "fastparse": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz",
+      "integrity": "sha1-0eJkOzipTXWDtHkGDmxK/8lAcfg="
+    },
+    "find-up": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+      "dev": true,
+      "requires": {
+        "path-exists": "2.1.0",
+        "pinkie-promise": "2.0.1"
+      }
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "dev": true
+    },
+    "form-data": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+      "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+      "dev": true,
+      "requires": {
+        "asynckit": "0.4.0",
+        "combined-stream": "1.0.5",
+        "mime-types": "2.1.15"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "fstream": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "inherits": "2.0.3",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.1"
+      }
+    },
+    "gauge": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+      "dev": true,
+      "requires": {
+        "aproba": "1.1.2",
+        "console-control-strings": "1.1.0",
+        "has-unicode": "2.0.1",
+        "object-assign": "4.1.1",
+        "signal-exit": "3.0.2",
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1",
+        "wide-align": "1.1.2"
+      }
+    },
+    "gaze": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz",
+      "integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=",
+      "dev": true,
+      "requires": {
+        "globule": "1.2.0"
+      }
+    },
+    "get-caller-file": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz",
+      "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=",
+      "dev": true
+    },
+    "get-stdin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
+      "dev": true
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        }
+      }
+    },
+    "glob": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz",
+      "integrity": "sha1-tCAqaQmbu00pKnwblbZoK2fr3JU=",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "1.0.0",
+        "inflight": "1.0.6",
+        "inherits": "2.0.3",
+        "minimatch": "3.0.4",
+        "once": "1.4.0",
+        "path-is-absolute": "1.0.1"
+      }
+    },
+    "globule": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz",
+      "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.2",
+        "lodash": "4.17.4",
+        "minimatch": "3.0.4"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        }
+      }
+    },
+    "graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+      "dev": true
+    },
+    "graceful-readlink": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
+      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
+      "dev": true
+    },
+    "growl": {
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
+      "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=",
+      "dev": true
+    },
+    "har-schema": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
+      "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
+      "dev": true
+    },
+    "har-validator": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
+      "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
+      "dev": true,
+      "requires": {
+        "ajv": "4.11.8",
+        "har-schema": "1.0.5"
+      }
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "2.1.1"
+      }
+    },
+    "has-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+      "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+      "dev": true
+    },
+    "has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
+      "dev": true
+    },
+    "hawk": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+      "dev": true,
+      "requires": {
+        "boom": "2.10.1",
+        "cryptiles": "2.0.5",
+        "hoek": "2.16.3",
+        "sntp": "1.0.9"
+      }
+    },
+    "hoek": {
+      "version": "2.16.3",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+      "dev": true
+    },
+    "hosted-git-info": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
+      "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==",
+      "dev": true
+    },
+    "http-signature": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+      "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "0.2.0",
+        "jsprim": "1.4.0",
+        "sshpk": "1.13.1"
+      }
+    },
+    "in-publish": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
+      "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
+      "dev": true
+    },
+    "indent-string": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+      "dev": true,
+      "requires": {
+        "repeating": "2.0.1"
+      }
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "1.4.0",
+        "wrappy": "1.0.2"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
+    },
+    "invert-kv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+      "dev": true
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "dev": true
+    },
+    "is-builtin-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
+      "dev": true,
+      "requires": {
+        "builtin-modules": "1.1.1"
+      }
+    },
+    "is-finite": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
+      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
+      "dev": true,
+      "requires": {
+        "number-is-nan": "1.0.1"
+      }
+    },
+    "is-fullwidth-code-point": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "dev": true,
+      "requires": {
+        "number-is-nan": "1.0.1"
+      }
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
+    },
+    "is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+      "dev": true
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "dev": true
+    },
+    "js-base64": {
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz",
+      "integrity": "sha1-8OgK4DmkvWVLXygfyT8EqRSn/M4=",
+      "dev": true
+    },
+    "js-tokens": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.0.tgz",
+      "integrity": "sha512-0LoUNELX4S+iofCT8f4uEHIiRBR+c2AINyC8qRWfC6QNruLtxVZRJaPcu/xwMgFIgDxF25tGHaDjvxzJCNE9yw==",
+      "dev": true,
+      "requires": {
+        "argparse": "1.0.9",
+        "esprima": "4.0.0"
+      }
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "dev": true,
+      "optional": true
+    },
+    "jsesc": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0="
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+      "dev": true
+    },
+    "json-stable-stringify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
+      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
+      "dev": true,
+      "requires": {
+        "jsonify": "0.0.0"
+      }
+    },
+    "json-stringify-pretty-compact": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-1.0.4.tgz",
+      "integrity": "sha1-1RYRMb4n/ZdIORNgWX/MolDGxc4=",
+      "dev": true
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true
+    },
+    "json3": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
+      "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
+      "dev": true
+    },
+    "jsonify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
+      "dev": true
+    },
+    "jsprim": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
+      "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.0.2",
+        "json-schema": "0.2.3",
+        "verror": "1.3.6"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        }
+      }
+    },
+    "lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+      "dev": true,
+      "requires": {
+        "invert-kv": "1.0.0"
+      }
+    },
+    "load-json-file": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "parse-json": "2.2.0",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1",
+        "strip-bom": "2.0.0"
+      }
+    },
+    "lodash": {
+      "version": "4.17.4",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+      "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+      "dev": true
+    },
+    "lodash._baseassign": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
+      "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
+      "dev": true,
+      "requires": {
+        "lodash._basecopy": "3.0.1",
+        "lodash.keys": "3.1.2"
+      }
+    },
+    "lodash._basecopy": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
+      "dev": true
+    },
+    "lodash._basecreate": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz",
+      "integrity": "sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=",
+      "dev": true
+    },
+    "lodash._getnative": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
+      "dev": true
+    },
+    "lodash._isiterateecall": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
+      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
+      "dev": true
+    },
+    "lodash.assign": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
+      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
+      "dev": true
+    },
+    "lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+      "dev": true
+    },
+    "lodash.create": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz",
+      "integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=",
+      "dev": true,
+      "requires": {
+        "lodash._baseassign": "3.2.0",
+        "lodash._basecreate": "3.0.3",
+        "lodash._isiterateecall": "3.0.9"
+      }
+    },
+    "lodash.isarguments": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
+      "dev": true
+    },
+    "lodash.isarray": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
+      "dev": true
+    },
+    "lodash.keys": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
+      "dev": true,
+      "requires": {
+        "lodash._getnative": "3.9.1",
+        "lodash.isarguments": "3.1.0",
+        "lodash.isarray": "3.0.4"
+      }
+    },
+    "loud-rejection": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
+      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
+      "dev": true,
+      "requires": {
+        "currently-unhandled": "0.4.1",
+        "signal-exit": "3.0.2"
+      }
+    },
+    "lru-cache": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
+      "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
+      "dev": true,
+      "requires": {
+        "pseudomap": "1.0.2",
+        "yallist": "2.1.2"
+      }
+    },
+    "make-error": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.0.tgz",
+      "integrity": "sha1-Uq06M5zPEM5itAQLcI/nByRLi5Y=",
+      "dev": true
+    },
+    "map-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+      "dev": true
+    },
+    "meow": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
+      "dev": true,
+      "requires": {
+        "camelcase-keys": "2.1.0",
+        "decamelize": "1.2.0",
+        "loud-rejection": "1.6.0",
+        "map-obj": "1.0.1",
+        "minimist": "1.2.0",
+        "normalize-package-data": "2.4.0",
+        "object-assign": "4.1.1",
+        "read-pkg-up": "1.0.1",
+        "redent": "1.0.0",
+        "trim-newlines": "1.0.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
+    "mime-db": {
+      "version": "1.27.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz",
+      "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=",
+      "dev": true
+    },
+    "mime-types": {
+      "version": "2.1.15",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
+      "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=",
+      "dev": true,
+      "requires": {
+        "mime-db": "1.27.0"
+      }
+    },
+    "minimalist": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/minimalist/-/minimalist-1.0.0.tgz",
+      "integrity": "sha1-Zr/k/WJbVozBasyUIRVOZr/Nchg=",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "1.1.8"
+      }
+    },
+    "minimist": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+      "dev": true
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "dev": true,
+      "requires": {
+        "minimist": "0.0.8"
+      }
+    },
+    "mocha": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.0.2.tgz",
+      "integrity": "sha1-Y6l/Phj00+ZZ1HphdnfQiYdFV/A=",
+      "dev": true,
+      "requires": {
+        "browser-stdout": "1.3.0",
+        "commander": "2.9.0",
+        "debug": "2.2.0",
+        "diff": "1.4.0",
+        "escape-string-regexp": "1.0.5",
+        "glob": "7.0.5",
+        "growl": "1.9.2",
+        "json3": "3.3.2",
+        "lodash.create": "3.1.1",
+        "mkdirp": "0.5.1",
+        "supports-color": "3.1.2"
+      }
+    },
+    "ms": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+      "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+      "dev": true
+    },
+    "nan": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz",
+      "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U=",
+      "dev": true
+    },
+    "node-gyp": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz",
+      "integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=",
+      "dev": true,
+      "requires": {
+        "fstream": "1.0.11",
+        "glob": "7.0.5",
+        "graceful-fs": "4.1.11",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.1",
+        "nopt": "3.0.6",
+        "npmlog": "4.1.2",
+        "osenv": "0.1.4",
+        "request": "2.81.0",
+        "rimraf": "2.6.1",
+        "semver": "5.3.0",
+        "tar": "2.2.1",
+        "which": "1.2.14"
+      }
+    },
+    "node-sass": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-3.13.1.tgz",
+      "integrity": "sha1-ckD7v/I5YwS0IjUn7TAgWJwAT8I=",
+      "dev": true,
+      "requires": {
+        "async-foreach": "0.1.3",
+        "chalk": "1.1.3",
+        "cross-spawn": "3.0.1",
+        "gaze": "1.1.2",
+        "get-stdin": "4.0.1",
+        "glob": "7.0.5",
+        "in-publish": "2.0.0",
+        "lodash.assign": "4.2.0",
+        "lodash.clonedeep": "4.5.0",
+        "meow": "3.7.0",
+        "mkdirp": "0.5.1",
+        "nan": "2.6.2",
+        "node-gyp": "3.6.2",
+        "npmlog": "4.1.2",
+        "request": "2.81.0",
+        "sass-graph": "2.2.4"
+      }
+    },
+    "nopt": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+      "dev": true,
+      "requires": {
+        "abbrev": "1.1.0"
+      }
+    },
+    "normalize-package-data": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
+      "dev": true,
+      "requires": {
+        "hosted-git-info": "2.5.0",
+        "is-builtin-module": "1.0.0",
+        "semver": "5.3.0",
+        "validate-npm-package-license": "3.0.1"
+      }
+    },
+    "npmlog": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+      "dev": true,
+      "requires": {
+        "are-we-there-yet": "1.1.4",
+        "console-control-strings": "1.1.0",
+        "gauge": "2.7.4",
+        "set-blocking": "2.0.0"
+      }
+    },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "dev": true
+    },
+    "oauth-sign": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
+      "dev": true
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1.0.2"
+      }
+    },
+    "os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "dev": true
+    },
+    "os-locale": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+      "dev": true,
+      "requires": {
+        "lcid": "1.0.0"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true
+    },
+    "osenv": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
+      "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
+      "dev": true,
+      "requires": {
+        "os-homedir": "1.0.2",
+        "os-tmpdir": "1.0.2"
+      }
+    },
+    "parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "dev": true,
+      "requires": {
+        "error-ex": "1.3.1"
+      }
+    },
+    "path-exists": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+      "dev": true,
+      "requires": {
+        "pinkie-promise": "2.0.1"
+      }
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
+      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
+      "dev": true
+    },
+    "path-type": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1"
+      }
+    },
+    "performance-now": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
+      "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
+      "dev": true
+    },
+    "pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
+      "requires": {
+        "pinkie": "2.0.4"
+      }
+    },
+    "process-nextick-args": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+      "dev": true
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
+      "dev": true
+    },
+    "punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+      "dev": true
+    },
+    "qs": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
+      "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
+      "dev": true
+    },
+    "read-pkg": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+      "dev": true,
+      "requires": {
+        "load-json-file": "1.1.0",
+        "normalize-package-data": "2.4.0",
+        "path-type": "1.1.0"
+      }
+    },
+    "read-pkg-up": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+      "dev": true,
+      "requires": {
+        "find-up": "1.1.2",
+        "read-pkg": "1.1.0"
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+      "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+      "dev": true,
+      "requires": {
+        "core-util-is": "1.0.2",
+        "inherits": "2.0.3",
+        "isarray": "1.0.0",
+        "process-nextick-args": "1.0.7",
+        "safe-buffer": "5.1.1",
+        "string_decoder": "1.0.3",
+        "util-deprecate": "1.0.2"
+      }
+    },
+    "redent": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
+      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
+      "dev": true,
+      "requires": {
+        "indent-string": "2.1.0",
+        "strip-indent": "1.0.1"
+      }
+    },
+    "regenerate": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz",
+      "integrity": "sha1-0ZQcZ7rUN+G+dkM63Vs4X5WxkmA="
+    },
+    "regexpu-core": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz",
+      "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
+      "requires": {
+        "regenerate": "1.3.2",
+        "regjsgen": "0.2.0",
+        "regjsparser": "0.1.5"
+      }
+    },
+    "regjsgen": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
+      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc="
+    },
+    "regjsparser": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
+      "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
+      "requires": {
+        "jsesc": "0.5.0"
+      }
+    },
+    "repeating": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+      "dev": true,
+      "requires": {
+        "is-finite": "1.0.2"
+      }
+    },
+    "request": {
+      "version": "2.81.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
+      "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
+      "dev": true,
+      "requires": {
+        "aws-sign2": "0.6.0",
+        "aws4": "1.6.0",
+        "caseless": "0.12.0",
+        "combined-stream": "1.0.5",
+        "extend": "3.0.1",
+        "forever-agent": "0.6.1",
+        "form-data": "2.1.4",
+        "har-validator": "4.2.1",
+        "hawk": "3.1.3",
+        "http-signature": "1.1.1",
+        "is-typedarray": "1.0.0",
+        "isstream": "0.1.2",
+        "json-stringify-safe": "5.0.1",
+        "mime-types": "2.1.15",
+        "oauth-sign": "0.8.2",
+        "performance-now": "0.2.0",
+        "qs": "6.4.0",
+        "safe-buffer": "5.1.1",
+        "stringstream": "0.0.5",
+        "tough-cookie": "2.3.2",
+        "tunnel-agent": "0.6.0",
+        "uuid": "3.1.0"
+      }
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true
+    },
+    "require-main-filename": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+      "dev": true
+    },
+    "resolve": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz",
+      "integrity": "sha1-ZVkHw0aahoDcLeOidaj91paR8OU=",
+      "dev": true,
+      "requires": {
+        "path-parse": "1.0.5"
+      }
+    },
+    "rimraf": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
+      "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
+      "dev": true,
+      "requires": {
+        "glob": "7.0.5"
+      }
+    },
+    "rxjs": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.4.1.tgz",
+      "integrity": "sha1-ti91fyeURdJloYpY+wpw3JDpFiY=",
+      "dev": true,
+      "requires": {
+        "symbol-observable": "1.0.4"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
+      "dev": true
+    },
+    "sass-graph": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
+      "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
+      "dev": true,
+      "requires": {
+        "glob": "7.0.5",
+        "lodash": "4.17.4",
+        "scss-tokenizer": "0.2.3",
+        "yargs": "7.1.0"
+      }
+    },
+    "scss-tokenizer": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
+      "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
+      "dev": true,
+      "requires": {
+        "js-base64": "2.1.9",
+        "source-map": "0.4.4"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+          "dev": true,
+          "requires": {
+            "amdefine": "1.0.1"
+          }
+        }
+      }
+    },
+    "semver": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+      "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
+    },
+    "semver-dsl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/semver-dsl/-/semver-dsl-1.0.1.tgz",
+      "integrity": "sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=",
+      "requires": {
+        "semver": "5.3.0"
+      }
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "dev": true
+    },
+    "sntp": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+      "dev": true,
+      "requires": {
+        "hoek": "2.16.3"
+      }
+    },
+    "source-map": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
+      "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI="
+    },
+    "source-map-support": {
+      "version": "0.4.15",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz",
+      "integrity": "sha1-AyAt9lwG0r2MfsI2KhkwVv7407E=",
+      "dev": true,
+      "requires": {
+        "source-map": "0.5.6"
+      }
+    },
+    "spdx-correct": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
+      "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
+      "dev": true,
+      "requires": {
+        "spdx-license-ids": "1.2.2"
+      }
+    },
+    "spdx-expression-parse": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz",
+      "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=",
+      "dev": true
+    },
+    "spdx-license-ids": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz",
+      "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=",
+      "dev": true
+    },
+    "sprintf-js": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.1.tgz",
+      "integrity": "sha1-Nr54Mgr+WAH2zqPueLblqrlA6gw="
+    },
+    "sshpk": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
+      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+      "dev": true,
+      "requires": {
+        "asn1": "0.2.3",
+        "assert-plus": "1.0.0",
+        "bcrypt-pbkdf": "1.0.1",
+        "dashdash": "1.14.1",
+        "ecc-jsbn": "0.1.1",
+        "getpass": "0.1.7",
+        "jsbn": "0.1.1",
+        "tweetnacl": "0.14.5"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        }
+      }
+    },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
+    "string-width": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "dev": true,
+      "requires": {
+        "code-point-at": "1.1.0",
+        "is-fullwidth-code-point": "1.0.0",
+        "strip-ansi": "3.0.1"
+      }
+    },
+    "stringstream": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
+      "dev": true
+    },
+    "strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "2.1.1"
+      }
+    },
+    "strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+      "dev": true,
+      "requires": {
+        "is-utf8": "0.2.1"
+      }
+    },
+    "strip-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
+      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
+      "dev": true,
+      "requires": {
+        "get-stdin": "4.0.1"
+      }
+    },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "dev": true
+    },
+    "supports-color": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
+      "integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=",
+      "dev": true,
+      "requires": {
+        "has-flag": "1.0.0"
+      }
+    },
+    "symbol-observable": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz",
+      "integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0=",
+      "dev": true
+    },
+    "tar": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
+      "dev": true,
+      "requires": {
+        "block-stream": "0.0.9",
+        "fstream": "1.0.11",
+        "inherits": "2.0.3"
+      }
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+    },
+    "tough-cookie": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
+      "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
+      "dev": true,
+      "requires": {
+        "punycode": "1.4.1"
+      }
+    },
+    "trim-newlines": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
+      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
+      "dev": true
+    },
+    "ts-node": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-1.2.2.tgz",
+      "integrity": "sha1-+8u+8eMCciqupfaPEzzNx8uAoec=",
+      "dev": true,
+      "requires": {
+        "arrify": "1.0.1",
+        "chalk": "1.1.3",
+        "diff": "2.2.3",
+        "make-error": "1.3.0",
+        "minimist": "1.2.0",
+        "mkdirp": "0.5.1",
+        "pinkie": "2.0.4",
+        "source-map-support": "0.4.15",
+        "tsconfig": "5.0.3",
+        "xtend": "4.0.1"
+      },
+      "dependencies": {
+        "diff": {
+          "version": "2.2.3",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz",
+          "integrity": "sha1-YOr9DSjukG5Oj/ClLBIpUhAzv5k=",
+          "dev": true
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
+    "tsconfig": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/tsconfig/-/tsconfig-5.0.3.tgz",
+      "integrity": "sha1-X0J45wGACWeo/Dg/0ZZIh48qbjo=",
+      "dev": true,
+      "requires": {
+        "any-promise": "1.3.0",
+        "parse-json": "2.2.0",
+        "strip-bom": "2.0.0",
+        "strip-json-comments": "2.0.1"
+      }
+    },
+    "tslib": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.7.1.tgz",
+      "integrity": "sha1-vIAEFkaRkjp5/oN4u+s9ogF1OOw=",
+      "dev": true
+    },
+    "tslint": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.5.0.tgz",
+      "integrity": "sha1-EOjas+MGH6YelELozuOYKs8gpqo=",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "6.22.0",
+        "colors": "1.1.2",
+        "commander": "2.9.0",
+        "diff": "3.3.0",
+        "glob": "7.1.2",
+        "minimatch": "3.0.4",
+        "resolve": "1.3.3",
+        "semver": "5.3.0",
+        "tslib": "1.7.1",
+        "tsutils": "2.6.1"
+      },
+      "dependencies": {
+        "diff": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-3.3.0.tgz",
+          "integrity": "sha512-w0XZubFWn0Adlsapj9EAWX0FqWdO4tz8kc3RiYdWLh4k/V8PTb6i0SMgXt0vRM3zyKnT8tKO7mUlieRQHIjMNg==",
+          "dev": true
+        },
+        "glob": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "tsutils": {
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.6.1.tgz",
+          "integrity": "sha1-mOzwCVlPTkr4hAV75M9BpFC8djc=",
+          "dev": true,
+          "requires": {
+            "tslib": "1.7.1"
+          }
+        }
+      }
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "dev": true,
+      "optional": true
+    },
+    "type-detect": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-1.0.0.tgz",
+      "integrity": "sha1-diIXzAbbJY7EiQihKY6LlRIejqI=",
+      "dev": true
+    },
+    "typescript": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.0.tgz",
+      "integrity": "sha1-rvWo1AS+ujatM5q/B53d3/+6ht0=",
+      "dev": true
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "uuid": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+      "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
+      "dev": true
+    },
+    "validate-npm-package-license": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
+      "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
+      "dev": true,
+      "requires": {
+        "spdx-correct": "1.0.2",
+        "spdx-expression-parse": "1.0.4"
+      }
+    },
+    "verror": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz",
+      "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=",
+      "dev": true,
+      "requires": {
+        "extsprintf": "1.0.2"
+      }
+    },
+    "which": {
+      "version": "1.2.14",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz",
+      "integrity": "sha1-mofEN48D6CfOyvGs31bHNsAcFOU=",
+      "dev": true,
+      "requires": {
+        "isexe": "2.0.0"
+      }
+    },
+    "which-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
+      "dev": true
+    },
+    "wide-align": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
+      "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
+      "dev": true,
+      "requires": {
+        "string-width": "1.0.2"
+      }
+    },
+    "wrap-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+      "dev": true,
+      "requires": {
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "xtend": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+      "dev": true
+    },
+    "y18n": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+      "dev": true
+    },
+    "yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+      "dev": true
+    },
+    "yargs": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
+      "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
+      "dev": true,
+      "requires": {
+        "camelcase": "3.0.0",
+        "cliui": "3.2.0",
+        "decamelize": "1.2.0",
+        "get-caller-file": "1.0.2",
+        "os-locale": "1.4.0",
+        "read-pkg-up": "1.0.1",
+        "require-directory": "2.1.1",
+        "require-main-filename": "1.0.1",
+        "set-blocking": "2.0.0",
+        "string-width": "1.0.2",
+        "which-module": "1.0.0",
+        "y18n": "3.2.1",
+        "yargs-parser": "5.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+          "dev": true
+        }
+      }
+    },
+    "yargs-parser": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
+      "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+      "dev": true,
+      "requires": {
+        "camelcase": "3.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+          "dev": true
+        }
+      }
+    },
+    "zone.js": {
+      "version": "0.8.13",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.13.tgz",
+      "integrity": "sha1-8IIlJfrZQVgqA7v+ceshdAMV3dA=",
+      "dev": true
+    }
+  }
+}
diff --git a/ng2-components/adf-rules/package.json b/ng2-components/adf-rules/package.json
new file mode 100644
index 0000000000..95b326d670
--- /dev/null
+++ b/ng2-components/adf-rules/package.json
@@ -0,0 +1,57 @@
+{
+  "name": "adf-tlsint-rules",
+  "description": "Custom Rules for the ADF project",
+  "version": "1.6.1",
+  "author": "Alfresco Software, Ltd.",
+  "scripts": {
+    "build": "tsc",
+    "tscv": "tsc --version",
+    "tsc": "tsc",
+    "tsc:watch": "tsc --w"
+  },
+  "contributors": [
+    {
+      "name": "Eugenio Romano",
+      "email": "eugenio.romano@alfresco.com"
+    }
+  ],
+  "devDependencies": {
+    "@angular/compiler": "^4.2.3",
+    "@angular/core": "^4.2.3",
+    "@types/chai": "^3.4.33",
+    "@types/less": "0.0.31",
+    "@types/mocha": "^2.2.32",
+    "@types/node": "^6.0.41",
+    "@types/node-sass": "^3.10.31",
+    "@types/source-map": "^0.5.0",
+    "@types/sprintf-js": "0.0.27",
+    "chai": "^3.5.0",
+    "chai-spies": "^0.7.1",
+    "minimalist": "1.0.0",
+    "mocha": "3.0.2",
+    "node-sass": "^3.13.0",
+    "rimraf": "^2.5.2",
+    "rxjs": "5.4.1",
+    "ts-node": "1.2.2",
+    "tslint": "^5.0.0",
+    "typescript": "2.4.0",
+    "zone.js": "^0.8.4",
+    "js-yaml": "^3.8.4",
+    "json-stringify-pretty-compact": "^1.0.4",
+    "@types/js-yaml": "^3.5.31"
+  },
+  "peerDependencies": {
+    "@angular/compiler": "^2.3.1 || >=4.0.0-beta <5.0.0",
+    "@angular/core": "^2.3.1 || >=4.0.0-beta <5.0.0",
+    "tslint": "^5.0.0"
+  },
+  "dependencies": {
+    "app-root-path": "^2.0.1",
+    "css-selector-tokenizer": "^0.7.0",
+    "cssauron": "^1.4.0",
+    "semver-dsl": "^1.0.1",
+    "source-map": "^0.5.6",
+    "sprintf-js": "^1.0.3"
+  },
+  "license": "Apache-2.0"
+}
diff --git a/ng2-components/adf-rules/tsconfig.json b/ng2-components/adf-rules/tsconfig.json
new file mode 100644
index 0000000000..e857586d5e
--- /dev/null
+++ b/ng2-components/adf-rules/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "experimentalDecorators": true,
+        "target": "es5",
+        "module": "commonjs",
+        "declaration": false,
+        "noImplicitAny": false,
+        "removeComments": true,
+        "lib": ["es6", "es2015", "dom"],
+        "noLib": false,
+        "typeRoots": [
+            "./node_modules/@types",
+            "./node_modules"
+        ],
+        "types": [
+            "mocha",
+            "chai",
+            "node",
+            "sprintf-js"
+        ]
+    }
+}
diff --git a/ng2-components/adf-rules/tslint.json b/ng2-components/adf-rules/tslint.json
new file mode 100644
index 0000000000..73a54c9c7d
--- /dev/null
+++ b/ng2-components/adf-rules/tslint.json
@@ -0,0 +1,5 @@
+{
+  "rules": {
+    "adf-file-naming": true
+  }
+}
diff --git a/ng2-components/ng2-activiti-form/index.ts b/ng2-components/ng2-activiti-form/index.ts
index 4373c18c67..08ee235753 100644
--- a/ng2-components/ng2-activiti-form/index.ts
+++ b/ng2-components/ng2-activiti-form/index.ts
@@ -21,10 +21,10 @@ import { MdButtonModule, MdCardModule, MdCheckboxModule, MdIconModule, MdInputMo
 import { CoreModule } from 'ng2-alfresco-core';
 import { DataTableModule } from 'ng2-alfresco-datatable';
 import { ActivitiContentComponent } from './src/components/activiti-content.component';
-import { ActivitiForm } from './src/components/activiti-form.component';
-import { ActivitiStartFormComponent } from './src/components/activiti-start-form.component';
-import { ADFFormListComponent } from './src/components/adf-form-list.component';
 import { FormFieldComponent } from './src/components/form-field/form-field.component';
+import { FormListComponent } from './src/components/form-list.component';
+import { FormComponent } from './src/components/form.component';
+import { StartFormComponent } from './src/components/start-form.component';
 import { MASK_DIRECTIVE, WIDGET_DIRECTIVES } from './src/components/widgets/index';
 import { ActivitiAlfrescoContentService } from './src/services/activiti-alfresco.service';
 import { ActivitiContentService } from './src/services/activiti-content-service';
@@ -34,10 +34,10 @@ import { FormService } from './src/services/form.service';
 import { NodeService } from './src/services/node.service';
 import { WidgetVisibilityService } from './src/services/widget-visibility.service';
 
-export * from './src/components/activiti-form.component';
-export * from './src/components/adf-form-list.component';
+export * from './src/components/form.component';
+export * from './src/components/form-list.component';
 export * from './src/components/activiti-content.component';
-export * from './src/components/activiti-start-form.component';
+export * from './src/components/start-form.component';
 export * from './src/services/form.service';
 export * from './src/services/activiti-content-service';
 export * from './src/components/widgets/index';
@@ -46,13 +46,26 @@ export * from './src/services/node.service';
 export * from './src/services/form-rendering.service';
 export * from './src/events/index';
 
+// Old deprecated import
+import {ActivitiContentComponent as ActivitiContent} from './src/components/activiti-content.component';
+import {FormComponent as ActivitiForm} from './src/components/form.component';
+import {StartFormComponent as ActivitiStartForm} from './src/components/start-form.component';
+export {FormComponent as ActivitiForm} from './src/components/form.component';
+export {ActivitiContentComponent as ActivitiContent} from './src/components/activiti-content.component';
+export {StartFormComponent as ActivitiStartForm} from './src/components/start-form.component';
+
 export const ACTIVITI_FORM_DIRECTIVES: any[] = [
-    ActivitiForm,
-    ADFFormListComponent,
+    FormComponent,
+    FormListComponent,
     ActivitiContentComponent,
-    ActivitiStartFormComponent,
+    StartFormComponent,
     FormFieldComponent,
-    ...WIDGET_DIRECTIVES
+    ...WIDGET_DIRECTIVES,
+
+    // Old Deprecated export
+    ActivitiForm,
+    ActivitiContent,
+    ActivitiStartForm
 ];
 
 export const ACTIVITI_FORM_PROVIDERS: any[] = [
diff --git a/ng2-components/ng2-activiti-form/src/assets/activiti-form.component.mock.ts b/ng2-components/ng2-activiti-form/src/assets/form.component.mock.ts
similarity index 100%
rename from ng2-components/ng2-activiti-form/src/assets/activiti-form.component.mock.ts
rename to ng2-components/ng2-activiti-form/src/assets/form.component.mock.ts
diff --git a/ng2-components/ng2-activiti-form/src/components/adf-form-list.component.css b/ng2-components/ng2-activiti-form/src/components/form-list.component.css
similarity index 100%
rename from ng2-components/ng2-activiti-form/src/components/adf-form-list.component.css
rename to ng2-components/ng2-activiti-form/src/components/form-list.component.css
diff --git a/ng2-components/ng2-activiti-form/src/components/adf-form-list.component.html b/ng2-components/ng2-activiti-form/src/components/form-list.component.html
similarity index 100%
rename from ng2-components/ng2-activiti-form/src/components/adf-form-list.component.html
rename to ng2-components/ng2-activiti-form/src/components/form-list.component.html
diff --git a/ng2-components/ng2-activiti-form/src/components/adf-form-list.component.spec.ts b/ng2-components/ng2-activiti-form/src/components/form-list.component.spec.ts
similarity index 91%
rename from ng2-components/ng2-activiti-form/src/components/adf-form-list.component.spec.ts
rename to ng2-components/ng2-activiti-form/src/components/form-list.component.spec.ts
index b88b06b1d6..105458bcd6 100644
--- a/ng2-components/ng2-activiti-form/src/components/adf-form-list.component.spec.ts
+++ b/ng2-components/ng2-activiti-form/src/components/form-list.component.spec.ts
@@ -22,14 +22,14 @@ import { DataTableModule } from 'ng2-alfresco-datatable';
 import { Observable } from 'rxjs/Rx';
 import { EcmModelService } from '../services/ecm-model.service';
 import { FormService } from '../services/form.service';
-import { ADFFormListComponent } from './adf-form-list.component';
+import { FormListComponent } from './form-list.component';
 
 declare let jasmine: any;
 
 describe('TaskAttachmentList', () => {
 
-    let component: ADFFormListComponent;
-    let fixture: ComponentFixture<ADFFormListComponent>;
+    let component: FormListComponent;
+    let fixture: ComponentFixture<FormListComponent>;
     let service: FormService;
     let componentHandler: any;
 
@@ -40,7 +40,7 @@ describe('TaskAttachmentList', () => {
                 DataTableModule
             ],
             declarations: [
-                ADFFormListComponent
+                FormListComponent
             ],
             providers: [
                 FormService,
@@ -63,7 +63,7 @@ describe('TaskAttachmentList', () => {
 
     beforeEach(async(() => {
 
-        fixture = TestBed.createComponent(ADFFormListComponent);
+        fixture = TestBed.createComponent(FormListComponent);
         component = fixture.componentInstance;
 
         service = TestBed.get(FormService);
diff --git a/ng2-components/ng2-activiti-form/src/components/adf-form-list.component.ts b/ng2-components/ng2-activiti-form/src/components/form-list.component.ts
similarity index 89%
rename from ng2-components/ng2-activiti-form/src/components/adf-form-list.component.ts
rename to ng2-components/ng2-activiti-form/src/components/form-list.component.ts
index 394826cd5d..11b5a64ec7 100644
--- a/ng2-components/ng2-activiti-form/src/components/adf-form-list.component.ts
+++ b/ng2-components/ng2-activiti-form/src/components/form-list.component.ts
@@ -21,10 +21,10 @@ import { FormService } from './../services/form.service';
 
 @Component({
     selector: 'adf-form-list',
-    templateUrl: './adf-form-list.component.html',
-    styleUrls: ['./adf-form-list.component.css']
+    templateUrl: './form-list.component.html',
+    styleUrls: ['./form-list.component.css']
 })
-export class ADFFormListComponent implements OnChanges {
+export class FormListComponent implements OnChanges {
 
     @Input()
     forms: any [] = [];
diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.css b/ng2-components/ng2-activiti-form/src/components/form.component.css
similarity index 100%
rename from ng2-components/ng2-activiti-form/src/components/activiti-form.component.css
rename to ng2-components/ng2-activiti-form/src/components/form.component.css
diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.html b/ng2-components/ng2-activiti-form/src/components/form.component.html
similarity index 100%
rename from ng2-components/ng2-activiti-form/src/components/activiti-form.component.html
rename to ng2-components/ng2-activiti-form/src/components/form.component.html
diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.spec.ts b/ng2-components/ng2-activiti-form/src/components/form.component.spec.ts
similarity index 97%
rename from ng2-components/ng2-activiti-form/src/components/activiti-form.component.spec.ts
rename to ng2-components/ng2-activiti-form/src/components/form.component.spec.ts
index 9716b73434..3599ca0785 100644
--- a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.spec.ts
+++ b/ng2-components/ng2-activiti-form/src/components/form.component.spec.ts
@@ -18,18 +18,18 @@
 import { SimpleChange } from '@angular/core';
 import { LogService } from 'ng2-alfresco-core';
 import { Observable } from 'rxjs/Rx';
-import { fakeForm } from '../assets/activiti-form.component.mock';
+import { fakeForm } from '../assets/form.component.mock';
 import { FormService } from './../services/form.service';
 import { NodeService } from './../services/node.service';
 import { WidgetVisibilityService } from './../services/widget-visibility.service';
-import { ActivitiForm } from './activiti-form.component';
+import { FormComponent } from './form.component';
 import { FormFieldModel, FormFieldTypes, FormModel, FormOutcomeEvent, FormOutcomeModel } from './widgets/index';
 
-describe('ActivitiForm', () => {
+describe('FormComponent', () => {
 
     let componentHandler: any;
     let formService: FormService;
-    let formComponent: ActivitiForm;
+    let formComponent: FormComponent;
     let visibilityService: WidgetVisibilityService;
     let nodeService: NodeService;
     let logService: LogService;
@@ -45,7 +45,7 @@ describe('ActivitiForm', () => {
         spyOn(visibilityService, 'refreshVisibility').and.stub();
         formService = new FormService(null, null, logService);
         nodeService = new NodeService(null);
-        formComponent = new ActivitiForm(formService, visibilityService, null, nodeService, logService);
+        formComponent = new FormComponent(formService, visibilityService, null, nodeService, logService);
     });
 
     it('should upgrade MDL content on view checked', () => {
@@ -325,7 +325,7 @@ describe('ActivitiForm', () => {
     it('should save form on [save] outcome click', () => {
         let formModel = new FormModel();
         let outcome = new FormOutcomeModel(formModel, {
-            id: ActivitiForm.SAVE_OUTCOME_ID,
+            id: FormComponent.SAVE_OUTCOME_ID,
             name: 'Save',
             isSystem: true
         });
@@ -341,7 +341,7 @@ describe('ActivitiForm', () => {
     it('should complete form on [complete] outcome click', () => {
         let formModel = new FormModel();
         let outcome = new FormOutcomeModel(formModel, {
-            id: ActivitiForm.COMPLETE_OUTCOME_ID,
+            id: FormComponent.COMPLETE_OUTCOME_ID,
             name: 'Complete',
             isSystem: true
         });
@@ -357,7 +357,7 @@ describe('ActivitiForm', () => {
     it('should emit form saved event on custom outcome click', () => {
         let formModel = new FormModel();
         let outcome = new FormOutcomeModel(formModel, {
-            id: ActivitiForm.CUSTOM_OUTCOME_ID,
+            id: FormComponent.CUSTOM_OUTCOME_ID,
             name: 'Custom',
             isSystem: true
         });
@@ -666,7 +666,7 @@ describe('ActivitiForm', () => {
     it('should prevent default outcome execution', () => {
 
         let outcome = new FormOutcomeModel(new FormModel(), {
-            id: ActivitiForm.CUSTOM_OUTCOME_ID,
+            id: FormComponent.CUSTOM_OUTCOME_ID,
             name: 'Custom'
         });
 
@@ -683,7 +683,7 @@ describe('ActivitiForm', () => {
 
     it('should not prevent default outcome execution', () => {
         let outcome = new FormOutcomeModel(new FormModel(), {
-            id: ActivitiForm.CUSTOM_OUTCOME_ID,
+            id: FormComponent.CUSTOM_OUTCOME_ID,
             name: 'Custom'
         });
 
@@ -740,7 +740,7 @@ describe('ActivitiForm', () => {
         formComponent.form = formModel;
 
         let outcome = new FormOutcomeModel(new FormModel(), {
-            id: ActivitiForm.CUSTOM_OUTCOME_ID,
+            id: FormComponent.CUSTOM_OUTCOME_ID,
             name: 'Custom'
         });
 
@@ -766,7 +766,7 @@ describe('ActivitiForm', () => {
         expect(formModel.isValid).toBeFalsy();
 
         let outcome = new FormOutcomeModel(new FormModel(), {
-            id: ActivitiForm.SAVE_OUTCOME_ID,
+            id: FormComponent.SAVE_OUTCOME_ID,
             name: FormOutcomeModel.SAVE_ACTION
         });
 
@@ -788,7 +788,7 @@ describe('ActivitiForm', () => {
         expect(formModel.isValid).toBeFalsy();
 
         let outcome = new FormOutcomeModel(new FormModel(), {
-            id: ActivitiForm.CUSTOM_OUTCOME_ID,
+            id: FormComponent.CUSTOM_OUTCOME_ID,
             name: 'Custom'
         });
 
@@ -812,7 +812,7 @@ describe('ActivitiForm', () => {
         });
 
         let outcome = new FormOutcomeModel(new FormModel(), {
-            id: ActivitiForm.CUSTOM_OUTCOME_ID,
+            id: FormComponent.CUSTOM_OUTCOME_ID,
             name: 'Custom'
         });
 
diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts b/ng2-components/ng2-activiti-form/src/components/form.component.ts
similarity index 97%
rename from ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts
rename to ng2-components/ng2-activiti-form/src/components/form.component.ts
index 1b07277038..41c71d787d 100644
--- a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts
+++ b/ng2-components/ng2-activiti-form/src/components/form.component.ts
@@ -31,10 +31,10 @@ declare var componentHandler: any;
 
 @Component({
     selector: 'adf-form, activiti-form',
-    templateUrl: './activiti-form.component.html',
-    styleUrls: ['./activiti-form.component.css']
+    templateUrl: './form.component.html',
+    styleUrls: ['./form.component.css']
 })
-export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges {
+export class FormComponent implements OnInit, AfterViewChecked, OnChanges {
 
     static SAVE_OUTCOME_ID: string = '$save';
     static COMPLETE_OUTCOME_ID: string = '$complete';
@@ -227,22 +227,22 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges {
             }
 
             if (outcome.isSystem) {
-                if (outcome.id === ActivitiForm.SAVE_OUTCOME_ID) {
+                if (outcome.id === FormComponent.SAVE_OUTCOME_ID) {
                     this.saveTaskForm();
                     return true;
                 }
 
-                if (outcome.id === ActivitiForm.COMPLETE_OUTCOME_ID) {
+                if (outcome.id === FormComponent.COMPLETE_OUTCOME_ID) {
                     this.completeTaskForm();
                     return true;
                 }
 
-                if (outcome.id === ActivitiForm.START_PROCESS_OUTCOME_ID) {
+                if (outcome.id === FormComponent.START_PROCESS_OUTCOME_ID) {
                     this.completeTaskForm();
                     return true;
                 }
 
-                if (outcome.id === ActivitiForm.CUSTOM_OUTCOME_ID) {
+                if (outcome.id === FormComponent.CUSTOM_OUTCOME_ID) {
                     this.onTaskSaved(this.form);
                     this.storeFormAsMetadata();
                     return true;
diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.html b/ng2-components/ng2-activiti-form/src/components/start-form.component.html
similarity index 100%
rename from ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.html
rename to ng2-components/ng2-activiti-form/src/components/start-form.component.html
diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.spec.ts b/ng2-components/ng2-activiti-form/src/components/start-form.component.spec.ts
similarity index 94%
rename from ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.spec.ts
rename to ng2-components/ng2-activiti-form/src/components/start-form.component.spec.ts
index 214d7c9286..0de3ca4ea3 100644
--- a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.spec.ts
+++ b/ng2-components/ng2-activiti-form/src/components/start-form.component.spec.ts
@@ -27,7 +27,7 @@ import { EcmModelService } from './../services/ecm-model.service';
 import { FormService } from './../services/form.service';
 import { WidgetVisibilityService } from './../services/widget-visibility.service';
 import { ActivitiContentComponent } from './activiti-content.component';
-import { ActivitiStartFormComponent } from './activiti-start-form.component';
+import { StartFormComponent } from './start-form.component';
 import { FormFieldComponent } from './form-field/form-field.component';
 import { MASK_DIRECTIVE } from './widgets/index';
 import { WIDGET_DIRECTIVES } from './widgets/index';
@@ -36,8 +36,8 @@ describe('ActivitiStartForm', () => {
 
     let componentHandler: any;
     let formService: FormService;
-    let component: ActivitiStartFormComponent;
-    let fixture: ComponentFixture<ActivitiStartFormComponent>;
+    let component: StartFormComponent;
+    let fixture: ComponentFixture<StartFormComponent>;
     let getStartFormSpy: jasmine.Spy;
 
     const exampleId1 = 'my:process1';
@@ -50,7 +50,7 @@ describe('ActivitiStartForm', () => {
                 MdInputModule,
                 CoreModule.forRoot()],
             declarations: [
-                ActivitiStartFormComponent,
+                StartFormComponent,
                 FormFieldComponent,
                 ActivitiContentComponent,
                 ...WIDGET_DIRECTIVES,
@@ -67,7 +67,7 @@ describe('ActivitiStartForm', () => {
 
     beforeEach(() => {
 
-        fixture = TestBed.createComponent(ActivitiStartFormComponent);
+        fixture = TestBed.createComponent(StartFormComponent);
         component = fixture.componentInstance;
         formService = fixture.debugElement.injector.get(FormService);
 
diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts b/ng2-components/ng2-activiti-form/src/components/start-form.component.ts
similarity index 95%
rename from ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts
rename to ng2-components/ng2-activiti-form/src/components/start-form.component.ts
index 25df10b386..2406c83666 100644
--- a/ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.ts
+++ b/ng2-components/ng2-activiti-form/src/components/start-form.component.ts
@@ -19,7 +19,7 @@ import { Component, ElementRef, EventEmitter, Input, OnChanges, OnInit, Output,
 import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core';
 import { FormService } from './../services/form.service';
 import { WidgetVisibilityService } from './../services/widget-visibility.service';
-import { ActivitiForm } from './activiti-form.component';
+import { FormComponent } from './form.component';
 import { ContentLinkModel } from './widgets/core/content-link.model';
 import { FormOutcomeModel } from './widgets/core/index';
 
@@ -38,14 +38,14 @@ import { FormOutcomeModel } from './widgets/core/index';
  *  {formSaved} EventEmitter - This event is fired when the form is saved, it pass all the value in the form.
  *  {formCompleted} EventEmitter - This event is fired when the form is completed, it pass all the value in the form.
  *
- * @returns {ActivitiForm} .
+ * @returns {FormComponent} .
  */
 @Component({
     selector: 'adf-start-form, activiti-start-form',
-    templateUrl: './activiti-start-form.component.html',
-    styleUrls: ['./activiti-form.component.css']
+    templateUrl: './start-form.component.html',
+    styleUrls: ['./form.component.css']
 })
-export class ActivitiStartFormComponent extends ActivitiForm implements OnChanges, OnInit {
+export class StartFormComponent extends FormComponent implements OnChanges, OnInit {
 
     @Input()
     processDefinitionId: string;
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/index.ts b/ng2-components/ng2-activiti-form/src/components/widgets/index.ts
index 83f1c46474..a7a9644f31 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/index.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/index.ts
@@ -99,7 +99,6 @@ export const WIDGET_DIRECTIVES: any[] = [
     PeopleWidgetComponent,
     DateWidgetComponent,
     AmountWidgetComponent,
-
     DynamicTableWidgetComponent,
     DateEditorComponent,
     DropdownEditorComponent,
diff --git a/ng2-components/ng2-activiti-processlist/README.md b/ng2-components/ng2-activiti-processlist/README.md
index 49e788fe3b..7bb510cfcb 100644
--- a/ng2-components/ng2-activiti-processlist/README.md
+++ b/ng2-components/ng2-activiti-processlist/README.md
@@ -298,10 +298,10 @@ Displays comments associated with a particular process instances and allows the
 This component displays attached documents on a specified process instance
 
 ```html
-<adf-process-attachment-list 
+<process-attachment-list 
     [processInstanceId]="YOUR_PROCESS_INSTANCE_ID"
     (attachmentClick="YOUR_ATTACHMENT_CLICK_EMITTER_HANDLER">
-</adf-process-attachment-list>
+</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 660331b6e8..f956285fbf 100644
--- a/ng2-components/ng2-activiti-processlist/index.ts
+++ b/ng2-components/ng2-activiti-processlist/index.ts
@@ -22,53 +22,93 @@ import { ActivitiTaskListModule } from 'ng2-activiti-tasklist';
 import { CoreModule } from 'ng2-alfresco-core';
 import { DataTableModule } from 'ng2-alfresco-datatable';
 
-import {
-    ActivitiCreateProcessAttachmentComponent,
-    ActivitiProcessAttachmentListComponent,
-    ActivitiProcessCommentsComponent,
-    ActivitiProcessFiltersComponent,
-    ActivitiProcessInstanceDetailsComponent,
-    ActivitiProcessInstanceHeaderComponent,
-    ActivitiProcessInstanceListComponent,
-    ActivitiProcessInstanceTasksComponent,
-    ActivitiProcessInstanceVariablesComponent,
-    ActivitiStartProcessInstanceComponent
-} from './src/components/index';
+import {CreateProcessAttachmentComponent} from './src/components/create-process-attachment.component';
+import {ProcessAttachmentListComponent} from './src/components/process-attachment-list.component';
+import {ProcessCommentsComponent} from './src/components/process-comments.component';
+import {ProcessFiltersComponent} from './src/components/process-filters.component';
+import {ProcessInstanceDetailsComponent} from './src/components/process-instance-details.component';
+import {ProcessInstanceHeaderComponent} from './src/components/process-instance-header.component';
+import {ProcessInstanceTasksComponent} from './src/components/process-instance-tasks.component';
+import {ProcessInstanceVariablesComponent} from './src/components/process-instance-variables.component';
+import {ProcessInstanceListComponent} from './src/components/processlist.component';
+import {StartProcessInstanceComponent} from './src/components/start-process.component';
+export {ProcessAttachmentListComponent} from './src/components/process-attachment-list.component';
+export {ProcessCommentsComponent} from './src/components/process-comments.component';
+export {ProcessFiltersComponent} from './src/components/process-filters.component';
+export {ProcessInstanceDetailsComponent} from './src/components/process-instance-details.component';
+export {ProcessInstanceHeaderComponent} from './src/components/process-instance-header.component';
+export {ProcessInstanceTasksComponent} from './src/components/process-instance-tasks.component';
+export {ProcessInstanceVariablesComponent} from './src/components/process-instance-variables.component';
+export {ProcessInstanceListComponent} from './src/components/processlist.component';
+export {StartProcessInstanceComponent} from './src/components/start-process.component';
 
-import { ActivitiProcessService } from './src/services/activiti-process.service';
 import { ProcessUploadService } from './src/services/process-upload.service';
-
-// components
-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/adf-process-attachment-list.component';
-export * from './src/components/adf-create-process-attachment.component';
-export * from './src/services/process-upload.service';
+import { ProcessService } from './src/services/process.service';
+export { ProcessService } from './src/services/process.service';
+export { ProcessUploadService } from './src/services/process-upload.service';
 
 // models
-export * from './src/models/index';
+export * from './src/models/filter-process.model';
+export * from './src/models/process-definition.model';
+export * from './src/models/process-instance.model';
+export * from './src/models/process-instance-filter.model';
+export * from './src/models/process-instance-variable.model';
 
-// services
-export * from './src/services/activiti-process.service';
+// Old derprecate export
+import {CreateProcessAttachmentComponent as ActivitiCreateProcessAttachmentComponent } from './src/components/create-process-attachment.component';
+import {ProcessAttachmentListComponent as ActivitiProcessAttachmentListComponent} from './src/components/process-attachment-list.component';
+import {ProcessCommentsComponent as ActivitiProcessComments } from './src/components/process-comments.component';
+import {ProcessFiltersComponent as ActivitiProcessFilters} from './src/components/process-filters.component';
+import {ProcessInstanceDetailsComponent as ActivitiProcessInstanceDetails} from './src/components/process-instance-details.component';
+import {ProcessInstanceHeaderComponent as ActivitiProcessInstanceHeader} from './src/components/process-instance-header.component';
+import {ProcessInstanceTasksComponent as ActivitiProcessInstanceTasks} from './src/components/process-instance-tasks.component';
+import {ProcessInstanceVariablesComponent as ActivitiProcessInstanceVariables} from './src/components/process-instance-variables.component';
+import {ProcessInstanceListComponent as ActivitiProcessInstanceListComponent} from './src/components/processlist.component';
+import {StartProcessInstanceComponent as ActivitiStartProcessInstance} from './src/components/start-process.component';
+import {ProcessService as ActivitiProcessService} from './src/services/process.service';
+export {CreateProcessAttachmentComponent as ActivitiCreateProcessAttachmentComponent } from './src/components/create-process-attachment.component';
+export {ProcessAttachmentListComponent as ActivitiProcessAttachmentListComponent} from './src/components/process-attachment-list.component';
+export {ProcessCommentsComponent as ActivitiProcessComments } from './src/components/process-comments.component';
+export {ProcessFiltersComponent as ActivitiProcessFilters} from './src/components/process-filters.component';
+export {ProcessInstanceDetailsComponent as ActivitiProcessInstanceDetails} from './src/components/process-instance-details.component';
+export {ProcessInstanceHeaderComponent as ActivitiProcessInstanceHeader} from './src/components/process-instance-header.component';
+export {ProcessInstanceTasksComponent as ActivitiProcessInstanceTasks} from './src/components/process-instance-tasks.component';
+export {ProcessInstanceVariablesComponent as ActivitiProcessInstanceVariables} from './src/components/process-instance-variables.component';
+export {ProcessInstanceListComponent as ActivitiProcessInstanceListComponent} from './src/components/processlist.component';
+export {StartProcessInstanceComponent as ActivitiStartProcessInstance} from './src/components/start-process.component';
+export {ProcessService as ActivitiProcessService} from './src/services/process.service';
 
 export const ACTIVITI_PROCESSLIST_DIRECTIVES: [any] = [
+    ProcessInstanceListComponent,
+    ProcessFiltersComponent,
+    ProcessInstanceDetailsComponent,
+    ProcessInstanceHeaderComponent,
+    ProcessInstanceTasksComponent,
+    ProcessInstanceVariablesComponent,
+    ProcessCommentsComponent,
+    StartProcessInstanceComponent,
+    ProcessAttachmentListComponent,
+    CreateProcessAttachmentComponent,
+
+    // Old Deprecated export
     ActivitiProcessInstanceListComponent,
-    ActivitiProcessFiltersComponent,
-    ActivitiProcessInstanceDetailsComponent,
-    ActivitiProcessInstanceHeaderComponent,
-    ActivitiProcessInstanceTasksComponent,
-    ActivitiProcessInstanceVariablesComponent,
-    ActivitiProcessCommentsComponent,
-    ActivitiStartProcessInstanceComponent,
+    ActivitiProcessFilters,
+    ActivitiProcessInstanceHeader,
+    ActivitiProcessInstanceTasks,
+    ActivitiProcessInstanceVariables,
+    ActivitiProcessComments,
+    ActivitiProcessInstanceDetails,
+    ActivitiStartProcessInstance,
     ActivitiProcessAttachmentListComponent,
     ActivitiCreateProcessAttachmentComponent
 ];
 
 export const ACTIVITI_PROCESSLIST_PROVIDERS: [any] = [
-    ActivitiProcessService,
-    ProcessUploadService
+    ProcessService,
+    ProcessUploadService,
+
+    // Old Deprecated import
+    ActivitiProcessService
 ];
 
 @NgModule({
diff --git a/ng2-components/ng2-activiti-processlist/src/assets/activiti-process-instances-list.mock.ts b/ng2-components/ng2-activiti-processlist/src/assets/process-instances-list.mock.ts
similarity index 100%
rename from ng2-components/ng2-activiti-processlist/src/assets/activiti-process-instances-list.mock.ts
rename to ng2-components/ng2-activiti-processlist/src/assets/process-instances-list.mock.ts
diff --git a/ng2-components/ng2-activiti-processlist/src/assets/activiti-process.model.mock.ts b/ng2-components/ng2-activiti-processlist/src/assets/process.model.mock.ts
similarity index 100%
rename from ng2-components/ng2-activiti-processlist/src/assets/activiti-process.model.mock.ts
rename to ng2-components/ng2-activiti-processlist/src/assets/process.model.mock.ts
diff --git a/ng2-components/ng2-activiti-processlist/src/assets/activiti-process.service.mock.ts b/ng2-components/ng2-activiti-processlist/src/assets/process.service.mock.ts
similarity index 91%
rename from ng2-components/ng2-activiti-processlist/src/assets/activiti-process.service.mock.ts
rename to ng2-components/ng2-activiti-processlist/src/assets/process.service.mock.ts
index 41e55427f5..916c3321c4 100644
--- a/ng2-components/ng2-activiti-processlist/src/assets/activiti-process.service.mock.ts
+++ b/ng2-components/ng2-activiti-processlist/src/assets/process.service.mock.ts
@@ -21,7 +21,8 @@ import {
     TaskDetailsModel,
     User
 } from 'ng2-activiti-tasklist';
-import { FilterProcessRepresentationModel, ProcessDefinitionRepresentation } from '../models/index';
+import { ProcessDefinitionRepresentation } from '../models/process-definition.model';
+import { FilterProcessRepresentationModel } from '../models/filter-process.model';
 
 export let fakeFilters = {
     size: 1, total: 1, start: 0,
@@ -66,7 +67,7 @@ export let fakeApp2 = new AppDefinitionRepresentationModel({
 });
 
 export let fakeTaskList = {
-    data: [ new TaskDetailsModel({
+    data: [new TaskDetailsModel({
         id: 1,
         name: 'Task 1',
         processInstanceId: 1000,
diff --git a/ng2-components/ng2-activiti-processlist/src/assets/activiti-start-process.component.mock.ts b/ng2-components/ng2-activiti-processlist/src/assets/start-process.component.mock.ts
similarity index 100%
rename from ng2-components/ng2-activiti-processlist/src/assets/activiti-start-process.component.mock.ts
rename to ng2-components/ng2-activiti-processlist/src/assets/start-process.component.mock.ts
diff --git a/ng2-components/ng2-activiti-processlist/src/components/adf-create-process-attachment.component.css b/ng2-components/ng2-activiti-processlist/src/components/create-process-attachment.component.css
similarity index 100%
rename from ng2-components/ng2-activiti-processlist/src/components/adf-create-process-attachment.component.css
rename to ng2-components/ng2-activiti-processlist/src/components/create-process-attachment.component.css
diff --git a/ng2-components/ng2-activiti-processlist/src/components/adf-create-process-attachment.component.html b/ng2-components/ng2-activiti-processlist/src/components/create-process-attachment.component.html
similarity index 100%
rename from ng2-components/ng2-activiti-processlist/src/components/adf-create-process-attachment.component.html
rename to ng2-components/ng2-activiti-processlist/src/components/create-process-attachment.component.html
diff --git a/ng2-components/ng2-activiti-processlist/src/components/adf-create-process-attachment.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/create-process-attachment.component.spec.ts
similarity index 91%
rename from ng2-components/ng2-activiti-processlist/src/components/adf-create-process-attachment.component.spec.ts
rename to ng2-components/ng2-activiti-processlist/src/components/create-process-attachment.component.spec.ts
index 8d0c55336d..23bc50e502 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/adf-create-process-attachment.component.spec.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/create-process-attachment.component.spec.ts
@@ -19,7 +19,7 @@ import { SimpleChange } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivitiContentService } from 'ng2-activiti-form';
 import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
-import { ActivitiCreateProcessAttachmentComponent } from './adf-create-process-attachment.component';
+import { CreateProcessAttachmentComponent } from './create-process-attachment.component';
 
 declare let jasmine: any;
 
@@ -27,8 +27,8 @@ describe('Activiti Process Create Attachment', () => {
 
     let componentHandler: any;
     let service: ActivitiContentService;
-    let component: ActivitiCreateProcessAttachmentComponent;
-    let fixture: ComponentFixture<ActivitiCreateProcessAttachmentComponent>;
+    let component: CreateProcessAttachmentComponent;
+    let fixture: ComponentFixture<CreateProcessAttachmentComponent>;
     let element: HTMLElement;
 
     let file = new File([new Blob()], 'Test');
@@ -55,7 +55,7 @@ describe('Activiti Process Create Attachment', () => {
                 CoreModule.forRoot()
             ],
             declarations: [
-                ActivitiCreateProcessAttachmentComponent
+                CreateProcessAttachmentComponent
             ],
             providers: [
                 { provide: AlfrescoTranslationService },
@@ -65,7 +65,7 @@ describe('Activiti Process Create Attachment', () => {
     }));
 
     beforeEach(() => {
-        fixture = TestBed.createComponent(ActivitiCreateProcessAttachmentComponent);
+        fixture = TestBed.createComponent(CreateProcessAttachmentComponent);
         component = fixture.componentInstance;
         service = fixture.debugElement.injector.get(ActivitiContentService);
         element = fixture.nativeElement;
diff --git a/ng2-components/ng2-activiti-processlist/src/components/adf-create-process-attachment.component.ts b/ng2-components/ng2-activiti-processlist/src/components/create-process-attachment.component.ts
similarity index 91%
rename from ng2-components/ng2-activiti-processlist/src/components/adf-create-process-attachment.component.ts
rename to ng2-components/ng2-activiti-processlist/src/components/create-process-attachment.component.ts
index cc0c30bf6f..b9b66cdec0 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/adf-create-process-attachment.component.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/create-process-attachment.component.ts
@@ -21,10 +21,10 @@ import { AlfrescoTranslationService } from 'ng2-alfresco-core';
 
 @Component({
     selector: 'adf-create-process-attachment',
-    styleUrls: ['./adf-create-process-attachment.component.css'],
-    templateUrl: './adf-create-process-attachment.component.html'
+    styleUrls: ['./create-process-attachment.component.css'],
+    templateUrl: './create-process-attachment.component.html'
 })
-export class ActivitiCreateProcessAttachmentComponent implements OnChanges {
+export class CreateProcessAttachmentComponent implements OnChanges {
 
     @Input()
     processInstanceId: string;
diff --git a/ng2-components/ng2-activiti-processlist/src/components/index.ts b/ng2-components/ng2-activiti-processlist/src/components/index.ts
deleted file mode 100644
index da3601a1fa..0000000000
--- a/ng2-components/ng2-activiti-processlist/src/components/index.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-export * from './activiti-processlist.component';
-export * from './activiti-filters.component';
-export * from './activiti-process-instance-header.component';
-export * from './activiti-process-instance-tasks.component';
-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 './adf-process-attachment-list.component';
-export * from './adf-create-process-attachment.component';
diff --git a/ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.css b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.css
similarity index 100%
rename from ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.css
rename to ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.css
diff --git a/ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.html b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.html
similarity index 100%
rename from ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.html
rename to ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.html
diff --git a/ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.spec.ts
similarity index 95%
rename from ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.spec.ts
rename to ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.spec.ts
index 82d5159e2d..762d8607e6 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.spec.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.spec.ts
@@ -26,14 +26,14 @@ import { DataTableModule } from 'ng2-alfresco-datatable';
 import { Observable } from 'rxjs/Rx';
 
 import { TranslationMock } from './../assets/translation.service.mock';
-import { ActivitiProcessAttachmentListComponent } from './adf-process-attachment-list.component';
+import { ProcessAttachmentListComponent } from './process-attachment-list.component';
 
-describe('ActivitiProcessAttachmentListComponent', () => {
+describe('ProcessAttachmentListComponent', () => {
 
     let componentHandler: any;
     let service: ActivitiContentService;
-    let component: ActivitiProcessAttachmentListComponent;
-    let fixture: ComponentFixture<ActivitiProcessAttachmentListComponent>;
+    let component: ProcessAttachmentListComponent;
+    let fixture: ComponentFixture<ProcessAttachmentListComponent>;
     let getProcessRelatedContentSpy: jasmine.Spy;
     let deleteContentSpy: jasmine.Spy;
     let getFileRawContentSpy: jasmine.Spy;
@@ -47,7 +47,7 @@ describe('ActivitiProcessAttachmentListComponent', () => {
                 MdProgressSpinnerModule
             ],
             declarations: [
-                ActivitiProcessAttachmentListComponent
+                ProcessAttachmentListComponent
             ],
             providers: [
                 { provide: AlfrescoTranslationService, useClass: TranslationMock },
@@ -58,7 +58,7 @@ describe('ActivitiProcessAttachmentListComponent', () => {
 
     beforeEach(() => {
 
-        fixture = TestBed.createComponent(ActivitiProcessAttachmentListComponent);
+        fixture = TestBed.createComponent(ProcessAttachmentListComponent);
         component = fixture.componentInstance;
         service = fixture.debugElement.injector.get(ActivitiContentService);
 
diff --git a/ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.ts b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.ts
similarity index 95%
rename from ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.ts
rename to ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.ts
index 053c62065a..f1e2a08f52 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.ts
@@ -20,11 +20,11 @@ import { ActivitiContentService } from 'ng2-activiti-form';
 import { AlfrescoTranslationService, ContentService, ThumbnailService } from 'ng2-alfresco-core';
 
 @Component({
-    selector: 'adf-process-attachment-list',
-    styleUrls: ['./adf-process-attachment-list.component.css'],
-    templateUrl: './adf-process-attachment-list.component.html'
+    selector: 'process-attachment-list',
+    styleUrls: ['./process-attachment-list.component.css'],
+    templateUrl: './process-attachment-list.component.html'
 })
-export class ActivitiProcessAttachmentListComponent implements OnChanges {
+export class ProcessAttachmentListComponent implements OnChanges {
 
     @Input()
     processInstanceId: string;
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.css b/ng2-components/ng2-activiti-processlist/src/components/process-comments.component.css
similarity index 100%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.css
rename to ng2-components/ng2-activiti-processlist/src/components/process-comments.component.css
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.html b/ng2-components/ng2-activiti-processlist/src/components/process-comments.component.html
similarity index 100%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.html
rename to ng2-components/ng2-activiti-processlist/src/components/process-comments.component.html
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/process-comments.component.spec.ts
similarity index 92%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.spec.ts
rename to ng2-components/ng2-activiti-processlist/src/components/process-comments.component.spec.ts
index 43e8d30660..e587355404 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.spec.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/process-comments.component.spec.ts
@@ -24,15 +24,15 @@ import { ActivitiFormModule } from 'ng2-activiti-form';
 import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 
 import { TranslationMock } from './../assets/translation.service.mock';
-import { ActivitiProcessService } from './../services/activiti-process.service';
-import { ActivitiProcessCommentsComponent } from './activiti-process-comments.component';
+import { ProcessService } from './../services/process.service';
+import { ProcessCommentsComponent } from './process-comments.component';
 
 describe('ActivitiProcessInstanceComments', () => {
 
     let componentHandler: any;
-    let service: ActivitiProcessService;
-    let component: ActivitiProcessCommentsComponent;
-    let fixture: ComponentFixture<ActivitiProcessCommentsComponent>;
+    let service: ProcessService;
+    let component: ProcessCommentsComponent;
+    let fixture: ComponentFixture<ProcessCommentsComponent>;
     let getCommentsSpy: jasmine.Spy;
     let addCommentSpy: jasmine.Spy;
 
@@ -43,20 +43,20 @@ describe('ActivitiProcessInstanceComments', () => {
                 ActivitiFormModule
             ],
             declarations: [
-                ActivitiProcessCommentsComponent
+                ProcessCommentsComponent
             ],
             providers: [
                 { provide: AlfrescoTranslationService, useClass: TranslationMock },
-                ActivitiProcessService
+                ProcessService
             ]
         }).compileComponents();
     }));
 
     beforeEach(() => {
 
-        fixture = TestBed.createComponent(ActivitiProcessCommentsComponent);
+        fixture = TestBed.createComponent(ProcessCommentsComponent);
         component = fixture.componentInstance;
-        service = fixture.debugElement.injector.get(ActivitiProcessService);
+        service = fixture.debugElement.injector.get(ProcessService);
 
         getCommentsSpy = spyOn(service, 'getProcessInstanceComments').and.returnValue(Observable.of([{
             message: 'Test1'
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.ts b/ng2-components/ng2-activiti-processlist/src/components/process-comments.component.ts
similarity index 90%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.ts
rename to ng2-components/ng2-activiti-processlist/src/components/process-comments.component.ts
index aaae1c8a62..54d88281a6 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/process-comments.component.ts
@@ -20,18 +20,18 @@ import { Comment } from 'ng2-activiti-tasklist';
 import { AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { Observable } from 'rxjs/Observable';
 import { Observer } from 'rxjs/Observer';
-import { ActivitiProcessService } from './../services/activiti-process.service';
+import { ProcessService } from './../services/process.service';
 
 declare let componentHandler: any;
 declare let dialogPolyfill: any;
 
 @Component({
     selector: 'adf-process-instance-comments, activiti-process-instance-comments',
-    templateUrl: './activiti-process-comments.component.html',
-    styleUrls: ['./activiti-process-comments.component.css'],
-    providers: [ActivitiProcessService]
+    templateUrl: './process-comments.component.html',
+    styleUrls: ['./process-comments.component.css'],
+    providers: [ProcessService]
 })
-export class ActivitiProcessCommentsComponent implements OnChanges {
+export class ProcessCommentsComponent implements OnChanges {
 
     @Input()
     processInstanceId: string;
@@ -56,7 +56,7 @@ export class ActivitiProcessCommentsComponent implements OnChanges {
      * @param activitiProcess Process service
      */
     constructor(private translate: AlfrescoTranslationService,
-                private activitiProcess: ActivitiProcessService) {
+                private activitiProcess: ProcessService) {
 
         if (translate) {
             translate.addTranslationFolder('ng2-activiti-processlist', 'assets/ng2-activiti-processlist');
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.css b/ng2-components/ng2-activiti-processlist/src/components/process-filters.component.css
similarity index 100%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.css
rename to ng2-components/ng2-activiti-processlist/src/components/process-filters.component.css
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.html b/ng2-components/ng2-activiti-processlist/src/components/process-filters.component.html
similarity index 100%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.html
rename to ng2-components/ng2-activiti-processlist/src/components/process-filters.component.html
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/process-filters.component.spec.ts
similarity index 93%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.spec.ts
rename to ng2-components/ng2-activiti-processlist/src/components/process-filters.component.spec.ts
index 906b0305bd..7843a30d7f 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.spec.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/process-filters.component.spec.ts
@@ -19,13 +19,13 @@ import { SimpleChange } from '@angular/core';
 import { LogServiceMock } from 'ng2-alfresco-core';
 import { Observable } from 'rxjs/Rx';
 import { FilterProcessRepresentationModel } from '../models/filter-process.model';
-import { ActivitiProcessService } from '../services/activiti-process.service';
-import { ActivitiProcessFiltersComponent } from './activiti-filters.component';
+import { ProcessService } from '../services/process.service';
+import { ProcessFiltersComponent } from './process-filters.component';
 
 describe('ActivitiFilters', () => {
 
-    let filterList: ActivitiProcessFiltersComponent;
-    let activitiService: ActivitiProcessService;
+    let filterList: ProcessFiltersComponent;
+    let activitiService: ProcessService;
     let logService: LogServiceMock;
 
     let fakeGlobalFilter = [];
@@ -52,8 +52,8 @@ describe('ActivitiFilters', () => {
 
     beforeEach(() => {
         logService = new LogServiceMock();
-        activitiService = new ActivitiProcessService(null, logService);
-        filterList = new ActivitiProcessFiltersComponent(null, activitiService, logService);
+        activitiService = new ProcessService(null, logService);
+        filterList = new ProcessFiltersComponent(null, activitiService, logService);
     });
 
     it('should return the filter task list', (done) => {
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts b/ng2-components/ng2-activiti-processlist/src/components/process-filters.component.ts
similarity index 95%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts
rename to ng2-components/ng2-activiti-processlist/src/components/process-filters.component.ts
index db73366d2b..3131532c95 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/process-filters.component.ts
@@ -19,16 +19,16 @@ import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChange
 import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core';
 import { Observable, Observer } from 'rxjs/Rx';
 import { FilterParamsModel, FilterProcessRepresentationModel } from './../models/filter-process.model';
-import { ActivitiProcessService } from './../services/activiti-process.service';
+import { ProcessService } from './../services/process.service';
 
 declare let componentHandler: any;
 
 @Component({
     selector: 'adf-process-instance-filters, activiti-process-instance-filters',
-    templateUrl: './activiti-filters.component.html',
-    styleUrls: ['activiti-filters.component.css']
+    templateUrl: './process-filters.component.html',
+    styleUrls: ['process-filters.component.css']
 })
-export class ActivitiProcessFiltersComponent implements OnInit, OnChanges {
+export class ProcessFiltersComponent implements OnInit, OnChanges {
 
     @Input()
     filterParam: FilterParamsModel;
@@ -59,7 +59,7 @@ export class ActivitiProcessFiltersComponent implements OnInit, OnChanges {
     filters: FilterProcessRepresentationModel [] = [];
 
     constructor(private translate: AlfrescoTranslationService,
-                private activiti: ActivitiProcessService,
+                private activiti: ProcessService,
                 private logService: LogService) {
         this.filter$ = new Observable<FilterProcessRepresentationModel>(observer => this.filterObserver = observer).share();
 
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.css b/ng2-components/ng2-activiti-processlist/src/components/process-instance-details.component.css
similarity index 100%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.css
rename to ng2-components/ng2-activiti-processlist/src/components/process-instance-details.component.css
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html b/ng2-components/ng2-activiti-processlist/src/components/process-instance-details.component.html
similarity index 100%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html
rename to ng2-components/ng2-activiti-processlist/src/components/process-instance-details.component.html
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/process-instance-details.component.spec.ts
similarity index 88%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.spec.ts
rename to ng2-components/ng2-activiti-processlist/src/components/process-instance-details.component.spec.ts
index 2764bd659e..6c4eb7e228 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.spec.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/process-instance-details.component.spec.ts
@@ -25,18 +25,18 @@ import { ActivitiTaskListModule } from 'ng2-activiti-tasklist';
 import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 
 import { ProcessInstance } from '../models/process-instance.model';
-import { exampleProcess, exampleProcessNoName } from './../assets/activiti-process.model.mock';
+import { exampleProcess, exampleProcessNoName } from './../assets/process.model.mock';
 import { TranslationMock } from './../assets/translation.service.mock';
-import { ActivitiProcessService } from './../services/activiti-process.service';
-import { ActivitiProcessInstanceDetailsComponent } from './activiti-process-instance-details.component';
+import { ProcessService } from './../services/process.service';
+import { ProcessInstanceDetailsComponent } from './process-instance-details.component';
 
-describe('ActivitiProcessInstanceDetailsComponent', () => {
+describe('ProcessInstanceDetailsComponent', () => {
 
     let componentHandler: any;
-    let service: ActivitiProcessService;
+    let service: ProcessService;
     let formService: FormService;
-    let component: ActivitiProcessInstanceDetailsComponent;
-    let fixture: ComponentFixture<ActivitiProcessInstanceDetailsComponent>;
+    let component: ProcessInstanceDetailsComponent;
+    let fixture: ComponentFixture<ProcessInstanceDetailsComponent>;
     let getProcessSpy: jasmine.Spy;
 
     beforeEach(async(() => {
@@ -47,11 +47,11 @@ describe('ActivitiProcessInstanceDetailsComponent', () => {
                 ActivitiTaskListModule
             ],
             declarations: [
-                ActivitiProcessInstanceDetailsComponent
+                ProcessInstanceDetailsComponent
             ],
             providers: [
                 { provide: AlfrescoTranslationService, useClass: TranslationMock },
-                ActivitiProcessService
+                ProcessService
             ],
             schemas: [ NO_ERRORS_SCHEMA ]
         }).compileComponents();
@@ -59,9 +59,9 @@ describe('ActivitiProcessInstanceDetailsComponent', () => {
 
     beforeEach(() => {
 
-        fixture = TestBed.createComponent(ActivitiProcessInstanceDetailsComponent);
+        fixture = TestBed.createComponent(ProcessInstanceDetailsComponent);
         component = fixture.componentInstance;
-        service = fixture.debugElement.injector.get(ActivitiProcessService);
+        service = fixture.debugElement.injector.get(ProcessService);
         formService = fixture.debugElement.injector.get(FormService);
 
         getProcessSpy = spyOn(service, 'getProcess').and.returnValue(Observable.of(exampleProcess));
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts b/ng2-components/ng2-activiti-processlist/src/components/process-instance-details.component.ts
similarity index 83%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts
rename to ng2-components/ng2-activiti-processlist/src/components/process-instance-details.component.ts
index c4525c55c3..c0b7f08c68 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/process-instance-details.component.ts
@@ -21,25 +21,25 @@ import {TaskDetailsEvent} from 'ng2-activiti-tasklist';
 import {AlfrescoTranslationService, LogService} from 'ng2-alfresco-core';
 
 import {ProcessInstance} from '../models/process-instance.model';
-import {ActivitiProcessService} from './../services/activiti-process.service';
-import {ActivitiProcessInstanceHeaderComponent} from './activiti-process-instance-header.component';
-import {ActivitiProcessInstanceTasksComponent} from './activiti-process-instance-tasks.component';
+import {ProcessService} from './../services/process.service';
+import {ProcessInstanceHeaderComponent} from './process-instance-header.component';
+import {ProcessInstanceTasksComponent} from './process-instance-tasks.component';
 
 @Component({
     selector: 'adf-process-instance-details, activiti-process-instance-details',
-    templateUrl: './activiti-process-instance-details.component.html',
-    styleUrls: ['./activiti-process-instance-details.component.css']
+    templateUrl: './process-instance-details.component.html',
+    styleUrls: ['./process-instance-details.component.css']
 })
-export class ActivitiProcessInstanceDetailsComponent implements OnChanges {
+export class ProcessInstanceDetailsComponent implements OnChanges {
 
     @Input()
     processInstanceId: string;
 
-    @ViewChild(ActivitiProcessInstanceHeaderComponent)
-    processInstanceHeader: ActivitiProcessInstanceHeaderComponent;
+    @ViewChild(ProcessInstanceHeaderComponent)
+    processInstanceHeader: ProcessInstanceHeaderComponent;
 
-    @ViewChild(ActivitiProcessInstanceTasksComponent)
-    tasksList: ActivitiProcessInstanceTasksComponent;
+    @ViewChild(ProcessInstanceTasksComponent)
+    tasksList: ProcessInstanceTasksComponent;
 
     @Input()
     showTitle: boolean = true;
@@ -67,7 +67,7 @@ export class ActivitiProcessInstanceDetailsComponent implements OnChanges {
      * @param activitiProcess   Process service
      */
     constructor(private translate: AlfrescoTranslationService,
-                private activitiProcess: ActivitiProcessService,
+                private activitiProcess: ProcessService,
                 private logService: LogService) {
 
         if (translate) {
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.css b/ng2-components/ng2-activiti-processlist/src/components/process-instance-header.component.css
similarity index 100%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.css
rename to ng2-components/ng2-activiti-processlist/src/components/process-instance-header.component.css
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.html b/ng2-components/ng2-activiti-processlist/src/components/process-instance-header.component.html
similarity index 100%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.html
rename to ng2-components/ng2-activiti-processlist/src/components/process-instance-header.component.html
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/process-instance-header.component.spec.ts
similarity index 86%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.spec.ts
rename to ng2-components/ng2-activiti-processlist/src/components/process-instance-header.component.spec.ts
index 17a53293c8..92d5748b7f 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.spec.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/process-instance-header.component.spec.ts
@@ -18,18 +18,18 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
-import { exampleProcess, processEnded } from './../assets/activiti-process.model.mock';
+import { exampleProcess, processEnded } from './../assets/process.model.mock';
 import { TranslationMock } from './../assets/translation.service.mock';
 import { ProcessInstance } from './../models/process-instance.model';
-import { ActivitiProcessService } from './../services/activiti-process.service';
-import { ActivitiProcessCommentsComponent } from './activiti-process-comments.component';
-import { ActivitiProcessInstanceHeaderComponent } from './activiti-process-instance-header.component';
+import { ProcessService } from './../services/process.service';
+import { ProcessCommentsComponent } from './process-comments.component';
+import { ProcessInstanceHeaderComponent } from './process-instance-header.component';
 
-describe('ActivitiProcessInstanceHeaderComponent', () => {
+describe('ProcessInstanceHeaderComponent', () => {
 
     let componentHandler: any;
-    let component: ActivitiProcessInstanceHeaderComponent;
-    let fixture: ComponentFixture<ActivitiProcessInstanceHeaderComponent>;
+    let component: ProcessInstanceHeaderComponent;
+    let fixture: ComponentFixture<ProcessInstanceHeaderComponent>;
     let element: HTMLElement;
 
     beforeEach(async(() => {
@@ -38,11 +38,11 @@ describe('ActivitiProcessInstanceHeaderComponent', () => {
                 CoreModule.forRoot()
             ],
             declarations: [
-                ActivitiProcessInstanceHeaderComponent,
-                ActivitiProcessCommentsComponent
+                ProcessInstanceHeaderComponent,
+                ProcessCommentsComponent
             ],
             providers: [
-                ActivitiProcessService,
+                ProcessService,
                 {provide: AlfrescoTranslationService, useClass: TranslationMock}
             ]
         }).compileComponents();
@@ -50,7 +50,7 @@ describe('ActivitiProcessInstanceHeaderComponent', () => {
 
     beforeEach(() => {
 
-        fixture = TestBed.createComponent(ActivitiProcessInstanceHeaderComponent);
+        fixture = TestBed.createComponent(ProcessInstanceHeaderComponent);
         component = fixture.componentInstance;
         element = fixture.nativeElement;
 
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts b/ng2-components/ng2-activiti-processlist/src/components/process-instance-header.component.ts
similarity index 93%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts
rename to ng2-components/ng2-activiti-processlist/src/components/process-instance-header.component.ts
index 018e101284..7dfceac75b 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/process-instance-header.component.ts
@@ -24,10 +24,10 @@ declare let componentHandler: any;
 
 @Component({
     selector: 'adf-process-instance-header, activiti-process-instance-header',
-    templateUrl: './activiti-process-instance-header.component.html',
-    styleUrls: ['./activiti-process-instance-header.component.css']
+    templateUrl: './process-instance-header.component.html',
+    styleUrls: ['./process-instance-header.component.css']
 })
-export class ActivitiProcessInstanceHeaderComponent {
+export class ProcessInstanceHeaderComponent {
 
     @Input()
     showDiagram: boolean = true;
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.css b/ng2-components/ng2-activiti-processlist/src/components/process-instance-tasks.component.css
similarity index 100%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.css
rename to ng2-components/ng2-activiti-processlist/src/components/process-instance-tasks.component.css
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html b/ng2-components/ng2-activiti-processlist/src/components/process-instance-tasks.component.html
similarity index 100%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html
rename to ng2-components/ng2-activiti-processlist/src/components/process-instance-tasks.component.html
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/process-instance-tasks.component.spec.ts
similarity index 90%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.spec.ts
rename to ng2-components/ng2-activiti-processlist/src/components/process-instance-tasks.component.spec.ts
index bfc7a16519..a037454853 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.spec.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/process-instance-tasks.component.spec.ts
@@ -26,16 +26,16 @@ import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 import { taskDetailsMock } from './../assets/task-details.mock';
 import { TranslationMock } from './../assets/translation.service.mock';
 import { ProcessInstance } from './../models/process-instance.model';
-import { ActivitiProcessService } from './../services/activiti-process.service';
-import { ActivitiProcessInstanceTasksComponent } from './activiti-process-instance-tasks.component';
+import { ProcessService } from './../services/process.service';
+import { ProcessInstanceTasksComponent } from './process-instance-tasks.component';
 
-describe('ActivitiProcessInstanceTasksComponent', () => {
+describe('ProcessInstanceTasksComponent', () => {
 
     let componentHandler: any;
-    let component: ActivitiProcessInstanceTasksComponent;
-    let fixture: ComponentFixture<ActivitiProcessInstanceTasksComponent>;
+    let component: ProcessInstanceTasksComponent;
+    let fixture: ComponentFixture<ProcessInstanceTasksComponent>;
     let debugElement: DebugElement;
-    let service: ActivitiProcessService;
+    let service: ProcessService;
     let getProcessTasksSpy: jasmine.Spy;
 
     let exampleProcessInstance = new ProcessInstance({ id: '123' });
@@ -46,11 +46,11 @@ describe('ActivitiProcessInstanceTasksComponent', () => {
                 CoreModule.forRoot()
             ],
             declarations: [
-                ActivitiProcessInstanceTasksComponent
+                ProcessInstanceTasksComponent
             ],
             providers: [
                 { provide: AlfrescoTranslationService, useClass: TranslationMock },
-                ActivitiProcessService
+                ProcessService
             ],
             schemas: [NO_ERRORS_SCHEMA]
         }).compileComponents();
@@ -58,10 +58,10 @@ describe('ActivitiProcessInstanceTasksComponent', () => {
 
     beforeEach(() => {
 
-        fixture = TestBed.createComponent(ActivitiProcessInstanceTasksComponent);
+        fixture = TestBed.createComponent(ProcessInstanceTasksComponent);
         component = fixture.componentInstance;
         debugElement = fixture.debugElement;
-        service = fixture.debugElement.injector.get(ActivitiProcessService);
+        service = fixture.debugElement.injector.get(ProcessService);
         getProcessTasksSpy = spyOn(service, 'getProcessTasks').and.returnValue(Observable.of([new TaskDetailsModel(taskDetailsMock)]));
 
         componentHandler = jasmine.createSpyObj('componentHandler', [
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts b/ng2-components/ng2-activiti-processlist/src/components/process-instance-tasks.component.ts
similarity index 94%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts
rename to ng2-components/ng2-activiti-processlist/src/components/process-instance-tasks.component.ts
index 22affde6c4..59b1ce5c5b 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/process-instance-tasks.component.ts
@@ -21,17 +21,17 @@ import { TaskDetailsEvent, TaskDetailsModel } from 'ng2-activiti-tasklist';
 import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core';
 import { Observable, Observer } from 'rxjs/Rx';
 import { ProcessInstance } from '../models/process-instance.model';
-import { ActivitiProcessService } from './../services/activiti-process.service';
+import { ProcessService } from './../services/process.service';
 
 declare let componentHandler: any;
 declare let dialogPolyfill: any;
 
 @Component({
     selector: 'adf-process-instance-tasks, activiti-process-instance-tasks',
-    templateUrl: './activiti-process-instance-tasks.component.html',
-    styleUrls: ['./activiti-process-instance-tasks.component.css']
+    templateUrl: './process-instance-tasks.component.html',
+    styleUrls: ['./process-instance-tasks.component.css']
 })
-export class ActivitiProcessInstanceTasksComponent implements OnInit, OnChanges {
+export class ProcessInstanceTasksComponent implements OnInit, OnChanges {
 
     @Input()
     processInstanceDetails: ProcessInstance;
@@ -67,7 +67,7 @@ export class ActivitiProcessInstanceTasksComponent implements OnInit, OnChanges
     taskClick: EventEmitter<TaskDetailsEvent> = new EventEmitter<TaskDetailsEvent>();
 
     constructor(private translate: AlfrescoTranslationService,
-                private activitiProcess: ActivitiProcessService,
+                private activitiProcess: ProcessService,
                 private logService: LogService) {
         if (translate) {
             translate.addTranslationFolder('ng2-activiti-processlist', 'assets/ng2-activiti-processlist');
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.css b/ng2-components/ng2-activiti-processlist/src/components/process-instance-variables.component.css
similarity index 100%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.css
rename to ng2-components/ng2-activiti-processlist/src/components/process-instance-variables.component.css
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.html b/ng2-components/ng2-activiti-processlist/src/components/process-instance-variables.component.html
similarity index 100%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.html
rename to ng2-components/ng2-activiti-processlist/src/components/process-instance-variables.component.html
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/process-instance-variables.component.spec.ts
similarity index 95%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.spec.ts
rename to ng2-components/ng2-activiti-processlist/src/components/process-instance-variables.component.spec.ts
index 8be1111efb..6239eb639d 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.spec.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/process-instance-variables.component.spec.ts
@@ -25,15 +25,15 @@ import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 import { DataTableModule, ObjectDataRow, ObjectDataTableAdapter } from 'ng2-alfresco-datatable';
 
 import { TranslationMock } from './../assets/translation.service.mock';
-import { ActivitiProcessService } from './../services/activiti-process.service';
-import { ActivitiProcessInstanceVariablesComponent } from './activiti-process-instance-variables.component';
+import { ProcessService } from './../services/process.service';
+import { ProcessInstanceVariablesComponent } from './process-instance-variables.component';
 
-describe('ActivitiProcessInstanceVariablesComponent', () => {
+describe('ProcessInstanceVariablesComponent', () => {
 
     let componentHandler: any;
-    let service: ActivitiProcessService;
-    let component: ActivitiProcessInstanceVariablesComponent;
-    let fixture: ComponentFixture<ActivitiProcessInstanceVariablesComponent>;
+    let service: ProcessService;
+    let component: ProcessInstanceVariablesComponent;
+    let fixture: ComponentFixture<ProcessInstanceVariablesComponent>;
     let getVariablesSpy: jasmine.Spy;
     let createOrUpdateProcessInstanceVariablesSpy: jasmine.Spy;
     let deleteProcessInstanceVariableSpy: jasmine.Spy;
@@ -46,20 +46,20 @@ describe('ActivitiProcessInstanceVariablesComponent', () => {
                 MdProgressSpinnerModule
             ],
             declarations: [
-                ActivitiProcessInstanceVariablesComponent
+                ProcessInstanceVariablesComponent
             ],
             providers: [
                 { provide: AlfrescoTranslationService, useClass: TranslationMock },
-                ActivitiProcessService
+                ProcessService
             ]
         }).compileComponents();
     }));
 
     beforeEach(() => {
 
-        fixture = TestBed.createComponent(ActivitiProcessInstanceVariablesComponent);
+        fixture = TestBed.createComponent(ProcessInstanceVariablesComponent);
         component = fixture.componentInstance;
-        service = fixture.debugElement.injector.get(ActivitiProcessService);
+        service = fixture.debugElement.injector.get(ProcessService);
 
         getVariablesSpy = spyOn(service, 'getProcessInstanceVariables').and.returnValue(Observable.of([{
             name: 'var1',
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.ts b/ng2-components/ng2-activiti-processlist/src/components/process-instance-variables.component.ts
similarity index 95%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.ts
rename to ng2-components/ng2-activiti-processlist/src/components/process-instance-variables.component.ts
index 90d0f44db7..f326a727cd 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/process-instance-variables.component.ts
@@ -20,18 +20,18 @@ import { Component, DebugElement, EventEmitter, Input, OnChanges, OnInit, Output
 import { AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { DataCellEvent, DataTableAdapter, ObjectDataRow, ObjectDataTableAdapter } from 'ng2-alfresco-datatable';
 import { ProcessInstanceVariable } from './../models/process-instance-variable.model';
-import { ActivitiProcessService } from './../services/activiti-process.service';
+import { ProcessService } from './../services/process.service';
 
 declare let componentHandler: any;
 declare let dialogPolyfill: any;
 
 @Component({
     selector: 'adf-process-instance-variables, activiti-process-instance-variables',
-    templateUrl: './activiti-process-instance-variables.component.html',
-    styleUrls: ['./activiti-process-instance-variables.component.css'],
-    providers: [ActivitiProcessService]
+    templateUrl: './process-instance-variables.component.html',
+    styleUrls: ['./process-instance-variables.component.css'],
+    providers: [ProcessService]
 })
-export class ActivitiProcessInstanceVariablesComponent implements OnInit, OnChanges {
+export class ProcessInstanceVariablesComponent implements OnInit, OnChanges {
 
     @Input()
     processInstanceId: string;
@@ -69,7 +69,7 @@ export class ActivitiProcessInstanceVariablesComponent implements OnInit, OnChan
      * @param activitiProcess Process service
      */
     constructor(private translate: AlfrescoTranslationService,
-                private activitiProcess: ActivitiProcessService) {
+                private activitiProcess: ProcessService) {
 
         if (translate) {
             translate.addTranslationFolder('ng2-activiti-processlist', 'assets/ng2-activiti-processlist');
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.css b/ng2-components/ng2-activiti-processlist/src/components/processlist.component.css
similarity index 100%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.css
rename to ng2-components/ng2-activiti-processlist/src/components/processlist.component.css
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.html b/ng2-components/ng2-activiti-processlist/src/components/processlist.component.html
similarity index 100%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.html
rename to ng2-components/ng2-activiti-processlist/src/components/processlist.component.html
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/processlist.component.spec.ts
similarity index 95%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts
rename to ng2-components/ng2-activiti-processlist/src/components/processlist.component.spec.ts
index e2da4f41a3..7f03b6629b 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/processlist.component.spec.ts
@@ -19,21 +19,21 @@ import { SimpleChange } from '@angular/core';
 import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { MdProgressSpinnerModule } from '@angular/material';
 import { Observable } from 'rxjs/Rx';
-import { ActivitiProcessInstanceListComponent } from './activiti-processlist.component';
+import { ProcessInstanceListComponent } from './processlist.component';
 
 import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 import { DataRowEvent, DataSorting, DataTableModule, ObjectDataRow, ObjectDataTableAdapter } from 'ng2-alfresco-datatable';
 
-import { fakeProcessInstances, fakeProcessInstancesWithNoName } from '../assets/activiti-process-instances-list.mock';
-import { ActivitiProcessService } from '../services/activiti-process.service';
+import { fakeProcessInstances, fakeProcessInstancesWithNoName } from '../assets/process-instances-list.mock';
+import { ProcessService } from '../services/process.service';
 import { TranslationMock } from './../assets/translation.service.mock';
 
-describe('ActivitiProcessInstanceListComponent', () => {
+describe('ProcessInstanceListComponent', () => {
 
     let componentHandler: any;
-    let fixture: ComponentFixture<ActivitiProcessInstanceListComponent>;
-    let component: ActivitiProcessInstanceListComponent;
-    let service: ActivitiProcessService;
+    let fixture: ComponentFixture<ProcessInstanceListComponent>;
+    let component: ProcessInstanceListComponent;
+    let service: ProcessService;
     let getProcessInstancesSpy: jasmine.Spy;
 
     beforeEach(async(() => {
@@ -43,15 +43,15 @@ describe('ActivitiProcessInstanceListComponent', () => {
                 DataTableModule.forRoot(),
                 MdProgressSpinnerModule
             ],
-            declarations: [ ActivitiProcessInstanceListComponent ],
+            declarations: [ ProcessInstanceListComponent ],
             providers: [
-                ActivitiProcessService,
+                ProcessService,
                 {provide: AlfrescoTranslationService, useClass: TranslationMock}
             ]
         }).compileComponents().then(() => {
-            fixture = TestBed.createComponent(ActivitiProcessInstanceListComponent);
+            fixture = TestBed.createComponent(ProcessInstanceListComponent);
             component = fixture.componentInstance;
-            service = fixture.debugElement.injector.get(ActivitiProcessService);
+            service = fixture.debugElement.injector.get(ProcessService);
 
             getProcessInstancesSpy = spyOn(service, 'getProcessInstances').and.returnValue(Observable.of(fakeProcessInstances));
 
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts b/ng2-components/ng2-activiti-processlist/src/components/processlist.component.ts
similarity index 96%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts
rename to ng2-components/ng2-activiti-processlist/src/components/processlist.component.ts
index c6f0bfc40c..e0187a2448 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/processlist.component.ts
@@ -21,14 +21,14 @@ import { AlfrescoTranslationService, DataColumnListComponent } from 'ng2-alfresc
 import { DataColumn, DataRowEvent, DataSorting, DataTableAdapter, ObjectDataRow, ObjectDataTableAdapter } from 'ng2-alfresco-datatable';
 import { ProcessFilterRequestRepresentation } from '../models/process-instance-filter.model';
 import { ProcessInstance } from '../models/process-instance.model';
-import { ActivitiProcessService } from '../services/activiti-process.service';
+import { ProcessService } from '../services/process.service';
 
 @Component({
     selector: 'adf-process-instance-list, activiti-process-instance-list',
-    styleUrls: ['./activiti-processlist.component.css'],
-    templateUrl: './activiti-processlist.component.html'
+    styleUrls: ['./processlist.component.css'],
+    templateUrl: './processlist.component.html'
 })
-export class ActivitiProcessInstanceListComponent implements OnChanges, AfterContentInit {
+export class ProcessInstanceListComponent implements OnChanges, AfterContentInit {
 
     @ContentChild(DataColumnListComponent) columnList: DataColumnListComponent;
 
@@ -69,7 +69,7 @@ export class ActivitiProcessInstanceListComponent implements OnChanges, AfterCon
         { type: 'text', key: 'created', title: 'Created', cssClass: 'hidden', sortable: true }
     ];
 
-    constructor(private processService: ActivitiProcessService,
+    constructor(private processService: ProcessService,
                 private translate: AlfrescoTranslationService) {
         if (translate !== null) {
             translate.addTranslationFolder('ng2-activiti-processlist', 'assets/ng2-activiti-processlist');
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.css b/ng2-components/ng2-activiti-processlist/src/components/start-process.component.css
similarity index 100%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.css
rename to ng2-components/ng2-activiti-processlist/src/components/start-process.component.css
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.html b/ng2-components/ng2-activiti-processlist/src/components/start-process.component.html
similarity index 100%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.html
rename to ng2-components/ng2-activiti-processlist/src/components/start-process.component.html
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/start-process.component.spec.ts
similarity index 94%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.spec.ts
rename to ng2-components/ng2-activiti-processlist/src/components/start-process.component.spec.ts
index b49e54d896..b929d4e14c 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.spec.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/start-process.component.spec.ts
@@ -23,17 +23,17 @@ import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 import { Observable } from 'rxjs/Rx';
 
 import { RestVariable } from 'alfresco-js-api';
-import { ActivitiProcessService } from '../services/activiti-process.service';
-import { fakeProcessDefs, fakeProcessDefWithForm, newProcess, taskFormMock } from './../assets/activiti-start-process.component.mock';
+import { ProcessService } from '../services/process.service';
+import { fakeProcessDefs, fakeProcessDefWithForm, newProcess, taskFormMock } from './../assets/start-process.component.mock';
 import { TranslationMock } from './../assets/translation.service.mock';
-import { ActivitiStartProcessInstanceComponent } from './activiti-start-process.component';
+import { StartProcessInstanceComponent } from './start-process.component';
 
-describe('ActivitiStartProcessInstanceComponent', () => {
+describe('StartProcessInstanceComponent', () => {
 
     let componentHandler: any;
-    let component: ActivitiStartProcessInstanceComponent;
-    let fixture: ComponentFixture<ActivitiStartProcessInstanceComponent>;
-    let processService: ActivitiProcessService;
+    let component: StartProcessInstanceComponent;
+    let fixture: ComponentFixture<StartProcessInstanceComponent>;
+    let processService: ProcessService;
     let formService: FormService;
     let getDefinitionsSpy: jasmine.Spy;
     let getStartFormDefinitionSpy: jasmine.Spy;
@@ -47,11 +47,11 @@ describe('ActivitiStartProcessInstanceComponent', () => {
                 ActivitiFormModule.forRoot()
             ],
             declarations: [
-                ActivitiStartProcessInstanceComponent
+                StartProcessInstanceComponent
             ],
             providers: [
                 {provide: AlfrescoTranslationService, useClass: TranslationMock},
-                ActivitiProcessService,
+                ProcessService,
                 FormService
             ]
         }).compileComponents();
@@ -59,10 +59,10 @@ describe('ActivitiStartProcessInstanceComponent', () => {
 
     beforeEach(() => {
 
-        fixture = TestBed.createComponent(ActivitiStartProcessInstanceComponent);
+        fixture = TestBed.createComponent(StartProcessInstanceComponent);
         component = fixture.componentInstance;
         debugElement = fixture.debugElement;
-        processService = fixture.debugElement.injector.get(ActivitiProcessService);
+        processService = fixture.debugElement.injector.get(ProcessService);
         formService = fixture.debugElement.injector.get(FormService);
 
         getDefinitionsSpy = spyOn(processService, 'getProcessDefinitions').and.returnValue(Observable.of(fakeProcessDefs));
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts b/ng2-components/ng2-activiti-processlist/src/components/start-process.component.ts
similarity index 90%
rename from ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts
rename to ng2-components/ng2-activiti-processlist/src/components/start-process.component.ts
index 2d2e598b22..ecae43e232 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/start-process.component.ts
@@ -17,21 +17,21 @@
 
 import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges, ViewChild } from '@angular/core';
 import { RestVariable } from 'alfresco-js-api';
-import { ActivitiStartFormComponent } from 'ng2-activiti-form';
+import { StartFormComponent } from 'ng2-activiti-form';
 import { AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { ProcessDefinitionRepresentation } from './../models/process-definition.model';
 import { ProcessInstance } from './../models/process-instance.model';
-import { ActivitiProcessService } from './../services/activiti-process.service';
+import { ProcessService } from './../services/process.service';
 
 declare let componentHandler: any;
 declare let dialogPolyfill: any;
 
 @Component({
     selector: 'adf-start-process, activiti-start-process',
-    templateUrl: './activiti-start-process.component.html',
-    styleUrls: ['./activiti-start-process.component.css']
+    templateUrl: './start-process.component.html',
+    styleUrls: ['./start-process.component.css']
 })
-export class ActivitiStartProcessInstanceComponent implements OnChanges {
+export class StartProcessInstanceComponent implements OnChanges {
 
     @Input()
     appId: string;
@@ -45,8 +45,8 @@ export class ActivitiStartProcessInstanceComponent implements OnChanges {
     @Output()
     error: EventEmitter<ProcessInstance> = new EventEmitter<ProcessInstance>();
 
-    @ViewChild(ActivitiStartFormComponent)
-    startForm: ActivitiStartFormComponent;
+    @ViewChild(StartFormComponent)
+    startForm: StartFormComponent;
 
     processDefinitions: ProcessDefinitionRepresentation[] = [];
 
@@ -57,7 +57,7 @@ export class ActivitiStartProcessInstanceComponent implements OnChanges {
     errorMessageId: string = '';
 
     constructor(private translate: AlfrescoTranslationService,
-                private activitiProcess: ActivitiProcessService) {
+                private activitiProcess: ProcessService) {
 
         if (translate) {
             translate.addTranslationFolder('ng2-activiti-processlist', 'assets/ng2-activiti-processlist');
diff --git a/ng2-components/ng2-activiti-processlist/src/models/index.ts b/ng2-components/ng2-activiti-processlist/src/models/index.ts
deleted file mode 100644
index b463bce748..0000000000
--- a/ng2-components/ng2-activiti-processlist/src/models/index.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-export * from './filter-process.model';
-export * from './process-definition.model';
-export * from './process-instance.model';
-export * from './process-instance-filter.model';
-export * from './process-instance-variable.model';
diff --git a/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.spec.ts b/ng2-components/ng2-activiti-processlist/src/services/process.service.spec.ts
similarity index 98%
rename from ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.spec.ts
rename to ng2-components/ng2-activiti-processlist/src/services/process.service.spec.ts
index 81c208b828..be47e74035 100644
--- a/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.spec.ts
+++ b/ng2-components/ng2-activiti-processlist/src/services/process.service.spec.ts
@@ -19,7 +19,7 @@ import { TestBed } from '@angular/core/testing';
 import { async } from '@angular/core/testing';
 import { AlfrescoApi } from 'alfresco-js-api';
 import { AlfrescoApiService, CoreModule } from 'ng2-alfresco-core';
-import { exampleProcess } from '../assets/activiti-process.model.mock';
+import { exampleProcess } from '../assets/process.model.mock';
 import {
     fakeApp1,
     fakeApp2,
@@ -28,16 +28,16 @@ import {
     fakeFilters,
     fakeProcessDef,
     fakeTaskList
-} from '../assets/activiti-process.service.mock';
+} from '../assets/process.service.mock';
 import { FilterProcessRepresentationModel } from '../models/filter-process.model';
 import { ProcessFilterRequestRepresentation } from '../models/process-instance-filter.model';
 import { ProcessInstanceVariable } from '../models/process-instance-variable.model';
-import { ActivitiProcessService } from './activiti-process.service';
+import { ProcessService } from './process.service';
 
 declare let jasmine: any;
-describe('ActivitiProcessService', () => {
+describe('ProcessService', () => {
 
-    let service: ActivitiProcessService;
+    let service: ProcessService;
     let apiService: AlfrescoApiService;
     let alfrescoApi: AlfrescoApi;
 
@@ -47,10 +47,10 @@ describe('ActivitiProcessService', () => {
                 CoreModule.forRoot()
             ],
             providers: [
-                ActivitiProcessService
+                ProcessService
             ]
         });
-        service = TestBed.get(ActivitiProcessService);
+        service = TestBed.get(ProcessService);
         apiService = TestBed.get(AlfrescoApiService);
         alfrescoApi = apiService.getInstance();
     });
diff --git a/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts b/ng2-components/ng2-activiti-processlist/src/services/process.service.ts
similarity index 98%
rename from ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts
rename to ng2-components/ng2-activiti-processlist/src/services/process.service.ts
index 2a1a412ad3..4e8a994f0e 100644
--- a/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts
+++ b/ng2-components/ng2-activiti-processlist/src/services/process.service.ts
@@ -21,14 +21,15 @@ import { AppDefinitionRepresentationModel, Comment, TaskDetailsModel, User } fro
 import { AlfrescoApiService, LogService } from 'ng2-alfresco-core';
 import { Observable } from 'rxjs/Observable';
 import { FilterProcessRepresentationModel } from '../models/filter-process.model';
-import { ProcessDefinitionRepresentation, ProcessInstance } from '../models/index';
+import { ProcessDefinitionRepresentation } from '../models/process-definition.model';
 import { ProcessFilterRequestRepresentation } from '../models/process-instance-filter.model';
+import { ProcessInstance } from '../models/process-instance.model';
 import { ProcessInstanceVariable } from './../models/process-instance-variable.model';
 
 declare let moment: any;
 
 @Injectable()
-export class ActivitiProcessService {
+export class ProcessService {
 
     constructor(private apiService: AlfrescoApiService,
                 private logService: LogService) {
diff --git a/ng2-components/ng2-activiti-tasklist/index.ts b/ng2-components/ng2-activiti-tasklist/index.ts
index 1f193854e7..a7e072dd34 100644
--- a/ng2-components/ng2-activiti-tasklist/index.ts
+++ b/ng2-components/ng2-activiti-tasklist/index.ts
@@ -17,71 +17,133 @@
 
 import { DatePipe } from '@angular/common';
 import { ModuleWithProviders, NgModule } from '@angular/core';
-import {
-    MdAutocompleteModule,
-    MdButtonModule,
-    MdCardModule,
-    MdDatepickerModule,
-    MdGridListModule,
-    MdIconModule,
-    MdInputModule,
-    MdNativeDateModule,
-    MdProgressSpinnerModule,
-    MdSelectModule
-} from '@angular/material';
+import { MdAutocompleteModule, MdButtonModule, MdCardModule, MdDatepickerModule, MdGridListModule,
+    MdIconModule, MdInputModule, MdNativeDateModule, MdProgressSpinnerModule, MdSelectModule } from '@angular/material';
 import { ActivitiFormModule } from 'ng2-activiti-form';
 import { CoreModule } from 'ng2-alfresco-core';
 import { DataTableModule } from 'ng2-alfresco-datatable';
-import { ActivitiPeopleService } from './src/services/activiti-people.service';
-import { ActivitiTaskListService } from './src/services/activiti-tasklist.service';
+import { PeopleService } from './src/services/people.service';
 import { ProcessUploadService } from './src/services/process-upload.service';
+import { TaskListService } from './src/services/tasklist.service';
 
-import {
-    ActivitiAppsComponent,
-    ActivitiChecklistComponent,
-    ActivitiCommentsComponent,
-    ActivitiCreateTaskAttachmentComponent,
-    ActivitiFiltersComponent,
-    ActivitiPeopleComponent,
-    ActivitiPeopleSearchComponent,
-    ActivitiStartTaskComponent,
-    ActivitiTaskDetailsComponent,
-    ActivitiTaskHeaderComponent,
-    ActivitiTaskListComponent,
-    AdfCommentListComponent,
-    NoTaskDetailsTemplateDirective,
-    PeopleListComponent,
-    TaskAttachmentListComponent
-} from './src/components/index';
+import {AppsListComponent } from './src/components/apps-list.component';
+import {ChecklistComponent } from './src/components/checklist.component';
+import {CommentListComponent } from './src/components/comment-list.component';
+import {CommentsComponent } from './src/components/comments.component';
+import {AttachmentComponent } from './src/components/create-task-attachment.component';
+import {NoTaskDetailsTemplateDirective } from './src/components/no-task-detail-template.directive';
+import {PeopleListComponent } from './src/components/people-list.component';
+import {PeopleSearchComponent } from './src/components/people-search.component';
+import {PeopleComponent } from './src/components/people.component';
+import {StartTaskComponent } from './src/components/start-task.component';
+import {TaskAttachmentListComponent} from './src/components/task-attachment-list.component';
+import {TaskDetailsComponent } from './src/components/task-details.component';
+import {TaskFiltersComponent } from './src/components/task-filters.component';
+import {TaskHeaderComponent } from './src/components/task-header.component';
+import {TaskListComponent } from './src/components/tasklist.component';
 
-export * from './src/components/index';
-export * from './src/services/activiti-tasklist.service';
-export * from './src/services/activiti-people.service';
-export * from './src/services/process-upload.service';
-export * from  './src/models/index';
+export {AppsListComponent } from './src/components/apps-list.component';
+export {TaskListComponent } from './src/components/tasklist.component';
+export {ChecklistComponent } from './src/components/checklist.component';
+export {CommentsComponent } from './src/components/comments.component';
+export {TaskAttachmentListComponent} from './src/components/task-attachment-list.component';
+export {PeopleComponent } from './src/components/people.component';
+export {TaskHeaderComponent } from './src/components/task-header.component';
+export {NoTaskDetailsTemplateDirective } from './src/components/no-task-detail-template.directive';
+export {TaskFiltersComponent } from './src/components/task-filters.component';
+export {TaskDetailsComponent } from './src/components/task-details.component';
+export {StartTaskComponent } from './src/components/start-task.component';
+export {PeopleSearchComponent } from './src/components/people-search.component';
+export {AttachmentComponent } from './src/components/create-task-attachment.component';
+export {PeopleListComponent } from './src/components/people-list.component';
+export {CommentListComponent } from './src/components/comment-list.component';
+
+export { TaskListService }  from './src/services/tasklist.service';
+export { PeopleService }  from './src/services/people.service';
+export { ProcessUploadService }  from './src/services/process-upload.service';
+
+// Old Deprecated export
+import {AppsListComponent as ActivitiApps} from './src/components/apps-list.component';
+import {ChecklistComponent as ActivitiChecklist} from './src/components/checklist.component';
+import {CommentsComponent as ActivitiComments} from './src/components/comments.component';
+import {AttachmentComponent as ActivitiCreateTaskAttachmentComponent } from './src/components/create-task-attachment.component';
+import {NoTaskDetailsTemplateDirective as NoTaskDetailsTemplateComponent } from './src/components/no-task-detail-template.directive';
+import {PeopleListComponent as PeopleList } from './src/components/people-list.component';
+import {PeopleSearchComponent as ActivitiPeopleSearch } from './src/components/people-search.component';
+import {PeopleComponent as ActivitiPeople} from './src/components/people.component';
+import {StartTaskComponent as ActivitiStartTaskButton } from './src/components/start-task.component';
+import {TaskDetailsComponent as ActivitiTaskDetails } from './src/components/task-details.component';
+import {TaskFiltersComponent as ActivitiFilters } from './src/components/task-filters.component';
+import {TaskHeaderComponent as ActivitiTaskHeader} from './src/components/task-header.component';
+import {TaskListComponent as ActivitiTaskList } from './src/components/tasklist.component';
+import {PeopleService as ActivitiPeopleService } from './src/services/people.service';
+import {TaskListService as ActivitiTaskListService } from './src/services/tasklist.service';
+export {AppsListComponent as ActivitiApps} from './src/components/apps-list.component';
+export {ChecklistComponent as ActivitiChecklist} from './src/components/checklist.component';
+export {CommentsComponent as ActivitiComments} from './src/components/comments.component';
+export {AttachmentComponent as ActivitiCreateTaskAttachmentComponent } from './src/components/create-task-attachment.component';
+export {NoTaskDetailsTemplateDirective as NoTaskDetailsTemplateComponent } from './src/components/no-task-detail-template.directive';
+export {PeopleListComponent as PeopleList } from './src/components/people-list.component';
+export {PeopleSearchComponent as ActivitiPeopleSearch } from './src/components/people-search.component';
+export {PeopleComponent as ActivitiPeople} from './src/components/people.component';
+export {StartTaskComponent as ActivitiStartTaskButton } from './src/components/start-task.component';
+export {TaskDetailsComponent as ActivitiTaskDetails } from './src/components/task-details.component';
+export {TaskFiltersComponent as ActivitiFilters } from './src/components/task-filters.component';
+export {TaskHeaderComponent as ActivitiTaskHeader} from './src/components/task-header.component';
+export {TaskListComponent as ActivitiTaskList } from './src/components/tasklist.component';
+export {PeopleService as ActivitiPeopleService } from './src/services/people.service';
+export {TaskListService as ActivitiTaskListService } from './src/services/tasklist.service';
+
+export * from './src/models/comment.model';
+export * from './src/models/filter.model';
+export * from './src/models/icon.model';
+export * from './src/models/user.model';
+export * from './src/models/task-details.model';
+export * from './src/models/task-details.event';
+export * from './src/models/user-event.model';
+export * from './src/models/start-task.model';
 
 export const ACTIVITI_TASKLIST_DIRECTIVES: any[] = [
     NoTaskDetailsTemplateDirective,
-    ActivitiAppsComponent,
-    ActivitiFiltersComponent,
-    ActivitiTaskListComponent,
-    ActivitiTaskDetailsComponent,
-    ActivitiChecklistComponent,
-    ActivitiCommentsComponent,
-    ActivitiPeopleComponent,
-    ActivitiTaskHeaderComponent,
-    ActivitiStartTaskComponent,
-    ActivitiPeopleSearchComponent,
+    AppsListComponent,
+    TaskFiltersComponent,
+    TaskListComponent,
+    TaskDetailsComponent,
+    ChecklistComponent,
+    CommentsComponent,
+    PeopleComponent,
+    TaskHeaderComponent,
+    StartTaskComponent,
+    PeopleSearchComponent,
     TaskAttachmentListComponent,
-    ActivitiCreateTaskAttachmentComponent,
+    AttachmentComponent,
     PeopleListComponent,
-    AdfCommentListComponent
+    CommentListComponent,
+
+// Old Deprecated export
+    ActivitiApps,
+    ActivitiTaskList,
+    ActivitiTaskDetails,
+    ActivitiFilters,
+    NoTaskDetailsTemplateComponent,
+    ActivitiChecklist,
+    ActivitiComments,
+    ActivitiPeople,
+    ActivitiTaskHeader,
+    ActivitiStartTaskButton,
+    ActivitiPeopleSearch,
+    ActivitiCreateTaskAttachmentComponent,
+    PeopleList
 ];
 
 export const ACTIVITI_TASKLIST_PROVIDERS: any[] = [
+    TaskListService,
+    PeopleService,
+    ProcessUploadService,
+
+    // Old Deprecated export
     ActivitiTaskListService,
-    ActivitiPeopleService,
-    ProcessUploadService
+    ActivitiPeopleService
 ];
 
 @NgModule({
diff --git a/ng2-components/ng2-activiti-tasklist/src/assets/activiti-apps.mock.ts b/ng2-components/ng2-activiti-tasklist/src/assets/apps-list.mock.ts
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/assets/activiti-apps.mock.ts
rename to ng2-components/ng2-activiti-tasklist/src/assets/apps-list.mock.ts
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps-grid.component.css b/ng2-components/ng2-activiti-tasklist/src/components/apps-grid.component.css
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-apps-grid.component.css
rename to ng2-components/ng2-activiti-tasklist/src/components/apps-grid.component.css
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.css b/ng2-components/ng2-activiti-tasklist/src/components/apps-list.component.css
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.css
rename to ng2-components/ng2-activiti-tasklist/src/components/apps-list.component.css
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.html b/ng2-components/ng2-activiti-tasklist/src/components/apps-list.component.html
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.html
rename to ng2-components/ng2-activiti-tasklist/src/components/apps-list.component.html
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/apps-list.component.spec.ts
similarity index 91%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.spec.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/apps-list.component.spec.ts
index 145b9dc403..756f2048ab 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.spec.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/apps-list.component.spec.ts
@@ -21,17 +21,17 @@ import { By } from '@angular/platform-browser';
 import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 import { Observable } from 'rxjs/Rx';
 
-import { defaultApp, deployedApps, nonDeployedApps } from './../assets/activiti-apps.mock';
-import { ActivitiTaskListService } from './../services/activiti-tasklist.service';
-import { ActivitiAppsComponent } from './activiti-apps.component';
+import { defaultApp, deployedApps, nonDeployedApps } from './../assets/apps-list.mock';
+import { TaskListService } from './../services/tasklist.service';
+import { AppsListComponent } from './apps-list.component';
 
-describe('ActivitiAppsComponent', () => {
+describe('AppsListComponent', () => {
 
     let componentHandler: any;
-    let component: ActivitiAppsComponent;
-    let fixture: ComponentFixture<ActivitiAppsComponent>;
+    let component: AppsListComponent;
+    let fixture: ComponentFixture<AppsListComponent>;
     let debugElement: DebugElement;
-    let service: ActivitiTaskListService;
+    let service: TaskListService;
     let getAppsSpy: jasmine.Spy;
 
     beforeEach(async(() => {
@@ -40,10 +40,10 @@ describe('ActivitiAppsComponent', () => {
                 CoreModule
             ],
             declarations: [
-                ActivitiAppsComponent
+                AppsListComponent
             ],
             providers: [
-                ActivitiTaskListService
+                TaskListService
             ]
         }).compileComponents();
 
@@ -54,11 +54,11 @@ describe('ActivitiAppsComponent', () => {
 
     beforeEach(() => {
 
-        fixture = TestBed.createComponent(ActivitiAppsComponent);
+        fixture = TestBed.createComponent(AppsListComponent);
         component = fixture.componentInstance;
         debugElement = fixture.debugElement;
 
-        service = fixture.debugElement.injector.get(ActivitiTaskListService);
+        service = fixture.debugElement.injector.get(TaskListService);
         getAppsSpy = spyOn(service, 'getDeployedApplications').and.returnValue(Observable.of(deployedApps));
 
         componentHandler = jasmine.createSpyObj('componentHandler', [
@@ -148,14 +148,14 @@ describe('ActivitiAppsComponent', () => {
         });
 
         it('should display a grid when configured to', () => {
-            component.layoutType = ActivitiAppsComponent.LAYOUT_GRID;
+            component.layoutType = AppsListComponent.LAYOUT_GRID;
             fixture.detectChanges();
             expect(component.isGrid()).toBe(true);
             expect(component.isList()).toBe(false);
         });
 
         it('should display a list when configured to', () => {
-            component.layoutType = ActivitiAppsComponent.LAYOUT_LIST;
+            component.layoutType = AppsListComponent.LAYOUT_LIST;
             fixture.detectChanges();
             expect(component.isGrid()).toBe(false);
             expect(component.isList()).toBe(true);
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/apps-list.component.ts
similarity index 82%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/apps-list.component.ts
index d902fcf704..503a71c56d 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/apps-list.component.ts
@@ -21,17 +21,17 @@ import { Observable } from 'rxjs/Observable';
 import { Observer } from 'rxjs/Observer';
 import { AppDefinitionRepresentationModel } from '../models/filter.model';
 import { IconModel } from '../models/icon.model';
-import { ActivitiTaskListService } from './../services/activiti-tasklist.service';
+import { TaskListService } from './../services/tasklist.service';
 
 declare let componentHandler: any;
 
 @Component({
     selector: 'adf-apps, activiti-apps',
-    templateUrl: 'activiti-apps.component.html',
-    styleUrls: ['./activiti-apps.component.css', './activiti-apps-grid.component.css'],
-    providers: [ActivitiTaskListService]
+    templateUrl: 'apps-list.component.html',
+    styleUrls: ['./apps-list.component.css', './apps-grid.component.css'],
+    providers: [TaskListService]
 })
-export class ActivitiAppsComponent implements OnInit {
+export class AppsListComponent implements OnInit {
 
     public static LAYOUT_LIST: string = 'LIST';
     public static LAYOUT_GRID: string = 'GRID';
@@ -42,7 +42,7 @@ export class ActivitiAppsComponent implements OnInit {
     public static DEFAULT_TASKS_APP_MATERIAL_ICON: string = 'favorite_border';
 
     @Input()
-    layoutType: string = ActivitiAppsComponent.LAYOUT_GRID;
+    layoutType: string = AppsListComponent.LAYOUT_GRID;
 
     @Input()
     filtersAppId: any[];
@@ -68,7 +68,7 @@ export class ActivitiAppsComponent implements OnInit {
      * @param activitiTaskList Task service
      */
     constructor(private translateService: AlfrescoTranslationService,
-                private activitiTaskList: ActivitiTaskListService) {
+                private activitiTaskList: TaskListService) {
 
         if (translateService) {
             translateService.addTranslationFolder('ng2-activiti-tasklist', 'assets/ng2-activiti-tasklist');
@@ -94,10 +94,10 @@ export class ActivitiAppsComponent implements OnInit {
             (res) => {
                 res = this.filterApps(res);
                 res.forEach((app: AppDefinitionRepresentationModel) => {
-                    if (app.defaultAppId === ActivitiAppsComponent.DEFAULT_TASKS_APP) {
-                        app.name = ActivitiAppsComponent.DEFAULT_TASKS_APP_NAME;
-                        app.theme = ActivitiAppsComponent.DEFAULT_TASKS_APP_THEME;
-                        app.icon = ActivitiAppsComponent.DEFAULT_TASKS_APP_ICON;
+                    if (app.defaultAppId === AppsListComponent.DEFAULT_TASKS_APP) {
+                        app.name = AppsListComponent.DEFAULT_TASKS_APP_NAME;
+                        app.theme = AppsListComponent.DEFAULT_TASKS_APP_THEME;
+                        app.icon = AppsListComponent.DEFAULT_TASKS_APP_ICON;
                         this.appsObserver.next(app);
                     } else if (app.deploymentId) {
                         this.appsObserver.next(app);
@@ -154,7 +154,7 @@ export class ActivitiAppsComponent implements OnInit {
      * @returns {boolean}
      */
     isValidType(): boolean {
-        if (this.layoutType && (this.layoutType === ActivitiAppsComponent.LAYOUT_LIST || this.layoutType === ActivitiAppsComponent.LAYOUT_GRID)) {
+        if (this.layoutType && (this.layoutType === AppsListComponent.LAYOUT_LIST || this.layoutType === AppsListComponent.LAYOUT_GRID)) {
             return true;
         }
         return false;
@@ -164,7 +164,7 @@ export class ActivitiAppsComponent implements OnInit {
      * Assign the default value to LayoutType
      */
     setDefaultLayoutType(): void {
-        this.layoutType = ActivitiAppsComponent.LAYOUT_GRID;
+        this.layoutType = AppsListComponent.LAYOUT_GRID;
     }
 
     /**
@@ -172,7 +172,7 @@ export class ActivitiAppsComponent implements OnInit {
      * @returns {boolean}
      */
     isList(): boolean {
-        return this.layoutType === ActivitiAppsComponent.LAYOUT_LIST;
+        return this.layoutType === AppsListComponent.LAYOUT_LIST;
     }
 
     /**
@@ -180,7 +180,7 @@ export class ActivitiAppsComponent implements OnInit {
      * @returns {boolean}
      */
     isGrid(): boolean {
-        return this.layoutType === ActivitiAppsComponent.LAYOUT_GRID;
+        return this.layoutType === AppsListComponent.LAYOUT_GRID;
     }
 
     isEmpty(): boolean {
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.css b/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.css
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.css
rename to ng2-components/ng2-activiti-tasklist/src/components/checklist.component.css
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.html b/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.html
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.html
rename to ng2-components/ng2-activiti-tasklist/src/components/checklist.component.html
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.spec.ts
similarity index 95%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.spec.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/checklist.component.spec.ts
index 28096a69e5..2553e92319 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.spec.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.spec.ts
@@ -20,8 +20,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 import { Observable } from 'rxjs/Rx';
 import { TaskDetailsModel } from '../models/task-details.model';
-import { ActivitiTaskListService } from '../services/activiti-tasklist.service';
-import { ActivitiChecklistComponent } from './activiti-checklist.component';
+import { TaskListService } from '../services/tasklist.service';
+import { ChecklistComponent } from './checklist.component';
 
 declare let jasmine: any;
 
@@ -30,10 +30,10 @@ const fakeTaskDetail = new TaskDetailsModel({
     name: 'fake-check-name'
 });
 
-describe('ActivitiChecklistComponent', () => {
+describe('ChecklistComponent', () => {
 
-    let checklistComponent: ActivitiChecklistComponent;
-    let fixture: ComponentFixture<ActivitiChecklistComponent>;
+    let checklistComponent: ChecklistComponent;
+    let fixture: ComponentFixture<ChecklistComponent>;
     let element: HTMLElement;
     let showChecklistDialog, closeCheckDialogButton;
 
@@ -43,10 +43,10 @@ describe('ActivitiChecklistComponent', () => {
                 CoreModule.forRoot()
             ],
             declarations: [
-                ActivitiChecklistComponent
+                ChecklistComponent
             ],
             providers: [
-                ActivitiTaskListService
+                TaskListService
             ]
         }).compileComponents().then(() => {
             let translateService = TestBed.get(AlfrescoTranslationService);
@@ -55,7 +55,7 @@ describe('ActivitiChecklistComponent', () => {
                 return Observable.of(key);
             });
 
-            fixture = TestBed.createComponent(ActivitiChecklistComponent);
+            fixture = TestBed.createComponent(ChecklistComponent);
             checklistComponent = fixture.componentInstance;
             element = fixture.nativeElement;
 
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.ts
similarity index 92%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/checklist.component.ts
index 9f01846a78..fd44d1d955 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.ts
@@ -19,17 +19,17 @@ import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChange
 import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core';
 import { Observable, Observer } from 'rxjs/Rx';
 import { TaskDetailsModel } from '../models/task-details.model';
-import { ActivitiTaskListService } from './../services/activiti-tasklist.service';
+import { TaskListService } from './../services/tasklist.service';
 
 declare let dialogPolyfill: any;
 
 @Component({
     selector: 'adf-checklist, activiti-checklist',
-    templateUrl: './activiti-checklist.component.html',
-    styleUrls: ['./activiti-checklist.component.css'],
-    providers: [ActivitiTaskListService]
+    templateUrl: './checklist.component.html',
+    styleUrls: ['./checklist.component.css'],
+    providers: [TaskListService]
 })
-export class ActivitiChecklistComponent implements OnInit, OnChanges {
+export class ChecklistComponent implements OnInit, OnChanges {
 
     @Input()
     taskId: string;
@@ -65,7 +65,7 @@ export class ActivitiChecklistComponent implements OnInit, OnChanges {
      * @param translate
      */
     constructor(private translateService: AlfrescoTranslationService,
-                private activitiTaskList: ActivitiTaskListService,
+                private activitiTaskList: TaskListService,
                 private logService: LogService) {
 
         if (translateService) {
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/adf-comment-list.component.css b/ng2-components/ng2-activiti-tasklist/src/components/comment-list.component.css
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/adf-comment-list.component.css
rename to ng2-components/ng2-activiti-tasklist/src/components/comment-list.component.css
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/adf-comment-list.component.html b/ng2-components/ng2-activiti-tasklist/src/components/comment-list.component.html
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/adf-comment-list.component.html
rename to ng2-components/ng2-activiti-tasklist/src/components/comment-list.component.html
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/adf-comment-list.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/comment-list.component.spec.ts
similarity index 93%
rename from ng2-components/ng2-activiti-tasklist/src/components/adf-comment-list.component.spec.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/comment-list.component.spec.ts
index c1eadccc7b..938746d9c4 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/adf-comment-list.component.spec.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/comment-list.component.spec.ts
@@ -19,8 +19,9 @@ import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { CoreModule } from 'ng2-alfresco-core';
 import { DataRowEvent, DataTableModule, ObjectDataRow } from 'ng2-alfresco-datatable';
-import { Comment, User } from '../models/index';
-import { AdfCommentListComponent } from './adf-comment-list.component';
+import { Comment  } from '../models/comment.model';
+import { User  } from '../models/user.model';
+import { CommentListComponent } from './comment-list.component';
 
 declare let jasmine: any;
 
@@ -33,10 +34,10 @@ const testUser: User = new User({
 const testDate = new Date();
 const testComment: Comment = new Comment(1, 'Test Comment', testDate.toDateString(), testUser);
 
-describe('AdfCommentListComponent', () => {
+describe('CommentListComponent', () => {
 
-    let commentList: AdfCommentListComponent;
-    let fixture: ComponentFixture<AdfCommentListComponent>;
+    let commentList: CommentListComponent;
+    let fixture: ComponentFixture<CommentListComponent>;
     let element: HTMLElement;
     let componentHandler;
 
@@ -47,14 +48,14 @@ describe('AdfCommentListComponent', () => {
                 DataTableModule
             ],
             declarations: [
-                AdfCommentListComponent
+                CommentListComponent
             ],
             providers: [
                 DatePipe
             ]
         }).compileComponents().then(() => {
 
-            fixture = TestBed.createComponent(AdfCommentListComponent);
+            fixture = TestBed.createComponent(CommentListComponent);
             commentList = fixture.componentInstance;
             element = fixture.nativeElement;
             componentHandler = jasmine.createSpyObj('componentHandler', [
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/adf-comment-list.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/comment-list.component.ts
similarity index 91%
rename from ng2-components/ng2-activiti-tasklist/src/components/adf-comment-list.component.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/comment-list.component.ts
index 5b44ef5f1e..d94dfe1d62 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/adf-comment-list.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/comment-list.component.ts
@@ -17,15 +17,16 @@
 
 import { DatePipe } from '@angular/common';
 import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { Comment, User } from '../models/index';
+import { Comment } from '../models/comment.model';
+import { User } from '../models/user.model';
 
 @Component({
     selector: 'adf-comment-list',
-    templateUrl: './adf-comment-list.component.html',
-    styleUrls: ['./adf-comment-list.component.css']
+    templateUrl: './comment-list.component.html',
+    styleUrls: ['./comment-list.component.css']
 })
 
-export class AdfCommentListComponent {
+export class CommentListComponent {
 
     @Input()
     comments: Comment[];
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.css b/ng2-components/ng2-activiti-tasklist/src/components/comments.component.css
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.css
rename to ng2-components/ng2-activiti-tasklist/src/components/comments.component.css
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.html b/ng2-components/ng2-activiti-tasklist/src/components/comments.component.html
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.html
rename to ng2-components/ng2-activiti-tasklist/src/components/comments.component.html
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/comments.component.spec.ts
similarity index 92%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.spec.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/comments.component.spec.ts
index 99a018a34f..60c86cc3da 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.spec.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/comments.component.spec.ts
@@ -25,16 +25,16 @@ import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 import { DatePipe } from '@angular/common';
 import { MdInputModule } from '@angular/material';
 import { DataTableModule } from 'ng2-alfresco-datatable';
-import { ActivitiTaskListService } from './../services/activiti-tasklist.service';
-import { ActivitiCommentsComponent } from './activiti-comments.component';
-import { AdfCommentListComponent } from './adf-comment-list.component';
+import { TaskListService } from './../services/tasklist.service';
+import { CommentsComponent } from './comments.component';
+import { CommentListComponent } from './comment-list.component';
 
-describe('ActivitiCommentsComponent', () => {
+describe('CommentsComponent', () => {
 
     let componentHandler: any;
-    let service: ActivitiTaskListService;
-    let component: ActivitiCommentsComponent;
-    let fixture: ComponentFixture<ActivitiCommentsComponent>;
+    let service: TaskListService;
+    let component: CommentsComponent;
+    let fixture: ComponentFixture<CommentsComponent>;
     let getCommentsSpy: jasmine.Spy;
     let addCommentSpy: jasmine.Spy;
 
@@ -47,11 +47,11 @@ describe('ActivitiCommentsComponent', () => {
                 MdInputModule
             ],
             declarations: [
-                ActivitiCommentsComponent,
-                AdfCommentListComponent
+                CommentsComponent,
+                CommentListComponent
             ],
             providers: [
-                ActivitiTaskListService,
+                TaskListService,
                 DatePipe
             ]
         }).compileComponents();
@@ -62,9 +62,9 @@ describe('ActivitiCommentsComponent', () => {
     }));
 
     beforeEach(() => {
-        fixture = TestBed.createComponent(ActivitiCommentsComponent);
+        fixture = TestBed.createComponent(CommentsComponent);
         component = fixture.componentInstance;
-        service = fixture.debugElement.injector.get(ActivitiTaskListService);
+        service = fixture.debugElement.injector.get(TaskListService);
 
         getCommentsSpy = spyOn(service, 'getTaskComments').and.returnValue(Observable.of([
             { message: 'Test1', created: Date.now(), createdBy: {firstName: 'Admin', lastName: 'User'} },
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/comments.component.ts
similarity index 91%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/comments.component.ts
index 37f942ac94..dde7392232 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/comments.component.ts
@@ -20,15 +20,15 @@ import { AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { Observable, Observer } from 'rxjs/Rx';
 
 import { Comment } from '../models/comment.model';
-import { ActivitiTaskListService } from '../services/activiti-tasklist.service';
+import { TaskListService } from '../services/tasklist.service';
 
 @Component({
     selector: 'adf-comments, activiti-comments',
-    templateUrl: './activiti-comments.component.html',
-    styleUrls: ['./activiti-comments.component.css'],
-    providers: [ActivitiTaskListService]
+    templateUrl: './comments.component.html',
+    styleUrls: ['./comments.component.css'],
+    providers: [TaskListService]
 })
-export class ActivitiCommentsComponent implements OnChanges {
+export class CommentsComponent implements OnChanges {
 
     @Input()
     taskId: string;
@@ -54,7 +54,7 @@ export class ActivitiCommentsComponent implements OnChanges {
      * @param activitiTaskList Task service
      */
     constructor(private translateService: AlfrescoTranslationService,
-                private activitiTaskList: ActivitiTaskListService) {
+                private activitiTaskList: TaskListService) {
 
         if (translateService) {
             translateService.addTranslationFolder('ng2-activiti-tasklist', 'assets/ng2-activiti-tasklist');
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/adf-create-task-attachment.component.css b/ng2-components/ng2-activiti-tasklist/src/components/create-task-attachment.component.css
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/adf-create-task-attachment.component.css
rename to ng2-components/ng2-activiti-tasklist/src/components/create-task-attachment.component.css
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/adf-create-task-attachment.component.html b/ng2-components/ng2-activiti-tasklist/src/components/create-task-attachment.component.html
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/adf-create-task-attachment.component.html
rename to ng2-components/ng2-activiti-tasklist/src/components/create-task-attachment.component.html
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/adf-create-task-attachment.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/create-task-attachment.component.spec.ts
similarity index 89%
rename from ng2-components/ng2-activiti-tasklist/src/components/adf-create-task-attachment.component.spec.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/create-task-attachment.component.spec.ts
index c3f19e2665..371190fa15 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/adf-create-task-attachment.component.spec.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/create-task-attachment.component.spec.ts
@@ -22,14 +22,14 @@ import { Observable } from 'rxjs/Rx';
 import { ActivitiContentService } from 'ng2-activiti-form';
 import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 
-import { ActivitiCreateTaskAttachmentComponent } from './adf-create-task-attachment.component';
+import { AttachmentComponent } from './create-task-attachment.component';
 
 describe('Activiti Task Create Attachment', () => {
 
     let componentHandler: any;
     let service: ActivitiContentService;
-    let component: ActivitiCreateTaskAttachmentComponent;
-    let fixture: ComponentFixture<ActivitiCreateTaskAttachmentComponent>;
+    let component: AttachmentComponent;
+    let fixture: ComponentFixture<AttachmentComponent>;
     let createTaskRelatedContentSpy: jasmine.Spy;
 
     beforeEach(async(() => {
@@ -38,7 +38,7 @@ describe('Activiti Task Create Attachment', () => {
                 CoreModule.forRoot()
             ],
             declarations: [
-                ActivitiCreateTaskAttachmentComponent
+                AttachmentComponent
             ],
             providers: [
                 {provide: AlfrescoTranslationService},
@@ -49,7 +49,7 @@ describe('Activiti Task Create Attachment', () => {
 
     beforeEach(() => {
 
-        fixture = TestBed.createComponent(ActivitiCreateTaskAttachmentComponent);
+        fixture = TestBed.createComponent(AttachmentComponent);
         component = fixture.componentInstance;
         service = fixture.debugElement.injector.get(ActivitiContentService);
 
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/adf-create-task-attachment.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/create-task-attachment.component.ts
similarity index 91%
rename from ng2-components/ng2-activiti-tasklist/src/components/adf-create-task-attachment.component.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/create-task-attachment.component.ts
index 894b359c11..280952cda3 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/adf-create-task-attachment.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/create-task-attachment.component.ts
@@ -21,10 +21,10 @@ import { AlfrescoTranslationService } from 'ng2-alfresco-core';
 
 @Component({
     selector: 'adf-create-task-attachment',
-    styleUrls: ['./adf-create-task-attachment.component.css'],
-    templateUrl: './adf-create-task-attachment.component.html'
+    styleUrls: ['./create-task-attachment.component.css'],
+    templateUrl: './create-task-attachment.component.html'
 })
-export class ActivitiCreateTaskAttachmentComponent implements OnChanges {
+export class AttachmentComponent implements OnChanges {
 
     @Input()
     taskId: string;
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/index.ts b/ng2-components/ng2-activiti-tasklist/src/components/index.ts
deleted file mode 100644
index 140f54bfc5..0000000000
--- a/ng2-components/ng2-activiti-tasklist/src/components/index.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-export * from './activiti-apps.component';
-export * from './activiti-tasklist.component';
-export * from './activiti-checklist.component';
-export * from './activiti-comments.component';
-export * from './adf-task-attachment-list.component';
-export * from './activiti-people.component';
-export * from './activiti-task-header.component';
-export * from './no-task-detail-template.component';
-export * from './activiti-filters.component';
-export * from './activiti-task-details.component';
-export * from './activiti-start-task.component';
-export * from './activiti-people-search.component';
-export * from './adf-create-task-attachment.component';
-export * from './adf-people-list.component';
-export * from './adf-comment-list.component';
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/no-task-detail-template.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/no-task-detail-template.directive.spec.ts
similarity index 82%
rename from ng2-components/ng2-activiti-tasklist/src/components/no-task-detail-template.component.spec.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/no-task-detail-template.directive.spec.ts
index a5e88d3eec..5c678b4aae 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/no-task-detail-template.component.spec.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/no-task-detail-template.directive.spec.ts
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-import { ActivitiTaskDetailsComponent } from './activiti-task-details.component';
-import { NoTaskDetailsTemplateDirective } from './no-task-detail-template.component';
+import { TaskDetailsComponent } from './task-details.component';
+import { NoTaskDetailsTemplateDirective } from './no-task-detail-template.directive';
 
 describe('NoTaskDetailsTemplateDirective', () => {
 
     let component: NoTaskDetailsTemplateDirective;
-    let detailsComponent: ActivitiTaskDetailsComponent;
+    let detailsComponent: TaskDetailsComponent;
 
     beforeEach(() => {
-        detailsComponent = new ActivitiTaskDetailsComponent(null, null, null, null, null, null);
+        detailsComponent = new TaskDetailsComponent(null, null, null, null, null, null);
         component = new NoTaskDetailsTemplateDirective(detailsComponent);
     });
 
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/no-task-detail-template.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/no-task-detail-template.directive.ts
similarity index 87%
rename from ng2-components/ng2-activiti-tasklist/src/components/no-task-detail-template.component.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/no-task-detail-template.directive.ts
index 4d0396c38a..7617bf32fa 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/no-task-detail-template.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/no-task-detail-template.directive.ts
@@ -21,7 +21,7 @@ import {
     Directive,
     TemplateRef
 } from '@angular/core';
-import { ActivitiTaskDetailsComponent } from './activiti-task-details.component';
+import { TaskDetailsComponent } from './task-details.component';
 
 @Directive({
     selector: 'no-task-details-template'
@@ -32,7 +32,7 @@ export class NoTaskDetailsTemplateDirective implements AfterContentInit {
     template: any;
 
     constructor(
-        private activitiTaskDetails: ActivitiTaskDetailsComponent) {
+        private activitiTaskDetails: TaskDetailsComponent) {
     }
 
     ngAfterContentInit() {
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/adf-people-list.component.css b/ng2-components/ng2-activiti-tasklist/src/components/people-list.component.css
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/adf-people-list.component.css
rename to ng2-components/ng2-activiti-tasklist/src/components/people-list.component.css
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/adf-people-list.component.html b/ng2-components/ng2-activiti-tasklist/src/components/people-list.component.html
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/adf-people-list.component.html
rename to ng2-components/ng2-activiti-tasklist/src/components/people-list.component.html
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/adf-people-list.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/people-list.component.spec.ts
similarity index 93%
rename from ng2-components/ng2-activiti-tasklist/src/components/adf-people-list.component.spec.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/people-list.component.spec.ts
index 643cec4a67..fba82c316c 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/adf-people-list.component.spec.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/people-list.component.spec.ts
@@ -19,8 +19,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 import { DataRowActionEvent, DataRowEvent, DataTableModule, ObjectDataRow } from 'ng2-alfresco-datatable';
 import { Observable } from 'rxjs/Observable';
-import { User, UserEventModel } from '../models/index';
-import { PeopleListComponent } from './adf-people-list.component';
+import { User } from '../models/user.model';
+import { UserEventModel } from '../models/user-event.model';
+import { PeopleListComponent } from './people-list.component';
 
 declare let jasmine: any;
 
@@ -51,7 +52,9 @@ describe('PeopleListComponent', () => {
 
             let translateService = TestBed.get(AlfrescoTranslationService);
             spyOn(translateService, 'addTranslationFolder').and.stub();
-            spyOn(translateService.translate, 'get').and.callFake((key) => { return Observable.of(key); });
+            spyOn(translateService.translate, 'get').and.callFake((key) => {
+                return Observable.of(key);
+            });
 
             fixture = TestBed.createComponent(PeopleListComponent);
             peopleListComponent = fixture.componentInstance;
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/adf-people-list.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/people-list.component.ts
similarity index 92%
rename from ng2-components/ng2-activiti-tasklist/src/components/adf-people-list.component.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/people-list.component.ts
index b1a8258758..62d9844100 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/adf-people-list.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/people-list.component.ts
@@ -18,14 +18,15 @@
 import { AfterContentInit, AfterViewInit, Component, ContentChild, EventEmitter, Input, Output, ViewChild } from '@angular/core';
 import { DataColumnListComponent } from 'ng2-alfresco-core';
 import { DataTableComponent } from 'ng2-alfresco-datatable';
-import { User, UserEventModel } from '../models/index';
+import { UserEventModel } from '../models/user-event.model';
+import { User } from '../models/user.model';
 
 declare let componentHandler: any;
 
 @Component({
     selector: 'adf-people-list',
-    templateUrl: './adf-people-list.component.html',
-    styleUrls: ['./adf-people-list.component.css']
+    templateUrl: './people-list.component.html',
+    styleUrls: ['./people-list.component.css']
 })
 
 export class PeopleListComponent implements AfterViewInit, AfterContentInit {
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.css b/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.css
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.css
rename to ng2-components/ng2-activiti-tasklist/src/components/people-search.component.css
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.html b/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.html
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.html
rename to ng2-components/ng2-activiti-tasklist/src/components/people-search.component.html
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.spec.ts
similarity index 76%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.spec.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/people-search.component.spec.ts
index a97dd332be..17743b4a6f 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.spec.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.spec.ts
@@ -20,8 +20,8 @@ import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 import { DataTableModule } from 'ng2-alfresco-datatable';
 import { Observable } from 'rxjs/Observable';
 import { User } from '../models/user.model';
-import { ActivitiPeopleSearchComponent } from './activiti-people-search.component';
-import { PeopleListComponent } from './adf-people-list.component';
+import { PeopleSearchComponent } from './people-search.component';
+import { PeopleListComponent } from './people-list.component';
 
 declare let jasmine: any;
 
@@ -39,10 +39,10 @@ const fakeSecondUser: User = new User({
     email: 'fake-involve@mail.com'
 });
 
-describe('ActivitiPeopleSearchComponent', () => {
+describe('PeopleSearchComponent', () => {
 
-    let activitiPeopleSearchComponent: ActivitiPeopleSearchComponent;
-    let fixture: ComponentFixture<ActivitiPeopleSearchComponent>;
+    let peopleSearchComponent: PeopleSearchComponent;
+    let fixture: ComponentFixture<PeopleSearchComponent>;
     let element: HTMLElement;
     let componentHandler;
     let userArray = [fakeUser, fakeSecondUser];
@@ -55,7 +55,7 @@ describe('ActivitiPeopleSearchComponent', () => {
                 DataTableModule
             ],
             declarations: [
-                ActivitiPeopleSearchComponent,
+                PeopleSearchComponent,
                 PeopleListComponent
             ]
         }).compileComponents().then(() => {
@@ -64,15 +64,15 @@ describe('ActivitiPeopleSearchComponent', () => {
             spyOn(translateService, 'addTranslationFolder').and.stub();
             spyOn(translateService.translate, 'get').and.callFake((key) => { return Observable.of(key); });
 
-            fixture = TestBed.createComponent(ActivitiPeopleSearchComponent);
-            activitiPeopleSearchComponent = fixture.componentInstance;
+            fixture = TestBed.createComponent(PeopleSearchComponent);
+            peopleSearchComponent = fixture.componentInstance;
             element = fixture.nativeElement;
             componentHandler = jasmine.createSpyObj('componentHandler', [
                 'upgradeAllRegistered'
             ]);
 
             window['componentHandler'] = componentHandler;
-            activitiPeopleSearchComponent.results = Observable.of([]);
+            peopleSearchComponent.results = Observable.of([]);
             fixture.detectChanges();
         });
     }));
@@ -92,9 +92,9 @@ describe('ActivitiPeopleSearchComponent', () => {
     });
 
     it('should show user which can be involved ', (done) => {
-        activitiPeopleSearchComponent.searchPeople.subscribe(() => {
-            activitiPeopleSearchComponent.results = Observable.of(userArray);
-            activitiPeopleSearchComponent.ngOnInit();
+        peopleSearchComponent.searchPeople.subscribe(() => {
+            peopleSearchComponent.results = Observable.of(userArray);
+            peopleSearchComponent.ngOnInit();
             fixture.detectChanges();
             fixture.whenStable()
                 .then(() => {
@@ -106,32 +106,32 @@ describe('ActivitiPeopleSearchComponent', () => {
         });
         searchInput = element.querySelector('#userSearchText');
         searchInput.value = 'fake-search';
-        activitiPeopleSearchComponent.searchUser.markAsDirty();
+        peopleSearchComponent.searchUser.markAsDirty();
         searchInput.dispatchEvent(new Event('input'));
     });
 
     it('should send an event when an user is clicked', (done) => {
-        activitiPeopleSearchComponent.success.subscribe((user) => {
+        peopleSearchComponent.success.subscribe((user) => {
             expect(user).toBeDefined();
             expect(user.firstName).toBe('fake-name');
             done();
         });
-        activitiPeopleSearchComponent.results = Observable.of(userArray);
-        activitiPeopleSearchComponent.ngOnInit();
+        peopleSearchComponent.results = Observable.of(userArray);
+        peopleSearchComponent.ngOnInit();
         fixture.detectChanges();
         fixture.whenStable()
             .then(() => {
-                activitiPeopleSearchComponent.onRowClick(fakeUser);
+                peopleSearchComponent.onRowClick(fakeUser);
                 let addUserButton = <HTMLElement> element.querySelector('#add-people');
                 addUserButton.click();
             });
     });
 
     it('should remove clicked user', (done) => {
-        activitiPeopleSearchComponent.results = Observable.of(userArray);
-        activitiPeopleSearchComponent.ngOnInit();
+        peopleSearchComponent.results = Observable.of(userArray);
+        peopleSearchComponent.ngOnInit();
         fixture.detectChanges();
-        activitiPeopleSearchComponent.onRowClick(fakeUser);
+        peopleSearchComponent.onRowClick(fakeUser);
         let addUserButton = <HTMLElement> element.querySelector('#add-people');
         addUserButton.click();
 
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.ts
similarity index 94%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/people-search.component.ts
index 99b90ea1ee..8ec01a5e84 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.ts
@@ -26,11 +26,11 @@ declare var require: any;
 
 @Component({
     selector: 'adf-people-search, activiti-people-search',
-    templateUrl: './activiti-people-search.component.html',
-    styleUrls: ['./activiti-people-search.component.css']
+    templateUrl: './people-search.component.html',
+    styleUrls: ['./people-search.component.css']
 })
 
-export class ActivitiPeopleSearchComponent implements OnInit, AfterViewInit {
+export class PeopleSearchComponent implements OnInit, AfterViewInit {
 
     @Input()
     results: Observable<User[]>;
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.css b/ng2-components/ng2-activiti-tasklist/src/components/people.component.css
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.css
rename to ng2-components/ng2-activiti-tasklist/src/components/people.component.css
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.html b/ng2-components/ng2-activiti-tasklist/src/components/people.component.html
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.html
rename to ng2-components/ng2-activiti-tasklist/src/components/people.component.html
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/people.component.spec.ts
similarity index 93%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.spec.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/people.component.spec.ts
index 0212b29ec8..1414feed41 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.spec.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/people.component.spec.ts
@@ -20,10 +20,10 @@ import { AlfrescoTranslationService, CoreModule, LogService } from 'ng2-alfresco
 import { DataTableModule } from 'ng2-alfresco-datatable';
 import { Observable } from 'rxjs/Observable';
 import { User } from '../models/user.model';
-import { ActivitiPeopleService } from '../services/activiti-people.service';
-import { ActivitiPeopleSearchComponent } from './activiti-people-search.component';
-import { ActivitiPeopleComponent } from './activiti-people.component';
-import { PeopleListComponent } from './adf-people-list.component';
+import { PeopleService } from '../services/people.service';
+import { PeopleSearchComponent } from './people-search.component';
+import { PeopleComponent } from './people.component';
+import { PeopleListComponent } from './people-list.component';
 
 declare let jasmine: any;
 
@@ -41,10 +41,10 @@ const fakeSecondUser: User = new User({
     email: 'fake-involve@mail.com'
 });
 
-describe('ActivitiPeopleComponent', () => {
+describe('PeopleComponent', () => {
 
-    let activitiPeopleComponent: ActivitiPeopleComponent;
-    let fixture: ComponentFixture<ActivitiPeopleComponent>;
+    let activitiPeopleComponent: PeopleComponent;
+    let fixture: ComponentFixture<PeopleComponent>;
     let element: HTMLElement;
     let componentHandler;
     let userArray = [fakeUser, fakeSecondUser];
@@ -57,12 +57,12 @@ describe('ActivitiPeopleComponent', () => {
                 DataTableModule
             ],
             declarations: [
-                ActivitiPeopleSearchComponent,
+                PeopleSearchComponent,
                 PeopleListComponent,
-                ActivitiPeopleComponent
+                PeopleComponent
             ],
             providers: [
-                ActivitiPeopleService
+                PeopleService
             ]
         }).compileComponents().then(() => {
 
@@ -72,7 +72,7 @@ describe('ActivitiPeopleComponent', () => {
             spyOn(translateService, 'addTranslationFolder').and.stub();
             spyOn(translateService.translate, 'get').and.callFake((key) => { return Observable.of(key); });
 
-            fixture = TestBed.createComponent(ActivitiPeopleComponent);
+            fixture = TestBed.createComponent(PeopleComponent);
             activitiPeopleComponent = fixture.componentInstance;
             element = fixture.nativeElement;
             componentHandler = jasmine.createSpyObj('componentHandler', [
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/people.component.ts
similarity index 91%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/people.component.ts
index 19a6ccf89a..ed7e3231c8 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/people.component.ts
@@ -18,18 +18,20 @@
 import { AfterViewInit, Component, Input } from '@angular/core';
 import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core';
 import { Observable, Observer } from 'rxjs/Rx';
-import { User, UserEventModel } from '../models/index';
-import { ActivitiPeopleService } from '../services/activiti-people.service';
+import { UserEventModel } from '../models/user-event.model';
+import { User } from '../models/user.model';
+
+import { PeopleService } from '../services/people.service';
 
 declare let componentHandler: any;
 declare var require: any;
 
 @Component({
     selector: 'adf-people, activiti-people',
-    templateUrl: './activiti-people.component.html',
-    styleUrls: ['./activiti-people.component.css']
+    templateUrl: './people.component.html',
+    styleUrls: ['./people.component.css']
 })
-export class ActivitiPeopleComponent implements AfterViewInit {
+export class PeopleComponent implements AfterViewInit {
 
     @Input()
     iconImageUrl: string = require('../assets/images/user.jpg');
@@ -54,7 +56,7 @@ export class ActivitiPeopleComponent implements AfterViewInit {
      * @param people service
      */
     constructor(private translateService: AlfrescoTranslationService,
-                private peopleService: ActivitiPeopleService,
+                private peopleService: PeopleService,
                 private logService: LogService) {
         if (translateService) {
             translateService.addTranslationFolder('ng2-activiti-tasklist', 'assets/ng2-activiti-tasklist');
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.css b/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.css
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.css
rename to ng2-components/ng2-activiti-tasklist/src/components/start-task.component.css
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.html b/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.html
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.html
rename to ng2-components/ng2-activiti-tasklist/src/components/start-task.component.html
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.spec.ts
similarity index 90%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.spec.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/start-task.component.spec.ts
index 8c48a9f298..ea3aea73ff 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.spec.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.spec.ts
@@ -19,20 +19,20 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { MdButtonModule, MdDatepickerModule, MdGridListModule, MdIconModule, MdInputModule, MdNativeDateModule, MdSelectModule } from '@angular/material';
 import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 import { Observable } from 'rxjs/Rx';
-import { StartTaskModel } from '../models/index';
-import { ActivitiPeopleService } from '../services/activiti-people.service';
-import { ActivitiTaskListService } from '../services/activiti-tasklist.service';
+import { StartTaskModel } from '../models/start-task.model';
+import { PeopleService } from '../services/people.service';
+import { TaskListService } from '../services/tasklist.service';
 import { startTaskMock } from './../assets/start-task.mock';
-import { ActivitiStartTaskComponent } from './activiti-start-task.component';
+import { StartTaskComponent } from './start-task.component';
 
 declare let jasmine: any;
 
-describe('ActivitiStartTaskComponent', () => {
+describe('StartTaskComponent', () => {
 
-    let activitiStartTaskComponent: ActivitiStartTaskComponent;
-    let fixture: ComponentFixture<ActivitiStartTaskComponent>;
-    let service: ActivitiTaskListService;
-    let peopleService: ActivitiPeopleService;
+    let activitiStartTaskComponent: StartTaskComponent;
+    let fixture: ComponentFixture<StartTaskComponent>;
+    let service: TaskListService;
+    let peopleService: PeopleService;
     let element: HTMLElement;
     let getformlistSpy: jasmine.Spy;
     let getWorkflowUsersSpy: jasmine.Spy;
@@ -60,18 +60,18 @@ describe('ActivitiStartTaskComponent', () => {
                 MdSelectModule
             ],
             declarations: [
-                ActivitiStartTaskComponent
+                StartTaskComponent
             ],
             providers: [
-                ActivitiTaskListService,
-                ActivitiPeopleService
+                TaskListService,
+                PeopleService
             ]
         }).compileComponents().then(() => {
             let translateService = TestBed.get(AlfrescoTranslationService);
             spyOn(translateService, 'addTranslationFolder').and.stub();
             spyOn(translateService.translate, 'get').and.callFake((key) => { return Observable.of(key); });
 
-            fixture = TestBed.createComponent(ActivitiStartTaskComponent);
+            fixture = TestBed.createComponent(StartTaskComponent);
             activitiStartTaskComponent = fixture.componentInstance;
             element = fixture.nativeElement;
             fixture.detectChanges();
@@ -79,8 +79,8 @@ describe('ActivitiStartTaskComponent', () => {
     }));
 
     beforeEach(() => {
-        service = fixture.debugElement.injector.get(ActivitiTaskListService);
-        peopleService = fixture.debugElement.injector.get(ActivitiPeopleService);
+        service = fixture.debugElement.injector.get(TaskListService);
+        peopleService = fixture.debugElement.injector.get(PeopleService);
         getformlistSpy = spyOn(service, 'getFormList').and.returnValue(Observable.of(fakeForms));
         getWorkflowUsersSpy = spyOn(peopleService, 'getWorkflowUsers').and.returnValue(Observable.of([
             {
@@ -101,8 +101,8 @@ describe('ActivitiStartTaskComponent', () => {
         ]));
     });
 
-    it('should create instance of ActivitiStartTaskComponent', () => {
-        expect(fixture.componentInstance instanceof ActivitiStartTaskComponent).toBe(true, 'should create ActivitiStartTaskComponent');
+    it('should create instance of StartTaskComponent', () => {
+        expect(fixture.componentInstance instanceof StartTaskComponent).toBe(true, 'should create StartTaskComponent');
     });
 
     it('should fetch fakeform on ngonint', () => {
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.ts
similarity index 86%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/start-task.component.ts
index db1de77781..2cef0bf86e 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.ts
@@ -18,17 +18,18 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core';
 import { Form } from '../models/form.model';
-import { StartTaskModel, User } from '../models/index';
+import { StartTaskModel } from '../models/start-task.model';
 import { TaskDetailsModel } from '../models/task-details.model';
-import { ActivitiPeopleService } from '../services/activiti-people.service';
-import { ActivitiTaskListService } from './../services/activiti-tasklist.service';
+import { User } from '../models/user.model';
+import { PeopleService } from '../services/people.service';
+import { TaskListService } from './../services/tasklist.service';
 
 @Component({
     selector: 'adf-start-task, activiti-start-task',
-    templateUrl: './activiti-start-task.component.html',
-    styleUrls: ['./activiti-start-task.component.css']
+    templateUrl: './start-task.component.html',
+    styleUrls: ['./start-task.component.css']
 })
-export class ActivitiStartTaskComponent implements OnInit {
+export class StartTaskComponent implements OnInit {
 
     @Input()
     appId: string;
@@ -55,8 +56,8 @@ export class ActivitiStartTaskComponent implements OnInit {
      * @param taskService
      */
     constructor(private translateService: AlfrescoTranslationService,
-                private taskService: ActivitiTaskListService,
-                private peopleService: ActivitiPeopleService,
+                private taskService: TaskListService,
+                private peopleService: PeopleService,
                 private logService: LogService) {
 
         if (translateService) {
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.css b/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.css
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.css
rename to ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.css
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.html b/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.html
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.html
rename to ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.html
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.spec.ts
similarity index 98%
rename from ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.spec.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.spec.ts
index 3207c54747..c4ad16e1f9 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.spec.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.spec.ts
@@ -24,7 +24,7 @@ import { ActivitiContentService } from 'ng2-activiti-form';
 import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 import { DataTableModule } from 'ng2-alfresco-datatable';
 import { Observable } from 'rxjs/Rx';
-import { TaskAttachmentListComponent } from './adf-task-attachment-list.component';
+import { TaskAttachmentListComponent } from './task-attachment-list.component';
 
 declare let jasmine: any;
 
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.ts
similarity index 97%
rename from ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.ts
index dbaaf6d849..cd3718bb68 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.ts
@@ -21,8 +21,8 @@ import { AlfrescoTranslationService, ContentService, ThumbnailService } from 'ng
 
 @Component({
     selector: 'adf-task-attachment-list',
-    styleUrls: ['./adf-task-attachment-list.component.css'],
-    templateUrl: './adf-task-attachment-list.component.html'
+    styleUrls: ['./task-attachment-list.component.css'],
+    templateUrl: './task-attachment-list.component.html'
 })
 export class TaskAttachmentListComponent implements OnChanges {
 
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.css b/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.css
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.css
rename to ng2-components/ng2-activiti-tasklist/src/components/task-details.component.css
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html b/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.html
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html
rename to ng2-components/ng2-activiti-tasklist/src/components/task-details.component.html
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.spec.ts
similarity index 93%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.spec.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/task-details.component.spec.ts
index 3b451f4fa8..394e53b07a 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.spec.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.spec.ts
@@ -25,17 +25,17 @@ import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 
 import { TaskDetailsModel } from '../models/task-details.model';
 import { noDataMock, taskDetailsMock, taskFormMock, tasksMock } from './../assets/task-details.mock';
-import { ActivitiPeopleService } from './../services/activiti-people.service';
-import { ActivitiTaskListService } from './../services/activiti-tasklist.service';
-import { ActivitiTaskDetailsComponent } from './activiti-task-details.component';
+import { PeopleService } from './../services/people.service';
+import { TaskListService } from './../services/tasklist.service';
+import { TaskDetailsComponent } from './task-details.component';
 
-describe('ActivitiTaskDetailsComponent', () => {
+describe('TaskDetailsComponent', () => {
 
     let componentHandler: any;
-    let service: ActivitiTaskListService;
+    let service: TaskListService;
     let formService: FormService;
-    let component: ActivitiTaskDetailsComponent;
-    let fixture: ComponentFixture<ActivitiTaskDetailsComponent>;
+    let component: TaskDetailsComponent;
+    let fixture: ComponentFixture<TaskDetailsComponent>;
     let getTaskDetailsSpy: jasmine.Spy;
     let getFormSpy: jasmine.Spy;
     let getTasksSpy: jasmine.Spy;
@@ -48,11 +48,11 @@ describe('ActivitiTaskDetailsComponent', () => {
                 ActivitiFormModule.forRoot()
             ],
             declarations: [
-                ActivitiTaskDetailsComponent
+                TaskDetailsComponent
             ],
             providers: [
-                ActivitiTaskListService,
-                ActivitiPeopleService
+                TaskListService,
+                PeopleService
             ],
             schemas: [ NO_ERRORS_SCHEMA ]
         }).compileComponents();
@@ -64,9 +64,9 @@ describe('ActivitiTaskDetailsComponent', () => {
 
     beforeEach(() => {
 
-        fixture = TestBed.createComponent(ActivitiTaskDetailsComponent);
+        fixture = TestBed.createComponent(TaskDetailsComponent);
         component = fixture.componentInstance;
-        service = fixture.debugElement.injector.get(ActivitiTaskListService);
+        service = fixture.debugElement.injector.get(TaskListService);
         formService = fixture.debugElement.injector.get(FormService);
 
         getTaskDetailsSpy = spyOn(service, 'getTaskDetails').and.returnValue(Observable.of(taskDetailsMock));
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.ts
similarity index 96%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/task-details.component.ts
index 83d4eeedc1..6e4395843b 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.ts
@@ -31,20 +31,20 @@ import { AlfrescoAuthenticationService, AlfrescoTranslationService, CardViewUpda
 import { TaskQueryRequestRepresentationModel } from '../models/filter.model';
 import { TaskDetailsModel } from '../models/task-details.model';
 import { User } from '../models/user.model';
-import { ActivitiTaskListService } from './../services/activiti-tasklist.service';
+import { TaskListService } from './../services/tasklist.service';
 
 declare var require: any;
 declare let dialogPolyfill: any;
 
 @Component({
     selector: 'adf-task-details, activiti-task-details',
-    templateUrl: './activiti-task-details.component.html',
-    styleUrls: ['./activiti-task-details.component.css'],
+    templateUrl: './task-details.component.html',
+    styleUrls: ['./task-details.component.css'],
     providers: [
         CardViewUpdateService
     ]
 })
-export class ActivitiTaskDetailsComponent implements OnInit, OnChanges {
+export class TaskDetailsComponent implements OnInit, OnChanges {
 
     @ViewChild('activiticomments')
     activiticomments: any;
@@ -144,7 +144,7 @@ export class ActivitiTaskDetailsComponent implements OnInit, OnChanges {
      */
     constructor(private translateService: AlfrescoTranslationService,
                 private activitiForm: FormService,
-                private activitiTaskList: ActivitiTaskListService,
+                private activitiTaskList: TaskListService,
                 private logService: LogService,
                 private authService: AlfrescoAuthenticationService,
                 private cardViewUpdateService: CardViewUpdateService
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.css b/ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.css
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.css
rename to ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.css
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.html b/ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.html
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.html
rename to ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.html
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.spec.ts
similarity index 96%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.spec.ts
index 624a6607d5..7eb19cf1cc 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.spec.ts
@@ -20,13 +20,13 @@ import { async } from '@angular/core/testing';
 import { LogServiceMock } from 'ng2-alfresco-core';
 import { Observable } from 'rxjs/Rx';
 import { FilterParamsModel, FilterRepresentationModel } from '../models/filter.model';
-import { ActivitiTaskListService } from '../services/activiti-tasklist.service';
-import { ActivitiFiltersComponent } from './activiti-filters.component';
+import { TaskListService } from '../services/tasklist.service';
+import { TaskFiltersComponent } from './task-filters.component';
 
-describe('ActivitiFiltersComponent', () => {
+describe('TaskFiltersComponent', () => {
 
-    let filterList: ActivitiFiltersComponent;
-    let activitiService: ActivitiTaskListService;
+    let filterList: TaskFiltersComponent;
+    let activitiService: TaskListService;
     let logService: LogServiceMock;
 
     let fakeGlobalFilter = [];
@@ -65,8 +65,8 @@ describe('ActivitiFiltersComponent', () => {
 
     beforeEach(() => {
         logService = new LogServiceMock();
-        activitiService = new ActivitiTaskListService(null, logService);
-        filterList = new ActivitiFiltersComponent(null, activitiService, logService);
+        activitiService = new TaskListService(null, logService);
+        filterList = new TaskFiltersComponent(null, activitiService, logService);
     });
 
     it('should return the filter task list', (done) => {
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.ts
similarity index 95%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.ts
index 94acfd7ca8..ec7578ad8a 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.ts
@@ -19,17 +19,17 @@ import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChange
 import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core';
 import { Observable, Observer } from 'rxjs/Rx';
 import { FilterParamsModel, FilterRepresentationModel } from '../models/filter.model';
-import { ActivitiTaskListService } from './../services/activiti-tasklist.service';
+import { TaskListService } from './../services/tasklist.service';
 
 declare let componentHandler: any;
 
 @Component({
     selector: 'adf-filters, activiti-filters',
-    templateUrl: './activiti-filters.component.html',
-    styleUrls: ['activiti-filters.component.css'],
-    providers: [ActivitiTaskListService]
+    templateUrl: './task-filters.component.html',
+    styleUrls: ['task-filters.component.css'],
+    providers: [TaskListService]
 })
-export class ActivitiFiltersComponent implements OnInit, OnChanges {
+export class TaskFiltersComponent implements OnInit, OnChanges {
 
     @Input()
     filterParam: FilterParamsModel;
@@ -60,7 +60,7 @@ export class ActivitiFiltersComponent implements OnInit, OnChanges {
     filters: FilterRepresentationModel [] = [];
 
     constructor(private translateService: AlfrescoTranslationService,
-                private activiti: ActivitiTaskListService,
+                private activiti: TaskListService,
                 private logService: LogService) {
         this.filter$ = new Observable<FilterRepresentationModel>(observer => this.filterObserver = observer).share();
 
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.html b/ng2-components/ng2-activiti-tasklist/src/components/task-header.component.html
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.html
rename to ng2-components/ng2-activiti-tasklist/src/components/task-header.component.html
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.scss b/ng2-components/ng2-activiti-tasklist/src/components/task-header.component.scss
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.scss
rename to ng2-components/ng2-activiti-tasklist/src/components/task-header.component.scss
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/task-header.component.spec.ts
similarity index 91%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.spec.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/task-header.component.spec.ts
index a7780a4e08..0fb021045e 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.spec.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/task-header.component.spec.ts
@@ -23,15 +23,15 @@ import { Observable } from 'rxjs/Rx';
 
 import { TaskDetailsModel } from '../models/task-details.model';
 import { taskDetailsMock } from './../assets/task-details.mock';
-import { ActivitiTaskListService } from './../services/activiti-tasklist.service';
-import { ActivitiTaskHeaderComponent } from './activiti-task-header.component';
+import { TaskListService } from './../services/tasklist.service';
+import { TaskHeaderComponent } from './task-header.component';
 
-describe('ActivitiTaskHeaderComponent', () => {
+describe('TaskHeaderComponent', () => {
 
-    let service: ActivitiTaskListService;
+    let service: TaskListService;
     let componentHandler: any;
-    let component: ActivitiTaskHeaderComponent;
-    let fixture: ComponentFixture<ActivitiTaskHeaderComponent>;
+    let component: TaskHeaderComponent;
+    let fixture: ComponentFixture<TaskHeaderComponent>;
     let debugElement: DebugElement;
 
     beforeEach(async(() => {
@@ -40,10 +40,10 @@ describe('ActivitiTaskHeaderComponent', () => {
                 CoreModule.forRoot()
             ],
             declarations: [
-                ActivitiTaskHeaderComponent
+                TaskHeaderComponent
             ],
             providers: [
-                ActivitiTaskListService,
+                TaskListService,
                 CardViewUpdateService
             ]
         }).compileComponents();
@@ -54,9 +54,9 @@ describe('ActivitiTaskHeaderComponent', () => {
     }));
 
     beforeEach(() => {
-        fixture = TestBed.createComponent(ActivitiTaskHeaderComponent);
+        fixture = TestBed.createComponent(TaskHeaderComponent);
         component = fixture.componentInstance;
-        service = TestBed.get(ActivitiTaskListService);
+        service = TestBed.get(TaskListService);
         debugElement = fixture.debugElement;
 
         component.taskDetails = new TaskDetailsModel(taskDetailsMock);
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/task-header.component.ts
similarity index 90%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/task-header.component.ts
index 539326579c..edbb19f920 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/task-header.component.ts
@@ -17,15 +17,15 @@
 
 import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
 import { AlfrescoTranslationService, CardViewDateItemModel, CardViewItem, CardViewTextItemModel, LogService } from 'ng2-alfresco-core';
-import { TaskDetailsModel } from '../models/index';
-import { ActivitiTaskListService } from './../services/activiti-tasklist.service';
+import { TaskDetailsModel } from '../models/task-details.model';
+import { TaskListService } from './../services/tasklist.service';
 
 @Component({
     selector: 'adf-task-header, activiti-task-header',
-    templateUrl: './activiti-task-header.component.html',
-    styleUrls: ['./activiti-task-header.component.scss']
+    templateUrl: './task-header.component.html',
+    styleUrls: ['./task-header.component.scss']
 })
-export class ActivitiTaskHeaderComponent implements OnChanges {
+export class TaskHeaderComponent implements OnChanges {
 
     @Input()
     formName: string = null;
@@ -40,7 +40,7 @@ export class ActivitiTaskHeaderComponent implements OnChanges {
     inEdit: boolean = false;
 
     constructor(private translateService: AlfrescoTranslationService,
-                private activitiTaskService: ActivitiTaskListService,
+                private activitiTaskService: TaskListService,
                 private logService: LogService) {
         if (translateService) {
             translateService.addTranslationFolder('ng2-activiti-tasklist', 'assets/ng2-activiti-tasklist');
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.css b/ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.css
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.css
rename to ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.css
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.html b/ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.html
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.html
rename to ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.html
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.spec.ts
similarity index 96%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.spec.ts
index a9bd19ca25..f8a7803ea1 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.spec.ts
@@ -22,10 +22,10 @@ import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 import { DataTableModule } from 'ng2-alfresco-datatable';
 import { DataRowEvent, ObjectDataRow, ObjectDataTableAdapter } from 'ng2-alfresco-datatable';
 import { Observable } from 'rxjs/Rx';
-import { ActivitiTaskListService } from '../services/activiti-tasklist.service';
-import { ActivitiTaskListComponent } from './activiti-tasklist.component';
+import { TaskListService } from '../services/tasklist.service';
+import { TaskListComponent } from './tasklist.component';
 
-describe('ActivitiTaskListComponent', () => {
+describe('TaskListComponent', () => {
 
     let fakeGlobalTask = [
         {
@@ -80,9 +80,9 @@ describe('ActivitiTaskListComponent', () => {
     };
 
     let componentHandler: any;
-    let component: ActivitiTaskListComponent;
-    let fixture: ComponentFixture<ActivitiTaskListComponent>;
-    let taskListService: ActivitiTaskListService;
+    let component: TaskListComponent;
+    let fixture: ComponentFixture<TaskListComponent>;
+    let taskListService: TaskListService;
 
     beforeEach(async(() => {
         TestBed.configureTestingModule({
@@ -92,10 +92,10 @@ describe('ActivitiTaskListComponent', () => {
                 MdProgressSpinnerModule
             ],
             declarations: [
-                ActivitiTaskListComponent
+                TaskListComponent
             ],
             providers: [
-                ActivitiTaskListService
+                TaskListService
             ]
         }).compileComponents();
 
@@ -106,10 +106,10 @@ describe('ActivitiTaskListComponent', () => {
 
     beforeEach(() => {
 
-        fixture = TestBed.createComponent(ActivitiTaskListComponent);
+        fixture = TestBed.createComponent(TaskListComponent);
         component = fixture.componentInstance;
 
-        taskListService = TestBed.get(ActivitiTaskListService);
+        taskListService = TestBed.get(TaskListService);
 
         componentHandler = jasmine.createSpyObj('componentHandler', [
             'upgradeAllRegistered',
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.ts
similarity index 95%
rename from ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.ts
index 2aa2f905cf..cdf1931357 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.ts
@@ -34,14 +34,14 @@ import {
     ObjectDataTableAdapter
 } from 'ng2-alfresco-datatable';
 import { TaskQueryRequestRepresentationModel } from '../models/filter.model';
-import { ActivitiTaskListService } from './../services/activiti-tasklist.service';
+import { TaskListService } from './../services/tasklist.service';
 
 @Component({
     selector: 'adf-tasklist, activiti-tasklist',
-    templateUrl: './activiti-tasklist.component.html',
-    styleUrls: ['./activiti-tasklist.component.css']
+    templateUrl: './tasklist.component.html',
+    styleUrls: ['./tasklist.component.css']
 })
-export class ActivitiTaskListComponent implements OnChanges, AfterContentInit {
+export class TaskListComponent implements OnChanges, AfterContentInit {
 
     requestNode: TaskQueryRequestRepresentationModel;
 
@@ -90,7 +90,7 @@ export class ActivitiTaskListComponent implements OnChanges, AfterContentInit {
      * This allows generating and displaying custom data sets (i.e. filtered out content).
      *
      * @type {boolean}
-     * @memberOf ActivitiTaskListComponent
+     * @memberOf TaskListComponent
      */
     hasCustomDataSource: boolean = false;
 
@@ -100,7 +100,7 @@ export class ActivitiTaskListComponent implements OnChanges, AfterContentInit {
     ];
 
     constructor(private translateService: AlfrescoTranslationService,
-                private taskListService: ActivitiTaskListService,
+                private taskListService: TaskListService,
                 private logService: LogService) {
         if (translateService) {
             translateService.addTranslationFolder('ng2-activiti-tasklist', 'assets/ng2-activiti-tasklist');
diff --git a/ng2-components/ng2-activiti-tasklist/src/models/index.ts b/ng2-components/ng2-activiti-tasklist/src/models/index.ts
deleted file mode 100644
index 890d8f4c5e..0000000000
--- a/ng2-components/ng2-activiti-tasklist/src/models/index.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-export * from './comment.model';
-export * from './filter.model';
-export * from './icon.model';
-export * from './user.model';
-export * from './task-details.model';
-export * from './task-details.event';
-export * from './user-event.model';
-export * from './start-task.model';
diff --git a/ng2-components/ng2-activiti-tasklist/src/services/activiti-people.service.spec.ts b/ng2-components/ng2-activiti-tasklist/src/services/people.service.spec.ts
similarity index 95%
rename from ng2-components/ng2-activiti-tasklist/src/services/activiti-people.service.spec.ts
rename to ng2-components/ng2-activiti-tasklist/src/services/people.service.spec.ts
index 2cc76e2421..5c07188f2c 100644
--- a/ng2-components/ng2-activiti-tasklist/src/services/activiti-people.service.spec.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/services/people.service.spec.ts
@@ -18,7 +18,7 @@
 import { TestBed } from '@angular/core/testing';
 import { CoreModule } from 'ng2-alfresco-core';
 import { User } from '../models/user.model';
-import { ActivitiPeopleService } from './activiti-people.service';
+import { PeopleService } from './people.service';
 
 declare let jasmine: any;
 
@@ -38,9 +38,9 @@ const secondInvolvedUser: User = new User({
 
 const fakeInvolveUserList: User[] = [firstInvolvedUser, secondInvolvedUser];
 
-describe('ActivitiPeopleService', () => {
+describe('PeopleService', () => {
 
-    let service: ActivitiPeopleService;
+    let service: PeopleService;
 
     beforeEach(() => {
         TestBed.configureTestingModule({
@@ -48,10 +48,10 @@ describe('ActivitiPeopleService', () => {
                 CoreModule.forRoot()
             ],
             providers: [
-                ActivitiPeopleService
+                PeopleService
             ]
         });
-        service = TestBed.get(ActivitiPeopleService);
+        service = TestBed.get(PeopleService);
     });
 
     describe('when user is logged in', () => {
diff --git a/ng2-components/ng2-activiti-tasklist/src/services/activiti-people.service.ts b/ng2-components/ng2-activiti-tasklist/src/services/people.service.ts
similarity index 98%
rename from ng2-components/ng2-activiti-tasklist/src/services/activiti-people.service.ts
rename to ng2-components/ng2-activiti-tasklist/src/services/people.service.ts
index 4efbdbfa7e..b379cb6b08 100644
--- a/ng2-components/ng2-activiti-tasklist/src/services/activiti-people.service.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/services/people.service.ts
@@ -22,7 +22,7 @@ import { Observable } from 'rxjs/Rx';
 import { User } from '../models/user.model';
 
 @Injectable()
-export class ActivitiPeopleService {
+export class PeopleService {
 
     constructor(private alfrescoJsApi: AlfrescoApiService,
                 private logService: LogService) {
diff --git a/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.spec.ts b/ng2-components/ng2-activiti-tasklist/src/services/tasklist.service.spec.ts
similarity index 99%
rename from ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.spec.ts
rename to ng2-components/ng2-activiti-tasklist/src/services/tasklist.service.spec.ts
index a5913a5d73..75c5356a7f 100644
--- a/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.spec.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/services/tasklist.service.spec.ts
@@ -39,13 +39,13 @@ import {
 import { Comment } from '../models/comment.model';
 import { FilterRepresentationModel, TaskQueryRequestRepresentationModel } from '../models/filter.model';
 import { TaskDetailsModel } from '../models/task-details.model';
-import { ActivitiTaskListService } from './activiti-tasklist.service';
+import { TaskListService } from './tasklist.service';
 
 declare let jasmine: any;
 
 describe('Activiti TaskList Service', () => {
 
-    let service: ActivitiTaskListService;
+    let service: TaskListService;
 
     beforeEach(async(() => {
         TestBed.configureTestingModule({
@@ -53,13 +53,13 @@ describe('Activiti TaskList Service', () => {
                 CoreModule.forRoot()
             ],
             providers: [
-                ActivitiTaskListService
+                TaskListService
             ]
         }).compileComponents();
     }));
 
     beforeEach(() => {
-        service = TestBed.get(ActivitiTaskListService);
+        service = TestBed.get(TaskListService);
     });
 
     beforeEach(() => {
diff --git a/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.ts b/ng2-components/ng2-activiti-tasklist/src/services/tasklist.service.ts
similarity index 99%
rename from ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.ts
rename to ng2-components/ng2-activiti-tasklist/src/services/tasklist.service.ts
index 5000d9a8a3..640aaff333 100644
--- a/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/services/tasklist.service.ts
@@ -28,7 +28,7 @@ import { TaskDetailsModel } from '../models/task-details.model';
 import { User } from '../models/user.model';
 
 @Injectable()
-export class ActivitiTaskListService {
+export class TaskListService {
 
     constructor(private apiService: AlfrescoApiService,
                 private logService: LogService) {
diff --git a/ng2-components/ng2-alfresco-core/README.md b/ng2-components/ng2-alfresco-core/README.md
index 6d666b238b..048832b35e 100644
--- a/ng2-components/ng2-alfresco-core/README.md
+++ b/ng2-components/ng2-alfresco-core/README.md
@@ -39,7 +39,7 @@
     + [1. Define the model for the custom type](#1-define-the-model-for-the-custom-type)
     + [2. Define the component for the custom type](#2-define-the-component-for-the-custom-type)
     + [3. Add you custom component to your module's entryComponents list](#3-add-you-custom-component-to-your-modules-entrycomponents-list)
-- [AlfrescoTranslationService](#alfrescotranslationservice)
+- [TranslationService](#translationservice)
 - [Renditions Service](#renditions-service)
 - [Build from sources](#build-from-sources)
 - [NPM scripts](#npm-scripts)
@@ -419,12 +419,12 @@ The preferences are bound to a particular `prefix` so the application can switch
 For example upon login you can set the `prefix` as current username:
 
 ```ts
-import { UserPreferencesService, AlfrescoAuthenticationService } from 'ng2-alfresco-core';
+import { UserPreferencesService, AuthenticationService } from 'ng2-alfresco-core';
 
 @Component({...})
 class AppComponent {
     constructor(private userPreferences: UserPreferencesService,
-                private authService: AlfrescoAuthenticationService) {
+                private authService: AuthenticationService) {
     }
 
     onLoggedIn() {
@@ -583,12 +583,12 @@ The authentication service is used inside the [login component](../ng2-alfresco-
 **app.component.ts**
 
 ```ts
-import { AlfrescoAuthenticationService } from 'ng2-alfresco-core';
+import { AuthenticationService } from 'ng2-alfresco-core';
 
 @Component({...})
 export class AppComponent {
-    constructor(authService: AlfrescoAuthenticationService) {
-        this.alfrescoAuthenticationService.login('admin', 'admin').subscribe(
+    constructor(authService: AuthenticationService) {
+        this.AuthenticationService.login('admin', 'admin').subscribe(
             token => {
                 console.log(token);
             },
@@ -624,7 +624,7 @@ The CardViewComponent is a configurable property list renderer. You define the p
 ### Editing
 
 The card view can optionally allow its properties to be edited. You can control the editing of the properties in two level.
-- **global level** - *via the editable paramter of the adf-card-view component*
+- **global level** - *via the editable paramter of the card-view.component*
 - **property level** -  *in each property via the editable attribute*
 
 If you set the global editable parameter to false, no properties can be edited regardless of what is set inside the property.
@@ -790,14 +790,14 @@ For Angular to be able to load your custom component dynamically, you have to re
 export class MyModule {}
 ```
 
-## AlfrescoTranslationService
+## TranslationService
 
 In order to enable localisation support you will need creating a `/resources/i18n/en.json` file 
 and registering path to it's parent `i18n` folder:
 
 ```ts
 class MainApplication {
-    constructor(translateService: AlfrescoTranslationService) {
+    constructor(translateService: TranslationService) {
         translateService.addTranslationFolder('app', 'resources');
     }
 }
@@ -808,7 +808,7 @@ Imagine you got a language picker that invokes `onLanguageClicked` method:
 
 ```ts
 class MyComponent {
-    constructor(private translateService: AlfrescoTranslationService) {
+    constructor(private translateService: TranslationService) {
     }
 
     onLanguageClicked(lang: string) {
@@ -821,7 +821,7 @@ It is also possible providing custom translations for existing components by ove
 
 ```ts
 class MyComponent {
-    constructor(private translateService: AlfrescoTranslationService) {
+    constructor(private translateService: TranslationService) {
         translateService.addTranslationFolder(
             'ng2-alfresco-login', 
             'i18n/custom-translation/alfresco-login'
diff --git a/ng2-components/ng2-alfresco-core/index.ts b/ng2-components/ng2-alfresco-core/index.ts
index d185691199..e9ca504161 100644
--- a/ng2-components/ng2-alfresco-core/index.ts
+++ b/ng2-components/ng2-alfresco-core/index.ts
@@ -24,34 +24,57 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
 import { CollapsableModule } from './src/components/collapsable/collapsable.module';
 import { ContextMenuModule } from './src/components/context-menu/context-menu.module';
-import { AdfToolbarComponent } from './src/components/toolbar/toolbar.component';
+import { ToolbarComponent } from './src/components/toolbar/toolbar.component';
 import { CardViewModule } from './src/components/view/card-view.module';
 import { MaterialModule } from './src/material.module';
+
+import { AlfrescoApiService } from './src/services/alfresco-api.service';
+import { AlfrescoContentService } from './src/services/alfresco-content.service';
+import { AlfrescoSettingsService } from './src/services/alfresco-settings.service';
 import { AppConfigModule } from './src/services/app-config.service';
+import { AppConfigService } from './src/services/app-config.service';
+import { InitAppConfigServiceProvider } from './src/services/app-config.service';
+import { AuthGuardBpm } from './src/services/auth-guard-bpm.service';
+import { AuthGuardEcm } from './src/services/auth-guard-ecm.service';
+import { AuthGuard } from './src/services/auth-guard.service';
+import { AuthenticationService } from './src/services/authentication.service';
+import { ContentService } from './src/services/content.service';
+import { CookieService } from './src/services/cookie.service';
+import { LogService } from './src/services/log.service';
+import { LogServiceMock } from './src/services/log.service';
+import { NotificationService } from './src/services/notification.service';
+import { RenditionsService } from './src/services/renditions.service';
+import { StorageService } from './src/services/storage.service';
+import { ThumbnailService } from './src/services/thumbnail.service';
+import { AlfrescoTranslateLoader } from './src/services/translate-loader.service';
+import { TranslationService } from './src/services/translation.service';
+import { UploadService } from './src/services/upload.service';
 import { UserPreferencesService } from './src/services/user-preferences.service';
 
-import {
-    AlfrescoApiService,
-    AlfrescoAuthenticationService,
-    AlfrescoContentService,
-    AlfrescoSettingsService,
-    AlfrescoTranslateLoader,
-    AlfrescoTranslationService,
-    AppConfigService,
-    AuthGuard,
-    AuthGuardBpm,
-    AuthGuardEcm,
-    ContentService,
-    CookieService,
-    InitAppConfigServiceProvider,
-    LogService,
-    LogServiceMock,
-    NotificationService,
-    RenditionsService,
-    StorageService,
-    ThumbnailService,
-    UploadService
-} from './src/services/index';
+export { ContentService } from './src/services/content.service';
+export { StorageService } from './src/services/storage.service';
+export { CookieService } from './src/services/cookie.service';
+export { AlfrescoApiService } from './src/services/alfresco-api.service';
+export { AlfrescoSettingsService } from './src/services/alfresco-settings.service';
+export { AlfrescoContentService } from './src/services/alfresco-content.service';
+export { RenditionsService } from './src/services/renditions.service';
+export { AuthGuard } from './src/services/auth-guard.service';
+export { AuthGuardEcm } from './src/services/auth-guard-ecm.service';
+export { AuthGuardBpm } from './src/services/auth-guard-bpm.service';
+export { NotificationService } from './src/services/notification.service';
+export { LogService } from './src/services/log.service';
+export { LogServiceMock } from './src/services/log.service';
+export { AuthenticationService } from './src/services/authentication.service';
+export { TranslationService } from './src/services/translation.service';
+export { AlfrescoTranslateLoader } from './src/services/translate-loader.service';
+export { AppConfigService } from './src/services/app-config.service';
+export { InitAppConfigServiceProvider } from './src/services/app-config.service';
+export { ThumbnailService } from './src/services/thumbnail.service';
+export { UploadService } from './src/services/upload.service';
+export { CardViewUpdateService } from './src/services/card-view-update.service';
+export { UpdateNotification } from './src/services/card-view-update.service';
+export { AppConfigModule } from './src/services/app-config.service';
+export { UserPreferencesService } from './src/services/user-preferences.service';
 
 import { DataColumnListComponent } from './src/components/data-column/data-column-list.component';
 import { DataColumnComponent } from './src/components/data-column/data-column.component';
@@ -68,9 +91,8 @@ import { MDLDirective } from './src/components/material/mdl-upgrade-element.dire
 export { ContextMenuModule } from './src/components/context-menu/context-menu.module';
 export { CardViewModule } from './src/components/view/card-view.module';
 export { CollapsableModule } from './src/components/collapsable/collapsable.module';
-export { UserPreferencesService } from './src/services/user-preferences.service';
 export { CardViewItem } from './src/interface/card-view-item.interface';
-export * from './src/services/index';
+
 export * from './src/components/data-column/data-column.component';
 export * from './src/components/data-column/data-column-list.component';
 export * from './src/directives/upload.directive';
@@ -134,7 +156,7 @@ export function createTranslateLoader(http: Http, logService: LogService) {
         DataColumnListComponent,
         FileSizePipe,
         HighlightPipe,
-        AdfToolbarComponent
+        ToolbarComponent
     ],
     providers: providers(),
     exports: [
@@ -154,7 +176,7 @@ export function createTranslateLoader(http: Http, logService: LogService) {
         DataColumnListComponent,
         FileSizePipe,
         HighlightPipe,
-        AdfToolbarComponent
+        ToolbarComponent
     ]
 })
 export class CoreModule {
diff --git a/ng2-components/ng2-alfresco-core/src/components/toolbar/toolbar.component.ts b/ng2-components/ng2-alfresco-core/src/components/toolbar/toolbar.component.ts
index ab050e49d4..00ac80c681 100644
--- a/ng2-components/ng2-alfresco-core/src/components/toolbar/toolbar.component.ts
+++ b/ng2-components/ng2-alfresco-core/src/components/toolbar/toolbar.component.ts
@@ -24,7 +24,7 @@ import { ChangeDetectionStrategy, Component, Input, ViewEncapsulation } from '@a
     changeDetection: ChangeDetectionStrategy.OnPush,
     encapsulation: ViewEncapsulation.None
 })
-export class AdfToolbarComponent {
+export class ToolbarComponent {
 
     @Input()
     title: string = '';
diff --git a/ng2-components/ng2-alfresco-core/src/components/view/adf-card-view-content-proxy.directive.ts b/ng2-components/ng2-alfresco-core/src/components/view/card-view-content-proxy.directive.ts
similarity index 94%
rename from ng2-components/ng2-alfresco-core/src/components/view/adf-card-view-content-proxy.directive.ts
rename to ng2-components/ng2-alfresco-core/src/components/view/card-view-content-proxy.directive.ts
index 00e65a40f7..8bc3d6a19b 100644
--- a/ng2-components/ng2-alfresco-core/src/components/view/adf-card-view-content-proxy.directive.ts
+++ b/ng2-components/ng2-alfresco-core/src/components/view/card-view-content-proxy.directive.ts
@@ -20,6 +20,6 @@ import { Directive, ViewContainerRef } from '@angular/core';
 @Directive({
     selector: '[adf-card-view-content-proxy]'
 })
-export class AdfCardViewContentProxyDirective {
+export class CardViewContentProxyDirective {
     constructor(public viewContainerRef: ViewContainerRef) { }
 }
diff --git a/ng2-components/ng2-alfresco-core/src/components/view/adf-card-view-dateitem.component.html b/ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.html
similarity index 100%
rename from ng2-components/ng2-alfresco-core/src/components/view/adf-card-view-dateitem.component.html
rename to ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.html
diff --git a/ng2-components/ng2-alfresco-core/src/components/view/adf-card-view-dateitem.component.scss b/ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.scss
similarity index 100%
rename from ng2-components/ng2-alfresco-core/src/components/view/adf-card-view-dateitem.component.scss
rename to ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.scss
diff --git a/ng2-components/ng2-alfresco-core/src/components/view/adf-card-view-dateitem.component.spec.ts b/ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.spec.ts
similarity index 97%
rename from ng2-components/ng2-alfresco-core/src/components/view/adf-card-view-dateitem.component.spec.ts
rename to ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.spec.ts
index f491f7a9f8..a1b3dfdfb3 100644
--- a/ng2-components/ng2-alfresco-core/src/components/view/adf-card-view-dateitem.component.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.spec.ts
@@ -19,8 +19,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { MdDatepickerModule, MdInputModule, MdNativeDateModule } from '@angular/material';
 import { By } from '@angular/platform-browser';
 import { CardViewDateItemModel } from '../../models/card-view-dateitem.model';
-import { CardViewUpdateService } from '../../services/adf-card-view-update.service';
-import { CardViewDateItemComponent } from './adf-card-view-dateitem.component';
+import { CardViewUpdateService } from '../../services/card-view-update.service';
+import { CardViewDateItemComponent } from './card-view-dateitem.component';
 
 describe('CardViewDateItemComponent', () => {
 
diff --git a/ng2-components/ng2-alfresco-core/src/components/view/adf-card-view-dateitem.component.ts b/ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.ts
similarity index 87%
rename from ng2-components/ng2-alfresco-core/src/components/view/adf-card-view-dateitem.component.ts
rename to ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.ts
index 40f4822bc9..f3c8aa426b 100644
--- a/ng2-components/ng2-alfresco-core/src/components/view/adf-card-view-dateitem.component.ts
+++ b/ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.ts
@@ -18,12 +18,12 @@
 import { Component, Input, ViewChild } from '@angular/core';
 import { MdDatepicker } from '@angular/material';
 import { CardViewDateItemModel } from '../../models/card-view-dateitem.model';
-import { CardViewUpdateService } from '../../services/adf-card-view-update.service';
+import { CardViewUpdateService } from '../../services/card-view-update.service';
 
 @Component({
     selector: 'adf-card-view-dateitem',
-    templateUrl: './adf-card-view-dateitem.component.html',
-    styleUrls: ['./adf-card-view-dateitem.component.scss']
+    templateUrl: './card-view-dateitem.component.html',
+    styleUrls: ['./card-view-dateitem.component.scss']
 })
 export class CardViewDateItemComponent {
     @Input()
diff --git a/ng2-components/ng2-alfresco-core/src/components/view/adf-card-view-item-dispatcher.component.spec.ts b/ng2-components/ng2-alfresco-core/src/components/view/card-view-item-dispatcher.component.spec.ts
similarity index 95%
rename from ng2-components/ng2-alfresco-core/src/components/view/adf-card-view-item-dispatcher.component.spec.ts
rename to ng2-components/ng2-alfresco-core/src/components/view/card-view-item-dispatcher.component.spec.ts
index b0e598a3cc..2dc53dc1e0 100644
--- a/ng2-components/ng2-alfresco-core/src/components/view/adf-card-view-item-dispatcher.component.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/components/view/card-view-item-dispatcher.component.spec.ts
@@ -20,8 +20,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing';
 import { CardViewItem } from '../../interface/card-view-item.interface';
-import { AdfCardViewContentProxyDirective } from './adf-card-view-content-proxy.directive';
-import { CardViewItemDispatcherComponent } from './adf-card-view-item-dispatcher.component';
+import { CardViewContentProxyDirective } from './card-view-content-proxy.directive';
+import { CardViewItemDispatcherComponent } from './card-view-item-dispatcher.component';
 
 @Component({
     selector: 'whatever-you-want-to-have',
@@ -43,7 +43,7 @@ describe('CardViewItemDispatcherComponent', () => {
             declarations: [
                 CardViewItemDispatcherComponent,
                 CardViewShinyCustomElementItemComponent,
-                AdfCardViewContentProxyDirective
+                CardViewContentProxyDirective
             ],
             providers: []
         });
diff --git a/ng2-components/ng2-alfresco-core/src/components/view/adf-card-view-item-dispatcher.component.ts b/ng2-components/ng2-alfresco-core/src/components/view/card-view-item-dispatcher.component.ts
similarity index 93%
rename from ng2-components/ng2-alfresco-core/src/components/view/adf-card-view-item-dispatcher.component.ts
rename to ng2-components/ng2-alfresco-core/src/components/view/card-view-item-dispatcher.component.ts
index 2028708fdf..8d8926b5fb 100644
--- a/ng2-components/ng2-alfresco-core/src/components/view/adf-card-view-item-dispatcher.component.ts
+++ b/ng2-components/ng2-alfresco-core/src/components/view/card-view-item-dispatcher.component.ts
@@ -24,7 +24,7 @@ import {
     ViewChild
 } from '@angular/core';
 import { CardViewItem } from '../../interface/card-view-item.interface';
-import { AdfCardViewContentProxyDirective } from './adf-card-view-content-proxy.directive';
+import { CardViewContentProxyDirective } from './card-view-content-proxy.directive';
 
 @Component({
     selector: 'adf-card-view-item-dispatcher',
@@ -37,8 +37,8 @@ export class CardViewItemDispatcherComponent implements OnChanges {
     @Input()
     editable: boolean;
 
-    @ViewChild(AdfCardViewContentProxyDirective)
-    private content: AdfCardViewContentProxyDirective;
+    @ViewChild(CardViewContentProxyDirective)
+    private content: CardViewContentProxyDirective;
 
     private loaded: boolean = false;
     private componentReference: any = null;
diff --git a/ng2-components/ng2-alfresco-core/src/components/view/adf-card-view-textitem.component.html b/ng2-components/ng2-alfresco-core/src/components/view/card-view-textitem.component.html
similarity index 100%
rename from ng2-components/ng2-alfresco-core/src/components/view/adf-card-view-textitem.component.html
rename to ng2-components/ng2-alfresco-core/src/components/view/card-view-textitem.component.html
diff --git a/ng2-components/ng2-alfresco-core/src/components/view/adf-card-view-textitem.component.scss b/ng2-components/ng2-alfresco-core/src/components/view/card-view-textitem.component.scss
similarity index 100%
rename from ng2-components/ng2-alfresco-core/src/components/view/adf-card-view-textitem.component.scss
rename to ng2-components/ng2-alfresco-core/src/components/view/card-view-textitem.component.scss
diff --git a/ng2-components/ng2-alfresco-core/src/components/view/adf-card-view-textitem.component.spec.ts b/ng2-components/ng2-alfresco-core/src/components/view/card-view-textitem.component.spec.ts
similarity index 97%
rename from ng2-components/ng2-alfresco-core/src/components/view/adf-card-view-textitem.component.spec.ts
rename to ng2-components/ng2-alfresco-core/src/components/view/card-view-textitem.component.spec.ts
index 621d5ff77d..9de4d2580f 100644
--- a/ng2-components/ng2-alfresco-core/src/components/view/adf-card-view-textitem.component.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/components/view/card-view-textitem.component.spec.ts
@@ -21,8 +21,8 @@ import { MdDatepickerModule, MdIconModule, MdInputModule, MdNativeDateModule } f
 import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { CardViewTextItemModel } from '../../models/card-view-textitem.model';
-import { CardViewUpdateService } from '../../services/adf-card-view-update.service';
-import { CardViewTextItemComponent } from './adf-card-view-textitem.component';
+import { CardViewUpdateService } from '../../services/card-view-update.service';
+import { CardViewTextItemComponent } from './card-view-textitem.component';
 
 describe('CardViewTextItemComponent', () => {
 
diff --git a/ng2-components/ng2-alfresco-core/src/components/view/adf-card-view-textitem.component.ts b/ng2-components/ng2-alfresco-core/src/components/view/card-view-textitem.component.ts
similarity index 89%
rename from ng2-components/ng2-alfresco-core/src/components/view/adf-card-view-textitem.component.ts
rename to ng2-components/ng2-alfresco-core/src/components/view/card-view-textitem.component.ts
index 55fb177469..4a85597b1a 100644
--- a/ng2-components/ng2-alfresco-core/src/components/view/adf-card-view-textitem.component.ts
+++ b/ng2-components/ng2-alfresco-core/src/components/view/card-view-textitem.component.ts
@@ -17,12 +17,12 @@
 
 import { Component, Input, OnChanges, ViewChild } from '@angular/core';
 import { CardViewTextItemModel } from '../../models/card-view-textitem.model';
-import { CardViewUpdateService } from '../../services/adf-card-view-update.service';
+import { CardViewUpdateService } from '../../services/card-view-update.service';
 
 @Component({
     selector: 'adf-card-view-textitem',
-    templateUrl: './adf-card-view-textitem.component.html',
-    styleUrls: ['./adf-card-view-textitem.component.scss']
+    templateUrl: './card-view-textitem.component.html',
+    styleUrls: ['./card-view-textitem.component.scss']
 })
 export class CardViewTextItemComponent implements OnChanges {
     @Input()
diff --git a/ng2-components/ng2-alfresco-core/src/components/view/adf-card-view.component.html b/ng2-components/ng2-alfresco-core/src/components/view/card-view.component.html
similarity index 100%
rename from ng2-components/ng2-alfresco-core/src/components/view/adf-card-view.component.html
rename to ng2-components/ng2-alfresco-core/src/components/view/card-view.component.html
diff --git a/ng2-components/ng2-alfresco-core/src/components/view/adf-card-view.component.scss b/ng2-components/ng2-alfresco-core/src/components/view/card-view.component.scss
similarity index 100%
rename from ng2-components/ng2-alfresco-core/src/components/view/adf-card-view.component.scss
rename to ng2-components/ng2-alfresco-core/src/components/view/card-view.component.scss
diff --git a/ng2-components/ng2-alfresco-core/src/components/view/adf-card-view.component.spec.ts b/ng2-components/ng2-alfresco-core/src/components/view/card-view.component.spec.ts
similarity index 90%
rename from ng2-components/ng2-alfresco-core/src/components/view/adf-card-view.component.spec.ts
rename to ng2-components/ng2-alfresco-core/src/components/view/card-view.component.spec.ts
index 1bb1d6e5e0..e1c51f325e 100644
--- a/ng2-components/ng2-alfresco-core/src/components/view/adf-card-view.component.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/components/view/card-view.component.spec.ts
@@ -22,12 +22,12 @@ import { By } from '@angular/platform-browser';
 import { BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing';
 import { CardViewDateItemModel } from '../../models/card-view-dateitem.model';
 import { CardViewTextItemModel } from '../../models/card-view-textitem.model';
-import { CardViewUpdateService } from '../../services/adf-card-view-update.service';
-import { AdfCardViewContentProxyDirective } from './adf-card-view-content-proxy.directive';
-import { CardViewDateItemComponent } from './adf-card-view-dateitem.component';
-import { CardViewItemDispatcherComponent } from './adf-card-view-item-dispatcher.component';
-import { CardViewTextItemComponent } from './adf-card-view-textitem.component';
-import { CardViewComponent } from './adf-card-view.component';
+import { CardViewUpdateService } from '../../services/card-view-update.service';
+import { CardViewContentProxyDirective } from './card-view-content-proxy.directive';
+import { CardViewDateItemComponent } from './card-view-dateitem.component';
+import { CardViewItemDispatcherComponent } from './card-view-item-dispatcher.component';
+import { CardViewTextItemComponent } from './card-view-textitem.component';
+import { CardViewComponent } from './card-view.component';
 
 describe('AdfCardView', () => {
 
@@ -46,7 +46,7 @@ describe('AdfCardView', () => {
             declarations: [
                 CardViewComponent,
                 CardViewItemDispatcherComponent,
-                AdfCardViewContentProxyDirective,
+                CardViewContentProxyDirective,
                 CardViewTextItemComponent,
                 CardViewDateItemComponent
             ],
diff --git a/ng2-components/ng2-alfresco-core/src/components/view/adf-card-view.component.ts b/ng2-components/ng2-alfresco-core/src/components/view/card-view.component.ts
similarity index 90%
rename from ng2-components/ng2-alfresco-core/src/components/view/adf-card-view.component.ts
rename to ng2-components/ng2-alfresco-core/src/components/view/card-view.component.ts
index 0aca314346..fd65f8c211 100644
--- a/ng2-components/ng2-alfresco-core/src/components/view/adf-card-view.component.ts
+++ b/ng2-components/ng2-alfresco-core/src/components/view/card-view.component.ts
@@ -20,8 +20,8 @@ import { CardViewItem } from '../../interface/card-view-item.interface';
 
 @Component({
     selector: 'adf-card-view',
-    templateUrl: './adf-card-view.component.html',
-    styleUrls: ['./adf-card-view.component.scss']
+    templateUrl: './card-view.component.html',
+    styleUrls: ['./card-view.component.scss']
 })
 export class CardViewComponent {
     @Input()
diff --git a/ng2-components/ng2-alfresco-core/src/components/view/card-view.module.ts b/ng2-components/ng2-alfresco-core/src/components/view/card-view.module.ts
index 10ac39bdc3..4f0a9e0a92 100644
--- a/ng2-components/ng2-alfresco-core/src/components/view/card-view.module.ts
+++ b/ng2-components/ng2-alfresco-core/src/components/view/card-view.module.ts
@@ -19,11 +19,11 @@ import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { MdButtonModule, MdDatepickerModule, MdIconModule, MdInputModule, MdNativeDateModule } from '@angular/material';
-import { AdfCardViewContentProxyDirective } from './adf-card-view-content-proxy.directive';
-import { CardViewDateItemComponent } from './adf-card-view-dateitem.component';
-import { CardViewItemDispatcherComponent } from './adf-card-view-item-dispatcher.component';
-import { CardViewTextItemComponent } from './adf-card-view-textitem.component';
-import { CardViewComponent } from './adf-card-view.component';
+import { CardViewContentProxyDirective } from './card-view-content-proxy.directive';
+import { CardViewDateItemComponent } from './card-view-dateitem.component';
+import { CardViewItemDispatcherComponent } from './card-view-item-dispatcher.component';
+import { CardViewTextItemComponent } from './card-view-textitem.component';
+import { CardViewComponent } from './card-view.component';
 
 @NgModule({
     imports: [
@@ -38,7 +38,7 @@ import { CardViewComponent } from './adf-card-view.component';
     declarations: [
         CardViewComponent,
         CardViewItemDispatcherComponent,
-        AdfCardViewContentProxyDirective,
+        CardViewContentProxyDirective,
         CardViewTextItemComponent,
         CardViewDateItemComponent
     ],
diff --git a/ng2-components/ng2-alfresco-core/src/services/alfresco-content.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/alfresco-content.service.spec.ts
index a6134db5fb..f75ed38aca 100644
--- a/ng2-components/ng2-alfresco-core/src/services/alfresco-content.service.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/alfresco-content.service.spec.ts
@@ -18,7 +18,7 @@
 import { async, TestBed } from '@angular/core/testing';
 import { CookieServiceMock } from './../assets/cookie.service.mock';
 import { AlfrescoApiService } from './alfresco-api.service';
-import { AlfrescoAuthenticationService } from './alfresco-authentication.service';
+import { AuthenticationService } from './authentication.service';
 import { AlfrescoContentService } from './alfresco-content.service';
 import { AlfrescoSettingsService } from './alfresco-settings.service';
 import { AppConfigModule } from './app-config.service';
@@ -32,7 +32,7 @@ declare let jasmine: any;
 describe('AlfrescoContentService', () => {
 
     let contentService: AlfrescoContentService;
-    let authService: AlfrescoAuthenticationService;
+    let authService: AuthenticationService;
     let settingsService: AlfrescoSettingsService;
     let storage: StorageService;
     let node: any;
@@ -49,7 +49,7 @@ describe('AlfrescoContentService', () => {
             providers: [
                 AlfrescoApiService,
                 AlfrescoContentService,
-                AlfrescoAuthenticationService,
+                AuthenticationService,
                 AlfrescoSettingsService,
                 StorageService,
                 UserPreferencesService,
@@ -60,7 +60,7 @@ describe('AlfrescoContentService', () => {
     }));
 
     beforeEach(() => {
-        authService = TestBed.get(AlfrescoAuthenticationService);
+        authService = TestBed.get(AuthenticationService);
         settingsService = TestBed.get(AlfrescoSettingsService);
         contentService = TestBed.get(AlfrescoContentService);
         storage = TestBed.get(StorageService);
diff --git a/ng2-components/ng2-alfresco-core/src/services/alfresco-content.service.ts b/ng2-components/ng2-alfresco-core/src/services/alfresco-content.service.ts
index 55307363a4..865174bf68 100644
--- a/ng2-components/ng2-alfresco-core/src/services/alfresco-content.service.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/alfresco-content.service.ts
@@ -19,7 +19,7 @@ import { Injectable } from '@angular/core';
 import { Observable, Subject } from 'rxjs/Rx';
 import { FolderCreatedEvent } from '../events/folder-created.event';
 import { AlfrescoApiService } from './alfresco-api.service';
-import { AlfrescoAuthenticationService } from './alfresco-authentication.service';
+import { AuthenticationService } from './authentication.service';
 import { LogService } from './log.service';
 
 @Injectable()
@@ -27,7 +27,7 @@ export class AlfrescoContentService {
 
     folderCreated: Subject<FolderCreatedEvent> = new Subject<FolderCreatedEvent>();
 
-    constructor(public authService: AlfrescoAuthenticationService,
+    constructor(public authService: AuthenticationService,
                 public apiService: AlfrescoApiService,
                 private logService: LogService) {
     }
diff --git a/ng2-components/ng2-alfresco-core/src/services/auth-guard-bpm.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/auth-guard-bpm.service.spec.ts
index 61b89e2a34..08753df950 100644
--- a/ng2-components/ng2-alfresco-core/src/services/auth-guard-bpm.service.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/auth-guard-bpm.service.spec.ts
@@ -21,7 +21,7 @@ import { RouterTestingModule } from '@angular/router/testing';
 
 import { CookieServiceMock } from './../assets/cookie.service.mock';
 import { AlfrescoApiService } from './alfresco-api.service';
-import { AlfrescoAuthenticationService } from './alfresco-authentication.service';
+import { AuthenticationService } from './authentication.service';
 import { AlfrescoSettingsService } from './alfresco-settings.service';
 import { AppConfigModule } from './app-config.service';
 import { AuthGuardBpm } from './auth-guard-bpm.service';
@@ -44,7 +44,7 @@ describe('AuthGuardService BPM', () => {
                 AuthGuardBpm,
                 AlfrescoSettingsService,
                 AlfrescoApiService,
-                AlfrescoAuthenticationService,
+                AuthenticationService,
                 StorageService,
                 UserPreferencesService,
                 { provide: CookieService, useClass: CookieServiceMock },
@@ -54,7 +54,7 @@ describe('AuthGuardService BPM', () => {
     }));
 
     it('if the alfresco js api is logged in should canActivate be true',
-        async(inject([AuthGuardBpm, Router, AlfrescoSettingsService, StorageService, AlfrescoAuthenticationService], (auth, router, settingsService, storage, authService) => {
+        async(inject([AuthGuardBpm, Router, AlfrescoSettingsService, StorageService, AuthenticationService], (auth, router, settingsService, storage, authService) => {
             spyOn(router, 'navigate');
 
             authService.isBpmLoggedIn = () => {
@@ -67,7 +67,7 @@ describe('AuthGuardService BPM', () => {
     );
 
     it('if the alfresco js api is NOT logged in should canActivate be false',
-        async(inject([AuthGuardBpm, Router, AlfrescoSettingsService, StorageService, AlfrescoAuthenticationService], (auth, router, settingsService, storage, authService) => {
+        async(inject([AuthGuardBpm, Router, AlfrescoSettingsService, StorageService, AuthenticationService], (auth, router, settingsService, storage, authService) => {
 
             spyOn(router, 'navigate');
 
diff --git a/ng2-components/ng2-alfresco-core/src/services/auth-guard-bpm.service.ts b/ng2-components/ng2-alfresco-core/src/services/auth-guard-bpm.service.ts
index 2d6b376f92..f80006f8ca 100644
--- a/ng2-components/ng2-alfresco-core/src/services/auth-guard-bpm.service.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/auth-guard-bpm.service.ts
@@ -22,11 +22,11 @@ import {
   RouterStateSnapshot
 } from '@angular/router';
 
-import { AlfrescoAuthenticationService } from './alfresco-authentication.service';
+import { AuthenticationService } from './authentication.service';
 
 @Injectable()
 export class AuthGuardBpm implements CanActivate, CanActivateChild {
-    constructor(private authService: AlfrescoAuthenticationService, private router: Router) {}
+    constructor(private authService: AuthenticationService, private router: Router) {}
 
     canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
         // let url: string = state.url;
diff --git a/ng2-components/ng2-alfresco-core/src/services/auth-guard-ecm.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/auth-guard-ecm.service.spec.ts
index eef0fa5a35..d7489bb0f2 100644
--- a/ng2-components/ng2-alfresco-core/src/services/auth-guard-ecm.service.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/auth-guard-ecm.service.spec.ts
@@ -21,7 +21,7 @@ import { RouterTestingModule } from '@angular/router/testing';
 
 import { CookieServiceMock } from './../assets/cookie.service.mock';
 import { AlfrescoApiService } from './alfresco-api.service';
-import { AlfrescoAuthenticationService } from './alfresco-authentication.service';
+import { AuthenticationService } from './authentication.service';
 import { AlfrescoSettingsService } from './alfresco-settings.service';
 import { AppConfigModule } from './app-config.service';
 import { AuthGuardEcm } from './auth-guard-ecm.service';
@@ -44,7 +44,7 @@ describe('AuthGuardService ECM', () => {
                 AuthGuardEcm,
                 AlfrescoSettingsService,
                 AlfrescoApiService,
-                AlfrescoAuthenticationService,
+                AuthenticationService,
                 StorageService,
                 UserPreferencesService,
                 { provide: CookieService, useClass: CookieServiceMock },
@@ -54,7 +54,7 @@ describe('AuthGuardService ECM', () => {
     }));
 
     it('if the alfresco js api is logged in should canActivate be true',
-        async(inject([AuthGuardEcm, Router, AlfrescoSettingsService, StorageService, AlfrescoAuthenticationService], (auth, router, settingsService, storage, authService) => {
+        async(inject([AuthGuardEcm, Router, AlfrescoSettingsService, StorageService, AuthenticationService], (auth, router, settingsService, storage, authService) => {
             spyOn(router, 'navigate');
 
             authService.isEcmLoggedIn = () => {
@@ -67,7 +67,7 @@ describe('AuthGuardService ECM', () => {
     );
 
     it('if the alfresco js api is NOT logged in should canActivate be false',
-        async(inject([AuthGuardEcm, Router, AlfrescoSettingsService, StorageService, AlfrescoAuthenticationService], (auth, router, settingsService, storage, authService) => {
+        async(inject([AuthGuardEcm, Router, AlfrescoSettingsService, StorageService, AuthenticationService], (auth, router, settingsService, storage, authService) => {
 
             spyOn(router, 'navigate');
 
diff --git a/ng2-components/ng2-alfresco-core/src/services/auth-guard-ecm.service.ts b/ng2-components/ng2-alfresco-core/src/services/auth-guard-ecm.service.ts
index 786b177489..fad465cad4 100644
--- a/ng2-components/ng2-alfresco-core/src/services/auth-guard-ecm.service.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/auth-guard-ecm.service.ts
@@ -22,11 +22,11 @@ import {
   RouterStateSnapshot
 } from '@angular/router';
 
-import { AlfrescoAuthenticationService } from './alfresco-authentication.service';
+import { AuthenticationService } from './authentication.service';
 
 @Injectable()
 export class AuthGuardEcm implements CanActivate, CanActivateChild {
-    constructor(private authService: AlfrescoAuthenticationService, private router: Router) {}
+    constructor(private authService: AuthenticationService, private router: Router) {}
 
     canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
         // let url: string = state.url;
diff --git a/ng2-components/ng2-alfresco-core/src/services/auth-guard.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/auth-guard.service.spec.ts
index add6dd2b12..92f860f5ec 100644
--- a/ng2-components/ng2-alfresco-core/src/services/auth-guard.service.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/auth-guard.service.spec.ts
@@ -21,7 +21,7 @@ import { RouterTestingModule } from '@angular/router/testing';
 
 import { CookieServiceMock } from './../assets/cookie.service.mock';
 import { AlfrescoApiService } from './alfresco-api.service';
-import { AlfrescoAuthenticationService } from './alfresco-authentication.service';
+import { AuthenticationService } from './authentication.service';
 import { AlfrescoSettingsService } from './alfresco-settings.service';
 import { AppConfigModule } from './app-config.service';
 import { AuthGuard } from './auth-guard.service';
@@ -42,7 +42,7 @@ describe('AuthGuardService', () => {
                 AuthGuard,
                 AlfrescoSettingsService,
                 AlfrescoApiService,
-                AlfrescoAuthenticationService,
+                AuthenticationService,
                 UserPreferencesService,
                 StorageService,
                 { provide: CookieService, useClass: CookieServiceMock },
@@ -52,7 +52,7 @@ describe('AuthGuardService', () => {
     }));
 
     it('if the alfresco js api is logged in should canActivate be true',
-        async(inject([AuthGuard, Router, AlfrescoSettingsService, StorageService, AlfrescoAuthenticationService], (auth, router, settingsService, storage, authService) => {
+        async(inject([AuthGuard, Router, AlfrescoSettingsService, StorageService, AuthenticationService], (auth, router, settingsService, storage, authService) => {
             spyOn(router, 'navigate');
 
             authService.isLoggedIn = () => {
@@ -65,7 +65,7 @@ describe('AuthGuardService', () => {
     );
 
     it('if the alfresco js api is NOT logged in should canActivate be false',
-        async(inject([AuthGuard, Router, AlfrescoSettingsService, StorageService, AlfrescoAuthenticationService], (auth, router, settingsService, storage, authService) => {
+        async(inject([AuthGuard, Router, AlfrescoSettingsService, StorageService, AuthenticationService], (auth, router, settingsService, storage, authService) => {
 
             spyOn(router, 'navigate');
 
diff --git a/ng2-components/ng2-alfresco-core/src/services/auth-guard.service.ts b/ng2-components/ng2-alfresco-core/src/services/auth-guard.service.ts
index 5d1744fe34..2eedeec6af 100644
--- a/ng2-components/ng2-alfresco-core/src/services/auth-guard.service.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/auth-guard.service.ts
@@ -22,11 +22,11 @@ import {
   RouterStateSnapshot
 } from '@angular/router';
 
-import { AlfrescoAuthenticationService } from './alfresco-authentication.service';
+import { AuthenticationService } from './authentication.service';
 
 @Injectable()
 export class AuthGuard implements CanActivate, CanActivateChild {
-    constructor(private authService: AlfrescoAuthenticationService, private router: Router) {}
+    constructor(private authService: AuthenticationService, private router: Router) {}
 
     canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
         // let url: string = state.url;
diff --git a/ng2-components/ng2-alfresco-core/src/services/alfresco-authentication.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/authentication.service.spec.ts
similarity index 98%
rename from ng2-components/ng2-alfresco-core/src/services/alfresco-authentication.service.spec.ts
rename to ng2-components/ng2-alfresco-core/src/services/authentication.service.spec.ts
index 2d7e0998a7..8b70bdcbf4 100644
--- a/ng2-components/ng2-alfresco-core/src/services/alfresco-authentication.service.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/authentication.service.spec.ts
@@ -18,7 +18,7 @@
 import { async, TestBed } from '@angular/core/testing';
 import { CookieServiceMock } from './../assets/cookie.service.mock';
 import { AlfrescoApiService } from './alfresco-api.service';
-import { AlfrescoAuthenticationService } from './alfresco-authentication.service';
+import { AuthenticationService } from './authentication.service';
 import { AlfrescoSettingsService } from './alfresco-settings.service';
 import { AppConfigModule } from './app-config.service';
 import { CookieService } from './cookie.service';
@@ -28,9 +28,9 @@ import { UserPreferencesService } from './user-preferences.service';
 
 declare let jasmine: any;
 
-describe('AlfrescoAuthenticationService', () => {
+describe('AuthenticationService', () => {
     let apiService: AlfrescoApiService;
-    let authService: AlfrescoAuthenticationService;
+    let authService: AuthenticationService;
     let settingsService: AlfrescoSettingsService;
     let preferences: UserPreferencesService;
     let storage: StorageService;
@@ -44,7 +44,7 @@ describe('AlfrescoAuthenticationService', () => {
             providers: [
                 AlfrescoSettingsService,
                 AlfrescoApiService,
-                AlfrescoAuthenticationService,
+                AuthenticationService,
                 StorageService,
                 UserPreferencesService,
                 { provide: CookieService, useClass: CookieServiceMock },
@@ -55,7 +55,7 @@ describe('AlfrescoAuthenticationService', () => {
 
     beforeEach(() => {
         apiService = TestBed.get(AlfrescoApiService);
-        authService = TestBed.get(AlfrescoAuthenticationService);
+        authService = TestBed.get(AuthenticationService);
         settingsService = TestBed.get(AlfrescoSettingsService);
         preferences = TestBed.get(UserPreferencesService);
         cookie = TestBed.get(CookieService);
diff --git a/ng2-components/ng2-alfresco-core/src/services/alfresco-authentication.service.ts b/ng2-components/ng2-alfresco-core/src/services/authentication.service.ts
similarity index 98%
rename from ng2-components/ng2-alfresco-core/src/services/alfresco-authentication.service.ts
rename to ng2-components/ng2-alfresco-core/src/services/authentication.service.ts
index cdbbab0759..72808dc933 100644
--- a/ng2-components/ng2-alfresco-core/src/services/alfresco-authentication.service.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/authentication.service.ts
@@ -27,7 +27,7 @@ const REMEMBER_ME_COOKIE_KEY = 'ALFRESCO_REMEMBER_ME';
 const REMEMBER_ME_UNTIL = 1000 * 60 * 60 * 24 * 30 ;
 
 @Injectable()
-export class AlfrescoAuthenticationService {
+export class AuthenticationService {
 
     onLogin: Subject<any> = new Subject<any>();
     onLogout: Subject<any> = new Subject<any>();
@@ -211,7 +211,7 @@ export class AlfrescoAuthenticationService {
      *
      * @returns {string} The username value
      *
-     * @memberof AlfrescoAuthenticationService
+     * @memberof AuthenticationService
      */
     getEcmUsername(): string {
         return this.alfrescoApi.getInstance().ecmAuth.username;
@@ -222,7 +222,7 @@ export class AlfrescoAuthenticationService {
      *
      * @returns {string} The username value
      *
-     * @memberof AlfrescoAuthenticationService
+     * @memberof AuthenticationService
      */
     getBpmUsername(): string {
         return this.alfrescoApi.getInstance().bpmAuth.username;
diff --git a/ng2-components/ng2-alfresco-core/src/services/adf-card-view-update.service.ts b/ng2-components/ng2-alfresco-core/src/services/card-view-update.service.ts
similarity index 100%
rename from ng2-components/ng2-alfresco-core/src/services/adf-card-view-update.service.ts
rename to ng2-components/ng2-alfresco-core/src/services/card-view-update.service.ts
diff --git a/ng2-components/ng2-alfresco-core/src/services/index.ts b/ng2-components/ng2-alfresco-core/src/services/index.ts
deleted file mode 100644
index eb4bbb3393..0000000000
--- a/ng2-components/ng2-alfresco-core/src/services/index.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-export * from './content.service';
-export * from './storage.service';
-export * from './cookie.service';
-export * from './alfresco-api.service';
-export * from './alfresco-settings.service';
-export * from './alfresco-content.service';
-export * from './renditions.service';
-export * from './auth-guard.service';
-export * from './auth-guard-ecm.service';
-export * from './auth-guard-bpm.service';
-export * from './notification.service';
-export * from './log.service';
-export * from './alfresco-authentication.service';
-export * from './alfresco-translation.service';
-export * from './alfresco-translate-loader.service';
-export * from './app-config.service';
-export * from './thumbnail.service';
-export * from './upload.service';
-export * from './adf-card-view-update.service';
diff --git a/ng2-components/ng2-alfresco-core/src/services/thumbnail.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/thumbnail.service.spec.ts
index 4cc72de637..575a19d3b8 100644
--- a/ng2-components/ng2-alfresco-core/src/services/thumbnail.service.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/thumbnail.service.spec.ts
@@ -19,7 +19,7 @@ import { async, TestBed } from '@angular/core/testing';
 import { HttpModule } from '@angular/http';
 import { CookieServiceMock } from './../assets/cookie.service.mock';
 import { AlfrescoApiService } from './alfresco-api.service';
-import { AlfrescoAuthenticationService } from './alfresco-authentication.service';
+import { AuthenticationService } from './authentication.service';
 import { AlfrescoContentService } from './alfresco-content.service';
 import { AlfrescoSettingsService } from './alfresco-settings.service';
 import { AppConfigService } from './app-config.service';
@@ -40,7 +40,7 @@ describe('ThumbnailService', () => {
             ],
             providers: [
                 UserPreferencesService,
-                AlfrescoAuthenticationService,
+                AuthenticationService,
                 AlfrescoContentService,
                 AlfrescoSettingsService,
                 AppConfigService,
diff --git a/ng2-components/ng2-alfresco-core/src/services/alfresco-translate-loader.service.ts b/ng2-components/ng2-alfresco-core/src/services/translate-loader.service.ts
similarity index 100%
rename from ng2-components/ng2-alfresco-core/src/services/alfresco-translate-loader.service.ts
rename to ng2-components/ng2-alfresco-core/src/services/translate-loader.service.ts
diff --git a/ng2-components/ng2-alfresco-core/src/services/alfresco-translate-loader.spec.ts b/ng2-components/ng2-alfresco-core/src/services/translate-loader.spec.ts
similarity index 80%
rename from ng2-components/ng2-alfresco-core/src/services/alfresco-translate-loader.spec.ts
rename to ng2-components/ng2-alfresco-core/src/services/translate-loader.spec.ts
index ee7640792c..9db5ca49a0 100644
--- a/ng2-components/ng2-alfresco-core/src/services/alfresco-translate-loader.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/translate-loader.spec.ts
@@ -21,8 +21,8 @@ import { HttpModule, Response, ResponseOptions, XHRBackend } from '@angular/http
 import { MockBackend, MockConnection } from '@angular/http/testing';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
-import { AlfrescoTranslateLoader } from './alfresco-translate-loader.service';
-import { AlfrescoTranslationService } from './alfresco-translation.service';
+import { AlfrescoTranslateLoader } from './translate-loader.service';
+import { TranslationService } from './translation.service';
 import { LogService } from './log.service';
 
 let componentJson1 = ' {"TEST": "This is a test", "TEST2": "This is another test"} ' ;
@@ -34,7 +34,7 @@ const mockBackendResponse = (connection: MockConnection, response: string) => {
 describe('TranslateLoader', () => {
     let injector: Injector;
     let backend: any;
-    let alfrescoTranslationService: AlfrescoTranslationService;
+    let translationService: TranslationService;
     let connection: MockConnection; // this will be set when a new connection is emitted from the backend.
     let customLoader;
 
@@ -50,22 +50,22 @@ describe('TranslateLoader', () => {
                 })
             ],
             providers: [
-                AlfrescoTranslationService,
+                TranslationService,
                 LogService,
                 {provide: XHRBackend, useClass: MockBackend}
             ]
         });
         injector = getTestBed();
         backend = injector.get(XHRBackend);
-        alfrescoTranslationService = injector.get(AlfrescoTranslationService);
+        translationService = injector.get(TranslationService);
         backend.connections.subscribe((c: MockConnection) => connection = c);
-        customLoader = alfrescoTranslationService.translate.currentLoader;
+        customLoader = translationService.translate.currentLoader;
     });
 
     it('should be able to provide any TranslateLoader', () => {
-        expect(alfrescoTranslationService).toBeDefined();
-        expect(alfrescoTranslationService.translate.currentLoader).toBeDefined();
-        expect(alfrescoTranslationService.translate.currentLoader instanceof AlfrescoTranslateLoader).toBeTruthy();
+        expect(translationService).toBeDefined();
+        expect(translationService.translate.currentLoader).toBeDefined();
+        expect(translationService.translate.currentLoader instanceof AlfrescoTranslateLoader).toBeTruthy();
     });
 
     it('should add the component to the list', () => {
diff --git a/ng2-components/ng2-alfresco-core/src/services/alfresco-translation.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/translation.service.spec.ts
similarity index 76%
rename from ng2-components/ng2-alfresco-core/src/services/alfresco-translation.service.spec.ts
rename to ng2-components/ng2-alfresco-core/src/services/translation.service.spec.ts
index 74739d113c..9a7003c142 100644
--- a/ng2-components/ng2-alfresco-core/src/services/alfresco-translation.service.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/translation.service.spec.ts
@@ -21,18 +21,18 @@ import { HttpModule, Response, ResponseOptions, XHRBackend } from '@angular/http
 import { MockBackend, MockConnection } from '@angular/http/testing';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
-import { AlfrescoTranslateLoader } from './alfresco-translate-loader.service';
-import { AlfrescoTranslationService } from './alfresco-translation.service';
+import { AlfrescoTranslateLoader } from './translate-loader.service';
+import { TranslationService } from './translation.service';
 import { LogService } from './log.service';
 
 const mockBackendResponse = (connection: MockConnection, response: string) => {
     connection.mockRespond(new Response(new ResponseOptions({body: response})));
 };
 
-describe('AlfrescoTranslationService', () => {
+describe('TranslationService', () => {
     let injector: Injector;
     let backend: any;
-    let alfrescoTranslationService: AlfrescoTranslationService;
+    let translationService: TranslationService;
     let connection: MockConnection; // this will be set when a new connection is emitted from the backend.
 
     beforeEach(() => {
@@ -47,25 +47,25 @@ describe('AlfrescoTranslationService', () => {
                 })
             ],
             providers: [
-                AlfrescoTranslationService,
+                TranslationService,
                 LogService,
                 {provide: XHRBackend, useClass: MockBackend}
             ]
         });
         injector = getTestBed();
         backend = injector.get(XHRBackend);
-        alfrescoTranslationService = injector.get(AlfrescoTranslationService);
+        translationService = injector.get(TranslationService);
         backend.connections.subscribe((c: MockConnection) => connection = c);
-        alfrescoTranslationService.addTranslationFolder('fake-name', 'fake-path');
+        translationService.addTranslationFolder('fake-name', 'fake-path');
     });
 
     it('is defined', () => {
-        expect(AlfrescoTranslationService).toBeDefined();
-        expect(alfrescoTranslationService instanceof AlfrescoTranslationService).toBeTruthy();
+        expect(translationService).toBeDefined();
+        expect(translationService instanceof TranslationService).toBeTruthy();
     });
 
     it('should be able to get translations of the KEY: TEST', () => {
-        alfrescoTranslationService.get('TEST').subscribe((res: string) => {
+        translationService.get('TEST').subscribe((res: string) => {
             expect(res).toEqual('This is a test');
         });
 
@@ -73,7 +73,7 @@ describe('AlfrescoTranslationService', () => {
     });
 
     it('should be able to get translations of the KEY: TEST2', () => {
-        alfrescoTranslationService.get('TEST2').subscribe((res: string) => {
+        translationService.get('TEST2').subscribe((res: string) => {
             expect(res).toEqual('This is another test');
         });
 
diff --git a/ng2-components/ng2-alfresco-core/src/services/alfresco-translation.service.ts b/ng2-components/ng2-alfresco-core/src/services/translation.service.ts
similarity index 94%
rename from ng2-components/ng2-alfresco-core/src/services/alfresco-translation.service.ts
rename to ng2-components/ng2-alfresco-core/src/services/translation.service.ts
index fba9f153cd..989aa2d5d6 100644
--- a/ng2-components/ng2-alfresco-core/src/services/alfresco-translation.service.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/translation.service.ts
@@ -18,10 +18,10 @@
 import { Injectable } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs/Rx';
-import { AlfrescoTranslateLoader } from './alfresco-translate-loader.service';
+import { AlfrescoTranslateLoader } from './translate-loader.service';
 
 @Injectable()
-export class AlfrescoTranslationService {
+export class TranslationService {
     defaultLang: string = 'en';
     userLang: string = 'en';
     customLoader: AlfrescoTranslateLoader;
diff --git a/ng2-components/ng2-alfresco-core/src/services/upload.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/upload.service.spec.ts
index b5c45042dc..f69a69d536 100644
--- a/ng2-components/ng2-alfresco-core/src/services/upload.service.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/upload.service.spec.ts
@@ -19,7 +19,7 @@ import { EventEmitter } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { FileModel, FileUploadOptions } from '../models/file.model';
 import { AlfrescoApiService } from './alfresco-api.service';
-import { AlfrescoAuthenticationService } from './alfresco-authentication.service';
+import { AuthenticationService } from './authentication.service';
 import { AlfrescoSettingsService } from './alfresco-settings.service';
 import { AppConfigModule } from './app-config.service';
 import { StorageService } from './storage.service';
@@ -44,7 +44,7 @@ describe('UploadService', () => {
                 UploadService,
                 AlfrescoApiService,
                 AlfrescoSettingsService,
-                AlfrescoAuthenticationService,
+                AuthenticationService,
                 StorageService
             ]
         });
diff --git a/ng2-components/ng2-alfresco-datatable/index.ts b/ng2-components/ng2-alfresco-datatable/index.ts
index c9137fe66e..e612b72ab6 100644
--- a/ng2-components/ng2-alfresco-datatable/index.ts
+++ b/ng2-components/ng2-alfresco-datatable/index.ts
@@ -23,14 +23,14 @@ export * from './src/data/index';
 
 export { DataTableCellComponent } from './src/components/datatable/datatable-cell.component';
 export { DataTableComponent } from './src/components/datatable/datatable.component';
-export { AdfEmptyListComponent } from './src/components/datatable/adf-empty-list.component';
+export { EmptyListComponent } from './src/components/datatable/empty-list.component';
 export { PaginationComponent } from './src/components/pagination/pagination.component';
 export { DataCellEvent, DataCellEventModel } from './src/components/datatable/data-cell.event';
 export { DataRowActionEvent, DataRowActionModel } from './src/components/datatable/data-row-action.event';
 
-import { AdfEmptyListComponent } from './src/components/datatable/adf-empty-list.component';
 import { DataTableCellComponent } from './src/components/datatable/datatable-cell.component';
 import { DataTableComponent } from './src/components/datatable/datatable.component';
+import { EmptyListComponent } from './src/components/datatable/empty-list.component';
 import { PaginationComponent } from './src/components/pagination/pagination.component';
 import { LoadingContentTemplateDirective } from './src/directives/loading-template.directive';
 import { NoContentTemplateDirective } from './src/directives/no-content-template.directive';
@@ -38,7 +38,7 @@ import { NoContentTemplateDirective } from './src/directives/no-content-template
 export function directives() {
     return [
         DataTableComponent,
-        AdfEmptyListComponent,
+        EmptyListComponent,
         DataTableCellComponent,
         NoContentTemplateDirective,
         LoadingContentTemplateDirective,
diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/adf-empty-list.component.css b/ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.css
similarity index 100%
rename from ng2-components/ng2-alfresco-datatable/src/components/datatable/adf-empty-list.component.css
rename to ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.css
diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/adf-empty-list.component.html b/ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.html
similarity index 100%
rename from ng2-components/ng2-alfresco-datatable/src/components/datatable/adf-empty-list.component.html
rename to ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.html
diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/adf-empty-list.component.spec.ts b/ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.spec.ts
similarity index 88%
rename from ng2-components/ng2-alfresco-datatable/src/components/datatable/adf-empty-list.component.spec.ts
rename to ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.spec.ts
index 97d086013f..6ad390d198 100644
--- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/adf-empty-list.component.spec.ts
+++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.spec.ts
@@ -17,11 +17,11 @@
 
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { CoreModule } from 'ng2-alfresco-core';
-import { AdfEmptyListComponent } from './adf-empty-list.component';
+import { EmptyListComponent } from './empty-list.component';
 
-describe('AdfEmptyListComponentComponent', () => {
-    let component: AdfEmptyListComponent;
-    let fixture: ComponentFixture<AdfEmptyListComponent>;
+describe('EmptyListComponentComponent', () => {
+    let component: EmptyListComponent;
+    let fixture: ComponentFixture<EmptyListComponent>;
 
     beforeEach(async(() => {
         TestBed.configureTestingModule({
@@ -29,11 +29,11 @@ describe('AdfEmptyListComponentComponent', () => {
                 CoreModule.forRoot()
             ],
             declarations: [
-                AdfEmptyListComponent
+                EmptyListComponent
             ]
         }).compileComponents();
 
-        fixture = TestBed.createComponent(AdfEmptyListComponent);
+        fixture = TestBed.createComponent(EmptyListComponent);
         component = fixture.componentInstance;
     }));
 
diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/adf-empty-list.component.ts b/ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.ts
similarity index 88%
rename from ng2-components/ng2-alfresco-datatable/src/components/datatable/adf-empty-list.component.ts
rename to ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.ts
index 7f4a16a14c..6683c7f1c5 100644
--- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/adf-empty-list.component.ts
+++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.ts
@@ -19,10 +19,10 @@ import { Component, Input } from '@angular/core';
 
 @Component({
     selector: 'adf-empty-list',
-    styleUrls: ['./adf-empty-list.component.css'],
-    templateUrl: './adf-empty-list.component.html'
+    styleUrls: ['./empty-list.component.css'],
+    templateUrl: './empty-list.component.html'
 })
-export class AdfEmptyListComponent {
+export class EmptyListComponent {
 
     @Input()
     emptyListImageUrl: string = require('../../assets/images/empty_doc_lib.svg');
diff --git a/ng2-components/ng2-alfresco-documentlist/README.md b/ng2-components/ng2-alfresco-documentlist/README.md
index 5348f9a335..3f606edb2b 100644
--- a/ng2-components/ng2-alfresco-documentlist/README.md
+++ b/ng2-components/ng2-alfresco-documentlist/README.md
@@ -13,6 +13,7 @@
   * [DOM Events](#dom-events)
   * [Handling DOM events](#handling-dom-events)
   * [Setting default folder](#setting-default-folder)
+- [Custom icons for selected rows](#custom-icons-for-selected-rows)
 - [Calling DocumentList api directly](#calling-documentlist-api-directly)
 - [Breadcrumb Component](#breadcrumb-component)
   * [Properties](#properties-1)
diff --git a/ng2-components/ng2-alfresco-login/index.ts b/ng2-components/ng2-alfresco-login/index.ts
index 3379443026..258a731b51 100644
--- a/ng2-components/ng2-alfresco-login/index.ts
+++ b/ng2-components/ng2-alfresco-login/index.ts
@@ -19,19 +19,25 @@ import { ModuleWithProviders, NgModule } from '@angular/core';
 import { MdCheckboxModule, MdIconModule, MdInputModule, MdProgressSpinnerModule } from '@angular/material';
 import { CoreModule } from 'ng2-alfresco-core';
 
+import { LoginComponent } from './src/components/login.component';
 import { LoginFooterDirective } from './src/directives/login-footer.directive';
 import { LoginHeaderDirective } from './src/directives/login-header.directive';
 
-import { AlfrescoLoginComponent } from './src/components/alfresco-login.component';
+export { LoginHeaderDirective } from './src/directives/login-header.directive';
+export { LoginFooterDirective } from './src/directives/login-footer.directive';
+export { LoginComponent } from './src/components/login.component';
 
-export * from './src/directives/login-header.directive';
-export * from './src/directives/login-footer.directive';
-export * from './src/components/alfresco-login.component';
+// Old Deprecated export
+import { LoginComponent as AlfrescoLoginComponent } from './src/components/login.component';
+export { LoginComponent as AlfrescoLoginComponent } from './src/components/login.component';
 
 export const ALFRESCO_LOGIN_DIRECTIVES: any[] = [
-    AlfrescoLoginComponent,
+    LoginComponent,
     LoginFooterDirective,
-    LoginHeaderDirective
+    LoginHeaderDirective,
+
+    // Old Deprecated export
+    AlfrescoLoginComponent
 ];
 
 @NgModule({
diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.css b/ng2-components/ng2-alfresco-login/src/components/login.component.css
similarity index 100%
rename from ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.css
rename to ng2-components/ng2-alfresco-login/src/components/login.component.css
diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html b/ng2-components/ng2-alfresco-login/src/components/login.component.html
similarity index 100%
rename from ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html
rename to ng2-components/ng2-alfresco-login/src/components/login.component.html
diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts b/ng2-components/ng2-alfresco-login/src/components/login.component.spec.ts
similarity index 98%
rename from ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts
rename to ng2-components/ng2-alfresco-login/src/components/login.component.spec.ts
index 18e2256122..da16a4db3e 100644
--- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts
+++ b/ng2-components/ng2-alfresco-login/src/components/login.component.spec.ts
@@ -22,11 +22,11 @@ import { AlfrescoAuthenticationService, CoreModule } from 'ng2-alfresco-core';
 import { AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { AuthenticationMock } from './../assets/authentication.service.mock';
 import { TranslationMock } from './../assets/translation.service.mock';
-import { AlfrescoLoginComponent } from './alfresco-login.component';
+import { LoginComponent } from './login.component';
 
 describe('AlfrescoLogin', () => {
-    let component: AlfrescoLoginComponent;
-    let fixture: ComponentFixture<AlfrescoLoginComponent>;
+    let component: LoginComponent;
+    let fixture: ComponentFixture<LoginComponent>;
     let debug: DebugElement;
     let element: any;
 
@@ -42,7 +42,7 @@ describe('AlfrescoLogin', () => {
                 MdCheckboxModule,
                 CoreModule.forRoot()
             ],
-            declarations: [AlfrescoLoginComponent],
+            declarations: [LoginComponent],
             providers: [
                 {provide: AlfrescoAuthenticationService, useClass: AuthenticationMock},
                 {provide: AlfrescoTranslationService, useClass: TranslationMock}
@@ -51,7 +51,7 @@ describe('AlfrescoLogin', () => {
     }));
 
     beforeEach(() => {
-        fixture = TestBed.createComponent(AlfrescoLoginComponent);
+        fixture = TestBed.createComponent(LoginComponent);
 
         debug = fixture.debugElement;
         element = fixture.nativeElement;
diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts b/ng2-components/ng2-alfresco-login/src/components/login.component.ts
similarity index 98%
rename from ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts
rename to ng2-components/ng2-alfresco-login/src/components/login.component.ts
index cd11040e1a..8cebb35dae 100644
--- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts
+++ b/ng2-components/ng2-alfresco-login/src/components/login.component.ts
@@ -37,11 +37,11 @@ enum LoginSteps {
 
 @Component({
     selector: 'adf-login, alfresco-login',
-    templateUrl: './alfresco-login.component.html',
-    styleUrls: ['./alfresco-login.component.css'],
+    templateUrl: './login.component.html',
+    styleUrls: ['./login.component.css'],
     host: {'(blur)': 'onBlur($event)'}
 })
-export class AlfrescoLoginComponent implements OnInit {
+export class LoginComponent implements OnInit {
 
     isPasswordShow: boolean = false;
 
diff --git a/ng2-components/ng2-alfresco-login/src/directives/login-footer.directive.spec.ts b/ng2-components/ng2-alfresco-login/src/directives/login-footer.directive.spec.ts
index a286c0970c..bc51194872 100644
--- a/ng2-components/ng2-alfresco-login/src/directives/login-footer.directive.spec.ts
+++ b/ng2-components/ng2-alfresco-login/src/directives/login-footer.directive.spec.ts
@@ -18,7 +18,7 @@
 import { Injector } from '@angular/core';
 import { getTestBed, TestBed } from '@angular/core/testing';
 import { CoreModule } from 'ng2-alfresco-core';
-import { AlfrescoLoginComponent } from '../components/alfresco-login.component';
+import { LoginComponent } from '../components/login.component';
 import { LoginFooterDirective } from './login-footer.directive';
 
 describe('LoginFooterDirective', () => {
@@ -30,7 +30,7 @@ describe('LoginFooterDirective', () => {
             imports: [CoreModule.forRoot()],
             providers: [
                 LoginFooterDirective,
-                AlfrescoLoginComponent
+                LoginComponent
             ]
         });
         injector = getTestBed();
diff --git a/ng2-components/ng2-alfresco-login/src/directives/login-footer.directive.ts b/ng2-components/ng2-alfresco-login/src/directives/login-footer.directive.ts
index 2dedee7ee4..e5567973c1 100644
--- a/ng2-components/ng2-alfresco-login/src/directives/login-footer.directive.ts
+++ b/ng2-components/ng2-alfresco-login/src/directives/login-footer.directive.ts
@@ -21,7 +21,7 @@ import {
     Directive,
     TemplateRef
 } from '@angular/core';
-import { AlfrescoLoginComponent } from '../components/alfresco-login.component';
+import { LoginComponent } from '../components/login.component';
 
 @Directive({
     selector: 'login-footer'
@@ -32,7 +32,7 @@ export class LoginFooterDirective implements AfterContentInit {
     template: any;
 
     constructor(
-        private alfrescoLoginComponent: AlfrescoLoginComponent) {
+        private alfrescoLoginComponent: LoginComponent) {
     }
 
     ngAfterContentInit() {
diff --git a/ng2-components/ng2-alfresco-login/src/directives/login-header.directive.spec.ts b/ng2-components/ng2-alfresco-login/src/directives/login-header.directive.spec.ts
index 3279702486..70f3669050 100644
--- a/ng2-components/ng2-alfresco-login/src/directives/login-header.directive.spec.ts
+++ b/ng2-components/ng2-alfresco-login/src/directives/login-header.directive.spec.ts
@@ -18,7 +18,7 @@
 import { Injector } from '@angular/core';
 import { getTestBed, TestBed } from '@angular/core/testing';
 import { CoreModule } from 'ng2-alfresco-core';
-import { AlfrescoLoginComponent } from '../components/alfresco-login.component';
+import { LoginComponent } from '../components/login.component';
 import { LoginHeaderDirective } from './login-header.directive';
 
 describe('LoginHeaderDirective', () => {
@@ -30,7 +30,7 @@ describe('LoginHeaderDirective', () => {
             imports: [CoreModule.forRoot()],
             providers: [
                 LoginHeaderDirective,
-                AlfrescoLoginComponent
+                LoginComponent
             ]
         });
         injector = getTestBed();
diff --git a/ng2-components/ng2-alfresco-login/src/directives/login-header.directive.ts b/ng2-components/ng2-alfresco-login/src/directives/login-header.directive.ts
index b38c9596a0..0dce759c4f 100644
--- a/ng2-components/ng2-alfresco-login/src/directives/login-header.directive.ts
+++ b/ng2-components/ng2-alfresco-login/src/directives/login-header.directive.ts
@@ -21,7 +21,7 @@ import {
     Directive,
     TemplateRef
 } from '@angular/core';
-import { AlfrescoLoginComponent } from '../components/alfresco-login.component';
+import { LoginComponent } from '../components/login.component';
 
 @Directive({
     selector: 'login-header'
@@ -32,7 +32,7 @@ export class LoginHeaderDirective implements AfterContentInit {
     template: any;
 
     constructor(
-        private alfrescoLoginComponent: AlfrescoLoginComponent) {
+        private alfrescoLoginComponent: LoginComponent) {
     }
 
     ngAfterContentInit() {
diff --git a/ng2-components/ng2-alfresco-login/src/i18n/en.json b/ng2-components/ng2-alfresco-login/src/i18n/en.json
index 7e527fed9a..807643ab0a 100644
--- a/ng2-components/ng2-alfresco-login/src/i18n/en.json
+++ b/ng2-components/ng2-alfresco-login/src/i18n/en.json
@@ -15,7 +15,7 @@
             "LOGIN-ERROR-PROVIDERS": "Providers cannot be undefined",
             "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-ERROR-CSRF": "CSRF exception, set [disableCsrf]=\"true\" in login.component",
             "LOGIN-ECM-LICENSE": "Content Services repository is in read-only mode"
         },
         "BUTTON": {
diff --git a/ng2-components/ng2-alfresco-login/src/i18n/it.json b/ng2-components/ng2-alfresco-login/src/i18n/it.json
index 6f730e450c..6b496c4d12 100644
--- a/ng2-components/ng2-alfresco-login/src/i18n/it.json
+++ b/ng2-components/ng2-alfresco-login/src/i18n/it.json
@@ -14,7 +14,7 @@
             "LOGIN-ERROR-PROVIDERS": "Providers non può essere nullo",
             "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-ERROR-CSRF": "CSRF exception, set [disableCsrf]=\"true\" in login.component",
             "LOGIN-ECM-LICENSE": "l'Content Services e' in read-only mode"
         },
         "BUTTON": {
diff --git a/ng2-components/ng2-alfresco-search/index.ts b/ng2-components/ng2-alfresco-search/index.ts
index 403dd79a7a..0b110cd7ae 100644
--- a/ng2-components/ng2-alfresco-search/index.ts
+++ b/ng2-components/ng2-alfresco-search/index.ts
@@ -19,24 +19,42 @@ import { ModuleWithProviders, NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { CoreModule } from 'ng2-alfresco-core';
 import { DocumentListModule } from 'ng2-alfresco-documentlist';
-import { AlfrescoSearchAutocompleteComponent } from './src/components/alfresco-search-autocomplete.component';
-import { AlfrescoSearchControlComponent } from './src/components/alfresco-search-control.component';
-import { AlfrescoSearchComponent } from './src/components/alfresco-search.component';
-import { AlfrescoSearchService } from './src/services/alfresco-search.service';
+import { SearchAutocompleteComponent } from './src/components/search-autocomplete.component';
+import { SearchControlComponent } from './src/components/search-control.component';
+import { SearchComponent } from './src/components/search.component';
+import { SearchService } from './src/services/search.service';
 
 // services
-export * from './src/services/alfresco-search.service';
-export * from './src/components/alfresco-search.component';
-export * from './src/components/alfresco-search-control.component';
-export * from './src/components/alfresco-search-autocomplete.component';
+export * from './src/services/search.service';
+export * from './src/components/search.component';
+export * from './src/components/search-control.component';
+export * from './src/components/search-autocomplete.component';
+
+// Old Deprecated export
+import { SearchAutocompleteComponent as AlfrescoSearchAutocompleteComponent } from './src/components/search-autocomplete.component';
+import { SearchControlComponent as AlfrescoSearchControlComponent } from './src/components/search-control.component';
+import { SearchComponent as AlfrescoSearchComponent } from './src/components/search.component';
+import { SearchService as AlfrescoSearchService } from './src/services/search.service';
+export { SearchService as AlfrescoSearchService } from './src/services/search.service';
+export { SearchComponent as AlfrescoSearchComponent } from './src/components/search.component';
+export { SearchControlComponent as AlfrescoSearchControlComponent } from './src/components/search-control.component';
+export { SearchAutocompleteComponent as AlfrescoSearchAutocompleteComponent } from './src/components/search-autocomplete.component';
 
 export const ALFRESCO_SEARCH_DIRECTIVES: [any] = [
+    SearchComponent,
+    SearchControlComponent,
+    SearchAutocompleteComponent,
+
+    // Old Deprecated export
     AlfrescoSearchComponent,
     AlfrescoSearchControlComponent,
     AlfrescoSearchAutocompleteComponent
 ];
 
 export const ALFRESCO_SEARCH_PROVIDERS: [any] = [
+    SearchService,
+
+    // Old Deprecated export
     AlfrescoSearchService
 ];
 
diff --git a/ng2-components/ng2-alfresco-search/src/assets/alfresco-search.component.mock.ts b/ng2-components/ng2-alfresco-search/src/assets/search.component.mock.ts
similarity index 100%
rename from ng2-components/ng2-alfresco-search/src/assets/alfresco-search.component.mock.ts
rename to ng2-components/ng2-alfresco-search/src/assets/search.component.mock.ts
diff --git a/ng2-components/ng2-alfresco-search/src/assets/alfresco-search.service.mock.ts b/ng2-components/ng2-alfresco-search/src/assets/search.service.mock.ts
similarity index 100%
rename from ng2-components/ng2-alfresco-search/src/assets/alfresco-search.service.mock.ts
rename to ng2-components/ng2-alfresco-search/src/assets/search.service.mock.ts
diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.css b/ng2-components/ng2-alfresco-search/src/components/search-autocomplete.component.css
similarity index 100%
rename from ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.css
rename to ng2-components/ng2-alfresco-search/src/components/search-autocomplete.component.css
diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.html b/ng2-components/ng2-alfresco-search/src/components/search-autocomplete.component.html
similarity index 100%
rename from ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.html
rename to ng2-components/ng2-alfresco-search/src/components/search-autocomplete.component.html
diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.spec.ts b/ng2-components/ng2-alfresco-search/src/components/search-autocomplete.component.spec.ts
similarity index 93%
rename from ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.spec.ts
rename to ng2-components/ng2-alfresco-search/src/components/search-autocomplete.component.spec.ts
index 376fb04177..2623974fda 100644
--- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.spec.ts
+++ b/ng2-components/ng2-alfresco-search/src/components/search-autocomplete.component.spec.ts
@@ -25,15 +25,15 @@ import {
     AlfrescoTranslationService,
     CoreModule
 } from 'ng2-alfresco-core';
-import { AlfrescoSearchService } from '../services/alfresco-search.service';
-import { errorJson, folderResult, noResult, result, results } from './../assets/alfresco-search.component.mock';
+import { SearchService } from '../services/search.service';
+import { errorJson, folderResult, noResult, result, results } from './../assets/search.component.mock';
 import { TranslationMock } from './../assets/translation.service.mock';
-import { AlfrescoSearchAutocompleteComponent } from './alfresco-search-autocomplete.component';
+import { SearchAutocompleteComponent } from './search-autocomplete.component';
 
-describe('AlfrescoSearchAutocompleteComponent', () => {
+describe('SearchAutocompleteComponent', () => {
 
-    let fixture: ComponentFixture<AlfrescoSearchAutocompleteComponent>, element: HTMLElement;
-    let component: AlfrescoSearchAutocompleteComponent;
+    let fixture: ComponentFixture<SearchAutocompleteComponent>, element: HTMLElement;
+    let component: SearchAutocompleteComponent;
 
     let updateSearchTerm = (newSearchTerm: string): void => {
         let oldSearchTerm = component.searchTerm;
@@ -46,7 +46,7 @@ describe('AlfrescoSearchAutocompleteComponent', () => {
             imports: [
                 CoreModule
             ],
-            declarations: [ AlfrescoSearchAutocompleteComponent ], // declare the test component
+            declarations: [ SearchAutocompleteComponent ], // declare the test component
             providers: [
                 {provide: AlfrescoTranslationService, useClass: TranslationMock},
                 ThumbnailService,
@@ -54,10 +54,10 @@ describe('AlfrescoSearchAutocompleteComponent', () => {
                 AlfrescoApiService,
                 AlfrescoAuthenticationService,
                 AlfrescoContentService,
-                AlfrescoSearchService
+                SearchService
             ]
         }).compileComponents().then(() => {
-            fixture = TestBed.createComponent(AlfrescoSearchAutocompleteComponent);
+            fixture = TestBed.createComponent(SearchAutocompleteComponent);
             component = fixture.componentInstance;
             element = fixture.nativeElement;
         });
@@ -75,7 +75,7 @@ describe('AlfrescoSearchAutocompleteComponent', () => {
         let searchService;
 
         beforeEach(() => {
-            searchService = fixture.debugElement.injector.get(AlfrescoSearchService);
+            searchService = fixture.debugElement.injector.get(SearchService);
         });
 
         it('should clear results straight away when a new search term is entered', async(() => {
@@ -184,7 +184,7 @@ describe('AlfrescoSearchAutocompleteComponent', () => {
         let searchService;
 
         beforeEach(() => {
-            searchService = fixture.debugElement.injector.get(AlfrescoSearchService);
+            searchService = fixture.debugElement.injector.get(SearchService);
             spyOn(searchService, 'getQueryNodesPromise')
                 .and.returnValue(Promise.reject(errorJson));
         });
@@ -225,7 +225,7 @@ describe('AlfrescoSearchAutocompleteComponent', () => {
         let searchService;
 
         beforeEach(() => {
-            searchService = fixture.debugElement.injector.get(AlfrescoSearchService);
+            searchService = fixture.debugElement.injector.get(SearchService);
         });
 
         it('should emit fileSelect event when file item clicked', (done) => {
@@ -267,7 +267,7 @@ describe('AlfrescoSearchAutocompleteComponent', () => {
         let searchService;
 
         beforeEach(() => {
-            searchService = fixture.debugElement.injector.get(AlfrescoSearchService);
+            searchService = fixture.debugElement.injector.get(SearchService);
             spyOn(searchService, 'getQueryNodesPromise')
                 .and.returnValue(Promise.resolve(results));
         });
@@ -379,7 +379,7 @@ describe('AlfrescoSearchAutocompleteComponent', () => {
         let searchService;
 
         beforeEach(() => {
-            searchService = fixture.debugElement.injector.get(AlfrescoSearchService);
+            searchService = fixture.debugElement.injector.get(SearchService);
             spyOn(searchService, 'getQueryNodesPromise')
                 .and.returnValue(Promise.resolve(result));
         });
diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts b/ng2-components/ng2-alfresco-search/src/components/search-autocomplete.component.ts
similarity index 93%
rename from ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts
rename to ng2-components/ng2-alfresco-search/src/components/search-autocomplete.component.ts
index 596bbeaf13..c204a9b183 100644
--- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts
+++ b/ng2-components/ng2-alfresco-search/src/components/search-autocomplete.component.ts
@@ -19,16 +19,16 @@ import { Component, ElementRef, EventEmitter, Input, OnChanges, OnInit, Output,
 import { MinimalNodeEntity } from 'alfresco-js-api';
 import { AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { ThumbnailService } from 'ng2-alfresco-core';
-import { AlfrescoSearchService, SearchOptions } from './../services/alfresco-search.service';
+import { SearchOptions, SearchService } from './../services/search.service';
 
 declare var require: any;
 
 @Component({
     selector: 'adf-search-autocomplete, alfresco-search-autocomplete',
-    templateUrl: './alfresco-search-autocomplete.component.html',
-    styleUrls: ['./alfresco-search-autocomplete.component.css']
+    templateUrl: './search-autocomplete.component.html',
+    styleUrls: ['./search-autocomplete.component.css']
 })
-export class AlfrescoSearchAutocompleteComponent implements OnInit, OnChanges {
+export class SearchAutocompleteComponent implements OnInit, OnChanges {
 
     @Input()
     searchTerm: string = '';
@@ -72,7 +72,7 @@ export class AlfrescoSearchAutocompleteComponent implements OnInit, OnChanges {
 
     @ViewChild('resultsTableBody', {}) resultsTableBody: ElementRef;
 
-    constructor(private searchService: AlfrescoSearchService,
+    constructor(private searchService: SearchService,
                 private translateService: AlfrescoTranslationService,
                 private thumbnailService: ThumbnailService) {
     }
diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.css b/ng2-components/ng2-alfresco-search/src/components/search-control.component.css
similarity index 100%
rename from ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.css
rename to ng2-components/ng2-alfresco-search/src/components/search-control.component.css
diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.html b/ng2-components/ng2-alfresco-search/src/components/search-control.component.html
similarity index 100%
rename from ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.html
rename to ng2-components/ng2-alfresco-search/src/components/search-control.component.html
diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.spec.ts b/ng2-components/ng2-alfresco-search/src/components/search-control.component.spec.ts
similarity index 95%
rename from ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.spec.ts
rename to ng2-components/ng2-alfresco-search/src/components/search-control.component.spec.ts
index 4ec6db66d0..481c7370f3 100644
--- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.spec.ts
+++ b/ng2-components/ng2-alfresco-search/src/components/search-control.component.spec.ts
@@ -18,16 +18,16 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ThumbnailService } from 'ng2-alfresco-core';
 import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
-import { AlfrescoSearchService } from '../services/alfresco-search.service';
-import { result } from './../assets/alfresco-search.component.mock';
+import { SearchService } from '../services/search.service';
+import { result } from './../assets/search.component.mock';
 import { TranslationMock } from './../assets/translation.service.mock';
-import { AlfrescoSearchAutocompleteComponent } from './alfresco-search-autocomplete.component';
-import { AlfrescoSearchControlComponent } from './alfresco-search-control.component';
+import { SearchAutocompleteComponent } from './search-autocomplete.component';
+import { SearchControlComponent } from './search-control.component';
 
-describe('AlfrescoSearchControlComponent', () => {
+describe('SearchControlComponent', () => {
 
-    let fixture: ComponentFixture<AlfrescoSearchControlComponent>;
-    let component: AlfrescoSearchControlComponent, element: HTMLElement;
+    let fixture: ComponentFixture<SearchControlComponent>;
+    let component: SearchControlComponent, element: HTMLElement;
     let componentHandler;
 
     beforeEach(async(() => {
@@ -38,16 +38,16 @@ describe('AlfrescoSearchControlComponent', () => {
                 CoreModule.forRoot()
             ],
             declarations: [
-                AlfrescoSearchControlComponent,
-                AlfrescoSearchAutocompleteComponent
+                SearchControlComponent,
+                SearchAutocompleteComponent
             ],
             providers: [
                 {provide: AlfrescoTranslationService, useClass: TranslationMock},
                 ThumbnailService,
-                AlfrescoSearchService
+                SearchService
             ]
         }).compileComponents().then(() => {
-            fixture = TestBed.createComponent(AlfrescoSearchControlComponent);
+            fixture = TestBed.createComponent(SearchControlComponent);
             component = fixture.componentInstance;
             element = fixture.nativeElement;
         });
@@ -199,7 +199,7 @@ describe('AlfrescoSearchControlComponent', () => {
         });
 
         it('should keep find-as-you-type control visible when user tabs into results', (done) => {
-            let searchService = TestBed.get(AlfrescoSearchService);
+            let searchService = TestBed.get(SearchService);
             spyOn(searchService, 'getQueryNodesPromise')
                 .and.returnValue(Promise.resolve(result));
 
diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts b/ng2-components/ng2-alfresco-search/src/components/search-control.component.ts
similarity index 92%
rename from ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts
rename to ng2-components/ng2-alfresco-search/src/components/search-control.component.ts
index 2ceb45dd30..a24757a2c7 100644
--- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts
+++ b/ng2-components/ng2-alfresco-search/src/components/search-control.component.ts
@@ -20,14 +20,14 @@ import { FormControl, Validators } from '@angular/forms';
 import { AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { Observable, Subject } from 'rxjs/Rx';
 import { SearchTermValidator } from './../forms/search-term-validator';
-import { AlfrescoSearchAutocompleteComponent } from './alfresco-search-autocomplete.component';
+import { SearchAutocompleteComponent } from './search-autocomplete.component';
 
 @Component({
-    selector: 'adf-search-control, alfresco-search-control',
-    templateUrl: './alfresco-search-control.component.html',
-    styleUrls: ['./alfresco-search-control.component.css']
+    selector: 'adf-search-control, search-control',
+    templateUrl: './search-control.component.html',
+    styleUrls: ['./search-control.component.css']
 })
-export class AlfrescoSearchControlComponent implements OnInit, OnDestroy {
+export class SearchControlComponent implements OnInit, OnDestroy {
 
     @Input()
     searchTerm = '';
@@ -61,8 +61,8 @@ export class AlfrescoSearchControlComponent implements OnInit, OnDestroy {
     @ViewChild('searchInput', {})
     searchInput: ElementRef;
 
-    @ViewChild(AlfrescoSearchAutocompleteComponent)
-    liveSearchComponent: AlfrescoSearchAutocompleteComponent;
+    @ViewChild(SearchAutocompleteComponent)
+    liveSearchComponent: SearchAutocompleteComponent;
 
     @Input()
     liveSearchEnabled: boolean = true;
diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.css b/ng2-components/ng2-alfresco-search/src/components/search.component.css
similarity index 100%
rename from ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.css
rename to ng2-components/ng2-alfresco-search/src/components/search.component.css
diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.html b/ng2-components/ng2-alfresco-search/src/components/search.component.html
similarity index 100%
rename from ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.html
rename to ng2-components/ng2-alfresco-search/src/components/search.component.html
diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts b/ng2-components/ng2-alfresco-search/src/components/search.component.spec.ts
similarity index 91%
rename from ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts
rename to ng2-components/ng2-alfresco-search/src/components/search.component.spec.ts
index 8003f3fa75..d246062f70 100644
--- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts
+++ b/ng2-components/ng2-alfresco-search/src/components/search.component.spec.ts
@@ -22,14 +22,14 @@ import { AlfrescoTranslationService, CoreModule, NotificationService } from 'ng2
 import { DocumentListModule } from 'ng2-alfresco-documentlist';
 import { PermissionModel } from 'ng2-alfresco-documentlist';
 import { Observable } from 'rxjs/Rx';
-import { AlfrescoSearchService } from '../services/alfresco-search.service';
+import { SearchService } from '../services/search.service';
 import { TranslationMock } from './../assets/translation.service.mock';
-import { AlfrescoSearchComponent } from './alfresco-search.component';
+import { SearchComponent } from './search.component';
 
-describe('AlfrescoSearchComponent', () => {
+describe('SearchComponent', () => {
 
-    let fixture: ComponentFixture<AlfrescoSearchComponent>, element: HTMLElement;
-    let component: AlfrescoSearchComponent;
+    let fixture: ComponentFixture<SearchComponent>, element: HTMLElement;
+    let component: SearchComponent;
 
     let result = {
         list: {
@@ -102,14 +102,14 @@ describe('AlfrescoSearchComponent', () => {
                 CoreModule.forRoot(),
                 DocumentListModule.forRoot()
             ],
-            declarations: [AlfrescoSearchComponent], // declare the test component
+            declarations: [SearchComponent], // declare the test component
             providers: [
-                AlfrescoSearchService,
+                SearchService,
                 {provide: AlfrescoTranslationService, useClass: TranslationMock},
                 {provide: NotificationService, useClass: NotificationService}
             ]
         }).compileComponents().then(() => {
-            fixture = TestBed.createComponent(AlfrescoSearchComponent);
+            fixture = TestBed.createComponent(SearchComponent);
             component = fixture.componentInstance;
             element = fixture.nativeElement;
         });
@@ -128,7 +128,7 @@ describe('AlfrescoSearchComponent', () => {
             {provide: ActivatedRoute, useValue: {params: Observable.from([{q: 'exampleTerm692'}])}}
         ]);
 
-        let search = new AlfrescoSearchComponent(null, null, null, injector.get(ActivatedRoute));
+        let search = new SearchComponent(null, null, null, injector.get(ActivatedRoute));
 
         search.ngOnInit();
 
@@ -170,7 +170,7 @@ describe('AlfrescoSearchComponent', () => {
             component.searchTerm = searchTerm;
             component.rootNodeId = '-my-';
             component.resultType = 'my:type';
-            let searchService = fixture.debugElement.injector.get(AlfrescoSearchService);
+            let searchService = fixture.debugElement.injector.get(SearchService);
             spyOn(searchService, 'getQueryNodesPromise')
                 .and.returnValue(Promise.resolve(result));
             fixture.detectChanges();
@@ -184,7 +184,7 @@ describe('AlfrescoSearchComponent', () => {
 
         it('should display search results when a search term is provided', (done) => {
 
-            let searchService = TestBed.get(AlfrescoSearchService);
+            let searchService = TestBed.get(SearchService);
             spyOn(searchService, 'getQueryNodesPromise').and.returnValue(Promise.resolve(result));
             component.searchTerm = '';
 
@@ -205,7 +205,7 @@ describe('AlfrescoSearchComponent', () => {
 
         it('should display no result if no result are returned', (done) => {
 
-            let searchService = TestBed.get(AlfrescoSearchService);
+            let searchService = TestBed.get(SearchService);
             spyOn(searchService, 'getQueryNodesPromise')
                 .and.returnValue(Promise.resolve(noResult));
 
@@ -227,7 +227,7 @@ describe('AlfrescoSearchComponent', () => {
 
         it('should display an error if an error is encountered running the search', (done) => {
 
-            let searchService = TestBed.get(AlfrescoSearchService);
+            let searchService = TestBed.get(SearchService);
             spyOn(searchService, 'getQueryNodesPromise')
                 .and.returnValue(Promise.reject(errorJson));
 
@@ -252,7 +252,7 @@ describe('AlfrescoSearchComponent', () => {
 
         it('should update search results when the search term input is changed', (done) => {
 
-            let searchService = TestBed.get(AlfrescoSearchService);
+            let searchService = TestBed.get(SearchService);
             spyOn(searchService, 'getQueryNodesPromise')
                 .and.returnValue(Promise.resolve(result));
 
@@ -278,13 +278,13 @@ describe('AlfrescoSearchComponent', () => {
     describe('search result interactions', () => {
 
         let debugElement: DebugElement;
-        let searchService: AlfrescoSearchService;
+        let searchService: SearchService;
         let querySpy: jasmine.Spy;
         let emitSpy: jasmine.Spy;
 
         beforeEach(() => {
             debugElement = fixture.debugElement;
-            searchService = TestBed.get(AlfrescoSearchService);
+            searchService = TestBed.get(SearchService);
             querySpy = spyOn(searchService, 'getQueryNodesPromise').and.returnValue(Promise.resolve(result));
             emitSpy = spyOn(component.preview, 'emit');
         });
@@ -292,7 +292,7 @@ describe('AlfrescoSearchComponent', () => {
         describe('click results', () => {
 
             beforeEach(() => {
-                component.navigationMode = AlfrescoSearchComponent.SINGLE_CLICK_NAVIGATION;
+                component.navigationMode = SearchComponent.SINGLE_CLICK_NAVIGATION;
             });
 
             it('should emit preview event when file item clicked', (done) => {
@@ -340,7 +340,7 @@ describe('AlfrescoSearchComponent', () => {
         describe('double click results', () => {
 
             beforeEach(() => {
-                component.navigationMode = AlfrescoSearchComponent.DOUBLE_CLICK_NAVIGATION;
+                component.navigationMode = SearchComponent.DOUBLE_CLICK_NAVIGATION;
             });
 
             it('should emit preview event when file item clicked', (done) => {
diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts b/ng2-components/ng2-alfresco-search/src/components/search.component.ts
similarity index 92%
rename from ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts
rename to ng2-components/ng2-alfresco-search/src/components/search.component.ts
index e0420928d1..d7b4c2f20c 100644
--- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts
+++ b/ng2-components/ng2-alfresco-search/src/components/search.component.ts
@@ -20,14 +20,14 @@ import { ActivatedRoute, Params } from '@angular/router';
 import { NodePaging, Pagination } from 'alfresco-js-api';
 import { AlfrescoTranslationService, NotificationService } from 'ng2-alfresco-core';
 import { PermissionModel } from 'ng2-alfresco-documentlist';
-import { AlfrescoSearchService, SearchOptions } from './../services/alfresco-search.service';
+import { SearchOptions, SearchService } from './../services/search.service';
 
 @Component({
     selector: 'adf-search, alfresco-search',
-    styleUrls: ['./alfresco-search.component.css'],
-    templateUrl: './alfresco-search.component.html'
+    styleUrls: ['./search.component.css'],
+    templateUrl: './search.component.html'
 })
-export class AlfrescoSearchComponent implements OnChanges, OnInit {
+export class SearchComponent implements OnChanges, OnInit {
 
     static SINGLE_CLICK_NAVIGATION: string = 'click';
     static DOUBLE_CLICK_NAVIGATION: string = 'dblclick';
@@ -48,7 +48,7 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit {
     resultType: string = null;
 
     @Input()
-    navigationMode: string = AlfrescoSearchComponent.DOUBLE_CLICK_NAVIGATION; // click|dblclick
+    navigationMode: string = SearchComponent.DOUBLE_CLICK_NAVIGATION; // click|dblclick
 
     @Input()
     emptyFolderImageUrl: string = require('../assets/images/empty_doc_lib.svg');
@@ -65,7 +65,7 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit {
     skipCount: number = 0;
     nodeResults: NodePaging;
 
-    constructor(private searchService: AlfrescoSearchService,
+    constructor(private searchService: SearchService,
                 private translateService: AlfrescoTranslationService,
                 private notificationService: NotificationService,
                 @Optional() private route: ActivatedRoute) {
diff --git a/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.spec.ts b/ng2-components/ng2-alfresco-search/src/services/search.service.spec.ts
similarity index 91%
rename from ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.spec.ts
rename to ng2-components/ng2-alfresco-search/src/services/search.service.spec.ts
index 029081b0b2..f8e9a9aa08 100644
--- a/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.spec.ts
+++ b/ng2-components/ng2-alfresco-search/src/services/search.service.spec.ts
@@ -17,14 +17,14 @@
 
 import { async, TestBed } from '@angular/core/testing';
 import { AlfrescoApiService, CoreModule } from 'ng2-alfresco-core';
-import { fakeApi, fakeError, fakeSearch } from '../assets/alfresco-search.service.mock';
-import { AlfrescoSearchService } from './alfresco-search.service';
+import { fakeApi, fakeError, fakeSearch } from '../assets/search.service.mock';
+import { SearchService } from './search.service';
 
 declare let jasmine: any;
 
-describe('AlfrescoSearchService', () => {
+describe('SearchService', () => {
 
-    let service: AlfrescoSearchService;
+    let service: SearchService;
     let apiService: AlfrescoApiService;
 
     beforeEach(async(() => {
@@ -33,13 +33,13 @@ describe('AlfrescoSearchService', () => {
                 CoreModule
             ],
             providers: [
-                AlfrescoSearchService
+                SearchService
             ]
         }).compileComponents();
     }));
 
     beforeEach(() => {
-        service = TestBed.get(AlfrescoSearchService);
+        service = TestBed.get(SearchService);
         apiService = TestBed.get(AlfrescoApiService);
         spyOn(apiService, 'getInstance').and.returnValue(fakeApi);
     });
diff --git a/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts b/ng2-components/ng2-alfresco-search/src/services/search.service.ts
similarity index 98%
rename from ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts
rename to ng2-components/ng2-alfresco-search/src/services/search.service.ts
index 688c57bb9b..b7792c05e1 100644
--- a/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts
+++ b/ng2-components/ng2-alfresco-search/src/services/search.service.ts
@@ -24,7 +24,7 @@ import { Observable } from 'rxjs/Rx';
  * Internal service used by Document List component.
  */
 @Injectable()
-export class AlfrescoSearchService {
+export class SearchService {
 
     constructor(public authService: AlfrescoAuthenticationService,
                 private apiService: AlfrescoApiService) {
diff --git a/ng2-components/ng2-alfresco-tag/index.ts b/ng2-components/ng2-alfresco-tag/index.ts
index 40e11ac740..0e017f184a 100644
--- a/ng2-components/ng2-alfresco-tag/index.ts
+++ b/ng2-components/ng2-alfresco-tag/index.ts
@@ -24,14 +24,20 @@ import { TagListComponent } from './src/components/tag-list.component';
 import { TagNodeListComponent } from './src/components/tag-node-list.component';
 import { TagService } from './src/services/tag.service';
 
-export * from './src/components/tag-actions.component';
-export * from './src/components/tag-list.component';
-export * from './src/components/tag-node-list.component';
-export * from './src/services/tag.service';
+export { TagActionsComponent } from './src/components/tag-actions.component';
+export { TagListComponent } from './src/components/tag-list.component';
+export { TagNodeListComponent } from './src/components/tag-node-list.component';
+export { TagService } from './src/services/tag.service';
+import { TagListComponent as TagList } from './src/components/tag-list.component';
+export { TagNodeListComponent as TagNodeList } from './src/components/tag-node-list.component';
+export { TagListComponent as TagList } from './src/components/tag-list.component';
 
 export const TAG_DIRECTIVES: any[] = [
     TagActionsComponent,
     TagListComponent,
+
+    // Old Deprecated export
+    TagList,
     TagNodeListComponent
 ];
 
diff --git a/ng2-components/package.json b/ng2-components/package.json
index 0c26289825..0a2103d8d7 100644
--- a/ng2-components/package.json
+++ b/ng2-components/package.json
@@ -127,8 +127,6 @@
     "karma-systemjs": "^0.16.0",
     "karma-webpack": "^2.0.2",
     "loader-utils": "^1.1.0",
-    "markdown-toc": "1.1.0",
-    "markdownlint-cli": "^0.3.1",
     "merge-stream": "1.0.1",
     "node-sass": "4.5.3",
     "null-loader": "^0.1.1",
@@ -152,7 +150,9 @@
     "webpack": "^2.2.1",
     "webpack-dev-server": "^2.3.0",
     "webpack-merge": "2.6.1",
-    "wsrv": "0.1.7"
+    "wsrv": "0.1.7",
+    "markdown-toc": "1.1.0",
+    "markdownlint-cli": "^0.3.1"
   },
   "license": "Apache-2.0",
   "module": "./index.js",
diff --git a/ng2-components/tslint.json b/ng2-components/tslint.json
index b9260b027b..8037ec312f 100644
--- a/ng2-components/tslint.json
+++ b/ng2-components/tslint.json
@@ -1,6 +1,7 @@
 {
     "rulesDirectory": [
-        "node_modules/codelyzer"
+        "node_modules/codelyzer",
+        "adf-rules"
     ],
     "rules": {
         "align": [
@@ -152,6 +153,8 @@
         "directive-class-suffix": true,
         "no-access-missing-member": false,
         "templates-use-public": true,
-        "invoke-injectable": true
+        "invoke-injectable": true,
+        "adf-file-name": true,
+        "adf-class-name": true
     }
 }