From ab51202bb9530fed75d8c90cb6e7e2b301222239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Parafi=C5=84ski?= <dawid.parafinski@ez.no>
Date: Wed, 19 Jan 2022 09:13:34 +0100
Subject: [PATCH 1/5] IBX-1853: Changed services names to FQCN or rebranded
 ones

---
 .../Compiler/FieldTypeProcessorPass.php       |   4 +-
 .../Compiler/InputHandlerPass.php             |   4 +-
 .../Compiler/InputParserPass.php              |   4 +-
 .../Compiler/OutputVisitorPass.php            |   4 +-
 .../Compiler/ValueObjectVisitorPass.php       |   4 +-
 .../Security/RestSessionBasedFactory.php      |   6 +-
 src/bundle/Resources/config/input_parsers.yml | 529 +++++++++---------
 src/bundle/Resources/config/routing.yml       | 300 +++++-----
 src/bundle/Resources/config/security.yml      |  10 +-
 src/bundle/Resources/config/services.yml      | 268 ++++-----
 .../config/value_object_visitors.yml          | 426 +++++++-------
 .../Compiler/FieldTypeProcessorPassTest.php   |   4 +-
 .../Compiler/InputHandlerPassTest.php         |   4 +-
 .../Compiler/InputParserPassTest.php          |   4 +-
 .../Compiler/OutputVisitorPassTest.php        |  10 +-
 .../Compiler/ValueObjectVisitorPassTest.php   |   4 +-
 16 files changed, 793 insertions(+), 792 deletions(-)

diff --git a/src/bundle/DependencyInjection/Compiler/FieldTypeProcessorPass.php b/src/bundle/DependencyInjection/Compiler/FieldTypeProcessorPass.php
index 748e03fe..34263c52 100644
--- a/src/bundle/DependencyInjection/Compiler/FieldTypeProcessorPass.php
+++ b/src/bundle/DependencyInjection/Compiler/FieldTypeProcessorPass.php
@@ -17,11 +17,11 @@ class FieldTypeProcessorPass implements CompilerPassInterface
 
     public function process(ContainerBuilder $container)
     {
-        if (!$container->hasDefinition('ezpublish_rest.field_type_processor_registry')) {
+        if (!$container->hasDefinition(\Ibexa\Rest\FieldTypeProcessorRegistry::class)) {
             return;
         }
 
-        $definition = $container->getDefinition('ezpublish_rest.field_type_processor_registry');
+        $definition = $container->getDefinition(\Ibexa\Rest\FieldTypeProcessorRegistry::class);
 
         $taggedServiceIds = $container->findTaggedServiceIds(
             self::FIELD_TYPE_PROCESSOR_SERVICE_TAG
diff --git a/src/bundle/DependencyInjection/Compiler/InputHandlerPass.php b/src/bundle/DependencyInjection/Compiler/InputHandlerPass.php
index b8874a81..1429bae9 100644
--- a/src/bundle/DependencyInjection/Compiler/InputHandlerPass.php
+++ b/src/bundle/DependencyInjection/Compiler/InputHandlerPass.php
@@ -22,11 +22,11 @@ class InputHandlerPass implements CompilerPassInterface
 
     public function process(ContainerBuilder $container)
     {
-        if (!$container->hasDefinition('ezpublish_rest.input.dispatcher')) {
+        if (!$container->hasDefinition(\Ibexa\Rest\Input\Dispatcher::class)) {
             return;
         }
 
-        $definition = $container->getDefinition('ezpublish_rest.input.dispatcher');
+        $definition = $container->getDefinition(\Ibexa\Rest\Input\Dispatcher::class);
 
         $taggedServiceIds = $container->findTaggedServiceIds(self::INPUT_HANDLER_SERVICE_TAG);
         foreach ($taggedServiceIds as $id => $attributes) {
diff --git a/src/bundle/DependencyInjection/Compiler/InputParserPass.php b/src/bundle/DependencyInjection/Compiler/InputParserPass.php
index bf8d3401..e93b01e6 100644
--- a/src/bundle/DependencyInjection/Compiler/InputParserPass.php
+++ b/src/bundle/DependencyInjection/Compiler/InputParserPass.php
@@ -22,11 +22,11 @@ class InputParserPass implements CompilerPassInterface
 
     public function process(ContainerBuilder $container)
     {
-        if (!$container->hasDefinition('ezpublish_rest.input.parsing_dispatcher')) {
+        if (!$container->hasDefinition(\Ibexa\Contracts\Rest\Input\ParsingDispatcher::class)) {
             return;
         }
 
-        $definition = $container->getDefinition('ezpublish_rest.input.parsing_dispatcher');
+        $definition = $container->getDefinition(\Ibexa\Contracts\Rest\Input\ParsingDispatcher::class);
 
         $taggedServiceIds = $container->findTaggedServiceIds(self::INPUT_PARSER_SERVICE_TAG);
         foreach ($taggedServiceIds as $id => $attributes) {
diff --git a/src/bundle/DependencyInjection/Compiler/OutputVisitorPass.php b/src/bundle/DependencyInjection/Compiler/OutputVisitorPass.php
index 5c04c926..d7e8cf73 100644
--- a/src/bundle/DependencyInjection/Compiler/OutputVisitorPass.php
+++ b/src/bundle/DependencyInjection/Compiler/OutputVisitorPass.php
@@ -24,11 +24,11 @@ class OutputVisitorPass implements CompilerPassInterface
 
     public function process(ContainerBuilder $container)
     {
-        if (!$container->hasDefinition('ezpublish_rest.output.visitor.dispatcher')) {
+        if (!$container->hasDefinition(\Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher::class)) {
             return;
         }
 
-        $definition = $container->getDefinition('ezpublish_rest.output.visitor.dispatcher');
+        $definition = $container->getDefinition(\Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher::class);
 
         $visitors = [];
 
diff --git a/src/bundle/DependencyInjection/Compiler/ValueObjectVisitorPass.php b/src/bundle/DependencyInjection/Compiler/ValueObjectVisitorPass.php
index b108c90c..8860fd4e 100644
--- a/src/bundle/DependencyInjection/Compiler/ValueObjectVisitorPass.php
+++ b/src/bundle/DependencyInjection/Compiler/ValueObjectVisitorPass.php
@@ -20,11 +20,11 @@ class ValueObjectVisitorPass implements CompilerPassInterface
 
     public function process(ContainerBuilder $container)
     {
-        if (!$container->hasDefinition('ezpublish_rest.output.value_object_visitor.dispatcher')) {
+        if (!$container->hasDefinition(\Ibexa\Contracts\Rest\Output\ValueObjectVisitorDispatcher::class)) {
             return;
         }
 
-        $definition = $container->getDefinition('ezpublish_rest.output.value_object_visitor.dispatcher');
+        $definition = $container->getDefinition(\Ibexa\Contracts\Rest\Output\ValueObjectVisitorDispatcher::class);
 
         $taggedServiceIds = $container->findTaggedServiceIds(
             self::OUTPUT_VALUE_OBJECT_VISITOR_SERVICE_TAG
diff --git a/src/bundle/DependencyInjection/Security/RestSessionBasedFactory.php b/src/bundle/DependencyInjection/Security/RestSessionBasedFactory.php
index 6a0165b2..8d584a54 100644
--- a/src/bundle/DependencyInjection/Security/RestSessionBasedFactory.php
+++ b/src/bundle/DependencyInjection/Security/RestSessionBasedFactory.php
@@ -34,14 +34,14 @@ protected function createListener($container, $id, $config, $userProvider)
         /* @var \Symfony\Component\DependencyInjection\ContainerBuilder $container */
         $listenerId .= '.' . $id;
         $container->setDefinition($listenerId, $listener);
-        $container->setAlias('ezpublish_rest.session_authenticator', $listenerId);
+        $container->setAlias('ibexa.rest.session_authenticator', $listenerId);
 
         if ($container->hasDefinition('security.logout_listener.' . $id)) {
             // Copying logout handlers to REST session authenticator, to allow proper logout using it.
             $logoutListenerDef = $container->getDefinition('security.logout_listener.' . $id);
             $logoutListenerDef->addMethodCall(
                 'addHandler',
-                [new Reference('ezpublish_rest.security.authentication.logout_handler')]
+                [new Reference(\Ibexa\Rest\Server\Security\RestLogoutHandler::class)]
             );
 
             foreach ($logoutListenerDef->getMethodCalls() as $callArray) {
@@ -58,7 +58,7 @@ protected function createListener($container, $id, $config, $userProvider)
 
     protected function getListenerId(): string
     {
-        return 'ezpublish_rest.security.authentication.listener.session';
+        return 'ibexa.rest.security.authentication.listener.session';
     }
 
     public function getPosition(): string
diff --git a/src/bundle/Resources/config/input_parsers.yml b/src/bundle/Resources/config/input_parsers.yml
index 96daf181..749e8142 100644
--- a/src/bundle/Resources/config/input_parsers.yml
+++ b/src/bundle/Resources/config/input_parsers.yml
@@ -79,499 +79,500 @@ parameters:
     ezpublish_rest.input.parser.internal.path_string_route_based_limitation.class: Ibexa\Rest\Server\Input\Parser\Limitation\PathStringRouteBasedLimitationParser
 
 services:
-    ezpublish_rest.input.parser:
+    Ibexa\Rest\Server\Common\Parser:
         class: "%ezpublish_rest.input.parser.class%"
         abstract: true
         calls:
-            - [ setRequestParser, [ "@ezpublish_rest.request_parser" ] ]
+            - [ setRequestParser, [ '@Ibexa\Bundle\Rest\RequestParser\Router' ] ]
 
-    ezpublish_rest.input.parser.ContentObjectStates:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Input\Parser\ContentObjectStates:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.ContentObjectStates.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.ContentObjectStates }
 
     # Rest server
 
-    ezpublish_rest.input.parser.ContentCreate:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\ContentCreate:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.ContentCreate.class%"
         arguments:
-            - "@ezpublish.api.service.content"
-            - "@ezpublish.api.service.content_type"
-            - "@ezpublish_rest.field_type_parser"
-            - "@ezpublish_rest.input.parser.LocationCreate"
-            - "@ezpublish_rest.parser_tools"
+            - '@ibexa.api.service.content'
+            - '@ibexa.api.service.content_type'
+            - '@Ibexa\Rest\Input\FieldTypeParser'
+            - '@Ibexa\Rest\Server\Input\Parser\LocationCreate'
+            - '@Ibexa\Rest\Input\ParserTools'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.ContentCreate }
 
-    ezpublish_rest.input.parser.ContentUpdate:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\ContentUpdate:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.ContentUpdate.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.ContentUpdate }
 
-    ezpublish_rest.input.parser.ContentTypeCreate:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\ContentTypeCreate:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.ContentTypeCreate.class%"
         arguments:
-            - "@ezpublish.api.service.content_type"
-            - "@ezpublish_rest.input.parser.FieldDefinitionCreate"
-            - "@ezpublish_rest.parser_tools"
+            - '@ibexa.api.service.content_type'
+            - '@Ibexa\Rest\Server\Input\Parser\FieldDefinitionCreate'
+            - '@Ibexa\Rest\Input\ParserTools'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.ContentTypeCreate }
 
-    ezpublish_rest.input.parser.ContentTypeGroupInput:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\ContentTypeGroupInput:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.ContentTypeGroupInput.class%"
         arguments:
-            - "@ezpublish.api.service.content_type"
-            - "@ezpublish_rest.parser_tools"
+            - '@ibexa.api.service.content_type'
+            - '@Ibexa\Rest\Input\ParserTools'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.ContentTypeGroupInput }
 
-    ezpublish_rest.input.parser.ContentTypeUpdate:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\ContentTypeUpdate:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.ContentTypeUpdate.class%"
         arguments:
-            - "@ezpublish.api.service.content_type"
-            - "@ezpublish_rest.parser_tools"
+            - '@ibexa.api.service.content_type'
+            - '@Ibexa\Rest\Input\ParserTools'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.ContentTypeUpdate }
 
-    ezpublish_rest.input.parser.FieldDefinitionCreate:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\FieldDefinitionCreate:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.FieldDefinitionCreate.class%"
         arguments:
-            - "@ezpublish.api.service.content_type"
-            - "@ezpublish_rest.field_type_parser"
-            - "@ezpublish_rest.parser_tools"
+            - '@ibexa.api.service.content_type'
+            - '@Ibexa\Rest\Input\FieldTypeParser'
+            - '@Ibexa\Rest\Input\ParserTools'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.FieldDefinitionCreate }
 
-    ezpublish_rest.input.parser.FieldDefinitionUpdate:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\FieldDefinitionUpdate:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.FieldDefinitionUpdate.class%"
         arguments:
-            - "@ezpublish.api.service.content_type"
-            - "@ezpublish_rest.field_type_parser"
-            - "@ezpublish_rest.parser_tools"
+            - '@ibexa.api.service.content_type'
+            - '@Ibexa\Rest\Input\FieldTypeParser'
+            - '@Ibexa\Rest\Input\ParserTools'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.FieldDefinitionUpdate }
 
     Ibexa\Rest\Server\Input\Parser\JWTInput:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.JWTInput }
 
-    ezpublish_rest.input.parser.LocationCreate:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\LocationCreate:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.LocationCreate.class%"
         arguments:
-            - "@ezpublish.api.service.location"
-            - "@ezpublish_rest.parser_tools"
+            - '@ibexa.api.service.location'
+            - '@Ibexa\Rest\Input\ParserTools'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.LocationCreate }
 
-    ezpublish_rest.input.parser.LocationUpdate:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\LocationUpdate:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.LocationUpdate.class%"
         arguments:
-            - "@ezpublish.api.service.location"
-            - "@ezpublish_rest.parser_tools"
+            - '@ibexa.api.service.location'
+            - '@Ibexa\Rest\Input\ParserTools'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.LocationUpdate }
 
-    ezpublish_rest.input.parser.ObjectStateGroupCreate:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\ObjectStateGroupCreate:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.ObjectStateGroupCreate.class%"
         arguments:
-            - "@ezpublish.api.service.object_state"
-            - "@ezpublish_rest.parser_tools"
+            - '@ibexa.api.service.object_state'
+            - '@Ibexa\Rest\Input\ParserTools'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.ObjectStateGroupCreate }
 
-    ezpublish_rest.input.parser.ObjectStateGroupUpdate:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\ObjectStateGroupUpdate:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.ObjectStateGroupUpdate.class%"
         arguments:
-            - "@ezpublish.api.service.object_state"
-            - "@ezpublish_rest.parser_tools"
+            - '@ibexa.api.service.object_state'
+            - '@Ibexa\Rest\Input\ParserTools'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.ObjectStateGroupUpdate }
 
-    ezpublish_rest.input.parser.ObjectStateCreate:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\ObjectStateCreate:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.ObjectStateCreate.class%"
         arguments:
-            - "@ezpublish.api.service.object_state"
-            - "@ezpublish_rest.parser_tools"
+            - '@ibexa.api.service.object_state'
+            - '@Ibexa\Rest\Input\ParserTools'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.ObjectStateCreate }
 
-    ezpublish_rest.input.parser.ObjectStateUpdate:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\ObjectStateUpdate:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.ObjectStateUpdate.class%"
         arguments:
-            - "@ezpublish.api.service.object_state"
-            - "@ezpublish_rest.parser_tools"
+            - '@ibexa.api.service.object_state'
+            - '@Ibexa\Rest\Input\ParserTools'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.ObjectStateUpdate }
 
-    ezpublish_rest.input.parser.PolicyCreate:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\PolicyCreate:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.PolicyCreate.class%"
         arguments:
-            - "@ezpublish.api.service.role"
-            - "@ezpublish_rest.parser_tools"
+            - '@ibexa.api.service.role'
+            - '@Ibexa\Rest\Input\ParserTools'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.PolicyCreate }
 
-    ezpublish_rest.input.parser.PolicyUpdate:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\PolicyUpdate:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.PolicyUpdate.class%"
         arguments:
-            - "@ezpublish.api.service.role"
-            - "@ezpublish_rest.parser_tools"
+            - '@ibexa.api.service.role'
+            - '@Ibexa\Rest\Input\ParserTools'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.PolicyUpdate }
 
-    ezpublish_rest.input.parser.RelationCreate:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\RelationCreate:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.RelationCreate.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.RelationCreate }
 
-    ezpublish_rest.input.parser.RoleAssignInput:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\RoleAssignInput:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.RoleAssignInput.class%"
         arguments:
-            - "@ezpublish_rest.parser_tools"
+            - '@Ibexa\Rest\Input\ParserTools'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.RoleAssignInput }
 
-    ezpublish_rest.input.parser.RoleInput:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\RoleInput:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.RoleInput.class%"
         arguments:
-            - "@ezpublish.api.service.role"
-            - "@ezpublish_rest.parser_tools"
+            - '@ibexa.api.service.role'
+            - '@Ibexa\Rest\Input\ParserTools'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.RoleInput }
 
-    ezpublish_rest.input.parser.SectionInput:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\SectionInput:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.SectionInput.class%"
         arguments:
-            - "@ezpublish.api.service.section"
+            - '@ibexa.api.service.section'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.SectionInput }
 
-    ezpublish_rest.input.parser.SessionInput:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\SessionInput:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.SessionInput.class%"
         arguments:
-            - "@ezpublish_rest.parser_tools"
+            - '@Ibexa\Rest\Input\ParserTools'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.SessionInput }
 
-    ezpublish_rest.input.parser.UserGroupUpdate:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\UserGroupUpdate:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.UserGroupUpdate.class%"
         arguments:
-            - "@ezpublish.api.service.user"
-            - "@ezpublish.api.service.content"
-            - "@ezpublish.api.service.location"
-            - "@ezpublish_rest.field_type_parser"
+            - '@ibexa.api.service.user'
+            - '@ibexa.api.service.content'
+            - '@ibexa.api.service.location'
+            - '@Ibexa\Rest\Input\FieldTypeParser'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.UserGroupUpdate }
 
-    ezpublish_rest.input.parser.URLAliasCreate:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\URLAliasCreate:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.URLAliasCreate.class%"
         arguments:
-            - "@ezpublish_rest.parser_tools"
+            - '@Ibexa\Rest\Input\ParserTools'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.UrlAliasCreate }
 
-    ezpublish_rest.input.parser.URLWildcardCreate:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\URLWildcardCreate:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.UrlWildcardCreate.class%"
         arguments:
-            - "@ezpublish_rest.parser_tools"
+            - '@Ibexa\Rest\Input\ParserTools'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.UrlWildcardCreate }
 
-    ezpublish_rest.input.parser.UserCreate:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\UserCreate:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.UserCreate.class%"
         arguments:
-            - "@ezpublish.api.service.user"
-            - "@ezpublish.api.service.content_type"
-            - "@ezpublish_rest.field_type_parser"
-            - "@ezpublish_rest.parser_tools"
+            - '@ibexa.api.service.user'
+            - '@ibexa.api.service.content_type'
+            - '@Ibexa\Rest\Input\FieldTypeParser'
+            - '@Ibexa\Rest\Input\ParserTools'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.UserCreate }
 
-    ezpublish_rest.input.parser.UserGroupCreate:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\UserGroupCreate:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.UserGroupCreate.class%"
         arguments:
-            - "@ezpublish.api.service.user"
-            - "@ezpublish.api.service.content_type"
-            - "@ezpublish_rest.field_type_parser"
+            - '@ibexa.api.service.user'
+            - '@ibexa.api.service.content_type'
+            - '@Ibexa\Rest\Input\FieldTypeParser'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.UserGroupCreate }
 
-    ezpublish_rest.input.parser.UserUpdate:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\UserUpdate:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.UserUpdate.class%"
         arguments:
-            - "@ezpublish.api.service.user"
-            - "@ezpublish.api.service.content"
-            - "@ezpublish_rest.field_type_parser"
-            - "@ezpublish_rest.parser_tools"
+            - '@ibexa.api.service.user'
+            - '@ibexa.api.service.content'
+            - '@Ibexa\Rest\Input\FieldTypeParser'
+            - '@Ibexa\Rest\Input\ParserTools'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.UserUpdate }
 
-    ezpublish_rest.input.parser.ViewInput:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\ViewInput:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.ViewInput.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.ViewInput }
 
-    ezpublish_rest.input.parser.ViewInputOnedotOne:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\ViewInputOneDotOne:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.ViewInputOneDotOne.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: "application/vnd.ez.api.ViewInput; version=1.1" }
 
-    ezpublish_rest.input.parser.VersionUpdate:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\VersionUpdate:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.VersionUpdate.class%"
         arguments:
-            - "@ezpublish.api.service.content"
-            - "@ezpublish_rest.field_type_parser"
+            - '@ibexa.api.service.content'
+            - '@Ibexa\Rest\Input\FieldTypeParser'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.VersionUpdate }
 
     # internal Media-Types
-    ezpublish_rest.input.parser.internal.criterion.ContentQuery:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\ContentQuery:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.internal.ContentQuery.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.ContentQuery }
 
-    ezpublish_rest.input.parser.internal.criterion.LocationQuery:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\LocationQuery:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.internal.LocationQuery.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.LocationQuery }
 
-    ezpublish_rest.input.parser.internal.criterion.Ancestor:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\Criterion\Ancestor:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.internal.criterion.Ancestor.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.Ancestor }
 
-    ezpublish_rest.input.parser.internal.criterion.ContentId:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\Criterion\ContentId:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.internal.criterion.ContentId.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.ContentId }
 
-    ezpublish_rest.input.parser.internal.criterion.ContentRemoteId:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\Criterion\ContentRemoteId:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.internal.criterion.ContentRemoteId.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.ContentRemoteId }
 
-    ezpublish_rest.input.parser.internal.criterion.ContentTypeGroupId:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\Criterion\ContentTypeGroupId:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.internal.criterion.ContentTypeGroupId.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.ContentTypeGroupId }
 
-    ezpublish_rest.input.parser.internal.criterion.ContentTypeId:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\Criterion\ContentTypeId:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.internal.criterion.ContentTypeId.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.ContentTypeId }
 
-    ezpublish_rest.input.parser.internal.criterion.ContentTypeIdentifier:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\Criterion\ContentTypeIdentifier:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.internal.criterion.ContentTypeIdentifier.class%"
         arguments:
-            - "@ezpublish.api.service.content_type"
+            - '@ibexa.api.service.content_type'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.ContentTypeIdentifier }
 
-    ezpublish_rest.input.parser.internal.criterion.DateMetadata:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\Criterion\DateMetadata:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.internal.criterion.DateMetadata.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.DateMetadata }
 
