diff --git a/docs/DataTableAdapter.md b/docs/DataTableAdapter.md
index 4bf1673ecc..1bc1761ce5 100644
--- a/docs/DataTableAdapter.md
+++ b/docs/DataTableAdapter.md
@@ -1,7 +1,7 @@
 # DataTableAdapter interface
 
 Defines how table data is supplied to [DataTable](datatable.component.md)
-and [Tasklist](tasklist.component.md) components.
+and [Tasklist](task-list.component.md) components.
 
 <!-- markdown-toc start - Don't edit this section.  npm run toc to generate it-->
 
@@ -48,7 +48,7 @@ Sort the table with a specified key and direction (ascending or descending).
 ## Details
 
 You can implement DataTableAdapter in your own class to display your data with the [DataTable](datatable.component.md)
-and [Tasklist](tasklist.component.md) components.
+and [Tasklist](task-list.component.md) components.
 This interface (along with other interfaces for column and row data) hides the details of your class from the caller, so you can store your data internally however you like. The DataTable library implements the interface in the [ObjectDataTableAdapter](#objectdatatableadapter) class which is the standard adapter for the Datatable component.
 
 The basic idea of DataTableAdapter is that the caller can request your class to return an array of column
@@ -162,5 +162,5 @@ let schema = ObjectDataTableAdapter.generateSchema(data);
 ## See also
 
 - [Datatable component](datatable.component.md)
-- [Tasklist component](tasklist.component.md)
+- [Tasklist component](task-list.component.md)
 <!-- seealso end -->
\ No newline at end of file
diff --git a/docs/README.md b/docs/README.md
index 17e7d4af91..2dffe17fed 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -280,7 +280,7 @@ for more information about installing and using the source code.
 - [Task details component](task-details.component.md)
 - [Task filters component](task-filters.component.md)
 - [Task header component](task-header.component.md)
-- [Tasklist component](tasklist.component.md)
+- [Tasklist component](task-list.component.md)
 - [*Comment list component](../ng2-components/ng2-activiti-tasklist/src/components/comment-list.component.ts)
 - [*People list component](../ng2-components/ng2-activiti-tasklist/src/components/people-list.component.ts)
 
diff --git a/docs/data-column.component.md b/docs/data-column.component.md
index e8fb893b16..1affd97672 100644
--- a/docs/data-column.component.md
+++ b/docs/data-column.component.md
@@ -295,5 +295,5 @@ Now you can declare columns and assign `desktop-only` class where needed:
 
 - [Document list component](document-list.component.md)
 - [Datatable component](datatable.component.md)
-- [Tasklist component](tasklist.component.md)
+- [Tasklist component](task-list.component.md)
 <!-- seealso end -->
\ No newline at end of file
diff --git a/docs/seeAlsoGraph.json b/docs/seeAlsoGraph.json
index bb7c370272..e6482a16ac 100644
--- a/docs/seeAlsoGraph.json
+++ b/docs/seeAlsoGraph.json
@@ -18,12 +18,12 @@
     "context-menu.directive": [],
     "create-process-attachment.component": [],
     "create-task-attachment.component": [],
-    "data-column.component": ["document-list.component", "datatable.component", "tasklist.component"],
+    "data-column.component": ["document-list.component", "datatable.component", "task-list.component"],
     "datatable.component": [
         "data-column.component",
         "pagination.component"
     ],
-    "DataTableAdapter": ["datatable.component", "tasklist.component"],
+    "DataTableAdapter": ["datatable.component", "task-list.component"],
     "diagram.component": [],
     "document-actions.service": [],
     "document-list.component": [
@@ -86,7 +86,7 @@
     "task-details.model": [],
     "task-filters.component": [],
     "task-header.component": [],
-    "tasklist.component": [],
+    "task-list.component": [],
     "theming": [],
     "toolbar-divider.component": [],
     "toolbar-title.component": [],
diff --git a/docs/tasklist.component.md b/docs/task-list.component.md
similarity index 100%
rename from docs/tasklist.component.md
rename to docs/task-list.component.md
diff --git a/ng2-components/ng2-activiti-tasklist/index.ts b/ng2-components/ng2-activiti-tasklist/index.ts
index 6ecf695073..acbf455d7d 100644
--- a/ng2-components/ng2-activiti-tasklist/index.ts
+++ b/ng2-components/ng2-activiti-tasklist/index.ts
@@ -41,10 +41,10 @@ import { TaskAuditDirective } from './src/components/task-audit.directive';
 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';
+import { TaskListComponent } from './src/components/task-list.component';
 
 export {AppsListComponent } from './src/components/apps-list.component';
-export {TaskListComponent } from './src/components/tasklist.component';
+export {TaskListComponent } from './src/components/task-list.component';
 export {ChecklistComponent } from './src/components/checklist.component';
 export {CommentsComponent } from './src/components/comments.component';
 export {TaskAttachmentListComponent} from './src/components/task-attachment-list.component';
@@ -76,7 +76,7 @@ import {StartTaskComponent as ActivitiStartTaskButton } from './src/components/s
 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 {TaskListComponent as ActivitiTaskList } from './src/components/task-list.component';
 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';
@@ -90,7 +90,7 @@ export {StartTaskComponent as ActivitiStartTaskButton } from './src/components/s
 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 {TaskListComponent as ActivitiTaskList } from './src/components/task-list.component';
 export {TaskListService as ActivitiTaskListService } from './src/services/tasklist.service';
 
 export * from './src/models/filter.model';
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.css b/ng2-components/ng2-activiti-tasklist/src/components/task-list.component.css
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.css
rename to ng2-components/ng2-activiti-tasklist/src/components/task-list.component.css
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.html b/ng2-components/ng2-activiti-tasklist/src/components/task-list.component.html
similarity index 100%
rename from ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.html
rename to ng2-components/ng2-activiti-tasklist/src/components/task-list.component.html
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/task-list.component.spec.ts
similarity index 99%
rename from ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.spec.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/task-list.component.spec.ts
index ea150ff94c..22be0e97f5 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.spec.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/task-list.component.spec.ts
@@ -23,7 +23,7 @@ import { DataTableModule } from 'ng2-alfresco-datatable';
 import { DataRowEvent, ObjectDataRow, ObjectDataTableAdapter } from 'ng2-alfresco-datatable';
 import { TranslationMock } from '../assets/translation.service.mock';
 import { TaskListService } from '../services/tasklist.service';
-import { TaskListComponent } from './tasklist.component';
+import { TaskListComponent } from './task-list.component';
 
 declare let jasmine: any;
 
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/task-list.component.ts
similarity index 99%
rename from ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.ts
rename to ng2-components/ng2-activiti-tasklist/src/components/task-list.component.ts
index a615a90e17..ec224bab0d 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/task-list.component.ts
@@ -26,8 +26,8 @@ import { TaskListService } from './../services/tasklist.service';
 const DEFAULT_SIZE = 5;
 @Component({
     selector: 'adf-tasklist, activiti-tasklist',
-    templateUrl: './tasklist.component.html',
-    styleUrls: ['./tasklist.component.css']
+    templateUrl: './task-list.component.html',
+    styleUrls: ['./task-list.component.css']
 })
 export class TaskListComponent implements OnChanges, OnInit, AfterContentInit {