diff --git a/app/Api/BaseApi.php b/app/Api/BaseApi.php
index d8c46fd52..5de7f5276 100644
--- a/app/Api/BaseApi.php
+++ b/app/Api/BaseApi.php
@@ -98,8 +98,8 @@ abstract class BaseApi extends Base
         if (! empty($project)) {
             $project['url'] = array(
                 'board' => $this->helper->url->to('board', 'show', array('project_id' => $project['id']), '', true),
-                'calendar' => $this->helper->url->to('calendar', 'show', array('project_id' => $project['id']), '', true),
-                'list' => $this->helper->url->to('listing', 'show', array('project_id' => $project['id']), '', true),
+                'calendar' => $this->helper->url->to('CalendarController', 'show', array('project_id' => $project['id']), '', true),
+                'list' => $this->helper->url->to('TaskListController', 'show', array('project_id' => $project['id']), '', true),
             );
         }
 
diff --git a/app/Controller/Action.php b/app/Controller/ActionController.php
similarity index 91%
rename from app/Controller/Action.php
rename to app/Controller/ActionController.php
index 40497a628..51090d226 100644
--- a/app/Controller/Action.php
+++ b/app/Controller/ActionController.php
@@ -3,12 +3,12 @@
 namespace Kanboard\Controller;
 
 /**
- * Automatic Actions
+ * Automatic Actions Controller
  *
- * @package controller
+ * @package Kanboard\Controller
  * @author  Frederic Guillot
  */