-    ezpublish_rest.input.parser.internal.criterion.Field:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\Criterion\Field:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.internal.criterion.Field.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.Field }
 
-    ezpublish_rest.input.parser.internal.criterion.FullText:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\Criterion\FullText:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.internal.criterion.FullText.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.FullText }
 
-    ezpublish_rest.input.parser.internal.criterion.LanguageCode:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\Criterion\LanguageCode:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.internal.criterion.LanguageCode.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.LanguageCode }
-    ezpublish_rest.input.parser.internal.criterion.LocationId:
-        parent: ezpublish_rest.input.parser
+
+    Ibexa\Rest\Server\Input\Parser\Criterion\LocationId:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.internal.criterion.LocationId.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.LocationId }
 
-    ezpublish_rest.input.parser.internal.criterion.LocationRemoteId:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\Criterion\LocationRemoteId:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.internal.criterion.LocationRemoteId.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.LocationRemoteId }
 
-    ezpublish_rest.input.parser.internal.criterion.LogicalAnd:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\Criterion\LogicalAnd:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.internal.criterion.LogicalAnd.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.LogicalAnd }
 
-    ezpublish_rest.input.parser.internal.criterion.LogicalNot:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\Criterion\LogicalNot:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.internal.criterion.LogicalNot.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.LogicalNot }
 
-    ezpublish_rest.input.parser.internal.criterion.LogicalOperator:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\Criterion\LogicalOperator:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.internal.criterion.LogicalOperator.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.LogicalOperator }
 
-    ezpublish_rest.input.parser.internal.criterion.LogicalOr:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\Criterion\LogicalOr:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.internal.criterion.LogicalOr.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.LogicalOr }
 
-    ezpublish_rest.input.parser.internal.criterion.MoreLikeThis:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\Criterion\MoreLikeThis:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.internal.criterion.MoreLikeThis.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.MoreLikeThis }
 
-    ezpublish_rest.input.parser.internal.criterion.Operator:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\Criterion\Operator:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.internal.criterion.Operator.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.Operator }
 
-    ezpublish_rest.input.parser.internal.criterion.ParentLocationId:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\Criterion\ParentLocationId:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.internal.criterion.ParentLocationId.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.ParentLocationId }
 
-    ezpublish_rest.input.parser.internal.criterion.ParentLocationRemoteId:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\Criterion\ParentLocationRemoteId:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.internal.criterion.ParentLocationRemoteId.class%"
         arguments:
-            - "@ezpublish.api.service.location"
+            - '@ibexa.api.service.location'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.ParentLocationRemoteId }
 
-    ezpublish_rest.input.parser.internal.criterion.SectionIdentifier:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\Criterion\SectionIdentifier:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.internal.criterion.SectionIdentifier.class%"
         arguments:
-            - "@ezpublish.api.service.section"
+            - '@ibexa.api.service.section'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.SectionIdentifier }
 
-    ezpublish_rest.input.parser.internal.criterion.SectionId:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\Criterion\SectionId:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.internal.criterion.SectionId.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.SectionId }
 
-    ezpublish_rest.input.parser.internal.criterion.Subtree:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\Criterion\Subtree:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.internal.criterion.Subtree.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.Subtree }
 
-    ezpublish_rest.input.parser.internal.criterion.UserMetadata:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\Criterion\UserMetadata:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.internal.criterion.UserMetadata.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.UserMetadata }
 
     Ibexa\Rest\Server\Input\Parser\Criterion\IsUserBased:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         arguments:
-            $parserTools: '@ezpublish_rest.parser_tools'
+            $parserTools: '@Ibexa\Rest\Input\ParserTools'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.IsUserBased }
 
     Ibexa\Rest\Server\Input\Parser\Criterion\IsUserEnabled:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         arguments:
-            $parserTools: '@ezpublish_rest.parser_tools'
+            $parserTools: '@Ibexa\Rest\Input\ParserTools'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.IsUserEnabled }
 
     Ibexa\Rest\Server\Input\Parser\Criterion\UserId:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.UserId }
 
     Ibexa\Rest\Server\Input\Parser\Criterion\UserLogin:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.UserLogin }
 
     Ibexa\Rest\Server\Input\Parser\Criterion\UserEmail:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.UserEmail }
 
-    ezpublish_rest.input.parser.internal.criterion.ObjectStateId:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\Criterion\ObjectStateId:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.internal.criterion.ObjectStateId.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.ObjectStateId }
 
     Ibexa\Rest\Server\Input\Parser\Criterion\ObjectStateIdentifier:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.ObjectStateIdentifier }
 
-    ezpublish_rest.input.parser.internal.criterion.Visibility:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\Criterion\Visibility:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.internal.criterion.Visibility.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.Visibility }
 
     Ibexa\Rest\Server\Input\Parser\Criterion\Sibling:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         arguments:
-            $locationService: "@ezpublish.api.service.location"
+            $locationService: '@ibexa.api.service.location'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.criterion.Sibling }
 
-    ezpublish_rest.input.parser.internal.sortclause.content_id:
-        parent: ezpublish_rest.input.parser
+    ibexa.rest.input.parser.internal.sortclause.content_id:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: '%ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class%'
         arguments:
             - 'ContentId'
@@ -579,8 +580,8 @@ services:
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.ContentId }
 
-    ezpublish_rest.input.parser.internal.sortclause.content_name:
-        parent: ezpublish_rest.input.parser
+    ibexa.rest.input.parser.internal.sortclause.content_name:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: '%ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class%'
         arguments:
             - 'ContentName'
@@ -588,8 +589,8 @@ services:
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.ContentName }
 
-    ezpublish_rest.input.parser.internal.sortclause.date_modified:
-        parent: ezpublish_rest.input.parser
+    ibexa.rest.input.parser.internal.sortclause.date_modified:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: '%ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class%'
         arguments:
             - 'DateModified'
@@ -597,8 +598,8 @@ services:
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.DateModified }
 
-    ezpublish_rest.input.parser.internal.sortclause.date_published:
-        parent: ezpublish_rest.input.parser
+    ibexa.rest.input.parser.internal.sortclause.date_published:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: '%ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class%'
         arguments:
             - 'DatePublished'
@@ -606,8 +607,8 @@ services:
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.DatePublished }
 
-    ezpublish_rest.input.parser.internal.sortclause.location_depth:
-        parent: ezpublish_rest.input.parser
+    ibexa.rest.input.parser.internal.sortclause.location_depth:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: '%ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class%'
         arguments:
             - 'LocationDepth'
@@ -615,8 +616,8 @@ services:
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.LocationDepth }
 
-    ezpublish_rest.input.parser.internal.sortclause.location_path:
-        parent: ezpublish_rest.input.parser
+    ibexa.rest.input.parser.internal.sortclause.location_path:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: '%ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class%'
         arguments:
             - 'LocationPath'
@@ -624,8 +625,8 @@ services:
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.LocationPath }
 
-    ezpublish_rest.input.parser.internal.sortclause.location_priority:
-        parent: ezpublish_rest.input.parser
+    ibexa.rest.input.parser.internal.sortclause.location_priority:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: '%ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class%'
         arguments:
             - 'LocationPriority'
@@ -633,8 +634,8 @@ services:
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.LocationPriority }
 
-    ezpublish_rest.input.parser.internal.sortclause.location_id:
-        parent: ezpublish_rest.input.parser
+    ibexa.rest.input.parser.internal.sortclause.location_id:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: '%ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class%'
         arguments:
             - 'LocationId'
@@ -642,8 +643,8 @@ services:
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.LocationId }
 
-    ezpublish_rest.input.parser.internal.sortclause.section_identifier:
-        parent: ezpublish_rest.input.parser
+    ibexa.rest.input.parser.internal.sortclause.section_identifier:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: '%ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class%'
         arguments:
             - 'SectionIdentifier'
@@ -651,8 +652,8 @@ services:
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.SectionIdentifier }
 
-    ezpublish_rest.input.parser.internal.sortclause.SectionName:
-        parent: ezpublish_rest.input.parser
+    ibexa.rest.input.parser.internal.sortclause.SectionName:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: '%ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class%'
         arguments:
             - 'SectionName'
@@ -660,8 +661,8 @@ services:
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.SectionName }
 
-    ezpublish_rest.input.parser.internal.sortclause.score:
-        parent: ezpublish_rest.input.parser
+    ibexa.rest.input.parser.internal.sortclause.score:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: 'Ibexa\Rest\Server\Input\Parser\SortClause\DataKeyValueObjectClass'
         arguments:
             - 'Score'
@@ -669,62 +670,62 @@ services:
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.Score }
 
-    ezpublish_rest.input.parser.internal.sortclause.Field:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\SortClause\Field:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: '%ezpublish_rest.input.parser.internal.sortclause.field.class%'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.Field }
 
-    ezpublish_rest.input.parser.internal.facetbuilder.content_type:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\FacetBuilder\ContentTypeParser:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: '%ezpublish_rest.input.parser.internal.facetbuilder.content_type.class%'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.facetbuilder.ContentType }
 
-    ezpublish_rest.input.parser.internal.facetbuilder.criterion:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\FacetBuilder\CriterionParser:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: '%ezpublish_rest.input.parser.internal.facetbuilder.criterion.class%'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.facetbuilder.Criterion }
 
-    ezpublish_rest.input.parser.internal.facetbuilder.date_range:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\FacetBuilder\DateRangeParser:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: '%ezpublish_rest.input.parser.internal.facetbuilder.date_range.class%'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.facetbuilder.DateRange }
 
-    ezpublish_rest.input.parser.internal.facetbuilder.field:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\FacetBuilder\FieldParser:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: '%ezpublish_rest.input.parser.internal.facetbuilder.field.class%'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.facetbuilder.Field }
 
-    ezpublish_rest.input.parser.internal.facetbuilder.field_range:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\FacetBuilder\FieldRangeParser:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: '%ezpublish_rest.input.parser.internal.facetbuilder.field_range.class%'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.facetbuilder.FieldRange }
 
-    ezpublish_rest.input.parser.internal.facetbuilder.location:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\FacetBuilder\LocationParser:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: '%ezpublish_rest.input.parser.internal.facetbuilder.location.class%'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.facetbuilder.Location }
 
-    ezpublish_rest.input.parser.internal.facetbuilder.section:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\FacetBuilder\SectionParser:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: '%ezpublish_rest.input.parser.internal.facetbuilder.section.class%'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.facetbuilder.Section }
 
-    ezpublish_rest.input.parser.internal.facetbuilder.term:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\FacetBuilder\TermParser:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: '%ezpublish_rest.input.parser.internal.facetbuilder.term.class%'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.facetbuilder.Term }
 
-    ezpublish_rest.input.parser.internal.facetbuilder.user:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\FacetBuilder\UserParser:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: '%ezpublish_rest.input.parser.internal.facetbuilder.user.class%'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.facetbuilder.User }
@@ -732,149 +733,149 @@ services:
     # aggregation parsers
 
     Ibexa\Rest\Server\Input\Parser\Aggregation\Range\DateTimeRangeParser:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.aggregation.range.DateTimeRange }
 
     Ibexa\Rest\Server\Input\Parser\Aggregation\Range\FloatRangeParser:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.aggregation..range.FloatRange }
 
     Ibexa\Rest\Server\Input\Parser\Aggregation\Range\IntRangeParser:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.aggregation.range.IntRange }
 
     Ibexa\Rest\Server\Input\Parser\Aggregation\ContentTypeGroupTermAggregationParser:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.aggregation.ContentTypeGroupTermAggregation }
 
     Ibexa\Rest\Server\Input\Parser\Aggregation\ContentTypeTermAggregationParser:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.aggregation.ContentTypeTermAggregation }
 
     Ibexa\Rest\Server\Input\Parser\Aggregation\DateMetadataRangeAggregationParser:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.aggregation.DateMetadataRangeAggregation }
 
     Ibexa\Rest\Server\Input\Parser\Aggregation\Field\AuthorTermAggregationParser:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.aggregation.AuthorTermAggregation }
 
     Ibexa\Rest\Server\Input\Parser\Aggregation\Field\CheckboxTermAggregationParser:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.aggregation.CheckboxTermAggregation }
 
     Ibexa\Rest\Server\Input\Parser\Aggregation\Field\CountryTermAggregationParser:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.aggregation.CountryTermAggregation }
 
     Ibexa\Rest\Server\Input\Parser\Aggregation\Field\DateRangeAggregationParser:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.aggregation.DateRangeAggregation }
 
     Ibexa\Rest\Server\Input\Parser\Aggregation\Field\DateTimeRangeAggregationParser:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.aggregation.DateTimeRangeAggregation }
 
     Ibexa\Rest\Server\Input\Parser\Aggregation\Field\FloatRangeAggregationParser:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.aggregation.FloatRangeAggregation }
 
     Ibexa\Rest\Server\Input\Parser\Aggregation\Field\FloatStatsAggregationParser:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.aggregation.FloatStatsAggregation }
 
     Ibexa\Rest\Server\Input\Parser\Aggregation\Field\IntegerRangeAggregationParser:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.aggregation.IntegerRangeAggregation }
 
     Ibexa\Rest\Server\Input\Parser\Aggregation\Field\IntegerStatsAggregationParser:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.aggregation.IntegerStatsAggregation }
 
     Ibexa\Rest\Server\Input\Parser\Aggregation\Field\KeywordTermAggregationParser:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.aggregation.KeywordTermAggregation }
 
     Ibexa\Rest\Server\Input\Parser\Aggregation\Field\SelectionTermAggregationParser:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.aggregation.SelectionTermAggregation }
 
     Ibexa\Rest\Server\Input\Parser\Aggregation\Field\TimeRangeAggregationParser:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.aggregation.TimeRangeAggregation }
 
     Ibexa\Rest\Server\Input\Parser\Aggregation\LanguageTermAggregationParser:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.aggregation.LanguageTermAggregation }
 
     Ibexa\Rest\Server\Input\Parser\Aggregation\ObjectStateTermAggregationParser:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.aggregation.ObjectStateTermAggregation }
 
     Ibexa\Rest\Server\Input\Parser\Aggregation\RawRangeAggregationParser:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.aggregation.RawRangeAggregation }
 
     Ibexa\Rest\Server\Input\Parser\Aggregation\RawStatsAggregationParser:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.aggregation.RawStatsAggregation }
 
     Ibexa\Rest\Server\Input\Parser\Aggregation\RawTermAggregationParser:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.aggregation.RawTermAggregation }
 
     Ibexa\Rest\Server\Input\Parser\Aggregation\SectionTermAggregationParser:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.aggregation.SectionTermAggregation }
 
     Ibexa\Rest\Server\Input\Parser\Aggregation\Location\SubtreeTermAggregationParser:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.aggregation.SubtreeTermAggregation }
 
     Ibexa\Rest\Server\Input\Parser\Aggregation\Location\LocationChildrenTermAggregationParser:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.aggregation.LocationChildrenTermAggregation }
 
     Ibexa\Rest\Server\Input\Parser\Aggregation\UserMetadataTermAggregationParser:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.aggregation.UserMetadataTermAggregation }
 
     Ibexa\Rest\Server\Input\Parser\Aggregation\VisibilityTermAggregationParser:
-        parent: ezpublish_rest.input.parser
+        parent: Ibexa\Rest\Server\Common\Parser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.aggregation.VisibilityTermAggregation }
 
     # role limitation parsers
 
-    ezpublish_rest.input.parser.internal.limitation.Subtree:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\Limitation\PathStringRouteBasedLimitationParser:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.internal.path_string_route_based_limitation.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.limitation.Subtree }
@@ -882,8 +883,8 @@ services:
             - 'locationPath'
             - 'Ibexa\Contracts\Core\Repository\Values\User\Limitation\SubtreeLimitation'
 
-    ezpublish_rest.input.parser.internal.limitation.Section:
-        parent: ezpublish_rest.input.parser
+    Ibexa\Rest\Server\Input\Parser\Limitation\RouteBasedLimitationParser:
+        parent: Ibexa\Rest\Server\Common\Parser
         class: "%ezpublish_rest.input.parser.internal.route_based_limitation.class%"
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ez.api.internal.limitation.Section }
diff --git a/src/bundle/Resources/config/routing.yml b/src/bundle/Resources/config/routing.yml
index f67c9b87..72c776ca 100644
--- a/src/bundle/Resources/config/routing.yml
+++ b/src/bundle/Resources/config/routing.yml
@@ -4,7 +4,7 @@
 ezpublish_rest_loadRootResource:
     path: /
     defaults:
-        _controller: ezpublish_rest.controller.root:loadRootResource
+        _controller: Ibexa\Rest\Server\Controller\Root:loadRootResource
     methods: [GET]
 
 
@@ -14,19 +14,19 @@ ezpublish_rest_loadRootResource:
 ezpublish_rest_listSections:
     path: /content/sections
     defaults:
-        _controller: ezpublish_rest.controller.section:listSections
+        _controller: Ibexa\Rest\Server\Controller\Section:listSections
     methods: [GET]
 
 ezpublish_rest_createSection:
     path: /content/sections
     defaults:
-        _controller: ezpublish_rest.controller.section:createSection
+        _controller: Ibexa\Rest\Server\Controller\Section:createSection
     methods: [POST]
 
 ezpublish_rest_loadSection:
     path: /content/sections/{sectionId}
     defaults:
-        _controller: ezpublish_rest.controller.section:loadSection
+        _controller: Ibexa\Rest\Server\Controller\Section:loadSection
     methods: [GET]
     requirements:
         sectionId: \d+
@@ -34,7 +34,7 @@ ezpublish_rest_loadSection:
 ezpublish_rest_updateSection:
     path: /content/sections/{sectionId}
     defaults:
-        _controller: ezpublish_rest.controller.section:updateSection
+        _controller: Ibexa\Rest\Server\Controller\Section:updateSection
     methods: [PATCH]
     requirements:
         sectionId: \d+
@@ -42,7 +42,7 @@ ezpublish_rest_updateSection:
 ezpublish_rest_deleteSection:
     path: /content/sections/{sectionId}
     defaults:
-        _controller: ezpublish_rest.controller.section:deleteSection
+        _controller: Ibexa\Rest\Server\Controller\Section:deleteSection
     methods: [DELETE]
     requirements:
         sectionId: \d+
@@ -54,19 +54,19 @@ ezpublish_rest_deleteSection:
 ezpublish_rest_redirectContent:
     path: /content/objects
     defaults:
-        _controller: ezpublish_rest.controller.content:redirectContent
+        _controller: Ibexa\Rest\Server\Controller\Content:redirectContent
     methods: [GET]
 
 ezpublish_rest_createContent:
     path: /content/objects
     defaults:
-        _controller: ezpublish_rest.controller.content:createContent
+        _controller: Ibexa\Rest\Server\Controller\Content:createContent
     methods: [POST]
 
 ezpublish_rest_updateContentMetadata:
     path: /content/objects/{contentId}
     defaults:
-        _controller: ezpublish_rest.controller.content:updateContentMetadata
+        _controller: Ibexa\Rest\Server\Controller\Content:updateContentMetadata
     methods: [PATCH]
     requirements:
         contentId: \d+
@@ -74,7 +74,7 @@ ezpublish_rest_updateContentMetadata:
 ezpublish_rest_loadContent:
     path: /content/objects/{contentId}
     defaults:
-        _controller: ezpublish_rest.controller.content:loadContent
+        _controller: Ibexa\Rest\Server\Controller\Content:loadContent
     methods: [GET]
     requirements:
         contentId: \d+
@@ -82,7 +82,7 @@ ezpublish_rest_loadContent:
 ezpublish_rest_deleteContent:
     path: /content/objects/{contentId}
     defaults:
-        _controller: ezpublish_rest.controller.content:deleteContent
+        _controller: Ibexa\Rest\Server\Controller\Content:deleteContent
     methods: [DELETE]
     requirements:
         contentId: \d+
@@ -90,7 +90,7 @@ ezpublish_rest_deleteContent:
 ezpublish_rest_copyContent:
     path: /content/objects/{contentId}
     defaults:
-        _controller: ezpublish_rest.controller.content:copyContent
+        _controller: Ibexa\Rest\Server\Controller\Content:copyContent
     methods: [COPY]
     requirements:
         contentId: \d+
@@ -98,13 +98,13 @@ ezpublish_rest_copyContent:
 ezpublish_rest_deleteContentTranslation:
     path: /content/objects/{contentId}/translations/{languageCode}
     defaults:
-        _controller: ezpublish_rest.controller.content:deleteContentTranslation
+        _controller: Ibexa\Rest\Server\Controller\Content:deleteContentTranslation
     methods: [DELETE]
 
 ezpublish_rest_redirectCurrentVersionRelations:
     path: /content/objects/{contentId}/relations
     defaults:
-        _controller: ezpublish_rest.controller.content:redirectCurrentVersionRelations
+        _controller: Ibexa\Rest\Server\Controller\Content:redirectCurrentVersionRelations
     methods: [GET]
     requirements:
         contentId: \d+
@@ -112,7 +112,7 @@ ezpublish_rest_redirectCurrentVersionRelations:
 ezpublish_rest_loadContentVersions:
     path: /content/objects/{contentId}/versions
     defaults:
-        _controller: ezpublish_rest.controller.content:loadContentVersions
+        _controller: Ibexa\Rest\Server\Controller\Content:loadContentVersions
     methods: [GET]
     requirements:
         contentId: \d+
@@ -120,7 +120,7 @@ ezpublish_rest_loadContentVersions:
 ezpublish_rest_loadVersionRelations:
     path: /content/objects/{contentId}/versions/{versionNumber}/relations
     defaults:
-        _controller: ezpublish_rest.controller.content:loadVersionRelations
+        _controller: Ibexa\Rest\Server\Controller\Content:loadVersionRelations
     methods: [GET]
     requirements:
         contentId: \d+
@@ -129,7 +129,7 @@ ezpublish_rest_loadVersionRelations:
 ezpublish_rest_createRelation:
     path: /content/objects/{contentId}/versions/{versionNumber}/relations
     defaults:
-        _controller: ezpublish_rest.controller.content:createRelation
+        _controller: Ibexa\Rest\Server\Controller\Content:createRelation
     methods: [POST]
     requirements:
         contentId: \d+
@@ -138,7 +138,7 @@ ezpublish_rest_createRelation:
 ezpublish_rest_loadVersionRelation:
     path: /content/objects/{contentId}/versions/{versionNumber}/relations/{relationId}
     defaults:
-        _controller: ezpublish_rest.controller.content:loadVersionRelation
+        _controller: Ibexa\Rest\Server\Controller\Content:loadVersionRelation
     methods: [GET]
     requirements:
         contentId: \d+
