diff --git a/Controller/AdminController.php b/Controller/AdminController.php
index 9a528b0b8..cdb7796a3 100644
--- a/Controller/AdminController.php
+++ b/Controller/AdminController.php
@@ -21,15 +21,17 @@
 
 namespace Chill\MainBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
 /**
- * 
+ * Class AdminController
  *
+ * @package Chill\MainBundle\Controller
  * @author julien.fastre@champs-libres.coop
  * @author marc@champs-libres.coop
  */
-class AdminController extends Controller {
+class AdminController extends AbstractController
+{
     
     public function indexAction($menu = 'admin', 
             $header_title = 'views.Main.admin.index.header_title',
diff --git a/Controller/CenterController.php b/Controller/CenterController.php
index be0372040..c85140ff4 100644
--- a/Controller/CenterController.php
+++ b/Controller/CenterController.php
@@ -2,8 +2,8 @@
 
 namespace Chill\MainBundle\Controller;
 
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 
 use Chill\MainBundle\Entity\Center;
@@ -11,10 +11,11 @@ use Chill\MainBundle\Form\CenterType;
 
 
 /**
- * Center controller.
+ * Class CenterController
  *
+ * @package Chill\MainBundle\Controller
  */
-class CenterController extends Controller
+class CenterController extends AbstractController
 {
 
     /**
diff --git a/Controller/DefaultController.php b/Controller/DefaultController.php
index cd2de4472..8ad6d8d3a 100644
--- a/Controller/DefaultController.php
+++ b/Controller/DefaultController.php
@@ -2,9 +2,14 @@
 
 namespace Chill\MainBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
-class DefaultController extends Controller
+/**
+ * Class DefaultController
+ *
+ * @package Chill\MainBundle\Controller
+ */
+class DefaultController extends AbstractController
 {
     public function indexAction()
     {        
diff --git a/Controller/ExportController.php b/Controller/ExportController.php
index 0e0ebb4fc..71f6c0543 100644
--- a/Controller/ExportController.php
+++ b/Controller/ExportController.php
@@ -22,7 +22,7 @@
 
 namespace Chill\MainBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Chill\MainBundle\Form\Type\Export\ExportType;
 use Chill\MainBundle\Form\Type\Export\FormatterType;
@@ -37,11 +37,12 @@ use Chill\MainBundle\Redis\ChillRedis;
 use Symfony\Component\Translation\TranslatorInterface;
 
 /**
- * ExportController is the controller use for exporting data.
- *
+ * Class ExportController
+ * Controller used for exporting data.
  *
+ * @package Chill\MainBundle\Controller
  */
-class ExportController extends Controller
+class ExportController extends AbstractController
 {
     
     /**
diff --git a/Controller/LoginController.php b/Controller/LoginController.php
index 43eac37e5..920ce22c3 100644
--- a/Controller/LoginController.php
+++ b/Controller/LoginController.php
@@ -2,12 +2,17 @@
 
 namespace Chill\MainBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
 
-class LoginController extends Controller
+/**
+ * Class LoginController
+ *
+ * @package Chill\MainBundle\Controller
+ */
+class LoginController extends AbstractController
 {
     /**
      *
diff --git a/Controller/MenuController.php b/Controller/MenuController.php
index 4402bff6e..8820c8356 100644
--- a/Controller/MenuController.php
+++ b/Controller/MenuController.php
@@ -2,9 +2,14 @@
 
 namespace Chill\MainBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
-class MenuController extends Controller
+/**
+ * Class MenuController
+ *
+ * @package Chill\MainBundle\Controller
+ */
+class MenuController extends AbstractController
 {
     public function writeMenuAction($menu, $layout, $activeRouteKey = null, array $args = array() )
     {
diff --git a/Controller/PasswordController.php b/Controller/PasswordController.php
index 3c2735e11..6d364f7ce 100644
--- a/Controller/PasswordController.php
+++ b/Controller/PasswordController.php
@@ -2,7 +2,7 @@
 
 namespace Chill\MainBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Chill\MainBundle\Form\UserPasswordType;
@@ -20,7 +20,12 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Chill\MainBundle\Security\PasswordRecover\PasswordRecoverEvent;
 use Chill\MainBundle\Security\PasswordRecover\PasswordRecoverVoter;
 
-class PasswordController extends Controller
+/**
+ * Class PasswordController
+ *
+ * @package Chill\MainBundle\Controller
+ */
+class PasswordController extends AbstractController
 {
     /**
      *
diff --git a/Controller/PermissionsGroupController.php b/Controller/PermissionsGroupController.php
index a3d69cbbd..148a1fe35 100644
--- a/Controller/PermissionsGroupController.php
+++ b/Controller/PermissionsGroupController.php
@@ -4,8 +4,8 @@ namespace Chill\MainBundle\Controller;
 
 use Chill\MainBundle\Security\RoleProvider;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Chill\MainBundle\Entity\RoleScope;
 use Chill\MainBundle\Entity\PermissionsGroup;
@@ -17,10 +17,11 @@ use Chill\MainBundle\Form\Type\ComposedRoleScopeType;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
- * PermissionsGroup controller.
+ * Class PermissionsGroupController
  *
+ * @package Chill\MainBundle\Controller
  */
-class PermissionsGroupController extends Controller
+class PermissionsGroupController extends AbstractController
 {
     /**
      * @var TranslatableStringHelper
diff --git a/Controller/PostalCodeController.php b/Controller/PostalCodeController.php
index b68b68ced..fb88e0763 100644
--- a/Controller/PostalCodeController.php
+++ b/Controller/PostalCodeController.php
@@ -19,7 +19,7 @@
  */
 namespace Chill\MainBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Chill\MainBundle\Entity\PostalCode;
@@ -28,11 +28,12 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\Query;
 
 /**
- * 
+ * Class PostalCodeController
  *
+ * @package Chill\MainBundle\Controller
  * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
-class PostalCodeController extends Controller
+class PostalCodeController extends AbstractController
 {
     /**
      *
diff --git a/Controller/ScopeController.php b/Controller/ScopeController.php
index a95ea0a1b..33e37ad94 100644
--- a/Controller/ScopeController.php
+++ b/Controller/ScopeController.php
@@ -2,19 +2,18 @@
 
 namespace Chill\MainBundle\Controller;
 
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Form\ScopeType;
 
-
 /**
- * Scope controller.
+ * Class ScopeController
  *
+ * @package Chill\MainBundle\Controller
  */
-class ScopeController extends Controller
+class ScopeController extends AbstractController
 {
 
     /**
diff --git a/Controller/SearchController.php b/Controller/SearchController.php
index 940c31241..a44af8e7b 100644
--- a/Controller/SearchController.php
+++ b/Controller/SearchController.php
@@ -22,7 +22,7 @@
 
 namespace Chill\MainBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Chill\MainBundle\Search\UnknowSearchDomainException;
 use Chill\MainBundle\Search\UnknowSearchNameException;
@@ -36,10 +36,11 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 
 /**
+ * Class SearchController
  *
- *
+ * @package Chill\MainBundle\Controller
  */
-class SearchController extends Controller
+class SearchController extends AbstractController
 {
     /**
      *
diff --git a/Controller/UIController.php b/Controller/UIController.php
index f12be675a..75992bf15 100644
--- a/Controller/UIController.php
+++ b/Controller/UIController.php
@@ -17,15 +17,16 @@
  */
 namespace Chill\MainBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Chill\MainBundle\Templating\UI\CountNotificationUser;
 
 /**
- * 
+ * Class UIController
  *
+ * @package Chill\MainBundle\Controller
  * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
-class UIController extends Controller
+class UIController extends AbstractController
 {
     public function showNotificationUserCounterAction(
         CountNotificationUser $counter
diff --git a/Controller/UserController.php b/Controller/UserController.php
index 8ae6750f6..3184b27ae 100644
--- a/Controller/UserController.php
+++ b/Controller/UserController.php
@@ -2,10 +2,9 @@
 
 namespace Chill\MainBundle\Controller;
 
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\UserType;
 use Chill\MainBundle\Entity\GroupCenter;
@@ -14,10 +13,11 @@ use Chill\MainBundle\Form\UserPasswordType;
 
 
 /**
- * User controller.
+ * Class UserController
  *
+ * @package Chill\MainBundle\Controller
  */
-class UserController extends Controller
+class UserController extends AbstractController
 {
 
     const FORM_GROUP_CENTER_COMPOSED = 'composed_groupcenter';