Rename controllers

30 files changed, 117 insertions, 114 deletions

diff --git a/app/Controller/Action.php b/app/Controller/ActionController.php
index 40497a62..51090d22 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
index 388b30e2..e055f11b 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
index 0c6aa3f3..a8fc1b39 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
index ba73c15c..99d34c66 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 60bc154a..45cf39a5 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
index cad44a34..598b3ff8 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
index d3117f78..b204af39 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
index 49d02ced..2f1d949e 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
index 706c1d3b..c875a18c 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
index 954d92cc..e7c8db54 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
index 294c31d8..5f04f426 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
index 8d3b7862..8d1132ae 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
index d0794366..8dd98764 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
index 7e1d2fdc..4ed9ee08 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
index a49b0fb2..245845c7 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
index d28f5e4e..08627d40 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
index 04adf154..7663ddcc 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
index 7050d6d2..9036b3e7 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
index 10b3c9d4..790b7ed3 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
index 0ffa2174..4166ead1 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 774c6909..64e02d1a 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
index 6ec5ff27..f1bce09d 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
index f8837f95..75cf25ba 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
index fe1fe0f1..90887a8a 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
index 4575e909..13a64d40 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 4b4a2594..c0214ea7 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
index 1ea3a3f9..ab7b6b42 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
index 0bd55dba..91dc734a 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
index 544c1ea7..44c19c27 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
index 93a7b836..898c14c8 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),