@@ -148,7 +148,7 @@ ezpublish_rest_loadVersionRelation:
 ezpublish_rest_removeRelation:
     path: /content/objects/{contentId}/versions/{versionNumber}/relations/{relationId}
     defaults:
-        _controller: ezpublish_rest.controller.content:removeRelation
+        _controller: Ibexa\Rest\Server\Controller\Content:removeRelation
     methods: [DELETE]
     requirements:
         contentId: \d+
@@ -158,7 +158,7 @@ ezpublish_rest_removeRelation:
 ezpublish_rest_loadContentInVersion:
     path: /content/objects/{contentId}/versions/{versionNumber}
     defaults:
-        _controller: ezpublish_rest.controller.content:loadContentInVersion
+        _controller: Ibexa\Rest\Server\Controller\Content:loadContentInVersion
     methods: [GET]
     requirements:
         contentId: \d+
@@ -167,7 +167,7 @@ ezpublish_rest_loadContentInVersion:
 ezpublish_rest_updateVersion:
     path: /content/objects/{contentId}/versions/{versionNumber}
     defaults:
-        _controller: ezpublish_rest.controller.content:updateVersion
+        _controller: Ibexa\Rest\Server\Controller\Content:updateVersion
     methods: [PATCH]
     requirements:
         contentId: \d+
@@ -176,7 +176,7 @@ ezpublish_rest_updateVersion:
 ezpublish_rest_deleteContentVersion:
     path: /content/objects/{contentId}/versions/{versionNumber}
     defaults:
-        _controller: ezpublish_rest.controller.content:deleteContentVersion
+        _controller: Ibexa\Rest\Server\Controller\Content:deleteContentVersion
     methods: [DELETE]
     requirements:
         contentId: \d+
@@ -185,7 +185,7 @@ ezpublish_rest_deleteContentVersion:
 ezpublish_rest_deleteTranslationFromDraft:
     path: /content/objects/{contentId}/versions/{versionNumber}/translations/{languageCode}
     defaults:
-        _controller: ezpublish_rest.controller.content:deleteTranslationFromDraft
+        _controller: Ibexa\Rest\Server\Controller\Content:deleteTranslationFromDraft
     methods: [DELETE]
     requirements:
         contentId: \d+
@@ -194,7 +194,7 @@ ezpublish_rest_deleteTranslationFromDraft:
 ezpublish_rest_createDraftFromVersion:
     path: /content/objects/{contentId}/versions/{versionNumber}
     defaults:
-        _controller: ezpublish_rest.controller.content:createDraftFromVersion
+        _controller: Ibexa\Rest\Server\Controller\Content:createDraftFromVersion
     methods: [COPY]
     requirements:
         contentId: \d+
@@ -203,7 +203,7 @@ ezpublish_rest_createDraftFromVersion:
 ezpublish_rest_publishVersion:
     path: /content/objects/{contentId}/versions/{versionNumber}
     defaults:
-        _controller: ezpublish_rest.controller.content:publishVersion
+        _controller: Ibexa\Rest\Server\Controller\Content:publishVersion
     methods: [PUBLISH]
     requirements:
         contentId: \d+
@@ -212,7 +212,7 @@ ezpublish_rest_publishVersion:
 ezpublish_rest_redirectCurrentVersion:
     path: /content/objects/{contentId}/currentversion
     defaults:
-        _controller: ezpublish_rest.controller.content:redirectCurrentVersion
+        _controller: Ibexa\Rest\Server\Controller\Content:redirectCurrentVersion
     methods: [GET]
     requirements:
         contentId: \d+
@@ -220,7 +220,7 @@ ezpublish_rest_redirectCurrentVersion:
 ezpublish_rest_createDraftFromCurrentVersion:
     path: /content/objects/{contentId}/currentversion
     defaults:
-        _controller: ezpublish_rest.controller.content:createDraftFromCurrentVersion
+        _controller: Ibexa\Rest\Server\Controller\Content:createDraftFromCurrentVersion
     methods: [COPY]
     requirements:
         contentId: \d+
@@ -228,7 +228,7 @@ ezpublish_rest_createDraftFromCurrentVersion:
 ezpublish_rest_hideContent:
     path: /content/objects/{contentId}/hide
     defaults:
-        _controller: ezpublish_rest.controller.content:hideContent
+        _controller: Ibexa\Rest\Server\Controller\Content:hideContent
     methods: [POST]
     requirements:
         contentId: \d+
@@ -236,7 +236,7 @@ ezpublish_rest_hideContent:
 ezpublish_rest_revealContent:
     path: /content/objects/{contentId}/reveal
     defaults:
-        _controller: ezpublish_rest.controller.content:revealContent
+        _controller: Ibexa\Rest\Server\Controller\Content:revealContent
     methods: [POST]
     requirements:
         contentId: \d+
@@ -246,7 +246,7 @@ ezpublish_rest_revealContent:
 ezpublish_rest_binaryContent_getImageVariation:
     path: /content/binary/images/{imageId}/variations/{variationIdentifier}
     defaults:
-        _controller: ezpublish_rest.controller.binary_content:getImageVariation
+        _controller: alias for "Ibexa\Bundle\Connector\Dam\Controller\AssetVariationController":getImageVariation
     methods: [GET]
     requirements:
         imageId: \d+-\d+(-\d+)?
@@ -257,32 +257,32 @@ ezpublish_rest_binaryContent_getImageVariation:
 ezpublish_rest_createContentView:
     path: /content/views
     defaults:
-        _controller: ezpublish_rest.controller.content:createView
+        _controller: Ibexa\Rest\Server\Controller\Content:createView
     methods: [POST]
 
 # Views, Platform 1.0
 ezpublish_rest_views_create:
     path: /views
     defaults:
-        _controller: ezpublish_rest.controller.views:createView
+        _controller: Ibexa\Rest\Server\Controller\Views:createView
     methods: [POST]
 
 ezpublish_rest_views_list:
     path: /views
     defaults:
-        _controller: ezpublish_rest.controller.views:listView
+        _controller: Ibexa\Rest\Server\Controller\Views:listView
     methods: [GET]
 
 ezpublish_rest_views_load:
     path : /views/{viewId}
     defaults:
-        _controller: ezpublish_rest.controller.views:getView
+        _controller: Ibexa\Rest\Server\Controller\Views:getView
     methods: [GET]
 
 ezpublish_rest_views_load_results:
     path: /views/{viewId}/results
     defaults:
-        _controller: ezpublish_rest.controller.views:loadViewResults
+        _controller: Ibexa\Rest\Server\Controller\Views:loadViewResults
     methods: [GET]
 # Object states
 
@@ -290,19 +290,19 @@ ezpublish_rest_views_load_results:
 ezpublish_rest_loadObjectStateGroups:
     path: /content/objectstategroups
     defaults:
-        _controller: ezpublish_rest.controller.object_state:loadObjectStateGroups
+        _controller: Ibexa\Rest\Server\Controller\ObjectState:loadObjectStateGroups
     methods: [GET]
 
 ezpublish_rest_createObjectStateGroup:
     path: /content/objectstategroups
     defaults:
-        _controller: ezpublish_rest.controller.object_state:createObjectStateGroup
+        _controller: Ibexa\Rest\Server\Controller\ObjectState:createObjectStateGroup
     methods: [POST]
 
 ezpublish_rest_loadObjectStateGroup:
     path: /content/objectstategroups/{objectStateGroupId}
     defaults:
-        _controller: ezpublish_rest.controller.object_state:loadObjectStateGroup
+        _controller: Ibexa\Rest\Server\Controller\ObjectState:loadObjectStateGroup
     methods: [GET]
     requirements:
         objectStateGroupId: \d+
@@ -310,7 +310,7 @@ ezpublish_rest_loadObjectStateGroup:
 ezpublish_rest_updateObjectStateGroup:
     path: /content/objectstategroups/{objectStateGroupId}
     defaults:
-        _controller: ezpublish_rest.controller.object_state:updateObjectStateGroup
+        _controller: Ibexa\Rest\Server\Controller\ObjectState:updateObjectStateGroup
     methods: [PATCH]
     requirements:
         objectStateGroupId: \d+
@@ -318,7 +318,7 @@ ezpublish_rest_updateObjectStateGroup:
 ezpublish_rest_deleteObjectStateGroup:
     path: /content/objectstategroups/{objectStateGroupId}
     defaults:
-        _controller: ezpublish_rest.controller.object_state:deleteObjectStateGroup
+        _controller: Ibexa\Rest\Server\Controller\ObjectState:deleteObjectStateGroup
     methods: [DELETE]
     requirements:
         objectStateGroupId: \d+
@@ -326,7 +326,7 @@ ezpublish_rest_deleteObjectStateGroup:
 ezpublish_rest_loadObjectStates:
     path: /content/objectstategroups/{objectStateGroupId}/objectstates
     defaults:
-        _controller: ezpublish_rest.controller.object_state:loadObjectStates
+        _controller: Ibexa\Rest\Server\Controller\ObjectState:loadObjectStates
     methods: [GET]
     requirements:
         objectStateGroupId: \d+
@@ -334,7 +334,7 @@ ezpublish_rest_loadObjectStates:
 ezpublish_rest_createObjectState:
     path: /content/objectstategroups/{objectStateGroupId}/objectstates
     defaults:
-        _controller: ezpublish_rest.controller.object_state:createObjectState
+        _controller: Ibexa\Rest\Server\Controller\ObjectState:createObjectState
     methods: [POST]
     requirements:
         objectStateGroupId: \d+
@@ -342,7 +342,7 @@ ezpublish_rest_createObjectState:
 ezpublish_rest_loadObjectState:
     path: /content/objectstategroups/{objectStateGroupId}/objectstates/{objectStateId}
     defaults:
-        _controller: ezpublish_rest.controller.object_state:loadObjectState
+        _controller: Ibexa\Rest\Server\Controller\ObjectState:loadObjectState
     methods: [GET]
     requirements:
         objectStateGroupId: \d+
@@ -351,7 +351,7 @@ ezpublish_rest_loadObjectState:
 ezpublish_rest_updateObjectState:
     path: /content/objectstategroups/{objectStateGroupId}/objectstates/{objectStateId}
     defaults:
-        _controller: ezpublish_rest.controller.object_state:updateObjectState
+        _controller: Ibexa\Rest\Server\Controller\ObjectState:updateObjectState
     methods: [PATCH]
     requirements:
         objectStateGroupId: \d+
@@ -360,7 +360,7 @@ ezpublish_rest_updateObjectState:
 ezpublish_rest_deleteObjectState:
     path: /content/objectstategroups/{objectStateGroupId}/objectstates/{objectStateId}
     defaults:
-        _controller: ezpublish_rest.controller.object_state:deleteObjectState
+        _controller: Ibexa\Rest\Server\Controller\ObjectState:deleteObjectState
     methods: [DELETE]
     requirements:
         objectStateGroupId: \d+
@@ -369,7 +369,7 @@ ezpublish_rest_deleteObjectState:
 ezpublish_rest_getObjectStatesForContent:
     path: /content/objects/{contentId}/objectstates
     defaults:
-        _controller: ezpublish_rest.controller.object_state:getObjectStatesForContent
+        _controller: Ibexa\Rest\Server\Controller\ObjectState:getObjectStatesForContent
     methods: [GET]
     requirements:
         contentId: \d+
@@ -377,7 +377,7 @@ ezpublish_rest_getObjectStatesForContent:
 ezpublish_rest_setObjectStatesForContent:
     path: /content/objects/{contentId}/objectstates
     defaults:
-        _controller: ezpublish_rest.controller.object_state:setObjectStatesForContent
+        _controller: Ibexa\Rest\Server\Controller\ObjectState:setObjectStatesForContent
     methods: [PATCH]
     requirements:
         contentId: \d+
@@ -389,13 +389,13 @@ ezpublish_rest_setObjectStatesForContent:
 ezpublish_rest_redirectLocation:
     path: /content/locations
     defaults:
-        _controller: ezpublish_rest.controller.location:redirectLocation
+        _controller: Ibexa\Rest\Server\Controller\Location:redirectLocation
     methods: [GET]
 
 ezpublish_rest_loadLocation:
     path: /content/locations/{locationPath}
     defaults:
-        _controller: ezpublish_rest.controller.location:loadLocation
+        _controller: Ibexa\Rest\Server\Controller\Location:loadLocation
     methods: [GET]
     requirements:
         locationPath: "[0-9/]+"
@@ -403,7 +403,7 @@ ezpublish_rest_loadLocation:
 ezpublish_rest_updateLocation:
     path: /content/locations/{locationPath}
     defaults:
-        _controller: ezpublish_rest.controller.location:updateLocation
+        _controller: Ibexa\Rest\Server\Controller\Location:updateLocation
     methods: [PATCH]
     requirements:
         locationPath: "[0-9/]+"
@@ -411,7 +411,7 @@ ezpublish_rest_updateLocation:
 ezpublish_rest_deleteSubtree:
     path: /content/locations/{locationPath}
     defaults:
-        _controller: ezpublish_rest.controller.location:deleteSubtree
+        _controller: Ibexa\Rest\Server\Controller\Location:deleteSubtree
     methods: [DELETE]
     requirements:
         locationPath: "[0-9/]+"
@@ -419,7 +419,7 @@ ezpublish_rest_deleteSubtree:
 ezpublish_rest_copySubtree:
     path: /content/locations/{locationPath}
     defaults:
-        _controller: ezpublish_rest.controller.location:copySubtree
+        _controller: Ibexa\Rest\Server\Controller\Location:copySubtree
     methods: [COPY]
     requirements:
         locationPath: "[0-9/]+"
@@ -427,7 +427,7 @@ ezpublish_rest_copySubtree:
 ezpublish_rest_moveSubtree:
     path: /content/locations/{locationPath}
     defaults:
-        _controller: ezpublish_rest.controller.location:moveSubtree
+        _controller: Ibexa\Rest\Server\Controller\Location:moveSubtree
     methods: [MOVE]
     requirements:
         locationPath: "[0-9/]+"
@@ -435,7 +435,7 @@ ezpublish_rest_moveSubtree:
 ezpublish_rest_swapLocation:
     path: /content/locations/{locationPath}
     defaults:
-        _controller: ezpublish_rest.controller.location:swapLocation
+        _controller: Ibexa\Rest\Server\Controller\Location:swapLocation
     methods: [SWAP]
     requirements:
         locationPath: "[0-9/]+"
@@ -443,7 +443,7 @@ ezpublish_rest_swapLocation:
 ezpublish_rest_loadLocationChildren:
     path: /content/locations/{locationPath}/children
     defaults:
-        _controller: ezpublish_rest.controller.location:loadLocationChildren
+        _controller: Ibexa\Rest\Server\Controller\Location:loadLocationChildren
     methods: [GET]
     requirements:
         locationPath: "[0-9/]+"
@@ -451,7 +451,7 @@ ezpublish_rest_loadLocationChildren:
 ezpublish_rest_loadLocationsForContent:
     path: /content/objects/{contentId}/locations
     defaults:
-        _controller: ezpublish_rest.controller.location:loadLocationsForContent
+        _controller: Ibexa\Rest\Server\Controller\Location:loadLocationsForContent
     methods: [GET]
     requirements:
         contentId: \d+
@@ -459,7 +459,7 @@ ezpublish_rest_loadLocationsForContent:
 ezpublish_rest_createLocation:
     path: /content/objects/{contentId}/locations
     defaults:
-        _controller: ezpublish_rest.controller.location:createLocation
+        _controller: Ibexa\Rest\Server\Controller\Location:createLocation
     methods: [POST]
     requirements:
         contentId: \d+
@@ -471,19 +471,19 @@ ezpublish_rest_createLocation:
 ezpublish_rest_loadContentTypeGroupList:
     path: /content/typegroups
     defaults:
-        _controller: ezpublish_rest.controller.content_type:loadContentTypeGroupList
+        _controller: Ibexa\Rest\Server\Controller\ContentType:loadContentTypeGroupList
     methods: [GET]
 
 ezpublish_rest_createContentTypeGroup:
     path: /content/typegroups
     defaults:
-        _controller: ezpublish_rest.controller.content_type:createContentTypeGroup
+        _controller: Ibexa\Rest\Server\Controller\ContentType:createContentTypeGroup
     methods: [POST]
 
 ezpublish_rest_loadContentTypeGroup:
     path: /content/typegroups/{contentTypeGroupId}
     defaults:
-        _controller: ezpublish_rest.controller.content_type:loadContentTypeGroup
+        _controller: Ibexa\Rest\Server\Controller\ContentType:loadContentTypeGroup
     methods: [GET]
     requirements:
         contentTypeGroupId: \d+
@@ -491,7 +491,7 @@ ezpublish_rest_loadContentTypeGroup:
 ezpublish_rest_updateContentTypeGroup:
     path: /content/typegroups/{contentTypeGroupId}
     defaults:
-        _controller: ezpublish_rest.controller.content_type:updateContentTypeGroup
+        _controller: Ibexa\Rest\Server\Controller\ContentType:updateContentTypeGroup
     methods: [PATCH]
     requirements:
         contentTypeGroupId: \d+
@@ -499,7 +499,7 @@ ezpublish_rest_updateContentTypeGroup:
 ezpublish_rest_deleteContentTypeGroup:
     path: /content/typegroups/{contentTypeGroupId}
     defaults:
-        _controller: ezpublish_rest.controller.content_type:deleteContentTypeGroup
+        _controller: Ibexa\Rest\Server\Controller\ContentType:deleteContentTypeGroup
     methods: [DELETE]
     requirements:
         contentTypeGroupId: \d+
@@ -507,7 +507,7 @@ ezpublish_rest_deleteContentTypeGroup:
 ezpublish_rest_listContentTypesForGroup:
     path: /content/typegroups/{contentTypeGroupId}/types
     defaults:
-        _controller: ezpublish_rest.controller.content_type:listContentTypesForGroup
+        _controller: Ibexa\Rest\Server\Controller\ContentType:listContentTypesForGroup
     methods: [GET]
     requirements:
         contentTypeGroupId: \d+
@@ -515,7 +515,7 @@ ezpublish_rest_listContentTypesForGroup:
 ezpublish_rest_createContentType:
     path: /content/typegroups/{contentTypeGroupId}/types
     defaults:
-        _controller: ezpublish_rest.controller.content_type:createContentType
+        _controller: Ibexa\Rest\Server\Controller\ContentType:createContentType
     methods: [POST]
     requirements:
         contentTypeGroupId: \d+
@@ -524,13 +524,13 @@ ezpublish_rest_listContentTypes:
     # @todo: Handle all GET parameters
     path: /content/types
     defaults:
-        _controller: ezpublish_rest.controller.content_type:listContentTypes
+        _controller: Ibexa\Rest\Server\Controller\ContentType:listContentTypes
     methods: [GET]
 
 ezpublish_rest_copyContentType:
     path: /content/types/{contentTypeId}
     defaults:
-        _controller: ezpublish_rest.controller.content_type:copyContentType
+        _controller: Ibexa\Rest\Server\Controller\ContentType:copyContentType
     methods: [COPY]
     requirements:
         contentTypeId: \d+
@@ -538,7 +538,7 @@ ezpublish_rest_copyContentType:
 ezpublish_rest_loadContentType:
     path: /content/types/{contentTypeId}
     defaults:
-        _controller: ezpublish_rest.controller.content_type:loadContentType
+        _controller: Ibexa\Rest\Server\Controller\ContentType:loadContentType
     methods: [GET]
     requirements:
         contentTypeId: \d+
@@ -546,7 +546,7 @@ ezpublish_rest_loadContentType:
 ezpublish_rest_createContentTypeDraft:
     path: /content/types/{contentTypeId}
     defaults:
-        _controller: ezpublish_rest.controller.content_type:createContentTypeDraft
+        _controller: Ibexa\Rest\Server\Controller\ContentType:createContentTypeDraft
     methods: [POST]
     requirements:
         contentTypeId: \d+
@@ -554,7 +554,7 @@ ezpublish_rest_createContentTypeDraft:
 ezpublish_rest_deleteContentType:
     path: /content/types/{contentTypeId}
     defaults:
-        _controller: ezpublish_rest.controller.content_type:deleteContentType
+        _controller: Ibexa\Rest\Server\Controller\ContentType:deleteContentType
     methods: [DELETE]
     requirements:
         contentTypeId: \d+
@@ -562,7 +562,7 @@ ezpublish_rest_deleteContentType:
 ezpublish_rest_deleteContentTypeDraft:
     path: /content/types/{contentTypeId}/draft
     defaults:
-        _controller: ezpublish_rest.controller.content_type:deleteContentTypeDraft
+        _controller: Ibexa\Rest\Server\Controller\ContentType:deleteContentTypeDraft
     methods: [DELETE]
     requirements:
         contentTypeId: \d+
@@ -570,7 +570,7 @@ ezpublish_rest_deleteContentTypeDraft:
 ezpublish_rest_loadContentTypeFieldDefinitionList:
     path: /content/types/{contentTypeId}/fieldDefinitions
     defaults:
-        _controller: ezpublish_rest.controller.content_type:loadContentTypeFieldDefinitionList
+        _controller: Ibexa\Rest\Server\Controller\ContentType:loadContentTypeFieldDefinitionList
     methods: [GET]
     requirements:
         contentTypeId: \d+
@@ -578,7 +578,7 @@ ezpublish_rest_loadContentTypeFieldDefinitionList:
 ezpublish_rest_loadContentTypeFieldDefinition:
     path: /content/types/{contentTypeId}/fieldDefinitions/{fieldDefinitionId}
     defaults:
-        _controller: ezpublish_rest.controller.content_type:loadContentTypeFieldDefinition
+        _controller: Ibexa\Rest\Server\Controller\ContentType:loadContentTypeFieldDefinition
     methods: [GET]
     requirements:
         contentTypeId: \d+
@@ -587,7 +587,7 @@ ezpublish_rest_loadContentTypeFieldDefinition:
 ezpublish_rest_loadContentTypeDraft:
     path: /content/types/{contentTypeId}/draft
     defaults:
-        _controller: ezpublish_rest.controller.content_type:loadContentTypeDraft
+        _controller: Ibexa\Rest\Server\Controller\ContentType:loadContentTypeDraft
     methods: [GET]
     requirements:
         contentTypeId: \d+
@@ -595,7 +595,7 @@ ezpublish_rest_loadContentTypeDraft:
 ezpublish_rest_updateContentTypeDraft:
     path: /content/types/{contentTypeId}/draft
     defaults:
-        _controller: ezpublish_rest.controller.content_type:updateContentTypeDraft
+        _controller: Ibexa\Rest\Server\Controller\ContentType:updateContentTypeDraft
     methods: [PATCH]
     requirements:
         contentTypeId: \d+
