diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php
index eb4907589f..9a20c361a3 100644
--- a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php
+++ b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php
@@ -194,7 +194,7 @@ class Publications implements ControllerProviderInterface
             try {
                 $request = $app['request'];
                 $user = $app['manipulator.user']->getRepository()->find($request->request->get('usr_id'));
-                $feed = $app["EM"]->find('Alchemy\Phrasea\Model\Entities\Feed', $id);
+                $feed = $app["EM"]->find('Phraseanet:Feed', $id);
 
                 $publisher = new FeedPublisher();
                 $publisher->setUser($user);
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php
index 9971c3adae..7fca8a6eb6 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php
@@ -49,7 +49,7 @@ class Feed implements ControllerProviderInterface
                 $app->abort(404, "Feed not found");
             }
 
-            $publisher = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedPublisher')->findOneBy(['feed' => $feed, 'user' => $app['authentication']->getUser()]);
+            $publisher = $app['EM']->getRepository('Phraseanet:FeedPublisher')->findOneBy(['feed' => $feed, 'user' => $app['authentication']->getUser()]);
 
             if ('' === $title = trim($request->request->get('title', ''))) {
                 $app->abort(400, "Bad request");
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Order.php b/lib/Alchemy/Phrasea/Controller/Prod/Order.php
index f7c53fe43c..7c58d9a599 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Order.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Order.php
@@ -237,7 +237,7 @@ class Order implements ControllerProviderInterface
     public function sendOrder(Application $app, Request $request, $order_id)
     {
         $success = false;
-        if (null === $order = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Order')->find($order_id)) {
+        if (null === $order = $app['EM']->getRepository('Phraseanet:Order')->find($order_id)) {
             throw new NotFoundHttpException('Order not found');
         }
         $basket = $order->getBasket();
diff --git a/lib/Alchemy/Phrasea/Controller/Root/Account.php b/lib/Alchemy/Phrasea/Controller/Root/Account.php
index 5fec68c0d6..681fdd0282 100644
--- a/lib/Alchemy/Phrasea/Controller/Root/Account.php
+++ b/lib/Alchemy/Phrasea/Controller/Root/Account.php
@@ -261,7 +261,7 @@ class Account implements ControllerProviderInterface
      */
     public function accountSessionsAccess(Application $app, Request $request)
     {
-        $dql = 'SELECT s FROM Alchemy\Phrasea\Model\Entities\Session s
+        $dql = 'SELECT s FROM Phraseanet:Session s
             WHERE s.user = :usr_id
             ORDER BY s.created DESC';
 
diff --git a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
index c9a04e43f3..2a3e8583b5 100644
--- a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
+++ b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
@@ -62,7 +62,7 @@ class RSSFeeds implements ControllerProviderInterface
             ->assert('format', '(rss|atom)');
 
         $controllers->get('/userfeed/aggregated/{token}/{format}/', function (Application $app, $token, $format) {
-            $token = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\AggregateToken')->findOneBy(["value" => $token]);
+            $token = $app['EM']->getRepository('Phraseanet:AggregateToken')->findOneBy(["value" => $token]);
 
             $user = $token->getUser();
 
diff --git a/lib/Alchemy/Phrasea/Feed/Aggregate.php b/lib/Alchemy/Phrasea/Feed/Aggregate.php
index 8aeaf40cdf..dd0b456a07 100644
--- a/lib/Alchemy/Phrasea/Feed/Aggregate.php
+++ b/lib/Alchemy/Phrasea/Feed/Aggregate.php
@@ -78,8 +78,8 @@ class Aggregate implements FeedInterface
      */
     public static function createFromUser(Application $app, User $user)
     {
-        $feeds = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser($app['acl']->get($user));
-        $token = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\AggregateToken')->findOneBy(['user' => $user]);
+        $feeds = $app['EM']->getRepository('Phraseanet:Feed')->getAllForUser($app['acl']->get($user));
+        $token = $app['EM']->getRepository('Phraseanet:AggregateToken')->findOneBy(['user' => $user]);
 
         return new static($app['EM'], $feeds, $token);
     }
@@ -239,6 +239,6 @@ class Aggregate implements FeedInterface
      */
     public static function getPublic(Application $app)
     {
-        return new static($app['EM'], $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->findBy(['public' => true], ['updatedOn' => 'DESC']));
+        return new static($app['EM'], $app['EM']->getRepository('Phraseanet:Feed')->findBy(['public' => true], ['updatedOn' => 'DESC']));
     }
 }
diff --git a/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php b/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php
index dc2d45d2b5..586f6718c9 100644
--- a/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php
+++ b/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php
@@ -131,7 +131,7 @@ class AggregateLinkGenerator implements LinkGeneratorInterface
     private function getAggregateToken(User $user, $renew = false)
     {
         $token = $this->em
-            ->getRepository('Alchemy\Phrasea\Model\Entities\AggregateToken')
+            ->getRepository('Phraseanet:AggregateToken')
             ->findOneBy(['user' => $user]);
 
         if (null === $token || true === $renew) {
diff --git a/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php b/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php
index 6ecefa0565..f23afc918a 100644
--- a/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php
+++ b/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php
@@ -139,7 +139,7 @@ class FeedLinkGenerator implements LinkGeneratorInterface
     private function getFeedToken(Feed $feed, User $user, $renew = false)
     {
         $token = $this->em
-            ->getRepository('Alchemy\Phrasea\Model\Entities\FeedToken')
+            ->getRepository('Phraseanet:FeedToken')
             ->findOneBy(['user' => $user, 'feed' => $feed]);
 
         if (null === $token || true === $renew) {
diff --git a/lib/Alchemy/Phrasea/Form/TaskForm.php b/lib/Alchemy/Phrasea/Form/TaskForm.php
index 40ef762a5e..f442951ce4 100644
--- a/lib/Alchemy/Phrasea/Form/TaskForm.php
+++ b/lib/Alchemy/Phrasea/Form/TaskForm.php
@@ -49,7 +49,7 @@ class TaskForm extends AbstractType
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults([
-            'data_class' => 'Alchemy\Phrasea\Model\Entities\Task',
+            'data_class' => 'Phraseanet:Task',
         ]);
     }
 
diff --git a/lib/Alchemy/Phrasea/Model/Manager/UserManager.php b/lib/Alchemy/Phrasea/Model/Manager/UserManager.php
index cd790ee515..5b24de6463 100644
--- a/lib/Alchemy/Phrasea/Model/Manager/UserManager.php
+++ b/lib/Alchemy/Phrasea/Model/Manager/UserManager.php
@@ -137,7 +137,7 @@ class UserManager
      */
     private function cleanFtpExports(User $user)
     {
-       $elements = $this->objectManager->getRepository('Alchemy\Phrasea\Model\Entities\FtpExport')
+       $elements = $this->objectManager->getRepository('Phraseanet:FtpExport')
                ->findBy(['user' => $user]);
 
        foreach ($elements as $element) {
@@ -152,7 +152,7 @@ class UserManager
      */
     private function cleanOrders(User $user)
     {
-       $orders = $this->objectManager->getRepository('Alchemy\Phrasea\Model\Entities\Order')
+       $orders = $this->objectManager->getRepository('Phraseanet:Order')
                ->findBy(['user' => $user]);
 
        foreach ($orders as $order) {
@@ -167,7 +167,7 @@ class UserManager
      */
     private function cleanUserSessions(User $user)
     {
-        $sessions = $this->objectManager->getRepository('Alchemy\Phrasea\Model\Entities\Session')
+        $sessions = $this->objectManager->getRepository('Phraseanet:Session')
             ->findByUser(['user' => $user]);
 
         foreach ($sessions as $session) {
@@ -182,7 +182,7 @@ class UserManager
      */
     private function cleanAuthProvider(User $user)
     {
-        $providers = $this->objectManager->getRepository('Alchemy\Phrasea\Model\Entities\UsrAuthProvider')
+        $providers = $this->objectManager->getRepository('Phraseanet:UsrAuthProvider')
             ->findBy(['user' => $user]);
 
         foreach ($providers as $provider) {
diff --git a/lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php b/lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php
index 493c3b7e35..f505ea5ccc 100644
--- a/lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php
+++ b/lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php
@@ -127,7 +127,7 @@ class BasketRepository extends EntityRepository
     public function findUserBasket($basket_id, User $user, $requireOwner)
     {
         $dql = 'SELECT b
-            FROM Alchemy\Phrasea\Model\Entities\Basket b
+            FROM Phraseanet:Basket b
             LEFT JOIN b.elements e
             WHERE b.id = :basket_id';
 
diff --git a/lib/Alchemy/Phrasea/Model/Repositories/StoryWZRepository.php b/lib/Alchemy/Phrasea/Model/Repositories/StoryWZRepository.php
index ffa5b6072c..c48f3881d2 100644
--- a/lib/Alchemy/Phrasea/Model/Repositories/StoryWZRepository.php
+++ b/lib/Alchemy/Phrasea/Model/Repositories/StoryWZRepository.php
@@ -28,7 +28,7 @@ class StoryWZRepository extends EntityRepository
 
     public function findByUser(Application $app, User $user, $sort)
     {
-        $dql = 'SELECT s FROM Alchemy\Phrasea\Model\Entities\StoryWZ s WHERE s.user = :user ';
+        $dql = 'SELECT s FROM Phraseanet:StoryWZ s WHERE s.user = :user ';
 
         if ($sort == 'date') {
             $dql .= ' ORDER BY s.created DESC';
@@ -117,7 +117,7 @@ class StoryWZRepository extends EntityRepository
 
     public function findByRecord(Application $app, \record_adapter $Story)
     {
-        $dql = 'SELECT s FROM Alchemy\Phrasea\Model\Entities\StoryWZ s
+        $dql = 'SELECT s FROM Phraseanet:StoryWZ s
                 WHERE s.sbas_id = :sbas_id
                 AND s.record_id = :record_id';
 
diff --git a/lib/Alchemy/Phrasea/Model/Repositories/UsrAuthProviderRepository.php b/lib/Alchemy/Phrasea/Model/Repositories/UsrAuthProviderRepository.php
index 99ac160623..4bf149e366 100644
--- a/lib/Alchemy/Phrasea/Model/Repositories/UsrAuthProviderRepository.php
+++ b/lib/Alchemy/Phrasea/Model/Repositories/UsrAuthProviderRepository.php
@@ -25,7 +25,7 @@ class UsrAuthProviderRepository extends EntityRepository
     public function findByUser(User $user)
     {
         $dql = 'SELECT u
-                FROM Alchemy\Phrasea\Model\Entities\UsrAuthProvider u
+                FROM Phraseanet:UsrAuthProvider u
                 WHERE u.user = :usrId';
 
         $params = ['usrId' => $user->getId()];
diff --git a/lib/Alchemy/Phrasea/Model/Repositories/UsrListEntryRepository.php b/lib/Alchemy/Phrasea/Model/Repositories/UsrListEntryRepository.php
index c568158998..fe78d1a8ac 100644
--- a/lib/Alchemy/Phrasea/Model/Repositories/UsrListEntryRepository.php
+++ b/lib/Alchemy/Phrasea/Model/Repositories/UsrListEntryRepository.php
@@ -36,7 +36,7 @@ class UsrListEntryRepository extends EntityRepository
      */
     public function findUserList(User $user)
     {
-        $dql = 'SELECT e FROM Alchemy\Phrasea\Model\Entities\UsrListEntry e
+        $dql = 'SELECT e FROM Phraseanet:UsrListEntry e
             WHERE e.user = :usr_id';
 
         $params = [
diff --git a/lib/Alchemy/Phrasea/Setup/Version/PreSchemaUpgrade/Upgrade39.php b/lib/Alchemy/Phrasea/Setup/Version/PreSchemaUpgrade/Upgrade39.php
index ed9e04b8dc..671b0d10fc 100644
--- a/lib/Alchemy/Phrasea/Setup/Version/PreSchemaUpgrade/Upgrade39.php
+++ b/lib/Alchemy/Phrasea/Setup/Version/PreSchemaUpgrade/Upgrade39.php
@@ -42,7 +42,7 @@ class Upgrade39 implements PreSchemaUpgradeInterface
      */
     public static function getUserReferences(EntityManager $em, $id)
     {
-        $q = $em->createQuery('SELECT PARTIAL u.{id,login} FROM Alchemy\Phrasea\Model\Entities\User u WHERE u.id = :id');
+        $q = $em->createQuery('SELECT PARTIAL u.{id,login} FROM Phraseanet:User u WHERE u.id = :id');
         $q->setParameters(['id' => $id]);
         $q->setHint(Query::HINT_FORCE_PARTIAL_LOAD, true);
 
diff --git a/lib/classes/eventsmanager/notify/orderdeliver.php b/lib/classes/eventsmanager/notify/orderdeliver.php
index 1770a74a48..4996df29b1 100644
--- a/lib/classes/eventsmanager/notify/orderdeliver.php
+++ b/lib/classes/eventsmanager/notify/orderdeliver.php
@@ -151,7 +151,7 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
         $sender = $user->getDisplayName();
 
         try {
-            $repository = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
+            $repository = $this->app['EM']->getRepository('Phraseanet:Basket');
 
             $basket = $repository->findUserBasket($ssel_id, $this->app['authentication']->getUser(), false);
         } catch (Exception $e) {
diff --git a/lib/classes/eventsmanager/notify/validationdone.php b/lib/classes/eventsmanager/notify/validationdone.php
index 2281791891..5811a34937 100644
--- a/lib/classes/eventsmanager/notify/validationdone.php
+++ b/lib/classes/eventsmanager/notify/validationdone.php
@@ -138,7 +138,7 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract
         $sender = $registered_user->getDisplayName();
 
         try {
-            $repository = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
+            $repository = $this->app['EM']->getRepository('Phraseanet:Basket');
 
             $basket = $repository->findUserBasket($ssel_id, $this->app['authentication']->getUser(), false);
         } catch (Exception $e) {
diff --git a/lib/classes/patch/320alpha2a.php b/lib/classes/patch/320alpha2a.php
index 14e34c1be4..a5a468ae2c 100644
--- a/lib/classes/patch/320alpha2a.php
+++ b/lib/classes/patch/320alpha2a.php
@@ -57,7 +57,7 @@ class patch_320alpha2a implements patchInterface
      */
     public function apply(base $appbox, Application $app)
     {
-        $dql = 'SELECT u FROM Alchemy\Phrasea\Model\Entities\User u WHERE u.nonce IS NULL';
+        $dql = 'SELECT u FROM Phraseanet:User u WHERE u.nonce IS NULL';
         $q = $app['EM']->createQuery($dql);
         $q->setHint(Query::HINT_FORCE_PARTIAL_LOAD, true);
         $users = $q->getResult();
diff --git a/lib/classes/patch/320alpha4b.php b/lib/classes/patch/320alpha4b.php
index cd31620871..03efae231c 100644
--- a/lib/classes/patch/320alpha4b.php
+++ b/lib/classes/patch/320alpha4b.php
@@ -87,7 +87,7 @@ class patch_320alpha4b implements patchInterface
 
         $app['EM']->getEventManager()->removeEventSubscriber(new TimestampableListener());
         foreach ($rs as $row) {
-            $user =  $app['EM']->getPartialReference('Alchemy\Phrasea\Model\Entities\User', $row['usr_id']);
+            $user =  $app['EM']->getPartialReference('Phraseanet:User', $row['usr_id']);
 
             $feed = $this->get_feed($appbox, $user, $row['pub_restrict'], $row['homelink'], $app);
 
diff --git a/lib/classes/patch/370alpha7a.php b/lib/classes/patch/370alpha7a.php
index 2bd1043c5e..60e3a389e7 100644
--- a/lib/classes/patch/370alpha7a.php
+++ b/lib/classes/patch/370alpha7a.php
@@ -110,7 +110,7 @@ class patch_370alpha7a implements patchInterface
 
                 $borderFile = new \Alchemy\Phrasea\Border\File($app, $media, $collection);
 
-                $user = $user = $app['EM']->getPartialReference('Alchemy\Phrasea\Model\Entities\User', $row['usr_id']);
+                $user = $user = $app['EM']->getPartialReference('Phraseanet:User', $row['usr_id']);
 
                 $lazaretSession = new LazaretSession();
                 $lazaretSession->setUser($user);
diff --git a/lib/classes/patch/380alpha11a.php b/lib/classes/patch/380alpha11a.php
index 05129ae6c6..e4751d383e 100644
--- a/lib/classes/patch/380alpha11a.php
+++ b/lib/classes/patch/380alpha11a.php
@@ -81,7 +81,7 @@ class patch_380alpha11a implements patchInterface
                 $updated = \DateTime::createFromFormat('Y-m-d H:i:s', $row['lastaccess']);
             }
 
-            $user = $app['EM']->getPartialReference('Alchemy\Phrasea\Model\Entities\User', $row['usr_id']);
+            $user = $app['EM']->getPartialReference('Phraseanet:User', $row['usr_id']);
 
             $session = new Session();
             $session
diff --git a/lib/classes/patch/383alpha2a.php b/lib/classes/patch/383alpha2a.php
index fcb574b73a..5d6a66d636 100644
--- a/lib/classes/patch/383alpha2a.php
+++ b/lib/classes/patch/383alpha2a.php
@@ -64,7 +64,7 @@ class patch_383alpha2a implements patchInterface
         $stmt->closeCursor();
 
         foreach ($rows as $row) {
-            if (null !== $vsession = $app['EM']->getPartialReference('Alchemy\Phrasea\Model\Entities\ValidationSession', $row['validation_session_id'])) {
+            if (null !== $vsession = $app['EM']->getPartialReference('Phraseanet:ValidationSession', $row['validation_session_id'])) {
                 $app['EM']->remove($vsession);
             }
         }
diff --git a/lib/classes/patch/390alpha1a.php b/lib/classes/patch/390alpha1a.php
index 870f00074f..e155224478 100644
--- a/lib/classes/patch/390alpha1a.php
+++ b/lib/classes/patch/390alpha1a.php
@@ -71,7 +71,7 @@ class patch_390alpha1a implements patchInterface
         $em = $app['EM'];
 
         foreach ($rs as $row) {
-            $user = $em->getPartialReference('Alchemy\Phrasea\Model\Entities\User', $row['usr_id']);
+            $user = $em->getPartialReference('Phraseanet:User', $row['usr_id']);
             $credential = new FtpCredential();
             $credential->setActive($row['activeFTP']);
             $credential->setAddress($row['addrFTP']);
diff --git a/lib/classes/patch/390alpha1b.php b/lib/classes/patch/390alpha1b.php
index 8f1d4ad3c7..0c42836d54 100644
--- a/lib/classes/patch/390alpha1b.php
+++ b/lib/classes/patch/390alpha1b.php
@@ -92,7 +92,7 @@ class patch_390alpha1b implements patchInterface
             $todo = $stmt->fetch(\PDO::FETCH_ASSOC);
             $stmt->closeCursor();
 
-            $user = $em->getPartialReference('Alchemy\Phrasea\Model\Entities\User', $row['usr_id']);
+            $user = $em->getPartialReference('Phraseanet:User', $row['usr_id']);
 
             $order = new Order();
             $order->setUser($user)
@@ -100,7 +100,7 @@ class patch_390alpha1b implements patchInterface
                 ->setOrderUsage($row['usage'])
                 ->setDeadline(new \DateTime($row['deadline']))
                 ->setCreatedOn(new \DateTime($row['created_on']))
-                ->setBasket($em->getPartialReference('Alchemy\Phrasea\Model\Entities\Basket', $row['ssel_id']));
+                ->setBasket($em->getPartialReference('Phraseanet:Basket', $row['ssel_id']));
 
             $em->persist($order);
 
@@ -118,7 +118,7 @@ class patch_390alpha1b implements patchInterface
                 $orderElement->setBaseId($element['base_id'])
                     ->setDeny($element['deny'] === null ? null : (Boolean) $element['deny'])
                     ->setOrder($order)
-                    ->setOrderMaster($em->getPartialReference('Alchemy\Phrasea\Model\Entities\User',$element['order_master_id']))
+                    ->setOrderMaster($em->getPartialReference('Phraseanet:User',$element['order_master_id']))
                     ->setRecordId($element['record_id']);
 
                 $order->addElement($orderElement);
diff --git a/lib/classes/patch/390alpha3a.php b/lib/classes/patch/390alpha3a.php
index ff54f2a5d6..d3ab3c6c8d 100644
--- a/lib/classes/patch/390alpha3a.php
+++ b/lib/classes/patch/390alpha3a.php
@@ -74,7 +74,7 @@ class patch_390alpha3a implements patchInterface
         $em = $app['EM'];
 
         foreach ($rs as $row) {
-            $user = $em->getPartialReference('Alchemy\Phrasea\Model\Entities\User', $row['usr_id']);
+            $user = $em->getPartialReference('Phraseanet:User', $row['usr_id']);
 
             $userQuery = new UserQuery();
             $userQuery->setQuery($row['query']);
diff --git a/lib/classes/patch/390alpha4a.php b/lib/classes/patch/390alpha4a.php
index 81dcf63549..e572fd6b24 100644
--- a/lib/classes/patch/390alpha4a.php
+++ b/lib/classes/patch/390alpha4a.php
@@ -78,7 +78,7 @@ class patch_390alpha4a implements patchInterface
                 continue;
             }
 
-            $user = $em->getPartialReference('Alchemy\Phrasea\Model\Entities\User', $row['usr_id']);
+            $user = $em->getPartialReference('Phraseanet:User', $row['usr_id']);
 
             $userSetting = new UserSetting();
             $userSetting->setName($row['prop']);
diff --git a/lib/classes/patch/390alpha5a.php b/lib/classes/patch/390alpha5a.php
index d65f8ed30b..0f2308987c 100644
--- a/lib/classes/patch/390alpha5a.php
+++ b/lib/classes/patch/390alpha5a.php
@@ -75,7 +75,7 @@ class patch_390alpha5a implements patchInterface
         $em = $app['EM'];
 
         foreach ($rs as $row) {
-            $user = $em->getPartialReference('Alchemy\Phrasea\Model\Entities\User', $row['usr_id']);
+            $user = $em->getPartialReference('Phraseanet:User', $row['usr_id']);
 
             $userSetting = new UserNotificationSetting();
             $userSetting->setName($row['prop']);
diff --git a/lib/classes/patch/390alpha6a.php b/lib/classes/patch/390alpha6a.php
index d594304995..afd64334dc 100644
--- a/lib/classes/patch/390alpha6a.php
+++ b/lib/classes/patch/390alpha6a.php
@@ -96,7 +96,7 @@ class patch_390alpha6a implements patchInterface
 
         foreach ($rs as $row) {
             try {
-                $user = $em->getPartialReference('Alchemy\Phrasea\Model\Entities\User', $row['usr_id']);
+                $user = $em->getPartialReference('Phraseanet:User', $row['usr_id']);
             } catch (NoResultException $e) {
                 continue;
             }
diff --git a/lib/classes/patch/390alpha7a.php b/lib/classes/patch/390alpha7a.php
index 971b6a6ed2..5adfa6191f 100644
--- a/lib/classes/patch/390alpha7a.php
+++ b/lib/classes/patch/390alpha7a.php
@@ -134,7 +134,7 @@ class patch_390alpha7a implements patchInterface
             $fpRes = $fpStmt->fetchAll(\PDO::FETCH_ASSOC);
 
             foreach ($fpRes as $fpRow) {
-                $user = $em->getPartialReference('Alchemy\Phrasea\Model\Entities\User', $fpRow['usr_id']);
+                $user = $em->getPartialReference('Phraseanet:User', $fpRow['usr_id']);
 
                 $feedPublisher = new FeedPublisher();
                 $feedPublisher->setFeed($feed);
@@ -180,7 +180,7 @@ class patch_390alpha7a implements patchInterface
             $ftRes = $ftStmt->fetchAll(\PDO::FETCH_ASSOC);
 
             foreach ($ftRes as $ftRow) {
-                $user = $em->getPartialReference('Alchemy\Phrasea\Model\Entities\User', $ftRow['usr_id']);
+                $user = $em->getPartialReference('Phraseanet:User', $ftRow['usr_id']);
 
                 $token = new FeedToken();
                 $token->setFeed($feed);
@@ -209,7 +209,7 @@ class patch_390alpha7a implements patchInterface
         $faRes = $faStmt->fetchAll(\PDO::FETCH_ASSOC);
 
         foreach ($faRes as $faRow) {
-            $user = $em->getPartialReference('Alchemy\Phrasea\Model\Entities\User', $faRow['usr_id']);
+            $user = $em->getPartialReference('Phraseanet:User', $faRow['usr_id']);
 
             $token = new AggregateToken();
             $token->setUser($user);
diff --git a/lib/classes/queries.php b/lib/classes/queries.php
index 3e1fbc1d4a..fed56676f8 100644
--- a/lib/classes/queries.php
+++ b/lib/classes/queries.php
@@ -189,7 +189,7 @@ class queries
         $history = '<ul>';
 
         $queries = $app['EM']
-            ->getRepository('Alchemy\Phrasea\Model\Entities\UserQuery')
+            ->getRepository('Phraseanet:UserQuery')
             ->findBy(['user' => $usrId], ['created' => 'ASC'], 25, 0);
 
         foreach ($queries as $query) {
diff --git a/lib/classes/set/export.php b/lib/classes/set/export.php
index 72cf34f837..f2cc5fff08 100644
--- a/lib/classes/set/export.php
+++ b/lib/classes/set/export.php
@@ -54,7 +54,7 @@ class set_export extends set_abstract
         }
 
         if ($sstid != "") {
-            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
+            $repository = $app['EM']->getRepository('Phraseanet:Basket');
 
             /* @var $repository Alchemy\Phrasea\Model\Repositories\BasketRepository */
             $Basket = $repository->findUserBasket($sstid, $app['authentication']->getUser(), false);
diff --git a/tests/Alchemy/Tests/Phrasea/Application/LightboxTest.php b/tests/Alchemy/Tests/Phrasea/Application/LightboxTest.php
index 0e632f9597..11792ebe5b 100644
--- a/tests/Alchemy/Tests/Phrasea/Application/LightboxTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Application/LightboxTest.php
@@ -48,7 +48,7 @@ class LightboxTest extends \PhraseanetAuthenticatedWebTestCase
     {
         $this->logout(self::$DI['app']);
 
-        $Basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 1);
+        $Basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 1);
         $token = self::$DI['app']['tokens']->getUrlToken(\random::TYPE_VIEW, self::$DI['user_alt2']->getId(), null, $Basket->getId());
 
         self::$DI['client']->request('GET', '/lightbox/?LOG='.$token);
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php
index 4a00a52177..ca0e587a12 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php
@@ -324,7 +324,7 @@ class BasketTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testAddElementToValidationPost()
     {
-        $countData = count(self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\ValidationData')->findAll());
+        $countData = count(self::$DI['app']['EM']->getRepository('Phraseanet:ValidationData')->findAll());
 
         $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 4);
         $this->assertCount(2, $basket->getElements());
@@ -347,7 +347,7 @@ class BasketTest extends \PhraseanetAuthenticatedWebTestCase
 
         $this->assertEquals(302, $response->getStatusCode());
         $this->assertCount(4, $basket->getElements());
-        $datas = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\ValidationData')->findAll();
+        $datas = self::$DI['app']['EM']->getRepository('Phraseanet:ValidationData')->findAll();
         $this->assertTrue($countData < count($datas), 'assert that ' . count($datas) . ' > ' . $countData);
     }
 
diff --git a/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php b/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php
index 9dcd83f419..9e825b568e 100644
--- a/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php
@@ -67,10 +67,10 @@ class AggregateLinkGeneratorTest extends \PhraseanetTestCase
                 $this->assertNotEquals($tokenValue, $capture['token']);
 
                 $this->assertCount(0, self::$DI['app']['EM']
-                    ->getRepository('Alchemy\Phrasea\Model\Entities\AggregateToken')
+                    ->getRepository('Phraseanet:AggregateToken')
                     ->findBy(['value' => $tokenValue]));
                 $this->assertCount(1, self::$DI['app']['EM']
-                    ->getRepository('Alchemy\Phrasea\Model\Entities\AggregateToken')
+                    ->getRepository('Phraseanet:AggregateToken')
                     ->findBy(['value' => $capture['token']]));
             } else {
                 $expectedParams = [
@@ -85,7 +85,7 @@ class AggregateLinkGeneratorTest extends \PhraseanetTestCase
                 $this->assertEquals($expectedParams, $capture);
 
                 $this->assertCount(1, self::$DI['app']['EM']
-                    ->getRepository('Alchemy\Phrasea\Model\Entities\AggregateToken')
+                    ->getRepository('Phraseanet:AggregateToken')
                     ->findBy(['value' => $tokenValue]));
             }
         } else {
@@ -96,7 +96,7 @@ class AggregateLinkGeneratorTest extends \PhraseanetTestCase
             $this->assertEquals(12, strlen($capture['token']));
 
             $this->assertCount(1, self::$DI['app']['EM']
-                ->getRepository('Alchemy\Phrasea\Model\Entities\AggregateToken')
+                ->getRepository('Phraseanet:AggregateToken')
                 ->findBy(['value' => $capture['token']]));
         }
     }
diff --git a/tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php b/tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php
index f3b4c23af0..e3661e41a8 100644
--- a/tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php
@@ -59,10 +59,10 @@ class FeedLinkGeneratorTest extends \PhraseanetTestCase
                 }
 
                 $this->assertCount(0, self::$DI['app']['EM']
-                    ->getRepository('Alchemy\Phrasea\Model\Entities\FeedToken')
+                    ->getRepository('Phraseanet:FeedToken')
                     ->findBy(['value' => $tokenValue]));
                 $this->assertCount(1, self::$DI['app']['EM']
-                    ->getRepository('Alchemy\Phrasea\Model\Entities\FeedToken')
+                    ->getRepository('Phraseanet:FeedToken')
                     ->findBy(['value' => $capture['token']]));
             } else {
                 $expectedParams = [
@@ -78,7 +78,7 @@ class FeedLinkGeneratorTest extends \PhraseanetTestCase
                 $this->assertEquals($expectedParams, $capture);
 
                 $this->assertCount(1, self::$DI['app']['EM']
-                    ->getRepository('Alchemy\Phrasea\Model\Entities\FeedToken')
+                    ->getRepository('Phraseanet:FeedToken')
                     ->findBy(['value' => $tokenValue]));
             }
         } else {
@@ -90,7 +90,7 @@ class FeedLinkGeneratorTest extends \PhraseanetTestCase
             $this->assertEquals(12, strlen($capture['token']));
 
             $this->assertCount(1, self::$DI['app']['EM']
-                ->getRepository('Alchemy\Phrasea\Model\Entities\FeedToken')
+                ->getRepository('Phraseanet:FeedToken')
                 ->findBy(['value' => $capture['token']]));
         }
     }
diff --git a/tests/Alchemy/Tests/Phrasea/Model/Repositories/UserRepositoryTest.php b/tests/Alchemy/Tests/Phrasea/Model/Repositories/UserRepositoryTest.php
index c3e4e69f55..09294becad 100644
--- a/tests/Alchemy/Tests/Phrasea/Model/Repositories/UserRepositoryTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Model/Repositories/UserRepositoryTest.php
@@ -8,7 +8,7 @@ class UserRepositoryTest extends \PhraseanetTestCase
 {
     public function testFindAdminsWithNoAdmins()
     {
-        $users = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\User')->findAdmins();
+        $users = self::$DI['app']['EM']->getRepository('Phraseanet:User')->findAdmins();
         $this->assertEquals(2, count($users));
     }
 
diff --git a/tests/classes/userTest.php b/tests/classes/userTest.php
index 4ec89c14c4..b14077ce3f 100644
--- a/tests/classes/userTest.php
+++ b/tests/classes/userTest.php
@@ -33,7 +33,7 @@ class userTest extends \PhraseanetTestCase
 
         self::$DI['app']['model.user-manager']->delete($user);
 
-        $this->assertNull(self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrAuthProvider')->findWithProviderAndId('custom-one', 12345));
+        $this->assertNull(self::$DI['app']['EM']->getRepository('Phraseanet:UsrAuthProvider')->findWithProviderAndId('custom-one', 12345));
     }
 
     public function testDeleteSetMailToNullAndRemovesSessions()