diff --git a/lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php
index 9c36512c7a..ff45885fe2 100644
--- a/lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php
+++ b/lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php
@@ -12,7 +12,7 @@
 namespace Alchemy\Phrasea\Core\Provider;
 
 use Alchemy\Phrasea\Form\Constraint\NewLogin;
-use Alchemy\Phrasea\Registration\RegistrationManager;
+use Alchemy\Phrasea\Model\Manipulator\RegistrationManipulator;
 use Alchemy\Phrasea\Model\Entities\User;
 use Silex\Application;
 use Silex\ServiceProviderInterface;
@@ -132,7 +132,7 @@ class RegistrationServiceProvider implements ServiceProviderInterface
         });
 
         $app['registration-manager'] = $app->share(function (Application $app) {
-            return new RegistrationManager($app['EM'], $app['phraseanet.appbox'], $app['acl']);
+            return new RegistrationManipulator($app['EM'], $app['phraseanet.appbox'], $app['acl']);
         });
     }
 
diff --git a/lib/Alchemy/Phrasea/Registration/RegistrationManager.php b/lib/Alchemy/Phrasea/Model/Manipulator/RegistrationManipulator.php
similarity index 98%
rename from lib/Alchemy/Phrasea/Registration/RegistrationManager.php
rename to lib/Alchemy/Phrasea/Model/Manipulator/RegistrationManipulator.php
index 3d4f93b1b6..62527152e9 100644
--- a/lib/Alchemy/Phrasea/Registration/RegistrationManager.php
+++ b/lib/Alchemy/Phrasea/Model/Manipulator/RegistrationManipulator.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Registration;
+namespace Alchemy\Phrasea\Model\Manipulator;
 
 use Alchemy\Phrasea\Authentication\ACLProvider;
 use Alchemy\Phrasea\Model\Entities\Registration;
@@ -17,7 +17,7 @@ use Alchemy\Phrasea\Model\Repositories\RegistrationRepository;
 use Doctrine\ORM\EntityManager;
 use igorw;
 
-class RegistrationManager
+class RegistrationManipulator implements ManipulatorInterface
 {
     private $em;
     private $appbox;
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Root/AccountTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Root/AccountTest.php
index fc9d0012ea..7c53244c0b 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Root/AccountTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Root/AccountTest.php
@@ -84,7 +84,7 @@ class AccountTest extends \PhraseanetAuthenticatedWebTestCase
             ]
         ];
 
-        $service = $this->getMockBuilder('Alchemy\Phrasea\Registration\RegistrationManager')
+        $service = $this->getMockBuilder('Alchemy\Phrasea\Model\Manipulator\RegistrationManipulator')
             ->setConstructorArgs([self::$DI['app']['EM'], self::$DI['app']['phraseanet.appbox'], self::$DI['app']['acl']])
             ->setMethods(['getRegistrationSummary'])
             ->getMock();
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
index 1b73487e55..7e1df47b29 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
@@ -822,7 +822,7 @@ class LoginTest extends \PhraseanetAuthenticatedWebTestCase
         self::$DI['app']['registration.fields'] = [];
         $this->logout(self::$DI['app']);
 
-        $managerMock = $this->getMockBuilder('Alchemy\Phrasea\Registration\RegistrationManager')
+        $managerMock = $this->getMockBuilder('Alchemy\Phrasea\Model\Manipulator\RegistrationManipulator')
             ->setConstructorArgs([self::$DI['app']['EM'], self::$DI['app']['phraseanet.appbox'], self::$DI['app']['acl']])
             ->setMethods(['getRepository'])
             ->getMock();