@@ -603,7 +603,7 @@ ezpublish_rest_updateContentTypeDraft:
 ezpublish_rest_publishContentTypeDraft:
     path: /content/types/{contentTypeId}/draft
     defaults:
-        _controller: ezpublish_rest.controller.content_type:publishContentTypeDraft
+        _controller: Ibexa\Rest\Server\Controller\ContentType:publishContentTypeDraft
     methods: [PUBLISH]
     requirements:
         contentTypeId: \d+
@@ -611,7 +611,7 @@ ezpublish_rest_publishContentTypeDraft:
 ezpublish_rest_loadContentTypeDraftFieldDefinitionList:
     path: /content/types/{contentTypeId}/draft/fieldDefinitions
     defaults:
-        _controller: ezpublish_rest.controller.content_type:loadContentTypeDraftFieldDefinitionList
+        _controller: Ibexa\Rest\Server\Controller\ContentType:loadContentTypeDraftFieldDefinitionList
     methods: [GET]
     requirements:
         contentTypeId: \d+
@@ -619,7 +619,7 @@ ezpublish_rest_loadContentTypeDraftFieldDefinitionList:
 ezpublish_rest_addContentTypeDraftFieldDefinition:
     path: /content/types/{contentTypeId}/draft/fieldDefinitions
     defaults:
-        _controller: ezpublish_rest.controller.content_type:addContentTypeDraftFieldDefinition
+        _controller: Ibexa\Rest\Server\Controller\ContentType:addContentTypeDraftFieldDefinition
     methods: [POST]
     requirements:
         contentTypeId: \d+
@@ -627,7 +627,7 @@ ezpublish_rest_addContentTypeDraftFieldDefinition:
 ezpublish_rest_loadContentTypeDraftFieldDefinition:
     path: /content/types/{contentTypeId}/draft/fieldDefinitions/{fieldDefinitionId}
     defaults:
-        _controller: ezpublish_rest.controller.content_type:loadContentTypeDraftFieldDefinition
+        _controller: Ibexa\Rest\Server\Controller\ContentType:loadContentTypeDraftFieldDefinition
     methods: [GET]
     requirements:
         contentTypeId: \d+
@@ -636,7 +636,7 @@ ezpublish_rest_loadContentTypeDraftFieldDefinition:
 ezpublish_rest_updateContentTypeDraftFieldDefinition:
     path: /content/types/{contentTypeId}/draft/fieldDefinitions/{fieldDefinitionId}
     defaults:
-        _controller: ezpublish_rest.controller.content_type:updateContentTypeDraftFieldDefinition
+        _controller: Ibexa\Rest\Server\Controller\ContentType:updateContentTypeDraftFieldDefinition
     methods: [PATCH]
     requirements:
         contentTypeId: \d+
@@ -645,7 +645,7 @@ ezpublish_rest_updateContentTypeDraftFieldDefinition:
 ezpublish_rest_removeContentTypeDraftFieldDefinition:
     path: /content/types/{contentTypeId}/draft/fieldDefinitions/{fieldDefinitionId}
     defaults:
-        _controller: ezpublish_rest.controller.content_type:removeContentTypeDraftFieldDefinition
+        _controller: Ibexa\Rest\Server\Controller\ContentType:removeContentTypeDraftFieldDefinition
     methods: [DELETE]
     requirements:
         contentTypeId: \d+
@@ -654,7 +654,7 @@ ezpublish_rest_removeContentTypeDraftFieldDefinition:
 ezpublish_rest_loadGroupsOfContentType:
     path: /content/types/{contentTypeId}/groups
     defaults:
-        _controller: ezpublish_rest.controller.content_type:loadGroupsOfContentType
+        _controller: Ibexa\Rest\Server\Controller\ContentType:loadGroupsOfContentType
     methods: [GET]
     requirements:
         contentTypeId: \d+
@@ -663,7 +663,7 @@ ezpublish_rest_linkContentTypeToGroup:
     # Handle GET parameter group in controller. Most likely already done
     path: /content/types/{contentTypeId}/groups
     defaults:
-        _controller: ezpublish_rest.controller.content_type:linkContentTypeToGroup
+        _controller: Ibexa\Rest\Server\Controller\ContentType:linkContentTypeToGroup
     methods: [POST]
     requirements:
         contentTypeId: \d+
@@ -671,7 +671,7 @@ ezpublish_rest_linkContentTypeToGroup:
 ezpublish_rest_unlinkContentTypeFromGroup:
     path: /content/types/{contentTypeId}/groups/{contentTypeGroupId}
     defaults:
-        _controller: ezpublish_rest.controller.content_type:unlinkContentTypeFromGroup
+        _controller: Ibexa\Rest\Server\Controller\ContentType:unlinkContentTypeFromGroup
     methods: [DELETE]
     requirements:
         contentTypeId: \d+
@@ -684,19 +684,19 @@ ezpublish_rest_unlinkContentTypeFromGroup:
 ezpublish_rest_loadTrashItems:
     path: /content/trash
     defaults:
-        _controller: ezpublish_rest.controller.trash:loadTrashItems
+        _controller: Ibexa\Rest\Server\Controller\Trash:loadTrashItems
     methods: [GET]
 
 ezpublish_rest_emptyTrash:
     path: /content/trash
     defaults:
-        _controller: ezpublish_rest.controller.trash:emptyTrash
+        _controller: Ibexa\Rest\Server\Controller\Trash:emptyTrash
     methods: [DELETE]
 
 ezpublish_rest_loadTrashItem:
     path: /content/trash/{trashItemId}
     defaults:
-        _controller: ezpublish_rest.controller.trash:loadTrashItem
+        _controller: Ibexa\Rest\Server\Controller\Trash:loadTrashItem
     methods: [GET]
     requirements:
         trashItemId: \d+
@@ -704,7 +704,7 @@ ezpublish_rest_loadTrashItem:
 ezpublish_rest_deleteTrashItem:
     path: /content/trash/{trashItemId}
     defaults:
-        _controller: ezpublish_rest.controller.trash:deleteTrashItem
+        _controller: Ibexa\Rest\Server\Controller\Trash:deleteTrashItem
     methods: [DELETE]
     requirements:
         trashItemId: \d+
@@ -712,7 +712,7 @@ ezpublish_rest_deleteTrashItem:
 ezpublish_rest_restoreTrashItem:
     path: /content/trash/{trashItemId}
     defaults:
-        _controller: ezpublish_rest.controller.trash:restoreTrashItem
+        _controller: Ibexa\Rest\Server\Controller\Trash:restoreTrashItem
     methods: [MOVE]
     requirements:
         trashItemId: \d+
@@ -724,19 +724,19 @@ ezpublish_rest_restoreTrashItem:
 ezpublish_rest_listURLWildcards:
     path: /content/urlwildcards
     defaults:
-        _controller: ezpublish_rest.controller.url_wildcard:listURLWildcards
+        _controller: Ibexa\Rest\Server\Controller\URLWildcard:listURLWildcards
     methods: [GET]
 
 ezpublish_rest_createURLWildcard:
     path: /content/urlwildcards
     defaults:
-        _controller: ezpublish_rest.controller.url_wildcard:createURLWildcard
+        _controller: Ibexa\Rest\Server\Controller\URLWildcard:createURLWildcard
     methods: [POST]
 
 ezpublish_rest_loadURLWildcard:
     path: /content/urlwildcards/{urlWildcardId}
     defaults:
-        _controller: ezpublish_rest.controller.url_wildcard:loadURLWildcard
+        _controller: Ibexa\Rest\Server\Controller\URLWildcard:loadURLWildcard
     methods: [GET]
     requirements:
         urlWildcardId: \d+
@@ -744,7 +744,7 @@ ezpublish_rest_loadURLWildcard:
 ezpublish_rest_deleteURLWildcard:
     path: /content/urlwildcards/{urlWildcardId}
     defaults:
-        _controller: ezpublish_rest.controller.url_wildcard:deleteURLWildcard
+        _controller: Ibexa\Rest\Server\Controller\URLWildcard:deleteURLWildcard
     methods: [DELETE]
     requirements:
         urlWildcardId: \d+
@@ -756,7 +756,7 @@ ezpublish_rest_deleteURLWildcard:
 ezpublish_rest_listPoliciesForUser:
     path: /user/policies
     defaults:
-        _controller: ezpublish_rest.controller.role:listPoliciesForUser
+        _controller: Ibexa\Rest\Server\Controller\Role:listPoliciesForUser
     methods: [GET]
 
 
@@ -766,20 +766,20 @@ ezpublish_rest_listPoliciesForUser:
 ezpublish_rest_listRoles:
     path: /user/roles
     defaults:
-        _controller: ezpublish_rest.controller.role:listRoles
+        _controller: Ibexa\Rest\Server\Controller\Role:listRoles
     methods: [GET]
 
 ezpublish_rest_createRole:
     path: /user/roles
     defaults:
-        _controller: ezpublish_rest.controller.role:createRole
+        _controller: Ibexa\Rest\Server\Controller\Role:createRole
     methods: [POST]
     requirements:
 
 ezpublish_rest_createRoleDraft:
     path: /user/roles/{roleId}
     defaults:
-        _controller: ezpublish_rest.controller.role:createRoleDraft
+        _controller: Ibexa\Rest\Server\Controller\Role:createRoleDraft
     methods: [POST]
     requirements:
         roleId: \d+
@@ -787,7 +787,7 @@ ezpublish_rest_createRoleDraft:
 ezpublish_rest_loadRole:
     path: /user/roles/{roleId}
     defaults:
-        _controller: ezpublish_rest.controller.role:loadRole
+        _controller: Ibexa\Rest\Server\Controller\Role:loadRole
     methods: [GET]
     requirements:
         roleId: \d+
@@ -795,7 +795,7 @@ ezpublish_rest_loadRole:
 ezpublish_rest_loadRoleDraft:
     path: /user/roles/{roleId}/draft
     defaults:
-        _controller: ezpublish_rest.controller.role:loadRoleDraft
+        _controller: Ibexa\Rest\Server\Controller\Role:loadRoleDraft
     methods: [GET]
     requirements:
         roleId: \d+
@@ -803,7 +803,7 @@ ezpublish_rest_loadRoleDraft:
 ezpublish_rest_updateRole:
     path: /user/roles/{roleId}
     defaults:
-        _controller: ezpublish_rest.controller.role:updateRole
+        _controller: Ibexa\Rest\Server\Controller\Role:updateRole
     methods: [PATCH]
     requirements:
         roleId: \d+
@@ -811,7 +811,7 @@ ezpublish_rest_updateRole:
 ezpublish_rest_updateRoleDraft:
     path: /user/roles/{roleId}/draft
     defaults:
-        _controller: ezpublish_rest.controller.role:updateRoleDraft
+        _controller: Ibexa\Rest\Server\Controller\Role:updateRoleDraft
     methods: [PATCH]
     requirements:
         roleId: \d+
@@ -819,7 +819,7 @@ ezpublish_rest_updateRoleDraft:
 ezpublish_rest_publishRoleDraft:
     path: /user/roles/{roleId}/draft
     defaults:
-        _controller: ezpublish_rest.controller.role:publishRoleDraft
+        _controller: Ibexa\Rest\Server\Controller\Role:publishRoleDraft
     methods: [PUBLISH]
     requirements:
         roleId: \d+
@@ -827,7 +827,7 @@ ezpublish_rest_publishRoleDraft:
 ezpublish_rest_deleteRole:
     path: /user/roles/{roleId}
     defaults:
-        _controller: ezpublish_rest.controller.role:deleteRole
+        _controller: Ibexa\Rest\Server\Controller\Role:deleteRole
     methods: [DELETE]
     requirements:
         roleId: \d+
@@ -835,7 +835,7 @@ ezpublish_rest_deleteRole:
 ezpublish_rest_deleteRoleDraft:
     path: /user/roles/{roleId}/draft
     defaults:
-        _controller: ezpublish_rest.controller.role:deleteRoleDraft
+        _controller: Ibexa\Rest\Server\Controller\Role:deleteRoleDraft
     methods: [DELETE]
     requirements:
         roleId: \d+
@@ -843,7 +843,7 @@ ezpublish_rest_deleteRoleDraft:
 ezpublish_rest_loadPolicies:
     path: /user/roles/{roleId}/policies
     defaults:
-        _controller: ezpublish_rest.controller.role:loadPolicies
+        _controller: Ibexa\Rest\Server\Controller\Role:loadPolicies
     methods: [GET]
     requirements:
         roleId: \d+
@@ -851,7 +851,7 @@ ezpublish_rest_loadPolicies:
 ezpublish_rest_addPolicy:
     path: /user/roles/{roleId}/policies
     defaults:
-        _controller: ezpublish_rest.controller.role:addPolicy
+        _controller: Ibexa\Rest\Server\Controller\Role:addPolicy
     methods: [POST]
     requirements:
         roleId: \d+
@@ -859,7 +859,7 @@ ezpublish_rest_addPolicy:
 ezpublish_rest_deletePolicies:
     path: /user/roles/{roleId}/policies
     defaults:
-        _controller: ezpublish_rest.controller.role:deletePolicies
+        _controller: Ibexa\Rest\Server\Controller\Role:deletePolicies
     methods: [DELETE]
     requirements:
         roleId: \d+
@@ -867,7 +867,7 @@ ezpublish_rest_deletePolicies:
 ezpublish_rest_loadPolicy:
     path: /user/roles/{roleId}/policies/{policyId}
     defaults:
-        _controller: ezpublish_rest.controller.role:loadPolicy
+        _controller: Ibexa\Rest\Server\Controller\Role:loadPolicy
     methods: [GET]
     requirements:
         roleId: \d+
@@ -876,7 +876,7 @@ ezpublish_rest_loadPolicy:
 ezpublish_rest_updatePolicy:
     path: /user/roles/{roleId}/policies/{policyId}
     defaults:
-        _controller: ezpublish_rest.controller.role:updatePolicy
+        _controller: Ibexa\Rest\Server\Controller\Role:updatePolicy
     methods: [PATCH]
     requirements:
         roleId: \d+
@@ -885,7 +885,7 @@ ezpublish_rest_updatePolicy:
 ezpublish_rest_deletePolicy:
     path: /user/roles/{roleId}/policies/{policyId}
     defaults:
-        _controller: ezpublish_rest.controller.role:deletePolicy
+        _controller: Ibexa\Rest\Server\Controller\Role:deletePolicy
     methods: [DELETE]
     requirements:
         roleId: \d+
@@ -898,19 +898,19 @@ ezpublish_rest_deletePolicy:
 ezpublish_rest_verifyUsers:
     path: /user/users
     defaults:
-        _controller: ezpublish_rest.controller.user:verifyUsers
+        _controller: Ibexa\Rest\Server\Controller\User:verifyUsers
     methods: [HEAD]
 
 ezpublish_rest_loadUsers:
     path: /user/users
     defaults:
-        _controller: ezpublish_rest.controller.user:loadUsers
+        _controller: Ibexa\Rest\Server\Controller\User:loadUsers
     methods: [GET]
 
 ezpublish_rest_loadUser:
     path: /user/users/{userId}
     defaults:
-        _controller: ezpublish_rest.controller.user:loadUser
+        _controller: Ibexa\Rest\Server\Controller\User:loadUser
     methods: [GET]
     requirements:
         userId: \d+
@@ -918,7 +918,7 @@ ezpublish_rest_loadUser:
 ezpublish_rest_updateUser:
     path: /user/users/{userId}
     defaults:
-        _controller: ezpublish_rest.controller.user:updateUser
+        _controller: Ibexa\Rest\Server\Controller\User:updateUser
     methods: [PATCH]
     requirements:
         userId: \d+
@@ -926,7 +926,7 @@ ezpublish_rest_updateUser:
 ezpublish_rest_deleteUser:
     path: /user/users/{userId}
     defaults:
-        _controller: ezpublish_rest.controller.user:deleteUser
+        _controller: Ibexa\Rest\Server\Controller\User:deleteUser
     methods: [DELETE]
     requirements:
         userId: \d+
@@ -934,7 +934,7 @@ ezpublish_rest_deleteUser:
 ezpublish_rest_loadUserGroupsOfUser:
     path: /user/users/{userId}/groups
     defaults:
-        _controller: ezpublish_rest.controller.user:loadUserGroupsOfUser
+        _controller: Ibexa\Rest\Server\Controller\User:loadUserGroupsOfUser
     methods: [GET]
     requirements:
         userId: \d+
@@ -942,7 +942,7 @@ ezpublish_rest_loadUserGroupsOfUser:
 ezpublish_rest_assignUserToUserGroup:
     path: /user/users/{userId}/groups
     defaults:
-        _controller: ezpublish_rest.controller.user:assignUserToUserGroup
+        _controller: Ibexa\Rest\Server\Controller\User:assignUserToUserGroup
     methods: [POST]
     requirements:
         userId: \d+
@@ -950,7 +950,7 @@ ezpublish_rest_assignUserToUserGroup:
 ezpublish_rest_unassignUserFromUserGroup:
     path: /user/users/{userId}/groups/{groupPath}
     defaults:
-        _controller: ezpublish_rest.controller.user:unassignUserFromUserGroup
+        _controller: Ibexa\Rest\Server\Controller\User:unassignUserFromUserGroup
     methods: [DELETE]
     requirements:
         userId: \d+
@@ -959,7 +959,7 @@ ezpublish_rest_unassignUserFromUserGroup:
 ezpublish_rest_loadUserDrafts:
     path: /user/users/{userId}/drafts
     defaults:
-        _controller: ezpublish_rest.controller.user:loadUserDrafts
+        _controller: Ibexa\Rest\Server\Controller\User:loadUserDrafts
     methods: [GET]
     requirements:
         userId: \d+
@@ -967,7 +967,7 @@ ezpublish_rest_loadUserDrafts:
 ezpublish_rest_loadRoleAssignmentsForUser:
     path: /user/users/{userId}/roles
     defaults:
-        _controller: ezpublish_rest.controller.role:loadRoleAssignmentsForUser
+        _controller: Ibexa\Rest\Server\Controller\Role:loadRoleAssignmentsForUser
     methods: [GET]
     requirements:
         userId: \d+
@@ -975,7 +975,7 @@ ezpublish_rest_loadRoleAssignmentsForUser:
 ezpublish_rest_assignRoleToUser:
     path: /user/users/{userId}/roles
     defaults:
-        _controller: ezpublish_rest.controller.role:assignRoleToUser
+        _controller: Ibexa\Rest\Server\Controller\Role:assignRoleToUser
     methods: [POST]
     requirements:
         userId: \d+
@@ -983,7 +983,7 @@ ezpublish_rest_assignRoleToUser:
 ezpublish_rest_loadRoleAssignmentForUser:
     path: /user/users/{userId}/roles/{roleId}
     defaults:
-        _controller: ezpublish_rest.controller.role:loadRoleAssignmentForUser
+        _controller: Ibexa\Rest\Server\Controller\Role:loadRoleAssignmentForUser
     methods: [GET]
     requirements:
         userId: \d+
@@ -992,7 +992,7 @@ ezpublish_rest_loadRoleAssignmentForUser:
 ezpublish_rest_unassignRoleFromUser:
     path: /user/users/{userId}/roles/{roleId}
     defaults:
-        _controller: ezpublish_rest.controller.role:unassignRoleFromUser
+        _controller: Ibexa\Rest\Server\Controller\Role:unassignRoleFromUser
     methods: [DELETE]
     requirements:
         userId: \d+
@@ -1001,25 +1001,25 @@ ezpublish_rest_unassignRoleFromUser:
 ezpublish_rest_loadUserGroups:
     path: /user/groups
     defaults:
-        _controller: ezpublish_rest.controller.user:loadUserGroups
+        _controller: Ibexa\Rest\Server\Controller\User:loadUserGroups
     methods: [GET]
 
 ezpublish_rest_loadRootUserGroup:
     path: /user/groups/root
     defaults:
-        _controller: ezpublish_rest.controller.user:loadRootUserGroup
+        _controller: Ibexa\Rest\Server\Controller\User:loadRootUserGroup
     methods: [GET]
 
 ezpublish_rest_createRootUserGroup:
     path: /user/groups/subgroups
     defaults:
-        _controller: ezpublish_rest.controller.user:createUserGroup
+        _controller: Ibexa\Rest\Server\Controller\User:createUserGroup
     methods: [POST]
 
 ezpublish_rest_loadUserGroup:
     path: /user/groups/{groupPath}
     defaults:
-        _controller: ezpublish_rest.controller.user:loadUserGroup
+        _controller: Ibexa\Rest\Server\Controller\User:loadUserGroup
     methods: [GET]
     requirements:
         groupPath: "[0-9/]+"
@@ -1027,7 +1027,7 @@ ezpublish_rest_loadUserGroup:
 ezpublish_rest_updateUserGroup:
     path: /user/groups/{groupPath}
     defaults:
-        _controller: ezpublish_rest.controller.user:updateUserGroup
+        _controller: Ibexa\Rest\Server\Controller\User:updateUserGroup
     methods: [PATCH]
     requirements:
         groupPath: "[0-9/]+"
@@ -1035,7 +1035,7 @@ ezpublish_rest_updateUserGroup:
 ezpublish_rest_deleteUserGroup:
     path: /user/groups/{groupPath}
     defaults:
-        _controller: ezpublish_rest.controller.user:deleteUserGroup
+        _controller: Ibexa\Rest\Server\Controller\User:deleteUserGroup
     methods: [DELETE]
     requirements:
         groupPath: "[0-9/]+"
@@ -1043,7 +1043,7 @@ ezpublish_rest_deleteUserGroup:
 ezpublish_rest_moveUserGroup:
     path: /user/groups/{groupPath}
     defaults:
-        _controller: ezpublish_rest.controller.user:moveUserGroup
+        _controller: Ibexa\Rest\Server\Controller\User:moveUserGroup
     methods: [MOVE]
     requirements:
         groupPath: "[0-9/]+"
@@ -1051,7 +1051,7 @@ ezpublish_rest_moveUserGroup:
 ezpublish_rest_loadSubUserGroups:
     path: /user/groups/{groupPath}/subgroups
     defaults:
-        _controller: ezpublish_rest.controller.user:loadSubUserGroups
+        _controller: Ibexa\Rest\Server\Controller\User:loadSubUserGroups
     methods: [GET]
     requirements:
         groupPath: "[0-9/]+"
@@ -1059,7 +1059,7 @@ ezpublish_rest_loadSubUserGroups:
 ezpublish_rest_createUserGroup:
     path: /user/groups/{groupPath}/subgroups
     defaults:
