diff --git a/lib/Alchemy/Phrasea/Authentication/Authenticator.php b/lib/Alchemy/Phrasea/Authentication/Authenticator.php
index 71ec4afbc4..1a5092a35d 100644
--- a/lib/Alchemy/Phrasea/Authentication/Authenticator.php
+++ b/lib/Alchemy/Phrasea/Authentication/Authenticator.php
@@ -88,7 +88,7 @@ class Authenticator
 
     public function refreshAccount(Session $session)
     {
-        if (!$this->em->getRepository('Alchemy\Phrasea\Model\Entities\Session')->findOneBy(['id' => $session->getId()])) {
+        if (!$this->em->getRepository('Phraseanet:Session')->findOneBy(['id' => $session->getId()])) {
             throw new RuntimeException('Unable to refresh the session, it does not exist anymore');
         }
 
@@ -120,7 +120,7 @@ class Authenticator
             throw new RuntimeException('No session to close.');
         }
 
-        if (null !== $session = $this->em->find('Alchemy\Phrasea\Model\Entities\Session', $this->session->get('session_id'))) {
+        if (null !== $session = $this->em->find('Phraseanet:Session', $this->session->get('session_id'))) {
             $this->em->remove($session);
             $this->em->flush();
         }
@@ -154,7 +154,7 @@ class Authenticator
         }
 
         if ($this->session->has('session_id')) {
-            if (null !== $this->em->find('Alchemy\Phrasea\Model\Entities\Session', $this->session->get('session_id'))) {
+            if (null !== $this->em->find('Phraseanet:Session', $this->session->get('session_id'))) {
                 return true;
             }
         }
diff --git a/lib/Alchemy/Phrasea/Authentication/PersistentCookie/Manager.php b/lib/Alchemy/Phrasea/Authentication/PersistentCookie/Manager.php
index 51982adb7c..23b32b921b 100644
--- a/lib/Alchemy/Phrasea/Authentication/PersistentCookie/Manager.php
+++ b/lib/Alchemy/Phrasea/Authentication/PersistentCookie/Manager.php
@@ -38,7 +38,7 @@ class Manager
     public function getSession($cookieValue)
     {
         $session = $this->em
-            ->getRepository('Alchemy\Phrasea\Model\Entities\Session')
+            ->getRepository('Phraseanet:Session')
             ->findOneBy(['token' => $cookieValue]);
 
         if (!$session) {
diff --git a/lib/Alchemy/Phrasea/Authentication/Phrasea/FailureManager.php b/lib/Alchemy/Phrasea/Authentication/Phrasea/FailureManager.php
index a8bbaad427..bf531579d4 100644
--- a/lib/Alchemy/Phrasea/Authentication/Phrasea/FailureManager.php
+++ b/lib/Alchemy/Phrasea/Authentication/Phrasea/FailureManager.php
@@ -80,7 +80,7 @@ class FailureManager
     public function checkFailures($username, Request $request)
     {
         $failures = $this->em
-            ->getRepository('Alchemy\Phrasea\Model\Entities\AuthFailure')
+            ->getRepository('Phraseanet:AuthFailure')
             ->findLockedFailuresMatching($username, $request->getClientIp());
 
         if (0 === count($failures)) {
@@ -109,7 +109,7 @@ class FailureManager
     private function removeOldFailures()
     {
         $failures = $this->em
-            ->getRepository('Alchemy\Phrasea\Model\Entities\AuthFailure')
+            ->getRepository('Phraseanet:AuthFailure')
             ->findOldFailures('-2 months');
 
         if (0 < count($failures)) {
diff --git a/lib/Alchemy/Phrasea/Controller/Admin/ConnectedUsers.php b/lib/Alchemy/Phrasea/Controller/Admin/ConnectedUsers.php
index 6f8f81e799..172acc8978 100644
--- a/lib/Alchemy/Phrasea/Controller/Admin/ConnectedUsers.php
+++ b/lib/Alchemy/Phrasea/Controller/Admin/ConnectedUsers.php
@@ -39,7 +39,7 @@ class ConnectedUsers implements ControllerProviderInterface
 
     public function listConnectedUsers(Application $app, Request $request)
     {
-        $dql = 'SELECT s FROM Alchemy\Phrasea\Model\Entities\Session s
+        $dql = 'SELECT s FROM Phraseanet:Session s
             WHERE
                 s.updated > :date
             ORDER BY s.updated DESC';
diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php
index 2f1dde74f2..f0574df44b 100644
--- a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php
+++ b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php
@@ -34,7 +34,7 @@ class Publications implements ControllerProviderInterface
         });
 
         $controllers->get('/list/', function (PhraseaApplication $app) {
-            $feeds = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser(
+            $feeds = $app['EM']->getRepository('Phraseanet:Feed')->getAllForUser(
                 $app['acl']->get($app['authentication']->getUser())
             );
 
@@ -76,7 +76,7 @@ class Publications implements ControllerProviderInterface
         })->bind('admin_feeds_create');
 
         $controllers->get('/feed/{id}/', function (PhraseaApplication $app, Request $request, $id) {
-            $feed = $app["EM"]->find('Alchemy\Phrasea\Model\Entities\Feed', $id);
+            $feed = $app["EM"]->find('Phraseanet:Feed', $id);
 
             return $app['twig']
                     ->render('admin/publications/fiche.html.twig', ['feed'  => $feed, 'error' => $app['request']->query->get('error')]);
@@ -90,7 +90,7 @@ class Publications implements ControllerProviderInterface
                 $app->abort(400, "Bad request");
             }
 
-            $feed = $app["EM"]->find('Alchemy\Phrasea\Model\Entities\Feed', $id);
+            $feed = $app["EM"]->find('Phraseanet:Feed', $id);
 
             try {
                 $collection = \collection::get_from_base_id($app, $request->request->get('base_id'));
@@ -106,7 +106,7 @@ class Publications implements ControllerProviderInterface
 
             return $app->redirectPath('admin_feeds_list');
         })->before(function (Request $request) use ($app) {
-            $feed = $app["EM"]->find('Alchemy\Phrasea\Model\Entities\Feed', $request->attributes->get('id'));
+            $feed = $app["EM"]->find('Phraseanet:Feed', $request->attributes->get('id'));
 
             if (!$feed->isOwner($app['authentication']->getUser())) {
                 return $app->redirectPath('admin_feeds_feed', ['id' => $request->attributes->get('id'), 'error' =>  $app->trans('You are not the owner of this feed, you can not edit it')]);
@@ -120,7 +120,7 @@ class Publications implements ControllerProviderInterface
                 'success' => false,
                 'message' => '',
             ];
-            $feed = $app["EM"]->find('Alchemy\Phrasea\Model\Entities\Feed', $id);
+            $feed = $app["EM"]->find('Phraseanet:Feed', $id);
 
             if (null === $feed) {
                 $app->abort(404, "Feed not found");
@@ -194,7 +194,7 @@ class Publications implements ControllerProviderInterface
             try {
                 $request = $app['request'];
                 $user = \User_Adapter::getInstance($request->request->get('usr_id'), $app);
-                $feed = $app["EM"]->find('Alchemy\Phrasea\Model\Entities\Feed', $id);
+                $feed = $app["EM"]->find('Phraseanet:Feed', $id);
 
                 $publisher = new FeedPublisher();
                 $publisher->setUsrId($user->get_id());
@@ -219,9 +219,9 @@ class Publications implements ControllerProviderInterface
             try {
                 $request = $app['request'];
 
-                $feed = $app["EM"]->find('Alchemy\Phrasea\Model\Entities\Feed', $id);
+                $feed = $app["EM"]->find('Phraseanet:Feed', $id);
 
-                $publisher = $app["EM"]->find('Alchemy\Phrasea\Model\Entities\FeedPublisher', $request->request->get('publisher_id'));
+                $publisher = $app["EM"]->find('Phraseanet:FeedPublisher', $request->request->get('publisher_id'));
                 if (null === $publisher) {
                     $app->abort(404, "Feed Publisher not found");
                 }
@@ -243,7 +243,7 @@ class Publications implements ControllerProviderInterface
             ->assert('id', '\d+');
 
         $controllers->post('/feed/{id}/delete/', function (PhraseaApplication $app, $id) {
-            $feed = $app["EM"]->find('Alchemy\Phrasea\Model\Entities\Feed', $id);
+            $feed = $app["EM"]->find('Phraseanet:Feed', $id);
 
             if (null === $feed) {
                 $app->abort(404);
diff --git a/lib/Alchemy/Phrasea/Controller/Client/Baskets.php b/lib/Alchemy/Phrasea/Controller/Client/Baskets.php
index 70d79e7d51..151c3b8016 100644
--- a/lib/Alchemy/Phrasea/Controller/Client/Baskets.php
+++ b/lib/Alchemy/Phrasea/Controller/Client/Baskets.php
@@ -61,7 +61,7 @@ class Baskets implements ControllerProviderInterface
     public function deleteBasketElement(Application $app, Request $request)
     {
         try {
-            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement');
+            $repository = $app['EM']->getRepository('Phraseanet:BasketElement');
             $basketElement = $repository->findUserElement($request->request->get('p0'), $app['authentication']->getUser());
             $app['EM']->remove($basketElement);
             $app['EM']->flush();
@@ -167,7 +167,7 @@ class Baskets implements ControllerProviderInterface
     public function getBaskets(Application $app, Request $request)
     {
         $selectedBasketId = trim($request->get('courChuId', ''));
-        $baskets = new ArrayCollection($app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')->findActiveByUser($app['authentication']->getUser()));
+        $baskets = new ArrayCollection($app['EM']->getRepository('Phraseanet:Basket')->findActiveByUser($app['authentication']->getUser()));
         $selectedBasket = null;
 
         if ('' === $selectedBasketId && $baskets->count() > 0) {
@@ -202,7 +202,7 @@ class Baskets implements ControllerProviderInterface
     public function checkBaskets(Application $app, Request $request)
     {
         $noview = 0;
-        $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
+        $repository = $app['EM']->getRepository('Phraseanet:Basket');
 
         /* @var $repository Alchemy\Phrasea\Model\Repositories\BasketRepository */
         $baskets = $repository->findActiveByUser($app['authentication']->getUser());
diff --git a/lib/Alchemy/Phrasea/Controller/Datafiles.php b/lib/Alchemy/Phrasea/Controller/Datafiles.php
index 2dc5b04e12..2784ecb667 100644
--- a/lib/Alchemy/Phrasea/Controller/Datafiles.php
+++ b/lib/Alchemy/Phrasea/Controller/Datafiles.php
@@ -80,7 +80,7 @@ class Datafiles extends AbstractDelivery
 
                 if ($watermark && !$all_access) {
 
-                    $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement');
+                    $repository = $app['EM']->getRepository('Phraseanet:BasketElement');
 
                     /* @var $repository BasketElementRepository */
 
diff --git a/lib/Alchemy/Phrasea/Controller/Lightbox.php b/lib/Alchemy/Phrasea/Controller/Lightbox.php
index 013635167b..c1b83b56f8 100644
--- a/lib/Alchemy/Phrasea/Controller/Lightbox.php
+++ b/lib/Alchemy/Phrasea/Controller/Lightbox.php
@@ -76,7 +76,7 @@ class Lightbox implements ControllerProviderInterface
                 return $app->redirectPath('logout');
             }
 
-            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
+            $repository = $app['EM']->getRepository('Phraseanet:Basket');
 
             $basket_collection = array_merge(
                 $repository->findActiveByUser($app['authentication']->getUser())
@@ -104,7 +104,7 @@ class Lightbox implements ControllerProviderInterface
             }
 
             $basketElement = $app['EM']
-                ->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement')
+                ->getRepository('Phraseanet:BasketElement')
                 ->findUserElement($sselcont_id, $app['authentication']->getUser());
 
             $parameters = [
@@ -118,7 +118,7 @@ class Lightbox implements ControllerProviderInterface
             ->assert('sselcont_id', '\d+');
 
         $controllers->get('/ajax/LOAD_BASKET_ELEMENT/{sselcont_id}/', function (SilexApplication $app, $sselcont_id) {
-            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement');
+            $repository = $app['EM']->getRepository('Phraseanet:BasketElement');
 
             $BasketElement = $repository->findUserElement($sselcont_id, $app['authentication']->getUser());
 
@@ -164,7 +164,7 @@ class Lightbox implements ControllerProviderInterface
 
         $controllers->get('/ajax/LOAD_FEED_ITEM/{entry_id}/{item_id}/', function (SilexApplication $app, $entry_id, $item_id) {
 
-            $entry = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->find($entry_id);
+            $entry = $app['EM']->getRepository('Phraseanet:FeedEntry')->find($entry_id);
             $item = $entry->getItem($item_id);
 
             if ($app['browser']->isMobile()) {
@@ -209,7 +209,7 @@ class Lightbox implements ControllerProviderInterface
                 return $app->redirectPath('logout');
             }
 
-            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
+            $repository = $app['EM']->getRepository('Phraseanet:Basket');
 
             $basket_collection = $repository->findActiveValidationAndBasketByUser(
                 $app['authentication']->getUser()
@@ -256,7 +256,7 @@ class Lightbox implements ControllerProviderInterface
                 return $app->redirectPath('logout');
             }
 
-            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
+            $repository = $app['EM']->getRepository('Phraseanet:Basket');
 
             $basket_collection = $repository->findActiveValidationAndBasketByUser(
                 $app['authentication']->getUser()
@@ -303,7 +303,7 @@ class Lightbox implements ControllerProviderInterface
                 return $app->redirectPath('logout');
             }
 
-            $feed_entry = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->find($entry_id);
+            $feed_entry = $app['EM']->getRepository('Phraseanet:FeedEntry')->find($entry_id);
 
             $template = 'lightbox/feed.html.twig';
 
@@ -346,7 +346,7 @@ class Lightbox implements ControllerProviderInterface
                 Return new Response('You must provide a note value', 400);
             }
 
-            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement');
+            $repository = $app['EM']->getRepository('Phraseanet:BasketElement');
 
             $basket_element = $repository->findUserElement($sselcont_id, $app['authentication']->getUser());
 
@@ -393,7 +393,7 @@ class Lightbox implements ControllerProviderInterface
                     'datas'      => $app->trans('Erreur lors de la mise a jour des donnes')
                 ];
 
-                $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement');
+                $repository = $app['EM']->getRepository('Phraseanet:BasketElement');
 
                 $basket_element = $repository->findUserElement(
                     $sselcont_id
diff --git a/lib/Alchemy/Phrasea/Controller/Permalink.php b/lib/Alchemy/Phrasea/Controller/Permalink.php
index 69a3e40cb4..261a3c1d14 100644
--- a/lib/Alchemy/Phrasea/Controller/Permalink.php
+++ b/lib/Alchemy/Phrasea/Controller/Permalink.php
@@ -117,7 +117,7 @@ class Permalink extends AbstractDelivery
 
     private function retrieveRecord($app, $databox, $token, $record_id, $subdef)
     {
-        if (in_array($subdef, [\databox_subdef::CLASS_PREVIEW, \databox_subdef::CLASS_THUMBNAIL]) && $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedItem')->isRecordInPublicFeed($app, $databox->get_sbas_id(), $record_id)) {
+        if (in_array($subdef, [\databox_subdef::CLASS_PREVIEW, \databox_subdef::CLASS_THUMBNAIL]) && $app['EM']->getRepository('Phraseanet:FeedItem')->isRecordInPublicFeed($app, $databox->get_sbas_id(), $record_id)) {
             $record = $databox->get_record($record_id);
         } else {
             $record = \media_Permalink_Adapter::challenge_token($app, $databox, $token, $record_id, $subdef);
@@ -159,7 +159,7 @@ class Permalink extends AbstractDelivery
             $watermark = !$app['acl']->get($user)->has_right_on_base($record->get_base_id(), 'nowatermark');
 
             if ($watermark) {
-                $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement');
+                $repository = $app['EM']->getRepository('Phraseanet:BasketElement');
 
                 if (count($repository->findReceivedValidationElementsByRecord($record, $user)) > 0) {
                     $watermark = false;
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/BasketController.php b/lib/Alchemy/Phrasea/Controller/Prod/BasketController.php
index e4cbe65bd1..9fd56f5a0e 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/BasketController.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/BasketController.php
@@ -350,7 +350,7 @@ class BasketController implements ControllerProviderInterface
 
         foreach ($request->request->get('elements') as $bask_element_id) {
             try {
-                $basket_element = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement')
+                $basket_element = $app['EM']->getRepository('Phraseanet:BasketElement')
                     ->findUserElement($bask_element_id, $app['authentication']->getUser());
             } catch (\Exception $e) {
                 continue;
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php
index af9096232e..afe6feac1c 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php
@@ -34,7 +34,7 @@ class Feed implements ControllerProviderInterface
         $app['firewall']->addMandatoryAuthentication($controllers);
 
         $controllers->post('/requestavailable/', function (Application $app, Request $request) {
-            $feeds = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser(
+            $feeds = $app['EM']->getRepository('Phraseanet:Feed')->getAllForUser(
                 $app['acl']->get($app['authentication']->getUser())
             );
             $publishing = RecordsRequest::fromRequest($app, $request, true, [], ['bas_chupub']);
@@ -43,13 +43,13 @@ class Feed implements ControllerProviderInterface
         });
 
         $controllers->post('/entry/create/', function (Application $app, Request $request) {
-            $feed = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->find($request->request->get('feed_id'));
+            $feed = $app['EM']->getRepository('Phraseanet:Feed')->find($request->request->get('feed_id'));
 
             if (null === $feed) {
                 $app->abort(404, "Feed not found");
             }
 
-            $publisher = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedPublisher')->findOneBy(['feed' => $feed, 'usrId' => $app['authentication']->getUser()->get_id()]);
+            $publisher = $app['EM']->getRepository('Phraseanet:FeedPublisher')->findOneBy(['feed' => $feed, 'usrId' => $app['authentication']->getUser()->get_id()]);
 
             if ('' === $title = trim($request->request->get('title', ''))) {
                 $app->abort(400, "Bad request");
@@ -95,13 +95,13 @@ class Feed implements ControllerProviderInterface
             });
 
         $controllers->get('/entry/{id}/edit/', function (Application $app, Request $request, $id) {
-            $entry = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->find($id);
+            $entry = $app['EM']->getRepository('Phraseanet:FeedEntry')->find($id);
 
             if (!$entry->isPublisher($app['authentication']->getUser())) {
                 throw new AccessDeniedHttpException();
             }
 
-            $feeds = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser($app['acl']->get($app['authentication']->getUser()));
+            $feeds = $app['EM']->getRepository('Phraseanet:Feed')->getAllForUser($app['acl']->get($app['authentication']->getUser()));
 
             $datas = $app['twig']->render('prod/actions/publish/publish_edit.html.twig', ['entry' => $entry, 'feeds' => $feeds]);
 
@@ -115,7 +115,7 @@ class Feed implements ControllerProviderInterface
 
         $controllers->post('/entry/{id}/update/', function (Application $app, Request $request, $id) {
             $datas = ['error' => true, 'message' => '', 'datas' => ''];
-            $entry = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->find($id);
+            $entry = $app['EM']->getRepository('Phraseanet:FeedEntry')->find($id);
 
             if (null === $entry) {
                 $app->abort(404, 'Entry not found');
@@ -136,7 +136,7 @@ class Feed implements ControllerProviderInterface
             $new_feed_id = $request->request->get('feed_id', $currentFeedId);
             if ($currentFeedId !== (int) $new_feed_id) {
 
-                $new_feed = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->find($new_feed_id);
+                $new_feed = $app['EM']->getRepository('Phraseanet:Feed')->find($new_feed_id);
 
                 if ($new_feed === null) {
                     $app->abort(404, 'Feed not found');
@@ -155,7 +155,7 @@ class Feed implements ControllerProviderInterface
                 if (count($item_sort_datas) != 2) {
                     continue;
                 }
-                $item = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedItem')->find($item_sort_datas[0]);
+                $item = $app['EM']->getRepository('Phraseanet:FeedItem')->find($item_sort_datas[0]);
                 $item->setOrd($item_sort_datas[1]);
                 $app['EM']->persist($item);
             }
@@ -179,7 +179,7 @@ class Feed implements ControllerProviderInterface
         $controllers->post('/entry/{id}/delete/', function (Application $app, Request $request, $id) {
             $datas = ['error' => true, 'message' => ''];
 
-            $entry = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->find($id);
+            $entry = $app['EM']->getRepository('Phraseanet:FeedEntry')->find($id);
 
             if (null === $entry) {
                 $app->abort(404, 'Entry not found');
@@ -203,7 +203,7 @@ class Feed implements ControllerProviderInterface
             $page = (int) $request->query->get('page');
             $page = $page > 0 ? $page : 1;
 
-            $feeds = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser($app['acl']->get($app['authentication']->getUser()));
+            $feeds = $app['EM']->getRepository('Phraseanet:Feed')->getAllForUser($app['acl']->get($app['authentication']->getUser()));
 
             $datas = $app['twig']->render('prod/feeds/feeds.html.twig', [
                 'feeds' => $feeds,
@@ -218,11 +218,11 @@ class Feed implements ControllerProviderInterface
             $page = (int) $request->query->get('page');
             $page = $page > 0 ? $page : 1;
 
-            $feed = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->find($id);
+            $feed = $app['EM']->getRepository('Phraseanet:Feed')->find($id);
             if (!$feed->isAccessible($app['authentication']->getUser(), $app)) {
                 $app->abort(404, 'Feed not found');
             }
-            $feeds = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser($app['acl']->get($app['authentication']->getUser()));
+            $feeds = $app['EM']->getRepository('Phraseanet:Feed')->getAllForUser($app['acl']->get($app['authentication']->getUser()));
 
             $datas = $app['twig']->render('prod/feeds/feeds.html.twig', ['feed' => $feed, 'feeds' => $feeds, 'page' => $page]);
 
@@ -234,7 +234,7 @@ class Feed implements ControllerProviderInterface
         $controllers->get('/subscribe/aggregated/', function (Application $app, Request $request) {
             $renew = ($request->query->get('renew') === 'true');
 
-            $feeds = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser($app['acl']->get($app['authentication']->getUser()));
+            $feeds = $app['EM']->getRepository('Phraseanet:Feed')->getAllForUser($app['acl']->get($app['authentication']->getUser()));
 
             $link = $app['feed.aggregate-link-generator']->generate(new Aggregate($app['EM'], $feeds),
                 $app['authentication']->getUser(),
@@ -255,7 +255,7 @@ class Feed implements ControllerProviderInterface
         $controllers->get('/subscribe/{id}/', function (Application $app, Request $request, $id) {
             $renew = ($request->query->get('renew') === 'true');
 
-            $feed = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->find($id);
+            $feed = $app['EM']->getRepository('Phraseanet:Feed')->find($id);
             if (!$feed->isAccessible($app['authentication']->getUser(), $app)) {
                 $app->abort(404, 'Feed not found');
             }
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php b/lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
index 284bced764..d78c7f97ab 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
@@ -85,7 +85,7 @@ class Lazaret implements ControllerProviderInterface
         $lazaretFiles = null;
 
         if (count($baseIds) > 0) {
-            $lazaretRepository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\LazaretFile');
+            $lazaretRepository = $app['EM']->getRepository('Phraseanet:LazaretFile');
 
             $lazaretFiles = $lazaretRepository->findPerPage(
                 $baseIds, $request->query->get('offset', 0), $request->query->get('limit', 10)
@@ -110,7 +110,7 @@ class Lazaret implements ControllerProviderInterface
     {
         $ret = ['success' => false, 'message' => '', 'result'  => []];
 
-        $lazaretFile = $app['EM']->find('Alchemy\Phrasea\Model\Entities\LazaretFile', $file_id);
+        $lazaretFile = $app['EM']->find('Phraseanet:LazaretFile', $file_id);
 
         /* @var $lazaretFile LazaretFile */
         if (null === $lazaretFile) {
@@ -163,7 +163,7 @@ class Lazaret implements ControllerProviderInterface
             return $app->json($ret);
         }
 
-        $lazaretFile = $app['EM']->find('Alchemy\Phrasea\Model\Entities\LazaretFile', $file_id);
+        $lazaretFile = $app['EM']->find('Phraseanet:LazaretFile', $file_id);
 
         /* @var $lazaretFile LazaretFile */
         if (null === $lazaretFile) {
@@ -272,7 +272,7 @@ class Lazaret implements ControllerProviderInterface
     {
         $ret = ['success' => false, 'message' => '', 'result'  => []];
 
-        $lazaretFile = $app['EM']->find('Alchemy\Phrasea\Model\Entities\LazaretFile', $file_id);
+        $lazaretFile = $app['EM']->find('Phraseanet:LazaretFile', $file_id);
         /* @var $lazaretFile LazaretFile */
         if (null === $lazaretFile) {
             $ret['message'] = $app->trans('File is not present in quarantine anymore, please refresh');
@@ -319,7 +319,7 @@ class Lazaret implements ControllerProviderInterface
     {
         $ret = ['success' => false, 'message' => '', 'result'  => []];
 
-        $lazaretFiles = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\LazaretFile')->findAll();
+        $lazaretFiles = $app['EM']->getRepository('Phraseanet:LazaretFile')->findAll();
 
         $app['EM']->beginTransaction();
 
@@ -357,7 +357,7 @@ class Lazaret implements ControllerProviderInterface
             return $app->json($ret);
         }
 
-        $lazaretFile = $app['EM']->find('Alchemy\Phrasea\Model\Entities\LazaretFile', $file_id);
+        $lazaretFile = $app['EM']->find('Phraseanet:LazaretFile', $file_id);
 
         /* @var $lazaretFile LazaretFile */
         if (null === $lazaretFile) {
@@ -428,7 +428,7 @@ class Lazaret implements ControllerProviderInterface
      */
     public function thumbnailElement(Application $app, Request $request, $file_id)
     {
-        $lazaretFile = $app['EM']->find('Alchemy\Phrasea\Model\Entities\LazaretFile', $file_id);
+        $lazaretFile = $app['EM']->find('Phraseanet:LazaretFile', $file_id);
 
         /* @var $lazaretFile LazaretFile */
         if (null === $lazaretFile) {
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Order.php b/lib/Alchemy/Phrasea/Controller/Prod/Order.php
index 67d8737bc2..56e3f38ae8 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Order.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Order.php
@@ -193,8 +193,8 @@ class Order implements ControllerProviderInterface
 
         $baseIds = array_keys($app['acl']->get($app['authentication']->getUser())->get_granted_base(['order_master']));
 
-        $ordersList = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Order')->listOrders($baseIds, $offsetStart, $perPage, $sort);
-        $total = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Order')->countTotalOrders($baseIds);
+        $ordersList = $app['EM']->getRepository('Phraseanet:Order')->listOrders($baseIds, $offsetStart, $perPage, $sort);
+        $total = $app['EM']->getRepository('Phraseanet:Order')->countTotalOrders($baseIds);
 
         return $app['twig']->render('prod/orders/order_box.html.twig', [
             'page'         => $page,
@@ -216,7 +216,7 @@ class Order implements ControllerProviderInterface
      */
     public function displayOneOrder(Application $app, Request $request, $order_id)
     {
-        $order = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Order')->find($order_id);
+        $order = $app['EM']->getRepository('Phraseanet:Order')->find($order_id);
         if (null === $order) {
             throw new NotFoundHttpException('Order not found');
         }
@@ -237,7 +237,7 @@ class Order implements ControllerProviderInterface
     public function sendOrder(Application $app, Request $request, $order_id)
     {
         $success = false;
-        $order = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Order')->find($order_id);
+        $order = $app['EM']->getRepository('Phraseanet:Order')->find($order_id);
         if (null === $order) {
             throw new NotFoundHttpException('Order not found');
         }
@@ -324,7 +324,7 @@ class Order implements ControllerProviderInterface
     public function denyOrder(Application $app, Request $request, $order_id)
     {
         $success = false;
-        $order = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Order')->find($order_id);
+        $order = $app['EM']->getRepository('Phraseanet:Order')->find($order_id);
         if (null === $order) {
             throw new NotFoundHttpException('Order not found');
         }
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Push.php b/lib/Alchemy/Phrasea/Controller/Prod/Push.php
index 5ac7fc413c..14910240b9 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Push.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Push.php
@@ -117,7 +117,7 @@ class Push implements ControllerProviderInterface
         $controllers->post('/sendform/', function (Application $app) use ($userSelection) {
             $push = new RecordHelper\Push($app, $app['request']);
 
-            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Phraseanet:UsrList');
 
             $RecommendedUsers = $userSelection($push->get_elements());
 
@@ -135,7 +135,7 @@ class Push implements ControllerProviderInterface
         $controllers->post('/validateform/', function (Application $app) use ($userSelection) {
             $push = new RecordHelper\Push($app, $app['request']);
 
-            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Phraseanet:UsrList');
 
             $RecommendedUsers = $userSelection($push->get_elements());
 
@@ -277,7 +277,7 @@ class Push implements ControllerProviderInterface
             try {
                 $pusher = new RecordHelper\Push($app, $app['request']);
 
-                $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
+                $repository = $app['EM']->getRepository('Phraseanet:Basket');
 
                 $validation_name = $request->request->get('name', $app->trans('Validation from %user%', ['%user%' => $app['authentication']->getUser()->get_display_name()]));
                 $validation_description = $request->request->get('validation_description');
@@ -492,7 +492,7 @@ class Push implements ControllerProviderInterface
         $controllers->get('/list/{list_id}/', function (Application $app, $list_id) use ($listFormatter) {
             $datas = null;
 
-            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Phraseanet:UsrList');
 
             $list = $repository->findUserListByUserAndId($app, $app['authentication']->getUser(), $list_id);
 
@@ -592,7 +592,7 @@ class Push implements ControllerProviderInterface
                     ->limit(0, 50)
                     ->execute()->get_results();
 
-            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Phraseanet:UsrList');
 
             $lists = $repository->findUserListLike($app['authentication']->getUser(), $request->query->get('query'));
 
@@ -615,7 +615,7 @@ class Push implements ControllerProviderInterface
 
         $controllers->match('/edit-list/{list_id}/', function (Application $app, Request $request, $list_id) {
 
-            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Phraseanet:UsrList');
 
             $list = $repository->findUserListByUserAndId($app, $app['authentication']->getUser(), $list_id);
 
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Records.php b/lib/Alchemy/Phrasea/Controller/Prod/Records.php
index b7c5c4e25f..5758453140 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Records.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Records.php
@@ -152,8 +152,8 @@ class Records implements ControllerProviderInterface
             'candeleterecord'
         ]);
 
-        $basketElementsRepository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement');
-        $StoryWZRepository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\StoryWZ');
+        $basketElementsRepository = $app['EM']->getRepository('Phraseanet:BasketElement');
+        $StoryWZRepository = $app['EM']->getRepository('Phraseanet:StoryWZ');
 
         $deleted = [];
 
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Root.php b/lib/Alchemy/Phrasea/Controller/Prod/Root.php
index ba490e586b..284938fbb1 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Root.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Root.php
@@ -71,7 +71,7 @@ class Root implements ControllerProviderInterface
                 $cssfile = '000000';
             }
 
-            $feeds = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser($app['acl']->get($app['authentication']->getUser()));
+            $feeds = $app['EM']->getRepository('Phraseanet:Feed')->getAllForUser($app['acl']->get($app['authentication']->getUser()));
             $aggregate = Aggregate::createFromUser($app, $app['authentication']->getUser());
 
             $thjslist = "";
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php b/lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php
index 1a59b306eb..db89ed8a4c 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php
@@ -80,7 +80,7 @@ class UsrLists implements ControllerProviderInterface
         $lists = new ArrayCollection();
 
         try {
-            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Phraseanet:UsrList');
 
             $lists = $repository->findUserLists($app['authentication']->getUser());
 
@@ -193,7 +193,7 @@ class UsrLists implements ControllerProviderInterface
 
     public function displayList(Application $app, Request $request, $list_id)
     {
-        $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
+        $repository = $app['EM']->getRepository('Phraseanet:UsrList');
 
         $list = $repository->findUserListByUserAndId($app, $app['authentication']->getUser(), $list_id);
 
@@ -251,7 +251,7 @@ class UsrLists implements ControllerProviderInterface
                 throw new ControllerException($app->trans('List name is required'));
             }
 
-            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Phraseanet:UsrList');
 
             $list = $repository->findUserListByUserAndId($app, $app['authentication']->getUser(), $list_id);
 
@@ -282,7 +282,7 @@ class UsrLists implements ControllerProviderInterface
     public function removeList(Application $app, $list_id)
     {
         try {
-            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Phraseanet:UsrList');
 
             $list = $repository->findUserListByUserAndId($app, $app['authentication']->getUser(), $list_id);
 
@@ -316,7 +316,7 @@ class UsrLists implements ControllerProviderInterface
     public function removeUser(Application $app, $list_id, $usr_id)
     {
         try {
-            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Phraseanet:UsrList');
 
             $list = $repository->findUserListByUserAndId($app, $app['authentication']->getUser(), $list_id);
             /* @var $list UsrList */
@@ -325,7 +325,7 @@ class UsrLists implements ControllerProviderInterface
                 throw new ControllerException($app->trans('You are not authorized to do this'));
             }
 
-            $entry_repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrListEntry');
+            $entry_repository = $app['EM']->getRepository('Phraseanet:UsrListEntry');
 
             $user_entry = $entry_repository->findEntryByListAndUsrId($list, $usr_id);
 
@@ -358,7 +358,7 @@ class UsrLists implements ControllerProviderInterface
                 throw new ControllerException('Invalid or missing parameter usr_ids');
             }
 
-            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Phraseanet:UsrList');
 
             $list = $repository->findUserListByUserAndId($app, $app['authentication']->getUser(), $list_id);
             /* @var $list UsrList */
@@ -422,7 +422,7 @@ class UsrLists implements ControllerProviderInterface
         $list = null;
 
         try {
-            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Phraseanet:UsrList');
 
             $list = $repository->findUserListByUserAndId($app, $app['authentication']->getUser(), $list_id);
             /* @var $list UsrList */
@@ -452,7 +452,7 @@ class UsrLists implements ControllerProviderInterface
             throw new BadRequestHttpException('Role is invalid');
 
         try {
-            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Phraseanet:UsrList');
 
             $list = $repository->findUserListByUserAndId($app, $app['authentication']->getUser(), $list_id);
             /* @var $list UsrList */
@@ -508,7 +508,7 @@ class UsrLists implements ControllerProviderInterface
     public function unshareWithUser(Application $app, $list_id, $usr_id)
     {
         try {
-            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
+            $repository = $app['EM']->getRepository('Phraseanet:UsrList');
 
             $list = $repository->findUserListByUserAndId($app, $app['authentication']->getUser(), $list_id);
             /* @var $list UsrList */
@@ -517,7 +517,7 @@ class UsrLists implements ControllerProviderInterface
                 throw new \Exception($app->trans('You are not authorized to do this'));
             }
 
-            $owners_repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrListOwner');
+            $owners_repository = $app['EM']->getRepository('Phraseanet:UsrListOwner');
 
             $owner = $owners_repository->findByListAndUsrId($list, $usr_id);
 
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php b/lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php
index 76634361a4..e5d860122a 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php
@@ -80,7 +80,7 @@ class WorkZone implements ControllerProviderInterface
     {
         $request = $app['request'];
 
-        $BasketRepo = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
+        $BasketRepo = $app['EM']->getRepository('Phraseanet:Basket');
 
         $Page = (int) $request->query->get('Page', 0);
 
@@ -123,7 +123,7 @@ class WorkZone implements ControllerProviderInterface
             throw new BadRequestHttpException('Missing parameters stories');
         }
 
-        $StoryWZRepo = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\StoryWZ');
+        $StoryWZRepo = $app['EM']->getRepository('Phraseanet:StoryWZ');
 
         $alreadyFixed = $done = 0;
 
@@ -184,7 +184,7 @@ class WorkZone implements ControllerProviderInterface
     {
         $Story = new \record_adapter($app, $sbas_id, $record_id);
 
-        $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\StoryWZ');
+        $repository = $app['EM']->getRepository('Phraseanet:StoryWZ');
 
         $StoryWZ = $repository->findUserStory($app, $app['authentication']->getUser(), $Story);
 
diff --git a/lib/Alchemy/Phrasea/Controller/RecordsRequest.php b/lib/Alchemy/Phrasea/Controller/RecordsRequest.php
index f031d03321..634f05f4d6 100644
--- a/lib/Alchemy/Phrasea/Controller/RecordsRequest.php
+++ b/lib/Alchemy/Phrasea/Controller/RecordsRequest.php
@@ -213,7 +213,7 @@ class RecordsRequest extends ArrayCollection
                 $received[$basket_element->getRecord($app)->get_serialize_key()] = $basket_element->getRecord($app);
             }
         } elseif ($request->get('story')) {
-            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\StoryWZ');
+            $repository = $app['EM']->getRepository('Phraseanet:StoryWZ');
 
             $storyWZ = $repository->findByUserAndId(
                 $app, $app['authentication']->getUser()
diff --git a/lib/Alchemy/Phrasea/Controller/Root/Account.php b/lib/Alchemy/Phrasea/Controller/Root/Account.php
index d0768e0c14..1a956f3c4e 100644
--- a/lib/Alchemy/Phrasea/Controller/Root/Account.php
+++ b/lib/Alchemy/Phrasea/Controller/Root/Account.php
@@ -267,7 +267,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.usr_id = :usr_id
             ORDER BY s.created DESC';
 
diff --git a/lib/Alchemy/Phrasea/Controller/Root/Login.php b/lib/Alchemy/Phrasea/Controller/Root/Login.php
index 69e87ef4e1..74b6a12357 100644
--- a/lib/Alchemy/Phrasea/Controller/Root/Login.php
+++ b/lib/Alchemy/Phrasea/Controller/Root/Login.php
@@ -52,7 +52,7 @@ class Login implements ControllerProviderInterface
     {
         $items = [];
 
-        foreach ($app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedItem')->loadLatest($app, 20) as $item) {
+        foreach ($app['EM']->getRepository('Phraseanet:FeedItem')->loadLatest($app, 20) as $item) {
             $record = $item->getRecord($app);
             $preview = $record->get_subdef('preview');
             $permalink = $preview->get_permalink();
@@ -304,7 +304,7 @@ class Login implements ControllerProviderInterface
                 }
 
                 $userAuthProvider = $app['EM']
-                    ->getRepository('Alchemy\Phrasea\Model\Entities\UsrAuthProvider')
+                    ->getRepository('Phraseanet:UsrAuthProvider')
                     ->findWithProviderAndId($token->getProvider()->getId(), $token->getId());
 
                 if (null !== $userAuthProvider) {
@@ -762,7 +762,7 @@ class Login implements ControllerProviderInterface
             $app->addFlash('error', $app->trans('login::erreur: No available connection - Please contact sys-admin'));
         }
 
-        $feeds = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->findBy(['public' => true], ['updatedOn' => 'DESC']);
+        $feeds = $app['EM']->getRepository('Phraseanet:Feed')->findBy(['public' => true], ['updatedOn' => 'DESC']);
 
         $form = $app->form(new PhraseaAuthenticationForm());
         $form->setData([
@@ -854,7 +854,7 @@ class Login implements ControllerProviderInterface
         $date = new \DateTime('+' . (int) $app['conf']->get(['registry', 'actions', 'validation-reminder-days']) . ' days');
 
         foreach ($app['EM']
-            ->getRepository('Alchemy\Phrasea\Model\Entities\ValidationParticipant')
+            ->getRepository('Phraseanet:ValidationParticipant')
             ->findNotConfirmedAndNotRemindedParticipantsByExpireDate($date) as $participant) {
 
             /* @var $participant ValidationParticipant */
@@ -927,7 +927,7 @@ class Login implements ControllerProviderInterface
         }
 
         $userAuthProvider = $app['EM']
-            ->getRepository('Alchemy\Phrasea\Model\Entities\UsrAuthProvider')
+            ->getRepository('Phraseanet:UsrAuthProvider')
             ->findWithProviderAndId($token->getProvider()->getId(), $token->getId());
 
         if (null !== $userAuthProvider) {
@@ -1058,7 +1058,7 @@ class Login implements ControllerProviderInterface
             if (!$user->is_guest() && $request->cookies->has('invite-usr_id')) {
                 if ($user->get_id() != $inviteUsrId = $request->cookies->get('invite-usr_id')) {
 
-                    $repo = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
+                    $repo = $app['EM']->getRepository('Phraseanet:Basket');
                     $baskets = $repo->findBy(['usr_id' => $inviteUsrId]);
 
                     foreach ($baskets as $basket) {
diff --git a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
index 8b8898d872..7a1a14b03e 100644
--- a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
+++ b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
@@ -25,7 +25,7 @@ class RSSFeeds implements ControllerProviderInterface
         $controllers = $app['controllers_factory'];
 
         $controllers->get('/feed/{id}/{format}/', function (Application $app, $id, $format) {
-            $feed = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->find($id);
+            $feed = $app['EM']->getRepository('Phraseanet:Feed')->find($id);
 
             if (null === $feed) {
                 $app->abort(404, 'Feed not found');
@@ -47,7 +47,7 @@ class RSSFeeds implements ControllerProviderInterface
             ->assert('format', '(rss|atom)');
 
         $controllers->get('/userfeed/{token}/{id}/{format}/', function (Application $app, $token, $id, $format) {
-            $token = $app["EM"]->find('Alchemy\Phrasea\Model\Entities\FeedToken', $id);
+            $token = $app["EM"]->find('Phraseanet:FeedToken', $id);
 
             $request = $app['request'];
 
@@ -62,10 +62,10 @@ 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 = \User_Adapter::getInstance($token->getUsrId(), $app);
 
-            $feeds = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser($app['acl']->get($user));
+            $feeds = $app['EM']->getRepository('Phraseanet:Feed')->getAllForUser($app['acl']->get($user));
 
             $aggregate = new Aggregate($app['EM'], $feeds, $token);
 
diff --git a/lib/Alchemy/Phrasea/Controller/Root/Session.php b/lib/Alchemy/Phrasea/Controller/Root/Session.php
index 8ff0343e32..10771d695f 100644
--- a/lib/Alchemy/Phrasea/Controller/Root/Session.php
+++ b/lib/Alchemy/Phrasea/Controller/Root/Session.php
@@ -81,7 +81,7 @@ class Session implements ControllerProviderInterface
             return $app->json($ret);
         }
 
-        $session = $app['EM']->find('Alchemy\Phrasea\Model\Entities\Session', $app['session']->get('session_id'));
+        $session = $app['EM']->find('Phraseanet:Session', $app['session']->get('session_id'));
         $session->setUpdated(new \DateTime());
 
         if (!$session->hasModuleId($moduleId)) {
@@ -102,7 +102,7 @@ class Session implements ControllerProviderInterface
             'notifications' => $app['events-manager']->get_notifications()
         ]);
 
-        $baskets = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')->findUnreadActiveByUser($app['authentication']->getUser());
+        $baskets = $app['EM']->getRepository('Phraseanet:Basket')->findUnreadActiveByUser($app['authentication']->getUser());
 
         foreach ($baskets as $basket) {
             $ret['changed'][] = $basket->getId();
@@ -132,7 +132,7 @@ class Session implements ControllerProviderInterface
      */
     public function deleteSession(Application $app, Request $request, $id)
     {
-        $session = $app['EM']->find('Alchemy\Phrasea\Model\Entities\Session', $id);
+        $session = $app['EM']->find('Phraseanet:Session', $id);
 
         if (null === $session) {
             $app->abort(404, 'Unknown session');
diff --git a/lib/Alchemy/Phrasea/Core/CLIProvider/TaskManagerServiceProvider.php b/lib/Alchemy/Phrasea/Core/CLIProvider/TaskManagerServiceProvider.php
index ea85adabcc..30ca3dfd44 100644
--- a/lib/Alchemy/Phrasea/Core/CLIProvider/TaskManagerServiceProvider.php
+++ b/lib/Alchemy/Phrasea/Core/CLIProvider/TaskManagerServiceProvider.php
@@ -62,7 +62,7 @@ class TaskManagerServiceProvider implements ServiceProviderInterface
             $finder = new PhpExecutableFinder();
             $php = $finder->find();
 
-            return new TaskList($app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Task'), $app['root.path'], $php, $conf);
+            return new TaskList($app['EM']->getRepository('Phraseanet:Task'), $app['root.path'], $php, $conf);
         });
     }
 
diff --git a/lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php
index 84ddc69fa5..b0eead5f2c 100644
--- a/lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php
+++ b/lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php
@@ -17,6 +17,7 @@ use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\Annotations\AnnotationRegistry;
 use Doctrine\Common\Annotations\FileCacheReader;
 use Doctrine\Common\EventManager;
+use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain;
 use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
 use Doctrine\ORM\Mapping\Driver\DriverChain;
 use Doctrine\ORM\EntityManager;
@@ -54,7 +55,7 @@ class ORMServiceProvider implements ServiceProviderInterface
                 $app['debug']
             );
 
-            $driverChain = new DriverChain();
+            $driverChain = new MappingDriverChain();
             DoctrineExtensions::registerAbstractMappingIntoDriverChainORM(
                 $driverChain,
                 $fileCacheReader
@@ -95,6 +96,7 @@ class ORMServiceProvider implements ServiceProviderInterface
             $config->setProxyDir($app['root.path'] . '/tmp/doctrine-proxies');
             $config->setProxyNamespace('Alchemy\Phrasea\Model\Proxies');
             $config->setAutoGenerateProxyClasses($app['debug']);
+            $config->addEntityNamespace('Phraseanet', 'Alchemy\Phrasea\Model\Entities');
 
             return $config;
         });
diff --git a/lib/Alchemy/Phrasea/Feed/Aggregate.php b/lib/Alchemy/Phrasea/Feed/Aggregate.php
index 0e22bb3cfe..c14aa18252 100644
--- a/lib/Alchemy/Phrasea/Feed/Aggregate.php
+++ b/lib/Alchemy/Phrasea/Feed/Aggregate.php
@@ -77,8 +77,8 @@ class Aggregate implements FeedInterface
      */
     public static function createFromUser(Application $app, \User_Adapter $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(['usrId' => $user->get_id()]);
+        $feeds = $app['EM']->getRepository('Phraseanet:Feed')->getAllForUser($app['acl']->get($user));
+        $token = $app['EM']->getRepository('Phraseanet:AggregateToken')->findOneBy(['usrId' => $user->get_id()]);
 
         return new static($app['EM'], $feeds, $token);
     }
@@ -93,7 +93,7 @@ class Aggregate implements FeedInterface
      */
     public static function create(Application $app, array $feed_ids)
     {
-        $feeds = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->findByIds($feed_ids);
+        $feeds = $app['EM']->getRepository('Phraseanet:Feed')->findByIds($feed_ids);
 
         return new static($app, $feeds);
     }
@@ -120,7 +120,7 @@ class Aggregate implements FeedInterface
             $feedIds[] = $feed->getId();
         }
 
-        return $this->em->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->findByFeeds($feedIds, $offset_start, $how_many);
+        return $this->em->getRepository('Phraseanet:FeedEntry')->findByFeeds($feedIds, $offset_start, $how_many);
     }
 
     /**
@@ -206,7 +206,7 @@ class Aggregate implements FeedInterface
                 $feedIds[] = $feed->getId();
             }
 
-            return count($this->em->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->findByFeeds($feedIds));
+            return count($this->em->getRepository('Phraseanet:FeedEntry')->findByFeeds($feedIds));
         }
 
         return 0;
@@ -238,6 +238,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 92e416a65e..f4b9b32690 100644
--- a/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php
+++ b/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php
@@ -130,7 +130,7 @@ class AggregateLinkGenerator implements LinkGeneratorInterface
     private function getAggregateToken(\User_Adapter $user, $renew = false)
     {
         $token = $this->em
-            ->getRepository('Alchemy\Phrasea\Model\Entities\AggregateToken')
+            ->getRepository('Phraseanet:AggregateToken')
             ->findOneBy(['usrId' => $user->get_id()]);
 
         if (null === $token || true === $renew) {
diff --git a/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php b/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php
index f1be6d0431..5e7946e3c9 100644
--- a/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php
+++ b/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php
@@ -138,7 +138,7 @@ class FeedLinkGenerator implements LinkGeneratorInterface
     private function getFeedToken(Feed $feed, \User_Adapter $user, $renew = false)
     {
         $token = $this->em
-            ->getRepository('Alchemy\Phrasea\Model\Entities\FeedToken')
+            ->getRepository('Phraseanet:FeedToken')
             ->findOneBy(['usrId' => $user->get_id(), 'feed' => $feed->getId()]);
 
         if (null === $token || true === $renew) {
diff --git a/lib/Alchemy/Phrasea/Helper/Record/Helper.php b/lib/Alchemy/Phrasea/Helper/Record/Helper.php
index 2d8d9bec7b..4b485ff8aa 100644
--- a/lib/Alchemy/Phrasea/Helper/Record/Helper.php
+++ b/lib/Alchemy/Phrasea/Helper/Record/Helper.php
@@ -116,7 +116,7 @@ class Helper extends \Alchemy\Phrasea\Helper\Helper
             $this->is_basket = true;
             $this->original_basket = $Basket;
         } elseif (trim($Request->get('story')) !== '') {
-            $repository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\StoryWZ');
+            $repository = $app['EM']->getRepository('Phraseanet:StoryWZ');
 
             $storyWZ = $repository->findByUserAndId($app, $app['authentication']->getUser(), $Request->get('story'));
 
diff --git a/lib/Alchemy/Phrasea/Helper/WorkZone.php b/lib/Alchemy/Phrasea/Helper/WorkZone.php
index ed19811ac0..1c3717d4dd 100644
--- a/lib/Alchemy/Phrasea/Helper/WorkZone.php
+++ b/lib/Alchemy/Phrasea/Helper/WorkZone.php
@@ -33,7 +33,7 @@ class WorkZone extends Helper
     public function getContent($sort)
     {
         /* @var $repo_baskets Alchemy\Phrasea\Model\Repositories\BasketRepository */
-        $repo_baskets = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
+        $repo_baskets = $this->app['EM']->getRepository('Phraseanet:Basket');
 
         $sort = in_array($sort, ['date', 'name']) ? $sort : 'name';
 
@@ -56,7 +56,7 @@ class WorkZone extends Helper
         $validations = $repo_baskets->findActiveValidationByUser($this->app['authentication']->getUser(), $sort);
 
         /* @var $repo_stories Alchemy\Phrasea\Model\Repositories\StoryWZRepository */
-        $repo_stories = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\StoryWZ');
+        $repo_stories = $this->app['EM']->getRepository('Phraseanet:StoryWZ');
 
         $stories = $repo_stories->findByUser($this->app, $this->app['authentication']->getUser(), $sort);
 
diff --git a/lib/Alchemy/Phrasea/Model/Converter/BasketConverter.php b/lib/Alchemy/Phrasea/Model/Converter/BasketConverter.php
index 6b7e2d5960..da37ed27c2 100644
--- a/lib/Alchemy/Phrasea/Model/Converter/BasketConverter.php
+++ b/lib/Alchemy/Phrasea/Model/Converter/BasketConverter.php
@@ -31,7 +31,7 @@ class BasketConverter implements ConverterInterface
      */
     public function convert($id)
     {
-        if (null === $basket = $this->om->find('Alchemy\Phrasea\Model\Entities\Basket', (int) $id)) {
+        if (null === $basket = $this->om->find('Phraseanet:Basket', (int) $id)) {
             throw new NotFoundHttpException(sprintf('Basket %s not found.', $id));
         }
 
diff --git a/lib/Alchemy/Phrasea/Model/Converter/TaskConverter.php b/lib/Alchemy/Phrasea/Model/Converter/TaskConverter.php
index a0ffe28c83..87078cef55 100644
--- a/lib/Alchemy/Phrasea/Model/Converter/TaskConverter.php
+++ b/lib/Alchemy/Phrasea/Model/Converter/TaskConverter.php
@@ -31,7 +31,7 @@ class TaskConverter implements ConverterInterface
      */
     public function convert($id)
     {
-        if (null === $task = $this->om->find('Alchemy\Phrasea\Model\Entities\Task', (int) $id)) {
+        if (null === $task = $this->om->find('Phraseanet:Task', (int) $id)) {
             throw new NotFoundHttpException(sprintf('Task %s not found.', $id));
         }
 
diff --git a/lib/Alchemy/Phrasea/Model/Entities/Session.php b/lib/Alchemy/Phrasea/Model/Entities/Session.php
index 3d17c2555f..783b7919f1 100644
--- a/lib/Alchemy/Phrasea/Model/Entities/Session.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/Session.php
@@ -439,7 +439,7 @@ class Session
      * Get a module by its identifier
      *
      * @param  integer                                           $moduleId
-     * @return Alchemy\Phrasea\Model\Entities\SessionModule|null
+     * @return SessionModule|null
      */
     public function getModuleById($moduleId)
     {
diff --git a/lib/Alchemy/Phrasea/Model/Manager/UserManager.php b/lib/Alchemy/Phrasea/Model/Manager/UserManager.php
index 0bc929f2a6..ee068193b0 100644
--- a/lib/Alchemy/Phrasea/Model/Manager/UserManager.php
+++ b/lib/Alchemy/Phrasea/Model/Manager/UserManager.php
@@ -136,7 +136,7 @@ class UserManager
      */
     private function cleanFtpExports(User $user)
     {
-       $elements = $this->objectManager->getRepository('Alchemy\Phrasea\Model\Entities\FtpExport')
+       $elements = $this->objectManager->getRepository('Phraseanet:FtpExport')
                ->findBy(['usrId' => $user->getId()]);
 
        foreach ($elements as $element) {
@@ -151,7 +151,7 @@ class UserManager
      */
     private function cleanOrders(User $user)
     {
-       $orders = $this->objectManager->getRepository('Alchemy\Phrasea\Model\Entities\Order')
+       $orders = $this->objectManager->getRepository('Phraseanet:Order')
                ->findBy(['usrId' => $user->getId()]);
 
        foreach ($orders as $order) {
diff --git a/lib/Alchemy/Phrasea/Model/Manipulator/TaskManipulator.php b/lib/Alchemy/Phrasea/Model/Manipulator/TaskManipulator.php
index f3bd0cd8e9..c662706922 100644
--- a/lib/Alchemy/Phrasea/Model/Manipulator/TaskManipulator.php
+++ b/lib/Alchemy/Phrasea/Model/Manipulator/TaskManipulator.php
@@ -178,6 +178,6 @@ class TaskManipulator implements ManipulatorInterface
      */
     public function getRepository()
     {
-        return $this->om->getRepository('Alchemy\Phrasea\Model\Entities\Task');
+        return $this->om->getRepository('Phraseanet:Task');
     }
 }
diff --git a/lib/Alchemy/Phrasea/Model/Manipulator/UserManipulator.php b/lib/Alchemy/Phrasea/Model/Manipulator/UserManipulator.php
index b563ad446e..10c5a3f9b6 100644
--- a/lib/Alchemy/Phrasea/Model/Manipulator/UserManipulator.php
+++ b/lib/Alchemy/Phrasea/Model/Manipulator/UserManipulator.php
@@ -46,7 +46,7 @@ class UserManipulator implements ManipulatorInterface
      */
     public function getRepository()
     {
-        return $this->manager->getObjectManager()->getRepository('Alchemy\Phrasea\Model\Entities\User');
+        return $this->manager->getObjectManager()->getRepository('Phraseanet:User');
     }
 
     /**
diff --git a/lib/Alchemy/Phrasea/Model/Repositories/AuthFailureRepository.php b/lib/Alchemy/Phrasea/Model/Repositories/AuthFailureRepository.php
index 5b3f77d76c..783620a8c9 100644
--- a/lib/Alchemy/Phrasea/Model/Repositories/AuthFailureRepository.php
+++ b/lib/Alchemy/Phrasea/Model/Repositories/AuthFailureRepository.php
@@ -26,7 +26,7 @@ class AuthFailureRepository extends EntityRepository
         $date = new \DateTime($limit);
 
         $dql = 'SELECT f
-                FROM Alchemy\Phrasea\Model\Entities\AuthFailure f
+                FROM Phraseanet:AuthFailure f
                 WHERE f.created < :date';
 
         $params = ['date' => $date->format('Y-m-d h:i:s')];
@@ -40,7 +40,7 @@ class AuthFailureRepository extends EntityRepository
     public function findLockedFailuresMatching($username, $ip)
     {
         $dql = 'SELECT f
-                FROM Alchemy\Phrasea\Model\Entities\AuthFailure f
+                FROM Phraseanet:AuthFailure f
                 WHERE (f.username = :username OR f.ip = :ip)
                     AND f.locked = true';
 
diff --git a/lib/Alchemy/Phrasea/Model/Repositories/BasketElementRepository.php b/lib/Alchemy/Phrasea/Model/Repositories/BasketElementRepository.php
index 457d23a2d4..3f6a87ff4d 100644
--- a/lib/Alchemy/Phrasea/Model/Repositories/BasketElementRepository.php
+++ b/lib/Alchemy/Phrasea/Model/Repositories/BasketElementRepository.php
@@ -27,7 +27,7 @@ class BasketElementRepository extends EntityRepository
     public function findUserElement($element_id, \User_Adapter $user)
     {
         $dql = 'SELECT e
-            FROM Alchemy\Phrasea\Model\Entities\BasketElement e
+            FROM Phraseanet:BasketElement e
             JOIN e.basket b
             LEFT JOIN e.validation_datas vd
             LEFT JOIN b.validation s
@@ -57,7 +57,7 @@ class BasketElementRepository extends EntityRepository
     public function findElementsByRecord(\record_adapter $record)
     {
         $dql = 'SELECT e
-            FROM Alchemy\Phrasea\Model\Entities\BasketElement e
+            FROM Phraseanet:BasketElement e
             JOIN e.basket b
             LEFT JOIN b.validation s
             LEFT JOIN s.participants p
@@ -78,7 +78,7 @@ class BasketElementRepository extends EntityRepository
     public function findElementsByDatabox(\databox $databox)
     {
         $dql = 'SELECT e
-            FROM Alchemy\Phrasea\Model\Entities\BasketElement e
+            FROM Phraseanet:BasketElement e
             JOIN e.basket b
             LEFT JOIN b.validation s
             LEFT JOIN s.participants p
@@ -103,7 +103,7 @@ class BasketElementRepository extends EntityRepository
     public function findReceivedElementsByRecord(\record_adapter $record, \User_Adapter $user)
     {
         $dql = 'SELECT e
-            FROM Alchemy\Phrasea\Model\Entities\BasketElement e
+            FROM Phraseanet:BasketElement e
             JOIN e.basket b
             LEFT JOIN b.validation s
             LEFT JOIN s.participants p
@@ -127,7 +127,7 @@ class BasketElementRepository extends EntityRepository
     public function findReceivedValidationElementsByRecord(\record_adapter $record, \User_Adapter $user)
     {
         $dql = 'SELECT e
-            FROM Alchemy\Phrasea\Model\Entities\BasketElement e
+            FROM Phraseanet:BasketElement e
             JOIN e.basket b
             JOIN b.validation v
             JOIN v.participants p
diff --git a/lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php b/lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php
index c7ba576a8d..dd2dec24ca 100644
--- a/lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php
+++ b/lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php
@@ -30,7 +30,7 @@ class BasketRepository extends EntityRepository
     public function findActiveByUser(\User_Adapter $user, $sort = null)
     {
         $dql = 'SELECT b
-            FROM Alchemy\Phrasea\Model\Entities\Basket b
+            FROM Phraseanet:Basket b
             LEFT JOIN b.elements e
             WHERE b.usr_id = :usr_id
             AND b.archived = false';
@@ -56,7 +56,7 @@ class BasketRepository extends EntityRepository
     public function findUnreadActiveByUser(\User_Adapter $user)
     {
         $dql = 'SELECT b
-            FROM Alchemy\Phrasea\Model\Entities\Basket b
+            FROM Phraseanet:Basket b
             JOIN b.elements e
             LEFT JOIN b.validation s
             LEFT JOIN s.participants p
@@ -91,7 +91,7 @@ class BasketRepository extends EntityRepository
     public function findActiveValidationByUser(\User_Adapter $user, $sort = null)
     {
         $dql = 'SELECT b
-            FROM Alchemy\Phrasea\Model\Entities\Basket b
+            FROM Phraseanet:Basket b
             JOIN b.elements e
             JOIN e.validation_datas v
             JOIN b.validation s
@@ -115,7 +115,7 @@ class BasketRepository extends EntityRepository
     {
 
         $dql = 'SELECT b
-            FROM Alchemy\Phrasea\Model\Entities\Basket b
+            FROM Phraseanet:Basket b
             JOIN b.elements e
             WHERE e.record_id = :record_id AND e.sbas_id = e.sbas_id
               AND b.usr_id = :usr_id';
@@ -138,7 +138,7 @@ class BasketRepository extends EntityRepository
         switch ($type) {
             case self::RECEIVED:
                 $dql = 'SELECT b
-                FROM Alchemy\Phrasea\Model\Entities\Basket b
+                FROM Phraseanet:Basket b
                 JOIN b.elements e
                 WHERE b.usr_id = :usr_id AND b.pusher_id IS NOT NULL';
                 $params = [
@@ -147,7 +147,7 @@ class BasketRepository extends EntityRepository
                 break;
             case self::VALIDATION_DONE:
                 $dql = 'SELECT b
-                FROM Alchemy\Phrasea\Model\Entities\Basket b
+                FROM Phraseanet:Basket b
                 JOIN b.elements e
                 JOIN b.validation s
                 JOIN s.participants p
@@ -159,7 +159,7 @@ class BasketRepository extends EntityRepository
                 break;
             case self::VALIDATION_SENT:
                 $dql = 'SELECT b
-                FROM Alchemy\Phrasea\Model\Entities\Basket b
+                FROM Phraseanet:Basket b
                 JOIN b.elements e
                 JOIN b.validation v
                 WHERE b.usr_id = :usr_id';
@@ -169,7 +169,7 @@ class BasketRepository extends EntityRepository
                 break;
             default:
                 $dql = 'SELECT b
-                FROM Alchemy\Phrasea\Model\Entities\Basket b
+                FROM Phraseanet:Basket b
                 LEFT JOIN b.elements e
                 LEFT JOIN b.validation s
                 LEFT JOIN s.participants p
@@ -181,7 +181,7 @@ class BasketRepository extends EntityRepository
                 break;
             case self::MYBASKETS:
                 $dql = 'SELECT b
-                FROM Alchemy\Phrasea\Model\Entities\Basket b
+                FROM Phraseanet:Basket b
                 LEFT JOIN b.elements e
                 LEFT JOIN b.validation s
                 LEFT JOIN s.participants p
@@ -228,7 +228,7 @@ class BasketRepository extends EntityRepository
     public function findActiveValidationAndBasketByUser(\User_Adapter $user, $sort = null)
     {
         $dql = 'SELECT b
-            FROM Alchemy\Phrasea\Model\Entities\Basket b
+            FROM Phraseanet:Basket b
             LEFT JOIN b.elements e
             LEFT JOIN b.validation s
             LEFT JOIN s.participants p
diff --git a/lib/Alchemy/Phrasea/Model/Repositories/FeedEntryRepository.php b/lib/Alchemy/Phrasea/Model/Repositories/FeedEntryRepository.php
index 5d59393a9f..5144de9e4d 100644
--- a/lib/Alchemy/Phrasea/Model/Repositories/FeedEntryRepository.php
+++ b/lib/Alchemy/Phrasea/Model/Repositories/FeedEntryRepository.php
@@ -32,7 +32,7 @@ class FeedEntryRepository extends EntityRepository
      */
     public function findByFeeds($feeds, $offset_start = null, $how_many = null)
     {
-        $dql = 'SELECT f FROM Alchemy\Phrasea\Model\Entities\FeedEntry f
+        $dql = 'SELECT f FROM Phraseanet:FeedEntry f
                 WHERE f.feed IN (:feeds) order by f.updatedOn DESC';
 
         $query = $this->_em->createQuery($dql);
diff --git a/lib/Alchemy/Phrasea/Model/Repositories/FeedItemRepository.php b/lib/Alchemy/Phrasea/Model/Repositories/FeedItemRepository.php
index 3ca0341c82..5a79735566 100644
--- a/lib/Alchemy/Phrasea/Model/Repositories/FeedItemRepository.php
+++ b/lib/Alchemy/Phrasea/Model/Repositories/FeedItemRepository.php
@@ -35,7 +35,7 @@ class FeedItemRepository extends EntityRepository
     public function isRecordInPublicFeed(Application $app, $sbas_id, $record_id)
     {
         $dql = 'SELECT i
-            FROM Alchemy\Phrasea\Model\Entities\FeedItem i
+            FROM Phraseanet:FeedItem i
             JOIN i.entry e
             JOIN e.feed f
             WHERE i.sbasId = :sbas_id
@@ -63,7 +63,7 @@ class FeedItemRepository extends EntityRepository
 
         do {
             $dql = 'SELECT i
-                FROM Alchemy\Phrasea\Model\Entities\FeedItem i
+                FROM Phraseanet:FeedItem i
                 JOIN i.entry e
                 JOIN e.feed f
                 WHERE f.public = true ORDER BY i.createdOn DESC';
diff --git a/lib/Alchemy/Phrasea/Model/Repositories/FtpExportRepository.php b/lib/Alchemy/Phrasea/Model/Repositories/FtpExportRepository.php
index ac5bacaba7..8c3649863d 100644
--- a/lib/Alchemy/Phrasea/Model/Repositories/FtpExportRepository.php
+++ b/lib/Alchemy/Phrasea/Model/Repositories/FtpExportRepository.php
@@ -50,7 +50,7 @@ class FtpExportRepository extends EntityRepository
     public function findDoableExports()
     {
         $dql = 'SELECT f
-            FROM Alchemy\Phrasea\Model\Entities\FtpExport f
+            FROM Phraseanet:FtpExport f
                 INNER JOIN f.elements e
             WHERE e.done = false';
 
diff --git a/lib/Alchemy/Phrasea/Model/Repositories/LazaretFileRepository.php b/lib/Alchemy/Phrasea/Model/Repositories/LazaretFileRepository.php
index a8c6fcc7e0..9985050cd7 100644
--- a/lib/Alchemy/Phrasea/Model/Repositories/LazaretFileRepository.php
+++ b/lib/Alchemy/Phrasea/Model/Repositories/LazaretFileRepository.php
@@ -30,7 +30,7 @@ class LazaretFileRepository extends EntityRepository
 
         $dql = '
             SELECT f
-            FROM Alchemy\Phrasea\Model\Entities\LazaretFile f'
+            FROM Phraseanet:LazaretFile f'
             . ('' === $base_ids ? '' : ' WHERE f.base_id IN  (' . $base_ids . ')')
             . ' ORDER BY f.id DESC';
 
diff --git a/lib/Alchemy/Phrasea/Model/Repositories/SessionRepository.php b/lib/Alchemy/Phrasea/Model/Repositories/SessionRepository.php
index 7b43fc2eac..f2f1befa29 100644
--- a/lib/Alchemy/Phrasea/Model/Repositories/SessionRepository.php
+++ b/lib/Alchemy/Phrasea/Model/Repositories/SessionRepository.php
@@ -24,7 +24,7 @@ class SessionRepository extends EntityRepository
     public function findByUser(\User_Adapter $user)
     {
         $dql = 'SELECT s
-            FROM Alchemy\Phrasea\Model\Entities\Session s
+            FROM Phraseanet:Session s
             WHERE s.usr_id = :usr_id';
 
         $query = $this->_em->createQuery($dql);
diff --git a/lib/Alchemy/Phrasea/Model/Repositories/StoryWZRepository.php b/lib/Alchemy/Phrasea/Model/Repositories/StoryWZRepository.php
index 95da485c26..8e28107e28 100644
--- a/lib/Alchemy/Phrasea/Model/Repositories/StoryWZRepository.php
+++ b/lib/Alchemy/Phrasea/Model/Repositories/StoryWZRepository.php
@@ -27,7 +27,7 @@ class StoryWZRepository extends EntityRepository
 
     public function findByUser(Application $app, \User_Adapter $user, $sort)
     {
-        $dql = 'SELECT s FROM Alchemy\Phrasea\Model\Entities\StoryWZ s WHERE s.usr_id = :usr_id ';
+        $dql = 'SELECT s FROM Phraseanet:StoryWZ s WHERE s.usr_id = :usr_id ';
 
         if ($sort == 'date') {
             $dql .= ' ORDER BY s.created DESC';
@@ -118,7 +118,7 @@ class StoryWZRepository extends EntityRepository
 
     public function findByRecord(Application $app, \record_adapter $Story)
     {
-        $dql = 'SELECT s FROM Alchemy\Phrasea\Model\Entities\StoryWZ s WHERE s.sbas_id = :sbas_id
+        $dql = 'SELECT s FROM Phraseanet:StoryWZ s WHERE s.sbas_id = :sbas_id
                 AND s.record_id = :record_id';
 
         $query = $this->_em->createQuery($dql);
@@ -144,7 +144,7 @@ class StoryWZRepository extends EntityRepository
 
     public function findByDatabox(Application $app, \databox $databox)
     {
-        $dql = 'SELECT s FROM Alchemy\Phrasea\Model\Entities\StoryWZ s WHERE s.sbas_id = :sbas_id';
+        $dql = 'SELECT s FROM Phraseanet:StoryWZ s WHERE s.sbas_id = :sbas_id';
 
         $query = $this->_em->createQuery($dql);
         $query->setParameters([
diff --git a/lib/Alchemy/Phrasea/Model/Repositories/UsrAuthProviderRepository.php b/lib/Alchemy/Phrasea/Model/Repositories/UsrAuthProviderRepository.php
index f19c7f5c1f..dbee020012 100644
--- a/lib/Alchemy/Phrasea/Model/Repositories/UsrAuthProviderRepository.php
+++ b/lib/Alchemy/Phrasea/Model/Repositories/UsrAuthProviderRepository.php
@@ -24,7 +24,7 @@ class UsrAuthProviderRepository extends EntityRepository
     public function findByUser(\User_Adapter $user)
     {
         $dql = 'SELECT u
-                FROM Alchemy\Phrasea\Model\Entities\UsrAuthProvider u
+                FROM Phraseanet:UsrAuthProvider u
                 WHERE u.usr_id = :usrId';
 
         $params = ['usrId' => $user->get_id()];
@@ -38,7 +38,7 @@ class UsrAuthProviderRepository extends EntityRepository
     public function findWithProviderAndId($providerId, $distantId)
     {
         $dql = 'SELECT u
-                FROM Alchemy\Phrasea\Model\Entities\UsrAuthProvider u
+                FROM Phraseanet:UsrAuthProvider u
                 WHERE u.provider = :providerId AND u.distant_id = :distantId';
 
         $params = ['providerId' => $providerId, 'distantId' => $distantId];
diff --git a/lib/Alchemy/Phrasea/Model/Repositories/UsrListEntryRepository.php b/lib/Alchemy/Phrasea/Model/Repositories/UsrListEntryRepository.php
index 71f6dbb0ee..753caf7ddd 100644
--- a/lib/Alchemy/Phrasea/Model/Repositories/UsrListEntryRepository.php
+++ b/lib/Alchemy/Phrasea/Model/Repositories/UsrListEntryRepository.php
@@ -34,7 +34,7 @@ class UsrListEntryRepository extends EntityRepository
      */
     public function findUserList(\User_Adapter $user)
     {
-        $dql = 'SELECT e FROM Alchemy\Phrasea\Model\Entities\UsrListEntry e
+        $dql = 'SELECT e FROM Phraseanet:UsrListEntry e
             WHERE e.usr_id = :usr_id';
 
         $params = [
@@ -65,7 +65,7 @@ class UsrListEntryRepository extends EntityRepository
 
     public function findEntryByListAndUsrId(UsrList $list, $usr_id)
     {
-        $dql = 'SELECT e FROM Alchemy\Phrasea\Model\Entities\UsrListEntry e
+        $dql = 'SELECT e FROM Phraseanet:UsrListEntry e
               JOIN e.list l
             WHERE e.usr_id = :usr_id AND l.id = :list_id';
 
diff --git a/lib/Alchemy/Phrasea/Model/Repositories/UsrListOwnerRepository.php b/lib/Alchemy/Phrasea/Model/Repositories/UsrListOwnerRepository.php
index e6f3ab63c4..fe77e47300 100644
--- a/lib/Alchemy/Phrasea/Model/Repositories/UsrListOwnerRepository.php
+++ b/lib/Alchemy/Phrasea/Model/Repositories/UsrListOwnerRepository.php
@@ -58,7 +58,7 @@ class UsrListOwnerRepository extends EntityRepository
      */
     public function findByListAndUsrId(UsrList $list, $usr_id)
     {
-        $dql = 'SELECT o FROM Alchemy\Phrasea\Model\Entities\UsrListOwner o
+        $dql = 'SELECT o FROM Phraseanet:UsrListOwner o
               JOIN o.list l
             WHERE l.id = :list_id AND o.usr_id = :usr_id';
 
diff --git a/lib/Alchemy/Phrasea/Model/Repositories/UsrListRepository.php b/lib/Alchemy/Phrasea/Model/Repositories/UsrListRepository.php
index 58d1a400ec..7cc4ef028a 100644
--- a/lib/Alchemy/Phrasea/Model/Repositories/UsrListRepository.php
+++ b/lib/Alchemy/Phrasea/Model/Repositories/UsrListRepository.php
@@ -34,7 +34,7 @@ class UsrListRepository extends EntityRepository
      */
     public function findUserLists(\User_Adapter $user)
     {
-        $dql = 'SELECT l FROM Alchemy\Phrasea\Model\Entities\UsrList l
+        $dql = 'SELECT l FROM Phraseanet:UsrList l
               JOIN l.owners o
             WHERE o.usr_id = :usr_id';
 
@@ -79,7 +79,7 @@ class UsrListRepository extends EntityRepository
      */
     public function findUserListLike(\User_Adapter $user, $name)
     {
-        $dql = 'SELECT l FROM Alchemy\Phrasea\Model\Entities\UsrList l
+        $dql = 'SELECT l FROM Phraseanet:UsrList l
               JOIN l.owners o
             WHERE o.usr_id = :usr_id AND l.name LIKE :name';
 
diff --git a/lib/Alchemy/Phrasea/Model/Repositories/ValidationParticipantRepository.php b/lib/Alchemy/Phrasea/Model/Repositories/ValidationParticipantRepository.php
index c7b2521d21..85365639b2 100644
--- a/lib/Alchemy/Phrasea/Model/Repositories/ValidationParticipantRepository.php
+++ b/lib/Alchemy/Phrasea/Model/Repositories/ValidationParticipantRepository.php
@@ -27,7 +27,7 @@ class ValidationParticipantRepository extends EntityRepository
     {
         $dql = '
             SELECT p, s
-            FROM Alchemy\Phrasea\Model\Entities\ValidationParticipant p
+            FROM Phraseanet:ValidationParticipant p
             JOIN p.session s
             JOIN s.basket b
             WHERE p.is_confirmed = 0
diff --git a/lib/Alchemy/Phrasea/TaskManager/Job/FtpJob.php b/lib/Alchemy/Phrasea/TaskManager/Job/FtpJob.php
index adccddb928..8735605029 100644
--- a/lib/Alchemy/Phrasea/TaskManager/Job/FtpJob.php
+++ b/lib/Alchemy/Phrasea/TaskManager/Job/FtpJob.php
@@ -74,7 +74,7 @@ class FtpJob extends AbstractJob
     private function removeDeadExports(Application $app)
     {
         foreach ($app['EM']
-                ->getRepository('Alchemy\Phrasea\Model\Entities\FtpExport')
+                ->getRepository('Phraseanet:FtpExport')
                 ->findCrashedExports(new \DateTime('-1 month')) as $export) {
             $app['EM']->remove($export);
         }
@@ -84,7 +84,7 @@ class FtpJob extends AbstractJob
     private function retrieveExports(Application $app)
     {
         return $app['EM']
-                ->getRepository('Alchemy\Phrasea\Model\Entities\FtpExport')
+                ->getRepository('Phraseanet:FtpExport')
                 ->findDoableExports();
     }
 
diff --git a/lib/classes/ACL.php b/lib/classes/ACL.php
index 3c6cb934b2..9b792c7a4b 100644
--- a/lib/classes/ACL.php
+++ b/lib/classes/ACL.php
@@ -252,7 +252,7 @@ class ACL implements cache_cacheableInterface
             $granted = true;
         }
 
-        if (false === $granted && $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedItem')->isRecordInPublicFeed($this->app, $record->get_sbas_id(), $record->get_record_id())) {
+        if (false === $granted && $this->app['EM']->getRepository('Phraseanet:FeedItem')->isRecordInPublicFeed($this->app, $record->get_sbas_id(), $record->get_record_id())) {
             $granted = true;
         }
 
diff --git a/lib/classes/API/V1/adapter.php b/lib/classes/API/V1/adapter.php
index 6ff5b14764..d94ec654c4 100644
--- a/lib/classes/API/V1/adapter.php
+++ b/lib/classes/API/V1/adapter.php
@@ -24,6 +24,7 @@ use Alchemy\Phrasea\Model\Entities\FeedItem;
 use Alchemy\Phrasea\Model\Entities\LazaretFile;
 use Alchemy\Phrasea\Model\Entities\Task;
 use Alchemy\Phrasea\Model\Entities\UserQuery;
+use Alchemy\Phrasea\Model\Entities\ValidationData;
 use Alchemy\Phrasea\Model\Entities\ValidationParticipant;
 use Silex\Application;
 use Symfony\Component\HttpFoundation\Request;
@@ -724,7 +725,7 @@ class API_V1_adapter extends API_V1_Abstract
         $lazaretFiles = [];
 
         if (count($baseIds) > 0) {
-            $lazaretRepository = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\LazaretFile');
+            $lazaretRepository = $app['EM']->getRepository('Phraseanet:LazaretFile');
 
             $lazaretFiles = $lazaretRepository->findPerPage(
                     $baseIds, $offset_start, $per_page
@@ -750,7 +751,7 @@ class API_V1_adapter extends API_V1_Abstract
 
     public function list_quarantine_item($lazaret_id, Application $app, Request $request)
     {
-        $lazaretFile = $app['EM']->find('Alchemy\Phrasea\Model\Entities\LazaretFile', $lazaret_id);
+        $lazaretFile = $app['EM']->find('Phraseanet:LazaretFile', $lazaret_id);
 
         /* @var $lazaretFile LazaretFile */
         if (null === $lazaretFile) {
@@ -1240,7 +1241,7 @@ class API_V1_adapter extends API_V1_Abstract
      */
     protected function list_baskets($usr_id)
     {
-        $repo = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
+        $repo = $this->app['EM']->getRepository('Phraseanet:Basket');
         /* @var $repo Alchemy\Phrasea\Model\Repositories\BasketRepository */
 
         $baskets = $repo->findActiveByUser($this->app['authentication']->getUser());
@@ -1357,7 +1358,7 @@ class API_V1_adapter extends API_V1_Abstract
             foreach ($basket_element->getValidationDatas() as $validation_datas) {
                 $participant = $validation_datas->getParticipant();
                 $user = $participant->getUser($this->app);
-                /* @var $validation_datas Alchemy\Phrasea\Model\Entities\ValidationData */
+                /* @var $validation_datas ValidationData */
                 $choices[] = [
                     'validation_user' => [
                         'usr_id'         => $user->get_id(),
@@ -1440,7 +1441,7 @@ class API_V1_adapter extends API_V1_Abstract
     {
         $result = new API_V1_result($this->app, $request, $this);
 
-        $coll = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser($this->app['acl']->get($user));
+        $coll = $this->app['EM']->getRepository('Phraseanet:Feed')->getAllForUser($this->app['acl']->get($user));
 
         $datas = [];
         foreach ($coll as $feed) {
@@ -1473,7 +1474,7 @@ class API_V1_adapter extends API_V1_Abstract
     {
         $result = new API_V1_result($this->app, $request, $this);
 
-        $feed = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->find($publication_id);
+        $feed = $this->app['EM']->getRepository('Phraseanet:Feed')->find($publication_id);
         if (!$feed->isAccessible($user, $this->app)) {
             return $result->set_datas([]);
         }
@@ -1521,7 +1522,7 @@ class API_V1_adapter extends API_V1_Abstract
     {
         $result = new API_V1_result($this->app, $request, $this);
 
-        $entry = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->find($entry_id);
+        $entry = $this->app['EM']->getRepository('Phraseanet:FeedEntry')->find($entry_id);
 
         $collection = $entry->getFeed()->getCollection($this->app);
 
diff --git a/lib/classes/Session/Logger.php b/lib/classes/Session/Logger.php
index b41183dd60..315826ff36 100644
--- a/lib/classes/Session/Logger.php
+++ b/lib/classes/Session/Logger.php
@@ -188,7 +188,7 @@ class Session_Logger
             return;
         }
 
-        $session = $app['EM']->find('Alchemy\Phrasea\Model\Entities\Session', $app['session']->get('session_id'));
+        $session = $app['EM']->find('Phraseanet:Session', $app['session']->get('session_id'));
 
         if (!$session) {
             throw new SessionNotFound('No session found');
diff --git a/lib/classes/User/Adapter.php b/lib/classes/User/Adapter.php
index 2bfe1a7be4..4e53b6184d 100644
--- a/lib/classes/User/Adapter.php
+++ b/lib/classes/User/Adapter.php
@@ -676,7 +676,7 @@ class User_Adapter implements User_Interface, cache_cacheableInterface
     public function getFtpCredential()
     {
         if (null === $this->ftpCredential) {
-            $this->ftpCredential = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FtpCredential')->findOneBy([
+            $this->ftpCredential = $this->app['EM']->getRepository('Phraseanet:FtpCredential')->findOneBy([
                 'usrId' => $this->get_id()
             ]);
 
@@ -731,22 +731,22 @@ class User_Adapter implements User_Interface, cache_cacheableInterface
      */
     public function delete()
     {
-        $repo = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrAuthProvider');
+        $repo = $this->app['EM']->getRepository('Phraseanet:UsrAuthProvider');
         foreach ($repo->findByUser($this) as $provider) {
             $this->app['EM']->remove($provider);
         }
 
-        $repo = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FtpExport');
+        $repo = $this->app['EM']->getRepository('Phraseanet:FtpExport');
         foreach ($repo->findByUser($this) as $export) {
             $this->app['EM']->remove($export);
         }
 
-        $repo = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Order');
+        $repo = $this->app['EM']->getRepository('Phraseanet:Order');
         foreach ($repo->findByUser($this) as $order) {
             $this->app['EM']->remove($order);
         }
 
-        $repo = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Session');
+        $repo = $this->app['EM']->getRepository('Phraseanet:Session');
 
         foreach ($repo->findByUser($this) as $session) {
             $this->app['EM']->remove($session);
diff --git a/lib/classes/databox.php b/lib/classes/databox.php
index 4fc34588c5..33a4c0ebab 100644
--- a/lib/classes/databox.php
+++ b/lib/classes/databox.php
@@ -454,11 +454,11 @@ class databox extends base
             $n+=50;
         }
 
-        foreach ($this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\StoryWZ')->findByDatabox($this->app, $this) as $story) {
+        foreach ($this->app['EM']->getRepository('Phraseanet:StoryWZ')->findByDatabox($this->app, $this) as $story) {
             $this->app['EM']->remove($story);
         }
 
-        foreach ($this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement')->findElementsByDatabox($this) as $element) {
+        foreach ($this->app['EM']->getRepository('Phraseanet:BasketElement')->findElementsByDatabox($this) as $element) {
             $this->app['EM']->remove($element);
         }
 
diff --git a/lib/classes/eventsmanager/notify/feed.php b/lib/classes/eventsmanager/notify/feed.php
index 9ab9283fa1..1a1a9400e2 100644
--- a/lib/classes/eventsmanager/notify/feed.php
+++ b/lib/classes/eventsmanager/notify/feed.php
@@ -133,7 +133,7 @@ class eventsmanager_notify_feed extends eventsmanager_notifyAbstract
     {
         $sx = simplexml_load_string($datas);
 
-        $entry = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->find((int) $sx->entry_id);
+        $entry = $this->app['EM']->getRepository('Phraseanet:FeedEntry')->find((int) $sx->entry_id);
 
         if (null === $entry) {
             return [];
diff --git a/lib/classes/eventsmanager/notify/order.php b/lib/classes/eventsmanager/notify/order.php
index 3c1d1ecf2b..75ca544b0d 100644
--- a/lib/classes/eventsmanager/notify/order.php
+++ b/lib/classes/eventsmanager/notify/order.php
@@ -49,7 +49,7 @@ class eventsmanager_notify_order extends eventsmanager_notifyAbstract
         $users = [];
 
         try {
-            $repository = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\OrderElement');
+            $repository = $this->app['EM']->getRepository('Phraseanet:OrderElement');
 
             $results = $repository->findBy(['orderId' => $order_id]);
 
diff --git a/lib/classes/eventsmanager/notify/orderdeliver.php b/lib/classes/eventsmanager/notify/orderdeliver.php
index 150b64c933..2fca925580 100644
--- a/lib/classes/eventsmanager/notify/orderdeliver.php
+++ b/lib/classes/eventsmanager/notify/orderdeliver.php
@@ -98,7 +98,7 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
                 $receiver = Receiver::fromUser($user_to);
                 $emitter = Emitter::fromUser($user_from);
 
-                $repository = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
+                $repository = $this->app['EM']->getRepository('Phraseanet:Basket');
                 $basket = $repository->find($params['ssel_id']);
 
                 $readyToSend = true;
diff --git a/lib/classes/eventsmanager/notify/push.php b/lib/classes/eventsmanager/notify/push.php
index 9488b24eab..46d35cd893 100644
--- a/lib/classes/eventsmanager/notify/push.php
+++ b/lib/classes/eventsmanager/notify/push.php
@@ -80,7 +80,7 @@ class eventsmanager_notify_push extends eventsmanager_notifyAbstract
 
             $readyToSend = false;
             try {
-                $repository = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
+                $repository = $this->app['EM']->getRepository('Phraseanet:Basket');
                 $basket = $repository->find($params['ssel_id']);
 
                 $user_from = User_Adapter::getInstance($params['from'], $this->app);
diff --git a/lib/classes/eventsmanager/notify/validate.php b/lib/classes/eventsmanager/notify/validate.php
index a016bab6b4..260d72ee05 100644
--- a/lib/classes/eventsmanager/notify/validate.php
+++ b/lib/classes/eventsmanager/notify/validate.php
@@ -97,7 +97,7 @@ class eventsmanager_notify_validate extends eventsmanager_notifyAbstract
                 $user_to = User_Adapter::getInstance($params['to'], $this->app);
 
                 $basket = $this->app['EM']
-                    ->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
+                    ->getRepository('Phraseanet:Basket')
                     ->find($params['ssel_id']);
                 $title = $basket->getName();
 
diff --git a/lib/classes/eventsmanager/notify/validationdone.php b/lib/classes/eventsmanager/notify/validationdone.php
index 0408706f93..ffd22decd7 100644
--- a/lib/classes/eventsmanager/notify/validationdone.php
+++ b/lib/classes/eventsmanager/notify/validationdone.php
@@ -92,7 +92,7 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract
                 $user_to = User_Adapter::getInstance($params['to'], $this->app);
 
                 $basket = $this->app['EM']
-                    ->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
+                    ->getRepository('Phraseanet:Basket')
                     ->find($params['ssel_id']);
                 $title = $basket->getName();
 
diff --git a/lib/classes/eventsmanager/notify/validationreminder.php b/lib/classes/eventsmanager/notify/validationreminder.php
index f3ad4eefbf..9ea3a806ce 100644
--- a/lib/classes/eventsmanager/notify/validationreminder.php
+++ b/lib/classes/eventsmanager/notify/validationreminder.php
@@ -98,7 +98,7 @@ class eventsmanager_notify_validationreminder extends eventsmanager_notifyAbstra
             $readyToSend = false;
             try {
                 $basket = $this->app['EM']
-                    ->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
+                    ->getRepository('Phraseanet:Basket')
                     ->find($params['ssel_id']);
                 $title = $basket->getName();
 
diff --git a/lib/classes/patch/361alpha1a.php b/lib/classes/patch/361alpha1a.php
index 71466b7d92..694c0099ba 100644
--- a/lib/classes/patch/361alpha1a.php
+++ b/lib/classes/patch/361alpha1a.php
@@ -88,7 +88,7 @@ class patch_361alpha1a implements patchInterface
             }
         }
 
-        $dql = "SELECT b FROM Alchemy\Phrasea\Model\Entities\Basket b WHERE b.description != ''";
+        $dql = "SELECT b FROM Phraseanet:Basket b WHERE b.description != ''";
 
         $n = 0;
         $perPage = 100;
diff --git a/lib/classes/patch/383alpha1a.php b/lib/classes/patch/383alpha1a.php
index 0155acdc85..269f8c1279 100644
--- a/lib/classes/patch/383alpha1a.php
+++ b/lib/classes/patch/383alpha1a.php
@@ -69,13 +69,13 @@ class patch_383alpha1a implements patchInterface
         $stmt->closeCursor();
 
         foreach ($rows as $row) {
-            if (null !== $session = $app['EM']->find('Alchemy\Phrasea\Model\Entities\Session', $row['id'])) {
+            if (null !== $session = $app['EM']->find('Phraseanet:Session', $row['id'])) {
                 $app['EM']->remove($session);
             }
         }
 
         // Remove API sessions
-        $query = $app['EM']->createQuery('SELECT s FROM Alchemy\Phrasea\Model\Entities\Session s WHERE s.user_agent LIKE :guzzle');
+        $query = $app['EM']->createQuery('SELECT s FROM Phraseanet:Session s WHERE s.user_agent LIKE :guzzle');
         $query->setParameter(':guzzle', 'Guzzle%');
 
         foreach ($query->getResult() as $session) {
diff --git a/lib/classes/patch/383alpha2a.php b/lib/classes/patch/383alpha2a.php
index eed27378ec..af2fc321a2 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']->find('Alchemy\Phrasea\Model\Entities\ValidationSession', $row['validation_session_id'])) {
+            if (null !== $vsession = $app['EM']->find('Phraseanet:ValidationSession', $row['validation_session_id'])) {
                 $app['EM']->remove($vsession);
             }
         }
diff --git a/lib/classes/patch/390alpha1b.php b/lib/classes/patch/390alpha1b.php
index 565d2671c3..8cfeac42ee 100644
--- a/lib/classes/patch/390alpha1b.php
+++ b/lib/classes/patch/390alpha1b.php
@@ -79,7 +79,7 @@ class patch_390alpha1b implements patchInterface
         $n = 0;
         $em = $app['EM'];
         $em->getEventManager()->removeEventSubscriber(new TimestampableListener());
-        $basketRepository = $em->getRepository('Alchemy\Phrasea\Model\Entities\Basket');
+        $basketRepository = $em->getRepository('Phraseanet:Basket');
 
         foreach ($rs as $row) {
             $sql = 'SELECT count(id) as todo
diff --git a/lib/classes/patch/390alpha2a.php b/lib/classes/patch/390alpha2a.php
index 0a683c27f9..0360b9da4e 100644
--- a/lib/classes/patch/390alpha2a.php
+++ b/lib/classes/patch/390alpha2a.php
@@ -185,7 +185,7 @@ class patch_390alpha2a implements patchInterface
 
         $n = 0;
 
-        $repository = $em->getRepository('Alchemy\Phrasea\Model\Entities\User');
+        $repository = $em->getRepository('Phraseanet:User');
 
         foreach ($rows as $row) {
             $template = $repository->findOneByLogin($row['usr_login']);
diff --git a/lib/classes/patch/390alpha9a.php b/lib/classes/patch/390alpha9a.php
index d8e6db55d9..83ff830465 100644
--- a/lib/classes/patch/390alpha9a.php
+++ b/lib/classes/patch/390alpha9a.php
@@ -101,7 +101,7 @@ class patch_390alpha9a implements patchInterface
 
     private function updateDoctrineUsers(Application $app)
     {
-        $dql = 'SELECT u FROM Alchemy\Phrasea\Model\Entities\User u WHERE u.locale IS NOT NULL';
+        $dql = 'SELECT u FROM Phraseanet:User u WHERE u.locale IS NOT NULL';
         $users = $app['EM']->createQuery($dql)->getResult();
 
         foreach ($users as $user) {
diff --git a/lib/classes/queries.php b/lib/classes/queries.php
index 3007a6fd92..626c6dfcf6 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(['usrId' => $usrId], ['created' => 'ASC'], 25, 0);
 
         foreach ($queries as $query) {
diff --git a/lib/classes/record/adapter.php b/lib/classes/record/adapter.php
index 1f4d5bc86c..c756ee847a 100644
--- a/lib/classes/record/adapter.php
+++ b/lib/classes/record/adapter.php
@@ -1491,7 +1491,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface
         $stmt->execute([':record_id' => $this->get_record_id()]);
         $stmt->closeCursor();
 
-        $orderElementRepository = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\OrderElement');
+        $orderElementRepository = $this->app['EM']->getRepository('Phraseanet:OrderElement');
 
         /* @var $repository Alchemy\Phrasea\Model\Repositories\OrderElementRepository */
         foreach ($orderElementRepository->findBy(['recordId' => $this->get_record_id()]) as $order_element) {
@@ -1500,7 +1500,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface
             }
         }
 
-        $basketElementRepository = $this->app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\BasketElement');
+        $basketElementRepository = $this->app['EM']->getRepository('Phraseanet:BasketElement');
 
         /* @var $repository Alchemy\Phrasea\Model\Repositories\BasketElementRepository */
         foreach ($basketElementRepository->findElementsByRecord($this) as $basket_element) {
@@ -1613,7 +1613,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface
     public function get_container_baskets(EntityManager $em, User_Adapter $user)
     {
         return $em
-                ->getRepository('Alchemy\Phrasea\Model\Entities\Basket')
+                ->getRepository('Phraseanet:Basket')
                 ->findContainingRecordForUser($this, $user);
     }
 
diff --git a/lib/classes/record/preview.php b/lib/classes/record/preview.php
index 2b7d6d2edd..da6a65bd1d 100644
--- a/lib/classes/record/preview.php
+++ b/lib/classes/record/preview.php
@@ -170,7 +170,7 @@ class record_preview extends record_adapter
                 }
                 break;
             case "FEED":
-                $entry = $app['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->find($contId);
+                $entry = $app['EM']->getRepository('Phraseanet:FeedEntry')->find($contId);
 
                 $this->container = $entry;
                 $this->total = count($entry->getItems());
diff --git a/tests/Alchemy/Tests/Phrasea/ACL/BasketACLTest.php b/tests/Alchemy/Tests/Phrasea/ACL/BasketACLTest.php
index e3d8d4ac74..5dfb163f85 100644
--- a/tests/Alchemy/Tests/Phrasea/ACL/BasketACLTest.php
+++ b/tests/Alchemy/Tests/Phrasea/ACL/BasketACLTest.php
@@ -8,43 +8,43 @@ class BasketACLTest extends \PhraseanetTestCase
 {
     public function testOwnerIsOwner()
     {
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 4);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 4);
         $this->assertTrue((new BasketACL())->isOwner($basket, self::$DI['user']));
     }
 
     public function testParticipantIsNotAnOwner()
     {
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 4);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 4);
         $this->assertFalse((new BasketACL())->isOwner($basket, self::$DI['user_alt1']));
     }
 
     public function testUserIsNotTheOwner()
     {
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 1);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 1);
         $this->assertFalse((new BasketACL())->isOwner($basket, self::$DI['user_alt1']));
     }
 
     public function testOwnerHasAccessInValidationEnv()
     {
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 4);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 4);
         $this->assertTrue((new BasketACL())->hasAccess($basket, self::$DI['user']));
     }
 
     public function testOwnerHasAccess()
     {
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 1);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 1);
         $this->assertTrue((new BasketACL())->hasAccess($basket, self::$DI['user']));
     }
 
     public function testParticipantHasAccess()
     {
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 4);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 4);
         $this->assertTrue((new BasketACL())->hasAccess($basket, self::$DI['user_alt1']));
     }
 
     public function testUserHasNotAccess()
     {
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 1);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 1);
         $this->assertFalse((new BasketACL())->hasAccess($basket, self::$DI['user_alt1']));
     }
 }
diff --git a/tests/Alchemy/Tests/Phrasea/Application/ApiTestCase.php b/tests/Alchemy/Tests/Phrasea/Application/ApiTestCase.php
index ba38ba649c..1a82d90599 100644
--- a/tests/Alchemy/Tests/Phrasea/Application/ApiTestCase.php
+++ b/tests/Alchemy/Tests/Phrasea/Application/ApiTestCase.php
@@ -100,10 +100,10 @@ abstract class ApiTestCase extends \PhraseanetWebTestCase
 
     public function testThatSessionIsClosedAfterRequest()
     {
-        $this->assertCount(0, self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Session')->findAll());
+        $this->assertCount(0, self::$DI['app']['EM']->getRepository('Phraseanet:Session')->findAll());
         $this->setToken(self::$token);
         self::$DI['client']->request('GET', '/api/v1/databoxes/list/', $this->getParameters(), [], ['HTTP_Accept' => $this->getAcceptMimeType()]);
-        $this->assertCount(0, self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Session')->findAll());
+        $this->assertCount(0, self::$DI['app']['EM']->getRepository('Phraseanet:Session')->findAll());
     }
 
     public function provideEventNames()
@@ -1331,7 +1331,7 @@ abstract class ApiTestCase extends \PhraseanetWebTestCase
     {
         $this->setToken(self::$adminToken);
 
-        $basketElement = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\BasketElement', 1);
+        $basketElement = self::$DI['app']['EM']->find('Phraseanet:BasketElement', 1);
         $basket = $basketElement->getBasket();
 
         $route = '/api/v1/baskets/' . $basket->getId() . '/content/';
@@ -1371,7 +1371,7 @@ abstract class ApiTestCase extends \PhraseanetWebTestCase
     {
         $this->setToken(self::$adminToken);
 
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 1);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 1);
 
         $route = '/api/v1/baskets/' . $basket->getId() . '/setname/';
 
@@ -1424,7 +1424,7 @@ abstract class ApiTestCase extends \PhraseanetWebTestCase
     {
         $this->setToken(self::$adminToken);
 
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 1);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 1);
 
         $route = '/api/v1/baskets/' . $basket->getId() . '/setdescription/';
 
@@ -1643,7 +1643,7 @@ abstract class ApiTestCase extends \PhraseanetWebTestCase
      */
     public function testFeedList()
     {
-        $created_feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $created_feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
 
         $this->setToken(self::$token);
         $route = '/api/v1/feeds/list/';
@@ -1693,7 +1693,7 @@ abstract class ApiTestCase extends \PhraseanetWebTestCase
         $author = "W. Shakespeare";
         $author_email = "gontran.bonheur@gmail.com";
 
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
         $created_entry = $feed->getEntries()->first();
 
         $created_entry->setAuthorEmail($author_email);
@@ -1749,7 +1749,7 @@ abstract class ApiTestCase extends \PhraseanetWebTestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
         $created_entry = $feed->getEntries()->first();
 
         $this->setToken(self::$token);
@@ -1780,7 +1780,7 @@ abstract class ApiTestCase extends \PhraseanetWebTestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $created_feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $created_feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
         $created_entry = $created_feed->getEntries()->first();
 
         $created_feed->setCollection(self::$DI['collection_no_access']);
@@ -1813,7 +1813,7 @@ abstract class ApiTestCase extends \PhraseanetWebTestCase
         $entry_title = 'Superman';
         $entry_subtitle = 'Wonder Woman';
 
-        $created_feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $created_feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
         $created_entry = $created_feed->getEntries()->first();
         $created_entry->setTitle($entry_title);
         $created_entry->setSubtitle($entry_subtitle);
diff --git a/tests/Alchemy/Tests/Phrasea/Application/LightboxTest.php b/tests/Alchemy/Tests/Phrasea/Application/LightboxTest.php
index f3134afb20..5ff6350751 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']->get_id(), null, $Basket->getId());
 
         self::$DI['client']->request('GET', '/lightbox/?LOG='.$token);
@@ -59,7 +59,7 @@ class LightboxTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testAjaxNoteForm()
     {
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 4);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 4);
         $basket_element = $basket->getELements()->first();
 
         $this->set_user_agent(self::USER_AGENT_FIREFOX8MAC, self::$DI['app']);
@@ -83,7 +83,7 @@ class LightboxTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testAjaxElement()
     {
-        $basket_element = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\BasketElement', 1);
+        $basket_element = self::$DI['app']['EM']->find('Phraseanet:BasketElement', 1);
 
         $this->set_user_agent(self::USER_AGENT_FIREFOX8MAC, self::$DI['app']);
 
@@ -128,7 +128,7 @@ class LightboxTest extends \PhraseanetAuthenticatedWebTestCase
     {
         $this->set_user_agent(self::USER_AGENT_FIREFOX8MAC, self::$DI['app']);
 
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
         $entry = $feed->getEntries()->first();
         $item = $entry->getItems()->first();
 
@@ -173,7 +173,7 @@ class LightboxTest extends \PhraseanetAuthenticatedWebTestCase
     {
         $this->authenticate(self::$DI['app']);
 
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 4);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 4);
 
         $this->set_user_agent(self::USER_AGENT_FIREFOX8MAC, self::$DI['app']);
 
@@ -198,7 +198,7 @@ class LightboxTest extends \PhraseanetAuthenticatedWebTestCase
     {
         $this->authenticate(self::$DI['app']);
 
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 1);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 1);
 
         $this->set_user_agent(self::USER_AGENT_FIREFOX8MAC, self::$DI['app']);
 
@@ -225,7 +225,7 @@ class LightboxTest extends \PhraseanetAuthenticatedWebTestCase
 
         $this->set_user_agent(self::USER_AGENT_FIREFOX8MAC, self::$DI['app']);
 
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
         $entry = $feed->getEntries()->first();
 
         $crawler = self::$DI['client']->request('GET', '/lightbox/feeds/entry/' . $entry->getId() . '/');
@@ -247,7 +247,7 @@ class LightboxTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testAjaxReport()
     {
-        $validationBasket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 4);
+        $validationBasket = self::$DI['app']['EM']->find('Phraseanet:Basket', 4);
 
         $this->set_user_agent(self::USER_AGENT_FIREFOX8MAC, self::$DI['app']);
         self::$DI['client']->request('GET', '/lightbox/ajax/LOAD_REPORT/' . $validationBasket->getId() . '/');
@@ -257,7 +257,7 @@ class LightboxTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testAjaxSetNote()
     {
-        $validationBasket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 4);
+        $validationBasket = self::$DI['app']['EM']->find('Phraseanet:Basket', 4);
         $validationBasketElement = $validationBasket->getElements()->first();
 
         self::$DI['client']->request('POST', '/lightbox/ajax/SET_NOTE/' . $validationBasketElement->getId() . '/');
@@ -280,7 +280,7 @@ class LightboxTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testAjaxSetAgreement()
     {
-        $validationBasket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 4);
+        $validationBasket = self::$DI['app']['EM']->find('Phraseanet:Basket', 4);
         $validationBasketElement = $validationBasket->getElements()->first();
 
         $crawler = self::$DI['client']->request(
@@ -306,7 +306,7 @@ class LightboxTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testAjaxSetReleaseWithRegularBasket()
     {
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 1);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 1);
 
         $crawler = self::$DI['client']->request('POST', '/lightbox/ajax/SET_RELEASE/' . $basket->getId() . '/');
         $this->assertEquals(200, self::$DI['client']->getResponse()->getStatusCode());
@@ -318,7 +318,7 @@ class LightboxTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testAjaxSetReleaseWithRegularBasketWithValidation()
     {
-        $validationBasket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 4);
+        $validationBasket = self::$DI['app']['EM']->find('Phraseanet:Basket', 4);
 
         $this->mockNotificationDeliverer('Alchemy\Phrasea\Notification\Mail\MailInfoValidationDone');
 
diff --git a/tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php b/tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php
index 2665325a41..d5feb50855 100644
--- a/tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php
@@ -209,7 +209,7 @@ class OverviewTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testPermalinkRouteNotAuthenticatedIsOkInPublicFeed()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 2);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 2);
         $entry = $feed->getEntries()->first();
         $item = $entry->getItems()->first();
 
diff --git a/tests/Alchemy/Tests/Phrasea/Authentication/AuthenticatorTest.php b/tests/Alchemy/Tests/Phrasea/Authentication/AuthenticatorTest.php
index 6e0bdf093d..3287f0af9d 100644
--- a/tests/Alchemy/Tests/Phrasea/Authentication/AuthenticatorTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Authentication/AuthenticatorTest.php
@@ -155,7 +155,7 @@ class AuthenticatorTest extends \PhraseanetTestCase
 
         $em->expects($this->once())
             ->method('getRepository')
-            ->with($this->equalTo('Alchemy\Phrasea\Model\Entities\Session'))
+            ->with($this->equalTo('Phraseanet:Session'))
             ->will($this->returnValue($repo));
 
         $authenticator = new Authenticator($app, $browser, $SFsession, $em);
@@ -197,7 +197,7 @@ class AuthenticatorTest extends \PhraseanetTestCase
 
         $em->expects($this->once())
             ->method('getRepository')
-            ->with($this->equalTo('Alchemy\Phrasea\Model\Entities\Session'))
+            ->with($this->equalTo('Phraseanet:Session'))
             ->will($this->returnValue($repo));
 
         $authenticator = new Authenticator($app, $browser, $SFsession, $em);
diff --git a/tests/Alchemy/Tests/Phrasea/Authentication/PersistentCookie/ManagerTest.php b/tests/Alchemy/Tests/Phrasea/Authentication/PersistentCookie/ManagerTest.php
index 63f64ffafc..3fdbd878e6 100644
--- a/tests/Alchemy/Tests/Phrasea/Authentication/PersistentCookie/ManagerTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Authentication/PersistentCookie/ManagerTest.php
@@ -41,7 +41,7 @@ class ManagerTest extends \PhraseanetTestCase
 
         $em->expects($this->once())
             ->method('getRepository')
-            ->with($this->equalTo('Alchemy\Phrasea\Model\Entities\Session'))
+            ->with($this->equalTo('Phraseanet:Session'))
             ->will($this->returnValue($repo));
 
         $encoder->expects($this->once())
@@ -86,7 +86,7 @@ class ManagerTest extends \PhraseanetTestCase
 
         $em->expects($this->once())
             ->method('getRepository')
-            ->with($this->equalTo('Alchemy\Phrasea\Model\Entities\Session'))
+            ->with($this->equalTo('Phraseanet:Session'))
             ->will($this->returnValue($repo));
 
         $encoder->expects($this->once())
@@ -119,7 +119,7 @@ class ManagerTest extends \PhraseanetTestCase
 
         $em->expects($this->once())
             ->method('getRepository')
-            ->with($this->equalTo('Alchemy\Phrasea\Model\Entities\Session'))
+            ->with($this->equalTo('Phraseanet:Session'))
             ->will($this->returnValue($repo));
 
         $this->assertFalse($manager->getSession($tokenValue));
diff --git a/tests/Alchemy/Tests/Phrasea/Authentication/Phrasea/FailureManagerTest.php b/tests/Alchemy/Tests/Phrasea/Authentication/Phrasea/FailureManagerTest.php
index 597fa37c20..d19d13152f 100644
--- a/tests/Alchemy/Tests/Phrasea/Authentication/Phrasea/FailureManagerTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Authentication/Phrasea/FailureManagerTest.php
@@ -250,17 +250,17 @@ class FailureManagerTest extends \PhraseanetTestCase
             ->method('getClientIp')
             ->will($this->returnValue($ip));
 
-        $this->assertCount(10, self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\AuthFailure')
+        $this->assertCount(10, self::$DI['app']['EM']->getRepository('Phraseanet:AuthFailure')
                 ->findOldFailures());
-        $this->assertCount(12, self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\AuthFailure')
+        $this->assertCount(12, self::$DI['app']['EM']->getRepository('Phraseanet:AuthFailure')
                 ->findAll());
 
         $manager = new FailureManager(self::$DI['app']['EM'], $recaptcha, 9);
         $manager->saveFailure($username, $request);
 
-        $this->assertCount(0, self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\AuthFailure')
+        $this->assertCount(0, self::$DI['app']['EM']->getRepository('Phraseanet:AuthFailure')
                 ->findOldFailures());
-        $this->assertCount(3, self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\AuthFailure')
+        $this->assertCount(3, self::$DI['app']['EM']->getRepository('Phraseanet:AuthFailure')
                 ->findAll());
 
         self::$DI['app']['EM']->getEventManager()->addEventSubscriber(new TimestampableListener());
@@ -285,7 +285,7 @@ class FailureManagerTest extends \PhraseanetTestCase
 
         $em->expects($this->once())
             ->method('getRepository')
-            ->with($this->equalTo('Alchemy\Phrasea\Model\Entities\AuthFailure'))
+            ->with($this->equalTo('Phraseanet:AuthFailure'))
             ->will($this->returnValue($repo));
 
         return $em;
diff --git a/tests/Alchemy/Tests/Phrasea/Border/Checker/Sha256Test.php b/tests/Alchemy/Tests/Phrasea/Border/Checker/Sha256Test.php
index 3406d1a122..217c751344 100644
--- a/tests/Alchemy/Tests/Phrasea/Border/Checker/Sha256Test.php
+++ b/tests/Alchemy/Tests/Phrasea/Border/Checker/Sha256Test.php
@@ -38,7 +38,7 @@ class Sha256Test extends \PhraseanetTestCase
      */
     public function testCheck()
     {
-        $session = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\LazaretSession', 1);
+        $session = self::$DI['app']['EM']->find('Phraseanet:LazaretSession', 1);
 
         self::$DI['app']['border-manager']->process($session, File::buildFromPathfile($this->media->getFile()->getPathname(), self::$DI['collection'], self::$DI['app']), null, Manager::FORCE_RECORD);
 
diff --git a/tests/Alchemy/Tests/Phrasea/Border/ManagerTest.php b/tests/Alchemy/Tests/Phrasea/Border/ManagerTest.php
index dda30d14a4..db10174687 100644
--- a/tests/Alchemy/Tests/Phrasea/Border/ManagerTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Border/ManagerTest.php
@@ -54,7 +54,7 @@ class ManagerTest extends \PhraseanetAuthenticatedWebTestCase
     {
         parent::setUp();
         $this->object = new Manager(self::$DI['app']);
-        $this->session = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\LazaretSession', 1);
+        $this->session = self::$DI['app']['EM']->find('Phraseanet:LazaretSession', 1);
     }
 
     /**
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Admin/AdminCollectionTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/AdminCollectionTest.php
index 13636f3cf2..b367b8d6ad 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Admin/AdminCollectionTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/AdminCollectionTest.php
@@ -558,7 +558,7 @@ class AdminCollectionTest extends \PhraseanetAuthenticatedWebTestCase
         $json = $this->getJson(self::$DI['client']->getResponse());
         $this->assertTrue($json->success);
 
-        if (count(self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Task')->findAll()) === 0) {
+        if (count(self::$DI['app']['EM']->getRepository('Phraseanet:Task')->findAll()) === 0) {
             $this->fail('Task for empty collection has not been created');
         }
     }
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Admin/DataboxTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/DataboxTest.php
index cb18624ffa..8a9f27b778 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Admin/DataboxTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/DataboxTest.php
@@ -680,7 +680,7 @@ class DataboxTest extends \PhraseanetAuthenticatedWebTestCase
         $json = $this->getJson(self::$DI['client']->getResponse());
         $this->assertTrue($json->success);
 
-        if (count(self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Task')->findAll()) === 0) {
+        if (count(self::$DI['app']['EM']->getRepository('Phraseanet:Task')->findAll()) === 0) {
             $this->fail('Task for empty collection has not been created');
         }
 
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php
index b89fea6a4c..cb8051d7ee 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php
@@ -19,7 +19,7 @@ class PublicationTest extends \PhraseanetAuthenticatedWebTestCase
         $crawler = self::$DI['client']->request('GET', '/admin/publications/list/');
         $pageContent = self::$DI['client']->getResponse()->getContent();
         $this->assertTrue(self::$DI['client']->getResponse()->isOk());
-        $feeds = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser(self::$DI['app']['acl']->get(self::$DI['user']));
+        $feeds = self::$DI['app']['EM']->getRepository('Phraseanet:Feed')->getAllForUser(self::$DI['app']['acl']->get(self::$DI['user']));
 
         foreach ($feeds as $feed) {
             $this->assertRegExp('/\/admin\/publications\/feed\/' . $feed->getId() . '/', $pageContent);
@@ -34,21 +34,21 @@ class PublicationTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testCreate()
     {
-        $feeds = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser(self::$DI['app']['acl']->get(self::$DI['user']));
+        $feeds = self::$DI['app']['EM']->getRepository('Phraseanet:Feed')->getAllForUser(self::$DI['app']['acl']->get(self::$DI['user']));
         $count = sizeof($feeds);
 
         $crawler = self::$DI['client']->request('POST', '/admin/publications/create/', ["title"    => "hello", "subtitle" => "coucou", "base_id"  => self::$DI['collection']->get_base_id()]);
 
         $this->assertTrue(self::$DI['client']->getResponse()->isRedirect('/admin/publications/list/'));
 
-        $feeds = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser(self::$DI['app']['acl']->get(self::$DI['user']));
+        $feeds = self::$DI['app']['EM']->getRepository('Phraseanet:Feed')->getAllForUser(self::$DI['app']['acl']->get(self::$DI['user']));
         $count_after = sizeof($feeds);
         $this->assertGreaterThan($count, $count_after);
     }
 
     public function testGetFeed()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
         $crawler = self::$DI['client']->request('GET', '/admin/publications/feed/' . $feed->getId() . '/');
         $this->assertTrue(self::$DI['client']->getResponse()->isOk());
         $this->assertEquals(1, $crawler->filterXPath("//form[@action='/admin/publications/feed/" . $feed->getId() . "/update/']")->count());
@@ -57,7 +57,7 @@ class PublicationTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testUpdatedFeedException()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
 
         self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->getId() . "/update/", [
             'title'    => 'test'
@@ -65,7 +65,7 @@ class PublicationTest extends \PhraseanetAuthenticatedWebTestCase
             , 'public'   => '1'
         ]);
 
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', $feed->getId());
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', $feed->getId());
 
         $this->assertTrue(
             strpos(
@@ -81,7 +81,7 @@ class PublicationTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testUpdatedFeedOwner()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
 
         self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->getId() . "/update/", [
             'title'    => 'test'
@@ -96,7 +96,7 @@ class PublicationTest extends \PhraseanetAuthenticatedWebTestCase
                 , '/admin/publications/list/'
             ) === 0);
 
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', $feed->getId());
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', $feed->getId());
 
         $collection = $feed->getCollection(self::$DI['app']);
 
@@ -114,7 +114,7 @@ class PublicationTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testIconUploadErrorOwner()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 3);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 3);
 
         self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->getId() . "/iconupload/", [], [], ['HTTP_ACCEPT' => 'application/json']);
 
@@ -125,7 +125,7 @@ class PublicationTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testIconUploadErrorFileData()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
 
         self::$DI['client']->request(
             "POST"
@@ -143,7 +143,7 @@ class PublicationTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testIconUploadErrorFileType()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
 
         self::$DI['client']->request(
             "POST"
@@ -161,7 +161,7 @@ class PublicationTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testIconUpload()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
 
         $files = [
             'files' => [
@@ -189,7 +189,7 @@ class PublicationTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testAddPublisher()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
 
         self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->getId() . "/addpublisher/", [
             'usr_id' => self::$DI['user_alt1']->get_id()
@@ -198,7 +198,7 @@ class PublicationTest extends \PhraseanetAuthenticatedWebTestCase
         $response = self::$DI['client']->getResponse();
         $this->assertTrue($response->isRedirect());
 
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', $feed->getId());
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', $feed->getId());
         $publishers = $feed->getPublishers();
 
         $this->assertTrue($feed->isPublisher(self::$DI['user_alt1']));
@@ -211,11 +211,11 @@ class PublicationTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testAddPublisherException()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
 
         self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->getId() . "/addpublisher/");
 
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', $feed->getId());
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', $feed->getId());
         $response = self::$DI['client']->getResponse();
         $this->assertTrue($response->isRedirect());
         $this->assertTrue(
@@ -227,7 +227,7 @@ class PublicationTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testRemovePublisher()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
 
         self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->getId() . "/removepublisher/", [
             'usr_id' => self::$DI['user_alt1']->get_id()
@@ -236,7 +236,7 @@ class PublicationTest extends \PhraseanetAuthenticatedWebTestCase
         $response = self::$DI['client']->getResponse();
         $this->assertTrue($response->isRedirect());
 
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', $feed->getId());
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', $feed->getId());
         $publishers = $feed->getPublishers();
 
         $this->assertFalse(isset($publishers[self::$DI['user_alt1']->get_id()]));
@@ -249,14 +249,14 @@ class PublicationTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testRemovePublisherException()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
 
         self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->getId() . "/removepublisher/");
 
         $response = self::$DI['client']->getResponse();
         $this->assertTrue($response->isRedirect());
 
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', $feed->getId());
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', $feed->getId());
 
         $this->assertTrue(
             strpos(
@@ -267,7 +267,7 @@ class PublicationTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testDeleteFeed()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
 
         self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->getId() . "/delete/");
 
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Admin/TaskManagerTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/TaskManagerTest.php
index 10d400768a..ddd5e0cec4 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Admin/TaskManagerTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/TaskManagerTest.php
@@ -85,12 +85,12 @@ class TaskManagerTest extends \PhraseanetAuthenticatedWebTestCase
         $this->assertEquals(302, self::$DI['client']->getResponse()->getStatusCode());
         $this->assertEquals('/admin/task-manager/tasks', self::$DI['client']->getResponse()->headers->get('location'));
 
-        $this->assertNull(self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Task', 1));
+        $this->assertNull(self::$DI['app']['EM']->find('Phraseanet:Task', 1));
     }
 
     public function testPostTaskStart()
     {
-        $task = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Task', 1);
+        $task = self::$DI['app']['EM']->find('Phraseanet:Task', 1);
 
         self::$DI['client']->request('POST', '/admin/task-manager/task/'.$task->getId().'/start');
         $this->assertEquals(302, self::$DI['client']->getResponse()->getStatusCode());
@@ -101,7 +101,7 @@ class TaskManagerTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testPostTaskStop()
     {
-        $task = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Task', 1);
+        $task = self::$DI['app']['EM']->find('Phraseanet:Task', 1);
 
         self::$DI['client']->request('POST', '/admin/task-manager/task/'.$task->getId().'/stop');
         $this->assertEquals(302, self::$DI['client']->getResponse()->getStatusCode());
@@ -112,7 +112,7 @@ class TaskManagerTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testPostResetCrashes()
     {
-        $task = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Task', 1);
+        $task = self::$DI['app']['EM']->find('Phraseanet:Task', 1);
 
         self::$DI['client']->request('POST', '/admin/task-manager/task/'.$task->getId().'/resetcrashcounter');
         $this->assertEquals(200, self::$DI['client']->getResponse()->getStatusCode());
@@ -123,7 +123,7 @@ class TaskManagerTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testPostSaveTask()
     {
-        $task = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Task', 1);
+        $task = self::$DI['app']['EM']->find('Phraseanet:Task', 1);
 
         $name = 'renamed';
         $period = 366;
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Client/BasketsTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Client/BasketsTest.php
index 823f9524b5..65a3a5cfe4 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Client/BasketsTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Client/BasketsTest.php
@@ -31,10 +31,10 @@ class BasketsTest extends \PhraseanetAuthenticatedWebTestCase
      */
     public function testCreateBasket()
     {
-       $nbBasketsBefore = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM \Alchemy\Phrasea\Model\Entities\Basket b')->getSingleScalarResult();
+       $nbBasketsBefore = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM Phraseanet:Basket b')->getSingleScalarResult();
        self::$DI['client']->request("POST", "/client/baskets/new/", ['p0' => 'hello']);
        $this->assertTrue(self::$DI['client']->getResponse()->isRedirect());
-       $nbBasketsAfter = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM \Alchemy\Phrasea\Model\Entities\Basket b')->getSingleScalarResult();
+       $nbBasketsAfter = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM Phraseanet:Basket b')->getSingleScalarResult();
        $this->assertGreaterThan($nbBasketsBefore,$nbBasketsAfter);
     }
 
@@ -43,14 +43,14 @@ class BasketsTest extends \PhraseanetAuthenticatedWebTestCase
      */
     public function testAddElementToBasket()
     {
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 1);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 1);
         self::$DI['client']->request("POST", "/client/baskets/add-element/", [
             'courChuId'  => $basket->getId(),
             'sbas'       => self::$DI['record_1']->get_sbas_id(),
             'p0'         => self::$DI['record_1']->get_record_id()
         ]);
         $this->assertTrue(self::$DI['client']->getResponse()->isRedirect());
-        $basket = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')->find($basket->getId());
+        $basket = self::$DI['app']['EM']->getRepository('Phraseanet:Basket')->find($basket->getId());
         $this->assertGreaterThan(0, $basket->getElements()->count());
     }
 
@@ -64,7 +64,7 @@ class BasketsTest extends \PhraseanetAuthenticatedWebTestCase
         ]);
         $this->assertTrue(self::$DI['client']->getResponse()->isRedirect());
         try {
-            $basket = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Basket')->find(1);
+            $basket = self::$DI['app']['EM']->getRepository('Phraseanet:Basket')->find(1);
             $this->fail('Basket is not deleted');
         } catch (\Exception $e) {
 
@@ -76,8 +76,8 @@ class BasketsTest extends \PhraseanetAuthenticatedWebTestCase
      */
     public function testDeleteBasketElement()
     {
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 1);
-        $basketElement = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\BasketElement', 1);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 1);
+        $basketElement = self::$DI['app']['EM']->find('Phraseanet:BasketElement', 1);
 
         self::$DI['client']->request("POST", "/client/baskets/delete-element/", [
             'p0'  => $basketElement->getId()
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php
index dbd1d4eb3f..218d51bcfe 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php
@@ -35,13 +35,13 @@ class BasketTest extends \PhraseanetAuthenticatedWebTestCase
 
         $response = self::$DI['client']->getResponse();
 
-        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM \Alchemy\Phrasea\Model\Entities\Basket b');
+        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM Phraseanet:Basket b');
         $count = $query->getSingleScalarResult();
 
         $this->assertEquals(5, $count);
         $this->assertEquals(302, $response->getStatusCode());
 
-        $query = self::$DI['app']['EM']->createQuery('SELECT b FROM \Alchemy\Phrasea\Model\Entities\Basket b');
+        $query = self::$DI['app']['EM']->createQuery('SELECT b FROM Phraseanet:Basket b');
         $result = $query->getResult();
 
         $basket = array_pop($result);
@@ -50,7 +50,7 @@ class BasketTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testRootPostJSON()
     {
-        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM \Alchemy\Phrasea\Model\Entities\Basket b');
+        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM Phraseanet:Basket b');
         $count = $query->getSingleScalarResult();
 
         $route = '/prod/baskets/';
@@ -70,7 +70,7 @@ class BasketTest extends \PhraseanetAuthenticatedWebTestCase
 
         $response = self::$DI['client']->getResponse();
 
-        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM \Alchemy\Phrasea\Model\Entities\Basket b');
+        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM Phraseanet:Basket b');
 
         $this->assertEquals($count + 1, $query->getSingleScalarResult());
         $this->assertEquals(200, $response->getStatusCode());
@@ -105,7 +105,7 @@ class BasketTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testBasketGetAccessDenied()
     {
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 3);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 3);
         $route = sprintf('/prod/baskets/%s/', $basket->getId());
         self::$DI['client']->request('GET', $route);
         $response = self::$DI['client']->getResponse();
@@ -114,7 +114,7 @@ class BasketTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testBasketDeleteElementPost()
     {
-        $basketElement = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\BasketElement', 1);
+        $basketElement = self::$DI['app']['EM']->find('Phraseanet:BasketElement', 1);
         $basket = $basketElement->getBasket();
 
         $this->assertEquals(1, $basket->getElements()->count());
@@ -131,8 +131,8 @@ class BasketTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testBasketDeldeteElementPostJSON()
     {
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 1);
-        $basket_element = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\BasketElement', 1);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 1);
+        $basket_element = self::$DI['app']['EM']->find('Phraseanet:BasketElement', 1);
 
         $route = sprintf(
             "/prod/baskets/%s/delete/%s/", $basket->getId(), $basket_element->getId()
@@ -151,13 +151,13 @@ class BasketTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testBasketDeletePostUnauthorized()
     {
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 3);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 3);
         $route = sprintf('/prod/baskets/%s/delete/', $basket->getId());
         self::$DI['client']->request('POST', $route);
         $response = self::$DI['client']->getResponse();
 
         $this->assertEquals(403, $response->getStatusCode());
-        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM \Alchemy\Phrasea\Model\Entities\Basket b');
+        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM Phraseanet:Basket b');
         $count = $query->getSingleScalarResult();
         $this->assertEquals(4, $count);
     }
@@ -167,7 +167,7 @@ class BasketTest extends \PhraseanetAuthenticatedWebTestCase
         $route = '/prod/baskets/1/delete/';
         self::$DI['client']->request('POST', $route);
         $response = self::$DI['client']->getResponse();
-        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM \Alchemy\Phrasea\Model\Entities\Basket b');
+        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM Phraseanet:Basket b');
         $count = $query->getSingleScalarResult();
         $this->assertEquals(3, $count);
         $this->assertEquals(302, $response->getStatusCode());
@@ -178,7 +178,7 @@ class BasketTest extends \PhraseanetAuthenticatedWebTestCase
         $route = '/prod/baskets/1/delete/';
         self::$DI['client']->request('POST', $route, [], [], ["HTTP_ACCEPT" => "application/json"]);
         $response = self::$DI['client']->getResponse();
-        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM \Alchemy\Phrasea\Model\Entities\Basket b');
+        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM Phraseanet:Basket b');
         $count = $query->getSingleScalarResult();
         $this->assertEquals(3, $count);
         $this->assertEquals(200, $response->getStatusCode());
@@ -186,7 +186,7 @@ class BasketTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testBasketUpdatePost()
     {
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 1);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 1);
         $route = sprintf('/prod/baskets/%s/update/', $basket->getId());
 
         self::$DI['client']->request(
@@ -203,7 +203,7 @@ class BasketTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testBasketUpdatePostJSON()
     {
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 1);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 1);
         $route = sprintf('/prod/baskets/%s/update/', $basket->getId());
 
         self::$DI['client']->request(
@@ -222,7 +222,7 @@ class BasketTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testReorderGet()
     {
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 4);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 4);
 
         $route = sprintf("/prod/baskets/%s/reorder/", $basket->getId());
 
@@ -238,7 +238,7 @@ class BasketTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testBasketUpdateGet()
     {
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 1);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 1);
         $route = sprintf('/prod/baskets/%s/update/', $basket->getId());
 
         $crawler = self::$DI['client']->request(
@@ -260,7 +260,7 @@ class BasketTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testBasketArchivedPost()
     {
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 1);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 1);
         $route = sprintf('/prod/baskets/%s/archive/?archive=1', $basket->getId());
         self::$DI['client']->request('POST', $route);
         $this->assertTrue($basket->getArchived());
@@ -274,7 +274,7 @@ class BasketTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testBasketArchivedPostJSON()
     {
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 1);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 1);
         $route = sprintf('/prod/baskets/%s/archive/?archive=1', $basket->getId());
 
         self::$DI['client']->request(
@@ -300,7 +300,7 @@ class BasketTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testAddElementPost()
     {
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 1);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 1);
         $route = sprintf('/prod/baskets/%s/addElements/', $basket->getId());
 
         $records = [
@@ -324,10 +324,10 @@ class BasketTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testAddElementToValidationPost()
     {
-        $datas = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\ValidationData')->findAll();
+        $datas = self::$DI['app']['EM']->getRepository('Phraseanet:ValidationData')->findAll();
         $countDatas = count($datas);
 
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 4);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 4);
         $this->assertCount(2, $basket->getElements());
         $route = sprintf('/prod/baskets/%s/addElements/', $basket->getId());
 
@@ -348,13 +348,13 @@ 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($countDatas < count($datas), 'assert that ' . count($datas) . ' > ' . $countDatas);
     }
 
     public function testAddElementPostJSON()
     {
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 1);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 1);
         $route = '/prod/baskets/1/addElements/';
 
         $records = [
@@ -372,10 +372,10 @@ class BasketTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testRouteStealElements()
     {
-        $BasketElement = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\BasketElement', 1);
+        $BasketElement = self::$DI['app']['EM']->find('Phraseanet:BasketElement', 1);
 
         $Basket_1 = $BasketElement->getBasket();
-        $Basket_2 = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 2);
+        $Basket_2 = self::$DI['app']['EM']->find('Phraseanet:Basket', 2);
 
         $route = sprintf('/prod/baskets/%s/stealElements/', $Basket_2->getId());
 
@@ -395,11 +395,11 @@ class BasketTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testRouteStealElementsJson()
     {
-        $BasketElement = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\BasketElement', 1);
+        $BasketElement = self::$DI['app']['EM']->find('Phraseanet:BasketElement', 1);
 
         $Basket_1 = $BasketElement->getBasket();
 
-        $Basket_2 = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 2);
+        $Basket_2 = self::$DI['app']['EM']->find('Phraseanet:Basket', 2);
 
         $route = sprintf('/prod/baskets/%s/stealElements/', $Basket_2->getId());
 
@@ -428,7 +428,7 @@ class BasketTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testRemoveBasket()
     {
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 4);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 4);
 
         $route = sprintf('/prod/baskets/%s/delete/', $basket->getId());
         self::$DI['client']->request('POST', $route, [], [], ["HTTP_ACCEPT" => "application/json"]);
@@ -443,16 +443,16 @@ class BasketTest extends \PhraseanetAuthenticatedWebTestCase
         $this->assertArrayHasKey('success', $datas);
         $this->assertTrue($datas['success']);
 
-        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(v.id) FROM \Alchemy\Phrasea\Model\Entities\ValidationParticipant v');
+        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(v.id) FROM Phraseanet:ValidationParticipant v');
         $this->assertEquals(0, $query->getSingleScalarResult());
 
-        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM \Alchemy\Phrasea\Model\Entities\BasketElement b');
+        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM Phraseanet:BasketElement b');
         $this->assertEquals(1, $query->getSingleScalarResult());
 
-        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(v.id) FROM \Alchemy\Phrasea\Model\Entities\ValidationSession v');
+        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(v.id) FROM Phraseanet:ValidationSession v');
         $this->assertEquals(0, $query->getSingleScalarResult());
 
-        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM \Alchemy\Phrasea\Model\Entities\Basket b');
+        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(b.id) FROM Phraseanet:Basket b');
         $this->assertEquals(3, $query->getSingleScalarResult());
     }
 }
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/DownloadTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/DownloadTest.php
index c6e5731a79..bea01dd53b 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/DownloadTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/DownloadTest.php
@@ -104,7 +104,7 @@ class DownloadTest extends \PhraseanetAuthenticatedWebTestCase
      */
     public function testDownloadBasket()
     {
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 4);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 4);
 
         $eventManagerStub = $this->getMockBuilder('\eventsmanager_broker')
                      ->disableOriginalConstructor()
@@ -136,7 +136,7 @@ class DownloadTest extends \PhraseanetAuthenticatedWebTestCase
      */
     public function testDownloadBasketValidation()
     {
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 4);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 4);
 
         $eventManagerStub = $this->getMockBuilder('\eventsmanager_broker')
                      ->disableOriginalConstructor()
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php
index 739c87a68f..99dcfa64d7 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php
@@ -12,7 +12,7 @@ class FeedTest extends \PhraseanetAuthenticatedWebTestCase
     {
         $crawler = self::$DI['client']->request('POST', '/prod/feeds/requestavailable/');
         $this->assertTrue(self::$DI['client']->getResponse()->isOk());
-        $feeds = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser(self::$DI['app']['acl']->get(self::$DI['user']));
+        $feeds = self::$DI['app']['EM']->getRepository('Phraseanet:Feed')->getAllForUser(self::$DI['app']['acl']->get(self::$DI['user']));
         foreach ($feeds as $one_feed) {
             if ($one_feed->isPublisher(self::$DI['user'])) {
                 $this->assertEquals(1, $crawler->filterXPath("//input[@value='" . $one_feed->getId() . "' and @name='feed_proposal[]']")->count());
@@ -30,7 +30,7 @@ class FeedTest extends \PhraseanetAuthenticatedWebTestCase
             ->method('deliver')
             ->with($this->isInstanceOf('Alchemy\Phrasea\Notification\Mail\MailInfoNewPublication'), $this->equalTo(null));
 
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
         $params = [
             "feed_id"        => $feed->getId()
             , "notify"        => 1
@@ -67,7 +67,7 @@ class FeedTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testEntryCreateUnauthorized()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 3);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 3);
 
         self::$DI['app']['notification.deliverer'] = $this->getMockBuilder('Alchemy\Phrasea\Notification\Deliverer')
             ->disableOriginalConstructor()
@@ -91,7 +91,7 @@ class FeedTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testEntryEdit()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
         $entry = $feed->getEntries()->first();
         $crawler = self::$DI['client']->request('GET', '/prod/feeds/entry/' . $entry->getId() . '/edit/');
 
@@ -108,7 +108,7 @@ class FeedTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testEntryEditUnauthorized()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 3);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 3);
         $entry = $feed->getEntries()->first();
 
         self::$DI['client']->request('GET', '/prod/feeds/entry/' . $entry->getId() . '/edit/');
@@ -118,7 +118,7 @@ class FeedTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testEntryUpdate()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
         $entry = $feed->getEntries()->first();
 
         $params = [
@@ -142,9 +142,9 @@ class FeedTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testEntryUpdateChangeFeed()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
         $entry = $feed->getEntries()->first();
-        $newfeed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 2);
+        $newfeed = self::$DI['app']['EM']->find('Phraseanet:Feed', 2);
 
         $params = [
             "feed_id"      => $newfeed->getId(),
@@ -164,15 +164,15 @@ class FeedTest extends \PhraseanetAuthenticatedWebTestCase
         $this->assertTrue(is_string($pageContent->datas));
         $this->assertRegExp("/entry_" . $entry->getId() . "/", $pageContent->datas);
 
-        $retrievedentry = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->find($entry->getId());
+        $retrievedentry = self::$DI['app']['EM']->getRepository('Phraseanet:FeedEntry')->find($entry->getId());
         $this->assertEquals($newfeed->getId(), $retrievedentry->getFeed()->getId());
     }
 
     public function testEntryUpdateChangeFeedNoAccess()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
         $entry = $feed->getEntries()->first();
-        $newfeed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 3);
+        $newfeed = self::$DI['app']['EM']->find('Phraseanet:Feed', 3);
         $newfeed->setCollection(self::$DI['collection_no_access']);
         self::$DI['app']['EM']->persist($newfeed);
         self::$DI['app']['EM']->flush();
@@ -192,7 +192,7 @@ class FeedTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testEntryUpdateChangeFeedInvalidFeed()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
         $entry = $feed->getEntries()->first();
 
         $params = [
@@ -225,7 +225,7 @@ class FeedTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testEntryUpdateFailed()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
         $entry = $feed->getEntries()->first(['user']);
 
         $params = [
@@ -243,7 +243,7 @@ class FeedTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testEntryUpdateUnauthorized()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 3);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 3);
         $entry = $feed->getEntries()->first();
 
         $params = [
@@ -261,7 +261,7 @@ class FeedTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testEntryUpdateChangeOrder()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
         $entry = $feed->getEntries()->first();
 
         $items = $entry->getItems()->toArray();
@@ -282,8 +282,8 @@ class FeedTest extends \PhraseanetAuthenticatedWebTestCase
         self::$DI['client']->request('POST', '/prod/feeds/entry/' . $entry->getId() . '/update/', $params);
         $this->assertTrue(self::$DI['client']->getResponse()->isOk());
 
-        $newItem1 = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedItem')->find($item1->getId());
-        $newItem2 = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedItem')->find($item2->getId());
+        $newItem1 = self::$DI['app']['EM']->getRepository('Phraseanet:FeedItem')->find($item1->getId());
+        $newItem2 = self::$DI['app']['EM']->getRepository('Phraseanet:FeedItem')->find($item2->getId());
 
         $this->assertEquals($ord1, (int) $newItem2->getOrd());
         $this->assertEquals($ord2, (int) $newItem1->getOrd());
@@ -291,7 +291,7 @@ class FeedTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testDelete()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
         $entry = $feed->getEntries()->first();
 
         self::$DI['client']->request('POST', '/prod/feeds/entry/' . $entry->getId() . '/delete/');
@@ -306,7 +306,7 @@ class FeedTest extends \PhraseanetAuthenticatedWebTestCase
         $this->assertTrue(is_string($pageContent->message));
 
         try {
-            self::$DI["app"]['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedEntry')->find($entry->getId());
+            self::$DI["app"]['EM']->getRepository('Phraseanet:FeedEntry')->find($entry->getId());
             $this->fail("Failed to delete entry");
         } catch (\Exception $e) {
 
@@ -321,7 +321,7 @@ class FeedTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testDeleteUnauthorized()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 3);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 3);
         $entry = $feed->getEntries()->first();
 
         self::$DI['client']->request('POST', '/prod/feeds/entry/' . $entry->getId() . '/delete/');
@@ -332,7 +332,7 @@ class FeedTest extends \PhraseanetAuthenticatedWebTestCase
     {
         $crawler = self::$DI['client']->request('GET', '/prod/feeds/');
         $this->assertTrue(self::$DI['client']->getResponse()->isOk());
-        $feeds = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser(self::$DI['app']['acl']->get(self::$DI['user']));
+        $feeds = self::$DI['app']['EM']->getRepository('Phraseanet:Feed')->getAllForUser(self::$DI['app']['acl']->get(self::$DI['user']));
 
         foreach ($feeds as $one_feed) {
             $path = CssSelector::toXPath("ul.submenu a[href='/prod/feeds/feed/" . $one_feed->getId() . "/']");
@@ -348,8 +348,8 @@ class FeedTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testGetFeed()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
-        $feeds = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser(self::$DI['app']['acl']->get(self::$DI['user']));
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
+        $feeds = self::$DI['app']['EM']->getRepository('Phraseanet:Feed')->getAllForUser(self::$DI['app']['acl']->get(self::$DI['user']));
         $crawler = self::$DI['client']->request('GET', '/prod/feeds/feed/' . $feed->getId() . "/");
 
         foreach ($feeds as $one_feed) {
@@ -398,7 +398,7 @@ class FeedTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testSuscribe()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
 
         self::$DI['app']['feed.user-link-generator'] = $this->getMockBuilder('Alchemy\Phrasea\Feed\Link\FeedLinkGenerator')
             ->disableOriginalConstructor()
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/LazaretTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/LazaretTest.php
index c51f487282..632ddead33 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/LazaretTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/LazaretTest.php
@@ -57,7 +57,7 @@ class LazaretTest extends \PhraseanetAuthenticatedWebTestCase
 
         $em->expects($this->once())
             ->method('getRepository')
-            ->with($this->EqualTo('Alchemy\Phrasea\Model\Entities\LazaretFile'))
+            ->with($this->equalTo('Phraseanet:LazaretFile'))
             ->will($this->returnValue($repo));
 
         $route = '/prod/lazaret/';
@@ -94,7 +94,7 @@ class LazaretTest extends \PhraseanetAuthenticatedWebTestCase
 
         $em->expects($this->any())
             ->method('find')
-            ->with($this->EqualTo('Alchemy\Phrasea\Model\Entities\LazaretFile'), $this->EqualTo($id))
+            ->with($this->equalTo('Phraseanet:LazaretFile'), $this->equalTo($id))
             ->will($this->returnValue($lazaretFile));
 
         self::$DI['app']['EM'] = $em;
@@ -138,7 +138,7 @@ class LazaretTest extends \PhraseanetAuthenticatedWebTestCase
 
         $em->expects($this->any())
             ->method('find')
-            ->with($this->EqualTo('Alchemy\Phrasea\Model\Entities\LazaretFile'), $this->EqualTo($id))
+            ->with($this->equalTo('Phraseanet:LazaretFile'), $this->equalTo($id))
             ->will($this->returnValue(null));
 
         self::$DI['app']['EM'] = $em;
@@ -208,13 +208,13 @@ class LazaretTest extends \PhraseanetAuthenticatedWebTestCase
         //Expect the retrieval of the lazaret file with the provided id
         $em->expects($this->any())
             ->method('find')
-            ->with($this->EqualTo('Alchemy\Phrasea\Model\Entities\LazaretFile'), $this->EqualTo($id))
+            ->with($this->equalTo('Phraseanet:LazaretFile'), $this->equalTo($id))
             ->will($this->returnValue($lazaretFile));
 
         //In any case we expect the deletion of the lazaret file
         $em->expects($this->once())
             ->method('remove')
-            ->with($this->EqualTo($lazaretFile));
+            ->with($this->equalTo($lazaretFile));
 
         //Then flush
         $em->expects($this->once())
@@ -259,7 +259,7 @@ class LazaretTest extends \PhraseanetAuthenticatedWebTestCase
         //Expect the retrieval of the lazaret file with the provided id
         $em->expects($this->any())
             ->method('find')
-            ->with($this->EqualTo('Alchemy\Phrasea\Model\Entities\LazaretFile'), $this->EqualTo($id))
+            ->with($this->equalTo('Phraseanet:LazaretFile'), $this->equalTo($id))
             ->will($this->returnValue($lazaretFile));
 
         self::$DI['app']['EM'] = $em;
@@ -321,7 +321,7 @@ class LazaretTest extends \PhraseanetAuthenticatedWebTestCase
         $this->assertResponseOk($response);
         $this->assertGoodJsonContent(json_decode($response->getContent()));
 
-        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(l.id) FROM \Alchemy\Phrasea\Model\Entities\LazaretFile l');
+        $query = self::$DI['app']['EM']->createQuery('SELECT COUNT(l.id) FROM Phraseanet:LazaretFile l');
 
         $count = $query->getSingleScalarResult();
 
@@ -344,7 +344,7 @@ class LazaretTest extends \PhraseanetAuthenticatedWebTestCase
         $this->assertGoodJsonContent(json_decode($response->getContent()));
 
         $query = self::$DI['app']['EM']->createQuery(
-            'SELECT COUNT(l.id) FROM \Alchemy\Phrasea\Model\Entities\LazaretFile l'
+            'SELECT COUNT(l.id) FROM Phraseanet:LazaretFile l'
         );
 
         $count = $query->getSingleScalarResult();
@@ -430,13 +430,13 @@ class LazaretTest extends \PhraseanetAuthenticatedWebTestCase
         //Expect the retrieval of the lazaret file with the provided id
         $em->expects($this->any())
             ->method('find')
-            ->with($this->EqualTo('Alchemy\Phrasea\Model\Entities\LazaretFile'), $this->EqualTo($id))
+            ->with($this->equalTo('Phraseanet:LazaretFile'), $this->equalTo($id))
             ->will($this->returnValue($lazaretFile));
 
         //In any case we expect the deletion of the lazaret file
         $em->expects($this->once())
             ->method('remove')
-            ->with($this->EqualTo($lazaretFile));
+            ->with($this->equalTo($lazaretFile));
 
         //Then flush
         $em->expects($this->once())
@@ -496,7 +496,7 @@ class LazaretTest extends \PhraseanetAuthenticatedWebTestCase
         //Expect the retrieval of the lazaret file with the provided id
         $em->expects($this->any())
             ->method('find')
-            ->with($this->EqualTo('Alchemy\Phrasea\Model\Entities\LazaretFile'), $this->EqualTo($id))
+            ->with($this->equalTo('Phraseanet:LazaretFile'), $this->equalTo($id))
             ->will($this->returnValue($lazaretFile));
 
         $id = 1;
@@ -551,7 +551,7 @@ class LazaretTest extends \PhraseanetAuthenticatedWebTestCase
         //Expect the retrieval of the lazaret file with the provided id
         $em->expects($this->any())
             ->method('find')
-            ->with($this->EqualTo('Alchemy\Phrasea\Model\Entities\LazaretFile'), $this->EqualTo($id))
+            ->with($this->equalTo('Phraseanet:LazaretFile'), $this->equalTo($id))
             ->will($this->returnValue($lazaretFile));
 
         self::$DI['app']['EM'] = $em;
@@ -598,7 +598,7 @@ class LazaretTest extends \PhraseanetAuthenticatedWebTestCase
         //Expect the retrieval of the lazaret file with the provided id
         $em->expects($this->any())
             ->method('find')
-            ->with($this->EqualTo('Alchemy\Phrasea\Model\Entities\LazaretFile'), $this->EqualTo($id))
+            ->with($this->equalTo('Phraseanet:LazaretFile'), $this->equalTo($id))
             ->will($this->returnValue($lazaretFile));
 
         self::$DI['app']['EM'] = $em;
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/OrderTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/OrderTest.php
index 6b4dc00dbe..66ab4e0770 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/OrderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/OrderTest.php
@@ -197,7 +197,7 @@ class OrderTest extends \PhraseanetAuthenticatedWebTestCase
         }
         self::$DI['client']->request('POST', '/prod/order/' . $order->getId() . '/send/', ['elements' => $parameters]);
 
-        $testOrder = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Order')->find($order->getId());
+        $testOrder = self::$DI['app']['EM']->getRepository('Phraseanet:Order')->find($order->getId());
         $this->assertEquals(0, $testOrder->getTodo());
     }
 
@@ -218,13 +218,13 @@ class OrderTest extends \PhraseanetAuthenticatedWebTestCase
 
         $parameters = [$order->getElements()->first()->getId()];
         self::$DI['client']->request('POST', '/prod/order/' . $order->getId() . '/send/', ['elements' => $parameters]);
-        $testOrder = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Order')->find($order->getId());
+        $testOrder = self::$DI['app']['EM']->getRepository('Phraseanet:Order')->find($order->getId());
         $this->assertEquals(1, $testOrder->getTodo());
 
         $parameters = [$orderElement->getId()];
         self::$DI['client']->request('POST', '/prod/order/' . $order->getId() . '/deny/', ['elements' => $parameters]);
 
-        $testOrder = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Order')->find($order->getId());
+        $testOrder = self::$DI['app']['EM']->getRepository('Phraseanet:Order')->find($order->getId());
         $this->assertEquals(0, $testOrder->getTodo());
     }
 
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/RecordsTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/RecordsTest.php
index 58e065ef6d..63aeeb1171 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/RecordsTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/RecordsTest.php
@@ -190,7 +190,7 @@ class RecordsTest extends \PhraseanetAuthenticatedWebTestCase
     public function testGetRecordDetailBasket()
     {
         $this->authenticate(self::$DI['app']);
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 1);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 1);
 
         $this->XMLHTTPRequest('POST', '/prod/records/', [
             'env'   => 'BASK',
@@ -226,7 +226,7 @@ class RecordsTest extends \PhraseanetAuthenticatedWebTestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
         $feedEntry = $feed->getEntries()->first();
 
         $this->XMLHTTPRequest('POST', '/prod/records/', [
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/StoryTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/StoryTest.php
index f84d82f93a..339620cec1 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/StoryTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/StoryTest.php
@@ -27,7 +27,7 @@ class StoryTest extends \PhraseanetAuthenticatedWebTestCase
         $this->assertEquals(302, $response->getStatusCode());
 
         $query = self::$DI['app']['EM']->createQuery(
-            'SELECT COUNT(w.id) FROM \Alchemy\Phrasea\Model\Entities\StoryWZ w'
+            'SELECT COUNT(w.id) FROM Phraseanet:StoryWZ w'
         );
 
         $count = $query->getSingleScalarResult();
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/UsrListsTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/UsrListsTest.php
index ee171fe8f8..c2aca791d4 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/UsrListsTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/UsrListsTest.php
@@ -84,7 +84,7 @@ class UsrListsTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testGetList()
     {
-        $entry = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\UsrListEntry', 2);
+        $entry = self::$DI['app']['EM']->find('Phraseanet:UsrListEntry', 2);
         $list_id = $entry->getList()->getId();
 
         $route = '/prod/lists/list/' . $list_id . '/';
@@ -104,7 +104,7 @@ class UsrListsTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testPostUpdate()
     {
-        $entry = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\UsrListEntry', 2);
+        $entry = self::$DI['app']['EM']->find('Phraseanet:UsrListEntry', 2);
         $list_id = $entry->getList()->getId();
 
         $route = '/prod/lists/list/' . $list_id . '/update/';
@@ -140,7 +140,7 @@ class UsrListsTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testPostDelete()
     {
-        $entry = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\UsrListEntry', 2);
+        $entry = self::$DI['app']['EM']->find('Phraseanet:UsrListEntry', 2);
         $list_id = $entry->getList()->getId();
 
         $route = '/prod/lists/list/' . $list_id . '/delete/';
@@ -159,14 +159,14 @@ class UsrListsTest extends \PhraseanetAuthenticatedWebTestCase
 
         $this->assertTrue($datas['success']);
 
-        $repository = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
+        $repository = self::$DI['app']['EM']->getRepository('Phraseanet:UsrList');
 
         $this->assertNull($repository->find($list_id));
     }
 
     public function testPostRemoveEntry()
     {
-        $entry = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\UsrListEntry', 2);
+        $entry = self::$DI['app']['EM']->find('Phraseanet:UsrListEntry', 2);
         $list_id = $entry->getList()->getId();
         $usr_id = $entry->getUser(self::$DI['app'])->get_id();
         $entry_id = $entry->getId();
@@ -187,14 +187,14 @@ class UsrListsTest extends \PhraseanetAuthenticatedWebTestCase
 
         $this->assertTrue($datas['success']);
 
-        $repository = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrListEntry');
+        $repository = self::$DI['app']['EM']->getRepository('Phraseanet:UsrListEntry');
 
         $this->assertNull($repository->find($entry_id));
     }
 
     public function testPostAddEntry()
     {
-        $list = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\UsrList', 1);
+        $list = self::$DI['app']['EM']->find('Phraseanet:UsrList', 1);
 
         $this->assertEquals(2, $list->getEntries()->count());
 
@@ -218,7 +218,7 @@ class UsrListsTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testPostShareList()
     {
-        $list = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\UsrList', 1);
+        $list = self::$DI['app']['EM']->find('Phraseanet:UsrList', 1);
 
         $this->assertEquals(1, $list->getOwners()->count());
 
@@ -256,7 +256,7 @@ class UsrListsTest extends \PhraseanetAuthenticatedWebTestCase
 
         $this->assertTrue($datas['success']);
 
-        $repository = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
+        $repository = self::$DI['app']['EM']->getRepository('Phraseanet:UsrList');
 
         $list = $repository->find($list->getId());
 
@@ -265,7 +265,7 @@ class UsrListsTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testPostUnShareList()
     {
-        $list = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\UsrList', 1);
+        $list = self::$DI['app']['EM']->find('Phraseanet:UsrList', 1);
 
         $this->assertEquals(1, $list->getOwners()->count());
 
@@ -285,7 +285,7 @@ class UsrListsTest extends \PhraseanetAuthenticatedWebTestCase
 
         $this->assertTrue($datas['success']);
 
-        $repository = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
+        $repository = self::$DI['app']['EM']->getRepository('Phraseanet:UsrList');
 
         $list = $repository->find($list->getId());
 
@@ -304,7 +304,7 @@ class UsrListsTest extends \PhraseanetAuthenticatedWebTestCase
 
         $this->assertTrue($datas['success']);
 
-        $repository = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
+        $repository = self::$DI['app']['EM']->getRepository('Phraseanet:UsrList');
 
         $list = $repository->find($list->getId());
 
@@ -315,7 +315,7 @@ class UsrListsTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testPostUnShareFail()
     {
-        $list = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\UsrList', 1);
+        $list = self::$DI['app']['EM']->find('Phraseanet:UsrList', 1);
 
         $this->assertEquals(1, $list->getOwners()->count());
 
@@ -367,7 +367,7 @@ class UsrListsTest extends \PhraseanetAuthenticatedWebTestCase
 
         $this->assertTrue($datas['success']);
 
-        $repository = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrList');
+        $repository = self::$DI['app']['EM']->getRepository('Phraseanet:UsrList');
 
         $list = $repository->find($list->getId());
 
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/WorkZoneTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/WorkZoneTest.php
index eed6325485..7136ce81c8 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/WorkZoneTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/WorkZoneTest.php
@@ -40,7 +40,7 @@ class WorkZoneTest extends \PhraseanetAuthenticatedWebTestCase
 
         $em = self::$DI['app']['EM'];
         /* @var $em \Doctrine\ORM\EntityManager */
-        $query = $em->createQuery('SELECT COUNT(w.id) FROM \Alchemy\Phrasea\Model\Entities\StoryWZ w');
+        $query = $em->createQuery('SELECT COUNT(w.id) FROM Phraseanet:StoryWZ w');
 
         $count = $query->getSingleScalarResult();
 
@@ -62,7 +62,7 @@ class WorkZoneTest extends \PhraseanetAuthenticatedWebTestCase
 
         $em = self::$DI['app']['EM'];
         /* @var $em \Doctrine\ORM\EntityManager */
-        $query = $em->createQuery('SELECT COUNT(w.id) FROM \Alchemy\Phrasea\Model\Entities\StoryWZ w');
+        $query = $em->createQuery('SELECT COUNT(w.id) FROM Phraseanet:StoryWZ w');
         $count = $query->getSingleScalarResult();
 
         $this->assertEquals(2, $count);
@@ -73,7 +73,7 @@ class WorkZoneTest extends \PhraseanetAuthenticatedWebTestCase
         $story = self::$DI['record_story_2'];
         $route = sprintf("/prod/WorkZone/attachStories/");
 
-        $storyWZ = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\StoryWZ', 1);
+        $storyWZ = self::$DI['app']['EM']->find('Phraseanet:StoryWZ', 1);
 
         self::$DI['client']->request('POST', $route, ['stories' => [$story->get_serialize_key()]]);
         $response = self::$DI['client']->getResponse();
@@ -83,7 +83,7 @@ class WorkZoneTest extends \PhraseanetAuthenticatedWebTestCase
         $em = self::$DI['app']['EM'];
         /* @var $em \Doctrine\ORM\EntityManager */
         $query = $em->createQuery(
-            'SELECT COUNT(w.id) FROM \Alchemy\Phrasea\Model\Entities\StoryWZ w'
+            'SELECT COUNT(w.id) FROM Phraseanet:StoryWZ w'
         );
 
         $count = $query->getSingleScalarResult();
@@ -131,7 +131,7 @@ class WorkZoneTest extends \PhraseanetAuthenticatedWebTestCase
         self::$DI['client']->request('POST', $attachRoute, ['stories' => [$story->get_serialize_key()]]);
 
         $query = self::$DI['app']['EM']->createQuery(
-                'SELECT COUNT(w.id) FROM \Alchemy\Phrasea\Model\Entities\StoryWZ w'
+                'SELECT COUNT(w.id) FROM Phraseanet:StoryWZ w'
         );
 
         $count = $query->getSingleScalarResult();
@@ -144,7 +144,7 @@ class WorkZoneTest extends \PhraseanetAuthenticatedWebTestCase
         $this->assertEquals(302, $response->getStatusCode());
 
         $query = self::$DI['app']['EM']->createQuery(
-                'SELECT COUNT(w.id) FROM \Alchemy\Phrasea\Model\Entities\StoryWZ w'
+                'SELECT COUNT(w.id) FROM Phraseanet:StoryWZ w'
         );
 
         $count = $query->getSingleScalarResult();
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/RecordsRequestTest.php b/tests/Alchemy/Tests/Phrasea/Controller/RecordsRequestTest.php
index 269db0340a..38f6b0504c 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/RecordsRequestTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/RecordsRequestTest.php
@@ -158,7 +158,7 @@ class RecordsRequestTest extends \PhraseanetAuthenticatedTestCase
 
     public function testSimpleBasket()
     {
-        $basketElement = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\BasketElement', 1);
+        $basketElement = self::$DI['app']['EM']->find('Phraseanet:BasketElement', 1);
         $request = new Request(['ssel' => $basketElement->getBasket()->getId()]);
 
         $records = RecordsRequest::fromRequest(self::$DI['app'], $request);
@@ -240,6 +240,6 @@ class RecordsRequestTest extends \PhraseanetAuthenticatedTestCase
 
     private function getStoryWZ()
     {
-        return self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\StoryWZ', 1);
+        return self::$DI['app']['EM']->find('Phraseanet:StoryWZ', 1);
     }
 }
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
index f6d60a489a..aedd25a628 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
@@ -1017,7 +1017,7 @@ class LoginTest extends \PhraseanetAuthenticatedWebTestCase
 
         $user = new \User_Adapter((int) $userId, self::$DI['app']);
 
-        $ret = self::$DI['app']['EM']->getRepository('\Alchemy\Phrasea\Model\Entities\UsrAuthProvider')
+        $ret = self::$DI['app']['EM']->getRepository('Phraseanet:UsrAuthProvider')
             ->findBy(['usr_id' => $userId, 'provider' => 'provider-test']);
         $this->assertCount(1, $ret);
 
@@ -1520,7 +1520,7 @@ class LoginTest extends \PhraseanetAuthenticatedWebTestCase
 
         $this->assertSame(302, self::$DI['client']->getResponse()->getStatusCode());
 
-        $ret = self::$DI['app']['EM']->getRepository('\Alchemy\Phrasea\Model\Entities\UsrAuthProvider')
+        $ret = self::$DI['app']['EM']->getRepository('Phraseanet:UsrAuthProvider')
             ->findBy(['usr_id' => self::$DI['user']->get_id(), 'provider' => 'provider-test']);
 
         $this->assertCount(1, $ret);
@@ -1595,7 +1595,7 @@ class LoginTest extends \PhraseanetAuthenticatedWebTestCase
 
         $this->assertSame(302, self::$DI['client']->getResponse()->getStatusCode());
 
-        $ret = self::$DI['app']['EM']->getRepository('\Alchemy\Phrasea\Model\Entities\UsrAuthProvider')
+        $ret = self::$DI['app']['EM']->getRepository('Phraseanet:UsrAuthProvider')
             ->findBy(['usr_id' => $createdUser->get_id(), 'provider' => 'provider-test']);
 
         $this->assertCount(1, $ret);
@@ -1760,7 +1760,7 @@ class LoginTest extends \PhraseanetAuthenticatedWebTestCase
 
         self::$DI['app']['EM']->expects($this->at(0))
             ->method('getRepository')
-            ->with('Alchemy\Phrasea\Model\Entities\UsrAuthProvider')
+            ->with('Phraseanet:UsrAuthProvider')
             ->will($this->returnValue($repo));
 
         if ($participants) {
@@ -1774,7 +1774,7 @@ class LoginTest extends \PhraseanetAuthenticatedWebTestCase
 
             self::$DI['app']['EM']->expects($this->at(1))
                 ->method('getRepository')
-                ->with('Alchemy\Phrasea\Model\Entities\ValidationParticipant')
+                ->with('Phraseanet:ValidationParticipant')
                 ->will($this->returnValue($repo));
         }
     }
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
index 8c69e4cdc8..e9e674bff9 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
@@ -14,7 +14,7 @@ class RSSFeedTest extends \PhraseanetWebTestCase
 {
     public function testPublicFeedAggregated()
     {
-        self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 2);
+        self::$DI['app']['EM']->find('Phraseanet:Feed', 2);
 
         self::$DI['client']->request('GET', '/feeds/aggregated/atom/');
         $response = self::$DI['client']->getResponse();
@@ -59,7 +59,7 @@ class RSSFeedTest extends \PhraseanetWebTestCase
     public function testPublicFeed()
     {
         $this->authenticate(self::$DI['app']);
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 2);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 2);
 
         self::$DI['client']->request('GET', "/feeds/feed/" . $feed->getId() . "/atom/");
         $response = self::$DI['client']->getResponse();
@@ -72,7 +72,7 @@ class RSSFeedTest extends \PhraseanetWebTestCase
 
     public function testUserFeedAggregated()
     {
-        $token = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\AggregateToken', 1);
+        $token = self::$DI['app']['EM']->find('Phraseanet:AggregateToken', 1);
         $tokenValue = $token->getValue();
 
         $this->logout(self::$DI['app']);
@@ -88,7 +88,7 @@ class RSSFeedTest extends \PhraseanetWebTestCase
 
     public function testUserFeed()
     {
-        $token = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\FeedToken', 1);
+        $token = self::$DI['app']['EM']->find('Phraseanet:FeedToken', 1);
         $tokenValue = $token->getValue();
         $this->logout(self::$DI['app']);
 
@@ -103,7 +103,7 @@ class RSSFeedTest extends \PhraseanetWebTestCase
 
     public function testGetFeedFormat()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 2);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 2);
         self::$DI['client']->request("GET", "/feeds/feed/" . $feed->getId() . "/rss/");
 
         $this->assertEquals("application/rss+xml", self::$DI['client']->getResponse()->headers->get("content-type"));
@@ -121,7 +121,7 @@ class RSSFeedTest extends \PhraseanetWebTestCase
 
     public function testCooliris()
     {
-        self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 2);
+        self::$DI['app']['EM']->find('Phraseanet:Feed', 2);
 
         self::$DI['client']->request("GET", "/feeds/cooliris/");
         $this->assertTrue(self::$DI['client']->getResponse()->isOk());
@@ -132,7 +132,7 @@ class RSSFeedTest extends \PhraseanetWebTestCase
 
     public function testAggregatedRss()
     {
-        $all_feeds = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->findBy(['public' => true], ['updatedOn' => 'DESC']);
+        $all_feeds = self::$DI['app']['EM']->getRepository('Phraseanet:Feed')->findBy(['public' => true], ['updatedOn' => 'DESC']);
 
         foreach ($all_feeds as $feed) {
             $this->assertTrue($feed->isPublic());
@@ -146,7 +146,7 @@ class RSSFeedTest extends \PhraseanetWebTestCase
 
     public function testAggregatedAtom()
     {
-        $all_feeds = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->findBy(['public' => true], ['updatedOn' => 'DESC']);
+        $all_feeds = self::$DI['app']['EM']->getRepository('Phraseanet:Feed')->findBy(['public' => true], ['updatedOn' => 'DESC']);
 
         foreach ($all_feeds as $feed) {
             $this->assertTrue($feed->isPublic());
@@ -173,7 +173,7 @@ class RSSFeedTest extends \PhraseanetWebTestCase
 
     public function testGetFeedId()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 2);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 2);
 
         self::$DI['client']->request("GET", "/feeds/feed/" . $feed->getId() . "/rss/");
         $this->assertTrue(self::$DI['client']->getResponse()->isOk());
@@ -189,7 +189,7 @@ class RSSFeedTest extends \PhraseanetWebTestCase
 
     public function testPrivateFeedAccess()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
         self::$DI['client']->request("GET", "/feeds/feed/" . $feed->getId() . "/rss/");
         $this->assertFalse(self::$DI['client']->getResponse()->isOk());
         $this->assertEquals(403, self::$DI['client']->getResponse()->getStatusCode());
diff --git a/tests/Alchemy/Tests/Phrasea/Core/Middleware/BasketMiddlewareProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Middleware/BasketMiddlewareProviderTest.php
index b94d2b9bb6..7ce34805f6 100644
--- a/tests/Alchemy/Tests/Phrasea/Core/Middleware/BasketMiddlewareProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Middleware/BasketMiddlewareProviderTest.php
@@ -39,7 +39,7 @@ class BasketMiddlewareProviderTest extends MiddlewareProviderTestCase
         $this->authenticate(self::$DI['app']);
         self::$DI['app']->register(new BasketMiddlewareProvider());
         $request = new Request();
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 1);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 1);
         $request->attributes->set('basket', $basket->getId());
         call_user_func(self::$DI['app']['middleware.basket.converter'], $request, self::$DI['app']);
         $this->assertSame($basket, $request->attributes->get('basket'));
@@ -59,7 +59,7 @@ class BasketMiddlewareProviderTest extends MiddlewareProviderTestCase
         $this->authenticate(self::$DI['app']);
         self::$DI['app']->register(new BasketMiddlewareProvider());
         $request = new Request();
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 1);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 1);
         $request->attributes->set('basket', $basket);
         call_user_func(self::$DI['app']['middleware.basket.user-access'], $request, self::$DI['app']);
     }
@@ -69,7 +69,7 @@ class BasketMiddlewareProviderTest extends MiddlewareProviderTestCase
         $this->authenticate(self::$DI['app']);
         self::$DI['app']->register(new BasketMiddlewareProvider());
         $request = new Request();
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 3);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 3);
         $request->attributes->set('basket', $basket);
         $this->setExpectedException('Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException', 'Current user does not have access to the basket');
         call_user_func(self::$DI['app']['middleware.basket.user-access'], $request, self::$DI['app']);
diff --git a/tests/Alchemy/Tests/Phrasea/Core/Provider/ORMServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/ORMServiceProviderTest.php
index ad0ddc0e4e..c1243fc473 100644
--- a/tests/Alchemy/Tests/Phrasea/Core/Provider/ORMServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/ORMServiceProviderTest.php
@@ -12,7 +12,7 @@ class ORMServiceProviderTest extends ServiceProviderTestCase
         return [
             ['Alchemy\Phrasea\Core\Provider\ORMServiceProvider', 'EM', 'Doctrine\\ORM\\EntityManager'],
             ['Alchemy\Phrasea\Core\Provider\ORMServiceProvider', 'EM.sql-logger', 'Alchemy\\Phrasea\\Model\\MonologSQLLogger'],
-            ['Alchemy\Phrasea\Core\Provider\ORMServiceProvider', 'EM.driver', 'Doctrine\\ORM\Mapping\\Driver\\DriverChain'],
+            ['Alchemy\Phrasea\Core\Provider\ORMServiceProvider', 'EM.driver', 'Doctrine\\Common\\Persistence\\Mapping\\Driver\\MappingDriverChain'],
             ['Alchemy\Phrasea\Core\Provider\ORMServiceProvider', 'EM.config', 'Doctrine\\ORM\\Configuration'],
             ['Alchemy\Phrasea\Core\Provider\ORMServiceProvider', 'EM.events-manager', 'Doctrine\\Common\\EventManager'],
         ];
diff --git a/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php b/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php
index 5b78a6cc43..f649fb6272 100644
--- a/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php
@@ -30,7 +30,7 @@ class AggregateLinkGeneratorTest extends \PhraseanetTestCase
             ->getMock();
 
         if ($alreadyCreated) {
-            $token = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\AggregateToken', 1);
+            $token = self::$DI['app']['EM']->find('Phraseanet:AggregateToken', 1);
             $tokenValue = $token->getValue();
         }
 
@@ -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 b9dd0dbae3..35d5b7b3f3 100644
--- a/tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php
@@ -13,14 +13,14 @@ class FeedLinkGeneratorTest extends \PhraseanetTestCase
     public function testGenerate($expected, $format, $page, $renew, $alreadyCreated)
     {
         $user = self::$DI['user'];
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
 
         $generator = $this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGenerator')
             ->disableOriginalConstructor()
             ->getMock();
 
         if ($alreadyCreated) {
-            $token = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\FeedToken', 1);
+            $token = self::$DI['app']['EM']->find('Phraseanet:FeedToken', 1);
             $tokenValue = $token->getValue();
         }
 
@@ -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']]));
         }
     }
@@ -100,7 +100,7 @@ class FeedLinkGeneratorTest extends \PhraseanetTestCase
      */
     public function testGeneratePublic($expected, $format, $page)
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
 
         $generator = $this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGenerator')
             ->disableOriginalConstructor()
diff --git a/tests/Alchemy/Tests/Phrasea/Model/Converter/BasketConverterTest.php b/tests/Alchemy/Tests/Phrasea/Model/Converter/BasketConverterTest.php
index cf3824e53d..2a1c6e5c40 100644
--- a/tests/Alchemy/Tests/Phrasea/Model/Converter/BasketConverterTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Model/Converter/BasketConverterTest.php
@@ -8,7 +8,7 @@ class BasketConverterTest extends \PhraseanetTestCase
 {
     public function testConvert()
     {
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 1);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 1);
 
         $converter = new BasketConverter(self::$DI['app']['EM']);
         $this->assertSame($basket, $converter->convert($basket->getId()));
diff --git a/tests/Alchemy/Tests/Phrasea/Model/Converter/TaskConverterTest.php b/tests/Alchemy/Tests/Phrasea/Model/Converter/TaskConverterTest.php
index b848e87faa..e8f168b4ba 100644
--- a/tests/Alchemy/Tests/Phrasea/Model/Converter/TaskConverterTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Model/Converter/TaskConverterTest.php
@@ -8,7 +8,7 @@ class TaskConverterTest extends \PhraseanetTestCase
 {
     public function testConvert()
     {
-        $task = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Task', 1);
+        $task = self::$DI['app']['EM']->find('Phraseanet:Task', 1);
 
         $converter = new TaskConverter(self::$DI['app']['EM']);
         $this->assertSame($task, $converter->convert(1));
diff --git a/tests/Alchemy/Tests/Phrasea/Model/Manipulator/TaskManipulatorTest.php b/tests/Alchemy/Tests/Phrasea/Model/Manipulator/TaskManipulatorTest.php
index 5ed712c4d3..504ca70cbb 100644
--- a/tests/Alchemy/Tests/Phrasea/Model/Manipulator/TaskManipulatorTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Model/Manipulator/TaskManipulatorTest.php
@@ -41,7 +41,7 @@ class TaskManipulatorTest extends \PhraseanetTestCase
         $task->setName('new name');
         $this->assertSame($task, $manipulator->update($task));
         self::$DI['app']['EM']->clear();
-        $updated = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Task', 1);
+        $updated = self::$DI['app']['EM']->find('Phraseanet:Task', 1);
         $this->assertEquals($task, $updated);
     }
 
@@ -107,7 +107,7 @@ class TaskManipulatorTest extends \PhraseanetTestCase
     public function testGetRepository()
     {
         $manipulator = new TaskManipulator(self::$DI['app']['EM'], $this->createNotifierMock(), self::$DI['app']['translator']);
-        $this->assertSame(self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Task'), $manipulator->getRepository());
+        $this->assertSame(self::$DI['app']['EM']->getRepository('Phraseanet:Task'), $manipulator->getRepository());
     }
 
     public function testCreateEmptyCollection()
@@ -122,7 +122,7 @@ class TaskManipulatorTest extends \PhraseanetTestCase
         $manipulator = new TaskManipulator(self::$DI['app']['EM'], $this->createNotifierMock(), self::$DI['app']['translator']);
         $task = $manipulator->createEmptyCollectionJob($collection);
 
-        $tasks = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Task')->findAll();
+        $tasks = self::$DI['app']['EM']->getRepository('Phraseanet:Task')->findAll();
         $this->assertSame('EmptyCollection', $task->getJobId());
         $this->assertContains($task, $tasks);
         $settings = simplexml_load_string($task->getSettings());
@@ -130,12 +130,12 @@ class TaskManipulatorTest extends \PhraseanetTestCase
     }
     private function findAllTasks()
     {
-        return self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Task')->findAll();
+        return self::$DI['app']['EM']->getRepository('Phraseanet:Task')->findAll();
     }
 
     private function loadTask()
     {
-        return self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Task', 1);
+        return self::$DI['app']['EM']->find('Phraseanet:Task', 1);
     }
 
     private function createNotifierMock()
diff --git a/tests/Alchemy/Tests/Phrasea/Model/Repositories/FeedItemRepositoryTest.php b/tests/Alchemy/Tests/Phrasea/Model/Repositories/FeedItemRepositoryTest.php
index 0af59b5b3d..536bd67053 100644
--- a/tests/Alchemy/Tests/Phrasea/Model/Repositories/FeedItemRepositoryTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Model/Repositories/FeedItemRepositoryTest.php
@@ -9,28 +9,28 @@ class FeedItemRepositoryTest extends \PhraseanetTestCase
     public function testIs_record_in_public_feedInPublicFeed()
     {
         $record = self::$DI['record_7'];
-        $this->assertTrue(self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedItem')->isRecordInPublicFeed(self::$DI['app'], $record->get_sbas_id(), $record->get_record_id()));
+        $this->assertTrue(self::$DI['app']['EM']->getRepository('Phraseanet:FeedItem')->isRecordInPublicFeed(self::$DI['app'], $record->get_sbas_id(), $record->get_record_id()));
     }
 
     public function testIs_record_in_public_feedInPrivateFeed()
     {
         $record = self::$DI['record_2'];
-        $this->assertFalse(self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedItem')->isRecordInPublicFeed(self::$DI['app'], $record->get_sbas_id(), $record->get_record_id()));
+        $this->assertFalse(self::$DI['app']['EM']->getRepository('Phraseanet:FeedItem')->isRecordInPublicFeed(self::$DI['app'], $record->get_sbas_id(), $record->get_record_id()));
     }
 
     public function testLoadLatestItems()
     {
-        $this->assertCount(3, self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedItem')->loadLatest(self::$DI['app'], 20));
+        $this->assertCount(3, self::$DI['app']['EM']->getRepository('Phraseanet:FeedItem')->loadLatest(self::$DI['app'], 20));
     }
 
     public function testLoadLatestItemsLessItems()
     {
-        $this->assertCount(1, self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedItem')->loadLatest(self::$DI['app'], 1));
+        $this->assertCount(1, self::$DI['app']['EM']->getRepository('Phraseanet:FeedItem')->loadLatest(self::$DI['app'], 1));
     }
 
     public function testLoadLatestWithDeletedDatabox()
     {
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 2);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 2);
         $entry = $feed->getEntries()->first();
         $item = new FeedItem();
         $item->setEntry($entry)
@@ -61,6 +61,6 @@ class FeedItemRepositoryTest extends \PhraseanetTestCase
         self::$DI['app']['EM']->persist($entry);
         self::$DI['app']['EM']->flush();
 
-        $this->assertCount(4, self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\FeedItem')->loadLatest(self::$DI['app'], 20));
+        $this->assertCount(4, self::$DI['app']['EM']->getRepository('Phraseanet:FeedItem')->loadLatest(self::$DI['app'], 20));
     }
 }
diff --git a/tests/Alchemy/Tests/Phrasea/Model/Repositories/FtpExportRepositoryTest.php b/tests/Alchemy/Tests/Phrasea/Model/Repositories/FtpExportRepositoryTest.php
index 6283c51317..8724e81c69 100644
--- a/tests/Alchemy/Tests/Phrasea/Model/Repositories/FtpExportRepositoryTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Model/Repositories/FtpExportRepositoryTest.php
@@ -45,7 +45,7 @@ class FtpExportRepositoryTest extends \PhraseanetTestCase
         self::$DI['app']['EM']->flush();
 
         $crashed = self::$DI['app']['EM']
-                ->getRepository('Alchemy\Phrasea\Model\Entities\FtpExport')
+                ->getRepository('Phraseanet:FtpExport')
                 ->findCrashedExports();
 
         $this->assertCount(2, $crashed);
@@ -105,7 +105,7 @@ class FtpExportRepositoryTest extends \PhraseanetTestCase
         self::$DI['app']['EM']->flush();
 
         $crashed = self::$DI['app']['EM']
-                ->getRepository('Alchemy\Phrasea\Model\Entities\FtpExport')
+                ->getRepository('Phraseanet:FtpExport')
                 ->findCrashedExports(new \DateTime('-6 days'));
 
         $this->assertCount(2, $crashed);
@@ -187,7 +187,7 @@ class FtpExportRepositoryTest extends \PhraseanetTestCase
         self::$DI['app']['EM']->flush();
 
         $doables = self::$DI['app']['EM']
-                ->getRepository('Alchemy\Phrasea\Model\Entities\FtpExport')
+                ->getRepository('Phraseanet:FtpExport')
                 ->findDoableExports();
 
         $this->assertCount(2, $doables);
@@ -219,7 +219,7 @@ class FtpExportRepositoryTest extends \PhraseanetTestCase
         self::$DI['app']['EM']->flush();
 
         $exports = self::$DI['app']['EM']
-                ->getRepository('Alchemy\Phrasea\Model\Entities\FtpExport')
+                ->getRepository('Phraseanet:FtpExport')
                 ->findByUser(self::$DI['user']);
 
         $this->assertCount(2, $exports);
diff --git a/tests/Alchemy/Tests/Phrasea/Model/Repositories/TaskRepositoryTest.php b/tests/Alchemy/Tests/Phrasea/Model/Repositories/TaskRepositoryTest.php
index 6f35d8fd0b..124e3363d9 100644
--- a/tests/Alchemy/Tests/Phrasea/Model/Repositories/TaskRepositoryTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Model/Repositories/TaskRepositoryTest.php
@@ -8,14 +8,14 @@ class TaskRepositoryTest extends \PhraseanetTestCase
 {
     public function testFindActiveTask()
     {
-        $task1 = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Task', 1);
+        $task1 = self::$DI['app']['EM']->find('Phraseanet:Task', 1);
         $task1->setStatus(Task::STATUS_STOPPED);
-        $task2 = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Task', 2);
+        $task2 = self::$DI['app']['EM']->find('Phraseanet:Task', 2);
 
         self::$DI['app']['EM']->persist($task1);
         self::$DI['app']['EM']->flush();
 
-        $repository = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Task');
+        $repository = self::$DI['app']['EM']->getRepository('Phraseanet:Task');
         $this->assertSame([$task2], $repository->findActiveTasks());
 
         $task1->setStatus(Task::STATUS_STARTED);
diff --git a/tests/Alchemy/Tests/Phrasea/Model/Repositories/UserRepositoryTest.php b/tests/Alchemy/Tests/Phrasea/Model/Repositories/UserRepositoryTest.php
index 6882e0196d..1f8c43f971 100644
--- a/tests/Alchemy/Tests/Phrasea/Model/Repositories/UserRepositoryTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Model/Repositories/UserRepositoryTest.php
@@ -8,20 +8,20 @@ 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(1, count($users));
     }
 
     public function testFindByLogin()
     {
-        $user = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\User')->findByLogin('user1');
+        $user = self::$DI['app']['EM']->getRepository('Phraseanet:User')->findByLogin('user1');
         $this->assertInstanceOf('Alchemy\Phrasea\Model\Entities\User', $user);
-        $this->assertNull(self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\User')->findByLogin('wrong-login'));
+        $this->assertNull(self::$DI['app']['EM']->getRepository('Phraseanet:User')->findByLogin('wrong-login'));
     }
 
     public function testFindUserByEmail()
     {
-        $user = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\User')->findByEmail('user2@phraseanet.com');
+        $user = self::$DI['app']['EM']->getRepository('Phraseanet:User')->findByEmail('user2@phraseanet.com');
         $this->assertInstanceOf('Alchemy\Phrasea\Model\Entities\User', $user);
     }
 }
diff --git a/tests/Alchemy/Tests/Phrasea/TaskManager/Event/FinishedJobRemoverSubscriberTest.php b/tests/Alchemy/Tests/Phrasea/TaskManager/Event/FinishedJobRemoverSubscriberTest.php
index 39ff0e5f1a..96fffcb283 100644
--- a/tests/Alchemy/Tests/Phrasea/TaskManager/Event/FinishedJobRemoverSubscriberTest.php
+++ b/tests/Alchemy/Tests/Phrasea/TaskManager/Event/FinishedJobRemoverSubscriberTest.php
@@ -10,12 +10,12 @@ class FinishedJobRemoverSubscriberTest extends \PhraseanetTestCase
 {
     public function testOnJobFinish()
     {
-        $task = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Task', 1);
+        $task = self::$DI['app']['EM']->find('Phraseanet:Task', 1);
         $taskId = $task->getId();
 
         $subscriber = new FinishedJobRemoverSubscriber(self::$DI['app']['EM']);
         $subscriber->onJobFinish(new JobFinishedEvent($task));
 
-        $this->assertNull(self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Task')->find($taskId));
+        $this->assertNull(self::$DI['app']['EM']->getRepository('Phraseanet:Task')->find($taskId));
     }
 }
diff --git a/tests/Alchemy/Tests/Phrasea/TaskManager/LiveInformationTest.php b/tests/Alchemy/Tests/Phrasea/TaskManager/LiveInformationTest.php
index 260775c233..ac2a3c6cea 100644
--- a/tests/Alchemy/Tests/Phrasea/TaskManager/LiveInformationTest.php
+++ b/tests/Alchemy/Tests/Phrasea/TaskManager/LiveInformationTest.php
@@ -49,7 +49,7 @@ class LiveInformationTest extends \PhraseanetTestCase
 
     public function testItReturnsWorkingTaskStatus()
     {
-        $task = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Task', 1);
+        $task = self::$DI['app']['EM']->find('Phraseanet:Task', 1);
 
         $notifier = $this->createNotifierMock();
         $notifier->expects($this->once())
@@ -78,7 +78,7 @@ class LiveInformationTest extends \PhraseanetTestCase
 
     public function testItReturnsNonWorkingTaskStatus()
     {
-        $task = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Task', 1);
+        $task = self::$DI['app']['EM']->find('Phraseanet:Task', 1);
 
         $notifier = $this->createNotifierMock();
         $notifier->expects($this->once())
diff --git a/tests/Alchemy/Tests/Phrasea/TaskManager/Log/LogFileFactoryTest.php b/tests/Alchemy/Tests/Phrasea/TaskManager/Log/LogFileFactoryTest.php
index 13c84f3997..6a51ec1080 100644
--- a/tests/Alchemy/Tests/Phrasea/TaskManager/Log/LogFileFactoryTest.php
+++ b/tests/Alchemy/Tests/Phrasea/TaskManager/Log/LogFileFactoryTest.php
@@ -9,7 +9,7 @@ class LogFileFactoryTest extends \PhraseanetTestCase
 {
     public function testForTask()
     {
-        $task = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Task', 1);
+        $task = self::$DI['app']['EM']->find('Phraseanet:Task', 1);
 
         $root = __DIR__ . '/root';
         $factory = new LogFilefactory($root);
diff --git a/tests/Alchemy/Tests/Phrasea/TaskManager/Log/TaskLogFileTest.php b/tests/Alchemy/Tests/Phrasea/TaskManager/Log/TaskLogFileTest.php
index dec32be22b..21edd00e2e 100644
--- a/tests/Alchemy/Tests/Phrasea/TaskManager/Log/TaskLogFileTest.php
+++ b/tests/Alchemy/Tests/Phrasea/TaskManager/Log/TaskLogFileTest.php
@@ -19,7 +19,7 @@ class TaskLogFileTest extends LogFileTestCase
 
     protected function getLogFile($root)
     {
-        $task = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Task', 1);
+        $task = self::$DI['app']['EM']->find('Phraseanet:Task', 1);
 
         return new TaskLogFile($root, $task);
     }
diff --git a/tests/Alchemy/Tests/Phrasea/TaskManager/TaskListTest.php b/tests/Alchemy/Tests/Phrasea/TaskManager/TaskListTest.php
index c333d4445e..2fc6fa0c16 100644
--- a/tests/Alchemy/Tests/Phrasea/TaskManager/TaskListTest.php
+++ b/tests/Alchemy/Tests/Phrasea/TaskManager/TaskListTest.php
@@ -30,7 +30,7 @@ class TaskListTest extends \PhraseanetTestCase
         self::$DI['app']['EM']->persist($task3);
         self::$DI['app']['EM']->flush();
 
-        return new TaskList(self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Task'), self::$DI['app']['root.path'], '/path/to/php', '/path/to/php-conf');
+        return new TaskList(self::$DI['app']['EM']->getRepository('Phraseanet:Task'), self::$DI['app']['root.path'], '/path/to/php', '/path/to/php-conf');
     }
 
     public function testThatProcessHaveNoTimeout()
diff --git a/tests/classes/Doctrine/Repositories/UsrAuthProviderRepositoryTest.php b/tests/classes/Doctrine/Repositories/UsrAuthProviderRepositoryTest.php
index 44025db94f..652c1dbc33 100644
--- a/tests/classes/Doctrine/Repositories/UsrAuthProviderRepositoryTest.php
+++ b/tests/classes/Doctrine/Repositories/UsrAuthProviderRepositoryTest.php
@@ -6,14 +6,14 @@ class UsrAuthProviderRepositoryTest extends \PhraseanetTestCase
 {
     public function testFindWithProviderAndIdIsNullWhenNotFound()
     {
-        $repo = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrAuthProvider');
+        $repo = self::$DI['app']['EM']->getRepository('Phraseanet:UsrAuthProvider');
 
         $this->assertNull($repo->findWithProviderAndId('provider-test', 12345));
     }
 
     public function testFindWithProviderAndIdReturnsOneResultWhenFound()
     {
-        $repo = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrAuthProvider');
+        $repo = self::$DI['app']['EM']->getRepository('Phraseanet:UsrAuthProvider');
 
         $auth = new UsrAuthProvider();
         $auth->setUsrId(42);
diff --git a/tests/classes/Doctrine/Repositories/ValidationParticipantRepositoryTest.php b/tests/classes/Doctrine/Repositories/ValidationParticipantRepositoryTest.php
index a2652dddba..973d8276c7 100644
--- a/tests/classes/Doctrine/Repositories/ValidationParticipantRepositoryTest.php
+++ b/tests/classes/Doctrine/Repositories/ValidationParticipantRepositoryTest.php
@@ -6,7 +6,7 @@ class ValidationParticipantRepositoryTest extends \PhraseanetAuthenticatedTestCa
     public function testFindNotConfirmedAndNotRemindedParticipants()
     {
         $em = self::$DI['app']['EM'];
-        $repo = $em->getRepository('Alchemy\Phrasea\Model\Entities\ValidationParticipant');
+        $repo = $em->getRepository('Phraseanet:ValidationParticipant');
         /* @var $repo Alchemy\Phrasea\Model\Repositories\ValidationParticipantRepository */
         $expireDate = new \DateTime('+8 days');
         $participants = $repo->findNotConfirmedAndNotRemindedParticipantsByExpireDate($expireDate);
diff --git a/tests/classes/PhraseanetTestCase.php b/tests/classes/PhraseanetTestCase.php
index e0c7ae071b..7021cf9dce 100644
--- a/tests/classes/PhraseanetTestCase.php
+++ b/tests/classes/PhraseanetTestCase.php
@@ -155,7 +155,7 @@ abstract class PhraseanetTestCase extends WebTestCase
         }
 
         self::$DI['lazaret_1'] = self::$DI->share(function ($DI) {
-            return $DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\LazaretFile', self::$fixtureIds['lazaret']['lazaret_1']);
+            return $DI['app']['EM']->find('Phraseanet:LazaretFile', self::$fixtureIds['lazaret']['lazaret_1']);
         });
 
         foreach (range(1, 7) as $i) {
diff --git a/tests/classes/api/v1/adapterTest.php b/tests/classes/api/v1/adapterTest.php
index 0dec40cefa..cab0b61ae4 100644
--- a/tests/classes/api/v1/adapterTest.php
+++ b/tests/classes/api/v1/adapterTest.php
@@ -337,7 +337,7 @@ class api_v1_adapterTest extends \PhraseanetAuthenticatedTestCase
 
     public function testGet_record_related()
     {
-        $basketElement = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\BasketElement', 1);
+        $basketElement = self::$DI['app']['EM']->find('Phraseanet:BasketElement', 1);
         $story = self::$DI['record_story_1'];
         $story->appendChild(self::$DI['record_1']);
 
@@ -553,7 +553,7 @@ class api_v1_adapterTest extends \PhraseanetAuthenticatedTestCase
 
     public function testDelete_basket()
     {
-        $Basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 1);
+        $Basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 1);
 
         $request = new Request([], [], [], [], [], ['HTTP_Accept' => 'application/json']);
         $result = $this->object->delete_basket($request, $Basket);
@@ -567,7 +567,7 @@ class api_v1_adapterTest extends \PhraseanetAuthenticatedTestCase
 
     public function testGet_basket()
     {
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 1);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 1);
 
         $request = new Request([], [], [], [], [], ['HTTP_Accept' => 'application/json']);
         $result = $this->object->get_basket($request, $basket);
@@ -578,7 +578,7 @@ class api_v1_adapterTest extends \PhraseanetAuthenticatedTestCase
 
     public function testSet_basket_title()
     {
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 1);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 1);
 
         $request = new Request([], [], ['name' => 'PROUTO'], [], [], ['HTTP_Accept' => 'application/json']);
         $result = $this->object->set_basket_title($request, $basket);
@@ -586,7 +586,7 @@ class api_v1_adapterTest extends \PhraseanetAuthenticatedTestCase
         $this->assertEquals('application/json', $result->get_content_type());
         $this->assertTrue(is_array(json_decode($result->format(), true)));
 
-        $repository = self::$DI['app']['EM']->getRepository('\Alchemy\Phrasea\Model\Entities\Basket');
+        $repository = self::$DI['app']['EM']->getRepository('Phraseanet:Basket');
 
         $ret_bask = $repository->find($basket->getId());
 
@@ -595,7 +595,7 @@ class api_v1_adapterTest extends \PhraseanetAuthenticatedTestCase
 
     public function testSet_basket_description()
     {
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 1);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 1);
 
         $request = new Request([], [], ['description' => 'une belle description'], [], [], ['HTTP_Accept' => 'application/json']);
         $result = $this->object->set_basket_description($request, $basket);
@@ -603,7 +603,7 @@ class api_v1_adapterTest extends \PhraseanetAuthenticatedTestCase
         $this->assertEquals('application/json', $result->get_content_type());
         $this->assertTrue(is_array(json_decode($result->format(), true)));
 
-        $repository = self::$DI['app']['EM']->getRepository('\Alchemy\Phrasea\Model\Entities\Basket');
+        $repository = self::$DI['app']['EM']->getRepository('Phraseanet:Basket');
 
         $ret_bask = $repository->find($basket->getId());
 
@@ -613,7 +613,7 @@ class api_v1_adapterTest extends \PhraseanetAuthenticatedTestCase
     public function testSearch_publications()
     {
         $request = new Request([], [], [], [], [], ['HTTP_Accept' => 'application/json']);
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', 1);
+        $feed = self::$DI['app']['EM']->find('Phraseanet:Feed', 1);
         $result = $this->object->search_publications($request, self::$DI['user']);
         $this->checkResponseField($result, "feeds", 'array');
     }
@@ -635,7 +635,7 @@ class api_v1_adapterTest extends \PhraseanetAuthenticatedTestCase
         $date = new DateTime();
         $request = new Request([], [], [], [], [], ['HTTP_Accept'    => 'application/json']);
 
-        $feeds = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Feed')->getAllForUser(self::$DI['app']['acl']->get(self::$DI['user']));
+        $feeds = self::$DI['app']['EM']->getRepository('Phraseanet:Feed')->getAllForUser(self::$DI['app']['acl']->get(self::$DI['user']));
         foreach ($feeds as $feed) {
             $result = $this->object->get_publication($request, $feed->getId(), self::$DI['user']);
             $this->checkResponseField($result, "feed", 'array');
diff --git a/tests/classes/record/adapterTest.php b/tests/classes/record/adapterTest.php
index 62e7b76b10..a5ac2a096d 100644
--- a/tests/classes/record/adapterTest.php
+++ b/tests/classes/record/adapterTest.php
@@ -463,7 +463,7 @@ class record_adapterTest extends \PhraseanetAuthenticatedTestCase
 
     public function testGet_container_baskets()
     {
-        $basket = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Basket', 1);
+        $basket = self::$DI['app']['EM']->find('Phraseanet:Basket', 1);
         $found = $sselcont_id = false;
 
         $sbas_id = self::$DI['record_1']->get_sbas_id();
diff --git a/tests/classes/userTest.php b/tests/classes/userTest.php
index 6fb1faa683..a3fb4a9e1b 100644
--- a/tests/classes/userTest.php
+++ b/tests/classes/userTest.php
@@ -45,7 +45,7 @@ class userTest extends \PhraseanetTestCase
 
         $user->delete();
 
-        $repo = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\UsrAuthProvider');
+        $repo = self::$DI['app']['EM']->getRepository('Phraseanet:UsrAuthProvider');
         $this->assertNull($repo->findWithProviderAndId('custom-one', 12345));
     }
 
@@ -68,7 +68,7 @@ class userTest extends \PhraseanetTestCase
 
         $user->delete();
 
-        $repo = self::$DI['app']['EM']->getRepository('Alchemy\Phrasea\Model\Entities\Session');
+        $repo = self::$DI['app']['EM']->getRepository('Phraseanet:Session');
         $this->assertCount(0, $repo->findByUser($user));
     }