diff --git a/config/module.config.php b/config/module.config.php
index ecccac015d2f705eabbc89e055c519b74f0e7f70..9a1d59ddef691be5eaf841d2de953242f10ec76a 100644
--- a/config/module.config.php
+++ b/config/module.config.php
@@ -63,7 +63,7 @@ return array(
     'unicaen-auth' => $settings,
     'view_manager' => array(
         'template_path_stack' => array(
-            'unicaen-user' => __DIR__ . '/../view',
+            'unicaen-auth' => __DIR__ . '/../view',
         ),
     ),
     'service_manager' => array(
@@ -89,7 +89,7 @@ return array(
                 'options' => array(
                     'route' => '/utilisateur/generer-sesame',
                     'defaults' => array(
-                        'controller' => 'unicaen-user',
+                        'controller' => 'unicaen-auth',
                         'action'     => 'generer-sesame',
                     ),
                 ),
diff --git a/src/UnicaenAuth/Authentication/Adapter/AdapterChainServiceFactory.php b/src/UnicaenAuth/Authentication/Adapter/AdapterChainServiceFactory.php
index a1e43766cf46daac9a73f07be9aebfb70a32e9f5..09a08d4197b04e6bfa7e7f208ed21c6371ac2af6 100644
--- a/src/UnicaenAuth/Authentication/Adapter/AdapterChainServiceFactory.php
+++ b/src/UnicaenAuth/Authentication/Adapter/AdapterChainServiceFactory.php
@@ -14,10 +14,10 @@ class AdapterChainServiceFactory implements FactoryInterface
     {
         $chain = new AdapterChain;
         
-        $userService = $serviceLocator->get('unicaen-user_user_service');
+        $userService = $serviceLocator->get('unicaen-auth_user_service');
         
         /* @var $options \UnicaenAuth\Options\ModuleOptions */
-        $options = $serviceLocator->get('unicaen-user_module_options');
+        $options = $serviceLocator->get('unicaen-auth_module_options');
         if ($options->getCasAuthenticationActivated()) {
             /* @var $casAdapter Cas */
             $casAdapter = $serviceLocator->get('UnicaenAuth\Authentication\Adapter\Cas');
diff --git a/src/UnicaenAuth/Authentication/Adapter/Db.php b/src/UnicaenAuth/Authentication/Adapter/Db.php
index c5ad7de7423b6d61f61b0d5a9afd9bdc9dc7a540..20b5aeb9ef6b86ead5648b40d6167892f36d6068 100644
--- a/src/UnicaenAuth/Authentication/Adapter/Db.php
+++ b/src/UnicaenAuth/Authentication/Adapter/Db.php
@@ -98,7 +98,7 @@ class Db extends \ZfcUser\Authentication\Adapter\Db
     public function getUnicaenAuthOptions()
     {
         if (!$this->unicaenUserOptions instanceof AuthenticationOptionsInterface) {
-            $this->setUnicaenAuthOptions($this->getServiceManager()->get('unicaen-user_module_options'));
+            $this->setUnicaenAuthOptions($this->getServiceManager()->get('unicaen-auth_module_options'));
         }
         return $this->unicaenUserOptions;
     }
diff --git a/src/UnicaenAuth/Authentication/Adapter/Ldap.php b/src/UnicaenAuth/Authentication/Adapter/Ldap.php
index 55320cdbd0b039d61ce8274cafc6d03c1bac23a7..fb18a2683467efaea517b05412073f4eeefe38bc 100644
--- a/src/UnicaenAuth/Authentication/Adapter/Ldap.php
+++ b/src/UnicaenAuth/Authentication/Adapter/Ldap.php
@@ -198,7 +198,7 @@ class Ldap extends AbstractAdapter implements ServiceManagerAwareInterface, Even
     public function getOptions()
     {
         if (!$this->options instanceof AuthenticationOptionsInterface) {
-            $this->setOptions($this->getServiceManager()->get('unicaen-user_module_options'));
+            $this->setOptions($this->getServiceManager()->get('unicaen-auth_module_options'));
         }
         return $this->options;
     }
diff --git a/src/UnicaenAuth/Authentication/Storage/Ldap.php b/src/UnicaenAuth/Authentication/Storage/Ldap.php
index c6b7e5556e998af6c0aa0cfa7c336091be2a7271..e42702751bc64e6294e45cb05c4d7638e932fd4b 100644
--- a/src/UnicaenAuth/Authentication/Storage/Ldap.php
+++ b/src/UnicaenAuth/Authentication/Storage/Ldap.php
@@ -188,7 +188,7 @@ class Ldap implements Storage\StorageInterface, ServiceManagerAwareInterface
     public function getOptions()
     {
         if (!$this->options instanceof AuthenticationOptionsInterface) {
-            $this->setOptions($this->getServiceManager()->get('unicaen-user_module_options'));
+            $this->setOptions($this->getServiceManager()->get('unicaen-auth_module_options'));
         }
         return $this->options;
     }
diff --git a/src/UnicaenAuth/Authentication/Storage/Mixed.php b/src/UnicaenAuth/Authentication/Storage/Mixed.php
index 772f2304b027a8f168d13d4e66b5e7b2bc17dbce..46f06408c78311f24857803419703da20f10159b 100644
--- a/src/UnicaenAuth/Authentication/Storage/Mixed.php
+++ b/src/UnicaenAuth/Authentication/Storage/Mixed.php
@@ -185,7 +185,7 @@ class Mixed implements Storage\StorageInterface, ServiceManagerAwareInterface
     public function getOptions()
     {
         if (!$this->options instanceof AuthenticationOptionsInterface) {
-            $this->setOptions($this->getServiceManager()->get('unicaen-user_module_options'));
+            $this->setOptions($this->getServiceManager()->get('unicaen-auth_module_options'));
         }
         return $this->options;
     }