-        _controller: ezpublish_rest.controller.user:createUserGroup
+        _controller: Ibexa\Rest\Server\Controller\User:createUserGroup
     methods: [POST]
     requirements:
         groupPath: "[0-9/]+"
@@ -1067,7 +1067,7 @@ ezpublish_rest_createUserGroup:
 ezpublish_rest_loadUsersFromGroup:
     path: /user/groups/{groupPath}/users
     defaults:
-        _controller: ezpublish_rest.controller.user:loadUsersFromGroup
+        _controller: Ibexa\Rest\Server\Controller\User:loadUsersFromGroup
     methods: [GET]
     requirements:
         groupPath: "[0-9/]+"
@@ -1075,7 +1075,7 @@ ezpublish_rest_loadUsersFromGroup:
 ezpublish_rest_createUser:
     path: /user/groups/{groupPath}/users
     defaults:
-        _controller: ezpublish_rest.controller.user:createUser
+        _controller: Ibexa\Rest\Server\Controller\User:createUser
     methods: [POST]
     requirements:
         groupPath: "[0-9/]+"
@@ -1083,7 +1083,7 @@ ezpublish_rest_createUser:
 ezpublish_rest_loadRoleAssignmentsForUserGroup:
     path: /user/groups/{groupPath}/roles
     defaults:
-        _controller: ezpublish_rest.controller.role:loadRoleAssignmentsForUserGroup
+        _controller: Ibexa\Rest\Server\Controller\Role:loadRoleAssignmentsForUserGroup
     methods: [GET]
     requirements:
         groupPath: "[0-9/]+"
@@ -1091,7 +1091,7 @@ ezpublish_rest_loadRoleAssignmentsForUserGroup:
 ezpublish_rest_assignRoleToUserGroup:
     path: /user/groups/{groupPath}/roles
     defaults:
-        _controller: ezpublish_rest.controller.role:assignRoleToUserGroup
+        _controller: Ibexa\Rest\Server\Controller\Role:assignRoleToUserGroup
     methods: [POST]
     requirements:
         groupPath: "[0-9/]+"
@@ -1099,7 +1099,7 @@ ezpublish_rest_assignRoleToUserGroup:
 ezpublish_rest_loadRoleAssignmentForUserGroup:
     path: /user/groups/{groupPath}/roles/{roleId}
     defaults:
-        _controller: ezpublish_rest.controller.role:loadRoleAssignmentForUserGroup
+        _controller: Ibexa\Rest\Server\Controller\Role:loadRoleAssignmentForUserGroup
     methods: [GET]
     requirements:
         groupPath: "[0-9/]+"
@@ -1108,7 +1108,7 @@ ezpublish_rest_loadRoleAssignmentForUserGroup:
 ezpublish_rest_unassignRoleFromUserGroup:
     path: /user/groups/{groupPath}/roles/{roleId}
     defaults:
-        _controller: ezpublish_rest.controller.role:unassignRoleFromUserGroup
+        _controller: Ibexa\Rest\Server\Controller\Role:unassignRoleFromUserGroup
     methods: [DELETE]
     requirements:
         groupPath: "[0-9/]+"
@@ -1117,21 +1117,21 @@ ezpublish_rest_unassignRoleFromUserGroup:
 ezpublish_rest_createSession:
     path: /user/sessions
     defaults:
-        _controller: ezpublish_rest.controller.session:createSessionAction
+        _controller: Ibexa\Rest\Server\Controller\SessionController:createSessionAction
         csrf_protection: false
     methods: [POST]
 
 ezpublish_rest_deleteSession:
     path: /user/sessions/{sessionId}
     defaults:
-        _controller: ezpublish_rest.controller.session:deleteSessionAction
+        _controller: Ibexa\Rest\Server\Controller\SessionController:deleteSessionAction
         csrf_protection: false
     methods: [DELETE]
 
 ezpublish_rest_refreshSession:
     path: /user/sessions/{sessionId}/refresh
     defaults:
-        _controller: ezpublish_rest.controller.session:refreshSessionAction
+        _controller: Ibexa\Rest\Server\Controller\SessionController:refreshSessionAction
         csrf_protection: false
     methods: [POST]
 
@@ -1142,13 +1142,13 @@ ezpublish_rest_refreshSession:
 ezpublish_rest_listGlobalURLAliases:
     path: /content/urlaliases
     defaults:
-        _controller: ezpublish_rest.controller.url_alias:listGlobalURLAliases
+        _controller: Ibexa\Rest\Server\Controller\URLAlias:listGlobalURLAliases
     methods: [GET]
 
 ezpublish_rest_listLocationURLAliases:
     path: /content/locations/{locationPath}/urlaliases
     defaults:
-        _controller: ezpublish_rest.controller.url_alias:listLocationURLAliases
+        _controller: Ibexa\Rest\Server\Controller\URLAlias:listLocationURLAliases
     methods: [GET]
     requirements:
         locationPath: "[0-9/]+"
@@ -1156,19 +1156,19 @@ ezpublish_rest_listLocationURLAliases:
 ezpublish_rest_createURLAlias:
     path: /content/urlaliases
     defaults:
-        _controller: ezpublish_rest.controller.url_alias:createURLAlias
+        _controller: Ibexa\Rest\Server\Controller\URLAlias:createURLAlias
     methods: [POST]
 
 ezpublish_rest_loadURLAlias:
     path: /content/urlaliases/{urlAliasId}
     defaults:
-        _controller: ezpublish_rest.controller.url_alias:loadURLAlias
+        _controller: Ibexa\Rest\Server\Controller\URLAlias:loadURLAlias
     methods: [GET]
 
 ezpublish_rest_deleteURLAlias:
     path: /content/urlaliases/{urlAliasId}
     defaults:
-        _controller: ezpublish_rest.controller.url_alias:deleteURLAlias
+        _controller: Ibexa\Rest\Server\Controller\URLAlias:deleteURLAlias
     methods: [DELETE]
 
 
@@ -1178,7 +1178,7 @@ ezpublish_rest_deleteURLAlias:
 ezpublish_rest_loadCountryList:
     path: /services/countries
     defaults:
-        _controller: ezpublish_rest.controller.services:loadCountryList
+        _controller: Ibexa\Rest\Server\Controller\Services:loadCountryList
     methods: [GET]
 
 # Bookmark
@@ -1186,7 +1186,7 @@ ezpublish_rest_loadCountryList:
 ezpublish_rest_createBookmark:
     path: /bookmark/{locationId}
     defaults:
-        _controller: ezpublish_rest.controller.bookmark:createBookmark
+        _controller: Ibexa\Rest\Server\Controller\Bookmark:createBookmark
     methods: [POST]
     requirements:
         locationId: "[0-9]+"
@@ -1194,7 +1194,7 @@ ezpublish_rest_createBookmark:
 ezpublish_rest_deleteBookmark:
     path: /bookmark/{locationId}
     defaults:
-        _controller: ezpublish_rest.controller.bookmark:deleteBookmark
+        _controller: Ibexa\Rest\Server\Controller\Bookmark:deleteBookmark
     methods: [DELETE]
     requirements:
         locationId: "[0-9]+"
@@ -1202,7 +1202,7 @@ ezpublish_rest_deleteBookmark:
 ezpublish_rest_isBookmarked:
     path: /bookmark/{locationId}
     defaults:
-        _controller: ezpublish_rest.controller.bookmark:isBookmarked
+        _controller: Ibexa\Rest\Server\Controller\Bookmark:isBookmarked
     methods: [GET, HEAD]
     requirements:
         locationId: "[0-9]+"
@@ -1210,7 +1210,7 @@ ezpublish_rest_isBookmarked:
 ezpublish_rest_loadBookmarks:
     path: /bookmark
     defaults:
-        _controller: ezpublish_rest.controller.bookmark:loadBookmarks
+        _controller: Ibexa\Rest\Server\Controller\Bookmark:loadBookmarks
     methods: [GET]
 
 # JWT
diff --git a/src/bundle/Resources/config/security.yml b/src/bundle/Resources/config/security.yml
index 133509dc..6ef95890 100644
--- a/src/bundle/Resources/config/security.yml
+++ b/src/bundle/Resources/config/security.yml
@@ -5,25 +5,25 @@ parameters:
     ezpublish_rest.security.csrf.token_manager.class: Ibexa\Rest\Server\Security\CsrfTokenManager
 services:
     # Following service will be aliased at compile time to "ezpublish_rest.session_authenticator" by the Security factory.
-    ezpublish_rest.security.authentication.listener.session:
+    ibexa.rest.security.authentication.listener.session:
         class: "%ezpublish_rest.security.authentication.listener.session.class%"
         arguments:
             - "@security.token_storage"
             - "@security.authentication.manager"
             - ~ # Will be replaced at compile time by security provider key
             - "@event_dispatcher"
-            - "@ezpublish.config.resolver"
+            - '@ibexa.config.resolver'
             - "@?logger"
             - "%ibexa.rest.authentication_min_delay_time%"
             - "%ibexa.rest.authentication_max_delay_time%"
         abstract: true
 
-    ezpublish_rest.security.authentication.logout_handler:
+    Ibexa\Rest\Server\Security\RestLogoutHandler:
         class: "%ezpublish_rest.security.authentication.logout_handler.class%"
         arguments:
-            - '@ezpublish.config.resolver'
+            - '@ibexa.config.resolver'
 
-    ezpublish_rest.security.csrf.token_manager:
+    Ibexa\Rest\Server\Security\CsrfTokenManager:
         class: '%ezpublish_rest.security.csrf.token_manager.class%'
         arguments:
             - '@?security.csrf.token_generator'
diff --git a/src/bundle/Resources/config/services.yml b/src/bundle/Resources/config/services.yml
index 8c56eeda..ca80bc7c 100644
--- a/src/bundle/Resources/config/services.yml
+++ b/src/bundle/Resources/config/services.yml
@@ -72,212 +72,212 @@ parameters:
     ezpublish_rest.input.handler.xml.class: Ibexa\Rest\Input\Handler\Xml
 
 services:
-    ezpublish_rest.routing.options_loader:
+    Ibexa\Bundle\Rest\Routing\OptionsLoader:
         class: "%ezpublish_rest.routing.options_loader.class%"
         arguments:
-            - "@ezpublish_rest.routing.options_loader.route_collection_mapper"
-            - "@ezpublish_rest.templated_router"
+            - '@Ibexa\Bundle\Rest\Routing\OptionsLoader\RouteCollectionMapper'
+            - '@Ibexa\Bundle\Core\Routing\DefaultRouter'
         tags:
             - { name: routing.loader }
 
-    ezpublish_rest.routing.options_loader.route_collection_mapper:
+    Ibexa\Bundle\Rest\Routing\OptionsLoader\RouteCollectionMapper:
         class: "%ezpublish_rest.routing.options_loader.route_collection_mapper.class%"
         arguments:
-            - "@ezpublish_rest.routing.options_loader.mapper"
+            - '@Ibexa\Bundle\Rest\Routing\OptionsLoader\Mapper'
 
-    ezpublish_rest.routing.options_loader.mapper:
+    Ibexa\Bundle\Rest\Routing\OptionsLoader\Mapper:
         class: "%ezpublish_rest.routing.options_loader.mapper.class%"
 
-    ezpublish_rest.cors_option_provider:
+    Ibexa\Bundle\Rest\CorsOptions\RestProvider:
         class: "%ezpublish_rest.cors_options_provider.class%"
         arguments: ["@router.default"]
         tags:
             - { name: nelmio_cors.options_provider }
 
-    ezpublish_rest.field_type_serializer:
+    Ibexa\Rest\Output\FieldTypeSerializer:
         class: "%ezpublish_rest.field_type_serializer.class%"
         arguments:
-            - "@ezpublish.api.service.field_type"
-            - "@ezpublish_rest.field_type_processor_registry"
+            - '@ibexa.api.service.field_type'
+            - '@Ibexa\Rest\FieldTypeProcessorRegistry'
 
-    ezpublish_rest.request_parser:
+    Ibexa\Bundle\Rest\RequestParser\Router:
         class: "%ezpublish_rest.request_parser.class%"
         arguments:
             - "@router"
 
-    ezpublish_rest.parser_tools:
+    Ibexa\Rest\Input\ParserTools:
         class: "%ezpublish_rest.parser_tools.class%"
 
-    ezpublish_rest.field_type_parser:
+    Ibexa\Rest\Input\FieldTypeParser:
         class: "%ezpublish_rest.field_type_parser.class%"
         arguments:
-            - "@ezpublish.api.service.content"
-            - "@ezpublish.api.service.content_type"
-            - "@ezpublish.api.service.field_type"
-            - "@ezpublish_rest.field_type_processor_registry"
+            - '@ibexa.api.service.content'
+            - '@ibexa.api.service.content_type'
+            - '@ibexa.api.service.field_type'
+            - '@Ibexa\Rest\FieldTypeProcessorRegistry'
 
-    ezpublish_rest.factory:
+    Ibexa\Bundle\Rest\ApiLoader\Factory:
         class: "%ezpublish_rest.factory.class%"
-        arguments: ["@ezpublish.config.resolver", "@ezpublish.api.repository"]
+        arguments: ['@ibexa.config.resolver', '@ibexa.api.repository']
         calls:
             - [setRequestStack, ["@request_stack"]]
 
-    ezpublish_rest.root_resource_builder:
+    Ibexa\Rest\Server\Service\ExpressionRouterRootResourceBuilder:
          class: "%ezpublish_rest.root_resource_builder.class%"
-         arguments: ["@router", "@ezpublish_rest.templated_router", "@ezpublish.config.resolver"]
+         arguments: ["@router", '@Ibexa\Bundle\Core\Routing\DefaultRouter', '@ibexa.config.resolver']
 
-    ezpublish_rest.controller.base:
+    Ibexa\Rest\Server\Controller:
         class: "%ezpublish_rest.controller.base.class%"
         calls:
             - [ setContainer, ["@service_container"] ]
-            - [ setInputDispatcher, ["@ezpublish_rest.input.dispatcher"] ]
+            - [ setInputDispatcher, ['@Ibexa\Rest\Input\Dispatcher'] ]
             - [ setRouter, ["@router"] ]
-            - [ setRequestParser, ["@ezpublish_rest.request_parser"] ]
-            - [ setRepository, ["@ezpublish.api.repository"] ]
+            - [ setRequestParser, ['@Ibexa\Bundle\Rest\RequestParser\Router'] ]
+            - [ setRepository, ['@ibexa.api.repository'] ]
 
-    ezpublish_rest.controller.root:
+    Ibexa\Rest\Server\Controller\Root:
         class: "%ezpublish_rest.controller.root.class%"
-        parent: ezpublish_rest.controller.base
-        arguments: ["@ezpublish_rest.root_resource_builder"]
+        parent: Ibexa\Rest\Server\Controller
+        arguments: ['@Ibexa\Rest\Server\Service\ExpressionRouterRootResourceBuilder']
         tags: [controller.service_arguments]
 
-    ezpublish_rest.controller.section:
+    Ibexa\Rest\Server\Controller\Section:
         class: "%ezpublish_rest.controller.section.class%"
-        parent: ezpublish_rest.controller.base
+        parent: Ibexa\Rest\Server\Controller
         arguments:
-            - "@ezpublish.api.service.section"
+            - '@ibexa.api.service.section'
         tags: [controller.service_arguments]
 
-    ezpublish_rest.controller.binary_content:
+    alias for "Ibexa\Bundle\Connector\Dam\Controller\AssetVariationController":
         class: "%ezpublish_rest.controller.binary_content.class%"
-        parent: ezpublish_rest.controller.base
+        parent: Ibexa\Rest\Server\Controller
         arguments:
-            - "@ezpublish.fieldType.ezimage.variation_service"
-            - '@ezpublish.config.resolver'
+            - '@ibexa.field_type.ezimage.variation_service'
+            - '@ibexa.config.resolver'
         tags: [controller.service_arguments]
 
-    ezpublish_rest.controller.content:
+    Ibexa\Rest\Server\Controller\Content:
         class: "%ezpublish_rest.controller.content.class%"
-        parent: ezpublish_rest.controller.base
+        parent: Ibexa\Rest\Server\Controller
         tags: [controller.service_arguments]
 
-    ezpublish_rest.controller.content_type:
+    Ibexa\Rest\Server\Controller\ContentType:
         class: "%ezpublish_rest.controller.content_type.class%"
-        parent: ezpublish_rest.controller.base
+        parent: Ibexa\Rest\Server\Controller
         arguments:
-            - "@ezpublish.api.service.content_type"
+            - '@ibexa.api.service.content_type'
         tags: [controller.service_arguments]
 
-    ezpublish_rest.controller.role:
+    Ibexa\Rest\Server\Controller\Role:
         class: "%ezpublish_rest.controller.role.class%"
-        parent: ezpublish_rest.controller.base
+        parent: Ibexa\Rest\Server\Controller
         arguments:
-            - "@ezpublish.api.service.role"
-            - "@ezpublish.api.service.user"
-            - "@ezpublish.api.service.location"
+            - '@ibexa.api.service.role'
+            - '@ibexa.api.service.user'
+            - '@ibexa.api.service.location'
         tags: [controller.service_arguments]
 
-    ezpublish_rest.controller.location:
+    Ibexa\Rest\Server\Controller\Location:
         class: "%ezpublish_rest.controller.location.class%"
-        parent: ezpublish_rest.controller.base
+        parent: Ibexa\Rest\Server\Controller
         arguments:
-            - "@ezpublish.api.service.location"
-            - "@ezpublish.api.service.content"
-            - "@ezpublish.api.service.trash"
-            - "@ezpublish.api.service.url_alias"
+            - '@ibexa.api.service.location'
+            - '@ibexa.api.service.content'
+            - '@ibexa.api.service.trash'
+            - '@ibexa.api.service.url_alias'
         tags: [controller.service_arguments]
 
-    ezpublish_rest.controller.object_state:
+    Ibexa\Rest\Server\Controller\ObjectState:
         class: "%ezpublish_rest.controller.object_state.class%"
-        parent: ezpublish_rest.controller.base
+        parent: Ibexa\Rest\Server\Controller
         arguments:
-            - "@ezpublish.api.service.object_state"
-            - "@ezpublish.api.service.content"
+            - '@ibexa.api.service.object_state'
+            - '@ibexa.api.service.content'
         tags: [controller.service_arguments]
 
-    ezpublish_rest.controller.trash:
+    Ibexa\Rest\Server\Controller\Trash:
         class: "%ezpublish_rest.controller.trash.class%"
-        parent: ezpublish_rest.controller.base
+        parent: Ibexa\Rest\Server\Controller
         arguments:
-            - "@ezpublish.api.service.trash"
-            - "@ezpublish.api.service.location"
+            - '@ibexa.api.service.trash'
+            - '@ibexa.api.service.location'
         tags: [controller.service_arguments]
 
-    ezpublish_rest.controller.user:
+    Ibexa\Rest\Server\Controller\User:
         class: "%ezpublish_rest.controller.user.class%"
-        parent: ezpublish_rest.controller.base
+        parent: Ibexa\Rest\Server\Controller
         arguments:
-            - "@ezpublish.api.service.user"
-            - "@ezpublish.api.service.role"
-            - "@ezpublish.api.service.content"
-            - "@ezpublish.api.service.content_type"
-            - "@ezpublish.api.service.location"
-            - "@ezpublish.api.service.section"
-            - "@ezpublish.api.repository"
+            - '@ibexa.api.service.user'
+            - '@ibexa.api.service.role'
+            - '@ibexa.api.service.content'
+            - '@ibexa.api.service.content_type'
+            - '@ibexa.api.service.location'
+            - '@ibexa.api.service.section'
+            - '@ibexa.api.repository'
             - '@Ibexa\Contracts\Core\Repository\PermissionResolver'
         tags: [controller.service_arguments]
 
-    ezpublish_rest.controller.url_wildcard:
+    Ibexa\Rest\Server\Controller\URLWildcard:
         class: "%ezpublish_rest.controller.url_wildcard.class%"
-        parent: ezpublish_rest.controller.base
+        parent: Ibexa\Rest\Server\Controller
         arguments:
-            - "@ezpublish.api.service.url_wildcard"
+            - '@ibexa.api.service.url_wildcard'
         tags: [controller.service_arguments]
 
-    ezpublish_rest.controller.url_alias:
+    Ibexa\Rest\Server\Controller\URLAlias:
         class: "%ezpublish_rest.controller.url_alias.class%"
-        parent: ezpublish_rest.controller.base
+        parent: Ibexa\Rest\Server\Controller
         arguments:
-            - "@ezpublish.api.service.url_alias"
-            - "@ezpublish.api.service.location"
+            - '@ibexa.api.service.url_alias'
+            - '@ibexa.api.service.location'
         tags: [controller.service_arguments]
 
-    ezpublish_rest.controller.views:
+    Ibexa\Rest\Server\Controller\Views:
         class: "%ezpublish_rest.controller.views.class%"
-        parent: ezpublish_rest.controller.base
+        parent: Ibexa\Rest\Server\Controller
         arguments:
-            - "@ezpublish.api.service.search"
+            - '@ibexa.api.service.search'
         tags: [controller.service_arguments]
 
-    ezpublish_rest.controller.session:
+    Ibexa\Rest\Server\Controller\SessionController:
         class: Ibexa\Rest\Server\Controller\SessionController
-        parent: ezpublish_rest.controller.base
+        parent: Ibexa\Rest\Server\Controller
         arguments:
             - "%ezpublish_rest.csrf_token_intention%"
             - '@Ibexa\Contracts\Core\Repository\PermissionResolver'
-            - '@ezpublish.api.service.user'
+            - '@ibexa.api.service.user'
             - "@?ezpublish_rest.session_authenticator"
             - "@?ezpublish_rest.security.csrf.token_manager"
         tags: [controller.service_arguments]
 
-    ezpublish_rest.controller.bookmark:
+    Ibexa\Rest\Server\Controller\Bookmark:
         class: Ibexa\Rest\Server\Controller\Bookmark
-        parent: ezpublish_rest.controller.base
+        parent: Ibexa\Rest\Server\Controller
         arguments:
-            - '@ezpublish.api.service.bookmark'
-            - '@ezpublish.api.service.location'
+            - '@ibexa.api.service.bookmark'
+            - '@ibexa.api.service.location'
         tags: [controller.service_arguments]
 
     Ibexa\Rest\Server\Controller\JWT:
-        parent: ezpublish_rest.controller.base
+        parent: Ibexa\Rest\Server\Controller
         arguments:
             - '@Lexik\Bundle\JWTAuthenticationBundle\Services\JWTTokenManagerInterface'
