diff --git a/Controller/ActivityController.php b/Controller/ActivityController.php
index 8e3ff7958..e3ef641c6 100644
--- a/Controller/ActivityController.php
+++ b/Controller/ActivityController.php
@@ -26,7 +26,7 @@ use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Security\Core\Role\Role;
 use Chill\ActivityBundle\Entity\Activity;
@@ -34,10 +34,11 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\ActivityBundle\Form\ActivityType;
 
 /**
- * Activity controller.
+ * Class ActivityController
  *
+ * @package Chill\ActivityBundle\Controller
  */
-class ActivityController extends Controller
+class ActivityController extends AbstractController
 {
     
     /**
diff --git a/Controller/ActivityReasonCategoryController.php b/Controller/ActivityReasonCategoryController.php
index 90b72384b..793c9c695 100644
--- a/Controller/ActivityReasonCategoryController.php
+++ b/Controller/ActivityReasonCategoryController.php
@@ -2,8 +2,8 @@
 
 namespace Chill\ActivityBundle\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\ActivityBundle\Entity\ActivityReasonCategory;
@@ -13,7 +13,7 @@ use Chill\ActivityBundle\Form\ActivityReasonCategoryType;
  * ActivityReasonCategory controller.
  *
  */
-class ActivityReasonCategoryController extends Controller
+class ActivityReasonCategoryController extends AbstractController
 {
 
     /**
diff --git a/Controller/ActivityReasonController.php b/Controller/ActivityReasonController.php
index c09756942..a76221704 100644
--- a/Controller/ActivityReasonController.php
+++ b/Controller/ActivityReasonController.php
@@ -2,8 +2,8 @@
 
 namespace Chill\ActivityBundle\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\ActivityBundle\Entity\ActivityReason;
@@ -13,7 +13,7 @@ use Chill\ActivityBundle\Form\ActivityReasonType;
  * ActivityReason controller.
  *
  */
-class ActivityReasonController extends Controller
+class ActivityReasonController extends AbstractController
 {
 
     /**
diff --git a/Controller/ActivityTypeController.php b/Controller/ActivityTypeController.php
index db004470a..f27bea0ae 100644
--- a/Controller/ActivityTypeController.php
+++ b/Controller/ActivityTypeController.php
@@ -3,17 +3,17 @@
 namespace Chill\ActivityBundle\Controller;
 
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-
 use Chill\ActivityBundle\Entity\ActivityType;
 use Chill\ActivityBundle\Form\ActivityTypeType;
 
 /**
- * ActivityType controller.
+ * Class ActivityTypeController
  *
+ * @package Chill\ActivityBundle\Controller
  */
-class ActivityTypeController extends Controller
+class ActivityTypeController extends AbstractController
 {
 
     /**
diff --git a/Controller/AdminController.php b/Controller/AdminController.php
index 313f36c4f..0150b44d0 100644
--- a/Controller/AdminController.php
+++ b/Controller/AdminController.php
@@ -21,7 +21,7 @@
 namespace Chill\ActivityBundle\Controller;
 
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
 /**
  * Controller for activity configuration
@@ -29,7 +29,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
  * @author Julien Fastré <julien.fastre@champs-libres.coop>
  * @author Champs Libres <info@champs-libres.coop>
  */
-class AdminController extends Controller
+class AdminController extends AbstractController
 {
     public function indexActivityAction()
     {