Rename all models

27 files changed, 89 insertions, 89 deletions

diff --git a/app/Action/CommentCreation.php b/app/Action/CommentCreation.php
index b91e39e2..60ca24f7 100644
--- a/app/Action/CommentCreation.php
+++ b/app/Action/CommentCreation.php
@@ -65,11 +65,11 @@ class CommentCreation extends Base
      */
     public function doAction(array $data)
     {
-        return (bool) $this->comment->create(array(
+        return (bool) $this->commentModel->create(array(
             'reference' => isset($data['reference']) ? $data['reference'] : '',
             'comment' => $data['comment'],
             'task_id' => $data['task_id'],
-            'user_id' => isset($data['user_id']) && $this->projectPermission->isAssignable($this->getProjectId(), $data['user_id']) ? $data['user_id'] : 0,
+            'user_id' => isset($data['user_id']) && $this->projectPermissionModel->isAssignable($this->getProjectId(), $data['user_id']) ? $data['user_id'] : 0,
         ));
     }
 
diff --git a/app/Action/CommentCreationMoveTaskColumn.php b/app/Action/CommentCreationMoveTaskColumn.php
index 11224d67..1b16f481 100644
--- a/app/Action/CommentCreationMoveTaskColumn.php
+++ b/app/Action/CommentCreationMoveTaskColumn.php
@@ -2,7 +2,7 @@
 
 namespace Kanboard\Action;
 
-use Kanboard\Model\Task;
+use Kanboard\Model\TaskModel;
 
 /**
  * Add a comment of the triggering event to the task description.
@@ -32,7 +32,7 @@ class CommentCreationMoveTaskColumn extends Base
     public function getCompatibleEvents()
     {
         return array(
-            Task::EVENT_MOVE_COLUMN,
+            TaskModel::EVENT_MOVE_COLUMN,
         );
     }
 
@@ -71,9 +71,9 @@ class CommentCreationMoveTaskColumn extends Base
             return false;
         }
 
-        $column = $this->column->getById($data['column_id']);
+        $column = $this->columnModel->getById($data['column_id']);
 
-        return (bool) $this->comment->create(array(
+        return (bool) $this->commentModel->create(array(
             'comment' => t('Moved to column %s', $column['title']),
             'task_id' => $data['task_id'],
             'user_id' => $this->userSession->getId(),
diff --git a/app/Action/TaskAssignCategoryColor.php b/app/Action/TaskAssignCategoryColor.php
index f5085cb0..fc486870 100644
--- a/app/Action/TaskAssignCategoryColor.php
+++ b/app/Action/TaskAssignCategoryColor.php
@@ -2,7 +2,7 @@
 
 namespace Kanboard\Action;
 
-use Kanboard\Model\Task;
+use Kanboard\Model\TaskModel;
 
 /**
  * Set a category automatically according to the color
@@ -32,7 +32,7 @@ class TaskAssignCategoryColor extends Base
     public function getCompatibleEvents()
     {
         return array(
-            Task::EVENT_CREATE_UPDATE,
+            TaskModel::EVENT_CREATE_UPDATE,
         );
     }
 
@@ -78,7 +78,7 @@ class TaskAssignCategoryColor extends Base
             'category_id' => $this->getParam('category_id'),
         );
 
-        return $this->taskModification->update($values);
+        return $this->taskModificationModel->update($values);
     }
 
     /**
diff --git a/app/Action/TaskAssignCategoryLabel.php b/app/Action/TaskAssignCategoryLabel.php
index 95fa116e..48299010 100644
--- a/app/Action/TaskAssignCategoryLabel.php
+++ b/app/Action/TaskAssignCategoryLabel.php
@@ -74,7 +74,7 @@ class TaskAssignCategoryLabel extends Base
             'category_id' => $this->getParam('category_id'),
         );
 
-        return $this->taskModification->update($values);
+        return $this->taskModificationModel->update($values);
     }
 
     /**
diff --git a/app/Action/TaskAssignCategoryLink.php b/app/Action/TaskAssignCategoryLink.php
index b39e41b4..6937edd1 100644
--- a/app/Action/TaskAssignCategoryLink.php
+++ b/app/Action/TaskAssignCategoryLink.php
@@ -2,7 +2,7 @@
 
 namespace Kanboard\Action;
 
-use Kanboard\Model\TaskLink;
+use Kanboard\Model\TaskLinkModel;
 
 /**
  * Set a category automatically according to a task link
@@ -33,7 +33,7 @@ class TaskAssignCategoryLink extends Base
     public function getCompatibleEvents()
     {
         return array(
-            TaskLink::EVENT_CREATE_UPDATE,
+            TaskLinkModel::EVENT_CREATE_UPDATE,
         );
     }
 
@@ -79,7 +79,7 @@ class TaskAssignCategoryLink extends Base
             'category_id' => $this->getParam('category_id'),
         );
 
-        return $this->taskModification->update($values);
+        return $this->taskModificationModel->update($values);
     }
 
     /**
@@ -92,7 +92,7 @@ class TaskAssignCategoryLink extends Base
     public function hasRequiredCondition(array $data)
     {
         if ($data['link_id'] == $this->getParam('link_id')) {
-            $task = $this->taskFinder->getById($data['task_id']);
+            $task = $this->taskFinderModel->getById($data['task_id']);
             return empty($task['category_id']);
         }
 
diff --git a/app/Action/TaskAssignColorCategory.php b/app/Action/TaskAssignColorCategory.php
index 139c24cb..284b8f40 100644
--- a/app/Action/TaskAssignColorCategory.php
+++ b/app/Action/TaskAssignColorCategory.php
@@ -2,7 +2,7 @@
 
 namespace Kanboard\Action;
 
-use Kanboard\Model\Task;
+use Kanboard\Model\TaskModel;
 
 /**
  * Assign a color to a specific category
@@ -32,7 +32,7 @@ class TaskAssignColorCategory extends Base
     public function getCompatibleEvents()
     {
         return array(
-            Task::EVENT_CREATE_UPDATE,
+            TaskModel::EVENT_CREATE_UPDATE,
         );
     }
 
@@ -78,7 +78,7 @@ class TaskAssignColorCategory extends Base
             'color_id' => $this->getParam('color_id'),
         );
 
-        return $this->taskModification->update($values, false);
+        return $this->taskModificationModel->update($values, false);
     }
 
     /**
diff --git a/app/Action/TaskAssignColorColumn.php b/app/Action/TaskAssignColorColumn.php
index 92412739..57fd6f44 100644
--- a/app/Action/TaskAssignColorColumn.php
+++ b/app/Action/TaskAssignColorColumn.php
@@ -2,7 +2,7 @@
 
 namespace Kanboard\Action;
 
-use Kanboard\Model\Task;
+use Kanboard\Model\TaskModel;
 
 /**
  * Assign a color to a task
@@ -32,8 +32,8 @@ class TaskAssignColorColumn extends Base
     public function getCompatibleEvents()
     {
         return array(
-            Task::EVENT_CREATE,
-            Task::EVENT_MOVE_COLUMN,
+            TaskModel::EVENT_CREATE,
+            TaskModel::EVENT_MOVE_COLUMN,
         );
     }
 
@@ -79,7 +79,7 @@ class TaskAssignColorColumn extends Base
             'color_id' => $this->getParam('color_id'),
         );
 
-        return $this->taskModification->update($values, false);
+        return $this->taskModificationModel->update($values, false);
     }
 
     /**
diff --git a/app/Action/TaskAssignColorLink.php b/app/Action/TaskAssignColorLink.php
index 12ceabb3..9ab5458b 100644
--- a/app/Action/TaskAssignColorLink.php
+++ b/app/Action/TaskAssignColorLink.php
@@ -2,7 +2,7 @@
 
 namespace Kanboard\Action;
 
-use Kanboard\Model\TaskLink;
+use Kanboard\Model\TaskLinkModel;
 
 /**
  * Assign a color to a specific task link
@@ -32,7 +32,7 @@ class TaskAssignColorLink extends Base
     public function getCompatibleEvents()
     {
         return array(
-            TaskLink::EVENT_CREATE_UPDATE,
+            TaskLinkModel::EVENT_CREATE_UPDATE,
         );
     }
 
@@ -78,7 +78,7 @@ class TaskAssignColorLink extends Base
             'color_id' => $this->getParam('color_id'),
         );
 
-        return $this->taskModification->update($values, false);
+        return $this->taskModificationModel->update($values, false);
     }
 
     /**
diff --git a/app/Action/TaskAssignColorPriority.php b/app/Action/TaskAssignColorPriority.php
index 2e24f9ef..eae1b771 100644
--- a/app/Action/TaskAssignColorPriority.php
+++ b/app/Action/TaskAssignColorPriority.php
@@ -2,7 +2,7 @@
 
 namespace Kanboard\Action;
 
-use Kanboard\Model\Task;
+use Kanboard\Model\TaskModel;
 
 /**
  * Assign a color to a priority
@@ -32,7 +32,7 @@ class TaskAssignColorPriority extends Base
     public function getCompatibleEvents()
     {
         return array(
-            Task::EVENT_CREATE_UPDATE,
+            TaskModel::EVENT_CREATE_UPDATE,
         );
     }
 
@@ -78,7 +78,7 @@ class TaskAssignColorPriority extends Base
             'color_id' => $this->getParam('color_id'),
         );
 
-        return $this->taskModification->update($values, false);
+        return $this->taskModificationModel->update($values, false);
     }
 
     /**
diff --git a/app/Action/TaskAssignColorUser.php b/app/Action/TaskAssignColorUser.php
index 6ec8ce95..4bcf7a5c 100644
--- a/app/Action/TaskAssignColorUser.php
+++ b/app/Action/TaskAssignColorUser.php
@@ -2,7 +2,7 @@
 
 namespace Kanboard\Action;
 
-use Kanboard\Model\Task;
+use Kanboard\Model\TaskModel;
 
 /**
  * Assign a color to a specific user
@@ -32,8 +32,8 @@ class TaskAssignColorUser extends Base
     public function getCompatibleEvents()
     {
         return array(
-            Task::EVENT_CREATE,
-            Task::EVENT_ASSIGNEE_CHANGE,
+            TaskModel::EVENT_CREATE,
+            TaskModel::EVENT_ASSIGNEE_CHANGE,
         );
     }
 
@@ -79,7 +79,7 @@ class TaskAssignColorUser extends Base
             'color_id' => $this->getParam('color_id'),
         );
 
-        return $this->taskModification->update($values, false);
+        return $this->taskModificationModel->update($values, false);
     }
 
     /**
diff --git a/app/Action/TaskAssignCurrentUser.php b/app/Action/TaskAssignCurrentUser.php
index 192a120c..997aa98f 100644
--- a/app/Action/TaskAssignCurrentUser.php
+++ b/app/Action/TaskAssignCurrentUser.php
@@ -2,7 +2,7 @@
 
 namespace Kanboard\Action;
 
-use Kanboard\Model\Task;
+use Kanboard\Model\TaskModel;
 
 /**
  * Assign a task to the logged user
@@ -32,7 +32,7 @@ class TaskAssignCurrentUser extends Base
     public function getCompatibleEvents()
     {
         return array(
-            Task::EVENT_CREATE,
+            TaskModel::EVENT_CREATE,
         );
     }
 
@@ -78,7 +78,7 @@ class TaskAssignCurrentUser extends Base
             'owner_id' => $this->userSession->getId(),
         );
 
-        return $this->taskModification->update($values);
+        return $this->taskModificationModel->update($values);
     }
 
     /**
diff --git a/app/Action/TaskAssignCurrentUserColumn.php b/app/Action/TaskAssignCurrentUserColumn.php
index 05d08dd3..bc28a90b 100644
--- a/app/Action/TaskAssignCurrentUserColumn.php
+++ b/app/Action/TaskAssignCurrentUserColumn.php
@@ -2,7 +2,7 @@
 
 namespace Kanboard\Action;
 
-use Kanboard\Model\Task;
+use Kanboard\Model\TaskModel;
 
 /**
  * Assign a task to the logged user on column change
@@ -32,7 +32,7 @@ class TaskAssignCurrentUserColumn extends Base
     public function getCompatibleEvents()
     {
         return array(
-            Task::EVENT_MOVE_COLUMN,
+            TaskModel::EVENT_MOVE_COLUMN,
         );
     }
 
@@ -81,7 +81,7 @@ class TaskAssignCurrentUserColumn extends Base
             'owner_id' => $this->userSession->getId(),
         );
 
-        return $this->taskModification->update($values);
+        return $this->taskModificationModel->update($values);
     }
 
     /**
diff --git a/app/Action/TaskAssignSpecificUser.php b/app/Action/TaskAssignSpecificUser.php
index 2dc3e966..50a2b2ae 100644
--- a/app/Action/TaskAssignSpecificUser.php
+++ b/app/Action/TaskAssignSpecificUser.php
@@ -2,7 +2,7 @@
 
 namespace Kanboard\Action;
 
-use Kanboard\Model\Task;
+use Kanboard\Model\TaskModel;
 
 /**
  * Assign a task to a specific user
@@ -32,8 +32,8 @@ class TaskAssignSpecificUser extends Base
     public function getCompatibleEvents()
     {
         return array(
-            Task::EVENT_CREATE_UPDATE,
-            Task::EVENT_MOVE_COLUMN,
+            TaskModel::EVENT_CREATE_UPDATE,
+            TaskModel::EVENT_MOVE_COLUMN,
         );
     }
 
@@ -79,7 +79,7 @@ class TaskAssignSpecificUser extends Base
             'owner_id' => $this->getParam('user_id'),
         );
 
-        return $this->taskModification->update($values);
+        return $this->taskModificationModel->update($values);
     }
 
     /**
diff --git a/app/Action/TaskAssignUser.php b/app/Action/TaskAssignUser.php
index da54d186..9ea22986 100644
--- a/app/Action/TaskAssignUser.php
+++ b/app/Action/TaskAssignUser.php
@@ -71,7 +71,7 @@ class TaskAssignUser extends Base
             'owner_id' => $data['owner_id'],
         );
 
-        return $this->taskModification->update($values);
+        return $this->taskModificationModel->update($values);
     }
 
     /**
@@ -83,6 +83,6 @@ class TaskAssignUser extends Base
      */
     public function hasRequiredCondition(array $data)
     {
-        return $this->projectPermission->isAssignable($this->getProjectId(), $data['owner_id']);
+        return $this->projectPermissionModel->isAssignable($this->getProjectId(), $data['owner_id']);
     }
 }
diff --git a/app/Action/TaskClose.php b/app/Action/TaskClose.php
index cf91e83e..91e8cf43 100644
--- a/app/Action/TaskClose.php
+++ b/app/Action/TaskClose.php
@@ -63,7 +63,7 @@ class TaskClose extends Base
      */
     public function doAction(array $data)
     {
-        return $this->taskStatus->close($data['task_id']);
+        return $this->taskStatusModel->close($data['task_id']);
     }
 
     /**
diff --git a/app/Action/TaskCloseColumn.php b/app/Action/TaskCloseColumn.php
index 09af3b96..1edce8fa 100644
--- a/app/Action/TaskCloseColumn.php
+++ b/app/Action/TaskCloseColumn.php
@@ -2,7 +2,7 @@
 
 namespace Kanboard\Action;
 
-use Kanboard\Model\Task;
+use Kanboard\Model\TaskModel;
 
 /**
  * Close automatically a task in a specific column
@@ -32,7 +32,7 @@ class TaskCloseColumn extends Base
     public function getCompatibleEvents()
     {
         return array(
-            Task::EVENT_MOVE_COLUMN,
+            TaskModel::EVENT_MOVE_COLUMN,
         );
     }
 
@@ -67,7 +67,7 @@ class TaskCloseColumn extends Base
      */
     public function doAction(array $data)
     {
-        return $this->taskStatus->close($data['task_id']);
+        return $this->taskStatusModel->close($data['task_id']);
     }
 
     /**
diff --git a/app/Action/TaskCloseNoActivity.php b/app/Action/TaskCloseNoActivity.php
index 59f7f56a..5a10510f 100644
--- a/app/Action/TaskCloseNoActivity.php
+++ b/app/Action/TaskCloseNoActivity.php
@@ -2,7 +2,7 @@
 
 namespace Kanboard\Action;
 
-use Kanboard\Model\Task;
+use Kanboard\Model\TaskModel;
 
 /**
  * Close automatically a task after when inactive
@@ -31,7 +31,7 @@ class TaskCloseNoActivity extends Base
      */
     public function getCompatibleEvents()
     {
-        return array(Task::EVENT_DAILY_CRONJOB);
+        return array(TaskModel::EVENT_DAILY_CRONJOB);
     }
 
     /**
@@ -74,7 +74,7 @@ class TaskCloseNoActivity extends Base
             $duration = time() - $task['date_modification'];
 
             if ($duration > $max) {
-                $results[] = $this->taskStatus->close($task['id']);
+                $results[] = $this->taskStatusModel->close($task['id']);
             }
         }
 
diff --git a/app/Action/TaskCreation.php b/app/Action/TaskCreation.php
index 290c31e1..e9e5c5f3 100644
--- a/app/Action/TaskCreation.php
+++ b/app/Action/TaskCreation.php
@@ -66,7 +66,7 @@ class TaskCreation extends Base
      */
     public function doAction(array $data)
     {
-        return (bool) $this->taskCreation->create(array(
+        return (bool) $this->taskCreationModel->create(array(
             'project_id' => $data['project_id'],
             'title' => $data['title'],
             'reference' => $data['reference'],
diff --git a/app/Action/TaskDuplicateAnotherProject.php b/app/Action/TaskDuplicateAnotherProject.php
index 5f05136e..93fae5cc 100644
--- a/app/Action/TaskDuplicateAnotherProject.php
+++ b/app/Action/TaskDuplicateAnotherProject.php
@@ -2,7 +2,7 @@
 
 namespace Kanboard\Action;
 
-use Kanboard\Model\Task;
+use Kanboard\Model\TaskModel;
 
 /**
  * Duplicate a task to another project
@@ -32,8 +32,8 @@ class TaskDuplicateAnotherProject extends Base
     public function getCompatibleEvents()
     {
         return array(
-            Task::EVENT_MOVE_COLUMN,
-            Task::EVENT_CLOSE,
+            TaskModel::EVENT_MOVE_COLUMN,
+            TaskModel::EVENT_CLOSE,
         );
     }
 
@@ -74,8 +74,8 @@ class TaskDuplicateAnotherProject extends Base
      */
     public function doAction(array $data)
     {
-        $destination_column_id = $this->column->getFirstColumnId($this->getParam('project_id'));
-        return (bool) $this->taskDuplication->duplicateToProject($data['task_id'], $this->getParam('project_id'), null, $destination_column_id);
+        $destination_column_id = $this->columnModel->getFirstColumnId($this->getParam('project_id'));
+        return (bool) $this->taskDuplicationModel->duplicateToProject($data['task_id'], $this->getParam('project_id'), null, $destination_column_id);
     }
 
     /**
diff --git a/app/Action/TaskEmail.php b/app/Action/TaskEmail.php
index 4e0e06a6..7f9ba416 100644
--- a/app/Action/TaskEmail.php
+++ b/app/Action/TaskEmail.php
@@ -2,7 +2,7 @@
 
 namespace Kanboard\Action;
 
-use Kanboard\Model\Task;
+use Kanboard\Model\TaskModel;
 
 /**
  * Email a task to someone
@@ -32,8 +32,8 @@ class TaskEmail extends Base
     public function getCompatibleEvents()
     {
         return array(
-            Task::EVENT_MOVE_COLUMN,
-            Task::EVENT_CLOSE,
+            TaskModel::EVENT_MOVE_COLUMN,
+            TaskModel::EVENT_CLOSE,
         );
     }
 
@@ -75,16 +75,16 @@ class TaskEmail extends Base
      */
     public function doAction(array $data)
     {
-        $user = $this->user->getById($this->getParam('user_id'));
+        $user = $this->userModel->getById($this->getParam('user_id'));
 
         if (! empty($user['email'])) {
-            $task = $this->taskFinder->getDetails($data['task_id']);
+            $task = $this->taskFinderModel->getDetails($data['task_id']);
 
             $this->emailClient->send(
                 $user['email'],
                 $user['name'] ?: $user['username'],
                 $this->getParam('subject'),
-                $this->template->render('notification/task_create', array('task' => $task, 'application_url' => $this->config->get('application_url')))
+                $this->template->render('notification/task_create', array('task' => $task, 'application_url' => $this->configModel->get('application_url')))
             );
 
             return true;
diff --git a/app/Action/TaskEmailNoActivity.php b/app/Action/TaskEmailNoActivity.php
index c5d7a797..c60702fb 100644
--- a/app/Action/TaskEmailNoActivity.php
+++ b/app/Action/TaskEmailNoActivity.php
@@ -2,7 +2,7 @@
 
 namespace Kanboard\Action;
 
-use Kanboard\Model\Task;
+use Kanboard\Model\TaskModel;
 
 /**
  * Email a task with no activity
@@ -32,7 +32,7 @@ class TaskEmailNoActivity extends Base
     public function getCompatibleEvents()
     {
         return array(
-            Task::EVENT_DAILY_CRONJOB,
+            TaskModel::EVENT_DAILY_CRONJOB,
         );
     }
 
@@ -85,7 +85,7 @@ class TaskEmailNoActivity extends Base
     {
         $results = array();
         $max = $this->getParam('duration') * 86400;
-        $user = $this->user->getById($this->getParam('user_id'));
+        $user = $this->userModel->getById($this->getParam('user_id'));
 
         if (! empty($user['email'])) {
             foreach ($data['tasks'] as $task) {
@@ -110,13 +110,13 @@ class TaskEmailNoActivity extends Base
      */
     private function sendEmail($task_id, array $user)
     {
-        $task = $this->taskFinder->getDetails($task_id);
+        $task = $this->taskFinderModel->getDetails($task_id);
 
         $this->emailClient->send(
             $user['email'],
             $user['name'] ?: $user['username'],
             $this->getParam('subject'),
-            $this->template->render('notification/task_create', array('task' => $task, 'application_url' => $this->config->get('application_url')))
+            $this->template->render('notification/task_create', array('task' => $task, 'application_url' => $this->configModel->get('application_url')))
         );
 
         return true;
diff --git a/app/Action/TaskMoveAnotherProject.php b/app/Action/TaskMoveAnotherProject.php
index fdff0d8c..73ad4b69 100644
--- a/app/Action/TaskMoveAnotherProject.php
+++ b/app/Action/TaskMoveAnotherProject.php
@@ -2,7 +2,7 @@
 
 namespace Kanboard\Action;
 
-use Kanboard\Model\Task;
+use Kanboard\Model\TaskModel;
 
 /**
  * Move a task to another project
@@ -32,8 +32,8 @@ class TaskMoveAnotherProject extends Base
     public function getCompatibleEvents()
     {
         return array(
-            Task::EVENT_MOVE_COLUMN,
-            Task::EVENT_CLOSE,
+            TaskModel::EVENT_MOVE_COLUMN,
+            TaskModel::EVENT_CLOSE,
         );
     }
 
@@ -75,7 +75,7 @@ class TaskMoveAnotherProject extends Base
      */
     public function doAction(array $data)
     {
-        return $this->taskDuplication->moveToProject($data['task_id'], $this->getParam('project_id'));
+        return $this->taskDuplicationModel->moveToProject($data['task_id'], $this->getParam('project_id'));
     }
 
     /**
diff --git a/app/Action/TaskMoveColumnAssigned.php b/app/Action/TaskMoveColumnAssigned.php
index 1b23a591..7e3db9c5 100644
--- a/app/Action/TaskMoveColumnAssigned.php
+++ b/app/Action/TaskMoveColumnAssigned.php
@@ -2,7 +2,7 @@
 
 namespace Kanboard\Action;
 
-use Kanboard\Model\Task;
+use Kanboard\Model\TaskModel;
 
 /**
  * Move a task to another column when an assignee is set
@@ -32,8 +32,8 @@ class TaskMoveColumnAssigned extends Base
     public function getCompatibleEvents()
     {
         return array(
-            Task::EVENT_ASSIGNEE_CHANGE,
-            Task::EVENT_UPDATE,
+            TaskModel::EVENT_ASSIGNEE_CHANGE,
+            TaskModel::EVENT_UPDATE,
         );
     }
 
@@ -75,9 +75,9 @@ class TaskMoveColumnAssigned extends Base
      */
     public function doAction(array $data)
     {
-        $original_task = $this->taskFinder->getById($data['task_id']);
+        $original_task = $this->taskFinderModel->getById($data['task_id']);
 
-        return $this->taskPosition->movePosition(
+        return $this->taskPositionModel->movePosition(
             $data['project_id'],
             $data['task_id'],
             $this->getParam('dest_column_id'),
diff --git a/app/Action/TaskMoveColumnCategoryChange.php b/app/Action/TaskMoveColumnCategoryChange.php
index 0f591eda..e4f88760 100644
--- a/app/Action/TaskMoveColumnCategoryChange.php
+++ b/app/Action/TaskMoveColumnCategoryChange.php
@@ -2,7 +2,7 @@
 
 namespace Kanboard\Action;
 
-use Kanboard\Model\Task;
+use Kanboard\Model\TaskModel;
 
 /**
  * Move a task to another column when the category is changed
@@ -32,7 +32,7 @@ class TaskMoveColumnCategoryChange extends Base
     public function getCompatibleEvents()
     {
         return array(
-            Task::EVENT_UPDATE,
+            TaskModel::EVENT_UPDATE,
         );
     }
 
@@ -74,9 +74,9 @@ class TaskMoveColumnCategoryChange extends Base
      */
     public function doAction(array $data)
     {
-        $original_task = $this->taskFinder->getById($data['task_id']);
+        $original_task = $this->taskFinderModel->getById($data['task_id']);
 
-        return $this->taskPosition->movePosition(
+        return $this->taskPositionModel->movePosition(
             $data['project_id'],
             $data['task_id'],
             $this->getParam('dest_column_id'),
diff --git a/app/Action/TaskMoveColumnUnAssigned.php b/app/Action/TaskMoveColumnUnAssigned.php
index 99ef9351..c3ae9e1d 100644
--- a/app/Action/TaskMoveColumnUnAssigned.php
+++ b/app/Action/TaskMoveColumnUnAssigned.php
@@ -2,7 +2,7 @@
 
 namespace Kanboard\Action;
 
-use Kanboard\Model\Task;
+use Kanboard\Model\TaskModel;
 
 /**
  * Move a task to another column when an assignee is cleared
@@ -32,8 +32,8 @@ class TaskMoveColumnUnAssigned extends Base
     public function getCompatibleEvents()
     {
         return array(
-            Task::EVENT_ASSIGNEE_CHANGE,
-            Task::EVENT_UPDATE,
+            TaskModel::EVENT_ASSIGNEE_CHANGE,
+            TaskModel::EVENT_UPDATE,
         );
     }
 
@@ -75,9 +75,9 @@ class TaskMoveColumnUnAssigned extends Base
      */
     public function doAction(array $data)
     {
-        $original_task = $this->taskFinder->getById($data['task_id']);
+        $original_task = $this->taskFinderModel->getById($data['task_id']);
 
-        return $this->taskPosition->movePosition(
+        return $this->taskPositionModel->movePosition(
             $data['project_id'],
             $data['task_id'],
             $this->getParam('dest_column_id'),
diff --git a/app/Action/TaskOpen.php b/app/Action/TaskOpen.php
index ec0f96f7..8e847b8e 100644
--- a/app/Action/TaskOpen.php
+++ b/app/Action/TaskOpen.php
@@ -63,7 +63,7 @@ class TaskOpen extends Base
      */
     public function doAction(array $data)
     {
-        return $this->taskStatus->open($data['task_id']);
+        return $this->taskStatusModel->open($data['task_id']);
     }
 
     /**
diff --git a/app/Action/TaskUpdateStartDate.php b/app/Action/TaskUpdateStartDate.php
index e5cea01b..e5410a87 100644
--- a/app/Action/TaskUpdateStartDate.php
+++ b/app/Action/TaskUpdateStartDate.php
@@ -2,7 +2,7 @@
 
 namespace Kanboard\Action;
 
-use Kanboard\Model\Task;
+use Kanboard\Model\TaskModel;
 
 /**
  * Set the start date of task
@@ -32,7 +32,7 @@ class TaskUpdateStartDate extends Base
     public function getCompatibleEvents()
     {
         return array(
-            Task::EVENT_MOVE_COLUMN,
+            TaskModel::EVENT_MOVE_COLUMN,
         );
     }
 
@@ -77,7 +77,7 @@ class TaskUpdateStartDate extends Base
             'date_started' => time(),
         );
 
-        return $this->taskModification->update($values, false);
+        return $this->taskModificationModel->update($values, false);
     }
 
     /**