-            - '@?ezpublish_rest.session_authenticator'
+            - '@?ibexa.rest.session_authenticator'
         tags: [controller.service_arguments]
 
-    ezpublish_rest.request_listener:
+    Ibexa\Bundle\Rest\EventListener\RequestListener:
         class: "%ezpublish_rest.request_listener.class%"
         tags:
             - { name: kernel.event_subscriber }
 
-    ezpublish_rest.response_listener:
+    Ibexa\Bundle\Rest\EventListener\ResponseListener:
         class: "%ezpublish_rest.response_listener.class%"
         arguments:
-            - "@ezpublish_rest.output.visitor.dispatcher"
+            - '@Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher'
         tags:
             - { name: kernel.event_subscriber }
 
-    ezpublish_rest.csrf_listener:
+    Ibexa\Bundle\Rest\EventListener\CsrfListener:
         class: "%ezpublish_rest.csrf_listener.class%"
         arguments:
             - "@event_dispatcher"
@@ -287,91 +287,91 @@ services:
         tags:
             - { name: kernel.event_subscriber }
 
-    ezpublish_rest.controller.options:
+    Ibexa\Rest\Server\Controller\Options:
         class: "%ezpublish_rest.controller.options.class%"
-        parent: ezpublish_rest.controller.base
+        parent: Ibexa\Rest\Server\Controller
         tags: [controller.service_arguments]
 
-    ezpublish_rest.controller.services:
+    Ibexa\Rest\Server\Controller\Services:
         class: "%ezpublish_rest.controller.services.class%"
         arguments: ["%ezpublish.fieldType.ezcountry.data%"]
         tags: [controller.service_arguments]
 
-    ezpublish_rest.field_type_processor_registry:
+    Ibexa\Rest\FieldTypeProcessorRegistry:
         class: "%ezpublish_rest.field_type_processor_registry.class%"
         lazy: true
 
-    ezpublish_rest.field_type_processor.ezimage:
+    Ibexa\Rest\FieldTypeProcessor\ImageProcessor:
         class: "%ezpublish_rest.field_type_processor.ezimage.class%"
-        factory: ["@ezpublish_rest.factory", getImageFieldTypeProcessor]
+        factory: ['@Ibexa\Bundle\Rest\ApiLoader\Factory', getImageFieldTypeProcessor]
         arguments:
             - "@router"
         tags:
             - { name: ibexa.rest.field_type.processor, alias: ezimage }
 
     Ibexa\Rest\FieldTypeProcessor\ImageAssetFieldTypeProcessor:
-        factory: ["@ezpublish_rest.factory", getImageAssetFieldTypeProcessor]
+        factory: ['@Ibexa\Bundle\Rest\ApiLoader\Factory', getImageAssetFieldTypeProcessor]
         arguments:
             - "@router"
         tags:
             - { name: ibexa.rest.field_type.processor, alias: ezimageasset }
 
-    ezpublish_rest.field_type_processor.ezdatetime:
+    Ibexa\Rest\FieldTypeProcessor\DateAndTimeProcessor:
         class: "%ezpublish_rest.field_type_processor.ezdatetime.class%"
         tags:
             - { name: ibexa.rest.field_type.processor, alias: ezdatetime }
 
-    ezpublish_rest.field_type_processor.ezdate:
+    Ibexa\Rest\FieldTypeProcessor\DateProcessor:
         class: "%ezpublish_rest.field_type_processor.ezdate.class%"
         tags:
             - { name: ibexa.rest.field_type.processor, alias: ezdate }
 
-    ezpublish_rest.field_type_processor.ezmedia:
+    Ibexa\Rest\FieldTypeProcessor\MediaProcessor:
         class: "%ezpublish_rest.field_type_processor.ezmedia.class%"
-        factory: ["@ezpublish_rest.factory", getMediaFieldTypeProcessor]
+        factory: ['@Ibexa\Bundle\Rest\ApiLoader\Factory', getMediaFieldTypeProcessor]
         tags:
             - { name: ibexa.rest.field_type.processor, alias: ezmedia }
 
-    ezpublish_rest.field_type_processor.ezobjectrelationlist:
+    Ibexa\Rest\FieldTypeProcessor\RelationListProcessor:
         class: "%ezpublish_rest.field_type_processor.ezobjectrelationlist.class%"
         tags:
             - { name: ibexa.rest.field_type.processor, alias: ezobjectrelationlist }
         calls:
             - [setRouter, ["@router"]]
-            - [setLocationService, ["@ezpublish.api.service.location"]]
+            - [setLocationService, ['@ibexa.api.service.location']]
 
-    ezpublish_rest.field_type_processor.ezobjectrelation:
+    Ibexa\Rest\FieldTypeProcessor\RelationProcessor:
         class: "%ezpublish_rest.field_type_processor.ezobjectrelation.class%"
         tags:
             - { name: ibexa.rest.field_type.processor, alias: ezobjectrelation }
         calls:
             - [setRouter, ["@router"]]
-            - [setLocationService, ["@ezpublish.api.service.location"]]
+            - [setLocationService, ['@ibexa.api.service.location']]
 
-    ezpublish_rest.field_type_processor.eztime:
+    Ibexa\Rest\FieldTypeProcessor\TimeProcessor:
         class: "%ezpublish_rest.field_type_processor.eztime.class%"
         tags:
             - { name: ibexa.rest.field_type.processor, alias: eztime }
 
-    ezpublish_rest.field_type_processor.ezbinaryfile:
+    Ibexa\Rest\FieldTypeProcessor\BinaryProcessor:
         class: "%ezpublish_rest.field_type_processor.ezbinaryfile.class%"
-        factory: ["@ezpublish_rest.factory", getBinaryFileFieldTypeProcessor]
+        factory: ['@Ibexa\Bundle\Rest\ApiLoader\Factory', getBinaryFileFieldTypeProcessor]
         arguments:
-            - "@ezpublish.core.io.default_url_decorator"
+            - '@ibexa.core.io.default_url_decorator'
         tags:
             - { name: ibexa.rest.field_type.processor, alias: ezbinaryfile }
 
-    ezpublish_rest.field_type_processor.ezfloat:
+    Ibexa\Rest\FieldTypeProcessor\FloatProcessor:
         class: "%ezpublish_rest.field_type_processor.ezfloat.class%"
         tags:
             - { name: ibexa.rest.field_type.processor, alias: ezfloat }
 
-    ezpublish_rest.field_type_processor.ezstring:
+    Ibexa\Rest\FieldTypeProcessor\StringProcessor:
         class: "%ezpublish_rest.field_type_processor.ezstring.class%"
         tags:
             - { name: ibexa.rest.field_type.processor, alias: ezstring }
 
-    ezpublish_rest.field_type_processor.ezuser:
+    Ibexa\Rest\FieldTypeProcessor\UserProcessor:
         class: "%ezpublish_rest.field_type_processor.ezuser.class%"
         tags:
             - { name: ibexa.rest.field_type.processor, alias: ezuser }
@@ -380,76 +380,76 @@ services:
 
     # Main REST output dispatcher
     # Gets a <requestMatch> => output.visitor mapping with the ibexa.rest.output.visitor tag.
-    ezpublish_rest.output.visitor.dispatcher:
+    Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher:
         class: "%ezpublish_rest.output.visitor.dispatcher.class%"
 
     # format output visitors
-    ezpublish_rest.output.visitor.json:
+    ibexa.rest.output.visitor.json:
         class: "%ezpublish_rest.output.visitor.class%"
         arguments:
-            - "@ezpublish_rest.output.generator.json"
-            - "@ezpublish_rest.output.value_object_visitor.dispatcher"
+            - '@Ibexa\Rest\Output\Generator\Json'
+            - '@Ibexa\Contracts\Rest\Output\ValueObjectVisitorDispatcher'
         tags:
             - { name: ibexa.rest.output.visitor, regexps: ezpublish_rest.output.visitor.json.regexps }
 
-    ezpublish_rest.output.visitor.xml:
+    ibexa.rest.output.visitor.xml:
         class: "%ezpublish_rest.output.visitor.class%"
         arguments:
-            - "@ezpublish_rest.output.generator.xml"
-            - "@ezpublish_rest.output.value_object_visitor.dispatcher"
+            - '@Ibexa\Rest\Output\Generator\Xml'
+            - '@Ibexa\Contracts\Rest\Output\ValueObjectVisitorDispatcher'
         tags:
             - { name: ibexa.rest.output.visitor, regexps: ezpublish_rest.output.visitor.xml.regexps }
 
     # format output generators
-    ezpublish_rest.output.generator.xml:
+    Ibexa\Rest\Output\Generator\Xml:
         class: "%ezpublish_rest.output.generator.xml.class%"
         arguments:
-            - "@ezpublish_rest.output.generator.xml.field_type_hash_generator"
+            - '@Ibexa\Rest\Output\Generator\Xml\FieldTypeHashGenerator'
         calls:
             - [ setFormatOutput, [ "%kernel.debug%" ] ]
 
-    ezpublish_rest.output.generator.xml.field_type_hash_generator:
+    Ibexa\Rest\Output\Generator\Xml\FieldTypeHashGenerator:
         class: "%ezpublish_rest.output.generator.xml.field_type_hash_generator.class%"
 
-    ezpublish_rest.output.generator.json:
+    Ibexa\Rest\Output\Generator\Json:
         class: "%ezpublish_rest.output.generator.json.class%"
         arguments:
-            - "@ezpublish_rest.output.generator.json.field_type_hash_generator"
+            - '@Ibexa\Rest\Output\Generator\Json\FieldTypeHashGenerator'
         calls:
             - [ setFormatOutput, [ "%kernel.debug%" ] ]
 
-    ezpublish_rest.output.generator.json.field_type_hash_generator:
+    Ibexa\Rest\Output\Generator\Json\FieldTypeHashGenerator:
         class: "%ezpublish_rest.output.generator.json.field_type_hash_generator.class%"
 
     # value objects visitors
-    ezpublish_rest.output.value_object_visitor.dispatcher:
+    Ibexa\Contracts\Rest\Output\ValueObjectVisitorDispatcher:
         class: "%ezpublish_rest.output.value_object_visitor.dispatcher.class%"
 
-    ezpublish_rest.output.value_object_visitor.Exception.InvalidArgumentException:
+    ibexa.rest.output.value_object_visitor.Exception.InvalidArgumentException:
         class: "%ezpublish_rest.output.value_object_visitor.Exception.InvalidArgumentException.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException }
 
-    ezpublish_rest.input.dispatcher:
+    Ibexa\Rest\Input\Dispatcher:
         class: "%ezpublish_rest.input.dispatcher.class%"
         arguments:
-            - "@ezpublish_rest.input.parsing_dispatcher"
+            - '@Ibexa\Contracts\Rest\Input\ParsingDispatcher'
             - []
 
-    ezpublish_rest.input.parsing_dispatcher:
+    Ibexa\Contracts\Rest\Input\ParsingDispatcher:
         class: "%ezpublish_rest.input.parsing_dispatcher.class%"
 
-    ezpublish_rest.input.handler.json:
+    Ibexa\Rest\Input\Handler\Json:
         class: "%ezpublish_rest.input.handler.json.class%"
         tags:
             - { name: ibexa.rest.input.handler, format: json }
 
-    ezpublish_rest.input.handler.xml:
+    Ibexa\Rest\Input\Handler\Xml:
         class: "%ezpublish_rest.input.handler.xml.class%"
         tags:
             - { name: ibexa.rest.input.handler, format: xml }
 
-    ezpublish_rest.templated_router:
+    Ibexa\Bundle\Core\Routing\DefaultRouter:
         class: Ibexa\Bundle\Core\Routing\DefaultRouter
         parent: hautelook.router.template
         calls:
diff --git a/src/bundle/Resources/config/value_object_visitors.yml b/src/bundle/Resources/config/value_object_visitors.yml
index 4b4a50e2..387865a5 100644
--- a/src/bundle/Resources/config/value_object_visitors.yml
+++ b/src/bundle/Resources/config/value_object_visitors.yml
@@ -127,659 +127,659 @@ parameters:
     ezpublish_rest.output.value_object_visitor.CountryList.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CountryList
 
 services:
-    ezpublish_rest.output.value_object_visitor.base:
+    Ibexa\Contracts\Rest\Output\ValueObjectVisitor:
         class: "%ezpublish_rest.output.value_object_visitor.base.class%"
         calls:
-            - [ setRequestParser, [ "@ezpublish_rest.request_parser" ] ]
+            - [ setRequestParser, [ '@Ibexa\Bundle\Rest\RequestParser\Router' ] ]
             - [ setRouter, [ "@router" ] ]
-            - [ setTemplateRouter, [ "@ezpublish_rest.templated_router"] ]
+            - [ setTemplateRouter, [ '@Ibexa\Bundle\Core\Routing\DefaultRouter'] ]
 
     # Errors
-    ezpublish_rest.output.value_object_visitor.InvalidArgumentException:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    ibexa.rest.output.value_object_visitor.InvalidArgumentException:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.InvalidArgumentException.class%"
         arguments: [ "%kernel.debug%", "@translator" ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException }
 
-    ezpublish_rest.output.value_object_visitor.NotFoundException:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\NotFoundException:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.NotFoundException.class%"
         arguments: [ "%kernel.debug%", "@translator" ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException }
 
-    ezpublish_rest.output.value_object_visitor.UnauthorizedException:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\UnauthorizedException:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.UnauthorizedException.class%"
         arguments: [ "%kernel.debug%", "@translator" ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException }
 
-    ezpublish_rest.output.value_object_visitor.BadStateException:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\BadStateException:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.BadStateException.class%"
         arguments: [ "%kernel.debug%", "@translator" ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Exceptions\BadStateException }
 
-    ezpublish_rest.output.value_object_visitor.BadRequestException:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\BadRequestException:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.BadRequestException.class%"
         arguments: [ "%kernel.debug%", "@translator" ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Exceptions\BadRequestException }
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Rest\Exceptions\Parser }
 
-    ezpublish_rest.output.value_object_visitor.ContentFieldValidationException:
-        parent: ezpublish_rest.output.value_object_visitor.BadRequestException
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentFieldValidationException:
+        parent: Ibexa\Rest\Server\Output\ValueObjectVisitor\BadRequestException
         class: "%ezpublish_rest.output.value_object_visitor.ContentFieldValidationException.class%"
         arguments: [ "%kernel.debug%", "@translator" ]
         tags:
             - {  name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Exceptions\ContentFieldValidationException }
 
-    ezpublish_rest.output.value_object_visitor.ForbiddenException:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\ForbiddenException:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.ForbiddenException.class%"
         arguments: [ "%kernel.debug%", "@translator" ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Exceptions\ForbiddenException }
 
-    ezpublish_rest.output.value_object_visitor.NotImplementedException:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\NotImplementedException:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.NotImplementedException.class%"
         arguments: [ "%kernel.debug%", "@translator" ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Exceptions\NotImplementedException }
 
-    ezpublish_rest.output.value_object_visitor.Exception:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\Exception:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.Exception.class%"
         arguments: [ "%kernel.debug%", "@translator" ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Exception }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\HttpException:
-        parent: ezpublish_rest.output.value_object_visitor.base
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         arguments: [ "%kernel.debug%", "@translator" ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Symfony\Component\HttpKernel\Exception\HttpException }
 
     # Language
-    ezpublish_rest.output.value_object_visitor.Language:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\Language:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: Ibexa\Rest\Server\Output\ValueObjectVisitor\Language
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\Language }
 
     # Section
-    ezpublish_rest.output.value_object_visitor.SectionList:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\SectionList:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.SectionList.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\SectionList }
 
-    ezpublish_rest.output.value_object_visitor.CreatedSection:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedSection:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.CreatedSection.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedSection }
 
-    ezpublish_rest.output.value_object_visitor.Section:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\Section:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.Section.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\Section }
 
     # URLWildcard
-    ezpublish_rest.output.value_object_visitor.URLWildcardList:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\URLWildcardList:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.URLWildcardList.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\URLWildcardList }
 
-    ezpublish_rest.output.value_object_visitor.URLWildcard:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\URLWildcard:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.URLWildcard.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\URLWildcard }
 
-    ezpublish_rest.output.value_object_visitor.CreatedURLWildcard:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedURLWildcard:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.CreatedURLWildcard.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedURLWildcard }
 
     # URLAlias
-    ezpublish_rest.output.value_object_visitor.URLAliasList:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\URLAliasList:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.URLAliasList.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\URLAliasList }
 
-    ezpublish_rest.output.value_object_visitor.URLAliasRefList:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\URLAliasRefList:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.URLAliasRefList.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\URLAliasRefList }
 
-    ezpublish_rest.output.value_object_visitor.URLAlias:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\URLAlias:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.URLAlias.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\URLAlias }
 
-    ezpublish_rest.output.value_object_visitor.CreatedURLAlias:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedURLAlias:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.CreatedURLAlias.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedURLAlias }
 
     # Content
-    ezpublish_rest.output.value_object_visitor.Author:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\Author:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: Ibexa\Rest\Server\Output\ValueObjectVisitor\Author
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Core\FieldType\Author\Author }
 
-    ezpublish_rest.output.value_object_visitor.ContentList:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentList:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.ContentList.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\ContentList }
 
-    ezpublish_rest.output.value_object_visitor.RestContent:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\RestContent:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.RestContent.class%"
-        arguments: ['@ezpublish.translation_helper']
+        arguments: ['@Ibexa\Core\Helper\TranslationHelper']
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\RestContent }
 
-    ezpublish_rest.output.value_object_visitor.CreatedContent:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedContent:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.CreatedContent.class%"
-        arguments: ['@ezpublish.translation_helper']
+        arguments: ['@Ibexa\Core\Helper\TranslationHelper']
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedContent }
 
-    ezpublish_rest.output.value_object_visitor.VersionList:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\VersionList:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.VersionList.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\VersionList }
 
-    ezpublish_rest.output.value_object_visitor.CreatedVersion:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedVersion:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.CreatedVersion.class%"
-        arguments: [ "@ezpublish_rest.field_type_serializer" ]
+        arguments: [ '@Ibexa\Rest\Output\FieldTypeSerializer' ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedVersion }
 
-    ezpublish_rest.output.value_object_visitor.VersionInfo:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\VersionInfo:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.VersionInfo.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo }
 
-    ezpublish_rest.output.value_object_visitor.ImageVariation:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\ImageVariation:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.ImageVariation.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Variation\Values\ImageVariation }
 
-    ezpublish_rest.output.value_object_visitor.Version:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\Version:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.Version.class%"
-        arguments: [ "@ezpublish_rest.field_type_serializer"  ]
+        arguments: [ '@Ibexa\Rest\Output\FieldTypeSerializer'  ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\Version }
 
-    ezpublish_rest.output.value_object_visitor.VersionTranslationInfo:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\VersionTranslationInfo:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.VersionTranslationInfo.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\VersionTranslationInfo }
 
     # UserGroup
-    ezpublish_rest.output.value_object_visitor.UserGroup:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\UserGroup:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: Ibexa\Rest\Server\Output\ValueObjectVisitor\UserGroup
         arguments:
-            $contentService: '@ezpublish.api.service.content'
+            $contentService: '@ibexa.api.service.content'
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Values\User\UserGroup }
 
-    ezpublish_rest.output.value_object_visitor.RestUserGroup:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\RestUserGroup:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.RestUserGroup.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\RestUserGroup }
 
-    ezpublish_rest.output.value_object_visitor.CreatedUserGroup:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedUserGroup:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.CreatedUserGroup.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedUserGroup }
 
-    ezpublish_rest.output.value_object_visitor.UserGroupList:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\UserGroupList:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.UserGroupList.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\UserGroupList }
 
-    ezpublish_rest.output.value_object_visitor.UserGroupRefList:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\UserGroupRefList:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.UserGroupRefList.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\UserGroupRefList }
 
     # User
-    ezpublish_rest.output.value_object_visitor.UserList:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\UserList:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.UserList.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\UserList }
 
-    ezpublish_rest.output.value_object_visitor.UserRefList:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\UserRefList:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.UserRefList.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\UserRefList }
 
-    ezpublish_rest.output.value_object_visitor.CreatedUser:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedUser:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.CreatedUser.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedUser }
 
-    ezpublish_rest.output.value_object_visitor.User:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\User:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: Ibexa\Rest\Server\Output\ValueObjectVisitor\User
         arguments:
-            $contentService: '@ezpublish.api.service.content'
+            $contentService: '@ibexa.api.service.content'
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Values\User\User }
 
-    ezpublish_rest.output.value_object_visitor.RestUser:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\RestUser:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.RestUser.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\RestUser }
 
-    ezpublish_rest.output.value_object_visitor.UserSession:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\UserSession:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.UserSession.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\UserSession }
 
-    ezpublish_rest.output.value_object_visitor.UserSessionDeleted:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\DeletedUserSession:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.UserSessionDeleted.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\DeletedUserSession }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\JWT:
-        parent: ezpublish_rest.output.value_object_visitor.base
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\JWT }
 
     # ContentType
-    ezpublish_rest.output.value_object_visitor.ContentType:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentType:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentType
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType }
 
-    ezpublish_rest.output.value_object_visitor.RestContentType:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\RestContentType:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.RestContentType.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\RestContentType }
 
-    ezpublish_rest.output.value_object_visitor.CreatedContentType:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedContentType:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.CreatedContentType.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedContentType }
 
-    ezpublish_rest.output.value_object_visitor.ContentTypeList:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeList:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.ContentTypeList.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\ContentTypeList }
 
-    ezpublish_rest.output.value_object_visitor.ContentTypeInfoList:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeInfoList:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.ContentTypeInfoList.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\ContentTypeInfoList }
 
-    ezpublish_rest.output.value_object_visitor.ContentTypeGroup:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeGroup:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.ContentTypeGroup.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup }
 
-    ezpublish_rest.output.value_object_visitor.CreatedContentTypeGroup:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedContentTypeGroup:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.CreatedContentTypeGroup.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedContentTypeGroup }
 
-    ezpublish_rest.output.value_object_visitor.ContentTypeGroupList:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeGroupList:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.ContentTypeGroupList.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\ContentTypeGroupList }
 
-    ezpublish_rest.output.value_object_visitor.ContentTypeGroupRefList:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeGroupRefList:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.ContentTypeGroupRefList.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\ContentTypeGroupRefList }
 
-    ezpublish_rest.output.value_object_visitor.FieldDefinitionList:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\FieldDefinitionList:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.FieldDefinitionList.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\FieldDefinitionList }
 
