diff --git a/core/lib/Thelia/Admin/Controller/BaseAdminController.php b/core/lib/Thelia/Admin/Controller/BaseAdminController.php
index 84ccd7bd9..64bd0b665 100755
--- a/core/lib/Thelia/Admin/Controller/BaseAdminController.php
+++ b/core/lib/Thelia/Admin/Controller/BaseAdminController.php
@@ -25,7 +25,7 @@ namespace Thelia\Admin\Controller;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\HttpFoundation\Response;
 
-use Thelia\Core\DependencyInjection\ContainerAware;
+use Thelia\Core\DependencyInjection\ContainerAwareAdmin;
 use Thelia\Form\BaseForm;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -51,7 +51,7 @@ use Thelia\Core\Security\Exception\AuthorizationException;
  * @author Manuel Raynaud <mraynaud@openstudio.fr>
  */
 
-class BaseAdminController extends ContainerAware
+class BaseAdminController extends ContainerAwareAdmin
 {
 	const TEMPLATE_404 = "404";
 
diff --git a/core/lib/Thelia/Core/DependencyInjection/ContainerAware.php b/core/lib/Thelia/Core/DependencyInjection/ContainerAwareAdminAdmin.php
similarity index 97%
rename from core/lib/Thelia/Core/DependencyInjection/ContainerAware.php
rename to core/lib/Thelia/Core/DependencyInjection/ContainerAwareAdminAdmin.php
index 42dd46e7e..e3e19d63b 100644
--- a/core/lib/Thelia/Core/DependencyInjection/ContainerAware.php
+++ b/core/lib/Thelia/Core/DependencyInjection/ContainerAwareAdminAdmin.php
@@ -29,7 +29,7 @@ use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Thelia\Core\Security\SecurityContext;
 
-class ContainerAware implements ContainerAwareInterface {
+class ContainerAwareAdmin implements ContainerAwareInterface {
 
     /**
      * @var ContainerInterface