diff --git a/app/Controller/TaskImport.php b/app/Controller/TaskImportController.php
similarity index 90%
rename from app/Controller/TaskImport.php
rename to app/Controller/TaskImportController.php
index 5e37fb2f3..a4c39f84b 100644
--- a/app/Controller/TaskImport.php
+++ b/app/Controller/TaskImportController.php
@@ -7,10 +7,10 @@ use Kanboard\Core\Csv;
 /**
  * Task Import controller
  *
- * @package  controller
+ * @package  Kanboard\Controller
  * @author   Frederic Guillot
  */
-class TaskImport extends BaseController
+class TaskImportController extends BaseController
 {
     /**
      * Upload the file and ask settings
@@ -60,7 +60,7 @@ class TaskImport extends BaseController
             $this->flash->failure(t('Nothing have been imported!'));
         }
 
-        $this->response->redirect($this->helper->url->to('taskImport', 'step1', array('project_id' => $project['id'])));
+        $this->response->redirect($this->helper->url->to('TaskImportController', 'step1', array('project_id' => $project['id'])));
     }
 
     /**
diff --git a/app/Controller/TaskInternalLink.php b/app/Controller/TaskInternalLinkController.php
similarity index 98%
rename from app/Controller/TaskInternalLink.php
rename to app/Controller/TaskInternalLinkController.php
index 6ff20252f..f97426c69 100644
--- a/app/Controller/TaskInternalLink.php
+++ b/app/Controller/TaskInternalLinkController.php
@@ -7,11 +7,11 @@ use Kanboard\Core\Controller\PageNotFoundException;
 /**
  * TaskInternalLink Controller
  *
- * @package  controller
+ * @package  Kanboard\Controller
  * @author   Olivier Maridat
  * @author   Frederic Guillot
  */
-class TaskInternalLink extends BaseController
+class TaskInternalLinkController extends BaseController
 {
     /**
      * Get the current link
diff --git a/app/Controller/Taskmodification.php b/app/Controller/TaskModificationController.php
similarity index 97%
rename from app/Controller/Taskmodification.php
rename to app/Controller/TaskModificationController.php
index e8eafe200..47c075113 100644
--- a/app/Controller/Taskmodification.php
+++ b/app/Controller/TaskModificationController.php
@@ -7,10 +7,10 @@ use Kanboard\Core\DateParser;
 /**
  * Task Modification controller
  *
- * @package  controller
+ * @package  Kanboard\Controller
  * @author   Frederic Guillot
  */
-class Taskmodification extends BaseController
+class TaskModificationController extends BaseController
 {
     /**
      * Set automatically the start date
diff --git a/app/Controller/TaskPopover.php b/app/Controller/TaskPopoverController.php
similarity index 96%
rename from app/Controller/TaskPopover.php
rename to app/Controller/TaskPopoverController.php
index 0e47cffe2..9bac22061 100644
--- a/app/Controller/TaskPopover.php
+++ b/app/Controller/TaskPopoverController.php
@@ -5,10 +5,10 @@ namespace Kanboard\Controller;
 /**
  * Task Popover
  *
- * @package  controller
+ * @package  Kanboard\Controller
  * @author   Frederic Guillot
  */
-class TaskPopover extends BaseController
+class TaskPopoverController extends BaseController
 {
     /**
      * Change a task assignee directly from the board
diff --git a/app/Controller/TaskRecurrence.php b/app/Controller/TaskRecurrenceController.php
similarity index 95%
rename from app/Controller/TaskRecurrence.php
rename to app/Controller/TaskRecurrenceController.php
index 72dce3a56..1acf40386 100644
--- a/app/Controller/TaskRecurrence.php
+++ b/app/Controller/TaskRecurrenceController.php
@@ -5,10 +5,10 @@ namespace Kanboard\Controller;
 /**
  * Task Recurrence controller
  *
- * @package  controller
+ * @package  Kanboard\Controller
  * @author   Frederic Guillot
  */
-class TaskRecurrence extends BaseController
+class TaskRecurrenceController extends BaseController
 {
     /**
      * Edit recurrence form
diff --git a/app/Controller/Taskstatus.php b/app/Controller/TaskStatusController.php
similarity index 94%
rename from app/Controller/Taskstatus.php
rename to app/Controller/TaskStatusController.php
index eeaf8513f..fca168ec9 100644
--- a/app/Controller/Taskstatus.php
+++ b/app/Controller/TaskStatusController.php
@@ -5,10 +5,10 @@ namespace Kanboard\Controller;
 /**
  * Task Status controller
  *
- * @package  controller
+ * @package  Kanboard\Controller
  * @author   Frederic Guillot
  */
-class Taskstatus extends BaseController
+class TaskStatusController extends BaseController
 {
     /**
      * Close a task
diff --git a/app/ServiceProvider/AuthenticationProvider.php b/app/ServiceProvider/AuthenticationProvider.php
index 3b5a9bab0..ce0c6f27f 100644
--- a/app/ServiceProvider/AuthenticationProvider.php
+++ b/app/ServiceProvider/AuthenticationProvider.php
@@ -72,7 +72,7 @@ class AuthenticationProvider implements ServiceProviderInterface
         $acl->add('Analytic', '*', Role::PROJECT_MANAGER);
         $acl->add('Board', 'save', Role::PROJECT_MEMBER);
         $acl->add('BoardPopover', '*', Role::PROJECT_MEMBER);
-        $acl->add('TaskPopover', '*', Role::PROJECT_MEMBER);
+        $acl->add('TaskPopoverController', '*', Role::PROJECT_MEMBER);
         $acl->add('Calendar', 'save', Role::PROJECT_MEMBER);
         $acl->add('Category', '*', Role::PROJECT_MANAGER);
         $acl->add('Column', '*', Role::PROJECT_MANAGER);
@@ -95,12 +95,12 @@ class AuthenticationProvider implements ServiceProviderInterface
         $acl->add('TaskCreationController', '*', Role::PROJECT_MEMBER);
         $acl->add('TaskBulkController', '*', Role::PROJECT_MEMBER);
         $acl->add('Taskduplication', '*', Role::PROJECT_MEMBER);
-        $acl->add('TaskRecurrence', '*', Role::PROJECT_MEMBER);
-        $acl->add('TaskImport', '*', Role::PROJECT_MANAGER);
-        $acl->add('TaskInternalLink', '*', Role::PROJECT_MEMBER);
+        $acl->add('TaskRecurrenceController', '*', Role::PROJECT_MEMBER);
+        $acl->add('TaskImportController', '*', Role::PROJECT_MANAGER);
+        $acl->add('TaskInternalLinkController', '*', Role::PROJECT_MEMBER);
         $acl->add('TaskExternalLink', '*', Role::PROJECT_MEMBER);
-        $acl->add('Taskmodification', '*', Role::PROJECT_MEMBER);
-        $acl->add('Taskstatus', '*', Role::PROJECT_MEMBER);
+        $acl->add('TaskModificationController', '*', Role::PROJECT_MEMBER);
+        $acl->add('TaskStatusController', '*', Role::PROJECT_MEMBER);
         $acl->add('UserAjaxController', array('mention'), Role::PROJECT_MEMBER);
 
         return $acl;
diff --git a/app/ServiceProvider/RouteProvider.php b/app/ServiceProvider/RouteProvider.php
index f44820d94..d8c9fd45e 100644
--- a/app/ServiceProvider/RouteProvider.php
+++ b/app/ServiceProvider/RouteProvider.php
@@ -58,7 +58,7 @@ class RouteProvider implements ServiceProviderInterface
             $container['route']->addRoute('project/:project_id/integrations', 'ProjectViewController', 'integrations');
             $container['route']->addRoute('project/:project_id/duplicate', 'ProjectViewController', 'duplicate');
             $container['route']->addRoute('project/:project_id/permissions', 'ProjectPermissionController', 'index');
-            $container['route']->addRoute('project/:project_id/import', 'taskImport', 'step1');
+            $container['route']->addRoute('project/:project_id/import', 'TaskImportController', 'step1');
             $container['route']->addRoute('project/:project_id/activity', 'activity', 'project');
 
             // Project Overview
diff --git a/app/Template/board/task_avatar.php b/app/Template/board/task_avatar.php
index 53739b197..14b55476f 100644
--- a/app/Template/board/task_avatar.php
+++ b/app/Template/board/task_avatar.php
@@ -1,9 +1,9 @@
 <?php if (! empty($task['owner_id'])): ?>
 <div class="task-board-avatars">
     <span
-        <?php if ($this->user->hasProjectAccess('taskmodification', 'edit', $task['project_id'])): ?>
+        <?php if ($this->user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?>
         class="task-board-assignee task-board-change-assignee"
-        data-url="<?= $this->url->href('TaskPopover', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
+        data-url="<?= $this->url->href('TaskPopoverController', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
     <?php else: ?>
         class="task-board-assignee">
     <?php endif ?>
diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php
index dbfe65b0f..67cae77a5 100644
--- a/app/Template/board/task_footer.php
+++ b/app/Template/board/task_footer.php
@@ -6,7 +6,7 @@
         <?php else: ?>
             <?= $this->url->link(
                 $this->text->e($task['category_name']),
-                'TaskPopover',
+                'TaskPopoverController',
                 'changeCategory',
                 array('task_id' => $task['id'], 'project_id' => $task['project_id']),
                 false,
diff --git a/app/Template/board/task_private.php b/app/Template/board/task_private.php
index 57623042f..03ed39501 100644
--- a/app/Template/board/task_private.php
+++ b/app/Template/board/task_private.php
@@ -16,7 +16,7 @@
     <?php if ($this->board->isCollapsed($task['project_id'])): ?>
         <div class="task-board-collapsed">
             <div class="task-board-saving-icon" style="display: none;"><i class="fa fa-spinner fa-pulse"></i></div>
-            <?php if ($this->user->hasProjectAccess('taskmodification', 'edit', $task['project_id'])): ?>
+            <?php if ($this->user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?>
                 <?= $this->render('task/dropdown', array('task' => $task)) ?>
             <?php else: ?>
                 <strong><?= '#'.$task['id'] ?></strong>
@@ -32,7 +32,7 @@
     <?php else: ?>
         <div class="task-board-expanded">
             <div class="task-board-saving-icon" style="display: none;"><i class="fa fa-spinner fa-pulse fa-2x"></i></div>
-            <?php if ($this->user->hasProjectAccess('taskmodification', 'edit', $task['project_id'])): ?>
+            <?php if ($this->user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?>
                 <?= $this->render('task/dropdown', array('task' => $task)) ?>
             <?php else: ?>
                 <strong><?= '#'.$task['id'] ?></strong>
diff --git a/app/Template/listing/show.php b/app/Template/listing/show.php
index a5cba1c4c..1c92de4c6 100644
--- a/app/Template/listing/show.php
+++ b/app/Template/listing/show.php
@@ -18,7 +18,7 @@
             <?php foreach ($paginator->getCollection() as $task): ?>
             <tr>
                 <td class="task-table color-<?= $task['color_id'] ?>">
-                    <?php if ($this->user->hasProjectAccess('taskmodification', 'edit', $task['project_id'])): ?>
+                    <?php if ($this->user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?>
                         <?= $this->render('task/dropdown', array('task' => $task)) ?>
                     <?php else: ?>
                         #<?= $task['id'] ?>
diff --git a/app/Template/project/sidebar.php b/app/Template/project/sidebar.php
index 1071e78b3..0f58c112e 100644
--- a/app/Template/project/sidebar.php
+++ b/app/Template/project/sidebar.php
@@ -51,8 +51,8 @@
                     <?= $this->url->link(t('Enable'), 'ProjectStatusController', 'confirmEnable', array('project_id' => $project['id']), false, 'popover') ?>
                 <?php endif ?>
             </li>
-            <li <?= $this->app->checkMenuSelection('taskImport') ?>>
-                <?= $this->url->link(t('Import'), 'taskImport', 'step1', array('project_id' => $project['id'])) ?>
+            <li <?= $this->app->checkMenuSelection('TaskImportController') ?>>
+                <?= $this->url->link(t('Import'), 'TaskImportController', 'step1', array('project_id' => $project['id'])) ?>
             </li>
             <?php if ($this->user->hasProjectAccess('ProjectStatusController', 'remove', $project['id'])): ?>
                 <li>
diff --git a/app/Template/task/details.php b/app/Template/task/details.php
index 5b8b7c6da..6e72ca3c4 100644
--- a/app/Template/task/details.php
+++ b/app/Template/task/details.php
@@ -148,7 +148,7 @@
 
     <?php if ($editable && empty($task['date_started'])): ?>
         <div class="task-summary-buttons">
-            <?= $this->url->button('fa-play', t('Set start date'), 'taskmodification', 'start', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->url->button('fa-play', t('Set start date'), 'TaskModificationController', 'start', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
         </div>
     <?php endif ?>
 
diff --git a/app/Template/task/dropdown.php b/app/Template/task/dropdown.php
index 887e18283..2c3c38c67 100644
--- a/app/Template/task/dropdown.php
+++ b/app/Template/task/dropdown.php
@@ -4,24 +4,24 @@
         <?php if (array_key_exists('date_started', $task) && empty($task['date_started'])): ?>
         <li>
             <i class="fa fa-play fa-fw"></i>
-            <?= $this->url->link(t('Set automatically the start date'), 'taskmodification', 'start', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->url->link(t('Set automatically the start date'), 'TaskModificationController', 'start', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
         </li>
         <?php endif ?>
         <li>
             <i class="fa fa-user fa-fw"></i>
-            <?= $this->url->link(t('Change assignee'), 'TaskPopover', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Change assignee'), 'TaskPopoverController', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-tag fa-fw"></i>
-            <?= $this->url->link(t('Change category'), 'TaskPopover', 'changeCategory', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Change category'), 'TaskPopoverController', 'changeCategory', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-pencil-square-o fa-fw"></i>
-            <?= $this->url->link(t('Edit the task'), 'taskmodification', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Edit the task'), 'TaskModificationController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-align-left fa-fw"></i>
-            <?= $this->url->link(t('Edit the description'), 'taskmodification', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Edit the description'), 'TaskModificationController', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-plus fa-fw"></i>
@@ -29,7 +29,7 @@
         </li>
         <li>
             <i class="fa fa-code-fork fa-fw"></i>
-            <?= $this->url->link(t('Add internal link'), 'TaskInternalLink', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Add internal link'), 'TaskInternalLinkController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-external-link fa-fw"></i>
@@ -41,7 +41,7 @@
         </li>
         <li>
             <i class="fa fa-camera fa-fw"></i>
-            <?= $this->url->link(t('Add a screenshot'), 'TaskPopover', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Add a screenshot'), 'TaskPopoverController', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-files-o fa-fw"></i>
@@ -65,10 +65,10 @@
         <li>
             <?php if ($task['is_active'] == 1): ?>
                 <i class="fa fa-times fa-fw"></i>
-                <?= $this->url->link(t('Close this task'), 'taskstatus', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+                <?= $this->url->link(t('Close this task'), 'TaskStatusController', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
             <?php else: ?>
                 <i class="fa fa-check-square-o fa-fw"></i>
-                <?= $this->url->link(t('Open this task'), 'taskstatus', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+                <?= $this->url->link(t('Open this task'), 'TaskStatusController', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
             <?php endif ?>
         </li>
         <?php endif ?>
diff --git a/app/Template/task/layout.php b/app/Template/task/layout.php
index 4bc674065..0a755617e 100644
--- a/app/Template/task/layout.php
+++ b/app/Template/task/layout.php
@@ -3,10 +3,10 @@
     <?= $this->hook->render('template:task:layout:top', array('task' => $task)) ?>
     <section
         class="sidebar-container" id="task-view"
-        data-edit-url="<?= $this->url->href('taskmodification', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"
-        data-description-url="<?= $this->url->href('taskmodification', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"
+        data-edit-url="<?= $this->url->href('TaskModificationController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"
+        data-description-url="<?= $this->url->href('TaskModificationController', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"
         data-subtask-url="<?= $this->url->href('SubtaskController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"
-        data-internal-link-url="<?= $this->url->href('TaskInternalLink', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"
+        data-internal-link-url="<?= $this->url->href('TaskInternalLinkController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"
         data-comment-url="<?= $this->url->href('comment', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
 
         <?= $this->render($sidebar_template, array('task' => $task)) ?>
diff --git a/app/Template/task/show.php b/app/Template/task/show.php
index 8f41d6535..b79903b47 100644
--- a/app/Template/task/show.php
+++ b/app/Template/task/show.php
@@ -3,7 +3,7 @@
 <?= $this->render('task/details', array(
     'task' => $task,
     'project' => $project,
-    'editable' => $this->user->hasProjectAccess('taskmodification', 'edit', $project['id']),
+    'editable' => $this->user->hasProjectAccess('TaskModificationController', 'edit', $project['id']),
 )) ?>
 
 <?= $this->hook->render('template:task:show:before-description', array('task' => $task, 'project' => $project)) ?>
diff --git a/app/Template/task/sidebar.php b/app/Template/task/sidebar.php
index 3dc518b4e..c81aab9fd 100644
--- a/app/Template/task/sidebar.php
+++ b/app/Template/task/sidebar.php
@@ -27,20 +27,20 @@
         <?= $this->hook->render('template:task:sidebar:information', array('task' => $task)) ?>
     </ul>
 
-    <?php if ($this->user->hasProjectAccess('taskmodification', 'edit', $task['project_id'])): ?>
+    <?php if ($this->user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?>
     <h2><?= t('Actions') ?></h2>
     <ul>
         <li>
             <i class="fa fa-pencil-square-o fa-fw"></i>
-            <?= $this->url->link(t('Edit the task'), 'taskmodification', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Edit the task'), 'TaskModificationController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-align-left fa-fw"></i>
-            <?= $this->url->link(t('Edit the description'), 'taskmodification', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Edit the description'), 'TaskModificationController', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-refresh fa-rotate-90 fa-fw"></i>
-            <?= $this->url->link(t('Edit recurrence'), 'TaskRecurrence', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Edit recurrence'), 'TaskRecurrenceController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-plus fa-fw"></i>
@@ -48,7 +48,7 @@
         </li>
         <li>
             <i class="fa fa-code-fork fa-fw"></i>
-            <?= $this->url->link(t('Add internal link'), 'TaskInternalLink', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Add internal link'), 'TaskInternalLinkController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-external-link fa-fw"></i>
@@ -81,10 +81,10 @@
         <li>
             <?php if ($task['is_active'] == 1): ?>
                 <i class="fa fa-times fa-fw"></i>
-                <?= $this->url->link(t('Close this task'), 'taskstatus', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+                <?= $this->url->link(t('Close this task'), 'TaskStatusController', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
             <?php else: ?>
                 <i class="fa fa-check-square-o fa-fw"></i>
-                <?= $this->url->link(t('Open this task'), 'taskstatus', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+                <?= $this->url->link(t('Open this task'), 'TaskStatusController', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
             <?php endif ?>
         </li>
         <?php if ($this->user->canRemoveTask($task)): ?>
diff --git a/app/Template/task_import/step1.php b/app/Template/task_import/step1.php
index abb435058..23fcc11c6 100644
--- a/app/Template/task_import/step1.php
+++ b/app/Template/task_import/step1.php
@@ -1,7 +1,7 @@
 <div class="page-header">
     <h2><?= t('Tasks Importation') ?></h2>
 </div>
-<form action="<?= $this->url->href('taskImport', 'step2', array('project_id' => $project['id'])) ?>" method="post" enctype="multipart/form-data">
+<form action="<?= $this->url->href('TaskImportController', 'step2', array('project_id' => $project['id'])) ?>" method="post" enctype="multipart/form-data">
     <?= $this->form->csrf() ?>
 
     <?= $this->form->label(t('Delimiter'), 'delimiter') ?>
@@ -31,4 +31,4 @@
         <li><?= t('The due date must use the ISO format: YYYY-MM-DD') ?></li>
     </ul>
 </div>
-<p><i class="fa fa-download fa-fw"></i><?= $this->url->link(t('Download CSV template'), 'taskImport', 'template', array('project_id' => $project['id'])) ?></p>
\ No newline at end of file
+<p><i class="fa fa-download fa-fw"></i><?= $this->url->link(t('Download CSV template'), 'TaskImportController', 'template', array('project_id' => $project['id'])) ?></p>
diff --git a/app/Template/task_internal_link/create.php b/app/Template/task_internal_link/create.php
index 94dcdd663..87b3fd28d 100644
--- a/app/Template/task_internal_link/create.php
+++ b/app/Template/task_internal_link/create.php
@@ -2,7 +2,7 @@
     <h2><?= t('Add a new link') ?></h2>
 </div>
 
-<form class="popover-form" action="<?= $this->url->href('TaskInternalLink', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post" autocomplete="off">
+<form class="popover-form" action="<?= $this->url->href('TaskInternalLinkController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post" autocomplete="off">
 
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('task_id', array('task_id' => $task['id'])) ?>
@@ -30,4 +30,4 @@
         <?= t('or') ?>
         <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/Template/task_internal_link/edit.php b/app/Template/task_internal_link/edit.php
index 03622df79..15066443a 100644
--- a/app/Template/task_internal_link/edit.php
+++ b/app/Template/task_internal_link/edit.php
@@ -2,7 +2,7 @@
     <h2><?= t('Edit link') ?></h2>
 </div>
 
-<form action="<?= $this->url->href('TaskInternalLink', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'link_id' => $task_link['id'])) ?>" method="post" autocomplete="off">
+<form action="<?= $this->url->href('TaskInternalLinkController', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'link_id' => $task_link['id'])) ?>" method="post" autocomplete="off">
 
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('id', $values) ?>
@@ -31,4 +31,4 @@
         <?= t('or') ?>
         <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/Template/task_internal_link/remove.php b/app/Template/task_internal_link/remove.php
index 82156ece8..4dea7c9d7 100644
--- a/app/Template/task_internal_link/remove.php
+++ b/app/Template/task_internal_link/remove.php
@@ -8,8 +8,8 @@
     </p>
 
     <div class="form-actions">
-        <?= $this->url->link(t('Yes'), 'TaskInternalLink', 'remove', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), true, 'btn btn-red') ?>
+        <?= $this->url->link(t('Yes'), 'TaskInternalLinkController', 'remove', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), true, 'btn btn-red') ?>
         <?= t('or') ?>
         <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/Template/task_internal_link/table.php b/app/Template/task_internal_link/table.php
index 57a3536cd..631796bfd 100644
--- a/app/Template/task_internal_link/table.php
+++ b/app/Template/task_internal_link/table.php
@@ -72,8 +72,8 @@
                 <div class="dropdown">
                 <a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-cog fa-fw"></i><i class="fa fa-caret-down"></i></a>
                 <ul>
-                    <li><?= $this->url->link(t('Edit'), 'TaskInternalLink', 'edit', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li>
-                    <li><?= $this->url->link(t('Remove'), 'TaskInternalLink', 'confirm', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li>
+                    <li><?= $this->url->link(t('Edit'), 'TaskInternalLinkController', 'edit', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li>
+                    <li><?= $this->url->link(t('Remove'), 'TaskInternalLinkController', 'confirm', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li>
                 </ul>
                 </div>
             </td>
diff --git a/app/Template/task_modification/edit_description.php b/app/Template/task_modification/edit_description.php
index 801b40057..cddc0cf59 100644
--- a/app/Template/task_modification/edit_description.php
+++ b/app/Template/task_modification/edit_description.php
@@ -2,7 +2,7 @@
     <h2><?= t('Edit the description') ?></h2>
 </div>
 
-<form class="popover-form" method="post" action="<?= $this->url->href('taskmodification', 'updateDescription', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
+<form class="popover-form" method="post" action="<?= $this->url->href('TaskModificationController', 'updateDescription', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('id', $values) ?>
diff --git a/app/Template/task_modification/edit_task.php b/app/Template/task_modification/edit_task.php
index 5ddec5ea4..f7ecc9cb6 100644
--- a/app/Template/task_modification/edit_task.php
+++ b/app/Template/task_modification/edit_task.php
@@ -1,8 +1,7 @@
 <div class="page-header">
     <h2><?= t('Edit a task') ?></h2>
 </div>
-<form class="popover-form" method="post" action="<?= $this->url->href('taskmodification', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
-
+<form class="popover-form" method="post" action="<?= $this->url->href('TaskModificationController', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('id', $values) ?>
     <?= $this->form->hidden('project_id', $values) ?>
diff --git a/app/Template/task_popover/change_assignee.php b/app/Template/task_popover/change_assignee.php
index bf68c34d9..1a424e1fe 100644
--- a/app/Template/task_popover/change_assignee.php
+++ b/app/Template/task_popover/change_assignee.php
@@ -2,7 +2,7 @@
     <div class="page-header">
         <h2><?= t('Change assignee for the task "%s"', $values['title']) ?></h2>
     </div>
-    <form class="popover-form" method="post" action="<?= $this->url->href('TaskPopover', 'updateAssignee', array('task_id' => $values['id'], 'project_id' => $project['id'])) ?>">
+    <form class="popover-form" method="post" action="<?= $this->url->href('TaskPopoverController', 'updateAssignee', array('task_id' => $values['id'], 'project_id' => $project['id'])) ?>">
 
         <?= $this->form->csrf() ?>
 
diff --git a/app/Template/task_popover/change_category.php b/app/Template/task_popover/change_category.php
index 0364e660b..1755ac9b9 100644
--- a/app/Template/task_popover/change_category.php
+++ b/app/Template/task_popover/change_category.php
@@ -2,7 +2,7 @@
     <div class="page-header">
         <h2><?= t('Change category for the task "%s"', $values['title']) ?></h2>
     </div>
-    <form class="popover-form" method="post" action="<?= $this->url->href('TaskPopover', 'updateCategory', array('task_id' => $values['id'], 'project_id' => $project['id'])) ?>">
+    <form class="popover-form" method="post" action="<?= $this->url->href('TaskPopoverController', 'updateCategory', array('task_id' => $values['id'], 'project_id' => $project['id'])) ?>">
 
         <?= $this->form->csrf() ?>
 
diff --git a/app/Template/task_recurrence/edit.php b/app/Template/task_recurrence/edit.php
index 0f5d611ae..e1f0fecab 100644
--- a/app/Template/task_recurrence/edit.php
+++ b/app/Template/task_recurrence/edit.php
@@ -15,7 +15,7 @@
 
 <?php if ($task['recurrence_status'] != \Kanboard\Model\Task::RECURRING_STATUS_PROCESSED): ?>
 
-    <form class="popover-form" method="post" action="<?= $this->url->href('TaskRecurrence', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
+    <form class="popover-form" method="post" action="<?= $this->url->href('TaskRecurrenceController', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
 
         <?= $this->form->csrf() ?>
 
@@ -44,4 +44,4 @@
         </div>
     </form>
 
-<?php endif ?>
\ No newline at end of file
+<?php endif ?>
diff --git a/app/Template/task_status/close.php b/app/Template/task_status/close.php
index 7d2005444..f78e051df 100644
--- a/app/Template/task_status/close.php
+++ b/app/Template/task_status/close.php
@@ -8,8 +8,8 @@
     </p>
 
     <div class="form-actions">
-        <?= $this->url->link(t('Yes'), 'taskstatus', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red popover-link') ?>
+        <?= $this->url->link(t('Yes'), 'TaskStatusController', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red popover-link') ?>
         <?= t('or') ?>
         <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/Template/task_status/open.php b/app/Template/task_status/open.php
index 5d19bfbe3..1bd89cf41 100644
--- a/app/Template/task_status/open.php
+++ b/app/Template/task_status/open.php
@@ -8,8 +8,8 @@
     </p>
 
     <div class="form-actions">
-        <?= $this->url->link(t('Yes'), 'taskstatus', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red popover-link') ?>
+        <?= $this->url->link(t('Yes'), 'TaskStatusController', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red popover-link') ?>
         <?= t('or') ?>
         <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
-</div>
\ No newline at end of file
+</div>