-    ezpublish_rest.output.value_object_visitor.CreatedFieldDefinition:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedFieldDefinition:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.CreatedFieldDefinition.class%"
-        arguments: [ "@ezpublish_rest.field_type_serializer"  ]
+        arguments: [ '@Ibexa\Rest\Output\FieldTypeSerializer'  ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedFieldDefinition }
 
-    ezpublish_rest.output.value_object_visitor.RestFieldDefinition:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\RestFieldDefinition:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.RestFieldDefinition.class%"
-        arguments: [ "@ezpublish_rest.field_type_serializer"  ]
+        arguments: [ '@Ibexa\Rest\Output\FieldTypeSerializer'  ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\RestFieldDefinition }
 
     # Relation
-    ezpublish_rest.output.value_object_visitor.RelationList:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\RelationList:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.RelationList.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\RelationList }
 
-    ezpublish_rest.output.value_object_visitor.RestRelation:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\RestRelation:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.RestRelation.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\RestRelation }
 
-    ezpublish_rest.output.value_object_visitor.CreatedRelation:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedRelation:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.CreatedRelation.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedRelation }
 
     # Role
-    ezpublish_rest.output.value_object_visitor.RoleList:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\RoleList:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.RoleList.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\RoleList }
 
-    ezpublish_rest.output.value_object_visitor.CreatedRole:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedRole:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.CreatedRole.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedRole }
 
-    ezpublish_rest.output.value_object_visitor.PublishedRole:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\PublishedRole:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.PublishedRole.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\PublishedRole }
 
-    ezpublish_rest.output.value_object_visitor.Role:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\Role:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.Role.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Values\User\Role }
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Values\User\RoleDraft }
 
-    ezpublish_rest.output.value_object_visitor.Policy:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\Policy:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.Policy.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Values\User\Policy }
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Values\User\PolicyDraft }
 
-    ezpublish_rest.output.value_object_visitor.CreatedPolicy:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedPolicy:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.CreatedPolicy.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedPolicy }
 
-    ezpublish_rest.output.value_object_visitor.PolicyList:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\PolicyList:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.PolicyList.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\PolicyList }
 
-    ezpublish_rest.output.value_object_visitor.RoleAssignmentList:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\RoleAssignmentList:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.RoleAssignmentList.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\RoleAssignmentList }
 
-    ezpublish_rest.output.value_object_visitor.RestUserRoleAssignment:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\RestUserRoleAssignment:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.RestUserRoleAssignment.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\RestUserRoleAssignment }
 
-    ezpublish_rest.output.value_object_visitor.RestUserGroupRoleAssignment:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\RestUserGroupRoleAssignment:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.RestUserGroupRoleAssignment.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\RestUserGroupRoleAssignment }
 
     # Location
-    ezpublish_rest.output.value_object_visitor.CreatedLocation:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedLocation:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.CreatedLocation.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedLocation }
 
-    ezpublish_rest.output.value_object_visitor.RestLocation:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\RestLocation:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.RestLocation.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\RestLocation }
 
-    ezpublish_rest.output.value_object_visitor.Location:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\Location:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.Location.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\Location }
         arguments:
-            $locationService: '@ezpublish.api.service.location'
-            $contentService: '@ezpublish.api.service.content'
+            $locationService: '@ibexa.api.service.location'
+            $contentService: '@ibexa.api.service.content'
 
-    ezpublish_rest.output.value_object_visitor.LocationList:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\LocationList:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.LocationList.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\LocationList }
 
     # Trash
-    ezpublish_rest.output.value_object_visitor.Trash:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\Trash:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.Trash.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\Trash }
 
-    ezpublish_rest.output.value_object_visitor.RestTrashItem:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\RestTrashItem:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.RestTrashItem.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\RestTrashItem }
 
     # Views
-    ezpublish_rest.output.value_object_visitor.RestExecutedView:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\RestExecutedView:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.RestExecutedView.class%"
-        arguments: [ "@ezpublish.api.service.location", "@ezpublish.api.service.content" ]
+        arguments: [ '@ibexa.api.service.location', '@ibexa.api.service.content' ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\RestExecutedView }
 
     # Aggregations
 
-    ezpublish_rest.output.value_object_visitor.Range:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\Range:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: Ibexa\Rest\Server\Output\ValueObjectVisitor\Range
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Range }
 
-    ezpublish_rest.output.value_object_visitor.RangeAggregationResult:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\RangeAggregationResult:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RangeAggregationResult
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\RangeAggregationResult }
 
-    ezpublish_rest.output.value_object_visitor.StatsAggregationResult:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\StatsAggregationResult:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: Ibexa\Rest\Server\Output\ValueObjectVisitor\StatsAggregationResult
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\StatsAggregationResult }
 
-    ezpublish_rest.output.value_object_visitor.TermAggregationResult:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\TermAggregationResult:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: Ibexa\Rest\Server\Output\ValueObjectVisitor\TermAggregationResult
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\TermAggregationResult }
 
     # Object state
-    ezpublish_rest.output.value_object_visitor.ObjectState:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\ObjectState:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ObjectState
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectState }
 
-    ezpublish_rest.output.value_object_visitor.ObjectStateGroup:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\ObjectStateGroup:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.ObjectStateGroup.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroup }
 
-    ezpublish_rest.output.value_object_visitor.CreatedObjectStateGroup:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedObjectStateGroup:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.CreatedObjectStateGroup.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedObjectStateGroup }
 
-    ezpublish_rest.output.value_object_visitor.ObjectStateGroupList:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\ObjectStateGroupList:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.ObjectStateGroupList.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\ObjectStateGroupList }
 
-    ezpublish_rest.output.value_object_visitor.RestObjectState:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\RestObjectState:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.RestObjectState.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Values\RestObjectState }
 
-    ezpublish_rest.output.value_object_visitor.CreatedObjectState:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedObjectState:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.CreatedObjectState.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedObjectState }
 
-    ezpublish_rest.output.value_object_visitor.ObjectStateList:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\ObjectStateList:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.ObjectStateList.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\ObjectStateList }
 
-    ezpublish_rest.output.value_object_visitor.ContentObjectStates:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Output\ValueObjectVisitor\ContentObjectStates:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.ContentObjectStates.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Values\ContentObjectStates }
 
     # Services
-    ezpublish_rest.output.value_object_visitor.CountryList:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\CountryList:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.CountryList.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CountryList}
 
     # REST specific
-    ezpublish_rest.output.value_object_visitor.TemporaryRedirect:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\TemporaryRedirect:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.TemporaryRedirect.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\TemporaryRedirect }
 
-    ezpublish_rest.output.value_object_visitor.PermanentRedirect:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\PermanentRedirect:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.PermanentRedirect.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\PermanentRedirect }
 
-    ezpublish_rest.output.value_object_visitor.ResourceCreated:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\ResourceCreated:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.ResourceCreated.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\ResourceCreated }
 
-    ezpublish_rest.output.value_object_visitor.NoContent:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\NoContent:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.NoContent.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\NoContent }
 
-    ezpublish_rest.output.value_object_visitor.Root:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\Root:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.Root.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Values\Root }
 
-    ezpublish_rest.output.value_object_visitor.SeeOther:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\SeeOther:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.SeeOther.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\SeeOther }
 
-    ezpublish_rest.output.value_object_visitor.Conflict:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\Conflict:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.Conflict.class%"
         arguments: [ true  ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\Conflict }
 
-    ezpublish_rest.output.value_object_visitor.Options:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\Options:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.Options.class%"
         arguments: [ true  ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\Options }
 
-    ezpublish_rest.output.value_object_visitor.OK:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\OK:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: "%ezpublish_rest.output.value_object_visitor.OK.class%"
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\OK }
 
-    ezpublish_rest.output.value_object_visitor.cached_value:
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\CachedValue:
         class: "%ezpublish_rest.output.value_object_visitor.cached_value.class%"
-        parent: ezpublish_rest.output.value_object_visitor.base
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         arguments:
-            - "@ezpublish.config.resolver"
+            - '@ibexa.config.resolver'
         calls:
             - [setRequestStack, ["@request_stack"]]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CachedValue }
 
-    ezpublish_rest.output.value_object_visitor.BookmarkList:
-        parent: ezpublish_rest.output.value_object_visitor.base
+    Ibexa\Rest\Server\Output\ValueObjectVisitor\BookmarkList:
+        parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         class: Ibexa\Rest\Server\Output\ValueObjectVisitor\BookmarkList
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\BookmarkList }
diff --git a/tests/bundle/DependencyInjection/Compiler/FieldTypeProcessorPassTest.php b/tests/bundle/DependencyInjection/Compiler/FieldTypeProcessorPassTest.php
index 61cb9e01..ea321ddd 100644
--- a/tests/bundle/DependencyInjection/Compiler/FieldTypeProcessorPassTest.php
+++ b/tests/bundle/DependencyInjection/Compiler/FieldTypeProcessorPassTest.php
@@ -25,7 +25,7 @@ public function testProcess(string $tag): void
         $containerBuilder = new ContainerBuilder();
         $containerBuilder->addDefinitions(
             [
-                'ezpublish_rest.field_type_processor_registry' => new Definition(),
+                \Ibexa\Rest\FieldTypeProcessorRegistry::class => new Definition(),
                 'ezpublish_rest.field_type_processor.test' => $processorDefinition,
             ]
         );
@@ -33,7 +33,7 @@ public function testProcess(string $tag): void
         $compilerPass = new FieldTypeProcessorPass();
         $compilerPass->process($containerBuilder);
 
-        $dispatcherMethodCalls = $containerBuilder->getDefinition('ezpublish_rest.field_type_processor_registry')->getMethodCalls();
+        $dispatcherMethodCalls = $containerBuilder->getDefinition(\Ibexa\Rest\FieldTypeProcessorRegistry::class)->getMethodCalls();
         self::assertTrue(isset($dispatcherMethodCalls[0][0]), 'Failed asserting that dispatcher has a method call');
         self::assertEquals('registerProcessor', $dispatcherMethodCalls[0][0], "Failed asserting that called method is 'addVisitor'");
         self::assertInstanceOf(Reference::class, $dispatcherMethodCalls[0][1][1], 'Failed asserting that method call is to a Reference object');
diff --git a/tests/bundle/DependencyInjection/Compiler/InputHandlerPassTest.php b/tests/bundle/DependencyInjection/Compiler/InputHandlerPassTest.php
index 0afea810..e6e797e6 100644
--- a/tests/bundle/DependencyInjection/Compiler/InputHandlerPassTest.php
+++ b/tests/bundle/DependencyInjection/Compiler/InputHandlerPassTest.php
@@ -22,7 +22,7 @@ public function testProcess()
         $containerBuilder = new ContainerBuilder();
         $containerBuilder->addDefinitions(
             [
-                'ezpublish_rest.input.dispatcher' => new Definition(),
+                \Ibexa\Rest\Input\Dispatcher::class => new Definition(),
                 'ezpublish_rest.input.handler.test' => $visitorDefinition,
             ]
         );
@@ -31,7 +31,7 @@ public function testProcess()
         $compilerPass->process($containerBuilder);
 
         $dispatcherMethodCalls = $containerBuilder
-            ->getDefinition('ezpublish_rest.input.dispatcher')
+            ->getDefinition(\Ibexa\Rest\Input\Dispatcher::class)
             ->getMethodCalls();
         self::assertTrue(isset($dispatcherMethodCalls[0][0]), 'Failed asserting that dispatcher has a method call');
         self::assertEquals('addHandler', $dispatcherMethodCalls[0][0], "Failed asserting that called method is 'addParser'");
diff --git a/tests/bundle/DependencyInjection/Compiler/InputParserPassTest.php b/tests/bundle/DependencyInjection/Compiler/InputParserPassTest.php
index a6999624..77bc0a6d 100644
--- a/tests/bundle/DependencyInjection/Compiler/InputParserPassTest.php
+++ b/tests/bundle/DependencyInjection/Compiler/InputParserPassTest.php
@@ -25,7 +25,7 @@ public function testProcess()
         $containerBuilder = new ContainerBuilder();
         $containerBuilder->addDefinitions(
             [
-                'ezpublish_rest.input.parsing_dispatcher' => new Definition(),
+                \Ibexa\Contracts\Rest\Input\ParsingDispatcher::class => new Definition(),
                 'ezpublish_rest.input.parser.unit_test' => $visitorDefinition,
             ]
         );
@@ -34,7 +34,7 @@ public function testProcess()
         $compilerPass->process($containerBuilder);
 
         $dispatcherMethodCalls = $containerBuilder
-            ->getDefinition('ezpublish_rest.input.parsing_dispatcher')
+            ->getDefinition(\Ibexa\Contracts\Rest\Input\ParsingDispatcher::class)
             ->getMethodCalls();
         self::assertTrue(isset($dispatcherMethodCalls[0][0]), 'Failed asserting that dispatcher has a method call');
         self::assertEquals('addParser', $dispatcherMethodCalls[0][0], "Failed asserting that called method is 'addParser'");
diff --git a/tests/bundle/DependencyInjection/Compiler/OutputVisitorPassTest.php b/tests/bundle/DependencyInjection/Compiler/OutputVisitorPassTest.php
index e83e5290..b82d8cca 100644
--- a/tests/bundle/DependencyInjection/Compiler/OutputVisitorPassTest.php
+++ b/tests/bundle/DependencyInjection/Compiler/OutputVisitorPassTest.php
@@ -35,7 +35,7 @@ public function testProcess()
         $arrayDefinition->addTag('ibexa.rest.output.visitor', ['regexps' => [$arrayRegexp]]);
         $this->setDefinition('ezpublish_rest.output.visitor.test_array', $arrayDefinition);
 
-        $this->setDefinition('ezpublish_rest.output.visitor.dispatcher', new Definition());
+        $this->setDefinition(\Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher::class, new Definition());
 
         $this->compile();
 
@@ -45,11 +45,11 @@ public function testProcess()
         self::assertEquals('ezpublish_rest.output.visitor.test_array', $visitorsInOrder[1]);
         $this->assertContainerBuilderHasService('ezpublish_rest.output.visitor.test_string');
         $this->assertContainerBuilderHasService('ezpublish_rest.output.visitor.test_array');