@@ -1468,7 +1468,7 @@ class LoginTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testAuthenticateProviderCallbackAlreadyBound()
     {
-        $managerMock = $this->getMockBuilder('Alchemy\Phrasea\Registration\RegistrationManager')
+        $managerMock = $this->getMockBuilder('Alchemy\Phrasea\Model\Manipulator\RegistrationManipulator')
             ->setConstructorArgs([self::$DI['app']['EM'], self::$DI['app']['phraseanet.appbox'], self::$DI['app']['acl']])
             ->setMethods(['getRepository'])
             ->getMock();
diff --git a/tests/Alchemy/Tests/Phrasea/Registration/RegistrationManagerTest.php b/tests/Alchemy/Tests/Phrasea/Model/Manipulator/RegistrationManipulatorTest.php
similarity index 90%
rename from tests/Alchemy/Tests/Phrasea/Registration/RegistrationManagerTest.php
rename to tests/Alchemy/Tests/Phrasea/Model/Manipulator/RegistrationManipulatorTest.php
index 8350dcbf43..b763b297df 100644
--- a/tests/Alchemy/Tests/Phrasea/Registration/RegistrationManagerTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Model/Manipulator/RegistrationManipulatorTest.php
@@ -4,9 +4,9 @@ namespace Alchemy\Tests\Phrasea\Registration;
 
 use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Model\Entities\Registration;
-use Alchemy\Phrasea\Registration\RegistrationManager;
+use Alchemy\Phrasea\Model\Manipulator\RegistrationManipulator;
 
-class RegistrationManagerTest extends \PhraseanetTestCase
+class RegistrationManipulatorTest extends \PhraseanetTestCase
 {
     public function testCreateRegistration()
     {
@@ -16,7 +16,7 @@ class RegistrationManagerTest extends \PhraseanetTestCase
         $em->expects($this->once())->method('persist')->with($this->isInstanceOf('Alchemy\Phrasea\Model\Entities\Registration'));
         $em->expects($this->once())->method('flush');
 
-        $service = new RegistrationManager($em, self::$DI['app']['phraseanet.appbox'], self::$DI['app']['acl']);
+        $service = new RegistrationManipulator($em, self::$DI['app']['phraseanet.appbox'], self::$DI['app']['acl']);
 
         $registration = $service->createRegistration(self::$DI['user']->get_id(), self::$DI['collection']->get_base_id());
 
@@ -38,7 +38,7 @@ class RegistrationManagerTest extends \PhraseanetTestCase
         $em->expects($this->once())->method('persist')->with($this->isInstanceOf('Alchemy\Phrasea\Model\Entities\Registration'));
         $em->expects($this->once())->method('flush');
 
-        $service = new RegistrationManager($em, self::$DI['app']['phraseanet.appbox'], self::$DI['app']['acl']);
+        $service = new RegistrationManipulator($em, self::$DI['app']['phraseanet.appbox'], self::$DI['app']['acl']);
 
         $service->rejectRegistration($registration);
         $this->assertFalse($registration->isPending());
@@ -74,13 +74,13 @@ class RegistrationManagerTest extends \PhraseanetTestCase
         $em->expects($this->once())->method('remove')->with($this->isInstanceOf('Alchemy\Phrasea\Model\Entities\Registration'));
         $em->expects($this->once())->method('flush');
 
-        $service = new RegistrationManager($em, self::$DI['app']['phraseanet.appbox'], $aclProviderMock);
+        $service = new RegistrationManipulator($em, self::$DI['app']['phraseanet.appbox'], $aclProviderMock);
         $service->acceptRegistration($registration, self::$DI['user'], self::$DI['collection'], true, false);
     }
 
     public function testDeleteRegistrationForUser()
     {
-        $service = new RegistrationManager(self::$DI['app']['EM'], self::$DI['app']['phraseanet.appbox'], self::$DI['app']['acl']);
+        $service = new RegistrationManipulator(self::$DI['app']['EM'], self::$DI['app']['phraseanet.appbox'], self::$DI['app']['acl']);
         $qb = $service->getRepository()->createQueryBuilder('r');
         $nbRegistrationBefore = $qb->select('COUNT(r)')
             ->where($qb->expr()->eq('r.user', ':user'))
@@ -94,7 +94,7 @@ class RegistrationManagerTest extends \PhraseanetTestCase
 
     public function testDeleteOldRegistrations()
     {
-        $service = new RegistrationManager(self::$DI['app']['EM'], self::$DI['app']['phraseanet.appbox'], self::$DI['app']['acl']);
+        $service = new RegistrationManipulator(self::$DI['app']['EM'], self::$DI['app']['phraseanet.appbox'], self::$DI['app']['acl']);
         $qb = $service->getRepository()->createQueryBuilder('r');
         $nbRegistrationBefore = $qb->select('COUNT(r)')
             ->getQuery()
@@ -106,7 +106,7 @@ class RegistrationManagerTest extends \PhraseanetTestCase
 
     public function testDeleteRegistrationOnCollection()
     {
-        $service = new RegistrationManager(self::$DI['app']['EM'], self::$DI['app']['phraseanet.appbox'], self::$DI['app']['acl']);
+        $service = new RegistrationManipulator(self::$DI['app']['EM'], self::$DI['app']['phraseanet.appbox'], self::$DI['app']['acl']);
         $qb = $service->getRepository()->createQueryBuilder('r');
         $nbRegistrationBefore = $qb->select('COUNT(r)')
             ->getQuery()
@@ -131,7 +131,7 @@ class RegistrationManagerTest extends \PhraseanetTestCase
             ->getMock();
         $em->expects($this->once())->method('getRepository')->will($this->returnValue($repoMock));
 
-        $service = new RegistrationManager($em, self::$DI['app']['phraseanet.appbox'], self::$DI['app']['acl']);
+        $service = new RegistrationManipulator($em, self::$DI['app']['phraseanet.appbox'], self::$DI['app']['acl']);
 
         $rs = $service->getRegistrationSummary(4);