Rename all models

11 files changed, 201 insertions, 201 deletions

diff --git a/tests/units/Filter/ProjectActivityCreationDateFilterTest.php b/tests/units/Filter/ProjectActivityCreationDateFilterTest.php
index 1dce4451..716d58bd 100644
--- a/tests/units/Filter/ProjectActivityCreationDateFilterTest.php
+++ b/tests/units/Filter/ProjectActivityCreationDateFilterTest.php
@@ -1,11 +1,11 @@
 <?php
 
 use Kanboard\Filter\ProjectActivityCreationDateFilter;
-use Kanboard\Model\Project;
-use Kanboard\Model\ProjectActivity;
-use Kanboard\Model\TaskCreation;
-use Kanboard\Model\TaskFinder;
-use Kanboard\Model\Task;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\ProjectActivityModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\TaskFinderModel;
+use Kanboard\Model\TaskModel;
 
 require_once __DIR__.'/../Base.php';
 
@@ -13,14 +13,14 @@ class ProjectActivityCreationDateFilterTest extends Base
 {
     public function testWithToday()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $projectModel = new Project($this->container);
-        $projectActivityModel = new ProjectActivity($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $projectActivityModel = new ProjectActivityModel($this->container);
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
         $this->assertEquals(1, $taskCreation->create(array('title' => 'Test', 'project_id' => 1)));
-        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, Task::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
+        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, TaskModel::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
 
         $query = $projectActivityModel->getQuery();
         $filter = new ProjectActivityCreationDateFilter('today');
@@ -33,14 +33,14 @@ class ProjectActivityCreationDateFilterTest extends Base
 
     public function testWithYesterday()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $projectModel = new Project($this->container);
-        $projectActivityModel = new ProjectActivity($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $projectActivityModel = new ProjectActivityModel($this->container);
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
         $this->assertEquals(1, $taskCreation->create(array('title' => 'Test', 'project_id' => 1)));
-        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, Task::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
+        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, TaskModel::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
 
         $query = $projectActivityModel->getQuery();
         $filter = new ProjectActivityCreationDateFilter('yesterday');
@@ -53,14 +53,14 @@ class ProjectActivityCreationDateFilterTest extends Base
 
     public function testWithStrtotimeString()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $projectModel = new Project($this->container);
-        $projectActivityModel = new ProjectActivity($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $projectActivityModel = new ProjectActivityModel($this->container);
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
         $this->assertEquals(1, $taskCreation->create(array('title' => 'Test', 'project_id' => 1)));
-        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, Task::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
+        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, TaskModel::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
 
         $query = $projectActivityModel->getQuery();
         $filter = new ProjectActivityCreationDateFilter('<=last week');
@@ -73,14 +73,14 @@ class ProjectActivityCreationDateFilterTest extends Base
 
     public function testWithIsoDate()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $projectModel = new Project($this->container);
-        $projectActivityModel = new ProjectActivity($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $projectActivityModel = new ProjectActivityModel($this->container);
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
         $this->assertEquals(1, $taskCreation->create(array('title' => 'Test', 'project_id' => 1)));
-        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, Task::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
+        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, TaskModel::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
 
         $query = $projectActivityModel->getQuery();
         $filter = new ProjectActivityCreationDateFilter(date('Y-m-d'));
@@ -93,14 +93,14 @@ class ProjectActivityCreationDateFilterTest extends Base
 
     public function testWithOperatorAndIsoDate()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $projectModel = new Project($this->container);
-        $projectActivityModel = new ProjectActivity($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $projectActivityModel = new ProjectActivityModel($this->container);
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
         $this->assertEquals(1, $taskCreation->create(array('title' => 'Test', 'project_id' => 1)));
-        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, Task::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
+        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, TaskModel::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
 
         $query = $projectActivityModel->getQuery();
         $filter = new ProjectActivityCreationDateFilter('>='.date('Y-m-d'));
diff --git a/tests/units/Filter/ProjectActivityCreatorFilterTest.php b/tests/units/Filter/ProjectActivityCreatorFilterTest.php
index 99c70322..65281d06 100644
--- a/tests/units/Filter/ProjectActivityCreatorFilterTest.php
+++ b/tests/units/Filter/ProjectActivityCreatorFilterTest.php
@@ -1,11 +1,11 @@
 <?php
 
 use Kanboard\Filter\ProjectActivityCreatorFilter;
-use Kanboard\Model\Project;
-use Kanboard\Model\ProjectActivity;
-use Kanboard\Model\TaskCreation;
-use Kanboard\Model\TaskFinder;
-use Kanboard\Model\Task;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\ProjectActivityModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\TaskFinderModel;
+use Kanboard\Model\TaskModel;
 
 require_once __DIR__.'/../Base.php';
 
@@ -13,14 +13,14 @@ class ProjectActivityCreatorFilterTest extends Base
 {
     public function testWithUsername()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $projectModel = new Project($this->container);
-        $projectActivityModel = new ProjectActivity($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $projectActivityModel = new ProjectActivityModel($this->container);
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
         $this->assertEquals(1, $taskCreation->create(array('title' => 'Test', 'project_id' => 1)));
-        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, Task::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
+        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, TaskModel::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
 
         $query = $projectActivityModel->getQuery();
         $filter = new ProjectActivityCreatorFilter('admin');
@@ -32,14 +32,14 @@ class ProjectActivityCreatorFilterTest extends Base
 
     public function testWithAnotherUsername()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $projectModel = new Project($this->container);
-        $projectActivityModel = new ProjectActivity($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $projectActivityModel = new ProjectActivityModel($this->container);
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
         $this->assertEquals(1, $taskCreation->create(array('title' => 'Test', 'project_id' => 1)));
-        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, Task::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
+        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, TaskModel::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
 
         $query = $projectActivityModel->getQuery();
         $filter = new ProjectActivityCreatorFilter('John Doe');
@@ -51,14 +51,14 @@ class ProjectActivityCreatorFilterTest extends Base
 
     public function testWithCurrentUser()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $projectModel = new Project($this->container);
-        $projectActivityModel = new ProjectActivity($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $projectActivityModel = new ProjectActivityModel($this->container);
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
         $this->assertEquals(1, $taskCreation->create(array('title' => 'Test', 'project_id' => 1)));
-        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, Task::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
+        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, TaskModel::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
 
         $query = $projectActivityModel->getQuery();
         $filter = new ProjectActivityCreatorFilter('me');
@@ -71,14 +71,14 @@ class ProjectActivityCreatorFilterTest extends Base
 
     public function testWithAnotherCurrentUser()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $projectModel = new Project($this->container);
-        $projectActivityModel = new ProjectActivity($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $projectActivityModel = new ProjectActivityModel($this->container);
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
         $this->assertEquals(1, $taskCreation->create(array('title' => 'Test', 'project_id' => 1)));
-        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, Task::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
+        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, TaskModel::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
 
         $query = $projectActivityModel->getQuery();
         $filter = new ProjectActivityCreatorFilter('me');
diff --git a/tests/units/Filter/ProjectActivityProjectIdFilterTest.php b/tests/units/Filter/ProjectActivityProjectIdFilterTest.php
index 193852e1..75e6fa70 100644
--- a/tests/units/Filter/ProjectActivityProjectIdFilterTest.php
+++ b/tests/units/Filter/ProjectActivityProjectIdFilterTest.php
@@ -1,11 +1,11 @@
 <?php
 
 use Kanboard\Filter\ProjectActivityProjectIdFilter;
-use Kanboard\Model\Project;
-use Kanboard\Model\ProjectActivity;
-use Kanboard\Model\TaskCreation;
-use Kanboard\Model\TaskFinder;
-use Kanboard\Model\Task;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\ProjectActivityModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\TaskFinderModel;
+use Kanboard\Model\TaskModel;
 
 require_once __DIR__.'/../Base.php';
 
@@ -13,10 +13,10 @@ class ProjectActivityProjectIdFilterTest extends Base
 {
     public function testFilterByProjectId()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $projectModel = new Project($this->container);
-        $projectActivityModel = new ProjectActivity($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $projectActivityModel = new ProjectActivityModel($this->container);
         $query = $projectActivityModel->getQuery();
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
@@ -25,8 +25,8 @@ class ProjectActivityProjectIdFilterTest extends Base
         $this->assertEquals(1, $taskCreation->create(array('title' => 'Test', 'project_id' => 1)));
         $this->assertEquals(2, $taskCreation->create(array('title' => 'Test', 'project_id' => 2)));
 
-        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, Task::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
-        $this->assertNotFalse($projectActivityModel->createEvent(2, 2, 1, Task::EVENT_CREATE, array('task' => $taskFinder->getById(2))));
+        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, TaskModel::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
+        $this->assertNotFalse($projectActivityModel->createEvent(2, 2, 1, TaskModel::EVENT_CREATE, array('task' => $taskFinder->getById(2))));
 
         $filter = new ProjectActivityProjectIdFilter(1);
         $filter->withQuery($query)->apply();
diff --git a/tests/units/Filter/ProjectActivityProjectIdsFilterTest.php b/tests/units/Filter/ProjectActivityProjectIdsFilterTest.php
index e99d2e2f..b5c4683d 100644
--- a/tests/units/Filter/ProjectActivityProjectIdsFilterTest.php
+++ b/tests/units/Filter/ProjectActivityProjectIdsFilterTest.php
@@ -1,11 +1,11 @@
 <?php
 
 use Kanboard\Filter\ProjectActivityProjectIdsFilter;
-use Kanboard\Model\Project;
-use Kanboard\Model\ProjectActivity;
-use Kanboard\Model\TaskCreation;
-use Kanboard\Model\TaskFinder;
-use Kanboard\Model\Task;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\ProjectActivityModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\TaskFinderModel;
+use Kanboard\Model\TaskModel;
 
 require_once __DIR__.'/../Base.php';
 
@@ -13,10 +13,10 @@ class ProjectActivityProjectIdsFilterTest extends Base
 {
     public function testFilterByProjectIds()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $projectModel = new Project($this->container);
-        $projectActivityModel = new ProjectActivity($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $projectActivityModel = new ProjectActivityModel($this->container);
         $query = $projectActivityModel->getQuery();
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
@@ -27,9 +27,9 @@ class ProjectActivityProjectIdsFilterTest extends Base
         $this->assertEquals(2, $taskCreation->create(array('title' => 'Test', 'project_id' => 2)));
         $this->assertEquals(3, $taskCreation->create(array('title' => 'Test', 'project_id' => 3)));
 
-        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, Task::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
-        $this->assertNotFalse($projectActivityModel->createEvent(2, 2, 1, Task::EVENT_CREATE, array('task' => $taskFinder->getById(2))));
-        $this->assertNotFalse($projectActivityModel->createEvent(3, 3, 1, Task::EVENT_CREATE, array('task' => $taskFinder->getById(3))));
+        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, TaskModel::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
+        $this->assertNotFalse($projectActivityModel->createEvent(2, 2, 1, TaskModel::EVENT_CREATE, array('task' => $taskFinder->getById(2))));
+        $this->assertNotFalse($projectActivityModel->createEvent(3, 3, 1, TaskModel::EVENT_CREATE, array('task' => $taskFinder->getById(3))));
 
         $filter = new ProjectActivityProjectIdsFilter(array(1, 2));
         $filter->withQuery($query)->apply();
@@ -38,10 +38,10 @@ class ProjectActivityProjectIdsFilterTest extends Base
 
     public function testWithEmptyArgument()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $projectModel = new Project($this->container);
-        $projectActivityModel = new ProjectActivity($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $projectActivityModel = new ProjectActivityModel($this->container);
         $query = $projectActivityModel->getQuery();
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
@@ -52,9 +52,9 @@ class ProjectActivityProjectIdsFilterTest extends Base
         $this->assertEquals(2, $taskCreation->create(array('title' => 'Test', 'project_id' => 2)));
         $this->assertEquals(3, $taskCreation->create(array('title' => 'Test', 'project_id' => 3)));
 
-        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, Task::EVENT_CREATE, $taskFinder->getById(1)));
-        $this->assertNotFalse($projectActivityModel->createEvent(2, 2, 1, Task::EVENT_CREATE, $taskFinder->getById(2)));
-        $this->assertNotFalse($projectActivityModel->createEvent(3, 3, 1, Task::EVENT_CREATE, $taskFinder->getById(3)));
+        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, TaskModel::EVENT_CREATE, $taskFinder->getById(1)));
+        $this->assertNotFalse($projectActivityModel->createEvent(2, 2, 1, TaskModel::EVENT_CREATE, $taskFinder->getById(2)));
+        $this->assertNotFalse($projectActivityModel->createEvent(3, 3, 1, TaskModel::EVENT_CREATE, $taskFinder->getById(3)));
 
         $filter = new ProjectActivityProjectIdsFilter(array());
         $filter->withQuery($query)->apply();
diff --git a/tests/units/Filter/ProjectActivityProjectNameFilterTest.php b/tests/units/Filter/ProjectActivityProjectNameFilterTest.php
index de9d7d59..3ec01bc0 100644
--- a/tests/units/Filter/ProjectActivityProjectNameFilterTest.php
+++ b/tests/units/Filter/ProjectActivityProjectNameFilterTest.php
@@ -1,11 +1,11 @@
 <?php
 
 use Kanboard\Filter\ProjectActivityProjectNameFilter;
-use Kanboard\Model\Project;
-use Kanboard\Model\ProjectActivity;
-use Kanboard\Model\TaskCreation;
-use Kanboard\Model\TaskFinder;
-use Kanboard\Model\Task;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\ProjectActivityModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\TaskFinderModel;
+use Kanboard\Model\TaskModel;
 
 require_once __DIR__.'/../Base.php';
 
@@ -13,10 +13,10 @@ class ProjectActivityProjectNameFilterTest extends Base
 {
     public function testFilterByProjectName()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $projectModel = new Project($this->container);
-        $projectActivityModel = new ProjectActivity($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $projectActivityModel = new ProjectActivityModel($this->container);
         $query = $projectActivityModel->getQuery();
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
@@ -25,8 +25,8 @@ class ProjectActivityProjectNameFilterTest extends Base
         $this->assertEquals(1, $taskCreation->create(array('title' => 'Test', 'project_id' => 1)));
         $this->assertEquals(2, $taskCreation->create(array('title' => 'Test', 'project_id' => 2)));
 
-        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, Task::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
-        $this->assertNotFalse($projectActivityModel->createEvent(2, 2, 1, Task::EVENT_CREATE, array('task' => $taskFinder->getById(2))));
+        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, TaskModel::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
+        $this->assertNotFalse($projectActivityModel->createEvent(2, 2, 1, TaskModel::EVENT_CREATE, array('task' => $taskFinder->getById(2))));
 
         $filter = new ProjectActivityProjectNameFilter('P1');
         $filter->withQuery($query)->apply();
diff --git a/tests/units/Filter/ProjectActivityTaskIdFilterTest.php b/tests/units/Filter/ProjectActivityTaskIdFilterTest.php
index 646cab1b..940d1c6f 100644
--- a/tests/units/Filter/ProjectActivityTaskIdFilterTest.php
+++ b/tests/units/Filter/ProjectActivityTaskIdFilterTest.php
@@ -1,11 +1,11 @@
 <?php
 
 use Kanboard\Filter\ProjectActivityTaskIdFilter;
-use Kanboard\Model\Project;
-use Kanboard\Model\ProjectActivity;
-use Kanboard\Model\TaskCreation;
-use Kanboard\Model\TaskFinder;
-use Kanboard\Model\Task;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\ProjectActivityModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\TaskFinderModel;
+use Kanboard\Model\TaskModel;
 
 require_once __DIR__.'/../Base.php';
 
@@ -13,10 +13,10 @@ class ProjectActivityTaskIdFilterTest extends Base
 {
     public function testFilterByTaskId()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $projectModel = new Project($this->container);
-        $projectActivityModel = new ProjectActivity($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $projectActivityModel = new ProjectActivityModel($this->container);
         $query = $projectActivityModel->getQuery();
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
@@ -24,8 +24,8 @@ class ProjectActivityTaskIdFilterTest extends Base
         $this->assertEquals(1, $taskCreation->create(array('title' => 'Test', 'project_id' => 1)));
         $this->assertEquals(2, $taskCreation->create(array('title' => 'Test', 'project_id' => 1)));
 
-        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, Task::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
-        $this->assertNotFalse($projectActivityModel->createEvent(1, 2, 1, Task::EVENT_CREATE, array('task' => $taskFinder->getById(2))));
+        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, TaskModel::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
+        $this->assertNotFalse($projectActivityModel->createEvent(1, 2, 1, TaskModel::EVENT_CREATE, array('task' => $taskFinder->getById(2))));
 
         $filter = new ProjectActivityTaskIdFilter(1);
         $filter->withQuery($query)->apply();
diff --git a/tests/units/Filter/ProjectActivityTaskStatusFilterTest.php b/tests/units/Filter/ProjectActivityTaskStatusFilterTest.php
index b8df6338..673a4990 100644
--- a/tests/units/Filter/ProjectActivityTaskStatusFilterTest.php
+++ b/tests/units/Filter/ProjectActivityTaskStatusFilterTest.php
@@ -1,12 +1,12 @@
 <?php
 
 use Kanboard\Filter\ProjectActivityTaskStatusFilter;
-use Kanboard\Model\Project;
-use Kanboard\Model\ProjectActivity;
-use Kanboard\Model\TaskCreation;
-use Kanboard\Model\TaskFinder;
-use Kanboard\Model\Task;
-use Kanboard\Model\TaskStatus;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\ProjectActivityModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\TaskFinderModel;
+use Kanboard\Model\TaskModel;
+use Kanboard\Model\TaskStatusModel;
 
 require_once __DIR__.'/../Base.php';
 
@@ -14,19 +14,19 @@ class ProjectActivityTaskStatusFilterTest extends Base
 {
     public function testFilterByTaskStatus()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $taskStatus = new TaskStatus($this->container);
-        $projectModel = new Project($this->container);
-        $projectActivityModel = new ProjectActivity($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $taskStatus = new TaskStatusModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $projectActivityModel = new ProjectActivityModel($this->container);
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
 
         $this->assertEquals(1, $taskCreation->create(array('title' => 'Test', 'project_id' => 1)));
         $this->assertEquals(2, $taskCreation->create(array('title' => 'Test', 'project_id' => 1)));
 
-        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, Task::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
-        $this->assertNotFalse($projectActivityModel->createEvent(1, 2, 1, Task::EVENT_CREATE, array('task' => $taskFinder->getById(2))));
+        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, TaskModel::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
+        $this->assertNotFalse($projectActivityModel->createEvent(1, 2, 1, TaskModel::EVENT_CREATE, array('task' => $taskFinder->getById(2))));
 
         $this->assertTrue($taskStatus->close(1));
 
diff --git a/tests/units/Filter/ProjectActivityTaskTitleFilterTest.php b/tests/units/Filter/ProjectActivityTaskTitleFilterTest.php
index 925a1ab2..f6217dba 100644
--- a/tests/units/Filter/ProjectActivityTaskTitleFilterTest.php
+++ b/tests/units/Filter/ProjectActivityTaskTitleFilterTest.php
@@ -1,11 +1,11 @@
 <?php
 
 use Kanboard\Filter\ProjectActivityTaskTitleFilter;
-use Kanboard\Model\Project;
-use Kanboard\Model\ProjectActivity;
-use Kanboard\Model\TaskCreation;
-use Kanboard\Model\TaskFinder;
-use Kanboard\Model\Task;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\ProjectActivityModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\TaskFinderModel;
+use Kanboard\Model\TaskModel;
 
 require_once __DIR__.'/../Base.php';
 
@@ -13,10 +13,10 @@ class ProjectActivityTaskTitleFilterTest extends Base
 {
     public function testWithFullTitle()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $projectModel = new Project($this->container);
-        $projectActivityModel = new ProjectActivity($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $projectActivityModel = new ProjectActivityModel($this->container);
         $query = $projectActivityModel->getQuery();
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
@@ -24,8 +24,8 @@ class ProjectActivityTaskTitleFilterTest extends Base
         $this->assertEquals(1, $taskCreation->create(array('title' => 'Test1', 'project_id' => 1)));
         $this->assertEquals(2, $taskCreation->create(array('title' => 'Test2', 'project_id' => 1)));
 
-        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, Task::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
-        $this->assertNotFalse($projectActivityModel->createEvent(1, 2, 1, Task::EVENT_CREATE, array('task' => $taskFinder->getById(2))));
+        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, TaskModel::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
+        $this->assertNotFalse($projectActivityModel->createEvent(1, 2, 1, TaskModel::EVENT_CREATE, array('task' => $taskFinder->getById(2))));
 
         $filter = new ProjectActivityTaskTitleFilter('test2');
         $filter->withQuery($query)->apply();
@@ -34,10 +34,10 @@ class ProjectActivityTaskTitleFilterTest extends Base
 
     public function testWithPartialTitle()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $projectModel = new Project($this->container);
-        $projectActivityModel = new ProjectActivity($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $projectActivityModel = new ProjectActivityModel($this->container);
         $query = $projectActivityModel->getQuery();
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
@@ -45,8 +45,8 @@ class ProjectActivityTaskTitleFilterTest extends Base
         $this->assertEquals(1, $taskCreation->create(array('title' => 'Test1', 'project_id' => 1)));
         $this->assertEquals(2, $taskCreation->create(array('title' => 'Test2', 'project_id' => 1)));
 
-        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, Task::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
-        $this->assertNotFalse($projectActivityModel->createEvent(1, 2, 1, Task::EVENT_CREATE, array('task' => $taskFinder->getById(2))));
+        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, TaskModel::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
+        $this->assertNotFalse($projectActivityModel->createEvent(1, 2, 1, TaskModel::EVENT_CREATE, array('task' => $taskFinder->getById(2))));
 
         $filter = new ProjectActivityTaskTitleFilter('test');
         $filter->withQuery($query)->apply();
@@ -55,10 +55,10 @@ class ProjectActivityTaskTitleFilterTest extends Base
 
     public function testWithId()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $projectModel = new Project($this->container);
-        $projectActivityModel = new ProjectActivity($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $projectActivityModel = new ProjectActivityModel($this->container);
         $query = $projectActivityModel->getQuery();
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
@@ -66,8 +66,8 @@ class ProjectActivityTaskTitleFilterTest extends Base
         $this->assertEquals(1, $taskCreation->create(array('title' => 'Test1', 'project_id' => 1)));
         $this->assertEquals(2, $taskCreation->create(array('title' => 'Test2', 'project_id' => 1)));
 
-        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, Task::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
-        $this->assertNotFalse($projectActivityModel->createEvent(1, 2, 1, Task::EVENT_CREATE, array('task' => $taskFinder->getById(2))));
+        $this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, TaskModel::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
+        $this->assertNotFalse($projectActivityModel->createEvent(1, 2, 1, TaskModel::EVENT_CREATE, array('task' => $taskFinder->getById(2))));
 
         $filter = new ProjectActivityTaskTitleFilter('#2');
         $filter->withQuery($query)->apply();
diff --git a/tests/units/Filter/TaskAssigneeFilterTest.php b/tests/units/Filter/TaskAssigneeFilterTest.php
index 356342c5..dec3824e 100644
--- a/tests/units/Filter/TaskAssigneeFilterTest.php
+++ b/tests/units/Filter/TaskAssigneeFilterTest.php
@@ -1,10 +1,10 @@
 <?php
 
 use Kanboard\Filter\TaskAssigneeFilter;
-use Kanboard\Model\Project;
-use Kanboard\Model\TaskCreation;
-use Kanboard\Model\TaskFinder;
-use Kanboard\Model\User;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\TaskFinderModel;
+use Kanboard\Model\UserModel;
 
 require_once __DIR__.'/../Base.php';
 
@@ -12,9 +12,9 @@ class TaskAssigneeFilterTest extends Base
 {
     public function testWithIntegerAssigneeId()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $projectModel = new Project($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
         $query = $taskFinder->getExtendedQuery();
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
@@ -37,9 +37,9 @@ class TaskAssigneeFilterTest extends Base
 
     public function testWithStringAssigneeId()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $projectModel = new Project($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
         $query = $taskFinder->getExtendedQuery();
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
@@ -62,9 +62,9 @@ class TaskAssigneeFilterTest extends Base
 
     public function testWithUsername()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $projectModel = new Project($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
         $query = $taskFinder->getExtendedQuery();
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
@@ -87,10 +87,10 @@ class TaskAssigneeFilterTest extends Base
 
     public function testWithName()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $projectModel = new Project($this->container);
-        $userModel = new User($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $userModel = new UserModel($this->container);
         $query = $taskFinder->getExtendedQuery();
 
         $this->assertEquals(2, $userModel->create(array('username' => 'foobar', 'name' => 'Foo Bar')));
@@ -114,9 +114,9 @@ class TaskAssigneeFilterTest extends Base
 
     public function testWithNobody()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $projectModel = new Project($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
         $query = $taskFinder->getExtendedQuery();
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
@@ -132,9 +132,9 @@ class TaskAssigneeFilterTest extends Base
 
     public function testWithCurrentUser()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $projectModel = new Project($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
         $query = $taskFinder->getExtendedQuery();
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
diff --git a/tests/units/Filter/TaskCommentFilterTest.php b/tests/units/Filter/TaskCommentFilterTest.php
index 8d1b7f44..95ffb32f 100644
--- a/tests/units/Filter/TaskCommentFilterTest.php
+++ b/tests/units/Filter/TaskCommentFilterTest.php
@@ -1,10 +1,10 @@
 <?php
 
 use Kanboard\Filter\TaskCommentFilter;
-use Kanboard\Model\Comment;
-use Kanboard\Model\Project;
-use Kanboard\Model\TaskCreation;
-use Kanboard\Model\TaskFinder;
+use Kanboard\Model\CommentModel;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\TaskFinderModel;
 
 require_once __DIR__.'/../Base.php';
 
@@ -12,10 +12,10 @@ class TaskCommentFilterTest extends Base
 {
     public function testMatch()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $commentModel = new Comment($this->container);
-        $projectModel = new Project($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $commentModel = new CommentModel($this->container);
+        $projectModel = new ProjectModel($this->container);
         $query = $taskFinder->getExtendedQuery();
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
@@ -32,10 +32,10 @@ class TaskCommentFilterTest extends Base
 
     public function testNoMatch()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $commentModel = new Comment($this->container);
-        $projectModel = new Project($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $commentModel = new CommentModel($this->container);
+        $projectModel = new ProjectModel($this->container);
         $query = $taskFinder->getExtendedQuery();
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
diff --git a/tests/units/Filter/TaskCreatorFilterTest.php b/tests/units/Filter/TaskCreatorFilterTest.php
index 1c344de7..b5abe6cf 100644
--- a/tests/units/Filter/TaskCreatorFilterTest.php
+++ b/tests/units/Filter/TaskCreatorFilterTest.php
@@ -1,10 +1,10 @@
 <?php
 
 use Kanboard\Filter\TaskCreatorFilter;
-use Kanboard\Model\Project;
-use Kanboard\Model\TaskCreation;
-use Kanboard\Model\TaskFinder;
-use Kanboard\Model\User;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\TaskFinderModel;
+use Kanboard\Model\UserModel;
 
 require_once __DIR__.'/../Base.php';
 
@@ -12,9 +12,9 @@ class TaskCreatorFilterTest extends Base
 {
     public function testWithIntegerAssigneeId()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $projectModel = new Project($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
         $query = $taskFinder->getExtendedQuery();
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
@@ -37,9 +37,9 @@ class TaskCreatorFilterTest extends Base
 
     public function testWithStringAssigneeId()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $projectModel = new Project($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
         $query = $taskFinder->getExtendedQuery();
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
@@ -62,9 +62,9 @@ class TaskCreatorFilterTest extends Base
 
     public function testWithUsername()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $projectModel = new Project($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
         $query = $taskFinder->getExtendedQuery();
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
@@ -87,10 +87,10 @@ class TaskCreatorFilterTest extends Base
 
     public function testWithName()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $projectModel = new Project($this->container);
-        $userModel = new User($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $userModel = new UserModel($this->container);
         $query = $taskFinder->getExtendedQuery();
 
         $this->assertEquals(2, $userModel->create(array('username' => 'foobar', 'name' => 'Foo Bar')));
@@ -114,9 +114,9 @@ class TaskCreatorFilterTest extends Base
 
     public function testWithNobody()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $projectModel = new Project($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
         $query = $taskFinder->getExtendedQuery();
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
@@ -132,9 +132,9 @@ class TaskCreatorFilterTest extends Base
 
     public function testWithCurrentUser()
     {
-        $taskFinder = new TaskFinder($this->container);
-        $taskCreation = new TaskCreation($this->container);
-        $projectModel = new Project($this->container);
+        $taskFinder = new TaskFinderModel($this->container);
+        $taskCreation = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
         $query = $taskFinder->getExtendedQuery();
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));