-class Action extends BaseController
+class ActionController extends BaseController
 {
     /**
      * List of automatic actions for a given project
@@ -72,6 +72,6 @@ class Action extends BaseController
             $this->flash->failure(t('Unable to remove this action.'));
         }
 
-        $this->response->redirect($this->helper->url->to('action', 'index', array('project_id' => $project['id'])));
+        $this->response->redirect($this->helper->url->to('ActionController', 'index', array('project_id' => $project['id'])));
     }
 }
diff --git a/app/Controller/ActionCreation.php b/app/Controller/ActionCreationController.php
similarity index 93%
rename from app/Controller/ActionCreation.php
rename to app/Controller/ActionCreationController.php
index 388b30e25..e055f11bd 100644
--- a/app/Controller/ActionCreation.php
+++ b/app/Controller/ActionCreationController.php
@@ -3,12 +3,12 @@
 namespace Kanboard\Controller;
 
 /**
- * Action Creation
+ * Action Creation Controller
  *
- * @package controller
+ * @package Kanboard\Controller
  * @author  Frederic Guillot
  */
-class ActionCreation extends BaseController
+class ActionCreationController extends BaseController
 {
     /**
      * Show the form (step 1)
@@ -117,6 +117,6 @@ class ActionCreation extends BaseController
             }
         }
 
-        $this->response->redirect($this->helper->url->to('action', 'index', array('project_id' => $project['id'])));
+        $this->response->redirect($this->helper->url->to('ActionController', 'index', array('project_id' => $project['id'])));
     }
 }
diff --git a/app/Controller/Activity.php b/app/Controller/ActivityController.php
similarity index 90%
rename from app/Controller/Activity.php
rename to app/Controller/ActivityController.php
index 0c6aa3f39..a8fc1b39b 100644
--- a/app/Controller/Activity.php
+++ b/app/Controller/ActivityController.php
@@ -3,12 +3,12 @@
 namespace Kanboard\Controller;
 
 /**
- * Activity stream
+ * Activity Controller
  *
- * @package controller
+ * @package Kanboard\Controller
  * @author  Frederic Guillot
  */
-class Activity extends BaseController
+class ActivityController extends BaseController
 {
     /**
      * Activity page for a project
diff --git a/app/Controller/Analytic.php b/app/Controller/AnalyticController.php
similarity index 96%
rename from app/Controller/Analytic.php
rename to app/Controller/AnalyticController.php
index ba73c15c3..99d34c66d 100644
--- a/app/Controller/Analytic.php
+++ b/app/Controller/AnalyticController.php
@@ -6,12 +6,12 @@ use Kanboard\Filter\TaskProjectFilter;
 use Kanboard\Model\Task as TaskModel;
 
 /**
- * Project Analytic controller
+ * Project Analytic Controller
  *
- * @package  controller
+ * @package  Kanboard\Controller
  * @author   Frederic Guillot
  */
-class Analytic extends BaseController
+class AnalyticController extends BaseController
 {
     /**
      * Show average Lead and Cycle time
@@ -47,7 +47,7 @@ class Analytic extends BaseController
         $project = $this->getProject();
 
         $paginator = $this->paginator
-            ->setUrl('analytic', 'compareHours', array('project_id' => $project['id']))
+            ->setUrl('AnalyticController', 'compareHours', array('project_id' => $project['id']))
             ->setMax(30)
             ->setOrder(TaskModel::TABLE.'.id')
             ->setQuery($this->taskQuery
diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
index 60bc154ab..45cf39a5a 100644
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@@ -8,6 +8,7 @@ use Kanboard\Core\Base;
  * Class AppController
  *
  * @package Kanboard\Controller
+ * @author  Frederic Guillot
  */
 class AppController extends Base
 {
diff --git a/app/Controller/Auth.php b/app/Controller/AuthController.php
similarity index 88%
rename from app/Controller/Auth.php
rename to app/Controller/AuthController.php
index cad44a346..598b3ff8c 100644
--- a/app/Controller/Auth.php
+++ b/app/Controller/AuthController.php
@@ -3,12 +3,12 @@
 namespace Kanboard\Controller;
 
 /**
- * Authentication controller
+ * Authentication Controller
  *
- * @package  controller
+ * @package  Kanboard\Controller
  * @author   Frederic Guillot
  */
-class Auth extends BaseController
+class AuthController extends BaseController
 {
     /**
      * Display the form login
@@ -59,9 +59,9 @@ class Auth extends BaseController
     {
         if (! DISABLE_LOGOUT) {
             $this->sessionManager->close();
-            $this->response->redirect($this->helper->url->to('auth', 'login'));
+            $this->response->redirect($this->helper->url->to('AuthController', 'login'));
         } else {
-            $this->response->redirect($this->helper->url->to('auth', 'index'));
+            $this->response->redirect($this->helper->url->to('AuthController', 'index'));
         }
     }
 
diff --git a/app/Controller/BoardPopover.php b/app/Controller/BoardPopoverController.php
similarity index 93%
rename from app/Controller/BoardPopover.php
rename to app/Controller/BoardPopoverController.php
index d3117f78d..b204af39d 100644
--- a/app/Controller/BoardPopover.php
+++ b/app/Controller/BoardPopoverController.php
@@ -3,12 +3,12 @@
 namespace Kanboard\Controller;
 
 /**
- * Board Popover
+ * Board Popover Controller
  *
- * @package  controller
+ * @package  Kanboard\Controller
  * @author   Frederic Guillot
  */
-class BoardPopover extends BaseController
+class BoardPopoverController extends BaseController
 {
     /**
      * Confirmation before to close all column tasks
diff --git a/app/Controller/BoardTooltip.php b/app/Controller/BoardTooltipController.php
similarity index 97%
rename from app/Controller/BoardTooltip.php
rename to app/Controller/BoardTooltipController.php
index 49d02ced4..2f1d949e4 100644
--- a/app/Controller/BoardTooltip.php
+++ b/app/Controller/BoardTooltipController.php
@@ -5,10 +5,10 @@ namespace Kanboard\Controller;
 /**
  * Board Tooltip
  *
- * @package  controller
+ * @package  Kanboard\Controller
  * @author   Frederic Guillot
  */
-class BoardTooltip extends BaseController
+class BoardTooltipController extends BaseController
 {
     /**
      * Get links on mouseover
diff --git a/app/Controller/Calendar.php b/app/Controller/CalendarController.php
similarity index 96%
rename from app/Controller/Calendar.php
rename to app/Controller/CalendarController.php
index 706c1d3b1..c875a18cc 100644
--- a/app/Controller/Calendar.php
+++ b/app/Controller/CalendarController.php
@@ -8,13 +8,13 @@ use Kanboard\Filter\TaskStatusFilter;
 use Kanboard\Model\Task as TaskModel;
 
 /**
- * Project Calendar controller
+ * Calendar Controller
  *
- * @package  controller
+ * @package  Kanboard\Controller
  * @author   Frederic Guillot
  * @author   Timo Litzbarski
  */
-class Calendar extends BaseController
+class CalendarController extends BaseController
 {
     /**
      * Show calendar view for projects
diff --git a/app/Controller/Category.php b/app/Controller/CategoryController.php
similarity index 91%
rename from app/Controller/Category.php
rename to app/Controller/CategoryController.php
index 954d92ccd..e7c8db540 100644
--- a/app/Controller/Category.php
+++ b/app/Controller/CategoryController.php
@@ -5,12 +5,12 @@ namespace Kanboard\Controller;
 use Kanboard\Core\Controller\PageNotFoundException;
 
 /**
- * Category management
+ * Category Controller
  *
- * @package controller
+ * @package Kanboard\Controller
  * @author  Frederic Guillot
  */
-class Category extends BaseController
+class CategoryController extends BaseController
 {
     /**
      * Get the category (common method between actions)
@@ -66,7 +66,7 @@ class Category extends BaseController
         if ($valid) {
             if ($this->category->create($values)) {
                 $this->flash->success(t('Your category have been created successfully.'));
-                return $this->response->redirect($this->helper->url->to('category', 'index', array('project_id' => $project['id'])));
+                return $this->response->redirect($this->helper->url->to('CategoryController', 'index', array('project_id' => $project['id'])));
             } else {
                 $this->flash->failure(t('Unable to create your category.'));
             }
@@ -111,7 +111,7 @@ class Category extends BaseController
         if ($valid) {
             if ($this->category->update($values)) {
                 $this->flash->success(t('Your category have been updated successfully.'));
-                return $this->response->redirect($this->helper->url->to('category', 'index', array('project_id' => $project['id'])));
+                return $this->response->redirect($this->helper->url->to('CategoryController', 'index', array('project_id' => $project['id'])));
             } else {
                 $this->flash->failure(t('Unable to update your category.'));
             }
@@ -154,6 +154,6 @@ class Category extends BaseController
             $this->flash->failure(t('Unable to remove this category.'));
         }
 
-        $this->response->redirect($this->helper->url->to('category', 'index', array('project_id' => $project['id'])));
+        $this->response->redirect($this->helper->url->to('CategoryController', 'index', array('project_id' => $project['id'])));
     }
 }
diff --git a/app/Controller/Column.php b/app/Controller/ColumnController.php
similarity index 92%
rename from app/Controller/Column.php
rename to app/Controller/ColumnController.php
index 294c31d8d..5f04f426b 100644
--- a/app/Controller/Column.php
+++ b/app/Controller/ColumnController.php
@@ -5,12 +5,12 @@ namespace Kanboard\Controller;
 use Kanboard\Core\Controller\AccessForbiddenException;
 
 /**
- * Column controller
+ * Column Controller
  *
- * @package  controller
+ * @package  Kanboard\Controller
  * @author   Frederic Guillot
  */
-class Column extends BaseController
+class ColumnController extends BaseController
 {
     /**
      * Display columns list
@@ -68,7 +68,7 @@ class Column extends BaseController
         if ($valid) {
             if ($this->column->create($project['id'], $values['title'], $values['task_limit'], $values['description'])) {
                 $this->flash->success(t('Column created successfully.'));
-                return $this->response->redirect($this->helper->url->to('column', 'index', array('project_id' => $project['id'])), true);
+                return $this->response->redirect($this->helper->url->to('ColumnController', 'index', array('project_id' => $project['id'])), true);
             } else {
                 $errors['title'] = array(t('Another column with the same name exists in the project'));
             }
@@ -113,7 +113,7 @@ class Column extends BaseController
         if ($valid) {
             if ($this->column->update($values['id'], $values['title'], $values['task_limit'], $values['description'])) {
                 $this->flash->success(t('Board updated successfully.'));
-                return $this->response->redirect($this->helper->url->to('column', 'index', array('project_id' => $project['id'])));
+                return $this->response->redirect($this->helper->url->to('ColumnController', 'index', array('project_id' => $project['id'])));
             } else {
                 $this->flash->failure(t('Unable to update this board.'));
             }
@@ -173,6 +173,6 @@ class Column extends BaseController
             $this->flash->failure(t('Unable to remove this column.'));
         }
 
-        $this->response->redirect($this->helper->url->to('column', 'index', array('project_id' => $project['id'])));
+        $this->response->redirect($this->helper->url->to('ColumnController', 'index', array('project_id' => $project['id'])));
     }
 }
diff --git a/app/Controller/Comment.php b/app/Controller/CommentController.php
similarity index 98%
rename from app/Controller/Comment.php
rename to app/Controller/CommentController.php
index 8d3b7862b..8d1132ae8 100644
--- a/app/Controller/Comment.php
+++ b/app/Controller/CommentController.php
@@ -6,12 +6,12 @@ use Kanboard\Core\Controller\AccessForbiddenException;
 use Kanboard\Core\Controller\PageNotFoundException;
 
 /**
- * Comment controller
+ * Comment Controller
  *
- * @package  controller
+ * @package  Kanboard\Controller
  * @author   Frederic Guillot
  */
-class Comment extends BaseController
+class CommentController extends BaseController
 {
     /**
      * Get the current comment
diff --git a/app/Controller/Customfilter.php b/app/Controller/CustomFilterController.php
similarity index 91%
rename from app/Controller/Customfilter.php
rename to app/Controller/CustomFilterController.php
index d07943662..8dd987645 100644
--- a/app/Controller/Customfilter.php
+++ b/app/Controller/CustomFilterController.php
@@ -6,12 +6,13 @@ use Kanboard\Core\Controller\AccessForbiddenException;
 use Kanboard\Core\Security\Role;
 
 /**
- * Custom Filter management
+ * Custom Filter Controller
  *
- * @package controller
+ * @package Kanboard\Controller
  * @author  Timo Litzbarski
+ * @author  Frederic Guillot
  */
-class Customfilter extends BaseController
+class CustomFilterController extends BaseController
 {
     /**
      * Display list of filters
@@ -48,7 +49,7 @@ class Customfilter extends BaseController
         if ($valid) {
             if ($this->customFilter->create($values)) {
                 $this->flash->success(t('Your custom filter have been created successfully.'));
-                return $this->response->redirect($this->helper->url->to('customfilter', 'index', array('project_id' => $project['id'])));
+                return $this->response->redirect($this->helper->url->to('CustomFilterController', 'index', array('project_id' => $project['id'])));
             } else {
                 $this->flash->failure(t('Unable to create your custom filter.'));
             }
@@ -93,7 +94,7 @@ class Customfilter extends BaseController
             $this->flash->failure(t('Unable to remove this custom filter.'));
         }
 
-        $this->response->redirect($this->helper->url->to('customfilter', 'index', array('project_id' => $project['id'])));
+        $this->response->redirect($this->helper->url->to('CustomFilterController', 'index', array('project_id' => $project['id'])));
     }
 
     /**
@@ -144,7 +145,7 @@ class Customfilter extends BaseController
         if ($valid) {
             if ($this->customFilter->update($values)) {
                 $this->flash->success(t('Your custom filter have been updated successfully.'));
-                return $this->response->redirect($this->helper->url->to('customfilter', 'index', array('project_id' => $project['id'])));
+                return $this->response->redirect($this->helper->url->to('CustomFilterController', 'index', array('project_id' => $project['id'])));
             } else {
                 $this->flash->failure(t('Unable to update custom filter.'));
             }
diff --git a/app/Controller/Export.php b/app/Controller/ExportController.php
similarity index 93%
rename from app/Controller/Export.php
rename to app/Controller/ExportController.php
index 7e1d2fdc8..4ed9ee08b 100644
--- a/app/Controller/Export.php
+++ b/app/Controller/ExportController.php
@@ -3,12 +3,12 @@
 namespace Kanboard\Controller;
 
 /**
- * Export controller
+ * Export Controller
  *
- * @package  controller
+ * @package  Kanboard\Controller
  * @author   Frederic Guillot
  */
-class Export extends BaseController
+class ExportController extends BaseController
 {
     /**
      * Common export method
@@ -35,7 +35,7 @@ class Export extends BaseController
 
         $this->response->html($this->helper->layout->project('export/'.$action, array(
             'values' => array(
-                'controller' => 'export',
+                'controller' => 'ExportController',
                 'action' => $action,
                 'project_id' => $project['id'],
                 'from' => $from,
diff --git a/app/Controller/FileViewer.php b/app/Controller/FileViewerController.php
similarity index 97%
rename from app/Controller/FileViewer.php
rename to app/Controller/FileViewerController.php
index a49b0fb2c..245845c7f 100644
--- a/app/Controller/FileViewer.php
+++ b/app/Controller/FileViewerController.php
@@ -7,10 +7,10 @@ use Kanboard\Core\ObjectStorage\ObjectStorageException;
 /**
  * File Viewer Controller
  *
- * @package  controller
+ * @package  Kanbaord\Controller
  * @author   Frederic Guillot
  */
-class FileViewer extends BaseController
+class FileViewerController extends BaseController
 {
     /**
      * Get file content from object storage
diff --git a/app/Controller/Link.php b/app/Controller/LinkController.php
similarity index 93%
rename from app/Controller/Link.php
rename to app/Controller/LinkController.php
index d28f5e4e6..08627d400 100644
--- a/app/Controller/Link.php
+++ b/app/Controller/LinkController.php
@@ -5,13 +5,13 @@ namespace Kanboard\Controller;
 use Kanboard\Core\Controller\PageNotFoundException;
 
 /**
- * Link controller
+ * Link Controller
  *
- * @package controller
+ * @package Kanboard\Controller
  * @author  Olivier Maridat
  * @author  Frederic Guillot
  */
-class Link extends BaseController
+class LinkController extends BaseController
 {
     /**
      * Get the current link
@@ -61,7 +61,7 @@ class Link extends BaseController
         if ($valid) {
             if ($this->link->create($values['label'], $values['opposite_label']) !== false) {
                 $this->flash->success(t('Link added successfully.'));
-                return $this->response->redirect($this->helper->url->to('link', 'index'));
+                return $this->response->redirect($this->helper->url->to('LinkController', 'index'));
             } else {
                 $this->flash->failure(t('Unable to create your link.'));
             }
@@ -105,7 +105,7 @@ class Link extends BaseController
         if ($valid) {
             if ($this->link->update($values)) {
                 $this->flash->success(t('Link updated successfully.'));
-                return $this->response->redirect($this->helper->url->to('link', 'index'));
+                return $this->response->redirect($this->helper->url->to('LinkController', 'index'));
             } else {
                 $this->flash->failure(t('Unable to update your link.'));
             }
@@ -145,6 +145,6 @@ class Link extends BaseController
             $this->flash->failure(t('Unable to remove this link.'));
         }
 
-        $this->response->redirect($this->helper->url->to('link', 'index'));
+        $this->response->redirect($this->helper->url->to('LinkController', 'index'));
     }
 }
diff --git a/app/Controller/Oauth.php b/app/Controller/OAuthController.php
similarity index 97%
rename from app/Controller/Oauth.php
rename to app/Controller/OAuthController.php
index 04adf154c..7663ddcc1 100644
--- a/app/Controller/Oauth.php
+++ b/app/Controller/OAuthController.php
@@ -5,12 +5,12 @@ namespace Kanboard\Controller;
 use Kanboard\Core\Security\OAuthAuthenticationProviderInterface;
 
 /**
- * OAuth controller
+ * OAuth Controller
  *
- * @package  controller
+ * @package  Kanboard\Controller
  * @author   Frederic Guillot
  */
-class Oauth extends BaseController
+class OAuthController extends BaseController
 {
     /**
      * Redirect to the provider if no code received
diff --git a/app/Controller/PasswordReset.php b/app/Controller/PasswordResetController.php
similarity index 91%
rename from app/Controller/PasswordReset.php
rename to app/Controller/PasswordResetController.php
index 7050d6d2d..9036b3e78 100644
--- a/app/Controller/PasswordReset.php
+++ b/app/Controller/PasswordResetController.php
@@ -7,10 +7,10 @@ use Kanboard\Core\Controller\AccessForbiddenException;
 /**
  * Password Reset Controller
  *
- * @package controller
+ * @package Kanboard\Controller
  * @author  Frederic Guillot
  */
-class PasswordReset extends BaseController
+class PasswordResetController extends BaseController
 {
     /**
      * Show the form to reset the password
@@ -38,7 +38,7 @@ class PasswordReset extends BaseController
 
         if ($valid) {
             $this->sendEmail($values['username']);
-            $this->response->redirect($this->helper->url->to('auth', 'login'));
+            $this->response->redirect($this->helper->url->to('AuthController', 'login'));
         } else {
             $this->create($values, $errors);
         }
@@ -62,7 +62,7 @@ class PasswordReset extends BaseController
                 'no_layout' => true,
             )));
         } else {
-            $this->response->redirect($this->helper->url->to('auth', 'login'));
+            $this->response->redirect($this->helper->url->to('AuthController', 'login'));
         }
     }
 
@@ -85,7 +85,7 @@ class PasswordReset extends BaseController
                 $this->passwordReset->disable($user_id);
             }
 
-            return $this->response->redirect($this->helper->url->to('auth', 'login'));
+            return $this->response->redirect($this->helper->url->to('AuthController', 'login'));
         }
 
         return $this->change($values, $errors);
diff --git a/app/Controller/ActionProject.php b/app/Controller/ProjectActionDuplicationController.php
similarity index 69%
rename from app/Controller/ActionProject.php
rename to app/Controller/ProjectActionDuplicationController.php
index 10b3c9d4b..790b7ed33 100644
--- a/app/Controller/ActionProject.php
+++ b/app/Controller/ProjectActionDuplicationController.php
@@ -5,18 +5,18 @@ namespace Kanboard\Controller;
 /**
  * Duplicate automatic action from another project
  *
- * @package controller
+ * @package Kanboard\Controller
  * @author  Frederic Guillot
  */
-class ActionProject extends BaseController
+class ProjectActionDuplicationController extends BaseController
 {
-    public function project()
+    public function show()
     {
         $project = $this->getProject();
         $projects = $this->projectUserRole->getProjectsByUser($this->userSession->getId());
         unset($projects[$project['id']]);
 
-        $this->response->html($this->template->render('action_project/project', array(
+        $this->response->html($this->template->render('project_action_duplication/show', array(
             'project' => $project,
             'projects_list' => $projects,
         )));
@@ -33,6 +33,6 @@ class ActionProject extends BaseController
             $this->flash->failure(t('Unable to duplicate actions.'));
         }
 
-        $this->response->redirect($this->helper->url->to('action', 'index', array('project_id' => $project['id'])));
+        $this->response->redirect($this->helper->url->to('ActionController', 'index', array('project_id' => $project['id'])));
     }
 }
diff --git a/app/Controller/ProjectCreation.php b/app/Controller/ProjectCreationController.php
similarity index 97%
rename from app/Controller/ProjectCreation.php
rename to app/Controller/ProjectCreationController.php
index 0ffa21743..4166ead1b 100644
--- a/app/Controller/ProjectCreation.php
+++ b/app/Controller/ProjectCreationController.php
@@ -5,10 +5,10 @@ namespace Kanboard\Controller;
 /**
  * Project Creation Controller
  *
- * @package  controller
+ * @package  Kanboard\Controller
  * @author   Frederic Guillot
  */
-class ProjectCreation extends BaseController
+class ProjectCreationController extends BaseController
 {
     /**
      * Display a form to create a new project
diff --git a/app/Controller/ProjectEditController.php b/app/Controller/ProjectEditController.php
index 774c69098..64e02d1a9 100644
--- a/app/Controller/ProjectEditController.php
+++ b/app/Controller/ProjectEditController.php
@@ -97,11 +97,11 @@ class ProjectEditController extends BaseController
     {
         if ($redirect === 'edit') {
             if (isset($values['is_private'])) {
-                if (! $this->helper->user->hasProjectAccess('ProjectCreation', 'create', $project['id'])) {
+                if (! $this->helper->user->hasProjectAccess('ProjectCreationController', 'create', $project['id'])) {
                     unset($values['is_private']);
                 }
             } elseif ($project['is_private'] == 1 && ! isset($values['is_private'])) {
-                if ($this->helper->user->hasProjectAccess('ProjectCreation', 'create', $project['id'])) {
+                if ($this->helper->user->hasProjectAccess('ProjectCreationController', 'create', $project['id'])) {
                     $values += array('is_private' => 0);
                 }
             }
diff --git a/app/Controller/ProjectFile.php b/app/Controller/ProjectFileController.php
similarity index 88%
rename from app/Controller/ProjectFile.php
rename to app/Controller/ProjectFileController.php
index 6ec5ff273..f1bce09d9 100644
--- a/app/Controller/ProjectFile.php
+++ b/app/Controller/ProjectFileController.php
@@ -5,10 +5,10 @@ namespace Kanboard\Controller;
 /**
  * Project File Controller
  *
- * @package  controller
+ * @package  Kanboard\Controller
  * @author   Frederic Guillot
  */
-class ProjectFile extends BaseController
+class ProjectFileController extends BaseController
 {
     /**
      * File upload form
@@ -38,7 +38,7 @@ class ProjectFile extends BaseController
             $this->flash->failure(t('Unable to upload the file.'));
         }
 
-        $this->response->redirect($this->helper->url->to('ProjectOverview', 'show', array('project_id' => $project['id'])), true);
+        $this->response->redirect($this->helper->url->to('ProjectOverviewController', 'show', array('project_id' => $project['id'])), true);
     }
 
     /**
@@ -58,7 +58,7 @@ class ProjectFile extends BaseController
             $this->flash->failure(t('Unable to remove this file.'));
         }
 
-        $this->response->redirect($this->helper->url->to('ProjectOverview', 'show', array('project_id' => $project['id'])));
+        $this->response->redirect($this->helper->url->to('ProjectOverviewController', 'show', array('project_id' => $project['id'])));
     }
 
     /**
diff --git a/app/Controller/ProjectOverview.php b/app/Controller/ProjectOverviewController.php
similarity index 91%
rename from app/Controller/ProjectOverview.php
rename to app/Controller/ProjectOverviewController.php
index f8837f957..75cf25ba1 100644
--- a/app/Controller/ProjectOverview.php
+++ b/app/Controller/ProjectOverviewController.php
@@ -5,10 +5,10 @@ namespace Kanboard\Controller;
 /**
  * Project Overview Controller
  *
- * @package  controller
+ * @package  Kanboard\Controller
  * @author   Frederic Guillot
  */
-class ProjectOverview extends BaseController
+class ProjectOverviewController extends BaseController
 {
     /**
      * Show project overview
diff --git a/app/Controller/Projectuser.php b/app/Controller/ProjectUserOverviewController.php
similarity index 89%
rename from app/Controller/Projectuser.php
rename to app/Controller/ProjectUserOverviewController.php
index fe1fe0f15..90887a8a5 100644
--- a/app/Controller/Projectuser.php
+++ b/app/Controller/ProjectUserOverviewController.php
@@ -9,10 +9,10 @@ use Kanboard\Core\Security\Role;
 /**
  * Project User overview
  *
- * @package  controller
+ * @package  Kanboard\Controller
  * @author   Frederic Guillot
  */
-class Projectuser extends BaseController
+class ProjectUserOverviewController extends BaseController
 {
     private function common()
     {
@@ -39,13 +39,13 @@ class Projectuser extends BaseController
         }
 
         $paginator = $this->paginator
-            ->setUrl('projectuser', $action, array('user_id' => $user_id))
+            ->setUrl('ProjectUserOverviewController', $action, array('user_id' => $user_id))
             ->setMax(30)
             ->setOrder('projects.name')
             ->setQuery($query)
             ->calculate();
 
-        $this->response->html($this->helper->layout->projectUser('project_user/roles', array(
+        $this->response->html($this->helper->layout->projectUser('project_user_overview/roles', array(
             'paginator' => $paginator,
             'title' => $title,
             'user_id' => $user_id,
@@ -65,13 +65,13 @@ class Projectuser extends BaseController
         }
 
         $paginator = $this->paginator
-            ->setUrl('projectuser', $action, array('user_id' => $user_id))
+            ->setUrl('ProjectUserOverviewController', $action, array('user_id' => $user_id))
             ->setMax(50)
             ->setOrder(TaskModel::TABLE.'.id')
             ->setQuery($query)
             ->calculate();
 
-        $this->response->html($this->helper->layout->projectUser('project_user/tasks', array(
+        $this->response->html($this->helper->layout->projectUser('project_user_overview/tasks', array(
             'paginator' => $paginator,
             'title' => $title,
             'user_id' => $user_id,
@@ -122,7 +122,7 @@ class Projectuser extends BaseController
     {
         $project = $this->getProject();
 
-        return $this->response->html($this->template->render('project_user/tooltip_users', array(
+        return $this->response->html($this->template->render('project_user_overview/tooltip_users', array(
             'users' => $this->projectUserRole->getAllUsersGroupedByRole($project['id']),
             'roles' => $this->role->getProjectRoles(),
         )));
diff --git a/app/Controller/Swimlane.php b/app/Controller/SwimlaneController.php
similarity index 89%
rename from app/Controller/Swimlane.php
rename to app/Controller/SwimlaneController.php
index 4575e9099..13a64d40a 100644
--- a/app/Controller/Swimlane.php
+++ b/app/Controller/SwimlaneController.php
@@ -7,12 +7,12 @@ use Kanboard\Core\Controller\PageNotFoundException;
 use Kanboard\Model\Swimlane as SwimlaneModel;
 
 /**
- * Swimlanes
+ * Swimlanes Controller
  *
- * @package controller
+ * @package Kanboard\Controller
  * @author  Frederic Guillot
  */
-class Swimlane extends BaseController
+class SwimlaneController extends BaseController
 {
     /**
      * Get the swimlane (common method between actions)
@@ -83,7 +83,7 @@ class Swimlane extends BaseController
         if ($valid) {
             if ($this->swimlane->create($values)) {
                 $this->flash->success(t('Your swimlane have been created successfully.'));
-                return $this->response->redirect($this->helper->url->to('swimlane', 'index', array('project_id' => $project['id'])));
+                return $this->response->redirect($this->helper->url->to('SwimlaneController', 'index', array('project_id' => $project['id'])));
             } else {
                 $errors = array('name' => array(t('Another swimlane with the same name exists in the project')));
             }
@@ -127,7 +127,7 @@ class Swimlane extends BaseController
         if ($valid) {
             if ($this->swimlane->updateDefault($values)) {
                 $this->flash->success(t('The default swimlane have been updated successfully.'));
-                return $this->response->redirect($this->helper->url->to('swimlane', 'index', array('project_id' => $project['id'])), true);
+                return $this->response->redirect($this->helper->url->to('SwimlaneController', 'index', array('project_id' => $project['id'])), true);
             } else {
                 $this->flash->failure(t('Unable to update this swimlane.'));
             }
@@ -171,7 +171,7 @@ class Swimlane extends BaseController
         if ($valid) {
             if ($this->swimlane->update($values)) {
                 $this->flash->success(t('Swimlane updated successfully.'));
-                return $this->response->redirect($this->helper->url->to('swimlane', 'index', array('project_id' => $project['id'])));
+                return $this->response->redirect($this->helper->url->to('SwimlaneController', 'index', array('project_id' => $project['id'])));
             } else {
                 $errors = array('name' => array(t('Another swimlane with the same name exists in the project')));
             }
@@ -213,7 +213,7 @@ class Swimlane extends BaseController
             $this->flash->failure(t('Unable to remove this swimlane.'));
         }
 
-        $this->response->redirect($this->helper->url->to('swimlane', 'index', array('project_id' => $project['id'])));
+        $this->response->redirect($this->helper->url->to('SwimlaneController', 'index', array('project_id' => $project['id'])));
     }
 
     /**
@@ -233,7 +233,7 @@ class Swimlane extends BaseController
             $this->flash->failure(t('Unable to update this swimlane.'));
         }
 
-        $this->response->redirect($this->helper->url->to('swimlane', 'index', array('project_id' => $project['id'])));
+        $this->response->redirect($this->helper->url->to('SwimlaneController', 'index', array('project_id' => $project['id'])));
     }
 
     /**
@@ -252,7 +252,7 @@ class Swimlane extends BaseController
             $this->flash->failure(t('Unable to update this swimlane.'));
         }
 
-        $this->response->redirect($this->helper->url->to('swimlane', 'index', array('project_id' => $project['id'])));
+        $this->response->redirect($this->helper->url->to('SwimlaneController', 'index', array('project_id' => $project['id'])));
     }
 
     /**
@@ -272,7 +272,7 @@ class Swimlane extends BaseController
             $this->flash->failure(t('Unable to update this swimlane.'));
         }
 
-        $this->response->redirect($this->helper->url->to('swimlane', 'index', array('project_id' => $project['id'])));
+        $this->response->redirect($this->helper->url->to('SwimlaneController', 'index', array('project_id' => $project['id'])));
     }
 
     /**
@@ -291,7 +291,7 @@ class Swimlane extends BaseController
             $this->flash->failure(t('Unable to update this swimlane.'));
         }
 
-        $this->response->redirect($this->helper->url->to('swimlane', 'index', array('project_id' => $project['id'])));
+        $this->response->redirect($this->helper->url->to('SwimlaneController', 'index', array('project_id' => $project['id'])));
     }
 
     /**
diff --git a/app/Controller/TaskBulkController.php b/app/Controller/TaskBulkController.php
index 4b4a2594f..c0214ea7f 100644
--- a/app/Controller/TaskBulkController.php
+++ b/app/Controller/TaskBulkController.php
@@ -6,6 +6,7 @@ namespace Kanboard\Controller;
  * Class TaskBulkController
  *
  * @package Kanboard\Controller
+ * @author  Frederic Guillot
  */
 class TaskBulkController extends BaseController
 {
diff --git a/app/Controller/Taskduplication.php b/app/Controller/TaskDuplicationController.php
similarity index 95%
rename from app/Controller/Taskduplication.php
rename to app/Controller/TaskDuplicationController.php
index 1ea3a3f96..ab7b6b425 100644
--- a/app/Controller/Taskduplication.php
+++ b/app/Controller/TaskDuplicationController.php
@@ -5,10 +5,10 @@ namespace Kanboard\Controller;
 /**
  * Task Duplication controller
  *
- * @package  controller
+ * @package  Kanboard\Controller
  * @author   Frederic Guillot
  */
-class Taskduplication extends BaseController
+class TaskDuplicationController extends BaseController
 {
     /**
      * Duplicate a task
@@ -28,7 +28,7 @@ class Taskduplication extends BaseController
                 return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task_id)));
             } else {
                 $this->flash->failure(t('Unable to create this task.'));
-                return $this->response->redirect($this->helper->url->to('taskduplication', 'duplicate', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true);
+                return $this->response->redirect($this->helper->url->to('TaskDuplicationController', 'duplicate', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true);
             }
         }
 
diff --git a/app/Controller/TaskExternalLink.php b/app/Controller/TaskExternalLinkController.php
similarity index 98%
rename from app/Controller/TaskExternalLink.php
rename to app/Controller/TaskExternalLinkController.php
index 0bd55dba8..91dc734a0 100644
--- a/app/Controller/TaskExternalLink.php
+++ b/app/Controller/TaskExternalLinkController.php
@@ -8,10 +8,10 @@ use Kanboard\Core\ExternalLink\ExternalLinkProviderNotFound;
 /**
  * Task External Link Controller
  *
- * @package  controller
+ * @package  Kanboard\Controller
  * @author   Frederic Guillot
  */
-class TaskExternalLink extends BaseController
+class TaskExternalLinkController extends BaseController
 {
     /**
      * First creation form
diff --git a/app/Controller/TaskFile.php b/app/Controller/TaskFileController.php
similarity index 97%
rename from app/Controller/TaskFile.php
rename to app/Controller/TaskFileController.php
index 544c1ea72..44c19c276 100644
--- a/app/Controller/TaskFile.php
+++ b/app/Controller/TaskFileController.php
@@ -5,10 +5,10 @@ namespace Kanboard\Controller;
 /**
  * Task File Controller
  *
- * @package  controller
+ * @package  Kanboard\Controller
  * @author   Frederic Guillot
  */
-class TaskFile extends BaseController
+class TaskFileController extends BaseController
 {
     /**
      * Screenshot
diff --git a/app/Controller/Listing.php b/app/Controller/TaskListController.php
similarity index 77%
rename from app/Controller/Listing.php
rename to app/Controller/TaskListController.php
index 93a7b8368..898c14c81 100644
--- a/app/Controller/Listing.php
+++ b/app/Controller/TaskListController.php
@@ -6,12 +6,12 @@ use Kanboard\Filter\TaskProjectFilter;
 use Kanboard\Model\Task as TaskModel;
 
 /**
- * List view controller
+ * Task List Controller
  *
- * @package  controller
+ * @package  Kanboard\Controller
  * @author   Frederic Guillot
  */
-class Listing extends BaseController
+class TaskListController extends BaseController
 {
     /**
      * Show list view for projects
@@ -24,7 +24,7 @@ class Listing extends BaseController
         $search = $this->helper->projectHeader->getSearchQuery($project);
 
         $paginator = $this->paginator
-            ->setUrl('listing', 'show', array('project_id' => $project['id']))
+            ->setUrl('TaskListController', 'show', array('project_id' => $project['id']))
             ->setMax(30)
             ->setOrder(TaskModel::TABLE.'.id')
             ->setDirection('DESC')
@@ -35,7 +35,7 @@ class Listing extends BaseController
             )
             ->calculate();
 
-        $this->response->html($this->helper->layout->app('listing/show', array(
+        $this->response->html($this->helper->layout->app('task_list/show', array(
             'project' => $project,
             'title' => $project['name'],
             'description' => $this->helper->projectHeader->getDescription($project),
diff --git a/app/Helper/LayoutHelper.php b/app/Helper/LayoutHelper.php
index aeb0c8466..42047dd92 100644
--- a/app/Helper/LayoutHelper.php
+++ b/app/Helper/LayoutHelper.php
@@ -96,7 +96,7 @@ class LayoutHelper extends Base
     public function projectUser($template, array $params)
     {
         $params['filter'] = array('user_id' => $params['user_id']);
-        return $this->subLayout('project_user/layout', 'project_user/sidebar', $template, $params);
+        return $this->subLayout('project_user_overview/layout', 'project_user_overview/sidebar', $template, $params);
     }
 
     /**
diff --git a/app/Middleware/AuthenticationMiddleware.php b/app/Middleware/AuthenticationMiddleware.php
index c29b7ab60..499843fd0 100644
--- a/app/Middleware/AuthenticationMiddleware.php
+++ b/app/Middleware/AuthenticationMiddleware.php
@@ -39,7 +39,7 @@ class AuthenticationMiddleware extends BaseMiddleware
                 $this->response->text('Not Authorized', 401);
             } else {
                 $this->sessionStorage->redirectAfterLogin = $this->request->getUri();
-                $this->response->redirect($this->helper->url->to('auth', 'login'));
+                $this->response->redirect($this->helper->url->to('AuthController', 'login'));
             }
         }
     }
diff --git a/app/Middleware/PostAuthenticationMiddleware.php b/app/Middleware/PostAuthenticationMiddleware.php
index 650d47aa3..f7eccbce0 100644
--- a/app/Middleware/PostAuthenticationMiddleware.php
+++ b/app/Middleware/PostAuthenticationMiddleware.php
@@ -19,7 +19,7 @@ class PostAuthenticationMiddleware extends BaseMiddleware
     {
         $controller = strtolower($this->router->getController());
         $action = strtolower($this->router->getAction());
-        $ignore = ($controller === 'twofactorcontroller' && in_array($action, array('code', 'check'))) || ($controller === 'auth' && $action === 'logout');
+        $ignore = ($controller === 'twofactorcontroller' && in_array($action, array('code', 'check'))) || ($controller === 'authcontroller' && $action === 'logout');
 
         if ($ignore === false && $this->userSession->hasPostAuthentication() && ! $this->userSession->isPostAuthenticationValidated()) {
             $this->nextMiddleware = null;
diff --git a/app/ServiceProvider/AuthenticationProvider.php b/app/ServiceProvider/AuthenticationProvider.php
index 3d4c7f6b9..406cf1c29 100644
--- a/app/ServiceProvider/AuthenticationProvider.php
+++ b/app/ServiceProvider/AuthenticationProvider.php
@@ -66,39 +66,39 @@ class AuthenticationProvider implements ServiceProviderInterface
         $acl->setRoleHierarchy(Role::PROJECT_MANAGER, array(Role::PROJECT_MEMBER, Role::PROJECT_VIEWER));
         $acl->setRoleHierarchy(Role::PROJECT_MEMBER, array(Role::PROJECT_VIEWER));
 
-        $acl->add('Action', '*', Role::PROJECT_MANAGER);
-        $acl->add('ActionProject', '*', Role::PROJECT_MANAGER);
-        $acl->add('ActionCreation', '*', Role::PROJECT_MANAGER);
-        $acl->add('Analytic', '*', Role::PROJECT_MANAGER);
+        $acl->add('ActionController', '*', Role::PROJECT_MANAGER);
+        $acl->add('ProjectActionDuplicationController', '*', Role::PROJECT_MANAGER);
+        $acl->add('ActionCreationController', '*', Role::PROJECT_MANAGER);
+        $acl->add('AnalyticController', '*', Role::PROJECT_MANAGER);
         $acl->add('Board', 'save', Role::PROJECT_MEMBER);
-        $acl->add('BoardPopover', '*', Role::PROJECT_MEMBER);
+        $acl->add('BoardPopoverController', '*', 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);
-        $acl->add('Comment', '*', Role::PROJECT_MEMBER);
-        $acl->add('Customfilter', '*', Role::PROJECT_MEMBER);
-        $acl->add('Export', '*', Role::PROJECT_MANAGER);
-        $acl->add('TaskFile', array('screenshot', 'create', 'save', 'remove', 'confirm'), Role::PROJECT_MEMBER);
+        $acl->add('CalendarController', 'save', Role::PROJECT_MEMBER);
+        $acl->add('CategoryController', '*', Role::PROJECT_MANAGER);
+        $acl->add('ColumnController', '*', Role::PROJECT_MANAGER);
+        $acl->add('CommentController', '*', Role::PROJECT_MEMBER);
+        $acl->add('CustomFilterController', '*', Role::PROJECT_MEMBER);
+        $acl->add('ExportController', '*', Role::PROJECT_MANAGER);
+        $acl->add('TaskFileController', array('screenshot', 'create', 'save', 'remove', 'confirm'), Role::PROJECT_MEMBER);
         $acl->add('Gantt', '*', Role::PROJECT_MANAGER);
         $acl->add('ProjectViewController', array('share', 'updateSharing', 'integrations', 'updateIntegrations', 'notifications', 'updateNotifications', 'duplicate', 'doDuplication'), Role::PROJECT_MANAGER);
         $acl->add('ProjectPermissionController', '*', Role::PROJECT_MANAGER);
         $acl->add('ProjectEditController', '*', Role::PROJECT_MANAGER);
-        $acl->add('ProjectFile', '*', Role::PROJECT_MEMBER);
-        $acl->add('Projectuser', '*', Role::PROJECT_MANAGER);
+        $acl->add('ProjectFileController', '*', Role::PROJECT_MEMBER);
+        $acl->add('ProjectUserOverviewController', '*', Role::PROJECT_MANAGER);
         $acl->add('ProjectStatusController', '*', Role::PROJECT_MANAGER);
         $acl->add('SubtaskController', '*', Role::PROJECT_MEMBER);
         $acl->add('SubtaskRestrictionController', '*', Role::PROJECT_MEMBER);
         $acl->add('SubtaskStatusController', '*', Role::PROJECT_MEMBER);
-        $acl->add('Swimlane', '*', Role::PROJECT_MANAGER);
+        $acl->add('SwimlaneController', '*', Role::PROJECT_MANAGER);
         $acl->add('TaskViewController', 'remove', Role::PROJECT_MEMBER);
         $acl->add('TaskCreationController', '*', Role::PROJECT_MEMBER);
         $acl->add('TaskBulkController', '*', Role::PROJECT_MEMBER);
-        $acl->add('Taskduplication', '*', Role::PROJECT_MEMBER);
+        $acl->add('TaskDuplicationController', '*', 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('TaskExternalLinkController', '*', Role::PROJECT_MEMBER);
         $acl->add('TaskModificationController', '*', Role::PROJECT_MEMBER);
         $acl->add('TaskStatusController', '*', Role::PROJECT_MEMBER);
         $acl->add('UserAjaxController', array('mention'), Role::PROJECT_MEMBER);
@@ -120,10 +120,9 @@ class AuthenticationProvider implements ServiceProviderInterface
         $acl->setRoleHierarchy(Role::APP_MANAGER, array(Role::APP_USER, Role::APP_PUBLIC));
         $acl->setRoleHierarchy(Role::APP_USER, array(Role::APP_PUBLIC));
 
-        $acl->add('Auth', array('login', 'check'), Role::APP_PUBLIC);
+        $acl->add('AuthController', array('login', 'check'), Role::APP_PUBLIC);
         $acl->add('CaptchaController', '*', Role::APP_PUBLIC);
-        $acl->add('PasswordReset', '*', Role::APP_PUBLIC);
-        $acl->add('Webhook', '*', Role::APP_PUBLIC);
+        $acl->add('PasswordResetController', '*', Role::APP_PUBLIC);
         $acl->add('TaskViewController', 'readonly', Role::APP_PUBLIC);
         $acl->add('Board', 'readonly', Role::APP_PUBLIC);
         $acl->add('ICalendarController', '*', Role::APP_PUBLIC);
@@ -137,9 +136,9 @@ class AuthenticationProvider implements ServiceProviderInterface
         $acl->add('GroupListController', '*', Role::APP_ADMIN);
         $acl->add('GroupCreationController', '*', Role::APP_ADMIN);
         $acl->add('GroupModificationController', '*', Role::APP_ADMIN);
-        $acl->add('Link', '*', Role::APP_ADMIN);
-        $acl->add('ProjectCreation', 'create', Role::APP_MANAGER);
-        $acl->add('Projectuser', '*', Role::APP_MANAGER);
+        $acl->add('LinkController', '*', Role::APP_ADMIN);
+        $acl->add('ProjectCreationController', 'create', Role::APP_MANAGER);
+        $acl->add('ProjectUserOverviewController', '*', Role::APP_MANAGER);
         $acl->add('TwoFactorController', 'disable', Role::APP_ADMIN);
         $acl->add('UserImportController', '*', Role::APP_ADMIN);
         $acl->add('UserCreationController', '*', Role::APP_ADMIN);
diff --git a/app/ServiceProvider/RouteProvider.php b/app/ServiceProvider/RouteProvider.php
index c30c15747..0182fb393 100644
--- a/app/ServiceProvider/RouteProvider.php
+++ b/app/ServiceProvider/RouteProvider.php
@@ -45,24 +45,24 @@ class RouteProvider implements ServiceProviderInterface
             $container['route']->addRoute('search/activity', 'SearchController', 'activity');
 
             // ProjectCreation routes
-            $container['route']->addRoute('project/create', 'ProjectCreation', 'create');
-            $container['route']->addRoute('project/create/private', 'ProjectCreation', 'createPrivate');
+            $container['route']->addRoute('project/create', 'ProjectCreationController', 'create');
+            $container['route']->addRoute('project/create/private', 'ProjectCreationController', 'createPrivate');
 
             // Project routes
             $container['route']->addRoute('projects', 'ProjectListController', 'show');
             $container['route']->addRoute('project/:project_id', 'ProjectViewController', 'show');
             $container['route']->addRoute('p/:project_id', 'ProjectViewController', 'show');
-            $container['route']->addRoute('project/:project_id/customer-filters', 'customfilter', 'index');
+            $container['route']->addRoute('project/:project_id/customer-filters', 'CustomFilterController', 'index');
             $container['route']->addRoute('project/:project_id/share', 'ProjectViewController', 'share');
             $container['route']->addRoute('project/:project_id/notifications', 'ProjectViewController', 'notifications');
             $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', 'TaskImportController', 'step1');
-            $container['route']->addRoute('project/:project_id/activity', 'activity', 'project');
+            $container['route']->addRoute('project/:project_id/activity', 'ActivityController', 'project');
 
             // Project Overview
-            $container['route']->addRoute('project/:project_id/overview', 'ProjectOverview', 'show');
+            $container['route']->addRoute('project/:project_id/overview', 'ProjectOverviewController', 'show');
 
             // ProjectEdit routes
             $container['route']->addRoute('project/:project_id/edit', 'ProjectEditController', 'edit');
@@ -71,48 +71,48 @@ class RouteProvider implements ServiceProviderInterface
             $container['route']->addRoute('project/:project_id/edit/priority', 'ProjectEditController', 'priority');
 
             // ProjectUser routes
-            $container['route']->addRoute('projects/managers/:user_id', 'projectuser', 'managers');
-            $container['route']->addRoute('projects/members/:user_id', 'projectuser', 'members');
-            $container['route']->addRoute('projects/tasks/:user_id/opens', 'projectuser', 'opens');
-            $container['route']->addRoute('projects/tasks/:user_id/closed', 'projectuser', 'closed');
-            $container['route']->addRoute('projects/managers', 'projectuser', 'managers');
+            $container['route']->addRoute('projects/managers/:user_id', 'ProjectUserOverviewController', 'managers');
+            $container['route']->addRoute('projects/members/:user_id', 'ProjectUserOverviewController', 'members');
+            $container['route']->addRoute('projects/tasks/:user_id/opens', 'ProjectUserOverviewController', 'opens');
+            $container['route']->addRoute('projects/tasks/:user_id/closed', 'ProjectUserOverviewController', 'closed');
+            $container['route']->addRoute('projects/managers', 'ProjectUserOverviewController', 'managers');
 
             // Action routes
-            $container['route']->addRoute('project/:project_id/actions', 'action', 'index');
+            $container['route']->addRoute('project/:project_id/actions', 'ActionController', 'index');
 
             // Column routes
-            $container['route']->addRoute('project/:project_id/columns', 'column', 'index');
+            $container['route']->addRoute('project/:project_id/columns', 'ColumnController', 'index');
 
             // Swimlane routes
-            $container['route']->addRoute('project/:project_id/swimlanes', 'swimlane', 'index');
+            $container['route']->addRoute('project/:project_id/swimlanes', 'SwimlaneController', 'index');
 
             // Category routes
-            $container['route']->addRoute('project/:project_id/categories', 'category', 'index');
+            $container['route']->addRoute('project/:project_id/categories', 'CategoryController', 'index');
 
             // Task routes
             $container['route']->addRoute('project/:project_id/task/:task_id', 'TaskViewController', 'show');
             $container['route']->addRoute('t/:task_id', 'TaskViewController', 'show');
             $container['route']->addRoute('public/task/:task_id/:token', 'TaskViewController', 'readonly');
 
-            $container['route']->addRoute('project/:project_id/task/:task_id/activity', 'activity', 'task');
+            $container['route']->addRoute('project/:project_id/task/:task_id/activity', 'ActivityController', 'task');
             $container['route']->addRoute('project/:project_id/task/:task_id/transitions', 'TaskViewController', 'transitions');
             $container['route']->addRoute('project/:project_id/task/:task_id/analytics', 'TaskViewController', 'analytics');
             $container['route']->addRoute('project/:project_id/task/:task_id/time-tracking', 'TaskViewController', 'timetracking');
 
             // Exports
-            $container['route']->addRoute('export/tasks/:project_id', 'export', 'tasks');
-            $container['route']->addRoute('export/subtasks/:project_id', 'export', 'subtasks');
-            $container['route']->addRoute('export/transitions/:project_id', 'export', 'transitions');
-            $container['route']->addRoute('export/summary/:project_id', 'export', 'summary');
+            $container['route']->addRoute('export/tasks/:project_id', 'ExportController', 'tasks');
+            $container['route']->addRoute('export/subtasks/:project_id', 'ExportController', 'subtasks');
+            $container['route']->addRoute('export/transitions/:project_id', 'ExportController', 'transitions');
+            $container['route']->addRoute('export/summary/:project_id', 'ExportController', 'summary');
 
             // Analytics routes
-            $container['route']->addRoute('analytics/tasks/:project_id', 'analytic', 'tasks');
-            $container['route']->addRoute('analytics/users/:project_id', 'analytic', 'users');
-            $container['route']->addRoute('analytics/cfd/:project_id', 'analytic', 'cfd');
-            $container['route']->addRoute('analytics/burndown/:project_id', 'analytic', 'burndown');
-            $container['route']->addRoute('analytics/average-time-column/:project_id', 'analytic', 'averageTimeByColumn');
-            $container['route']->addRoute('analytics/lead-cycle-time/:project_id', 'analytic', 'leadAndCycleTime');
-            $container['route']->addRoute('analytics/estimated-spent-time/:project_id', 'analytic', 'compareHours');
+            $container['route']->addRoute('analytics/tasks/:project_id', 'AnalyticController', 'tasks');
+            $container['route']->addRoute('analytics/users/:project_id', 'AnalyticController', 'users');
+            $container['route']->addRoute('analytics/cfd/:project_id', 'AnalyticController', 'cfd');
+            $container['route']->addRoute('analytics/burndown/:project_id', 'AnalyticController', 'burndown');
+            $container['route']->addRoute('analytics/average-time-column/:project_id', 'AnalyticController', 'averageTimeByColumn');
+            $container['route']->addRoute('analytics/lead-cycle-time/:project_id', 'AnalyticController', 'leadAndCycleTime');
+            $container['route']->addRoute('analytics/estimated-spent-time/:project_id', 'AnalyticController', 'compareHours');
 
             // Board routes
             $container['route']->addRoute('board/:project_id', 'board', 'show');
@@ -120,12 +120,12 @@ class RouteProvider implements ServiceProviderInterface
             $container['route']->addRoute('public/board/:token', 'board', 'readonly');
 
             // Calendar routes
-            $container['route']->addRoute('calendar/:project_id', 'calendar', 'show');
-            $container['route']->addRoute('c/:project_id', 'calendar', 'show');
+            $container['route']->addRoute('calendar/:project_id', 'CalendarController', 'show');
+            $container['route']->addRoute('c/:project_id', 'CalendarController', 'show');
 
             // Listing routes
-            $container['route']->addRoute('list/:project_id', 'listing', 'show');
-            $container['route']->addRoute('l/:project_id', 'listing', 'show');
+            $container['route']->addRoute('list/:project_id', 'TaskListController', 'show');
+            $container['route']->addRoute('l/:project_id', 'TaskListController', 'show');
 
             // Gantt routes
             $container['route']->addRoute('gantt/:project_id', 'gantt', 'project');
@@ -170,7 +170,7 @@ class RouteProvider implements ServiceProviderInterface
             $container['route']->addRoute('settings/integrations', 'ConfigController', 'integrations');
             $container['route']->addRoute('settings/webhook', 'ConfigController', 'webhook');
             $container['route']->addRoute('settings/api', 'ConfigController', 'api');
-            $container['route']->addRoute('settings/links', 'link', 'index');
+            $container['route']->addRoute('settings/links', 'LinkController', 'index');
             $container['route']->addRoute('settings/currencies', 'CurrencyController', 'index');
 
             // Plugins
@@ -182,12 +182,12 @@ class RouteProvider implements ServiceProviderInterface
             $container['route']->addRoute('documentation', 'DocumentationController', 'show');
 
             // Auth routes
-            $container['route']->addRoute('login', 'auth', 'login');
-            $container['route']->addRoute('logout', 'auth', 'logout');
+            $container['route']->addRoute('login', 'AuthController', 'login');
+            $container['route']->addRoute('logout', 'AuthController', 'logout');
 
             // PasswordReset
-            $container['route']->addRoute('forgot-password', 'PasswordReset', 'create');
-            $container['route']->addRoute('forgot-password/change/:token', 'PasswordReset', 'change');
+            $container['route']->addRoute('forgot-password', 'PasswordResetController', 'create');
+            $container['route']->addRoute('forgot-password/change/:token', 'PasswordResetController', 'change');
         }
 
         return $container;
diff --git a/app/Template/action/index.php b/app/Template/action/index.php
index 63d638872..0a94e4f0c 100644
--- a/app/Template/action/index.php
+++ b/app/Template/action/index.php
@@ -3,11 +3,11 @@
     <ul>
         <li>
             <i class="fa fa-plus fa-fw"></i>
-            <?= $this->url->link(t('Add a new action'), 'ActionCreation', 'create', array('project_id' => $project['id']), false, 'popover') ?>
+            <?= $this->url->link(t('Add a new action'), 'ActionCreationController', 'create', array('project_id' => $project['id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-copy fa-fw"></i>
-            <?= $this->url->link(t('Import from another project'), 'ActionProject', 'project', array('project_id' => $project['id']), false, 'popover') ?>
+            <?= $this->url->link(t('Import from another project'), 'ProjectActionDuplicationController', 'show', array('project_id' => $project['id']), false, 'popover') ?>
         </li>
     </ul>
 </div>
@@ -63,9 +63,9 @@
                 </ul>
             </td>
             <td>
-                <?= $this->url->link(t('Remove'), 'action', 'confirm', array('project_id' => $project['id'], 'action_id' => $action['id']), false, 'popover') ?>
+                <?= $this->url->link(t('Remove'), 'ActionController', 'confirm', array('project_id' => $project['id'], 'action_id' => $action['id']), false, 'popover') ?>
             </td>
         </tr>
         <?php endforeach ?>
     </table>
-<?php endif ?>
\ No newline at end of file
+<?php endif ?>
diff --git a/app/Template/action/remove.php b/app/Template/action/remove.php
index 070a79181..384bec7ad 100644
--- a/app/Template/action/remove.php
+++ b/app/Template/action/remove.php
@@ -8,8 +8,8 @@
     </p>
 
     <div class="form-actions">
-        <?= $this->url->link(t('Yes'), 'action', 'remove', array('project_id' => $project['id'], 'action_id' => $action['id']), true, 'btn btn-red') ?>
+        <?= $this->url->link(t('Yes'), 'ActionController', 'remove', array('project_id' => $project['id'], 'action_id' => $action['id']), true, 'btn btn-red') ?>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'action', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'ActionController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/Template/action_creation/create.php b/app/Template/action_creation/create.php
index bccb19b37..c0d2880e3 100644
--- a/app/Template/action_creation/create.php
+++ b/app/Template/action_creation/create.php
@@ -1,7 +1,7 @@
 <div class="page-header">
     <h2><?= t('Add an action') ?></h2>
 </div>
-<form class="popover-form" method="post" action="<?= $this->url->href('ActionCreation', 'event', array('project_id' => $project['id'])) ?>">
+<form class="popover-form" method="post" action="<?= $this->url->href('ActionCreationController', 'event', array('project_id' => $project['id'])) ?>">
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('project_id', $values) ?>
 
@@ -11,6 +11,6 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Next step') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'Action', 'index', array(), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'ActionController', 'index', array(), false, 'close-popover') ?>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/Template/action_creation/event.php b/app/Template/action_creation/event.php
index e7e5aaf9b..cdf003101 100644
--- a/app/Template/action_creation/event.php
+++ b/app/Template/action_creation/event.php
@@ -2,7 +2,7 @@
     <h2><?= t('Choose an event') ?></h2>
 </div>
 
-<form class="popover-form" method="post" action="<?= $this->url->href('ActionCreation', 'params', array('project_id' => $project['id'])) ?>">
+<form class="popover-form" method="post" action="<?= $this->url->href('ActionCreationController', 'params', array('project_id' => $project['id'])) ?>">
 
     <?= $this->form->csrf() ?>
 
@@ -22,6 +22,6 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Next step') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'action', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'ActionController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/Template/action_creation/params.php b/app/Template/action_creation/params.php
index 46ca52a4e..fa892177f 100644
--- a/app/Template/action_creation/params.php
+++ b/app/Template/action_creation/params.php
@@ -2,7 +2,7 @@
     <h2><?= t('Define action parameters') ?></h2>
 </div>
 
-<form class="popover-form" method="post" action="<?= $this->url->href('ActionCreation', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
+<form class="popover-form" method="post" action="<?= $this->url->href('ActionCreationController', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
 
@@ -50,6 +50,6 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'action', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'ActionController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
     </div>
 </form>
diff --git a/app/Template/activity/project.php b/app/Template/activity/project.php
index 70235cfca..ce1c8c0ff 100644
--- a/app/Template/activity/project.php
+++ b/app/Template/activity/project.php
@@ -1,5 +1,5 @@
 <section id="main">
-    <?= $this->projectHeader->render($project, 'Analytic', $this->app->getRouterAction()) ?>
+    <?= $this->projectHeader->render($project, 'AnalyticController', $this->app->getRouterAction()) ?>
 
     <?php if ($project['is_public']): ?>
     <div class="menu-inline pull-right">
diff --git a/app/Template/analytic/burndown.php b/app/Template/analytic/burndown.php
index ed6c8aeb9..e979595d6 100644
--- a/app/Template/analytic/burndown.php
+++ b/app/Template/analytic/burndown.php
@@ -12,7 +12,7 @@
 
 <hr/>
 
-<form method="post" class="form-inline" action="<?= $this->url->href('analytic', 'burndown', array('project_id' => $project['id'])) ?>" autocomplete="off">
+<form method="post" class="form-inline" action="<?= $this->url->href('AnalyticController', 'burndown', array('project_id' => $project['id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
 
diff --git a/app/Template/analytic/cfd.php b/app/Template/analytic/cfd.php
index ee259c700..8dfb5b002 100644
--- a/app/Template/analytic/cfd.php
+++ b/app/Template/analytic/cfd.php
@@ -12,7 +12,7 @@
 
 <hr/>
 
-<form method="post" class="form-inline" action="<?= $this->url->href('analytic', 'cfd', array('project_id' => $project['id'])) ?>" autocomplete="off">
+<form method="post" class="form-inline" action="<?= $this->url->href('AnalyticController', 'cfd', array('project_id' => $project['id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
 
diff --git a/app/Template/analytic/layout.php b/app/Template/analytic/layout.php
index e9b9db617..e3c6099f4 100644
--- a/app/Template/analytic/layout.php
+++ b/app/Template/analytic/layout.php
@@ -1,5 +1,5 @@
 <section id="main">
-    <?= $this->projectHeader->render($project, 'Listing', 'show') ?>
+    <?= $this->projectHeader->render($project, 'TaskListController', 'show') ?>
     <section class="sidebar-container">
         <?= $this->render($sidebar_template, array('project' => $project)) ?>
 
diff --git a/app/Template/analytic/lead_cycle_time.php b/app/Template/analytic/lead_cycle_time.php
index 82ffe5347..2dccc1364 100644
--- a/app/Template/analytic/lead_cycle_time.php
+++ b/app/Template/analytic/lead_cycle_time.php
@@ -16,7 +16,7 @@
 
         <div id="chart" data-metrics='<?= json_encode($metrics, JSON_HEX_APOS) ?>' data-label-cycle="<?= t('Cycle Time') ?>" data-label-lead="<?= t('Lead Time') ?>"></div>
 
-        <form method="post" class="form-inline" action="<?= $this->url->href('analytic', 'leadAndCycleTime', array('project_id' => $project['id'])) ?>" autocomplete="off">
+        <form method="post" class="form-inline" action="<?= $this->url->href('AnalyticController', 'leadAndCycleTime', array('project_id' => $project['id'])) ?>" autocomplete="off">
 
             <?= $this->form->csrf() ?>
 
diff --git a/app/Template/analytic/sidebar.php b/app/Template/analytic/sidebar.php
index 76289b9f7..de3dccf81 100644
--- a/app/Template/analytic/sidebar.php
+++ b/app/Template/analytic/sidebar.php
@@ -1,29 +1,29 @@
 <div class="sidebar">
     <h2><?= t('Reportings') ?></h2>
     <ul>
-        <li <?= $this->app->checkMenuSelection('analytic', 'tasks') ?>>
-            <?= $this->url->link(t('Task distribution'), 'analytic', 'tasks', array('project_id' => $project['id'])) ?>
+        <li <?= $this->app->checkMenuSelection('AnalyticController', 'tasks') ?>>
+            <?= $this->url->link(t('Task distribution'), 'AnalyticController', 'tasks', array('project_id' => $project['id'])) ?>
         </li>
-        <li <?= $this->app->checkMenuSelection('analytic', 'users') ?>>
-            <?= $this->url->link(t('User repartition'), 'analytic', 'users', array('project_id' => $project['id'])) ?>
+        <li <?= $this->app->checkMenuSelection('AnalyticController', 'users') ?>>
+            <?= $this->url->link(t('User repartition'), 'AnalyticController', 'users', array('project_id' => $project['id'])) ?>
         </li>
-        <li <?= $this->app->checkMenuSelection('analytic', 'cfd') ?>>
-            <?= $this->url->link(t('Cumulative flow diagram'), 'analytic', 'cfd', array('project_id' => $project['id'])) ?>
+        <li <?= $this->app->checkMenuSelection('AnalyticController', 'cfd') ?>>
+            <?= $this->url->link(t('Cumulative flow diagram'), 'AnalyticController', 'cfd', array('project_id' => $project['id'])) ?>
         </li>
-        <li <?= $this->app->checkMenuSelection('analytic', 'burndown') ?>>
-            <?= $this->url->link(t('Burndown chart'), 'analytic', 'burndown', array('project_id' => $project['id'])) ?>
+        <li <?= $this->app->checkMenuSelection('AnalyticController', 'burndown') ?>>
+            <?= $this->url->link(t('Burndown chart'), 'AnalyticController', 'burndown', array('project_id' => $project['id'])) ?>
         </li>
-        <li <?= $this->app->checkMenuSelection('analytic', 'averageTimeByColumn') ?>>
-            <?= $this->url->link(t('Average time into each column'), 'analytic', 'averageTimeByColumn', array('project_id' => $project['id'])) ?>
+        <li <?= $this->app->checkMenuSelection('AnalyticController', 'averageTimeByColumn') ?>>
+            <?= $this->url->link(t('Average time into each column'), 'AnalyticController', 'averageTimeByColumn', array('project_id' => $project['id'])) ?>
         </li>
-        <li <?= $this->app->checkMenuSelection('analytic', 'leadAndCycleTime') ?>>
-            <?= $this->url->link(t('Lead and cycle time'), 'analytic', 'leadAndCycleTime', array('project_id' => $project['id'])) ?>
+        <li <?= $this->app->checkMenuSelection('AnalyticController', 'leadAndCycleTime') ?>>
+            <?= $this->url->link(t('Lead and cycle time'), 'AnalyticController', 'leadAndCycleTime', array('project_id' => $project['id'])) ?>
         </li>
-        <li <?= $this->app->checkMenuSelection('analytic', 'compareHours') ?>>
-            <?= $this->url->link(t('Estimated vs actual time'), 'analytic', 'compareHours', array('project_id' => $project['id'])) ?>
+        <li <?= $this->app->checkMenuSelection('AnalyticController', 'compareHours') ?>>
+            <?= $this->url->link(t('Estimated vs actual time'), 'AnalyticController', 'compareHours', array('project_id' => $project['id'])) ?>
         </li>
-        
+
         <?= $this->hook->render('template:analytic:sidebar', array('project' => $project)) ?>
-        
+
     </ul>
 </div>
diff --git a/app/Template/auth/index.php b/app/Template/auth/index.php
index 0f5129bd5..45bbdb8ea 100644
--- a/app/Template/auth/index.php
+++ b/app/Template/auth/index.php
@@ -7,7 +7,7 @@
     <?php endif ?>
 
     <?php if (! HIDE_LOGIN_FORM): ?>
-    <form method="post" action="<?= $this->url->href('auth', 'check') ?>">
+    <form method="post" action="<?= $this->url->href('AuthController', 'check') ?>">
 
         <?= $this->form->csrf() ?>
 
@@ -32,7 +32,7 @@
         </div>
         <?php if ($this->app->config('password_reset') == 1): ?>
             <div class="reset-password">
-                <?= $this->url->link(t('Forgot password?'), 'PasswordReset', 'create') ?>
+                <?= $this->url->link(t('Forgot password?'), 'PasswordResetController', 'create') ?>
             </div>
         <?php endif ?>
     </form>
diff --git a/app/Template/board/table_column.php b/app/Template/board/table_column.php
index eced52dca..f7a9f6ad3 100644
--- a/app/Template/board/table_column.php
+++ b/app/Template/board/table_column.php
@@ -43,7 +43,7 @@
                                 <?php if ($column['nb_tasks'] > 0): ?>
                                     <li>
                                         <i class="fa fa-close fa-fw"></i>
-                                        <?= $this->url->link(t('Close all tasks of this column'), 'BoardPopover', 'confirmCloseColumnTasks', array('project_id' => $column['project_id'], 'column_id' => $column['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?>
+                                        <?= $this->url->link(t('Close all tasks of this column'), 'BoardPopoverController', 'confirmCloseColumnTasks', array('project_id' => $column['project_id'], 'column_id' => $column['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?>
                                     </li>
                                 <?php endif ?>
                             <?php endif ?>
diff --git a/app/Template/board/table_swimlane.php b/app/Template/board/table_swimlane.php
index 349b9acb9..c5937e012 100644
--- a/app/Template/board/table_swimlane.php
+++ b/app/Template/board/table_swimlane.php
@@ -14,7 +14,7 @@
             <span
                 title="<?= t('Description') ?>"
                 class="tooltip"
-                data-href="<?= $this->url->href('BoardTooltip', 'swimlane', array('swimlane_id' => $swimlane['id'], 'project_id' => $project['id'])) ?>">
+                data-href="<?= $this->url->href('BoardTooltipController', 'swimlane', array('swimlane_id' => $swimlane['id'], 'project_id' => $project['id'])) ?>">
                 <i class="fa fa-info-circle"></i>
             </span>
         <?php endif ?>
diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php
index 67cae77a5..8cf3e709c 100644
--- a/app/Template/board/task_footer.php
+++ b/app/Template/board/task_footer.php
@@ -34,35 +34,35 @@
     <?php endif ?>
 
     <?php if ($task['recurrence_status'] == \Kanboard\Model\Task::RECURRING_STATUS_PENDING): ?>
-        <span title="<?= t('Recurrence') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltip', 'recurrence', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-refresh fa-rotate-90"></i></span>
+        <span title="<?= t('Recurrence') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'recurrence', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-refresh fa-rotate-90"></i></span>
     <?php endif ?>
 
     <?php if ($task['recurrence_status'] == \Kanboard\Model\Task::RECURRING_STATUS_PROCESSED): ?>
-        <span title="<?= t('Recurrence') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltip', 'recurrence', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-refresh fa-rotate-90 fa-inverse"></i></span>
+        <span title="<?= t('Recurrence') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'recurrence', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-refresh fa-rotate-90 fa-inverse"></i></span>
     <?php endif ?>
 
     <?php if (! empty($task['nb_links'])): ?>
-        <span title="<?= t('Links') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltip', 'tasklinks', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-code-fork fa-fw"></i><?= $task['nb_links'] ?></span>
+        <span title="<?= t('Links') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'tasklinks', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-code-fork fa-fw"></i><?= $task['nb_links'] ?></span>
     <?php endif ?>
 
     <?php if (! empty($task['nb_external_links'])): ?>
-        <span title="<?= t('External links') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltip', 'externallinks', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-external-link fa-fw"></i><?= $task['nb_external_links'] ?></span>
+        <span title="<?= t('External links') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'externallinks', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-external-link fa-fw"></i><?= $task['nb_external_links'] ?></span>
     <?php endif ?>
 
     <?php if (! empty($task['nb_subtasks'])): ?>
-		<span title="<?= t('Sub-Tasks') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltip', 'subtasks', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-bars"></i>&nbsp;<?= round($task['nb_completed_subtasks']/$task['nb_subtasks']*100, 0).'%' ?></span>
+		<span title="<?= t('Sub-Tasks') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'subtasks', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-bars"></i>&nbsp;<?= round($task['nb_completed_subtasks']/$task['nb_subtasks']*100, 0).'%' ?></span>
     <?php endif ?>
 
     <?php if (! empty($task['nb_files'])): ?>
-        <span title="<?= t('Attachments') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltip', 'attachments', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-paperclip"></i>&nbsp;<?= $task['nb_files'] ?></span>
+        <span title="<?= t('Attachments') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'attachments', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-paperclip"></i>&nbsp;<?= $task['nb_files'] ?></span>
     <?php endif ?>
 
     <?php if (! empty($task['nb_comments'])): ?>
-        <span title="<?= $task['nb_comments'] == 1 ? t('%d comment', $task['nb_comments']) : t('%d comments', $task['nb_comments']) ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltip', 'comments', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-comment-o"></i>&nbsp;<?= $task['nb_comments'] ?></span>
+        <span title="<?= $task['nb_comments'] == 1 ? t('%d comment', $task['nb_comments']) : t('%d comments', $task['nb_comments']) ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'comments', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-comment-o"></i>&nbsp;<?= $task['nb_comments'] ?></span>
     <?php endif ?>
 
     <?php if (! empty($task['description'])): ?>
-        <span title="<?= t('Description') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltip', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
+        <span title="<?= t('Description') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
             <i class="fa fa-file-text-o"></i>
         </span>
     <?php endif ?>
diff --git a/app/Template/board/tooltip_files.php b/app/Template/board/tooltip_files.php
index 5ade5b5b6..6f9e26402 100644
--- a/app/Template/board/tooltip_files.php
+++ b/app/Template/board/tooltip_files.php
@@ -9,9 +9,9 @@
         </tr>
         <tr>
             <td>
-                <i class="fa fa-download fa-fw"></i><?= $this->url->link(t('download'), 'FileViewer', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
+                <i class="fa fa-download fa-fw"></i><?= $this->url->link(t('download'), 'FileViewerController', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
                 <?php if ($file['is_image'] == 1): ?>
-                    &nbsp;<i class="fa fa-eye"></i> <?= $this->url->link(t('open file'), 'FileViewer', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?>
+                    &nbsp;<i class="fa fa-eye"></i> <?= $this->url->link(t('open file'), 'FileViewerController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?>
                 <?php endif ?>
             </td>
         </tr>
diff --git a/app/Template/board_popover/close_all_tasks_column.php b/app/Template/board_popover/close_all_tasks_column.php
index 5090f4996..bd167786c 100644
--- a/app/Template/board_popover/close_all_tasks_column.php
+++ b/app/Template/board_popover/close_all_tasks_column.php
@@ -2,7 +2,7 @@
     <div class="page-header">
         <h2><?= t('Do you really want to close all tasks of this column?') ?></h2>
     </div>
-    <form method="post" action="<?= $this->url->href('BoardPopover', 'closeColumnTasks', array('project_id' => $project['id'])) ?>">
+    <form method="post" action="<?= $this->url->href('BoardPopoverController', 'closeColumnTasks', array('project_id' => $project['id'])) ?>">
         <?= $this->form->csrf() ?>
         <?= $this->form->hidden('column_id', $values) ?>
         <?= $this->form->hidden('swimlane_id', $values) ?>
@@ -15,4 +15,4 @@
             <?= $this->url->link(t('cancel'), 'board', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
         </div>
     </form>
-</section>
\ No newline at end of file
+</section>
diff --git a/app/Template/calendar/show.php b/app/Template/calendar/show.php
index f00e810b8..3635f627f 100644
--- a/app/Template/calendar/show.php
+++ b/app/Template/calendar/show.php
@@ -1,9 +1,9 @@
 <section id="main">
-    <?= $this->projectHeader->render($project, 'Calendar', 'show') ?>
+    <?= $this->projectHeader->render($project, 'CalendarController', 'show') ?>
     <div id="calendar"
-         data-save-url="<?= $this->url->href('calendar', 'save', array('project_id' => $project['id'])) ?>"
-         data-check-url="<?= $this->url->href('calendar', 'project', array('project_id' => $project['id'])) ?>"
+         data-save-url="<?= $this->url->href('CalendarController', 'save', array('project_id' => $project['id'])) ?>"
+         data-check-url="<?= $this->url->href('CalendarController', 'project', array('project_id' => $project['id'])) ?>"
          data-check-interval="<?= $check_interval ?>"
     >
     </div>
-</section>
\ No newline at end of file
+</section>
diff --git a/app/Template/category/edit.php b/app/Template/category/edit.php
index 7b5926896..fac56db31 100644
--- a/app/Template/category/edit.php
+++ b/app/Template/category/edit.php
@@ -2,7 +2,7 @@
     <h2><?= t('Category modification for the project "%s"', $project['name']) ?></h2>
 </div>
 
-<form class="popover-form" method="post" action="<?= $this->url->href('category', 'update', array('project_id' => $project['id'], 'category_id' => $values['id'])) ?>" autocomplete="off">
+<form class="popover-form" method="post" action="<?= $this->url->href('CategoryController', 'update', array('project_id' => $project['id'], 'category_id' => $values['id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
 
@@ -18,6 +18,6 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'category', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'CategoryController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/Template/category/index.php b/app/Template/category/index.php
index b3bdfd813..a103d89f5 100644
--- a/app/Template/category/index.php
+++ b/app/Template/category/index.php
@@ -15,10 +15,10 @@
             <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'), 'category', 'edit', array('project_id' => $project['id'], 'category_id' => $category_id), false, 'popover') ?>
+                    <?= $this->url->link(t('Edit'), 'CategoryController', 'edit', array('project_id' => $project['id'], 'category_id' => $category_id), false, 'popover') ?>
                 </li>
                 <li>
-                    <?= $this->url->link(t('Remove'), 'category', 'confirm', array('project_id' => $project['id'], 'category_id' => $category_id), false, 'popover') ?>
+                    <?= $this->url->link(t('Remove'), 'CategoryController', 'confirm', array('project_id' => $project['id'], 'category_id' => $category_id), false, 'popover') ?>
                 </li>
             </ul>
             </div>
@@ -31,7 +31,7 @@
 <div class="page-header">
     <h2><?= t('Add a new category') ?></h2>
 </div>
-<form method="post" action="<?= $this->url->href('category', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
+<form method="post" action="<?= $this->url->href('CategoryController', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('project_id', $values) ?>
@@ -42,4 +42,4 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/Template/category/remove.php b/app/Template/category/remove.php
index cad58d372..e7b9c9b42 100644
--- a/app/Template/category/remove.php
+++ b/app/Template/category/remove.php
@@ -9,9 +9,9 @@
         </p>
 
         <div class="form-actions">
-            <?= $this->url->link(t('Yes'), 'category', 'remove', array('project_id' => $project['id'], 'category_id' => $category['id']), true, 'btn btn-red') ?>
+            <?= $this->url->link(t('Yes'), 'CategoryController', 'remove', array('project_id' => $project['id'], 'category_id' => $category['id']), true, 'btn btn-red') ?>
             <?= t('or') ?>
-            <?= $this->url->link(t('cancel'), 'category', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
+            <?= $this->url->link(t('cancel'), 'CategoryController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
         </div>
     </div>
-</section>
\ No newline at end of file
+</section>
diff --git a/app/Template/column/create.php b/app/Template/column/create.php
index 2d325f766..023de525a 100644
--- a/app/Template/column/create.php
+++ b/app/Template/column/create.php
@@ -1,7 +1,7 @@
 <div class="page-header">
     <h2><?= t('Add a new column') ?></h2>
 </div>
-<form class="popover-form" method="post" action="<?= $this->url->href('Column', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
+<form class="popover-form" method="post" action="<?= $this->url->href('ColumnController', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
 
@@ -21,4 +21,4 @@
         <?= t('or') ?>
         <?= $this->url->link(t('cancel'), 'column', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/Template/column/edit.php b/app/Template/column/edit.php
index 412858a9f..a742e4b99 100644
--- a/app/Template/column/edit.php
+++ b/app/Template/column/edit.php
@@ -2,7 +2,7 @@
     <h2><?= t('Edit column "%s"', $column['title']) ?></h2>
 </div>
 
-<form class="popover-form" method="post" action="<?= $this->url->href('column', 'update', array('project_id' => $project['id'], 'column_id' => $column['id'])) ?>" autocomplete="off">
+<form class="popover-form" method="post" action="<?= $this->url->href('ColumnController', 'update', array('project_id' => $project['id'], 'column_id' => $column['id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
 
@@ -21,6 +21,6 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'column', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'ColumnController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/Template/column/index.php b/app/Template/column/index.php
index 6bc67c5aa..4f5f0a603 100644
--- a/app/Template/column/index.php
+++ b/app/Template/column/index.php
@@ -3,7 +3,7 @@
     <ul>
         <li>
             <i class="fa fa-plus fa-fw"></i>
-            <?= $this->url->link(t('Add a new column'), 'Column', 'create', array('project_id' => $project['id']), false, 'popover') ?>
+            <?= $this->url->link(t('Add a new column'), 'ColumnController', 'create', array('project_id' => $project['id']), false, 'popover') ?>
         </li>
     </ul>
 </div>
@@ -13,7 +13,7 @@
 <?php else: ?>
     <table
         class="columns-table table-stripped"
-        data-save-position-url="<?= $this->url->href('Column', 'move', array('project_id' => $project['id'])) ?>">
+        data-save-position-url="<?= $this->url->href('ColumnController', 'move', array('project_id' => $project['id'])) ?>">
         <thead>
         <tr>
             <th class="column-70"><?= t('Column title') ?></th>
@@ -41,10 +41,10 @@
                 <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'), 'column', 'edit', array('project_id' => $project['id'], 'column_id' => $column['id']), false, 'popover') ?>
+                        <?= $this->url->link(t('Edit'), 'ColumnController', 'edit', array('project_id' => $project['id'], 'column_id' => $column['id']), false, 'popover') ?>
                     </li>
                     <li>
-                        <?= $this->url->link(t('Remove'), 'column', 'confirm', array('project_id' => $project['id'], 'column_id' => $column['id']), false, 'popover') ?>
+                        <?= $this->url->link(t('Remove'), 'ColumnController', 'confirm', array('project_id' => $project['id'], 'column_id' => $column['id']), false, 'popover') ?>
                     </li>
                 </ul>
                 </div>
diff --git a/app/Template/column/remove.php b/app/Template/column/remove.php
index ccab889d8..b231a9a70 100644
--- a/app/Template/column/remove.php
+++ b/app/Template/column/remove.php
@@ -9,7 +9,7 @@
     </p>
 
     <div class="form-actions">
-        <?= $this->url->link(t('Yes'), 'column', 'remove', array('project_id' => $project['id'], 'column_id' => $column['id'], 'remove' => 'yes'), true, 'btn btn-red') ?>
-        <?= t('or') ?> <?= $this->url->link(t('cancel'), 'column', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('Yes'), 'ColumnController', 'remove', array('project_id' => $project['id'], 'column_id' => $column['id'], 'remove' => 'yes'), true, 'btn btn-red') ?>
+        <?= t('or') ?> <?= $this->url->link(t('cancel'), 'ColumnController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/Template/comment/create.php b/app/Template/comment/create.php
index 2a92a2f83..0358107a3 100644
--- a/app/Template/comment/create.php
+++ b/app/Template/comment/create.php
@@ -1,7 +1,7 @@
 <div class="page-header">
     <h2><?= t('Add a comment') ?></h2>
 </div>
-<form class="popover-form" method="post" action="<?= $this->url->href('comment', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
+<form class="popover-form" method="post" action="<?= $this->url->href('CommentController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('task_id', $values) ?>
     <?= $this->form->hidden('user_id', $values) ?>
diff --git a/app/Template/comment/edit.php b/app/Template/comment/edit.php
index abe98804b..f69fc0c19 100644
--- a/app/Template/comment/edit.php
+++ b/app/Template/comment/edit.php
@@ -2,7 +2,7 @@
     <h2><?= t('Edit a comment') ?></h2>
 </div>
 
-<form class="popover-form" method="post" action="<?= $this->url->href('comment', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id'])) ?>" autocomplete="off">
+<form class="popover-form" method="post" action="<?= $this->url->href('CommentController', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('id', $values) ?>
diff --git a/app/Template/comment/remove.php b/app/Template/comment/remove.php
index c7de80536..55587b670 100644
--- a/app/Template/comment/remove.php
+++ b/app/Template/comment/remove.php
@@ -14,7 +14,7 @@
     )) ?>
 
     <div class="form-actions">
-        <?= $this->url->link(t('Yes'), 'comment', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), true, 'btn btn-red') ?>
+        <?= $this->url->link(t('Yes'), 'CommentController', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), true, 'btn btn-red') ?>
         <?= t('or') ?>
         <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
diff --git a/app/Template/comment/show.php b/app/Template/comment/show.php
index 2aca26b39..8419a14ea 100644
--- a/app/Template/comment/show.php
+++ b/app/Template/comment/show.php
@@ -26,11 +26,11 @@
                 <?php if ($editable && ($this->user->isAdmin() || $this->user->isCurrentUser($comment['user_id']))): ?>
                     <li>
                         <i class="fa fa-remove fa-fw"></i>
-                        <?= $this->url->link(t('remove'), 'comment', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), false, 'popover') ?>
+                        <?= $this->url->link(t('remove'), 'CommentController', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), false, 'popover') ?>
                     </li>
                     <li>
                         <i class="fa fa-edit fa-fw"></i>
-                        <?= $this->url->link(t('edit'), 'comment', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), false, 'popover') ?>
+                        <?= $this->url->link(t('edit'), 'CommentController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), false, 'popover') ?>
                     </li>
                 <?php endif ?>
             </ul>
diff --git a/app/Template/comments/create.php b/app/Template/comments/create.php
index 633f4392b..3fa6ddc0a 100644
--- a/app/Template/comments/create.php
+++ b/app/Template/comments/create.php
@@ -1,4 +1,4 @@
-<form method="post" action="<?= $this->url->href('comment', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
+<form method="post" action="<?= $this->url->href('CommentController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('task_id', $values) ?>
     <?= $this->form->hidden('user_id', $values) ?>
diff --git a/app/Template/comments/show.php b/app/Template/comments/show.php
index 76af55936..43f6b2c20 100644
--- a/app/Template/comments/show.php
+++ b/app/Template/comments/show.php
@@ -6,7 +6,7 @@
         <?php if (!isset($is_public) || !$is_public): ?>
             <div class="comment-sorting">
                 <i class="fa fa-sort"></i>
-                <?= $this->url->link(t('change sorting'), 'comment', 'toggleSorting', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+                <?= $this->url->link(t('change sorting'), 'CommentController', 'toggleSorting', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
             </div>
         <?php endif ?>
         <?php foreach ($comments as $comment): ?>
@@ -30,4 +30,4 @@
             )) ?>
         <?php endif ?>
     </div>
-</section>
\ No newline at end of file
+</section>
diff --git a/app/Template/config/sidebar.php b/app/Template/config/sidebar.php
index e6b4631dc..187ecd936 100644
--- a/app/Template/config/sidebar.php
+++ b/app/Template/config/sidebar.php
@@ -16,8 +16,8 @@
         <li <?= $this->app->checkMenuSelection('ConfigController', 'calendar') ?>>
             <?= $this->url->link(t('Calendar settings'), 'ConfigController', 'calendar') ?>
         </li>
-        <li <?= $this->app->checkMenuSelection('link') ?>>
-            <?= $this->url->link(t('Link settings'), 'link', 'index') ?>
+        <li <?= $this->app->checkMenuSelection('LinkController') ?>>
+            <?= $this->url->link(t('Link settings'), 'LinkController', 'index') ?>
         </li>
         <li <?= $this->app->checkMenuSelection('CurrencyController', 'index') ?>>
             <?= $this->url->link(t('Currency rates'), 'CurrencyController', 'index') ?>
diff --git a/app/Template/custom_filter/add.php b/app/Template/custom_filter/add.php
index 56f7921c6..3801cc302 100644
--- a/app/Template/custom_filter/add.php
+++ b/app/Template/custom_filter/add.php
@@ -1,7 +1,7 @@
 <div class="page-header">
     <h2><?= t('Add a new filter') ?></h2>
 </div>
-<form method="post" action="<?= $this->url->href('customfilter', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
+<form method="post" action="<?= $this->url->href('CustomFilterController', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('project_id', $values) ?>
diff --git a/app/Template/custom_filter/edit.php b/app/Template/custom_filter/edit.php
index 051a5062d..26da8da20 100644
--- a/app/Template/custom_filter/edit.php
+++ b/app/Template/custom_filter/edit.php
@@ -2,7 +2,7 @@
     <h2><?= t('Edit custom filter') ?></h2>
 </div>
 
-<form class="form-popover" method="post" action="<?= $this->url->href('customfilter', 'update', array('project_id' => $filter['project_id'], 'filter_id' => $filter['id'])) ?>" autocomplete="off">
+<form class="form-popover" method="post" action="<?= $this->url->href('CustomFilterController', 'update', array('project_id' => $filter['project_id'], 'filter_id' => $filter['id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
 
@@ -27,6 +27,6 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'customfilter', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'CustomFilterController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
     </div>
 </form>
diff --git a/app/Template/custom_filter/index.php b/app/Template/custom_filter/index.php
index 12a4eece8..08c8040c1 100644
--- a/app/Template/custom_filter/index.php
+++ b/app/Template/custom_filter/index.php
@@ -32,12 +32,12 @@
             </td>
             <td><?= $this->text->e($filter['owner_name'] ?: $filter['owner_username']) ?></td>
             <td>
-                <?php if ($filter['user_id'] == $this->user->getId() || $this->user->hasProjectAccess('customfilter', 'edit', $project['id'])): ?>
+                <?php if ($filter['user_id'] == $this->user->getId() || $this->user->hasProjectAccess('CustomFilterController', 'edit', $project['id'])): ?>
                     <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('Remove'), 'customfilter', 'confirm', array('project_id' => $filter['project_id'], 'filter_id' => $filter['id']), false, 'popover') ?></li>
-                        <li><?= $this->url->link(t('Edit'), 'customfilter', 'edit', array('project_id' => $filter['project_id'], 'filter_id' => $filter['id']), false, 'popover') ?></li>
+                        <li><?= $this->url->link(t('Remove'), 'CustomFilterController', 'confirm', array('project_id' => $filter['project_id'], 'filter_id' => $filter['id']), false, 'popover') ?></li>
+                        <li><?= $this->url->link(t('Edit'), 'CustomFilterController', 'edit', array('project_id' => $filter['project_id'], 'filter_id' => $filter['id']), false, 'popover') ?></li>
                     </ul>
                     </div>
                 <?php endif ?>
diff --git a/app/Template/custom_filter/remove.php b/app/Template/custom_filter/remove.php
index d4c67a2be..609f19b20 100644
--- a/app/Template/custom_filter/remove.php
+++ b/app/Template/custom_filter/remove.php
@@ -9,9 +9,9 @@
         </p>
 
         <div class="form-actions">
-            <?= $this->url->link(t('Yes'), 'customfilter', 'remove', array('project_id' => $project['id'], 'filter_id' => $filter['id']), true, 'btn btn-red') ?>
+            <?= $this->url->link(t('Yes'), 'CustomFilterController', 'remove', array('project_id' => $project['id'], 'filter_id' => $filter['id']), true, 'btn btn-red') ?>
             <?= t('or') ?>
-            <?= $this->url->link(t('cancel'), 'customfilter', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
+            <?= $this->url->link(t('cancel'), 'CustomFilterController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
         </div>
     </div>
 </section>
diff --git a/app/Template/dashboard/calendar.php b/app/Template/dashboard/calendar.php
index a154203b7..75c96d830 100644
--- a/app/Template/dashboard/calendar.php
+++ b/app/Template/dashboard/calendar.php
@@ -1,5 +1,5 @@
 <div id="calendar"
-     data-check-url="<?= $this->url->href('calendar', 'user', array('user_id' => $user['id'])) ?>"
-     data-save-url="<?= $this->url->href('calendar', 'save') ?>"
+     data-check-url="<?= $this->url->href('CalendarController', 'user', array('user_id' => $user['id'])) ?>"
+     data-save-url="<?= $this->url->href('CalendarController', 'save') ?>"
 >
 </div>
diff --git a/app/Template/dashboard/layout.php b/app/Template/dashboard/layout.php
index f73e02b51..795537a64 100644
--- a/app/Template/dashboard/layout.php
+++ b/app/Template/dashboard/layout.php
@@ -1,16 +1,16 @@
 <section id="main">
     <div class="page-header">
         <ul>
-            <?php if ($this->user->hasAccess('ProjectCreation', 'create')): ?>
+            <?php if ($this->user->hasAccess('ProjectCreationController', 'create')): ?>
                 <li>
                     <i class="fa fa-plus fa-fw"></i>
-                    <?= $this->url->link(t('New project'), 'ProjectCreation', 'create', array(), false, 'popover') ?>
+                    <?= $this->url->link(t('New project'), 'ProjectCreationController', 'create', array(), false, 'popover') ?>
                 </li>
             <?php endif ?>
             <?php if ($this->app->config('disable_private_project', 0) == 0): ?>
             <li>
                 <i class="fa fa-lock fa-fw"></i>
-                <?= $this->url->link(t('New private project'), 'ProjectCreation', 'createPrivate', array(), false, 'popover') ?>
+                <?= $this->url->link(t('New private project'), 'ProjectCreationController', 'createPrivate', array(), false, 'popover') ?>
             </li>
             <?php endif ?>
             <li>
diff --git a/app/Template/dashboard/projects.php b/app/Template/dashboard/projects.php
index cdf19bdf5..c56152301 100644
--- a/app/Template/dashboard/projects.php
+++ b/app/Template/dashboard/projects.php
@@ -26,8 +26,8 @@
                     <?= $this->url->link('<i class="fa fa-sliders fa-fw"></i>', 'gantt', 'project', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Gantt chart')) ?>
                 <?php endif ?>
 
-                <?= $this->url->link('<i class="fa fa-list"></i>', 'listing', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('List')) ?>&nbsp;
-                <?= $this->url->link('<i class="fa fa-calendar"></i>', 'calendar', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Calendar')) ?>&nbsp;
+                <?= $this->url->link('<i class="fa fa-list"></i>', 'TaskListController', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('List')) ?>&nbsp;
+                <?= $this->url->link('<i class="fa fa-calendar"></i>', 'CalendarController', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Calendar')) ?>&nbsp;
 
                 <?= $this->url->link($this->text->e($project['name']), 'board', 'show', array('project_id' => $project['id'])) ?>
                 <?php if (! empty($project['description'])): ?>
diff --git a/app/Template/export/sidebar.php b/app/Template/export/sidebar.php
index 6a1de7e99..c9d4d0a3c 100644
--- a/app/Template/export/sidebar.php
+++ b/app/Template/export/sidebar.php
@@ -2,17 +2,17 @@
     <h2><?= t('Exports') ?></h2>
     <ul>
         <li <?= $this->app->getRouterAction() === 'tasks' ? 'class="active"' : '' ?>>
-            <?= $this->url->link(t('Tasks'), 'export', 'tasks', array('project_id' => $project['id'])) ?>
+            <?= $this->url->link(t('Tasks'), 'ExportController', 'tasks', array('project_id' => $project['id'])) ?>
         </li>
         <li <?= $this->app->getRouterAction() === 'subtasks' ? 'class="active"' : '' ?>>
-            <?= $this->url->link(t('Subtasks'), 'export', 'subtasks', array('project_id' => $project['id'])) ?>
+            <?= $this->url->link(t('Subtasks'), 'ExportController', 'subtasks', array('project_id' => $project['id'])) ?>
         </li>
         <li <?= $this->app->getRouterAction() === 'transitions' ? 'class="active"' : '' ?>>
-            <?= $this->url->link(t('Task transitions'), 'export', 'transitions', array('project_id' => $project['id'])) ?>
+            <?= $this->url->link(t('Task transitions'), 'ExportController', 'transitions', array('project_id' => $project['id'])) ?>
         </li>
         <li <?= $this->app->getRouterAction() === 'summary' ? 'class="active"' : '' ?>>
-            <?= $this->url->link(t('Daily project summary'), 'export', 'summary', array('project_id' => $project['id'])) ?>
+            <?= $this->url->link(t('Daily project summary'), 'ExportController', 'summary', array('project_id' => $project['id'])) ?>
         </li>
         <?= $this->hook->render('template:export:sidebar') ?>
     </ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/Template/file_viewer/show.php b/app/Template/file_viewer/show.php
index 191aaa6c8..e829a1782 100644
--- a/app/Template/file_viewer/show.php
+++ b/app/Template/file_viewer/show.php
@@ -3,7 +3,7 @@
 </div>
 <div class="file-viewer">
     <?php if ($file['is_image']): ?>
-        <img src="<?= $this->url->href('FileViewer', 'image', $params) ?>" alt="<?= $this->text->e($file['name']) ?>">
+        <img src="<?= $this->url->href('FileViewerController', 'image', $params) ?>" alt="<?= $this->text->e($file['name']) ?>">
     <?php elseif ($type === 'markdown'): ?>
         <article class="markdown">
             <?= $this->text->markdown($content) ?>
@@ -11,4 +11,4 @@
     <?php elseif ($type === 'text'): ?>
         <pre><?= $content ?></pre>
     <?php endif ?>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/Template/gantt/projects.php b/app/Template/gantt/projects.php
index b8431d039..9241e3725 100644
--- a/app/Template/gantt/projects.php
+++ b/app/Template/gantt/projects.php
@@ -4,8 +4,8 @@
             <li>
                 <i class="fa fa-folder fa-fw"></i><?= $this->url->link(t('Projects list'), 'ProjectListController', 'show') ?>
             </li>
-            <?php if ($this->user->hasAccess('projectuser', 'managers')): ?>
-                <li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('Users overview'), 'projectuser', 'managers') ?></li>
+            <?php if ($this->user->hasAccess('ProjectUserOverviewController', 'managers')): ?>
+                <li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('Users overview'), 'ProjectUserOverviewController', 'managers') ?></li>
             <?php endif ?>
         </ul>
     </div>
diff --git a/app/Template/header.php b/app/Template/header.php
index 300df76d3..266b07244 100644
--- a/app/Template/header.php
+++ b/app/Template/header.php
@@ -38,7 +38,7 @@
                     </span>
                 <?php endif ?>
 
-                <?php $has_project_creation_access = $this->user->hasAccess('ProjectCreation', 'create'); ?>
+                <?php $has_project_creation_access = $this->user->hasAccess('ProjectCreationController', 'create'); ?>
                 <?php $is_private_project_enabled = $this->app->config('disable_private_project', 0) == 0; ?>
 
                 <?php if ($has_project_creation_access || (!$has_project_creation_access && $is_private_project_enabled)): ?>
@@ -46,11 +46,13 @@
                     <a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-plus fa-fw"></i><i class="fa fa-caret-down"></i></a>
                     <ul>
                         <?php if ($has_project_creation_access): ?>
-                            <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New project'), 'ProjectCreation', 'create', array(), false, 'popover') ?></li>
+                            <li><i class="fa fa-plus fa-fw"></i>
+                            <?= $this->url->link(t('New project'), 'ProjectCreationController', 'create', array(), false, 'popover') ?></li>
                         <?php endif ?>
                         <?php if ($is_private_project_enabled): ?>
                         <li>
-                            <i class="fa fa-lock fa-fw"></i><?= $this->url->link(t('New private project'), 'ProjectCreation', 'createPrivate', array(), false, 'popover') ?>
+                            <i class="fa fa-lock fa-fw"></i>
+                            <?= $this->url->link(t('New private project'), 'ProjectCreationController', 'createPrivate', array(), false, 'popover') ?>
                         </li>
                         <?php endif ?>
                     </ul>
@@ -98,7 +100,7 @@
                         <?php if (! DISABLE_LOGOUT): ?>
                             <li>
                                 <i class="fa fa-sign-out fa-fw"></i>
-                                <?= $this->url->link(t('Logout'), 'auth', 'logout') ?>
+                                <?= $this->url->link(t('Logout'), 'AuthController', 'logout') ?>
                             </li>
                         <?php endif ?>
                     </ul>
diff --git a/app/Template/layout.php b/app/Template/layout.php
index 6c02de91b..9c4d69c50 100644
--- a/app/Template/layout.php
+++ b/app/Template/layout.php
@@ -45,7 +45,7 @@
         <?= $this->hook->render('template:layout:head') ?>
     </head>
     <body data-status-url="<?= $this->url->href('UserAjaxController', 'status') ?>"
-          data-login-url="<?= $this->url->href('auth', 'login') ?>"
+          data-login-url="<?= $this->url->href('AuthController', 'login') ?>"
           data-keyboard-shortcut-url="<?= $this->url->href('DocumentationController', 'shortcuts') ?>"
           data-timezone="<?= $this->app->getTimezone() ?>"
           data-js-lang="<?= $this->app->jsLang() ?>">
diff --git a/app/Template/link/create.php b/app/Template/link/create.php
index 3b36abee9..23990604f 100644
--- a/app/Template/link/create.php
+++ b/app/Template/link/create.php
@@ -2,7 +2,7 @@
     <h2><?= t('Add a new link') ?></h2>
 </div>
 
-<form action="<?= $this->url->href('link', 'save') ?>" method="post" autocomplete="off">
+<form action="<?= $this->url->href('LinkController', 'save') ?>" method="post" autocomplete="off">
 
     <?= $this->form->csrf() ?>
 
@@ -15,4 +15,4 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/Template/link/edit.php b/app/Template/link/edit.php
index e91422bee..0ad73275b 100644
--- a/app/Template/link/edit.php
+++ b/app/Template/link/edit.php
@@ -2,7 +2,7 @@
     <h2><?= t('Link modification') ?></h2>
 </div>
 
-<form action="<?= $this->url->href('link', 'update', array('link_id' => $link['id'])) ?>" method="post" autocomplete="off">
+<form action="<?= $this->url->href('LinkController', 'update', array('link_id' => $link['id'])) ?>" method="post" autocomplete="off">
 
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('id', $values) ?>
@@ -18,4 +18,4 @@
         <?= t('or') ?>
         <?= $this->url->link(t('cancel'), 'link', 'index') ?>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/Template/link/index.php b/app/Template/link/index.php
index 1475bd509..7e32069a5 100644
--- a/app/Template/link/index.php
+++ b/app/Template/link/index.php
@@ -18,9 +18,9 @@
         </td>
         <td>
             <ul>
-                <?= $this->url->link(t('Edit'), 'link', 'edit', array('link_id' => $link['id'])) ?>
+                <?= $this->url->link(t('Edit'), 'LinkController', 'edit', array('link_id' => $link['id'])) ?>
                 <?= t('or') ?>
-                <?= $this->url->link(t('Remove'), 'link', 'confirm', array('link_id' => $link['id'])) ?>
+                <?= $this->url->link(t('Remove'), 'LinkController', 'confirm', array('link_id' => $link['id'])) ?>
             </ul>
         </td>
     </tr>
@@ -30,4 +30,4 @@
     <?= t('There is no link.') ?>
 <?php endif ?>
 
-<?= $this->render('link/create', array('values' => $values, 'errors' => $errors)) ?>
\ No newline at end of file
+<?= $this->render('link/create', array('values' => $values, 'errors' => $errors)) ?>
diff --git a/app/Template/link/remove.php b/app/Template/link/remove.php
index 12ca14bbf..b7fbef5e3 100644
--- a/app/Template/link/remove.php
+++ b/app/Template/link/remove.php
@@ -8,8 +8,8 @@
     </p>
 
     <div class="form-actions">
-        <?= $this->url->link(t('Yes'), 'link', 'remove', array('link_id' => $link['id']), true, 'btn btn-red') ?>
+        <?= $this->url->link(t('Yes'), 'LinkController', 'remove', array('link_id' => $link['id']), true, 'btn btn-red') ?>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'link', 'index') ?>
+        <?= $this->url->link(t('cancel'), 'LinkController', 'index') ?>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/Template/password_reset/change.php b/app/Template/password_reset/change.php
index 0a1d8de48..80a035da6 100644
--- a/app/Template/password_reset/change.php
+++ b/app/Template/password_reset/change.php
@@ -1,6 +1,6 @@
 <div class="form-login">
     <h2><?= t('Password Reset') ?></h2>
-    <form method="post" action="<?= $this->url->href('PasswordReset', 'update', array('token' => $token)) ?>">
+    <form method="post" action="<?= $this->url->href('PasswordResetController', 'update', array('token' => $token)) ?>">
         <?= $this->form->csrf() ?>
 
         <?= $this->form->label(t('New password'), 'password') ?>
@@ -13,4 +13,4 @@
             <button type="submit" class="btn btn-blue"><?= t('Change Password') ?></button>
         </div>
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/Template/password_reset/create.php b/app/Template/password_reset/create.php
index f1877aa7a..f43d95fcc 100644
--- a/app/Template/password_reset/create.php
+++ b/app/Template/password_reset/create.php
@@ -1,6 +1,6 @@
 <div class="form-login">
     <h2><?= t('Password Reset') ?></h2>
-    <form method="post" action="<?= $this->url->href('PasswordReset', 'save') ?>">
+    <form method="post" action="<?= $this->url->href('PasswordResetController', 'save') ?>">
         <?= $this->form->csrf() ?>
 
         <?= $this->form->label(t('Username'), 'username') ?>
diff --git a/app/Template/password_reset/email.php b/app/Template/password_reset/email.php
index 62788b496..63b08e490 100644
--- a/app/Template/password_reset/email.php
+++ b/app/Template/password_reset/email.php
@@ -1,6 +1,6 @@
 <p><?= t('To reset your password click on this link:') ?></p>
 
-<p><?= $this->url->to('PasswordReset', 'change', array('token' => $token), '', true) ?></p>
+<p><?= $this->url->to('PasswordResetController', 'change', array('token' => $token), '', true) ?></p>
 
 <hr>
-Kanboard
\ No newline at end of file
+Kanboard
diff --git a/app/Template/project/dropdown.php b/app/Template/project/dropdown.php
index edebdd657..10288b817 100644
--- a/app/Template/project/dropdown.php
+++ b/app/Template/project/dropdown.php
@@ -7,11 +7,11 @@
         </li>
         <li>
             <i class="fa fa-calendar fa-fw"></i>
-            <?= $this->url->link(t('Calendar'), 'calendar', 'show', array('project_id' => $project['id'])) ?>
+            <?= $this->url->link(t('Calendar'), 'CalendarController', 'show', array('project_id' => $project['id'])) ?>
         </li>
         <li>
             <i class="fa fa-list fa-fw"></i>
-            <?= $this->url->link(t('Listing'), 'listing', 'show', array('project_id' => $project['id'])) ?>
+            <?= $this->url->link(t('Listing'), 'TaskListController', 'show', array('project_id' => $project['id'])) ?>
         </li>
         <?php if ($this->user->hasProjectAccess('Gantt', 'project', $project['id'])): ?>
         <li>
@@ -22,13 +22,13 @@
 
         <li>
             <i class="fa fa-dashboard fa-fw"></i>&nbsp;
-            <?= $this->url->link(t('Activity'), 'activity', 'project', array('project_id' => $project['id'])) ?>
+            <?= $this->url->link(t('Activity'), 'ActivityController', 'project', array('project_id' => $project['id'])) ?>
         </li>
 
-        <?php if ($this->user->hasProjectAccess('analytic', 'tasks', $project['id'])): ?>
+        <?php if ($this->user->hasProjectAccess('AnalyticController', 'tasks', $project['id'])): ?>
             <li>
                 <i class="fa fa-line-chart fa-fw"></i>&nbsp;
-                <?= $this->url->link(t('Analytics'), 'analytic', 'tasks', array('project_id' => $project['id'])) ?>
+                <?= $this->url->link(t('Analytics'), 'AnalyticController', 'tasks', array('project_id' => $project['id'])) ?>
             </li>
         <?php endif ?>
 
diff --git a/app/Template/project/layout.php b/app/Template/project/layout.php
index fcb3e5f31..ec0392024 100644
--- a/app/Template/project/layout.php
+++ b/app/Template/project/layout.php
@@ -1,5 +1,5 @@
 <section id="main">
-    <?= $this->projectHeader->render($project, 'Listing', 'show') ?>
+    <?= $this->projectHeader->render($project, 'TaskListController', 'show') ?>
     <section class="sidebar-container">
 
         <?= $this->render($sidebar_template, array('project' => $project)) ?>
@@ -8,4 +8,4 @@
             <?= $content_for_sublayout ?>
         </div>
     </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/app/Template/project/sidebar.php b/app/Template/project/sidebar.php
index 0f58c112e..3fac3fd19 100644
--- a/app/Template/project/sidebar.php
+++ b/app/Template/project/sidebar.php
@@ -4,9 +4,9 @@
         <li <?= $this->app->checkMenuSelection('ProjectViewController', 'show') ?>>
             <?= $this->url->link(t('Summary'), 'ProjectViewController', 'show', array('project_id' => $project['id'])) ?>
         </li>
-        <?php if ($this->user->hasProjectAccess('customfilter', 'index', $project['id'])): ?>
-        <li <?= $this->app->checkMenuSelection('customfilter') ?>>
-            <?= $this->url->link(t('Custom filters'), 'customfilter', 'index', array('project_id' => $project['id'])) ?>
+        <?php if ($this->user->hasProjectAccess('CustomFilterController', 'index', $project['id'])): ?>
+        <li <?= $this->app->checkMenuSelection('CustomFilterController') ?>>
+            <?= $this->url->link(t('Custom filters'), 'CustomFilterController', 'index', array('project_id' => $project['id'])) ?>
         </li>
         <?php endif ?>
 
@@ -23,22 +23,22 @@
             <li <?= $this->app->checkMenuSelection('ProjectViewController', 'integrations') ?>>
                 <?= $this->url->link(t('Integrations'), 'ProjectViewController', 'integrations', array('project_id' => $project['id'])) ?>
             </li>
-            <li <?= $this->app->checkMenuSelection('column') ?>>
-                <?= $this->url->link(t('Columns'), 'column', 'index', array('project_id' => $project['id'])) ?>
+            <li <?= $this->app->checkMenuSelection('ColumnController') ?>>
+                <?= $this->url->link(t('Columns'), 'ColumnController', 'index', array('project_id' => $project['id'])) ?>
             </li>
-            <li <?= $this->app->checkMenuSelection('swimlane') ?>>
-                <?= $this->url->link(t('Swimlanes'), 'swimlane', 'index', array('project_id' => $project['id'])) ?>
+            <li <?= $this->app->checkMenuSelection('SwimlaneController') ?>>
+                <?= $this->url->link(t('Swimlanes'), 'SwimlaneController', 'index', array('project_id' => $project['id'])) ?>
             </li>
             <li <?= $this->app->checkMenuSelection('category') ?>>
-                <?= $this->url->link(t('Categories'), 'category', 'index', array('project_id' => $project['id'])) ?>
+                <?= $this->url->link(t('Categories'), 'CategoryController', 'index', array('project_id' => $project['id'])) ?>
             </li>
             <?php if ($project['is_private'] == 0): ?>
             <li <?= $this->app->checkMenuSelection('ProjectPermissionController') ?>>
                 <?= $this->url->link(t('Permissions'), 'ProjectPermissionController', 'index', array('project_id' => $project['id'])) ?>
             </li>
             <?php endif ?>
-            <li <?= $this->app->checkMenuSelection('action') ?>>
-                <?= $this->url->link(t('Automatic actions'), 'action', 'index', array('project_id' => $project['id'])) ?>
+            <li <?= $this->app->checkMenuSelection('ActionController') ?>>
+                <?= $this->url->link(t('Automatic actions'), 'ActionController', 'index', array('project_id' => $project['id'])) ?>
             </li>
             <li <?= $this->app->checkMenuSelection('ProjectViewController', 'duplicate') ?>>
                 <?= $this->url->link(t('Duplicate'), 'ProjectViewController', 'duplicate', array('project_id' => $project['id'])) ?>
diff --git a/app/Template/action_project/project.php b/app/Template/project_action_duplication/show.php
similarity index 84%
rename from app/Template/action_project/project.php
rename to app/Template/project_action_duplication/show.php
index 226f3b190..2eebb262b 100644
--- a/app/Template/action_project/project.php
+++ b/app/Template/project_action_duplication/show.php
@@ -4,8 +4,7 @@
 <?php if (empty($projects_list)): ?>
     <p class="alert"><?= t('There is no available project.') ?></p>
 <?php else: ?>
-    <form class="popover-form" method="post" action="<?= $this->url->href('ActionProject', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
-
+    <form class="popover-form" method="post" action="<?= $this->url->href('ProjectActionDuplicationController', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
         <?= $this->form->csrf() ?>
 
         <?= $this->form->label(t('Create from another project'), 'src_project_id') ?>
@@ -17,4 +16,4 @@
             <?= $this->url->link(t('cancel'), 'Action', 'index', array(), false, 'close-popover') ?>
         </div>
     </form>
-<?php endif ?>
\ No newline at end of file
+<?php endif ?>
diff --git a/app/Template/project_creation/create.php b/app/Template/project_creation/create.php
index ea5783a67..fb892012d 100644
--- a/app/Template/project_creation/create.php
+++ b/app/Template/project_creation/create.php
@@ -2,7 +2,7 @@
     <div class="page-header">
         <h2><?= $title ?></h2>
     </div>
-    <form class="popover-form" id="project-creation-form" method="post" action="<?= $this->url->href('ProjectCreation', 'save') ?>" autocomplete="off">
+    <form class="popover-form" id="project-creation-form" method="post" action="<?= $this->url->href('ProjectCreationController', 'save') ?>" autocomplete="off">
 
         <?= $this->form->csrf() ?>
         <?= $this->form->hidden('is_private', $values) ?>
diff --git a/app/Template/project_edit/general.php b/app/Template/project_edit/general.php
index b817bcd48..c74214776 100644
--- a/app/Template/project_edit/general.php
+++ b/app/Template/project_edit/general.php
@@ -24,7 +24,7 @@
         <?= $this->form->select('owner_id', $owners, $values, $errors) ?>
     </div>
 
-    <?php if ($this->user->hasProjectAccess('ProjectCreation', 'create', $project['id'])): ?>
+    <?php if ($this->user->hasProjectAccess('ProjectCreationController', 'create', $project['id'])): ?>
         <hr>
         <?= $this->form->checkbox('is_private', t('Private project'), 1, $project['is_private'] == 1) ?>
         <p class="form-help"><?= t('Private projects do not have users and groups management.') ?></p>
diff --git a/app/Template/project_file/create.php b/app/Template/project_file/create.php
index 9858b273d..e262799b5 100644
--- a/app/Template/project_file/create.php
+++ b/app/Template/project_file/create.php
@@ -4,7 +4,7 @@
 <div id="file-done" style="display:none">
     <p class="alert alert-success">
         <?= t('All files have been uploaded successfully.') ?>
-        <?= $this->url->link(t('View uploaded files'), 'ProjectOverview', 'show', array('project_id' => $project['id'])) ?>
+        <?= $this->url->link(t('View uploaded files'), 'ProjectOverviewController', 'show', array('project_id' => $project['id'])) ?>
     </p>
 </div>
 
@@ -18,7 +18,7 @@
 <div
     id="file-dropzone"
     data-max-size="<?= $max_size ?>"
-    data-url="<?= $this->url->href('ProjectFile', 'save', array('project_id' => $project['id'])) ?>">
+    data-url="<?= $this->url->href('ProjectFileController', 'save', array('project_id' => $project['id'])) ?>">
     <div id="file-dropzone-inner">
         <?= t('Drag and drop your files here') ?> <?= t('or') ?> <a href="#" id="file-browser"><?= t('choose files') ?></a>
     </div>
@@ -29,5 +29,5 @@
 <div class="form-actions">
     <input type="submit" value="<?= t('Upload files') ?>" class="btn btn-blue" id="file-upload-button" disabled>
     <?= t('or') ?>
-    <?= $this->url->link(t('cancel'), 'ProjectOverview', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
+    <?= $this->url->link(t('cancel'), 'ProjectOverviewController', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
 </div>
diff --git a/app/Template/project_file/remove.php b/app/Template/project_file/remove.php
index ba8342884..0517a9e7e 100644
--- a/app/Template/project_file/remove.php
+++ b/app/Template/project_file/remove.php
@@ -8,8 +8,8 @@
     </p>
 
     <div class="form-actions">
-        <?= $this->url->link(t('Yes'), 'ProjectFile', 'remove', array('project_id' => $project['id'], 'file_id' => $file['id']), true, 'btn btn-red') ?>
+        <?= $this->url->link(t('Yes'), 'ProjectFileController', 'remove', array('project_id' => $project['id'], 'file_id' => $file['id']), true, 'btn btn-red') ?>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'ProjectOverview', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'ProjectOverviewController', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/Template/project_header/dropdown.php b/app/Template/project_header/dropdown.php
index 5a27e981f..d98552e6e 100644
--- a/app/Template/project_header/dropdown.php
+++ b/app/Template/project_header/dropdown.php
@@ -39,13 +39,13 @@
 
         <li>
             <i class="fa fa-dashboard fa-fw"></i>
-            <?= $this->url->link(t('Activity'), 'activity', 'project', array('project_id' => $project['id'])) ?>
+            <?= $this->url->link(t('Activity'), 'ActivityController', 'project', array('project_id' => $project['id'])) ?>
         </li>
 
-        <?php if ($this->user->hasProjectAccess('customfilter', 'index', $project['id'])): ?>
+        <?php if ($this->user->hasProjectAccess('CustomFilterController', 'index', $project['id'])): ?>
             <li>
                 <i class="fa fa-filter fa-fw"></i>
-                <?= $this->url->link(t('Custom filters'), 'customfilter', 'index', array('project_id' => $project['id'])) ?>
+                <?= $this->url->link(t('Custom filters'), 'CustomFilterController', 'index', array('project_id' => $project['id'])) ?>
             </li>
         <?php endif ?>
 
@@ -58,17 +58,17 @@
 
         <?= $this->hook->render('template:project:dropdown', array('project' => $project)) ?>
 
-        <?php if ($this->user->hasProjectAccess('analytic', 'tasks', $project['id'])): ?>
+        <?php if ($this->user->hasProjectAccess('AnalyticController', 'tasks', $project['id'])): ?>
             <li>
                 <i class="fa fa-line-chart fa-fw"></i>
-                <?= $this->url->link(t('Analytics'), 'analytic', 'tasks', array('project_id' => $project['id'])) ?>
+                <?= $this->url->link(t('Analytics'), 'AnalyticController', 'tasks', array('project_id' => $project['id'])) ?>
             </li>
         <?php endif ?>
 
-        <?php if ($this->user->hasProjectAccess('export', 'tasks', $project['id'])): ?>
+        <?php if ($this->user->hasProjectAccess('ExportController', 'tasks', $project['id'])): ?>
             <li>
                 <i class="fa fa-download fa-fw"></i>
-                <?= $this->url->link(t('Exports'), 'export', 'tasks', array('project_id' => $project['id'])) ?>
+                <?= $this->url->link(t('Exports'), 'ExportController', 'tasks', array('project_id' => $project['id'])) ?>
             </li>
         <?php endif ?>
 
diff --git a/app/Template/project_header/views.php b/app/Template/project_header/views.php
index 353e4b624..e444235ad 100644
--- a/app/Template/project_header/views.php
+++ b/app/Template/project_header/views.php
@@ -1,24 +1,24 @@
 <ul class="views">
-    <li <?= $this->app->getRouterController() === 'ProjectOverview' ? 'class="active"' : '' ?>>
+    <li <?= $this->app->checkMenuSelection('ProjectOverviewController') ?>>
         <i class="fa fa-eye fa-fw"></i>
-        <?= $this->url->link(t('Overview'), 'ProjectOverview', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-overview', t('Keyboard shortcut: "%s"', 'v o')) ?>
+        <?= $this->url->link(t('Overview'), 'ProjectOverviewController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-overview', t('Keyboard shortcut: "%s"', 'v o')) ?>
     </li>
-    <li <?= $this->app->getRouterController() === 'Board' ? 'class="active"' : '' ?>>
+    <li <?= $this->app->checkMenuSelection('Board') ?>>
         <i class="fa fa-th fa-fw"></i>
         <?= $this->url->link(t('Board'), 'board', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-board', t('Keyboard shortcut: "%s"', 'v b')) ?>
     </li>
-    <li <?= $this->app->getRouterController() === 'Calendar' ? 'class="active"' : '' ?>>
+    <li <?= $this->app->checkMenuSelection('Calendar') ?>>
         <i class="fa fa-calendar fa-fw"></i>
-        <?= $this->url->link(t('Calendar'), 'calendar', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-calendar', t('Keyboard shortcut: "%s"', 'v c')) ?>
+        <?= $this->url->link(t('Calendar'), 'CalendarController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-calendar', t('Keyboard shortcut: "%s"', 'v c')) ?>
     </li>
-    <li <?= $this->app->getRouterController() === 'Listing' ? 'class="active"' : '' ?>>
+    <li <?= $this->app->checkMenuSelection('TaskListController') ?>>
         <i class="fa fa-list fa-fw"></i>
-        <?= $this->url->link(t('List'), 'listing', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-listing', t('Keyboard shortcut: "%s"', 'v l')) ?>
+        <?= $this->url->link(t('List'), 'TaskListController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-listing', t('Keyboard shortcut: "%s"', 'v l')) ?>
     </li>
     <?php if ($this->user->hasProjectAccess('gantt', 'project', $project['id'])): ?>
-    <li <?= $this->app->getRouterController() === 'Gantt' ? 'class="active"' : '' ?>>
+    <li <?= $this->app->checkMenuSelection('Gantt') ?>>
         <i class="fa fa-sliders fa-fw"></i>
         <?= $this->url->link(t('Gantt'), 'gantt', 'project', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-gantt', t('Keyboard shortcut: "%s"', 'v g')) ?>
     </li>
     <?php endif ?>
-</ul>
\ No newline at end of file
+</ul>
diff --git a/app/Template/project_list/show.php b/app/Template/project_list/show.php
index 06e4a626e..3fd69f418 100644
--- a/app/Template/project_list/show.php
+++ b/app/Template/project_list/show.php
@@ -1,8 +1,8 @@
 <section id="main">
     <div class="page-header">
         <ul>
-            <?php if ($this->user->hasAccess('projectuser', 'managers')): ?>
-                <li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('Users overview'), 'projectuser', 'managers') ?></li>
+            <?php if ($this->user->hasAccess('ProjectUserOverviewController', 'managers')): ?>
+                <li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('Users overview'), 'ProjectUserOverviewController', 'managers') ?></li>
             <?php endif ?>
             <?php if ($this->user->hasAccess('gantt', 'projects')): ?>
                 <li><i class="fa fa-sliders fa-fw"></i><?= $this->url->link(t('Projects Gantt chart'), 'gantt', 'projects') ?></li>
@@ -20,7 +20,7 @@
                 <th class="column-8"><?= $paginator->order(t('Start date'), 'start_date') ?></th>
                 <th class="column-8"><?= $paginator->order(t('End date'), 'end_date') ?></th>
                 <th class="column-15"><?= $paginator->order(t('Owner'), 'owner_id') ?></th>
-                <?php if ($this->user->hasAccess('projectuser', 'managers')): ?>
+                <?php if ($this->user->hasAccess('ProjectUserOverviewController', 'managers')): ?>
                     <th class="column-10"><?= t('Users') ?></th>
                 <?php endif ?>
                 <th><?= t('Columns') ?></th>
@@ -64,10 +64,10 @@
                         <?= $this->text->e($project['owner_name'] ?: $project['owner_username']) ?>
                     <?php endif ?>
                 </td>
-                <?php if ($this->user->hasAccess('projectuser', 'managers')): ?>
+                <?php if ($this->user->hasAccess('ProjectUserOverviewController', 'managers')): ?>
                     <td>
                         <i class="fa fa-users fa-fw"></i>
-                        <span class="tooltip" title="<?= t('Members') ?>" data-href="<?= $this->url->href('Projectuser', 'users', array('project_id' => $project['id'])) ?>"><?= t('Members') ?></span>
+                        <span class="tooltip" title="<?= t('Members') ?>" data-href="<?= $this->url->href('ProjectUserOverviewController', 'users', array('project_id' => $project['id'])) ?>"><?= t('Members') ?></span>
                     </td>
                 <?php endif ?>
                 <td class="dashboard-project-stats">
diff --git a/app/Template/project_overview/attachments.php b/app/Template/project_overview/attachments.php
index eaabfd5f7..ab8cf2adf 100644
--- a/app/Template/project_overview/attachments.php
+++ b/app/Template/project_overview/attachments.php
@@ -3,9 +3,9 @@
         <h3><a href="#" class="fa accordion-toggle"></a> <?= t('Attachments') ?></h3>
     </div>
     <div class="accordion-content">
-        <?php if ($this->user->hasProjectAccess('ProjectFile', 'create', $project['id'])): ?>
+        <?php if ($this->user->hasProjectAccess('ProjectFileController', 'create', $project['id'])): ?>
         <div class="buttons-header">
-            <?= $this->url->button('fa-plus', t('Upload a file'), 'ProjectFile', 'create', array('project_id' => $project['id']), 'popover') ?>
+            <?= $this->url->button('fa-plus', t('Upload a file'), 'ProjectFileController', 'create', array('project_id' => $project['id']), 'popover') ?>
         </div>
         <?php endif ?>
 
diff --git a/app/Template/project_overview/files.php b/app/Template/project_overview/files.php
index c570b7715..fa870938b 100644
--- a/app/Template/project_overview/files.php
+++ b/app/Template/project_overview/files.php
@@ -16,17 +16,17 @@
                             <?php if ($this->file->getPreviewType($file['name']) !== null): ?>
                                 <li>
                                     <i class="fa fa-eye fa-fw"></i>
-                                    <?= $this->url->link(t('View file'), 'FileViewer', 'show', array('project_id' => $project['id'], 'file_id' => $file['id']), false, 'popover') ?>
+                                    <?= $this->url->link(t('View file'), 'FileViewerController', 'show', array('project_id' => $project['id'], 'file_id' => $file['id']), false, 'popover') ?>
                                 </li>
                             <?php endif ?>
                             <li>
                                 <i class="fa fa-download fa-fw"></i>
-                                <?= $this->url->link(t('Download'), 'FileViewer', 'download', array('project_id' => $project['id'], 'file_id' => $file['id'])) ?>
+                                <?= $this->url->link(t('Download'), 'FileViewerController', 'download', array('project_id' => $project['id'], 'file_id' => $file['id'])) ?>
                             </li>
-                            <?php if ($this->user->hasProjectAccess('ProjectFile', 'remove', $project['id'])): ?>
+                            <?php if ($this->user->hasProjectAccess('ProjectFileController', 'remove', $project['id'])): ?>
                                 <li>
                                     <i class="fa fa-trash fa-fw"></i>
-                                    <?= $this->url->link(t('Remove'), 'ProjectFile', 'confirm', array('project_id' => $project['id'], 'file_id' => $file['id']), false, 'popover') ?>
+                                    <?= $this->url->link(t('Remove'), 'ProjectFileController', 'confirm', array('project_id' => $project['id'], 'file_id' => $file['id']), false, 'popover') ?>
                                 </li>
                             <?php endif ?>
                         </ul>
diff --git a/app/Template/project_overview/images.php b/app/Template/project_overview/images.php
index f6937e12c..7f38e2b11 100644
--- a/app/Template/project_overview/images.php
+++ b/app/Template/project_overview/images.php
@@ -2,7 +2,7 @@
     <div class="file-thumbnails">
         <?php foreach ($images as $file): ?>
             <div class="file-thumbnail">
-                <a href="<?= $this->url->href('FileViewer', 'show', array('project_id' => $project['id'], 'file_id' => $file['id'])) ?>" class="popover"><img src="<?= $this->url->href('FileViewer', 'thumbnail', array('file_id' => $file['id'], 'project_id' => $project['id'])) ?>" title="<?= $this->text->e($file['name']) ?>" alt="<?= $this->text->e($file['name']) ?>"></a>
+                <a href="<?= $this->url->href('FileViewerController', 'show', array('project_id' => $project['id'], 'file_id' => $file['id'])) ?>" class="popover"><img src="<?= $this->url->href('FileViewerController', 'thumbnail', array('file_id' => $file['id'], 'project_id' => $project['id'])) ?>" title="<?= $this->text->e($file['name']) ?>" alt="<?= $this->text->e($file['name']) ?>"></a>
                 <div class="file-thumbnail-content">
                     <div class="file-thumbnail-title">
                         <div class="dropdown">
@@ -10,12 +10,12 @@
                             <ul>
                                 <li>
                                     <i class="fa fa-download fa-fw"></i>
-                                    <?= $this->url->link(t('Download'), 'FileViewer', 'download', array('project_id' => $project['id'], 'file_id' => $file['id'])) ?>
+                                    <?= $this->url->link(t('Download'), 'FileViewerController', 'download', array('project_id' => $project['id'], 'file_id' => $file['id'])) ?>
                                 </li>
-                                <?php if ($this->user->hasProjectAccess('ProjectFile', 'remove', $project['id'])): ?>
+                                <?php if ($this->user->hasProjectAccess('ProjectFileController', 'remove', $project['id'])): ?>
                                     <li>
                                         <i class="fa fa-trash fa-fw"></i>
-                                        <?= $this->url->link(t('Remove'), 'ProjectFile', 'confirm', array('project_id' => $project['id'], 'file_id' => $file['id']), false, 'popover') ?>
+                                        <?= $this->url->link(t('Remove'), 'ProjectFileController', 'confirm', array('project_id' => $project['id'], 'file_id' => $file['id']), false, 'popover') ?>
                                     </li>
                                 <?php endif ?>
                             </ul>
diff --git a/app/Template/project_overview/show.php b/app/Template/project_overview/show.php
index 6fe815b39..6b2bc2cfa 100644
--- a/app/Template/project_overview/show.php
+++ b/app/Template/project_overview/show.php
@@ -1,5 +1,5 @@
 <section id="main">
-    <?= $this->projectHeader->render($project, 'ProjectOverview', 'show') ?>
+    <?= $this->projectHeader->render($project, 'ProjectOverviewController', 'show') ?>
     <?= $this->render('project_overview/columns', array('project' => $project)) ?>
     <?= $this->render('project_overview/description', array('project' => $project)) ?>
     <?= $this->render('project_overview/attachments', array('project' => $project, 'images' => $images, 'files' => $files)) ?>
diff --git a/app/Template/project_user/sidebar.php b/app/Template/project_user/sidebar.php
deleted file mode 100644
index f1cffcadc..000000000
--- a/app/Template/project_user/sidebar.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<div class="sidebar">
-    <h2><?= t('Actions') ?></h2>
-
-    <?= $this->form->select(
-            'user_id',
-            $users,
-            $filter,
-            array(),
-            array('data-redirect-url="'.$this->url->href('projectuser', $this->app->getRouterAction(), array('user_id' => 'USER_ID')).'"', 'data-redirect-regex="USER_ID"'),
-            'chosen-select select-auto-redirect'
-        ) ?>
-
-    <br><br>
-    <ul>
-        <li <?= $this->app->checkMenuSelection('projectuser', 'managers') ?>>
-            <?= $this->url->link(t('Project managers'), 'projectuser', 'managers', $filter) ?>
-        </li>
-        <li <?= $this->app->checkMenuSelection('projectuser', 'members') ?>>
-            <?= $this->url->link(t('Project members'), 'projectuser', 'members', $filter) ?>
-        </li>
-        <li <?= $this->app->checkMenuSelection('projectuser', 'opens') ?>>
-            <?= $this->url->link(t('Open tasks'), 'projectuser', 'opens', $filter) ?>
-        </li>
-        <li <?= $this->app->checkMenuSelection('projectuser', 'closed') ?>>
-            <?= $this->url->link(t('Closed tasks'), 'projectuser', 'closed', $filter) ?>
-        </li>
-
-        <?= $this->hook->render('template:project-user:sidebar') ?>
-    </ul>
-</div>
diff --git a/app/Template/project_user/layout.php b/app/Template/project_user_overview/layout.php
similarity index 100%
rename from app/Template/project_user/layout.php
rename to app/Template/project_user_overview/layout.php
diff --git a/app/Template/project_user/roles.php b/app/Template/project_user_overview/roles.php
similarity index 100%
rename from app/Template/project_user/roles.php
rename to app/Template/project_user_overview/roles.php
diff --git a/app/Template/project_user_overview/sidebar.php b/app/Template/project_user_overview/sidebar.php
new file mode 100644
index 000000000..9a87d4ebb
--- /dev/null
+++ b/app/Template/project_user_overview/sidebar.php
@@ -0,0 +1,30 @@
+<div class="sidebar">
+    <h2><?= t('Actions') ?></h2>
+
+    <?= $this->form->select(
+            'user_id',
+            $users,
+            $filter,
+            array(),
+            array('data-redirect-url="'.$this->url->href('ProjectUserOverviewController', $this->app->getRouterAction(), array('user_id' => 'USER_ID')).'"', 'data-redirect-regex="USER_ID"'),
+            'chosen-select select-auto-redirect'
+        ) ?>
+
+    <br><br>
+    <ul>
+        <li <?= $this->app->checkMenuSelection('ProjectUserOverviewController', 'managers') ?>>
+            <?= $this->url->link(t('Project managers'), 'ProjectUserOverviewController', 'managers', $filter) ?>
+        </li>
+        <li <?= $this->app->checkMenuSelection('ProjectUserOverviewController', 'members') ?>>
+            <?= $this->url->link(t('Project members'), 'ProjectUserOverviewController', 'members', $filter) ?>
+        </li>
+        <li <?= $this->app->checkMenuSelection('ProjectUserOverviewController', 'opens') ?>>
+            <?= $this->url->link(t('Open tasks'), 'ProjectUserOverviewController', 'opens', $filter) ?>
+        </li>
+        <li <?= $this->app->checkMenuSelection('ProjectUserOverviewController', 'closed') ?>>
+            <?= $this->url->link(t('Closed tasks'), 'ProjectUserOverviewController', 'closed', $filter) ?>
+        </li>
+
+        <?= $this->hook->render('template:project-user:sidebar') ?>
+    </ul>
+</div>
diff --git a/app/Template/project_user/tasks.php b/app/Template/project_user_overview/tasks.php
similarity index 100%
rename from app/Template/project_user/tasks.php
rename to app/Template/project_user_overview/tasks.php
diff --git a/app/Template/project_user/tooltip_users.php b/app/Template/project_user_overview/tooltip_users.php
similarity index 88%
rename from app/Template/project_user/tooltip_users.php
rename to app/Template/project_user_overview/tooltip_users.php
index 81300eaac..7117a87f7 100644
--- a/app/Template/project_user/tooltip_users.php
+++ b/app/Template/project_user_overview/tooltip_users.php
@@ -7,7 +7,7 @@
         <tr><th><?= $role_name ?></th></tr>
             <?php foreach ($users[$role] as $user_id => $user): ?>
                 <tr><td>
-                <?= $this->url->link($this->text->e($user), 'Projectuser', 'opens', array('user_id' => $user_id)) ?>
+                <?= $this->url->link($this->text->e($user), 'ProjectUserOverviewController', 'opens', array('user_id' => $user_id)) ?>
                 </td></tr>
             <?php endforeach ?>
         <?php endif ?>
diff --git a/app/Template/project_view/show.php b/app/Template/project_view/show.php
index 3a0d7f03e..b03e0dd81 100644
--- a/app/Template/project_view/show.php
+++ b/app/Template/project_view/show.php
@@ -39,7 +39,7 @@
         <?php endif ?>
 
         <?php if ($stats['nb_inactive_tasks'] > 0): ?>
-            <li><?= $this->url->link(t('%d closed tasks', $stats['nb_inactive_tasks']), 'listing', 'show', array('project_id' => $project['id'], 'search' => 'status:closed')) ?></li>
+            <li><?= $this->url->link(t('%d closed tasks', $stats['nb_inactive_tasks']), 'TaskListController', 'show', array('project_id' => $project['id'], 'search' => 'status:closed')) ?></li>
         <?php endif ?>
 
         <li><?= t('%d tasks in total', $stats['nb_tasks']) ?></li>
diff --git a/app/Template/swimlane/create.php b/app/Template/swimlane/create.php
index a9b4374b3..f5aa15912 100644
--- a/app/Template/swimlane/create.php
+++ b/app/Template/swimlane/create.php
@@ -1,7 +1,7 @@
 <div class="page-header">
     <h2><?= t('Add a new swimlane') ?></h2>
 </div>
-<form class="popover-form" method="post" action="<?= $this->url->href('swimlane', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
+<form class="popover-form" method="post" action="<?= $this->url->href('SwimlaneController', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('project_id', $values) ?>
@@ -15,6 +15,6 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'Swimlane', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'SwimlaneController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
     </div>
 </form>
diff --git a/app/Template/swimlane/edit.php b/app/Template/swimlane/edit.php
index b08099aee..b10cdd520 100644
--- a/app/Template/swimlane/edit.php
+++ b/app/Template/swimlane/edit.php
@@ -2,7 +2,7 @@
     <h2><?= t('Swimlane modification for the project "%s"', $project['name']) ?></h2>
 </div>
 
-<form class="popover-form" method="post" action="<?= $this->url->href('swimlane', 'update', array('project_id' => $project['id'], 'swimlane_id' => $values['id'])) ?>" autocomplete="off">
+<form class="popover-form" method="post" action="<?= $this->url->href('SwimlaneController', 'update', array('project_id' => $project['id'], 'swimlane_id' => $values['id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
 
@@ -18,6 +18,6 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'swimlane', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'SwimlaneController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/Template/swimlane/edit_default.php b/app/Template/swimlane/edit_default.php
index 3bf825685..f271c5139 100644
--- a/app/Template/swimlane/edit_default.php
+++ b/app/Template/swimlane/edit_default.php
@@ -1,7 +1,7 @@
 <div class="page-header">
     <h2><?= t('Change default swimlane') ?></h2>
 </div>
-<form class="popover-form" method="post" action="<?= $this->url->href('swimlane', 'updateDefault', array('project_id' => $project['id'])) ?>" autocomplete="off">
+<form class="popover-form" method="post" action="<?= $this->url->href('SwimlaneController', 'updateDefault', array('project_id' => $project['id'])) ?>" autocomplete="off">
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('id', $values) ?>
 
@@ -13,6 +13,6 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'Swimlane', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'SwimlaneController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
     </div>
 </form>
diff --git a/app/Template/swimlane/index.php b/app/Template/swimlane/index.php
index fad35306b..4f78a405e 100644
--- a/app/Template/swimlane/index.php
+++ b/app/Template/swimlane/index.php
@@ -3,7 +3,7 @@
     <ul>
         <li>
             <i class="fa fa-plus fa-fw"></i>
-            <?= $this->url->link(t('Add a new swimlane'), 'Swimlane', 'create', array('project_id' => $project['id']), false, 'popover') ?>
+            <?= $this->url->link(t('Add a new swimlane'), 'SwimlaneController', 'create', array('project_id' => $project['id']), false, 'popover') ?>
         </li>
     </ul>
 </div>
diff --git a/app/Template/swimlane/remove.php b/app/Template/swimlane/remove.php
index 9be39ff8b..f16b778ce 100644
--- a/app/Template/swimlane/remove.php
+++ b/app/Template/swimlane/remove.php
@@ -9,9 +9,9 @@
         </p>
 
         <div class="form-actions">
-            <?= $this->url->link(t('Yes'), 'swimlane', 'remove', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), true, 'btn btn-red') ?>
+            <?= $this->url->link(t('Yes'), 'SwimlaneController', 'remove', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), true, 'btn btn-red') ?>
             <?= t('or') ?>
-            <?= $this->url->link(t('cancel'), 'swimlane', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
+            <?= $this->url->link(t('cancel'), 'SwimlaneController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
         </div>
     </div>
-</section>
\ No newline at end of file
+</section>
diff --git a/app/Template/swimlane/table.php b/app/Template/swimlane/table.php
index ec3cb6210..be123b08e 100644
--- a/app/Template/swimlane/table.php
+++ b/app/Template/swimlane/table.php
@@ -1,6 +1,6 @@
 <table
     class="swimlanes-table table-stripped"
-    data-save-position-url="<?= $this->url->href('Swimlane', 'move', array('project_id' => $project['id'])) ?>">
+    data-save-position-url="<?= $this->url->href('SwimlaneController', 'move', array('project_id' => $project['id'])) ?>">
     <thead>
         <tr>
             <th><?= t('Name') ?></th>
@@ -20,13 +20,13 @@
                 <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'), 'Swimlane', 'editDefault', array('project_id' => $project['id']), false, 'popover') ?>
+                        <?= $this->url->link(t('Edit'), 'SwimlaneController', 'editDefault', array('project_id' => $project['id']), false, 'popover') ?>
                     </li>
                     <li>
                         <?php if ($default_swimlane['show_default_swimlane'] == 1): ?>
-                            <?= $this->url->link(t('Disable'), 'Swimlane', 'disableDefault', array('project_id' => $project['id']), true) ?>
+                            <?= $this->url->link(t('Disable'), 'SwimlaneController', 'disableDefault', array('project_id' => $project['id']), true) ?>
                         <?php else: ?>
-                            <?= $this->url->link(t('Enable'), 'Swimlane', 'enableDefault', array('project_id' => $project['id']), true) ?>
+                            <?= $this->url->link(t('Enable'), 'SwimlaneController', 'enableDefault', array('project_id' => $project['id']), true) ?>
                         <?php endif ?>
                     </li>
                 </ul>
@@ -55,17 +55,17 @@
                 <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'), 'swimlane', 'edit', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?>
+                        <?= $this->url->link(t('Edit'), 'SwimlaneController', 'edit', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?>
                     </li>
                     <li>
                         <?php if ($swimlane['is_active']): ?>
-                            <?= $this->url->link(t('Disable'), 'swimlane', 'disable', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), true) ?>
+                            <?= $this->url->link(t('Disable'), 'SwimlaneController', 'disable', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), true) ?>
                         <?php else: ?>
-                            <?= $this->url->link(t('Enable'), 'swimlane', 'enable', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), true) ?>
+                            <?= $this->url->link(t('Enable'), 'SwimlaneController', 'enable', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), true) ?>
                         <?php endif ?>
                     </li>
                     <li>
-                        <?= $this->url->link(t('Remove'), 'swimlane', 'confirm', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?>
+                        <?= $this->url->link(t('Remove'), 'SwimlaneController', 'confirm', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?>
                     </li>
                 </ul>
                 </div>
diff --git a/app/Template/task/dropdown.php b/app/Template/task/dropdown.php
index 6f887c0af..472c819f5 100644
--- a/app/Template/task/dropdown.php
+++ b/app/Template/task/dropdown.php
@@ -33,11 +33,11 @@
         </li>
         <li>
             <i class="fa fa-external-link fa-fw"></i>
-            <?= $this->url->link(t('Add external link'), 'TaskExternalLink', 'find', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Add external link'), 'TaskExternalLinkController', 'find', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-comment-o fa-fw"></i>
-            <?= $this->url->link(t('Add a comment'), 'comment', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Add a comment'), 'CommentController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-camera fa-fw"></i>
@@ -45,15 +45,15 @@
         </li>
         <li>
             <i class="fa fa-files-o fa-fw"></i>
-            <?= $this->url->link(t('Duplicate'), 'taskduplication', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Duplicate'), 'TaskDuplicationController', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-clipboard fa-fw"></i>
-            <?= $this->url->link(t('Duplicate to another project'), 'taskduplication', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Duplicate to another project'), 'TaskDuplicationController', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-clone fa-fw"></i>
-            <?= $this->url->link(t('Move to another project'), 'taskduplication', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Move to another project'), 'TaskDuplicationController', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <?php if ($this->user->canRemoveTask($task)): ?>
             <li>
diff --git a/app/Template/task/layout.php b/app/Template/task/layout.php
index 0a755617e..00e0e9ae4 100644
--- a/app/Template/task/layout.php
+++ b/app/Template/task/layout.php
@@ -1,5 +1,5 @@
 <section id="main">
-    <?= $this->projectHeader->render($project, 'Listing', 'show') ?>
+    <?= $this->projectHeader->render($project, 'TaskListController', 'show') ?>
     <?= $this->hook->render('template:task:layout:top', array('task' => $task)) ?>
     <section
         class="sidebar-container" id="task-view"
@@ -7,7 +7,7 @@
         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('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'])) ?>">
+        data-comment-url="<?= $this->url->href('CommentController', '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 b79903b47..2b54eea85 100644
--- a/app/Template/task/show.php
+++ b/app/Template/task/show.php
@@ -46,7 +46,7 @@
     'task' => $task,
     'comments' => $comments,
     'project' => $project,
-    'editable' => $this->user->hasProjectAccess('comment', 'edit', $project['id']),
+    'editable' => $this->user->hasProjectAccess('CommentController', 'edit', $project['id']),
 )) ?>
 
 <?= $this->hook->render('template:task:show:bottom', array('task' => $task, 'project' => $project)) ?>
diff --git a/app/Template/task/sidebar.php b/app/Template/task/sidebar.php
index a8e8ba09e..ff3883e17 100644
--- a/app/Template/task/sidebar.php
+++ b/app/Template/task/sidebar.php
@@ -5,9 +5,9 @@
             <i class="fa fa-newspaper-o fa-fw"></i>
             <?= $this->url->link(t('Summary'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
         </li>
-        <li <?= $this->app->checkMenuSelection('activity', 'task') ?>>
+        <li <?= $this->app->checkMenuSelection('ActivityController', 'task') ?>>
             <i class="fa fa-dashboard fa-fw"></i>
-            <?= $this->url->link(t('Activity stream'), 'activity', 'task', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+            <?= $this->url->link(t('Activity stream'), 'ActivityController', 'task', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
         </li>
         <li <?= $this->app->checkMenuSelection('TaskViewController', 'transitions') ?>>
             <i class="fa fa-arrows-h fa-fw"></i>
@@ -52,31 +52,31 @@
         </li>
         <li>
             <i class="fa fa-external-link fa-fw"></i>
-            <?= $this->url->link(t('Add external link'), 'TaskExternalLink', 'find', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Add external link'), 'TaskExternalLinkController', 'find', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-comment-o fa-fw"></i>
-            <?= $this->url->link(t('Add a comment'), 'comment', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Add a comment'), 'CommentController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-file fa-fw"></i>
-            <?= $this->url->link(t('Attach a document'), 'TaskFile', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Attach a document'), 'TaskFileController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-camera fa-fw"></i>
-            <?= $this->url->link(t('Add a screenshot'), 'TaskFile', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Add a screenshot'), 'TaskFileController', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-files-o fa-fw"></i>
-            <?= $this->url->link(t('Duplicate'), 'taskduplication', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Duplicate'), 'TaskDuplicationController', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-clipboard fa-fw"></i>
-            <?= $this->url->link(t('Duplicate to another project'), 'taskduplication', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Duplicate to another project'), 'TaskDuplicationController', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-clone fa-fw"></i>
-            <?= $this->url->link(t('Move to another project'), 'taskduplication', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Move to another project'), 'TaskDuplicationController', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <?php if ($task['is_active'] == 1): ?>
diff --git a/app/Template/task_duplication/copy.php b/app/Template/task_duplication/copy.php
index f7215f3d4..58b4d837c 100644
--- a/app/Template/task_duplication/copy.php
+++ b/app/Template/task_duplication/copy.php
@@ -6,7 +6,7 @@
     <p class="alert"><?= t('There is no destination project available.') ?></p>
 <?php else: ?>
 
-    <form class="popover-form" method="post" action="<?= $this->url->href('taskduplication', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
+    <form class="popover-form" method="post" action="<?= $this->url->href('TaskDuplicationController', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
 
         <?= $this->form->csrf() ?>
         <?= $this->form->hidden('id', $values) ?>
@@ -17,7 +17,7 @@
             $projects_list,
             $values,
             array(),
-            array('data-redirect="'.$this->url->href('taskduplication', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'dst_project_id' => 'PROJECT_ID')).'"'),
+            array('data-redirect="'.$this->url->href('TaskDuplicationController', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'dst_project_id' => 'PROJECT_ID')).'"'),
             'task-reload-project-destination'
         ) ?>
         <span class="loading-icon" style="display: none">&nbsp;<i class="fa fa-spinner fa-spin"></i></span>
diff --git a/app/Template/task_duplication/duplicate.php b/app/Template/task_duplication/duplicate.php
index 1be6b7061..c0baf94e2 100644
--- a/app/Template/task_duplication/duplicate.php
+++ b/app/Template/task_duplication/duplicate.php
@@ -8,7 +8,7 @@
     </p>
 
     <div class="form-actions">
-        <?= $this->url->link(t('Yes'), 'taskduplication', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red') ?>
+        <?= $this->url->link(t('Yes'), 'TaskDuplicationController', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red') ?>
         <?= t('or') ?>
         <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
diff --git a/app/Template/task_duplication/move.php b/app/Template/task_duplication/move.php
index 50b29363a..8f01c4b9c 100644
--- a/app/Template/task_duplication/move.php
+++ b/app/Template/task_duplication/move.php
@@ -6,7 +6,7 @@
     <p class="alert"><?= t('There is no destination project available.') ?></p>
 <?php else: ?>
 
-    <form class="popover-form" method="post" action="<?= $this->url->href('taskduplication', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
+    <form class="popover-form" method="post" action="<?= $this->url->href('TaskDuplicationController', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
 
         <?= $this->form->csrf() ?>
         <?= $this->form->hidden('id', $values) ?>
@@ -17,7 +17,7 @@
             $projects_list,
             $values,
             array(),
-            array('data-redirect="'.$this->url->href('taskduplication', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'dst_project_id' => 'PROJECT_ID')).'"'),
+            array('data-redirect="'.$this->url->href('TaskDuplicationController', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'dst_project_id' => 'PROJECT_ID')).'"'),
             'task-reload-project-destination'
         ) ?>
         <span class="loading-icon" style="display: none">&nbsp;<i class="fa fa-spinner fa-spin"></i></span>
diff --git a/app/Template/task_external_link/create.php b/app/Template/task_external_link/create.php
index 5d49eef0c..beddfc90d 100644
--- a/app/Template/task_external_link/create.php
+++ b/app/Template/task_external_link/create.php
@@ -2,12 +2,12 @@
     <h2><?= t('Add a new external link') ?></h2>
 </div>
 
-<form class="popover-form" action="<?= $this->url->href('TaskExternalLink', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post" autocomplete="off">
+<form class="popover-form" action="<?= $this->url->href('TaskExternalLinkController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post" autocomplete="off">
     <?= $this->render('task_external_link/form', array('task' => $task, 'dependencies' => $dependencies, 'values' => $values, 'errors' => $errors)) ?>
 
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'TaskExternalLink', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'TaskExternalLinkController', '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_external_link/edit.php b/app/Template/task_external_link/edit.php
index dcbc26333..917a28b99 100644
--- a/app/Template/task_external_link/edit.php
+++ b/app/Template/task_external_link/edit.php
@@ -2,12 +2,12 @@
     <h2><?= t('Edit external link') ?></h2>
 </div>
 
-<form class="popover-form" action="<?= $this->url->href('TaskExternalLink', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post" autocomplete="off">
+<form class="popover-form" action="<?= $this->url->href('TaskExternalLinkController', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post" autocomplete="off">
     <?= $this->render('task_external_link/form', array('task' => $task, 'dependencies' => $dependencies, 'values' => $values, 'errors' => $errors)) ?>
 
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'TaskExternalLink', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'TaskExternalLinkController', '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_external_link/find.php b/app/Template/task_external_link/find.php
index 09843d2f3..a88b29ce3 100644
--- a/app/Template/task_external_link/find.php
+++ b/app/Template/task_external_link/find.php
@@ -2,7 +2,7 @@
     <h2><?= t('Add a new external link') ?></h2>
 </div>
 
-<form class="popover-form" action="<?= $this->url->href('TaskExternalLink', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post" autocomplete="off">
+<form class="popover-form" action="<?= $this->url->href('TaskExternalLinkController', 'create', 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'])) ?>
 
diff --git a/app/Template/task_external_link/remove.php b/app/Template/task_external_link/remove.php
index 015352552..2a888a60e 100644
--- a/app/Template/task_external_link/remove.php
+++ b/app/Template/task_external_link/remove.php
@@ -8,8 +8,8 @@
     </p>
 
     <div class="form-actions">
-        <?= $this->url->link(t('Yes'), 'TaskExternalLink', 'remove', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), true, 'btn btn-red') ?>
+        <?= $this->url->link(t('Yes'), 'TaskExternalLinkController', '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'), 'TaskExternalLink', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+        <?= $this->url->link(t('cancel'), 'TaskExternalLinkController', '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_external_link/table.php b/app/Template/task_external_link/table.php
index 1f32f4dd6..56ef03633 100644
--- a/app/Template/task_external_link/table.php
+++ b/app/Template/task_external_link/table.php
@@ -6,7 +6,7 @@
         <th class="column-10"><?= t('Dependency') ?></th>
         <th class="column-15"><?= t('Creator') ?></th>
         <th class="column-15"><?= t('Date') ?></th>
-        <?php if ($this->user->hasProjectAccess('TaskExternalLink', 'edit', $task['project_id'])): ?>
+        <?php if ($this->user->hasProjectAccess('TaskExternalLinkController', 'edit', $task['project_id'])): ?>
             <th class="column-5"><?= t('Action') ?></th>
         <?php endif ?>
     </tr>
@@ -27,13 +27,13 @@
             <td>
                 <?= $this->dt->date($link['date_creation']) ?>
             </td>
-            <?php if ($this->user->hasProjectAccess('TaskExternalLink', 'edit', $task['project_id'])): ?>
+            <?php if ($this->user->hasProjectAccess('TaskExternalLinkController', 'edit', $task['project_id'])): ?>
                 <td>
                     <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'), 'TaskExternalLink', 'edit', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li>
-                            <li><?= $this->url->link(t('Remove'), 'TaskExternalLink', 'confirm', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li>
+                            <li><?= $this->url->link(t('Edit'), 'TaskExternalLinkController', 'edit', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li>
+                            <li><?= $this->url->link(t('Remove'), 'TaskExternalLinkController', '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_file/create.php b/app/Template/task_file/create.php
index e3bbfa2b3..e05cf8297 100644
--- a/app/Template/task_file/create.php
+++ b/app/Template/task_file/create.php
@@ -18,7 +18,7 @@
 <div
     id="file-dropzone"
     data-max-size="<?= $max_size ?>"
-    data-url="<?= $this->url->href('TaskFile', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
+    data-url="<?= $this->url->href('TaskFileController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
     <div id="file-dropzone-inner">
         <?= t('Drag and drop your files here') ?> <?= t('or') ?> <a href="#" id="file-browser"><?= t('choose files') ?></a>
     </div>
diff --git a/app/Template/task_file/files.php b/app/Template/task_file/files.php
index 5603014e1..7ca59b1c1 100644
--- a/app/Template/task_file/files.php
+++ b/app/Template/task_file/files.php
@@ -16,17 +16,17 @@
                             <?php if ($this->file->getPreviewType($file['name']) !== null): ?>
                                 <li>
                                     <i class="fa fa-eye fa-fw"></i>
-                                    <?= $this->url->link(t('View file'), 'FileViewer', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?>
+                                    <?= $this->url->link(t('View file'), 'FileViewerController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?>
                                 </li>
                             <?php endif ?>
                             <li>
                                 <i class="fa fa-download fa-fw"></i>
-                                <?= $this->url->link(t('Download'), 'FileViewer', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
+                                <?= $this->url->link(t('Download'), 'FileViewerController', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
                             </li>
-                            <?php if ($this->user->hasProjectAccess('TaskFile', 'remove', $task['project_id'])): ?>
+                            <?php if ($this->user->hasProjectAccess('TaskFileController', 'remove', $task['project_id'])): ?>
                                 <li>
                                     <i class="fa fa-trash fa-fw"></i>
-                                    <?= $this->url->link(t('Remove'), 'TaskFile', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?>
+                                    <?= $this->url->link(t('Remove'), 'TaskFileController', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?>
                                 </li>
                             <?php endif ?>
                         </ul>
@@ -44,4 +44,4 @@
             </tr>
         <?php endforeach ?>
     </table>
-<?php endif ?>
\ No newline at end of file
+<?php endif ?>
diff --git a/app/Template/task_file/images.php b/app/Template/task_file/images.php
index 55c098cb3..81c331515 100644
--- a/app/Template/task_file/images.php
+++ b/app/Template/task_file/images.php
@@ -2,7 +2,7 @@
     <div class="file-thumbnails">
         <?php foreach ($images as $file): ?>
             <div class="file-thumbnail">
-                <a href="<?= $this->url->href('FileViewer', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>" class="popover"><img src="<?= $this->url->href('FileViewer', 'thumbnail', array('file_id' => $file['id'], 'project_id' => $task['project_id'], 'task_id' => $file['task_id'])) ?>" title="<?= $this->text->e($file['name']) ?>" alt="<?= $this->text->e($file['name']) ?>"></a>
+                <a href="<?= $this->url->href('FileViewerController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>" class="popover"><img src="<?= $this->url->href('FileViewerController', 'thumbnail', array('file_id' => $file['id'], 'project_id' => $task['project_id'], 'task_id' => $file['task_id'])) ?>" title="<?= $this->text->e($file['name']) ?>" alt="<?= $this->text->e($file['name']) ?>"></a>
                 <div class="file-thumbnail-content">
                     <div class="file-thumbnail-title">
                         <div class="dropdown">
@@ -10,12 +10,12 @@
                             <ul>
                                 <li>
                                     <i class="fa fa-download fa-fw"></i>
-                                    <?= $this->url->link(t('Download'), 'FileViewer', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
+                                    <?= $this->url->link(t('Download'), 'FileViewerController', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
                                 </li>
-                                <?php if ($this->user->hasProjectAccess('TaskFile', 'remove', $task['project_id'])): ?>
+                                <?php if ($this->user->hasProjectAccess('TaskFileController', 'remove', $task['project_id'])): ?>
                                     <li>
                                         <i class="fa fa-trash fa-fw"></i>
-                                        <?= $this->url->link(t('Remove'), 'TaskFile', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?>
+                                        <?= $this->url->link(t('Remove'), 'TaskFileController', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?>
                                     </li>
                                 <?php endif ?>
                             </ul>
@@ -31,4 +31,4 @@
             </div>
         <?php endforeach ?>
     </div>
-<?php endif ?>
\ No newline at end of file
+<?php endif ?>
diff --git a/app/Template/task_file/remove.php b/app/Template/task_file/remove.php
index 5097c66a3..42894f051 100644
--- a/app/Template/task_file/remove.php
+++ b/app/Template/task_file/remove.php
@@ -8,7 +8,7 @@
     </p>
 
     <div class="form-actions">
-        <?= $this->url->link(t('Yes'), 'TaskFile', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), true, 'btn btn-red') ?>
+        <?= $this->url->link(t('Yes'), 'TaskFileController', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), true, 'btn btn-red') ?>
         <?= t('or') ?>
         <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
diff --git a/app/Template/task_file/screenshot.php b/app/Template/task_file/screenshot.php
index 75958db1f..6300159fd 100644
--- a/app/Template/task_file/screenshot.php
+++ b/app/Template/task_file/screenshot.php
@@ -6,7 +6,7 @@
     <p id="screenshot-inner"><?= t('Take a screenshot and press CTRL+V or ⌘+V to paste here.') ?></p>
 </div>
 
-<form class="popover-form" action="<?= $this->url->href('TaskFile', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post">
+<form class="popover-form" action="<?= $this->url->href('TaskFileController', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post">
     <input type="hidden" name="screenshot"/>
     <?= $this->form->csrf() ?>
     <div class="form-actions">
diff --git a/app/Template/listing/show.php b/app/Template/task_list/show.php
similarity index 97%
rename from app/Template/listing/show.php
rename to app/Template/task_list/show.php
index 4ceb7f874..9ffcb2e82 100644
--- a/app/Template/listing/show.php
+++ b/app/Template/task_list/show.php
@@ -1,5 +1,5 @@
 <section id="main">
-    <?= $this->projectHeader->render($project, 'Listing', 'show') ?>
+    <?= $this->projectHeader->render($project, 'TaskListController', 'show') ?>
 
     <?php if ($paginator->isEmpty()): ?>
         <p class="alert"><?= t('No tasks found.') ?></p>
diff --git a/tests/units/Helper/UserHelperTest.php b/tests/units/Helper/UserHelperTest.php
index 0b339422b..3c21f7f1a 100644
--- a/tests/units/Helper/UserHelperTest.php
+++ b/tests/units/Helper/UserHelperTest.php
@@ -40,9 +40,9 @@ class UserHelperTest extends Base
             'role' => Role::APP_ADMIN,
         );
 
-        $this->assertTrue($helper->hasAccess('user', 'create'));
-        $this->assertTrue($helper->hasAccess('ProjectCreation', 'create'));
-        $this->assertTrue($helper->hasAccess('ProjectCreation', 'createPrivate'));
+        $this->assertTrue($helper->hasAccess('UserCreationController', 'create'));
+        $this->assertTrue($helper->hasAccess('ProjectCreationController', 'create'));
+        $this->assertTrue($helper->hasAccess('ProjectCreationController', 'createPrivate'));
     }
 
     public function testHasAccessForManagers()
@@ -55,8 +55,8 @@ class UserHelperTest extends Base
         );
 
         $this->assertFalse($helper->hasAccess('UserCreationController', 'show'));
-        $this->assertTrue($helper->hasAccess('ProjectCreation', 'create'));
-        $this->assertTrue($helper->hasAccess('ProjectCreation', 'createPrivate'));
+        $this->assertTrue($helper->hasAccess('ProjectCreationController', 'create'));
+        $this->assertTrue($helper->hasAccess('ProjectCreationController', 'createPrivate'));
     }
 
     public function testHasAccessForUsers()
@@ -69,8 +69,8 @@ class UserHelperTest extends Base
         );
 
         $this->assertFalse($helper->hasAccess('UserCreationController', 'show'));
-        $this->assertFalse($helper->hasAccess('ProjectCreation', 'create'));
-        $this->assertTrue($helper->hasAccess('ProjectCreation', 'createPrivate'));
+        $this->assertFalse($helper->hasAccess('ProjectCreationController', 'create'));
+        $this->assertTrue($helper->hasAccess('ProjectCreationController', 'createPrivate'));
     }
 
     public function testHasProjectAccessForAdmins()
@@ -140,12 +140,12 @@ class UserHelperTest extends Base
 
         $this->assertTrue($helper->hasProjectAccess('ProjectEditController', 'edit', 1));
         $this->assertTrue($helper->hasProjectAccess('board', 'show', 1));
-        $this->assertTrue($helper->hasProjectAccess('task', 'show', 1));
+        $this->assertTrue($helper->hasProjectAccess('TaskViewController', 'show', 1));
         $this->assertTrue($helper->hasProjectAccess('taskcreationcontroller', 'save', 1));
 
         $this->assertFalse($helper->hasProjectAccess('ProjectEditController', 'edit', 2));
         $this->assertFalse($helper->hasProjectAccess('board', 'show', 2));
-        $this->assertFalse($helper->hasProjectAccess('task', 'show', 2));
+        $this->assertFalse($helper->hasProjectAccess('TaskViewController', 'show', 2));
         $this->assertFalse($helper->hasProjectAccess('TaskCreationController', 'save', 2));
     }
 
@@ -168,12 +168,12 @@ class UserHelperTest extends Base
 
         $this->assertTrue($helper->hasProjectAccess('ProjectEditController', 'edit', 1));
         $this->assertTrue($helper->hasProjectAccess('board', 'show', 1));
-        $this->assertTrue($helper->hasProjectAccess('task', 'show', 1));
+        $this->assertTrue($helper->hasProjectAccess('TaskViewController', 'show', 1));
         $this->assertTrue($helper->hasProjectAccess('TaskCreationController', 'save', 1));
 
         $this->assertFalse($helper->hasProjectAccess('ProjectEditController', 'edit', 2));
         $this->assertFalse($helper->hasProjectAccess('board', 'show', 2));
-        $this->assertFalse($helper->hasProjectAccess('task', 'show', 2));
+        $this->assertFalse($helper->hasProjectAccess('TaskViewController', 'show', 2));
         $this->assertFalse($helper->hasProjectAccess('TaskCreationController', 'save', 2));
     }
 
@@ -196,12 +196,12 @@ class UserHelperTest extends Base
 
         $this->assertFalse($helper->hasProjectAccess('ProjectEditController', 'edit', 1));
         $this->assertTrue($helper->hasProjectAccess('board', 'show', 1));
-        $this->assertTrue($helper->hasProjectAccess('task', 'show', 1));
+        $this->assertTrue($helper->hasProjectAccess('TaskViewController', 'show', 1));
         $this->assertTrue($helper->hasProjectAccess('TaskCreationController', 'save', 1));
 
         $this->assertFalse($helper->hasProjectAccess('ProjectEditController', 'edit', 2));
         $this->assertFalse($helper->hasProjectAccess('board', 'show', 2));
-        $this->assertFalse($helper->hasProjectAccess('task', 'show', 2));
+        $this->assertFalse($helper->hasProjectAccess('TaskViewController', 'show', 2));
         $this->assertFalse($helper->hasProjectAccess('TaskCreationController', 'save', 2));
     }
 
@@ -224,12 +224,12 @@ class UserHelperTest extends Base
 
         $this->assertFalse($helper->hasProjectAccess('ProjectEditController', 'edit', 1));
         $this->assertTrue($helper->hasProjectAccess('board', 'show', 1));
-        $this->assertTrue($helper->hasProjectAccess('task', 'show', 1));
+        $this->assertTrue($helper->hasProjectAccess('TaskViewController', 'show', 1));
         $this->assertFalse($helper->hasProjectAccess('TaskCreationController', 'save', 1));
 
         $this->assertFalse($helper->hasProjectAccess('ProjectEditController', 'edit', 2));
         $this->assertFalse($helper->hasProjectAccess('board', 'show', 2));
-        $this->assertFalse($helper->hasProjectAccess('task', 'show', 2));
+        $this->assertFalse($helper->hasProjectAccess('TaskViewController', 'show', 2));
         $this->assertFalse($helper->hasProjectAccess('TaskCreationController', 'save', 2));
     }
 
@@ -245,10 +245,10 @@ class UserHelperTest extends Base
         $this->assertNotFalse($userModel->create(array('username' => 'toto', 'password' => '123456')));
         $this->assertNotFalse($userModel->create(array('username' => 'toto2', 'password' => '123456')));
         $this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
-        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'Task #1', 'project_id' => 1, 'creator_id' => 1)));
-        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'Task #2', 'project_id' => 1, 'creator_id' => 2)));
-        $this->assertEquals(3, $taskCreationModel->create(array('title' => 'Task #3', 'project_id' => 1, 'creator_id' => 3)));
-        $this->assertEquals(4, $taskCreationModel->create(array('title' => 'Task #4', 'project_id' => 1)));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'TaskViewController #1', 'project_id' => 1, 'creator_id' => 1)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'TaskViewController #2', 'project_id' => 1, 'creator_id' => 2)));
+        $this->assertEquals(3, $taskCreationModel->create(array('title' => 'TaskViewController #3', 'project_id' => 1, 'creator_id' => 3)));
+        $this->assertEquals(4, $taskCreationModel->create(array('title' => 'TaskViewController #4', 'project_id' => 1)));
 
         // User #1 can remove everything
         $user = $userModel->getById(1);
@@ -259,7 +259,7 @@ class UserHelperTest extends Base
         $this->assertNotEmpty($task);
         $this->assertTrue($helper->canRemoveTask($task));
 
-        // User #2 can't remove the task #1
+        // User #2 can't remove the TaskViewController #1
         $user = $userModel->getById(2);
         $this->assertNotEmpty($user);
         $userSessionModel->initialize($user);
@@ -277,7 +277,7 @@ class UserHelperTest extends Base
         $this->assertNotEmpty($task);
         $this->assertTrue($helper->canRemoveTask($task));
 
-        // User #2 can remove his own task
+        // User #2 can remove his own TaskViewController
         $user = $userModel->getbyId(2);
         $this->assertNotEmpty($user);
         $userSessionModel->initialize($user);
@@ -295,7 +295,7 @@ class UserHelperTest extends Base
         $this->assertNotEmpty($task);
         $this->assertTrue($helper->canRemoveTask($task));
 
-        // User #2 can't remove the task #3
+        // User #2 can't remove the TaskViewController #3
         $user = $userModel->getById(2);
         $this->assertNotEmpty($user);
         $userSessionModel->initialize($user);
@@ -313,7 +313,7 @@ class UserHelperTest extends Base
         $this->assertNotEmpty($task);
         $this->assertTrue($helper->canRemoveTask($task));
 
-        // User #2 can't remove the task #4
+        // User #2 can't remove the TaskViewController #4
         $user = $userModel->getById(2);
         $this->assertNotEmpty($user);
         $userSessionModel->initialize($user);