-        $this->assertContainerBuilderHasServiceDefinitionWithMethodCall('ezpublish_rest.output.visitor.dispatcher', 'addVisitor', [
+        $this->assertContainerBuilderHasServiceDefinitionWithMethodCall(\Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher::class, 'addVisitor', [
             $stringRegexp,
             new Reference('ezpublish_rest.output.visitor.test_string'),
         ]);
-        $this->assertContainerBuilderHasServiceDefinitionWithMethodCall('ezpublish_rest.output.visitor.dispatcher', 'addVisitor', [
+        $this->assertContainerBuilderHasServiceDefinitionWithMethodCall(\Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher::class, 'addVisitor', [
             $arrayRegexp,
             new Reference('ezpublish_rest.output.visitor.test_array'),
         ]);
@@ -82,7 +82,7 @@ public function testPriority()
             'low',
         ];
 
-        $this->setDefinition('ezpublish_rest.output.visitor.dispatcher', new Definition());
+        $this->setDefinition(\Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher::class, new Definition());
 
         foreach ($definitions as $name => $data) {
             $definition = new Definition();
@@ -101,7 +101,7 @@ public function testPriority()
 
     protected function getVisitorsInRegistrationOrder()
     {
-        $calls = $this->container->getDefinition('ezpublish_rest.output.visitor.dispatcher')->getMethodCalls();
+        $calls = $this->container->getDefinition(\Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher::class)->getMethodCalls();
 
         return array_map(static function ($call) {
             return (string) $call[1][1];
diff --git a/tests/bundle/DependencyInjection/Compiler/ValueObjectVisitorPassTest.php b/tests/bundle/DependencyInjection/Compiler/ValueObjectVisitorPassTest.php
index d1efe18e..66d363f7 100644
--- a/tests/bundle/DependencyInjection/Compiler/ValueObjectVisitorPassTest.php
+++ b/tests/bundle/DependencyInjection/Compiler/ValueObjectVisitorPassTest.php
@@ -22,7 +22,7 @@ public function testProcess()
         $containerBuilder = new ContainerBuilder();
         $containerBuilder->addDefinitions(
             [
-                'ezpublish_rest.output.value_object_visitor.dispatcher' => new Definition(),
+                \Ibexa\Contracts\Rest\Output\ValueObjectVisitorDispatcher::class => new Definition(),
                 'ezpublish_rest.output.value_object_visitor.test' => $visitorDefinition,
             ]
         );
@@ -31,7 +31,7 @@ public function testProcess()
         $compilerPass->process($containerBuilder);
 
         $dispatcherMethodCalls = $containerBuilder
-            ->getDefinition('ezpublish_rest.output.value_object_visitor.dispatcher')
+            ->getDefinition(\Ibexa\Contracts\Rest\Output\ValueObjectVisitorDispatcher::class)
             ->getMethodCalls();
         self::assertTrue(isset($dispatcherMethodCalls[0][0]), 'Failed asserting that dispatcher has a method call');
         self::assertEquals('addVisitor', $dispatcherMethodCalls[0][0], "Failed asserting that called method is 'addVisitor'");

From 935f40ee1fd74903ba77ac3c1bd3dacbe99b989c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Parafi=C5=84ski?= <dawid.parafinski@ez.no>
Date: Wed, 19 Jan 2022 10:55:12 +0100
Subject: [PATCH 2/5] IBX-1853: Fixed nullable services and xml aliases

---
 src/bundle/Resources/config/services.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bundle/Resources/config/services.yml b/src/bundle/Resources/config/services.yml
index ca80bc7c..2d5c4156 100644
--- a/src/bundle/Resources/config/services.yml
+++ b/src/bundle/Resources/config/services.yml
@@ -246,8 +246,8 @@ services:
             - "%ezpublish_rest.csrf_token_intention%"
             - '@Ibexa\Contracts\Core\Repository\PermissionResolver'
             - '@ibexa.api.service.user'
-            - "@?ezpublish_rest.session_authenticator"
-            - "@?ezpublish_rest.security.csrf.token_manager"
+            - '@?ibexa.rest.session_authenticator'
+            - '@?Ibexa\Rest\Server\Security\CsrfTokenManager'
         tags: [controller.service_arguments]
 
     Ibexa\Rest\Server\Controller\Bookmark:
@@ -283,7 +283,7 @@ services:
             - "@event_dispatcher"
             - "%form.type_extension.csrf.enabled%"
             - "%ezpublish_rest.csrf_token_intention%"
-            - "@?ezpublish_rest.security.csrf.token_manager"
+            - '@?Ibexa\Rest\Server\Security\CsrfTokenManager'
         tags:
             - { name: kernel.event_subscriber }
 

From 4d9a9a22a216110a7e1ca771dabf2782120cd09f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Parafi=C5=84ski?= <dawid.parafinski@ez.no>
Date: Wed, 19 Jan 2022 12:27:10 +0100
Subject: [PATCH 3/5] Fixed controller name

---
 src/bundle/Routing/OptionsLoader/Mapper.php       | 2 +-
 tests/bundle/Routing/OptionsLoader/MapperTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bundle/Routing/OptionsLoader/Mapper.php b/src/bundle/Routing/OptionsLoader/Mapper.php
index 2fdb2b61..b073710c 100644
--- a/src/bundle/Routing/OptionsLoader/Mapper.php
+++ b/src/bundle/Routing/OptionsLoader/Mapper.php
@@ -24,7 +24,7 @@ public function mapRoute(Route $route)
         $optionsRoute->setMethods(['OPTIONS']);
         $optionsRoute->setDefault(
             '_controller',
-            'ezpublish_rest.controller.options:getRouteOptions'
+            'Ibexa\Rest\Server\Controller\Options:getRouteOptions'
         );
 
         $optionsRoute->setDefault(
diff --git a/tests/bundle/Routing/OptionsLoader/MapperTest.php b/tests/bundle/Routing/OptionsLoader/MapperTest.php
index 10cc2796..f8f43994 100644
--- a/tests/bundle/Routing/OptionsLoader/MapperTest.php
+++ b/tests/bundle/Routing/OptionsLoader/MapperTest.php
@@ -76,7 +76,7 @@ public function testMapRoute()
         );
 
         self::assertEquals(
-            'ezpublish_rest.controller.options:getRouteOptions',
+            'Ibexa\Rest\Server\Controller\Options:getRouteOptions',
             $optionsRoute->getDefault('_controller')
         );
     }

From b9e275ad1735f4bde501fafbebace48cd0b00b54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Parafi=C5=84ski?= <dawid.parafinski@ez.no>
Date: Thu, 20 Jan 2022 09:25:20 +0100
Subject: [PATCH 4/5] Used imports instead of FQCN

---
 .../Compiler/FieldTypeProcessorPass.php       |  5 ++-
 .../Compiler/InputHandlerPass.php             |  5 ++-
 .../Compiler/InputParserPass.php              |  5 ++-
 .../Compiler/OutputVisitorPass.php            |  5 ++-
 .../Compiler/ValueObjectVisitorPass.php       |  5 ++-
 .../Security/RestSessionBasedFactory.php      |  3 +-
 src/lib/Input/ParserTools.php                 | 42 ++++++++++++-------
 .../Compiler/FieldTypeProcessorPassTest.php   |  5 ++-
 .../Compiler/InputHandlerPassTest.php         |  5 ++-
 .../Compiler/InputParserPassTest.php          |  5 ++-
 .../Compiler/OutputVisitorPassTest.php        | 11 ++---
 .../Compiler/ValueObjectVisitorPassTest.php   |  5 ++-
 .../Output/ValueObjectVisitor/PolicyTest.php  |  3 +-
 13 files changed, 65 insertions(+), 39 deletions(-)

diff --git a/src/bundle/DependencyInjection/Compiler/FieldTypeProcessorPass.php b/src/bundle/DependencyInjection/Compiler/FieldTypeProcessorPass.php
index 34263c52..3e6e551d 100644
--- a/src/bundle/DependencyInjection/Compiler/FieldTypeProcessorPass.php
+++ b/src/bundle/DependencyInjection/Compiler/FieldTypeProcessorPass.php
@@ -6,6 +6,7 @@
  */
 namespace Ibexa\Bundle\Rest\DependencyInjection\Compiler;
 
+use Ibexa\Rest\FieldTypeProcessorRegistry;
 use LogicException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -17,11 +18,11 @@ class FieldTypeProcessorPass implements CompilerPassInterface
 
     public function process(ContainerBuilder $container)
     {
-        if (!$container->hasDefinition(\Ibexa\Rest\FieldTypeProcessorRegistry::class)) {
+        if (!$container->hasDefinition(FieldTypeProcessorRegistry::class)) {
             return;
         }
 
-        $definition = $container->getDefinition(\Ibexa\Rest\FieldTypeProcessorRegistry::class);
+        $definition = $container->getDefinition(FieldTypeProcessorRegistry::class);
 
         $taggedServiceIds = $container->findTaggedServiceIds(
             self::FIELD_TYPE_PROCESSOR_SERVICE_TAG
diff --git a/src/bundle/DependencyInjection/Compiler/InputHandlerPass.php b/src/bundle/DependencyInjection/Compiler/InputHandlerPass.php
index 1429bae9..23fdc578 100644
--- a/src/bundle/DependencyInjection/Compiler/InputHandlerPass.php
+++ b/src/bundle/DependencyInjection/Compiler/InputHandlerPass.php
@@ -6,6 +6,7 @@
  */
 namespace Ibexa\Bundle\Rest\DependencyInjection\Compiler;
 
+use Ibexa\Rest\Input\Dispatcher;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -22,11 +23,11 @@ class InputHandlerPass implements CompilerPassInterface
 
     public function process(ContainerBuilder $container)
     {
-        if (!$container->hasDefinition(\Ibexa\Rest\Input\Dispatcher::class)) {
+        if (!$container->hasDefinition(Dispatcher::class)) {
             return;
         }
 
-        $definition = $container->getDefinition(\Ibexa\Rest\Input\Dispatcher::class);
+        $definition = $container->getDefinition(Dispatcher::class);
 
         $taggedServiceIds = $container->findTaggedServiceIds(self::INPUT_HANDLER_SERVICE_TAG);
         foreach ($taggedServiceIds as $id => $attributes) {
diff --git a/src/bundle/DependencyInjection/Compiler/InputParserPass.php b/src/bundle/DependencyInjection/Compiler/InputParserPass.php
index e93b01e6..0375fb7d 100644
--- a/src/bundle/DependencyInjection/Compiler/InputParserPass.php
+++ b/src/bundle/DependencyInjection/Compiler/InputParserPass.php
@@ -6,6 +6,7 @@
  */
 namespace Ibexa\Bundle\Rest\DependencyInjection\Compiler;
 
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -22,11 +23,11 @@ class InputParserPass implements CompilerPassInterface
 
     public function process(ContainerBuilder $container)
     {
-        if (!$container->hasDefinition(\Ibexa\Contracts\Rest\Input\ParsingDispatcher::class)) {
+        if (!$container->hasDefinition(ParsingDispatcher::class)) {
             return;
         }
 
-        $definition = $container->getDefinition(\Ibexa\Contracts\Rest\Input\ParsingDispatcher::class);
+        $definition = $container->getDefinition(ParsingDispatcher::class);
 
         $taggedServiceIds = $container->findTaggedServiceIds(self::INPUT_PARSER_SERVICE_TAG);
         foreach ($taggedServiceIds as $id => $attributes) {
diff --git a/src/bundle/DependencyInjection/Compiler/OutputVisitorPass.php b/src/bundle/DependencyInjection/Compiler/OutputVisitorPass.php
index d7e8cf73..4c2545c8 100644
--- a/src/bundle/DependencyInjection/Compiler/OutputVisitorPass.php
+++ b/src/bundle/DependencyInjection/Compiler/OutputVisitorPass.php
@@ -6,6 +6,7 @@
  */
 namespace Ibexa\Bundle\Rest\DependencyInjection\Compiler;
 
+use Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
@@ -24,11 +25,11 @@ class OutputVisitorPass implements CompilerPassInterface
 
     public function process(ContainerBuilder $container)
     {
-        if (!$container->hasDefinition(\Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher::class)) {
+        if (!$container->hasDefinition(AcceptHeaderVisitorDispatcher::class)) {
             return;
         }
 
-        $definition = $container->getDefinition(\Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher::class);
+        $definition = $container->getDefinition(AcceptHeaderVisitorDispatcher::class);
 
         $visitors = [];
 
diff --git a/src/bundle/DependencyInjection/Compiler/ValueObjectVisitorPass.php b/src/bundle/DependencyInjection/Compiler/ValueObjectVisitorPass.php
index 8860fd4e..ad774824 100644
--- a/src/bundle/DependencyInjection/Compiler/ValueObjectVisitorPass.php
+++ b/src/bundle/DependencyInjection/Compiler/ValueObjectVisitorPass.php
@@ -6,6 +6,7 @@
  */
 namespace Ibexa\Bundle\Rest\DependencyInjection\Compiler;
 
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitorDispatcher;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -20,11 +21,11 @@ class ValueObjectVisitorPass implements CompilerPassInterface
 
     public function process(ContainerBuilder $container)
     {
-        if (!$container->hasDefinition(\Ibexa\Contracts\Rest\Output\ValueObjectVisitorDispatcher::class)) {
+        if (!$container->hasDefinition(ValueObjectVisitorDispatcher::class)) {
             return;
         }
 
-        $definition = $container->getDefinition(\Ibexa\Contracts\Rest\Output\ValueObjectVisitorDispatcher::class);
+        $definition = $container->getDefinition(ValueObjectVisitorDispatcher::class);
 
         $taggedServiceIds = $container->findTaggedServiceIds(
             self::OUTPUT_VALUE_OBJECT_VISITOR_SERVICE_TAG
diff --git a/src/bundle/DependencyInjection/Security/RestSessionBasedFactory.php b/src/bundle/DependencyInjection/Security/RestSessionBasedFactory.php
index 8d584a54..da8de7aa 100644
--- a/src/bundle/DependencyInjection/Security/RestSessionBasedFactory.php
+++ b/src/bundle/DependencyInjection/Security/RestSessionBasedFactory.php
@@ -6,6 +6,7 @@
  */
 namespace Ibexa\Bundle\Rest\DependencyInjection\Security;
 
+use Ibexa\Rest\Server\Security\RestLogoutHandler;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\FormLoginFactory;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Reference;
@@ -41,7 +42,7 @@ protected function createListener($container, $id, $config, $userProvider)
             $logoutListenerDef = $container->getDefinition('security.logout_listener.' . $id);
             $logoutListenerDef->addMethodCall(
                 'addHandler',
-                [new Reference(\Ibexa\Rest\Server\Security\RestLogoutHandler::class)]
+                [new Reference(RestLogoutHandler::class)]
             );
 
             foreach ($logoutListenerDef->getMethodCalls() as $callArray) {
diff --git a/src/lib/Input/ParserTools.php b/src/lib/Input/ParserTools.php
index eb0971f7..edca18d1 100644
--- a/src/lib/Input/ParserTools.php
+++ b/src/lib/Input/ParserTools.php
@@ -7,8 +7,22 @@
 namespace Ibexa\Rest\Input;
 
 use Ibexa\Contracts\Core\Repository\Values;
+use Ibexa\Contracts\Core\Repository\Values\User\Limitation\ContentTypeLimitation;
+use Ibexa\Contracts\Core\Repository\Values\User\Limitation\LanguageLimitation;
+use Ibexa\Contracts\Core\Repository\Values\User\Limitation\LocationLimitation;
+use Ibexa\Contracts\Core\Repository\Values\User\Limitation\ObjectStateLimitation;
+use Ibexa\Contracts\Core\Repository\Values\User\Limitation\OwnerLimitation;
+use Ibexa\Contracts\Core\Repository\Values\User\Limitation\ParentContentTypeLimitation;
+use Ibexa\Contracts\Core\Repository\Values\User\Limitation\ParentDepthLimitation;
+use Ibexa\Contracts\Core\Repository\Values\User\Limitation\ParentOwnerLimitation;
+use Ibexa\Contracts\Core\Repository\Values\User\Limitation\ParentUserGroupLimitation;
+use Ibexa\Contracts\Core\Repository\Values\User\Limitation\SectionLimitation;
+use Ibexa\Contracts\Core\Repository\Values\User\Limitation\SiteaccessLimitation;
+use Ibexa\Contracts\Core\Repository\Values\User\Limitation\SubtreeLimitation;
+use Ibexa\Contracts\Core\Repository\Values\User\Limitation\UserGroupLimitation;
 use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Core\Base\Exceptions\NotFoundException;
 use RuntimeException;
 
 /**
@@ -226,46 +240,46 @@ protected function getLimitationByIdentifier($identifier)
     {
         switch ($identifier) {
             case Values\User\Limitation::CONTENTTYPE:
-                return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\ContentTypeLimitation();
+                return new ContentTypeLimitation();
 
             case Values\User\Limitation::LANGUAGE:
-                return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\LanguageLimitation();
+                return new LanguageLimitation();
 
             case Values\User\Limitation::LOCATION:
-                return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\LocationLimitation();
+                return new LocationLimitation();
 
             case Values\User\Limitation::OWNER:
-                return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\OwnerLimitation();
+                return new OwnerLimitation();
 
             case Values\User\Limitation::PARENTOWNER:
-                return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\ParentOwnerLimitation();
+                return new ParentOwnerLimitation();
 
             case Values\User\Limitation::PARENTCONTENTTYPE:
-                return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\ParentContentTypeLimitation();
+                return new ParentContentTypeLimitation();
 
             case Values\User\Limitation::PARENTDEPTH:
-                return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\ParentDepthLimitation();
+                return new ParentDepthLimitation();
 
             case Values\User\Limitation::SECTION:
-                return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\SectionLimitation();
+                return new SectionLimitation();
 
             case Values\User\Limitation::SITEACCESS:
-                return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\SiteaccessLimitation();
+                return new SiteaccessLimitation();
 
             case Values\User\Limitation::STATE:
-                return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\ObjectStateLimitation();
+                return new ObjectStateLimitation();
 
             case Values\User\Limitation::SUBTREE:
-                return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\SubtreeLimitation();
+                return new SubtreeLimitation();
 
             case Values\User\Limitation::USERGROUP:
-                return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\UserGroupLimitation();
+                return new UserGroupLimitation();
 
             case Values\User\Limitation::PARENTUSERGROUP:
-                return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\ParentUserGroupLimitation();
+                return new ParentUserGroupLimitation();
 
             default:
-                throw new \Ibexa\Core\Base\Exceptions\NotFoundException('Limitation', $identifier);
+                throw new NotFoundException('Limitation', $identifier);
         }
     }
 }
diff --git a/tests/bundle/DependencyInjection/Compiler/FieldTypeProcessorPassTest.php b/tests/bundle/DependencyInjection/Compiler/FieldTypeProcessorPassTest.php
index ea321ddd..634b4b48 100644
--- a/tests/bundle/DependencyInjection/Compiler/FieldTypeProcessorPassTest.php
+++ b/tests/bundle/DependencyInjection/Compiler/FieldTypeProcessorPassTest.php
@@ -7,6 +7,7 @@
 namespace Ibexa\Tests\Bundle\Rest\DependencyInjection\Compiler;
 
 use Ibexa\Bundle\Rest\DependencyInjection\Compiler\FieldTypeProcessorPass;
+use Ibexa\Rest\FieldTypeProcessorRegistry;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -25,7 +26,7 @@ public function testProcess(string $tag): void
         $containerBuilder = new ContainerBuilder();
         $containerBuilder->addDefinitions(
             [
-                \Ibexa\Rest\FieldTypeProcessorRegistry::class => new Definition(),
+                FieldTypeProcessorRegistry::class => new Definition(),
                 'ezpublish_rest.field_type_processor.test' => $processorDefinition,
             ]
         );
@@ -33,7 +34,7 @@ public function testProcess(string $tag): void
         $compilerPass = new FieldTypeProcessorPass();
         $compilerPass->process($containerBuilder);
 
-        $dispatcherMethodCalls = $containerBuilder->getDefinition(\Ibexa\Rest\FieldTypeProcessorRegistry::class)->getMethodCalls();
+        $dispatcherMethodCalls = $containerBuilder->getDefinition(FieldTypeProcessorRegistry::class)->getMethodCalls();
         self::assertTrue(isset($dispatcherMethodCalls[0][0]), 'Failed asserting that dispatcher has a method call');
         self::assertEquals('registerProcessor', $dispatcherMethodCalls[0][0], "Failed asserting that called method is 'addVisitor'");
         self::assertInstanceOf(Reference::class, $dispatcherMethodCalls[0][1][1], 'Failed asserting that method call is to a Reference object');
diff --git a/tests/bundle/DependencyInjection/Compiler/InputHandlerPassTest.php b/tests/bundle/DependencyInjection/Compiler/InputHandlerPassTest.php
index e6e797e6..fe915bd6 100644
--- a/tests/bundle/DependencyInjection/Compiler/InputHandlerPassTest.php
+++ b/tests/bundle/DependencyInjection/Compiler/InputHandlerPassTest.php
@@ -7,6 +7,7 @@
 namespace Ibexa\Tests\Bundle\Rest\DependencyInjection\Compiler;
 
 use Ibexa\Bundle\Rest\DependencyInjection\Compiler\InputHandlerPass;
+use Ibexa\Rest\Input\Dispatcher;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -22,7 +23,7 @@ public function testProcess()
         $containerBuilder = new ContainerBuilder();
         $containerBuilder->addDefinitions(
             [
-                \Ibexa\Rest\Input\Dispatcher::class => new Definition(),
+                Dispatcher::class => new Definition(),
                 'ezpublish_rest.input.handler.test' => $visitorDefinition,
             ]
         );
@@ -31,7 +32,7 @@ public function testProcess()
         $compilerPass->process($containerBuilder);
 
         $dispatcherMethodCalls = $containerBuilder
-            ->getDefinition(\Ibexa\Rest\Input\Dispatcher::class)
+            ->getDefinition(Dispatcher::class)
             ->getMethodCalls();
         self::assertTrue(isset($dispatcherMethodCalls[0][0]), 'Failed asserting that dispatcher has a method call');
         self::assertEquals('addHandler', $dispatcherMethodCalls[0][0], "Failed asserting that called method is 'addParser'");
diff --git a/tests/bundle/DependencyInjection/Compiler/InputParserPassTest.php b/tests/bundle/DependencyInjection/Compiler/InputParserPassTest.php
index 77bc0a6d..2122575c 100644
--- a/tests/bundle/DependencyInjection/Compiler/InputParserPassTest.php
+++ b/tests/bundle/DependencyInjection/Compiler/InputParserPassTest.php
@@ -7,6 +7,7 @@
 namespace Ibexa\Tests\Bundle\Rest\DependencyInjection\Compiler;
 
 use Ibexa\Bundle\Rest\DependencyInjection\Compiler\InputParserPass;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -25,7 +26,7 @@ public function testProcess()
         $containerBuilder = new ContainerBuilder();
         $containerBuilder->addDefinitions(
             [
-                \Ibexa\Contracts\Rest\Input\ParsingDispatcher::class => new Definition(),
+                ParsingDispatcher::class => new Definition(),
                 'ezpublish_rest.input.parser.unit_test' => $visitorDefinition,
             ]
         );
@@ -34,7 +35,7 @@ public function testProcess()
         $compilerPass->process($containerBuilder);
 
         $dispatcherMethodCalls = $containerBuilder
-            ->getDefinition(\Ibexa\Contracts\Rest\Input\ParsingDispatcher::class)
+            ->getDefinition(ParsingDispatcher::class)
             ->getMethodCalls();
         self::assertTrue(isset($dispatcherMethodCalls[0][0]), 'Failed asserting that dispatcher has a method call');
         self::assertEquals('addParser', $dispatcherMethodCalls[0][0], "Failed asserting that called method is 'addParser'");
diff --git a/tests/bundle/DependencyInjection/Compiler/OutputVisitorPassTest.php b/tests/bundle/DependencyInjection/Compiler/OutputVisitorPassTest.php
index b82d8cca..eb1db729 100644
--- a/tests/bundle/DependencyInjection/Compiler/OutputVisitorPassTest.php
+++ b/tests/bundle/DependencyInjection/Compiler/OutputVisitorPassTest.php
@@ -7,6 +7,7 @@
 namespace Ibexa\Tests\Bundle\Rest\DependencyInjection\Compiler;
 
 use Ibexa\Bundle\Rest\DependencyInjection\Compiler\OutputVisitorPass;
+use Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher;
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractCompilerPassTestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -35,7 +36,7 @@ public function testProcess()
         $arrayDefinition->addTag('ibexa.rest.output.visitor', ['regexps' => [$arrayRegexp]]);
         $this->setDefinition('ezpublish_rest.output.visitor.test_array', $arrayDefinition);
 
-        $this->setDefinition(\Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher::class, new Definition());
+        $this->setDefinition(AcceptHeaderVisitorDispatcher::class, new Definition());
 
         $this->compile();
 
@@ -45,11 +46,11 @@ public function testProcess()
         self::assertEquals('ezpublish_rest.output.visitor.test_array', $visitorsInOrder[1]);
         $this->assertContainerBuilderHasService('ezpublish_rest.output.visitor.test_string');
         $this->assertContainerBuilderHasService('ezpublish_rest.output.visitor.test_array');
-        $this->assertContainerBuilderHasServiceDefinitionWithMethodCall(\Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher::class, 'addVisitor', [
+        $this->assertContainerBuilderHasServiceDefinitionWithMethodCall(AcceptHeaderVisitorDispatcher::class, 'addVisitor', [
             $stringRegexp,
             new Reference('ezpublish_rest.output.visitor.test_string'),
         ]);
-        $this->assertContainerBuilderHasServiceDefinitionWithMethodCall(\Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher::class, 'addVisitor', [
+        $this->assertContainerBuilderHasServiceDefinitionWithMethodCall(AcceptHeaderVisitorDispatcher::class, 'addVisitor', [
             $arrayRegexp,
             new Reference('ezpublish_rest.output.visitor.test_array'),
         ]);
@@ -82,7 +83,7 @@ public function testPriority()
             'low',
         ];
 
-        $this->setDefinition(\Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher::class, new Definition());
+        $this->setDefinition(AcceptHeaderVisitorDispatcher::class, new Definition());
 
         foreach ($definitions as $name => $data) {
             $definition = new Definition();
@@ -101,7 +102,7 @@ public function testPriority()
 
     protected function getVisitorsInRegistrationOrder()
     {
-        $calls = $this->container->getDefinition(\Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher::class)->getMethodCalls();
+        $calls = $this->container->getDefinition(AcceptHeaderVisitorDispatcher::class)->getMethodCalls();
 
         return array_map(static function ($call) {
             return (string) $call[1][1];
diff --git a/tests/bundle/DependencyInjection/Compiler/ValueObjectVisitorPassTest.php b/tests/bundle/DependencyInjection/Compiler/ValueObjectVisitorPassTest.php
index 66d363f7..df83473d 100644
--- a/tests/bundle/DependencyInjection/Compiler/ValueObjectVisitorPassTest.php
+++ b/tests/bundle/DependencyInjection/Compiler/ValueObjectVisitorPassTest.php
@@ -7,6 +7,7 @@
 namespace Ibexa\Tests\Bundle\Rest\DependencyInjection\Compiler;
 
 use Ibexa\Bundle\Rest\DependencyInjection\Compiler\ValueObjectVisitorPass;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitorDispatcher;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -22,7 +23,7 @@ public function testProcess()
         $containerBuilder = new ContainerBuilder();
         $containerBuilder->addDefinitions(
             [
-                \Ibexa\Contracts\Rest\Output\ValueObjectVisitorDispatcher::class => new Definition(),
+                ValueObjectVisitorDispatcher::class => new Definition(),
                 'ezpublish_rest.output.value_object_visitor.test' => $visitorDefinition,
             ]
         );
@@ -31,7 +32,7 @@ public function testProcess()
         $compilerPass->process($containerBuilder);
 
         $dispatcherMethodCalls = $containerBuilder
-            ->getDefinition(\Ibexa\Contracts\Rest\Output\ValueObjectVisitorDispatcher::class)
+            ->getDefinition(ValueObjectVisitorDispatcher::class)
             ->getMethodCalls();
         self::assertTrue(isset($dispatcherMethodCalls[0][0]), 'Failed asserting that dispatcher has a method call');
         self::assertEquals('addVisitor', $dispatcherMethodCalls[0][0], "Failed asserting that called method is 'addVisitor'");
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/PolicyTest.php b/tests/lib/Server/Output/ValueObjectVisitor/PolicyTest.php
index 090ded60..1152bcc5 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/PolicyTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/PolicyTest.php
@@ -6,6 +6,7 @@
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
+use Ibexa\Contracts\Core\Repository\Values\User\Limitation\ContentTypeLimitation;
 use Ibexa\Core\Repository\Values\User;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
@@ -24,7 +25,7 @@ public function testVisit()
 
         $generator->startDocument(null);
 
-        $contentTypeLimitation = new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\ContentTypeLimitation();
+        $contentTypeLimitation = new ContentTypeLimitation();
         $contentTypeLimitation->limitationValues = [1, 2, 3];
 
         $policy = new User\Policy(

From b2afb570b0befe7d3f6a65f66591d4f71b73b5c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Parafi=C5=84ski?= <dawid.parafinski@ez.no>
Date: Thu, 20 Jan 2022 10:10:03 +0100
Subject: [PATCH 5/5] Fixed wrong entry in input map

---
 src/bundle/Resources/config/routing.yml  | 2 +-
 src/bundle/Resources/config/services.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bundle/Resources/config/routing.yml b/src/bundle/Resources/config/routing.yml
index 72c776ca..09e3031f 100644
--- a/src/bundle/Resources/config/routing.yml
+++ b/src/bundle/Resources/config/routing.yml
@@ -246,7 +246,7 @@ ezpublish_rest_revealContent:
 ezpublish_rest_binaryContent_getImageVariation:
     path: /content/binary/images/{imageId}/variations/{variationIdentifier}
     defaults:
-        _controller: alias for "Ibexa\Bundle\Connector\Dam\Controller\AssetVariationController":getImageVariation
+        _controller: Ibexa\Rest\Server\Controller\BinaryContent:getImageVariation
     methods: [GET]
     requirements:
         imageId: \d+-\d+(-\d+)?
diff --git a/src/bundle/Resources/config/services.yml b/src/bundle/Resources/config/services.yml
index 2d5c4156..4f731980 100644
--- a/src/bundle/Resources/config/services.yml
+++ b/src/bundle/Resources/config/services.yml
@@ -148,7 +148,7 @@ services:
             - '@ibexa.api.service.section'
         tags: [controller.service_arguments]
 
-    alias for "Ibexa\Bundle\Connector\Dam\Controller\AssetVariationController":
+    Ibexa\Rest\Server\Controller\BinaryContent:
         class: "%ezpublish_rest.controller.binary_content.class%"
         parent: Ibexa\Rest\Server\Controller
         arguments: