diff --git a/src/bundle/Resources/config/input_parsers.yml b/src/bundle/Resources/config/input_parsers.yml
index 703cf989..eb83f521 100644
--- a/src/bundle/Resources/config/input_parsers.yml
+++ b/src/bundle/Resources/config/input_parsers.yml
@@ -1,93 +1,16 @@
 parameters:
-    ezpublish_rest.input.parser.class: Ibexa\Rest\Server\Common\Parser
-    ezpublish_rest.input.parser.ContentObjectStates.class: Ibexa\Rest\Input\Parser\ContentObjectStates
 
     # REST server
-    ezpublish_rest.input.parser.ContentCreate.class: Ibexa\Rest\Server\Input\Parser\ContentCreate
-    ezpublish_rest.input.parser.ContentUpdate.class: Ibexa\Rest\Server\Input\Parser\ContentUpdate
-    ezpublish_rest.input.parser.ContentTypeGroupInput.class: Ibexa\Rest\Server\Input\Parser\ContentTypeGroupInput
-    ezpublish_rest.input.parser.ContentTypeCreate.class: Ibexa\Rest\Server\Input\Parser\ContentTypeCreate
-    ezpublish_rest.input.parser.ContentTypeUpdate.class: Ibexa\Rest\Server\Input\Parser\ContentTypeUpdate
-    ezpublish_rest.input.parser.FieldDefinitionCreate.class: Ibexa\Rest\Server\Input\Parser\FieldDefinitionCreate
-    ezpublish_rest.input.parser.FieldDefinitionUpdate.class: Ibexa\Rest\Server\Input\Parser\FieldDefinitionUpdate
-    ezpublish_rest.input.parser.LocationCreate.class: Ibexa\Rest\Server\Input\Parser\LocationCreate
-    ezpublish_rest.input.parser.LocationUpdate.class: Ibexa\Rest\Server\Input\Parser\LocationUpdate
-    ezpublish_rest.input.parser.ObjectStateCreate.class: Ibexa\Rest\Server\Input\Parser\ObjectStateCreate
-    ezpublish_rest.input.parser.ObjectStateGroupCreate.class: Ibexa\Rest\Server\Input\Parser\ObjectStateGroupCreate
-    ezpublish_rest.input.parser.ObjectStateGroupUpdate.class: Ibexa\Rest\Server\Input\Parser\ObjectStateGroupUpdate
-    ezpublish_rest.input.parser.ObjectStateUpdate.class: Ibexa\Rest\Server\Input\Parser\ObjectStateUpdate
-    ezpublish_rest.input.parser.PolicyCreate.class: Ibexa\Rest\Server\Input\Parser\PolicyCreate
-    ezpublish_rest.input.parser.PolicyUpdate.class: Ibexa\Rest\Server\Input\Parser\PolicyUpdate
-    ezpublish_rest.input.parser.RelationCreate.class: Ibexa\Rest\Server\Input\Parser\RelationCreate
-    ezpublish_rest.input.parser.RoleAssignInput.class: Ibexa\Rest\Server\Input\Parser\RoleAssignInput
-    ezpublish_rest.input.parser.RoleInput.class: Ibexa\Rest\Server\Input\Parser\RoleInput
-    ezpublish_rest.input.parser.SectionInput.class: Ibexa\Rest\Server\Input\Parser\SectionInput
-    ezpublish_rest.input.parser.UserGroupUpdate.class: Ibexa\Rest\Server\Input\Parser\UserGroupUpdate
-    ezpublish_rest.input.parser.UserUpdate.class: Ibexa\Rest\Server\Input\Parser\UserUpdate
-    ezpublish_rest.input.parser.UrlWildcardCreate.class: Ibexa\Rest\Server\Input\Parser\URLWildcardCreate
-    ezpublish_rest.input.parser.URLAliasCreate.class: Ibexa\Rest\Server\Input\Parser\URLAliasCreate
-    ezpublish_rest.input.parser.UserCreate.class: Ibexa\Rest\Server\Input\Parser\UserCreate
-    ezpublish_rest.input.parser.UserGroupCreate.class: Ibexa\Rest\Server\Input\Parser\UserGroupCreate
-    ezpublish_rest.input.parser.SessionInput.class: Ibexa\Rest\Server\Input\Parser\SessionInput
-    ezpublish_rest.input.parser.VersionUpdate.class: Ibexa\Rest\Server\Input\Parser\VersionUpdate
-    ezpublish_rest.input.parser.ViewInput.class: Ibexa\Rest\Server\Input\Parser\ViewInput
-    ezpublish_rest.input.parser.ViewInputOneDotOne.class: Ibexa\Rest\Server\Input\Parser\ViewInputOneDotOne
-
-    ezpublish_rest.input.parser.internal.ContentQuery.class: Ibexa\Rest\Server\Input\Parser\ContentQuery
-    ezpublish_rest.input.parser.internal.LocationQuery.class: Ibexa\Rest\Server\Input\Parser\LocationQuery
-    ezpublish_rest.input.parser.internal.criterion.Ancestor.class: Ibexa\Rest\Server\Input\Parser\Criterion\Ancestor
-    ezpublish_rest.input.parser.internal.criterion.ContentId.class: Ibexa\Rest\Server\Input\Parser\Criterion\ContentId
-    ezpublish_rest.input.parser.internal.criterion.ContentRemoteId.class: Ibexa\Rest\Server\Input\Parser\Criterion\ContentRemoteId
-    ezpublish_rest.input.parser.internal.criterion.ContentTypeGroupId.class: Ibexa\Rest\Server\Input\Parser\Criterion\ContentTypeGroupId
-    ezpublish_rest.input.parser.internal.criterion.ContentTypeId.class: Ibexa\Rest\Server\Input\Parser\Criterion\ContentTypeId
-    ezpublish_rest.input.parser.internal.criterion.ContentTypeIdentifier.class: Ibexa\Rest\Server\Input\Parser\Criterion\ContentTypeIdentifier
-    ezpublish_rest.input.parser.internal.criterion.DateMetadata.class: Ibexa\Rest\Server\Input\Parser\Criterion\DateMetadata
-    ezpublish_rest.input.parser.internal.criterion.Field.class: Ibexa\Rest\Server\Input\Parser\Criterion\Field
-    ezpublish_rest.input.parser.internal.criterion.FullText.class: Ibexa\Rest\Server\Input\Parser\Criterion\FullText
-    ezpublish_rest.input.parser.internal.criterion.LanguageCode.class: Ibexa\Rest\Server\Input\Parser\Criterion\LanguageCode
-    ezpublish_rest.input.parser.internal.criterion.LocationId.class: Ibexa\Rest\Server\Input\Parser\Criterion\LocationId
-    ezpublish_rest.input.parser.internal.criterion.LocationRemoteId.class: Ibexa\Rest\Server\Input\Parser\Criterion\LocationRemoteId
-    ezpublish_rest.input.parser.internal.criterion.LogicalAnd.class: Ibexa\Rest\Server\Input\Parser\Criterion\LogicalAnd
-    ezpublish_rest.input.parser.internal.criterion.LogicalNot.class: Ibexa\Rest\Server\Input\Parser\Criterion\LogicalNot
-    ezpublish_rest.input.parser.internal.criterion.LogicalOperator.class: Ibexa\Rest\Server\Input\Parser\Criterion\LogicalOperator
-    ezpublish_rest.input.parser.internal.criterion.LogicalOr.class: Ibexa\Rest\Server\Input\Parser\Criterion\LogicalOr
-    ezpublish_rest.input.parser.internal.criterion.MoreLikeThis.class: Ibexa\Rest\Server\Input\Parser\Criterion\MoreLikeThis
-    ezpublish_rest.input.parser.internal.criterion.ObjectStateId.class: Ibexa\Rest\Server\Input\Parser\Criterion\ObjectStateId
-    ezpublish_rest.input.parser.internal.criterion.Operator.class: Ibexa\Rest\Server\Input\Parser\Criterion\Operator
-    ezpublish_rest.input.parser.internal.criterion.ParentLocationId.class: Ibexa\Rest\Server\Input\Parser\Criterion\ParentLocationId
-    ezpublish_rest.input.parser.internal.criterion.ParentLocationRemoteId.class: Ibexa\Rest\Server\Input\Parser\Criterion\ParentLocationRemoteId
-    ezpublish_rest.input.parser.internal.criterion.SectionIdentifier.class: Ibexa\Rest\Server\Input\Parser\Criterion\SectionIdentifier
-    ezpublish_rest.input.parser.internal.criterion.SectionId.class: Ibexa\Rest\Server\Input\Parser\Criterion\SectionId
-    ezpublish_rest.input.parser.internal.criterion.Subtree.class: Ibexa\Rest\Server\Input\Parser\Criterion\Subtree
-    ezpublish_rest.input.parser.internal.criterion.UserMetadata.class: Ibexa\Rest\Server\Input\Parser\Criterion\UserMetadata
-    ezpublish_rest.input.parser.internal.criterion.Visibility.class: Ibexa\Rest\Server\Input\Parser\Criterion\Visibility
-
-    ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class: Ibexa\Rest\Server\Input\Parser\SortClause\DataKeyValueObjectClass
-    ezpublish_rest.input.parser.internal.sortclause.field.class: Ibexa\Rest\Server\Input\Parser\SortClause\Field
-
-    ezpublish_rest.input.parser.internal.facetbuilder.content_type.class: Ibexa\Rest\Server\Input\Parser\FacetBuilder\ContentTypeParser
-    ezpublish_rest.input.parser.internal.facetbuilder.criterion.class: Ibexa\Rest\Server\Input\Parser\FacetBuilder\CriterionParser
-    ezpublish_rest.input.parser.internal.facetbuilder.date_range.class: Ibexa\Rest\Server\Input\Parser\FacetBuilder\DateRangeParser
-    ezpublish_rest.input.parser.internal.facetbuilder.field.class: Ibexa\Rest\Server\Input\Parser\FacetBuilder\FieldParser
-    ezpublish_rest.input.parser.internal.facetbuilder.field_range.class: Ibexa\Rest\Server\Input\Parser\FacetBuilder\FieldRangeParser
-    ezpublish_rest.input.parser.internal.facetbuilder.location.class: Ibexa\Rest\Server\Input\Parser\FacetBuilder\LocationParser
-    ezpublish_rest.input.parser.internal.facetbuilder.section.class: Ibexa\Rest\Server\Input\Parser\FacetBuilder\SectionParser
-    ezpublish_rest.input.parser.internal.facetbuilder.term.class: Ibexa\Rest\Server\Input\Parser\FacetBuilder\TermParser
-    ezpublish_rest.input.parser.internal.facetbuilder.user.class: Ibexa\Rest\Server\Input\Parser\FacetBuilder\UserParser
-
-    ezpublish_rest.input.parser.internal.route_based_limitation.class: Ibexa\Rest\Server\Input\Parser\Limitation\RouteBasedLimitationParser
-    ezpublish_rest.input.parser.internal.path_string_route_based_limitation.class: Ibexa\Rest\Server\Input\Parser\Limitation\PathStringRouteBasedLimitationParser
 
 services:
     Ibexa\Rest\Server\Common\Parser:
-        class: "%ezpublish_rest.input.parser.class%"
         abstract: true
         calls:
             - [ setRequestParser, [ '@Ibexa\Bundle\Rest\RequestParser\Router' ] ]
 
     Ibexa\Rest\Input\Parser\ContentObjectStates:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.ContentObjectStates.class%"
+        class: Ibexa\Rest\Input\Parser\ContentObjectStates
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.ContentObjectStates }
 
@@ -95,7 +18,7 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\ContentCreate:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.ContentCreate.class%"
+        class: Ibexa\Rest\Server\Input\Parser\ContentCreate
         arguments:
             - '@ibexa.api.service.content'
             - '@ibexa.api.service.content_type'
@@ -107,13 +30,13 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\ContentUpdate:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.ContentUpdate.class%"
+        class: Ibexa\Rest\Server\Input\Parser\ContentUpdate
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.ContentUpdate }
 
     Ibexa\Rest\Server\Input\Parser\ContentTypeCreate:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.ContentTypeCreate.class%"
+        class: Ibexa\Rest\Server\Input\Parser\ContentTypeCreate
         arguments:
             - '@ibexa.api.service.content_type'
             - '@Ibexa\Rest\Server\Input\Parser\FieldDefinitionCreate'
@@ -123,7 +46,7 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\ContentTypeGroupInput:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.ContentTypeGroupInput.class%"
+        class: Ibexa\Rest\Server\Input\Parser\ContentTypeGroupInput
         arguments:
             - '@ibexa.api.service.content_type'
             - '@Ibexa\Rest\Input\ParserTools'
@@ -132,7 +55,7 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\ContentTypeUpdate:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.ContentTypeUpdate.class%"
+        class: Ibexa\Rest\Server\Input\Parser\ContentTypeUpdate
         arguments:
             - '@ibexa.api.service.content_type'
             - '@Ibexa\Rest\Input\ParserTools'
@@ -141,7 +64,7 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\FieldDefinitionCreate:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.FieldDefinitionCreate.class%"
+        class: Ibexa\Rest\Server\Input\Parser\FieldDefinitionCreate
         arguments:
             - '@ibexa.api.service.content_type'
             - '@Ibexa\Rest\Input\FieldTypeParser'
@@ -151,7 +74,7 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\FieldDefinitionUpdate:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.FieldDefinitionUpdate.class%"
+        class: Ibexa\Rest\Server\Input\Parser\FieldDefinitionUpdate
         arguments:
             - '@ibexa.api.service.content_type'
             - '@Ibexa\Rest\Input\FieldTypeParser'
@@ -166,7 +89,7 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\LocationCreate:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.LocationCreate.class%"
+        class: Ibexa\Rest\Server\Input\Parser\LocationCreate
         arguments:
             - '@ibexa.api.service.location'
             - '@Ibexa\Rest\Input\ParserTools'
@@ -175,7 +98,7 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\LocationUpdate:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.LocationUpdate.class%"
+        class: Ibexa\Rest\Server\Input\Parser\LocationUpdate
         arguments:
             - '@ibexa.api.service.location'
             - '@Ibexa\Rest\Input\ParserTools'
@@ -184,7 +107,7 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\ObjectStateGroupCreate:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.ObjectStateGroupCreate.class%"
+        class: Ibexa\Rest\Server\Input\Parser\ObjectStateGroupCreate
         arguments:
             - '@ibexa.api.service.object_state'
             - '@Ibexa\Rest\Input\ParserTools'
@@ -193,7 +116,7 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\ObjectStateGroupUpdate:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.ObjectStateGroupUpdate.class%"
+        class: Ibexa\Rest\Server\Input\Parser\ObjectStateGroupUpdate
         arguments:
             - '@ibexa.api.service.object_state'
             - '@Ibexa\Rest\Input\ParserTools'
@@ -202,7 +125,7 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\ObjectStateCreate:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.ObjectStateCreate.class%"
+        class: Ibexa\Rest\Server\Input\Parser\ObjectStateCreate
         arguments:
             - '@ibexa.api.service.object_state'
             - '@Ibexa\Rest\Input\ParserTools'
@@ -211,7 +134,7 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\ObjectStateUpdate:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.ObjectStateUpdate.class%"
+        class: Ibexa\Rest\Server\Input\Parser\ObjectStateUpdate
         arguments:
             - '@ibexa.api.service.object_state'
             - '@Ibexa\Rest\Input\ParserTools'
@@ -220,7 +143,7 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\PolicyCreate:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.PolicyCreate.class%"
+        class: Ibexa\Rest\Server\Input\Parser\PolicyCreate
         arguments:
             - '@ibexa.api.service.role'
             - '@Ibexa\Rest\Input\ParserTools'
@@ -229,7 +152,7 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\PolicyUpdate:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.PolicyUpdate.class%"
+        class: Ibexa\Rest\Server\Input\Parser\PolicyUpdate
         arguments:
             - '@ibexa.api.service.role'
             - '@Ibexa\Rest\Input\ParserTools'
@@ -238,13 +161,13 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\RelationCreate:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.RelationCreate.class%"
+        class: Ibexa\Rest\Server\Input\Parser\RelationCreate
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.RelationCreate }
 
     Ibexa\Rest\Server\Input\Parser\RoleAssignInput:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.RoleAssignInput.class%"
+        class: Ibexa\Rest\Server\Input\Parser\RoleAssignInput
         arguments:
             - '@Ibexa\Rest\Input\ParserTools'
         tags:
@@ -252,7 +175,7 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\RoleInput:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.RoleInput.class%"
+        class: Ibexa\Rest\Server\Input\Parser\RoleInput
         arguments:
             - '@ibexa.api.service.role'
             - '@Ibexa\Rest\Input\ParserTools'
@@ -261,7 +184,7 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\SectionInput:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.SectionInput.class%"
+        class: Ibexa\Rest\Server\Input\Parser\SectionInput
         arguments:
             - '@ibexa.api.service.section'
         tags:
@@ -269,7 +192,7 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\SessionInput:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.SessionInput.class%"
+        class: Ibexa\Rest\Server\Input\Parser\SessionInput
         arguments:
             - '@Ibexa\Rest\Input\ParserTools'
         tags:
@@ -277,7 +200,7 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\UserGroupUpdate:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.UserGroupUpdate.class%"
+        class: Ibexa\Rest\Server\Input\Parser\UserGroupUpdate
         arguments:
             - '@ibexa.api.service.user'
             - '@ibexa.api.service.content'
@@ -288,7 +211,7 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\URLAliasCreate:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.URLAliasCreate.class%"
+        class: Ibexa\Rest\Server\Input\Parser\URLAliasCreate
         arguments:
             - '@Ibexa\Rest\Input\ParserTools'
         tags:
@@ -296,7 +219,7 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\URLWildcardCreate:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.UrlWildcardCreate.class%"
+        class: Ibexa\Rest\Server\Input\Parser\URLWildcardCreate
         arguments:
             - '@Ibexa\Rest\Input\ParserTools'
         tags:
@@ -304,7 +227,7 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\UserCreate:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.UserCreate.class%"
+        class: Ibexa\Rest\Server\Input\Parser\UserCreate
         arguments:
             - '@ibexa.api.service.user'
             - '@ibexa.api.service.content_type'
@@ -315,7 +238,7 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\UserGroupCreate:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.UserGroupCreate.class%"
+        class: Ibexa\Rest\Server\Input\Parser\UserGroupCreate
         arguments:
             - '@ibexa.api.service.user'
             - '@ibexa.api.service.content_type'
@@ -325,7 +248,7 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\UserUpdate:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.UserUpdate.class%"
+        class: Ibexa\Rest\Server\Input\Parser\UserUpdate
         arguments:
             - '@ibexa.api.service.user'
             - '@ibexa.api.service.content'
@@ -336,19 +259,19 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\ViewInput:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.ViewInput.class%"
+        class: Ibexa\Rest\Server\Input\Parser\ViewInput
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.ViewInput }
 
     Ibexa\Rest\Server\Input\Parser\ViewInputOneDotOne:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.ViewInputOneDotOne.class%"
+        class: Ibexa\Rest\Server\Input\Parser\ViewInputOneDotOne
         tags:
             - { name: ibexa.rest.input.parser, mediaType: "application/vnd.ibexa.api.ViewInput; version=1.1" }
 
     Ibexa\Rest\Server\Input\Parser\VersionUpdate:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.VersionUpdate.class%"
+        class: Ibexa\Rest\Server\Input\Parser\VersionUpdate
         arguments:
             - '@ibexa.api.service.content'
             - '@Ibexa\Rest\Input\FieldTypeParser'
@@ -358,49 +281,49 @@ services:
     # internal Media-Types
     Ibexa\Rest\Server\Input\Parser\ContentQuery:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.internal.ContentQuery.class%"
+        class: Ibexa\Rest\Server\Input\Parser\ContentQuery
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.ContentQuery }
 
     Ibexa\Rest\Server\Input\Parser\LocationQuery:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.internal.LocationQuery.class%"
+        class: Ibexa\Rest\Server\Input\Parser\LocationQuery
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.LocationQuery }
 
     Ibexa\Rest\Server\Input\Parser\Criterion\Ancestor:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.internal.criterion.Ancestor.class%"
+        class: Ibexa\Rest\Server\Input\Parser\Criterion\Ancestor
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.criterion.Ancestor }
 
     Ibexa\Rest\Server\Input\Parser\Criterion\ContentId:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.internal.criterion.ContentId.class%"
+        class: Ibexa\Rest\Server\Input\Parser\Criterion\ContentId
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.criterion.ContentId }
 
     Ibexa\Rest\Server\Input\Parser\Criterion\ContentRemoteId:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.internal.criterion.ContentRemoteId.class%"
+        class: Ibexa\Rest\Server\Input\Parser\Criterion\ContentRemoteId
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.criterion.ContentRemoteId }
 
     Ibexa\Rest\Server\Input\Parser\Criterion\ContentTypeGroupId:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.internal.criterion.ContentTypeGroupId.class%"
+        class: Ibexa\Rest\Server\Input\Parser\Criterion\ContentTypeGroupId
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.criterion.ContentTypeGroupId }
 
     Ibexa\Rest\Server\Input\Parser\Criterion\ContentTypeId:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.internal.criterion.ContentTypeId.class%"
+        class: Ibexa\Rest\Server\Input\Parser\Criterion\ContentTypeId
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.criterion.ContentTypeId }
 
     Ibexa\Rest\Server\Input\Parser\Criterion\ContentTypeIdentifier:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.internal.criterion.ContentTypeIdentifier.class%"
+        class: Ibexa\Rest\Server\Input\Parser\Criterion\ContentTypeIdentifier
         arguments:
             - '@ibexa.api.service.content_type'
         tags:
@@ -408,85 +331,85 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\Criterion\DateMetadata:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.internal.criterion.DateMetadata.class%"
+        class: Ibexa\Rest\Server\Input\Parser\Criterion\DateMetadata
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.criterion.DateMetadata }
 
     Ibexa\Rest\Server\Input\Parser\Criterion\Field:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.internal.criterion.Field.class%"
+        class: Ibexa\Rest\Server\Input\Parser\Criterion\Field
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.criterion.Field }
 
     Ibexa\Rest\Server\Input\Parser\Criterion\FullText:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.internal.criterion.FullText.class%"
+        class: Ibexa\Rest\Server\Input\Parser\Criterion\FullText
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.criterion.FullText }
 
     Ibexa\Rest\Server\Input\Parser\Criterion\LanguageCode:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.internal.criterion.LanguageCode.class%"
+        class: Ibexa\Rest\Server\Input\Parser\Criterion\LanguageCode
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.criterion.LanguageCode }
 
     Ibexa\Rest\Server\Input\Parser\Criterion\LocationId:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.internal.criterion.LocationId.class%"
+        class: Ibexa\Rest\Server\Input\Parser\Criterion\LocationId
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.criterion.LocationId }
 
     Ibexa\Rest\Server\Input\Parser\Criterion\LocationRemoteId:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.internal.criterion.LocationRemoteId.class%"
+        class: Ibexa\Rest\Server\Input\Parser\Criterion\LocationRemoteId
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.criterion.LocationRemoteId }
 
     Ibexa\Rest\Server\Input\Parser\Criterion\LogicalAnd:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.internal.criterion.LogicalAnd.class%"
+        class: Ibexa\Rest\Server\Input\Parser\Criterion\LogicalAnd
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.criterion.LogicalAnd }
 
     Ibexa\Rest\Server\Input\Parser\Criterion\LogicalNot:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.internal.criterion.LogicalNot.class%"
+        class: Ibexa\Rest\Server\Input\Parser\Criterion\LogicalNot
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.criterion.LogicalNot }
 
     Ibexa\Rest\Server\Input\Parser\Criterion\LogicalOperator:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.internal.criterion.LogicalOperator.class%"
+        class: Ibexa\Rest\Server\Input\Parser\Criterion\LogicalOperator
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.criterion.LogicalOperator }
 
     Ibexa\Rest\Server\Input\Parser\Criterion\LogicalOr:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.internal.criterion.LogicalOr.class%"
+        class: Ibexa\Rest\Server\Input\Parser\Criterion\LogicalOr
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.criterion.LogicalOr }
 
     Ibexa\Rest\Server\Input\Parser\Criterion\MoreLikeThis:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.internal.criterion.MoreLikeThis.class%"
+        class: Ibexa\Rest\Server\Input\Parser\Criterion\MoreLikeThis
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.criterion.MoreLikeThis }
 
     Ibexa\Rest\Server\Input\Parser\Criterion\Operator:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.internal.criterion.Operator.class%"
+        class: Ibexa\Rest\Server\Input\Parser\Criterion\Operator
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.criterion.Operator }
 
     Ibexa\Rest\Server\Input\Parser\Criterion\ParentLocationId:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.internal.criterion.ParentLocationId.class%"
+        class: Ibexa\Rest\Server\Input\Parser\Criterion\ParentLocationId
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.criterion.ParentLocationId }
 
     Ibexa\Rest\Server\Input\Parser\Criterion\ParentLocationRemoteId:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.internal.criterion.ParentLocationRemoteId.class%"
+        class: Ibexa\Rest\Server\Input\Parser\Criterion\ParentLocationRemoteId
         arguments:
             - '@ibexa.api.service.location'
         tags:
@@ -494,7 +417,7 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\Criterion\SectionIdentifier:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.internal.criterion.SectionIdentifier.class%"
+        class: Ibexa\Rest\Server\Input\Parser\Criterion\SectionIdentifier
         arguments:
             - '@ibexa.api.service.section'
         tags:
@@ -502,19 +425,19 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\Criterion\SectionId:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.internal.criterion.SectionId.class%"
+        class: Ibexa\Rest\Server\Input\Parser\Criterion\SectionId
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.criterion.SectionId }
 
     Ibexa\Rest\Server\Input\Parser\Criterion\Subtree:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.internal.criterion.Subtree.class%"
+        class: Ibexa\Rest\Server\Input\Parser\Criterion\Subtree
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.criterion.Subtree }
 
     Ibexa\Rest\Server\Input\Parser\Criterion\UserMetadata:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.internal.criterion.UserMetadata.class%"
+        class: Ibexa\Rest\Server\Input\Parser\Criterion\UserMetadata
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.criterion.UserMetadata }
 
@@ -549,7 +472,7 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\Criterion\ObjectStateId:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.internal.criterion.ObjectStateId.class%"
+        class: Ibexa\Rest\Server\Input\Parser\Criterion\ObjectStateId
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.criterion.ObjectStateId }
 
@@ -560,7 +483,7 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\Criterion\Visibility:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.internal.criterion.Visibility.class%"
+        class: Ibexa\Rest\Server\Input\Parser\Criterion\Visibility
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.criterion.Visibility }
 
@@ -573,7 +496,7 @@ services:
 
     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%'
+        class: Ibexa\Rest\Server\Input\Parser\SortClause\DataKeyValueObjectClass
         arguments:
             - 'ContentId'
             - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\ContentId'
@@ -582,7 +505,7 @@ services:
 
     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%'
+        class: Ibexa\Rest\Server\Input\Parser\SortClause\DataKeyValueObjectClass
         arguments:
             - 'ContentName'
             - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\ContentName'
@@ -591,7 +514,7 @@ services:
 
     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%'
+        class: Ibexa\Rest\Server\Input\Parser\SortClause\DataKeyValueObjectClass
         arguments:
             - 'DateModified'
             - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\DateModified'
@@ -600,7 +523,7 @@ services:
 
     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%'
+        class: Ibexa\Rest\Server\Input\Parser\SortClause\DataKeyValueObjectClass
         arguments:
             - 'DatePublished'
             - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\DatePublished'
@@ -609,7 +532,7 @@ services:
 
     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%'
+        class: Ibexa\Rest\Server\Input\Parser\SortClause\DataKeyValueObjectClass
         arguments:
             - 'LocationDepth'
             - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\Location\Depth'
@@ -618,7 +541,7 @@ services:
 
     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%'
+        class: Ibexa\Rest\Server\Input\Parser\SortClause\DataKeyValueObjectClass
         arguments:
             - 'LocationPath'
             - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\Location\Path'
@@ -627,7 +550,7 @@ services:
 
     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%'
+        class: Ibexa\Rest\Server\Input\Parser\SortClause\DataKeyValueObjectClass
         arguments:
             - 'LocationPriority'
             - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\Location\Priority'
@@ -636,7 +559,7 @@ services:
 
     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%'
+        class: Ibexa\Rest\Server\Input\Parser\SortClause\DataKeyValueObjectClass
         arguments:
             - 'LocationId'
             - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\Location\Id'
@@ -645,7 +568,7 @@ services:
 
     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%'
+        class: Ibexa\Rest\Server\Input\Parser\SortClause\DataKeyValueObjectClass
         arguments:
             - 'SectionIdentifier'
             - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\SectionIdentifier'
@@ -654,7 +577,7 @@ services:
 
     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%'
+        class: Ibexa\Rest\Server\Input\Parser\SortClause\DataKeyValueObjectClass
         arguments:
             - 'SectionName'
             - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\SectionName'
@@ -672,61 +595,61 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\SortClause\Field:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: '%ezpublish_rest.input.parser.internal.sortclause.field.class%'
+        class: Ibexa\Rest\Server\Input\Parser\SortClause\Field
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.sortclause.Field }
 
     Ibexa\Rest\Server\Input\Parser\FacetBuilder\ContentTypeParser:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: '%ezpublish_rest.input.parser.internal.facetbuilder.content_type.class%'
+        class: Ibexa\Rest\Server\Input\Parser\FacetBuilder\ContentTypeParser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.facetbuilder.ContentType }
 
     Ibexa\Rest\Server\Input\Parser\FacetBuilder\CriterionParser:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: '%ezpublish_rest.input.parser.internal.facetbuilder.criterion.class%'
+        class: Ibexa\Rest\Server\Input\Parser\FacetBuilder\CriterionParser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.facetbuilder.Criterion }
 
     Ibexa\Rest\Server\Input\Parser\FacetBuilder\DateRangeParser:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: '%ezpublish_rest.input.parser.internal.facetbuilder.date_range.class%'
+        class: Ibexa\Rest\Server\Input\Parser\FacetBuilder\DateRangeParser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.facetbuilder.DateRange }
 
     Ibexa\Rest\Server\Input\Parser\FacetBuilder\FieldParser:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: '%ezpublish_rest.input.parser.internal.facetbuilder.field.class%'
+        class: Ibexa\Rest\Server\Input\Parser\FacetBuilder\FieldParser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.facetbuilder.Field }
 
     Ibexa\Rest\Server\Input\Parser\FacetBuilder\FieldRangeParser:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: '%ezpublish_rest.input.parser.internal.facetbuilder.field_range.class%'
+        class: Ibexa\Rest\Server\Input\Parser\FacetBuilder\FieldRangeParser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.facetbuilder.FieldRange }
 
     Ibexa\Rest\Server\Input\Parser\FacetBuilder\LocationParser:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: '%ezpublish_rest.input.parser.internal.facetbuilder.location.class%'
+        class: Ibexa\Rest\Server\Input\Parser\FacetBuilder\LocationParser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.facetbuilder.Location }
 
     Ibexa\Rest\Server\Input\Parser\FacetBuilder\SectionParser:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: '%ezpublish_rest.input.parser.internal.facetbuilder.section.class%'
+        class: Ibexa\Rest\Server\Input\Parser\FacetBuilder\SectionParser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.facetbuilder.Section }
 
     Ibexa\Rest\Server\Input\Parser\FacetBuilder\TermParser:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: '%ezpublish_rest.input.parser.internal.facetbuilder.term.class%'
+        class: Ibexa\Rest\Server\Input\Parser\FacetBuilder\TermParser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.facetbuilder.Term }
 
     Ibexa\Rest\Server\Input\Parser\FacetBuilder\UserParser:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: '%ezpublish_rest.input.parser.internal.facetbuilder.user.class%'
+        class: Ibexa\Rest\Server\Input\Parser\FacetBuilder\UserParser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.facetbuilder.User }
 
@@ -876,7 +799,7 @@ services:
 
     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%"
+        class: Ibexa\Rest\Server\Input\Parser\Limitation\PathStringRouteBasedLimitationParser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.limitation.Subtree }
         arguments:
@@ -885,7 +808,7 @@ services:
 
     Ibexa\Rest\Server\Input\Parser\Limitation\RouteBasedLimitationParser:
         parent: Ibexa\Rest\Server\Common\Parser
-        class: "%ezpublish_rest.input.parser.internal.route_based_limitation.class%"
+        class: Ibexa\Rest\Server\Input\Parser\Limitation\RouteBasedLimitationParser
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.internal.limitation.Section }
         arguments:
diff --git a/src/bundle/Resources/config/security.yml b/src/bundle/Resources/config/security.yml
index 6ef95890..a3f04ed4 100644
--- a/src/bundle/Resources/config/security.yml
+++ b/src/bundle/Resources/config/security.yml
@@ -1,12 +1,8 @@
 parameters:
-    ezpublish_rest.security.authentication.listener.session.class: Ibexa\Rest\Server\Security\RestAuthenticator
-    ezpublish_rest.security.authentication.logout_handler.class: Ibexa\Rest\Server\Security\RestLogoutHandler
-
-    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.
     ibexa.rest.security.authentication.listener.session:
-        class: "%ezpublish_rest.security.authentication.listener.session.class%"
+        class: Ibexa\Rest\Server\Security\RestAuthenticator
         arguments:
             - "@security.token_storage"
             - "@security.authentication.manager"
@@ -19,12 +15,10 @@ services:
         abstract: true
 
     Ibexa\Rest\Server\Security\RestLogoutHandler:
-        class: "%ezpublish_rest.security.authentication.logout_handler.class%"
         arguments:
             - '@ibexa.config.resolver'
 
     Ibexa\Rest\Server\Security\CsrfTokenManager:
-        class: '%ezpublish_rest.security.csrf.token_manager.class%'
         arguments:
             - '@?security.csrf.token_generator'
             - '@?security.csrf.token_storage'
diff --git a/src/bundle/Resources/config/services.yml b/src/bundle/Resources/config/services.yml
index c7718791..d669291c 100644
--- a/src/bundle/Resources/config/services.yml
+++ b/src/bundle/Resources/config/services.yml
@@ -1,59 +1,4 @@
 parameters:
-    ezpublish_rest.routing.options_loader.class: Ibexa\Bundle\Rest\Routing\OptionsLoader
-    ezpublish_rest.routing.options_loader.route_collection_mapper.class: Ibexa\Bundle\Rest\Routing\OptionsLoader\RouteCollectionMapper
-    ezpublish_rest.routing.options_loader.mapper.class: Ibexa\Bundle\Rest\Routing\OptionsLoader\Mapper
-
-    ezpublish_rest.cors_options_provider.class: Ibexa\Bundle\Rest\CorsOptions\RestProvider
-
-    ezpublish_rest.root_resource_builder.class: Ibexa\Rest\Server\Service\ExpressionRouterRootResourceBuilder
-
-    ezpublish_rest.controller.base.class: Ibexa\Rest\Server\Controller
-    ezpublish_rest.controller.binary_content.class: Ibexa\Rest\Server\Controller\BinaryContent
-    ezpublish_rest.controller.content.class: Ibexa\Rest\Server\Controller\Content
-    ezpublish_rest.controller.content_type.class: Ibexa\Rest\Server\Controller\ContentType
-    ezpublish_rest.controller.location.class: Ibexa\Rest\Server\Controller\Location
-    ezpublish_rest.controller.object_state.class: Ibexa\Rest\Server\Controller\ObjectState
-    ezpublish_rest.controller.role.class: Ibexa\Rest\Server\Controller\Role
-    ezpublish_rest.controller.root.class: Ibexa\Rest\Server\Controller\Root
-    ezpublish_rest.controller.section.class: Ibexa\Rest\Server\Controller\Section
-    ezpublish_rest.controller.trash.class: Ibexa\Rest\Server\Controller\Trash
-    ezpublish_rest.controller.user.class: Ibexa\Rest\Server\Controller\User
-    ezpublish_rest.controller.url_wildcard.class: Ibexa\Rest\Server\Controller\URLWildcard
-    ezpublish_rest.controller.url_alias.class: Ibexa\Rest\Server\Controller\URLAlias
-    ezpublish_rest.controller.options.class: Ibexa\Rest\Server\Controller\Options
-    ezpublish_rest.controller.services.class: Ibexa\Rest\Server\Controller\Services
-    ezpublish_rest.controller.views.class: Ibexa\Rest\Server\Controller\Views
-
-    ezpublish_rest.factory.class: Ibexa\Bundle\Rest\ApiLoader\Factory
-    ezpublish_rest.request_parser.class: Ibexa\Bundle\Rest\RequestParser\Router
-    ezpublish_rest.parser_tools.class: Ibexa\Rest\Input\ParserTools
-    ezpublish_rest.field_type_parser.class: Ibexa\Rest\Input\FieldTypeParser
-    ezpublish_rest.field_type_serializer.class: Ibexa\Rest\Output\FieldTypeSerializer
-
-    ezpublish_rest.request_listener.class: Ibexa\Bundle\Rest\EventListener\RequestListener
-    ezpublish_rest.csrf_listener.class: Ibexa\Bundle\Rest\EventListener\CsrfListener
-    ezpublish_rest.response_listener.class: Ibexa\Bundle\Rest\EventListener\ResponseListener
-
-    ezpublish_rest.field_type_processor.ezauthor.class: Ibexa\Rest\FieldTypeProcessor\AuthorProcessor
-    ezpublish_rest.field_type_processor_registry.class: Ibexa\Rest\FieldTypeProcessorRegistry
-    ezpublish_rest.field_type_processor.ezimage.class: Ibexa\Rest\FieldTypeProcessor\ImageProcessor
-    ezpublish_rest.field_type_processor.ezdatetime.class: Ibexa\Rest\FieldTypeProcessor\DateAndTimeProcessor
-    ezpublish_rest.field_type_processor.ezdate.class: Ibexa\Rest\FieldTypeProcessor\DateProcessor
-    ezpublish_rest.field_type_processor.ezmedia.class: Ibexa\Rest\FieldTypeProcessor\MediaProcessor
-    ezpublish_rest.field_type_processor.ezobjectrelationlist.class: Ibexa\Rest\FieldTypeProcessor\RelationListProcessor
-    ezpublish_rest.field_type_processor.ezobjectrelation.class: Ibexa\Rest\FieldTypeProcessor\RelationProcessor
-    ezpublish_rest.field_type_processor.eztime.class: Ibexa\Rest\FieldTypeProcessor\TimeProcessor
-    ezpublish_rest.field_type_processor.ezbinaryfile.class: Ibexa\Rest\FieldTypeProcessor\BinaryProcessor
-    ezpublish_rest.field_type_processor.ezfloat.class: Ibexa\Rest\FieldTypeProcessor\FloatProcessor
-    ezpublish_rest.field_type_processor.ezstring.class: Ibexa\Rest\FieldTypeProcessor\StringProcessor
-    ezpublish_rest.field_type_processor.ezuser.class: Ibexa\Rest\FieldTypeProcessor\UserProcessor
-
-    ezpublish_rest.output.visitor.dispatcher.class: Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher
-    ezpublish_rest.output.visitor.class: Ibexa\Contracts\Rest\Output\Visitor
-    ezpublish_rest.output.generator.json.class: Ibexa\Rest\Output\Generator\Json
-    ezpublish_rest.output.generator.json.field_type_hash_generator.class: Ibexa\Rest\Output\Generator\Json\FieldTypeHashGenerator
-    ezpublish_rest.output.generator.xml.class: Ibexa\Rest\Output\Generator\Xml
-    ezpublish_rest.output.generator.xml.field_type_hash_generator.class: Ibexa\Rest\Output\Generator\Xml\FieldTypeHashGenerator
     ezpublish_rest.output.visitor.json.regexps:
         - '(^application/vnd\.ibexa\.api\.[A-Za-z]+\+json$)'
         - '(^application/json$)'
@@ -62,18 +7,8 @@ parameters:
         - '(^application/xml$)'
         - '(^.*/.*$)'
 
-    ezpublish_rest.output.value_object_visitor.dispatcher.class: Ibexa\Contracts\Rest\Output\ValueObjectVisitorDispatcher
-    ezpublish_rest.output.value_object_visitor.Exception.InvalidArgumentException.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\InvalidArgumentException
-
-    ezpublish_rest.input.dispatcher.class: Ibexa\Rest\Input\Dispatcher
-    ezpublish_rest.input.parsing_dispatcher.class: Ibexa\Contracts\Rest\Input\ParsingDispatcher
-
-    ezpublish_rest.input.handler.json.class: Ibexa\Rest\Input\Handler\Json
-    ezpublish_rest.input.handler.xml.class: Ibexa\Rest\Input\Handler\Xml
-
 services:
     Ibexa\Bundle\Rest\Routing\OptionsLoader:
-        class: "%ezpublish_rest.routing.options_loader.class%"
         arguments:
             - '@Ibexa\Bundle\Rest\Routing\OptionsLoader\RouteCollectionMapper'
             - '@Ibexa\Bundle\Core\Routing\DefaultRouter'
@@ -81,35 +16,28 @@ services:
             - { name: routing.loader }
 
     Ibexa\Bundle\Rest\Routing\OptionsLoader\RouteCollectionMapper:
-        class: "%ezpublish_rest.routing.options_loader.route_collection_mapper.class%"
         arguments:
             - '@Ibexa\Bundle\Rest\Routing\OptionsLoader\Mapper'
 
-    Ibexa\Bundle\Rest\Routing\OptionsLoader\Mapper:
-        class: "%ezpublish_rest.routing.options_loader.mapper.class%"
+    Ibexa\Bundle\Rest\Routing\OptionsLoader\Mapper: ~
 
     Ibexa\Bundle\Rest\CorsOptions\RestProvider:
-        class: "%ezpublish_rest.cors_options_provider.class%"
         arguments: ["@router.default"]
         tags:
             - { name: nelmio_cors.options_provider }
 
     Ibexa\Rest\Output\FieldTypeSerializer:
-        class: "%ezpublish_rest.field_type_serializer.class%"
         arguments:
             - '@ibexa.api.service.field_type'
             - '@Ibexa\Rest\FieldTypeProcessorRegistry'
 
     Ibexa\Bundle\Rest\RequestParser\Router:
-        class: "%ezpublish_rest.request_parser.class%"
         arguments:
             - "@router"
 
-    Ibexa\Rest\Input\ParserTools:
-        class: "%ezpublish_rest.parser_tools.class%"
+    Ibexa\Rest\Input\ParserTools: ~
 
     Ibexa\Rest\Input\FieldTypeParser:
-        class: "%ezpublish_rest.field_type_parser.class%"
         arguments:
             - '@ibexa.api.service.content'
             - '@ibexa.api.service.content_type'
@@ -117,17 +45,14 @@ services:
             - '@Ibexa\Rest\FieldTypeProcessorRegistry'
 
     Ibexa\Bundle\Rest\ApiLoader\Factory:
-        class: "%ezpublish_rest.factory.class%"
         arguments: ['@ibexa.config.resolver', '@ibexa.api.repository']
         calls:
             - [setRequestStack, ["@request_stack"]]
 
     Ibexa\Rest\Server\Service\ExpressionRouterRootResourceBuilder:
-         class: "%ezpublish_rest.root_resource_builder.class%"
          arguments: ["@router", '@Ibexa\Bundle\Core\Routing\DefaultRouter', '@ibexa.config.resolver']
 
     Ibexa\Rest\Server\Controller:
-        class: "%ezpublish_rest.controller.base.class%"
         calls:
             - [ setContainer, ["@service_container"] ]
             - [ setInputDispatcher, ['@Ibexa\Rest\Input\Dispatcher'] ]
@@ -136,20 +61,17 @@ services:
             - [ setRepository, ['@ibexa.api.repository'] ]
 
     Ibexa\Rest\Server\Controller\Root:
-        class: "%ezpublish_rest.controller.root.class%"
         parent: Ibexa\Rest\Server\Controller
         arguments: ['@Ibexa\Rest\Server\Service\ExpressionRouterRootResourceBuilder']
         tags: [controller.service_arguments]
 
     Ibexa\Rest\Server\Controller\Section:
-        class: "%ezpublish_rest.controller.section.class%"
         parent: Ibexa\Rest\Server\Controller
         arguments:
             - '@ibexa.api.service.section'
         tags: [controller.service_arguments]
 
     Ibexa\Rest\Server\Controller\BinaryContent:
-        class: "%ezpublish_rest.controller.binary_content.class%"
         parent: Ibexa\Rest\Server\Controller
         arguments:
             - '@ibexa.field_type.ezimage.variation_service'
@@ -157,19 +79,16 @@ services:
         tags: [controller.service_arguments]
 
     Ibexa\Rest\Server\Controller\Content:
-        class: "%ezpublish_rest.controller.content.class%"
         parent: Ibexa\Rest\Server\Controller
         tags: [controller.service_arguments]
 
     Ibexa\Rest\Server\Controller\ContentType:
-        class: "%ezpublish_rest.controller.content_type.class%"
         parent: Ibexa\Rest\Server\Controller
         arguments:
             - '@ibexa.api.service.content_type'
         tags: [controller.service_arguments]
 
     Ibexa\Rest\Server\Controller\Role:
-        class: "%ezpublish_rest.controller.role.class%"
         parent: Ibexa\Rest\Server\Controller
         arguments:
             - '@ibexa.api.service.role'
@@ -178,7 +97,6 @@ services:
         tags: [controller.service_arguments]
 
     Ibexa\Rest\Server\Controller\Location:
-        class: "%ezpublish_rest.controller.location.class%"
         parent: Ibexa\Rest\Server\Controller
         arguments:
             - '@ibexa.api.service.location'
@@ -188,7 +106,6 @@ services:
         tags: [controller.service_arguments]
 
     Ibexa\Rest\Server\Controller\ObjectState:
-        class: "%ezpublish_rest.controller.object_state.class%"
         parent: Ibexa\Rest\Server\Controller
         arguments:
             - '@ibexa.api.service.object_state'
@@ -196,7 +113,6 @@ services:
         tags: [controller.service_arguments]
 
     Ibexa\Rest\Server\Controller\Trash:
-        class: "%ezpublish_rest.controller.trash.class%"
         parent: Ibexa\Rest\Server\Controller
         arguments:
             - '@ibexa.api.service.trash'
@@ -204,7 +120,6 @@ services:
         tags: [controller.service_arguments]
 
     Ibexa\Rest\Server\Controller\User:
-        class: "%ezpublish_rest.controller.user.class%"
         parent: Ibexa\Rest\Server\Controller
         arguments:
             - '@ibexa.api.service.user'
@@ -218,14 +133,12 @@ services:
         tags: [controller.service_arguments]
 
     Ibexa\Rest\Server\Controller\URLWildcard:
-        class: "%ezpublish_rest.controller.url_wildcard.class%"
         parent: Ibexa\Rest\Server\Controller
         arguments:
             - '@ibexa.api.service.url_wildcard'
         tags: [controller.service_arguments]
 
     Ibexa\Rest\Server\Controller\URLAlias:
-        class: "%ezpublish_rest.controller.url_alias.class%"
         parent: Ibexa\Rest\Server\Controller
         arguments:
             - '@ibexa.api.service.url_alias'
@@ -233,7 +146,6 @@ services:
         tags: [controller.service_arguments]
 
     Ibexa\Rest\Server\Controller\Views:
-        class: "%ezpublish_rest.controller.views.class%"
         parent: Ibexa\Rest\Server\Controller
         arguments:
             - '@ibexa.api.service.search'
@@ -266,19 +178,16 @@ services:
         tags: [controller.service_arguments]
 
     Ibexa\Bundle\Rest\EventListener\RequestListener:
-        class: "%ezpublish_rest.request_listener.class%"
         tags:
             - { name: kernel.event_subscriber }
 
     Ibexa\Bundle\Rest\EventListener\ResponseListener:
-        class: "%ezpublish_rest.response_listener.class%"
         arguments:
             - '@Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher'
         tags:
             - { name: kernel.event_subscriber }
 
     Ibexa\Bundle\Rest\EventListener\CsrfListener:
-        class: "%ezpublish_rest.csrf_listener.class%"
         arguments:
             - "@event_dispatcher"
             - "%form.type_extension.csrf.enabled%"
@@ -288,21 +197,17 @@ services:
             - { name: kernel.event_subscriber }
 
     Ibexa\Rest\Server\Controller\Options:
-        class: "%ezpublish_rest.controller.options.class%"
         parent: Ibexa\Rest\Server\Controller
         tags: [controller.service_arguments]
 
     Ibexa\Rest\Server\Controller\Services:
-        class: "%ezpublish_rest.controller.services.class%"
         arguments: ["%ezpublish.fieldType.ezcountry.data%"]
         tags: [controller.service_arguments]
 
     Ibexa\Rest\FieldTypeProcessorRegistry:
-        class: "%ezpublish_rest.field_type_processor_registry.class%"
         lazy: true
 
     Ibexa\Rest\FieldTypeProcessor\ImageProcessor:
-        class: "%ezpublish_rest.field_type_processor.ezimage.class%"
         factory: ['@Ibexa\Bundle\Rest\ApiLoader\Factory', getImageFieldTypeProcessor]
         arguments:
             - "@router"
@@ -317,23 +222,19 @@ services:
             - { name: ibexa.rest.field_type.processor, alias: ezimageasset }
 
     Ibexa\Rest\FieldTypeProcessor\DateAndTimeProcessor:
-        class: "%ezpublish_rest.field_type_processor.ezdatetime.class%"
         tags:
             - { name: ibexa.rest.field_type.processor, alias: ezdatetime }
 
     Ibexa\Rest\FieldTypeProcessor\DateProcessor:
-        class: "%ezpublish_rest.field_type_processor.ezdate.class%"
         tags:
             - { name: ibexa.rest.field_type.processor, alias: ezdate }
 
     Ibexa\Rest\FieldTypeProcessor\MediaProcessor:
-        class: "%ezpublish_rest.field_type_processor.ezmedia.class%"
         factory: ['@Ibexa\Bundle\Rest\ApiLoader\Factory', getMediaFieldTypeProcessor]
         tags:
             - { name: ibexa.rest.field_type.processor, alias: ezmedia }
 
     Ibexa\Rest\FieldTypeProcessor\RelationListProcessor:
-        class: "%ezpublish_rest.field_type_processor.ezobjectrelationlist.class%"
         tags:
             - { name: ibexa.rest.field_type.processor, alias: ezobjectrelationlist }
         calls:
@@ -341,7 +242,6 @@ services:
             - [setLocationService, ['@ibexa.api.service.location']]
 
     Ibexa\Rest\FieldTypeProcessor\RelationProcessor:
-        class: "%ezpublish_rest.field_type_processor.ezobjectrelation.class%"
         tags:
             - { name: ibexa.rest.field_type.processor, alias: ezobjectrelation }
         calls:
@@ -349,12 +249,10 @@ services:
             - [setLocationService, ['@ibexa.api.service.location']]
 
     Ibexa\Rest\FieldTypeProcessor\TimeProcessor:
-        class: "%ezpublish_rest.field_type_processor.eztime.class%"
         tags:
             - { name: ibexa.rest.field_type.processor, alias: eztime }
 
     Ibexa\Rest\FieldTypeProcessor\BinaryProcessor:
-        class: "%ezpublish_rest.field_type_processor.ezbinaryfile.class%"
         factory: ['@Ibexa\Bundle\Rest\ApiLoader\Factory', getBinaryFileFieldTypeProcessor]
         arguments:
             - '@ibexa.core.io.default_url_decorator'
@@ -362,17 +260,14 @@ services:
             - { name: ibexa.rest.field_type.processor, alias: ezbinaryfile }
 
     Ibexa\Rest\FieldTypeProcessor\FloatProcessor:
-        class: "%ezpublish_rest.field_type_processor.ezfloat.class%"
         tags:
             - { name: ibexa.rest.field_type.processor, alias: ezfloat }
 
     Ibexa\Rest\FieldTypeProcessor\StringProcessor:
-        class: "%ezpublish_rest.field_type_processor.ezstring.class%"
         tags:
             - { name: ibexa.rest.field_type.processor, alias: ezstring }
 
     Ibexa\Rest\FieldTypeProcessor\UserProcessor:
-        class: "%ezpublish_rest.field_type_processor.ezuser.class%"
         tags:
             - { name: ibexa.rest.field_type.processor, alias: ezuser }
 
@@ -380,12 +275,11 @@ services:
 
     # Main REST output dispatcher
     # Gets a <requestMatch> => output.visitor mapping with the ibexa.rest.output.visitor tag.
-    Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher:
-        class: "%ezpublish_rest.output.visitor.dispatcher.class%"
+    Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher: ~
 
     # format output visitors
     ibexa.rest.output.visitor.json:
-        class: "%ezpublish_rest.output.visitor.class%"
+        class: Ibexa\Contracts\Rest\Output\Visitor
         arguments:
             - '@Ibexa\Rest\Output\Generator\Json'
             - '@Ibexa\Contracts\Rest\Output\ValueObjectVisitorDispatcher'
@@ -393,7 +287,7 @@ services:
             - { name: ibexa.rest.output.visitor, regexps: ezpublish_rest.output.visitor.json.regexps }
 
     ibexa.rest.output.visitor.xml:
-        class: "%ezpublish_rest.output.visitor.class%"
+        class: Ibexa\Contracts\Rest\Output\Visitor
         arguments:
             - '@Ibexa\Rest\Output\Generator\Xml'
             - '@Ibexa\Contracts\Rest\Output\ValueObjectVisitorDispatcher'
@@ -402,52 +296,43 @@ services:
 
     # format output generators
     Ibexa\Rest\Output\Generator\Xml:
-        class: "%ezpublish_rest.output.generator.xml.class%"
         arguments:
             - '@Ibexa\Rest\Output\Generator\Xml\FieldTypeHashGenerator'
         calls:
             - [ setFormatOutput, [ "%kernel.debug%" ] ]
 
-    Ibexa\Rest\Output\Generator\Xml\FieldTypeHashGenerator:
-        class: "%ezpublish_rest.output.generator.xml.field_type_hash_generator.class%"
+    Ibexa\Rest\Output\Generator\Xml\FieldTypeHashGenerator: ~
 
     Ibexa\Rest\Output\Generator\Json:
-        class: "%ezpublish_rest.output.generator.json.class%"
         arguments:
             - '@Ibexa\Rest\Output\Generator\Json\FieldTypeHashGenerator'
         calls:
             - [ setFormatOutput, [ "%kernel.debug%" ] ]
 
-    Ibexa\Rest\Output\Generator\Json\FieldTypeHashGenerator:
-        class: "%ezpublish_rest.output.generator.json.field_type_hash_generator.class%"
+    Ibexa\Rest\Output\Generator\Json\FieldTypeHashGenerator: ~
 
     # value objects visitors
-    Ibexa\Contracts\Rest\Output\ValueObjectVisitorDispatcher:
-        class: "%ezpublish_rest.output.value_object_visitor.dispatcher.class%"
+    Ibexa\Contracts\Rest\Output\ValueObjectVisitorDispatcher: ~
 
     ibexa.rest.output.value_object_visitor.Exception.InvalidArgumentException:
-        class: "%ezpublish_rest.output.value_object_visitor.Exception.InvalidArgumentException.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\InvalidArgumentException
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException }
 
     Ibexa\Rest\Input\Dispatcher:
-        class: "%ezpublish_rest.input.dispatcher.class%"
         arguments:
             - '@Ibexa\Contracts\Rest\Input\ParsingDispatcher'
             - []
 
     Ibexa\Contracts\Rest\Input\ParsingDispatcher:
-        class: "%ezpublish_rest.input.parsing_dispatcher.class%"
         arguments:
             - '@event_dispatcher'
 
     Ibexa\Rest\Input\Handler\Json:
-        class: "%ezpublish_rest.input.handler.json.class%"
         tags:
             - { name: ibexa.rest.input.handler, format: json }
 
     Ibexa\Rest\Input\Handler\Xml:
-        class: "%ezpublish_rest.input.handler.xml.class%"
         tags:
             - { name: ibexa.rest.input.handler, format: xml }
 
diff --git a/src/bundle/Resources/config/value_object_visitors.yml b/src/bundle/Resources/config/value_object_visitors.yml
index 387865a5..c567c8b3 100644
--- a/src/bundle/Resources/config/value_object_visitors.yml
+++ b/src/bundle/Resources/config/value_object_visitors.yml
@@ -1,134 +1,45 @@
 parameters:
-    ezpublish_rest.output.value_object_visitor.base.class: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-    ezpublish_rest.output.value_object_visitor.ContentObjectStates.class: Ibexa\Rest\Output\ValueObjectVisitor\ContentObjectStates
 
     # Errors
-    ezpublish_rest.output.value_object_visitor.InvalidArgumentException.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\InvalidArgumentException
-    ezpublish_rest.output.value_object_visitor.NotFoundException.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\NotFoundException
-    ezpublish_rest.output.value_object_visitor.UnauthorizedException.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\UnauthorizedException
-    ezpublish_rest.output.value_object_visitor.BadStateException.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\BadStateException
-    ezpublish_rest.output.value_object_visitor.BadRequestException.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\BadRequestException
-    ezpublish_rest.output.value_object_visitor.ContentFieldValidationException.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentFieldValidationException
-    ezpublish_rest.output.value_object_visitor.ForbiddenException.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ForbiddenException
-    ezpublish_rest.output.value_object_visitor.Exception.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\Exception
-    ezpublish_rest.output.value_object_visitor.NotImplementedException.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\NotImplementedException
 
     # Section
-    ezpublish_rest.output.value_object_visitor.SectionList.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\SectionList
-    ezpublish_rest.output.value_object_visitor.CreatedSection.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedSection
-    ezpublish_rest.output.value_object_visitor.Section.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\Section
 
     # URLWildcard
-    ezpublish_rest.output.value_object_visitor.URLWildcardList.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\URLWildcardList
-    ezpublish_rest.output.value_object_visitor.URLWildcard.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\URLWildcard
-    ezpublish_rest.output.value_object_visitor.CreatedURLWildcard.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedURLWildcard
 
     # URLAlias
-    ezpublish_rest.output.value_object_visitor.URLAliasList.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\URLAliasList
-    ezpublish_rest.output.value_object_visitor.URLAliasRefList.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\URLAliasRefList
-    ezpublish_rest.output.value_object_visitor.URLAlias.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\URLAlias
-    ezpublish_rest.output.value_object_visitor.CreatedURLAlias.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedURLAlias
 
     # Content
-    ezpublish_rest.output.value_object_visitor.ContentList.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentList
-    ezpublish_rest.output.value_object_visitor.RestContent.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RestContent
-    ezpublish_rest.output.value_object_visitor.CreatedContent.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedContent
-    ezpublish_rest.output.value_object_visitor.VersionList.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\VersionList
-    ezpublish_rest.output.value_object_visitor.CreatedVersion.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedVersion
-    ezpublish_rest.output.value_object_visitor.VersionInfo.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\VersionInfo
-    ezpublish_rest.output.value_object_visitor.ImageVariation.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ImageVariation
-    ezpublish_rest.output.value_object_visitor.Version.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\Version
-    ezpublish_rest.output.value_object_visitor.VersionTranslationInfo.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\VersionTranslationInfo
 
     # User group
-    ezpublish_rest.output.value_object_visitor.RestUserGroup.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RestUserGroup
-    ezpublish_rest.output.value_object_visitor.CreatedUserGroup.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedUserGroup
-    ezpublish_rest.output.value_object_visitor.UserGroupList.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\UserGroupList
-    ezpublish_rest.output.value_object_visitor.UserGroupRefList.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\UserGroupRefList
 
     # User
-    ezpublish_rest.output.value_object_visitor.UserList.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\UserList
-    ezpublish_rest.output.value_object_visitor.UserRefList.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\UserRefList
-    ezpublish_rest.output.value_object_visitor.CreatedUser.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedUser
-    ezpublish_rest.output.value_object_visitor.RestUser.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RestUser
-    ezpublish_rest.output.value_object_visitor.UserSession.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\UserSession
-    ezpublish_rest.output.value_object_visitor.UserSessionDeleted.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\DeletedUserSession
 
     # ContentType
-    ezpublish_rest.output.value_object_visitor.RestContentType.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RestContentType
-    ezpublish_rest.output.value_object_visitor.CreatedContentType.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedContentType
 
     # Object state
-    ezpublish_rest.output.value_object_visitor.ObjectStateList.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ObjectStateList
-    ezpublish_rest.output.value_object_visitor.CreatedObjectState.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedObjectState
-    ezpublish_rest.output.value_object_visitor.RestObjectState.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RestObjectState
-    ezpublish_rest.output.value_object_visitor.ObjectStateGroupList.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ObjectStateGroupList
-    ezpublish_rest.output.value_object_visitor.CreatedObjectStateGroup.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedObjectStateGroup
-    ezpublish_rest.output.value_object_visitor.ObjectStateGroup.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ObjectStateGroup
 
     # View
-    ezpublish_rest.output.value_object_visitor.RestExecutedView.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RestExecutedView
 
     # Trash
-    ezpublish_rest.output.value_object_visitor.RestTrashItem.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RestTrashItem
-    ezpublish_rest.output.value_object_visitor.Trash.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\Trash
 
     # Location
-    ezpublish_rest.output.value_object_visitor.LocationList.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\LocationList
-    ezpublish_rest.output.value_object_visitor.RestLocation.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RestLocation
-    ezpublish_rest.output.value_object_visitor.Location.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\Location
-    ezpublish_rest.output.value_object_visitor.CreatedLocation.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedLocation
 
     # Roles
-    ezpublish_rest.output.value_object_visitor.RestUserGroupRoleAssignment.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RestUserGroupRoleAssignment
-    ezpublish_rest.output.value_object_visitor.RestUserRoleAssignment.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RestUserRoleAssignment
-    ezpublish_rest.output.value_object_visitor.RoleAssignmentList.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RoleAssignmentList
-    ezpublish_rest.output.value_object_visitor.PolicyList.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\PolicyList
-    ezpublish_rest.output.value_object_visitor.CreatedPolicy.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedPolicy
-    ezpublish_rest.output.value_object_visitor.Policy.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\Policy
-    ezpublish_rest.output.value_object_visitor.Role.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\Role
-    ezpublish_rest.output.value_object_visitor.CreatedRole.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedRole
-    ezpublish_rest.output.value_object_visitor.PublishedRole.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\PublishedRole
-    ezpublish_rest.output.value_object_visitor.RoleList.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RoleList
 
     # Relation
-    ezpublish_rest.output.value_object_visitor.CreatedRelation.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedRelation
-    ezpublish_rest.output.value_object_visitor.RestRelation.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RestRelation
-    ezpublish_rest.output.value_object_visitor.RelationList.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RelationList
 
     # Field Definition
-    ezpublish_rest.output.value_object_visitor.RestFieldDefinition.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RestFieldDefinition
-    ezpublish_rest.output.value_object_visitor.CreatedFieldDefinition.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedFieldDefinition
-    ezpublish_rest.output.value_object_visitor.FieldDefinitionList.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\FieldDefinitionList
 
     # Content Type Group
-    ezpublish_rest.output.value_object_visitor.ContentTypeGroupList.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeGroupList
-    ezpublish_rest.output.value_object_visitor.CreatedContentTypeGroup.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedContentTypeGroup
-    ezpublish_rest.output.value_object_visitor.ContentTypeGroup.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeGroup
-    ezpublish_rest.output.value_object_visitor.ContentTypeInfoList.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeInfoList
-    ezpublish_rest.output.value_object_visitor.ContentTypeList.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeList
-    ezpublish_rest.output.value_object_visitor.ContentTypeGroupRefList.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeGroupRefList
 
     # HTTP
-    ezpublish_rest.output.value_object_visitor.Conflict.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\Conflict
-    ezpublish_rest.output.value_object_visitor.SeeOther.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\SeeOther
-    ezpublish_rest.output.value_object_visitor.Root.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\Root
-    ezpublish_rest.output.value_object_visitor.NoContent.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\NoContent
-    ezpublish_rest.output.value_object_visitor.ResourceCreated.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ResourceCreated
-    ezpublish_rest.output.value_object_visitor.PermanentRedirect.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\PermanentRedirect
-    ezpublish_rest.output.value_object_visitor.TemporaryRedirect.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\TemporaryRedirect
-    ezpublish_rest.output.value_object_visitor.Options.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\Options
-    ezpublish_rest.output.value_object_visitor.OK.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\OK
 
     # Cache
-    ezpublish_rest.output.value_object_visitor.cached_value.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CachedValue
 
     # Services
-    ezpublish_rest.output.value_object_visitor.CountryList.class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CountryList
 
 services:
     Ibexa\Contracts\Rest\Output\ValueObjectVisitor:
-        class: "%ezpublish_rest.output.value_object_visitor.base.class%"
         calls:
             - [ setRequestParser, [ '@Ibexa\Bundle\Rest\RequestParser\Router' ] ]
             - [ setRouter, [ "@router" ] ]
@@ -137,35 +48,35 @@ services:
     # Errors
     ibexa.rest.output.value_object_visitor.InvalidArgumentException:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.InvalidArgumentException.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\InvalidArgumentException
         arguments: [ "%kernel.debug%", "@translator" ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\NotFoundException:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.NotFoundException.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\NotFoundException
         arguments: [ "%kernel.debug%", "@translator" ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\UnauthorizedException:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.UnauthorizedException.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\UnauthorizedException
         arguments: [ "%kernel.debug%", "@translator" ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\BadStateException:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.BadStateException.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\BadStateException
         arguments: [ "%kernel.debug%", "@translator" ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Exceptions\BadStateException }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\BadRequestException:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.BadRequestException.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\BadRequestException
         arguments: [ "%kernel.debug%", "@translator" ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Exceptions\BadRequestException }
@@ -173,28 +84,28 @@ services:
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentFieldValidationException:
         parent: Ibexa\Rest\Server\Output\ValueObjectVisitor\BadRequestException
-        class: "%ezpublish_rest.output.value_object_visitor.ContentFieldValidationException.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentFieldValidationException
         arguments: [ "%kernel.debug%", "@translator" ]
         tags:
             - {  name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Exceptions\ContentFieldValidationException }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\ForbiddenException:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.ForbiddenException.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ForbiddenException
         arguments: [ "%kernel.debug%", "@translator" ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Exceptions\ForbiddenException }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\NotImplementedException:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.NotImplementedException.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\NotImplementedException
         arguments: [ "%kernel.debug%", "@translator" ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Exceptions\NotImplementedException }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\Exception:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.Exception.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\Exception
         arguments: [ "%kernel.debug%", "@translator" ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Exception }
@@ -215,63 +126,63 @@ services:
     # Section
     Ibexa\Rest\Server\Output\ValueObjectVisitor\SectionList:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.SectionList.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\SectionList
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\SectionList }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedSection:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.CreatedSection.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedSection
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedSection }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\Section:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.Section.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\Section
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\Section }
 
     # URLWildcard
     Ibexa\Rest\Server\Output\ValueObjectVisitor\URLWildcardList:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.URLWildcardList.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\URLWildcardList
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\URLWildcardList }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\URLWildcard:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.URLWildcard.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\URLWildcard
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\URLWildcard }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedURLWildcard:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.CreatedURLWildcard.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedURLWildcard
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedURLWildcard }
 
     # URLAlias
     Ibexa\Rest\Server\Output\ValueObjectVisitor\URLAliasList:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.URLAliasList.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\URLAliasList
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\URLAliasList }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\URLAliasRefList:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.URLAliasRefList.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\URLAliasRefList
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\URLAliasRefList }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\URLAlias:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.URLAlias.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\URLAlias
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\URLAlias }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedURLAlias:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.CreatedURLAlias.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedURLAlias
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedURLAlias }
 
@@ -284,59 +195,59 @@ services:
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentList:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.ContentList.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentList
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\ContentList }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\RestContent:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.RestContent.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RestContent
         arguments: ['@Ibexa\Core\Helper\TranslationHelper']
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\RestContent }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedContent:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.CreatedContent.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedContent
         arguments: ['@Ibexa\Core\Helper\TranslationHelper']
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedContent }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\VersionList:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.VersionList.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\VersionList
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\VersionList }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedVersion:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.CreatedVersion.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedVersion
         arguments: [ '@Ibexa\Rest\Output\FieldTypeSerializer' ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedVersion }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\VersionInfo:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.VersionInfo.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\VersionInfo
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\ImageVariation:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.ImageVariation.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ImageVariation
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Variation\Values\ImageVariation }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\Version:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.Version.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\Version
         arguments: [ '@Ibexa\Rest\Output\FieldTypeSerializer'  ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\Version }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\VersionTranslationInfo:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.VersionTranslationInfo.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\VersionTranslationInfo
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\VersionTranslationInfo }
 
@@ -351,44 +262,44 @@ services:
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\RestUserGroup:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.RestUserGroup.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RestUserGroup
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\RestUserGroup }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedUserGroup:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.CreatedUserGroup.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedUserGroup
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedUserGroup }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\UserGroupList:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.UserGroupList.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\UserGroupList
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\UserGroupList }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\UserGroupRefList:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.UserGroupRefList.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\UserGroupRefList
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\UserGroupRefList }
 
     # User
     Ibexa\Rest\Server\Output\ValueObjectVisitor\UserList:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.UserList.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\UserList
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\UserList }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\UserRefList:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.UserRefList.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\UserRefList
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\UserRefList }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedUser:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.CreatedUser.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedUser
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedUser }
 
@@ -402,19 +313,19 @@ services:
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\RestUser:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.RestUser.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RestUser
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\RestUser }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\UserSession:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.UserSession.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\UserSession
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\UserSession }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\DeletedUserSession:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.UserSessionDeleted.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\DeletedUserSession
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\DeletedUserSession }
 
@@ -432,68 +343,68 @@ services:
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\RestContentType:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.RestContentType.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RestContentType
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\RestContentType }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedContentType:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.CreatedContentType.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedContentType
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedContentType }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeList:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.ContentTypeList.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeList
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\ContentTypeList }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeInfoList:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.ContentTypeInfoList.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeInfoList
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\ContentTypeInfoList }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeGroup:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.ContentTypeGroup.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeGroup
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedContentTypeGroup:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.CreatedContentTypeGroup.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedContentTypeGroup
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedContentTypeGroup }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeGroupList:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.ContentTypeGroupList.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeGroupList
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\ContentTypeGroupList }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeGroupRefList:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.ContentTypeGroupRefList.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeGroupRefList
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\ContentTypeGroupRefList }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\FieldDefinitionList:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.FieldDefinitionList.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\FieldDefinitionList
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\FieldDefinitionList }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedFieldDefinition:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.CreatedFieldDefinition.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedFieldDefinition
         arguments: [ '@Ibexa\Rest\Output\FieldTypeSerializer'  ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedFieldDefinition }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\RestFieldDefinition:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.RestFieldDefinition.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RestFieldDefinition
         arguments: [ '@Ibexa\Rest\Output\FieldTypeSerializer'  ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\RestFieldDefinition }
@@ -501,101 +412,101 @@ services:
     # Relation
     Ibexa\Rest\Server\Output\ValueObjectVisitor\RelationList:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.RelationList.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RelationList
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\RelationList }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\RestRelation:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.RestRelation.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RestRelation
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\RestRelation }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedRelation:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.CreatedRelation.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedRelation
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedRelation }
 
     # Role
     Ibexa\Rest\Server\Output\ValueObjectVisitor\RoleList:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.RoleList.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RoleList
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\RoleList }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedRole:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.CreatedRole.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedRole
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedRole }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\PublishedRole:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.PublishedRole.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\PublishedRole
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\PublishedRole }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\Role:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.Role.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\Role
         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 }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\Policy:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.Policy.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\Policy
         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 }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedPolicy:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.CreatedPolicy.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedPolicy
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedPolicy }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\PolicyList:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.PolicyList.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\PolicyList
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\PolicyList }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\RoleAssignmentList:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.RoleAssignmentList.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RoleAssignmentList
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\RoleAssignmentList }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\RestUserRoleAssignment:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.RestUserRoleAssignment.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RestUserRoleAssignment
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\RestUserRoleAssignment }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\RestUserGroupRoleAssignment:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.RestUserGroupRoleAssignment.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RestUserGroupRoleAssignment
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\RestUserGroupRoleAssignment }
 
     # Location
     Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedLocation:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.CreatedLocation.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedLocation
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedLocation }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\RestLocation:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.RestLocation.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RestLocation
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\RestLocation }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\Location:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.Location.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\Location
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\Location }
         arguments:
@@ -604,27 +515,27 @@ services:
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\LocationList:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.LocationList.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\LocationList
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\LocationList }
 
     # Trash
     Ibexa\Rest\Server\Output\ValueObjectVisitor\Trash:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.Trash.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\Trash
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\Trash }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\RestTrashItem:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.RestTrashItem.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RestTrashItem
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\RestTrashItem }
 
     # Views
     Ibexa\Rest\Server\Output\ValueObjectVisitor\RestExecutedView:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.RestExecutedView.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RestExecutedView
         arguments: [ '@ibexa.api.service.location', '@ibexa.api.service.content' ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\RestExecutedView }
@@ -664,112 +575,111 @@ services:
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\ObjectStateGroup:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.ObjectStateGroup.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ObjectStateGroup
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroup }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedObjectStateGroup:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.CreatedObjectStateGroup.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedObjectStateGroup
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedObjectStateGroup }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\ObjectStateGroupList:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.ObjectStateGroupList.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ObjectStateGroupList
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\ObjectStateGroupList }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\RestObjectState:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.RestObjectState.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RestObjectState
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Values\RestObjectState }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedObjectState:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.CreatedObjectState.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CreatedObjectState
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CreatedObjectState }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\ObjectStateList:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.ObjectStateList.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ObjectStateList
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\ObjectStateList }
 
     Ibexa\Rest\Output\ValueObjectVisitor\ContentObjectStates:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.ContentObjectStates.class%"
+        class: Ibexa\Rest\Output\ValueObjectVisitor\ContentObjectStates
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Values\ContentObjectStates }
 
     # Services
     Ibexa\Rest\Server\Output\ValueObjectVisitor\CountryList:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.CountryList.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\CountryList
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\CountryList}
 
     # REST specific
     Ibexa\Rest\Server\Output\ValueObjectVisitor\TemporaryRedirect:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.TemporaryRedirect.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\TemporaryRedirect
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\TemporaryRedirect }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\PermanentRedirect:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.PermanentRedirect.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\PermanentRedirect
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\PermanentRedirect }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\ResourceCreated:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.ResourceCreated.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ResourceCreated
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\ResourceCreated }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\NoContent:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.NoContent.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\NoContent
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\NoContent }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\Root:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.Root.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\Root
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Values\Root }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\SeeOther:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.SeeOther.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\SeeOther
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\SeeOther }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\Conflict:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.Conflict.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\Conflict
         arguments: [ true  ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\Conflict }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\Options:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.Options.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\Options
         arguments: [ true  ]
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\Options }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\OK:
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
-        class: "%ezpublish_rest.output.value_object_visitor.OK.class%"
+        class: Ibexa\Rest\Server\Output\ValueObjectVisitor\OK
         tags:
             - { name: ibexa.rest.output.value_object.visitor, type: Ibexa\Rest\Server\Values\OK }
 
     Ibexa\Rest\Server\Output\ValueObjectVisitor\CachedValue:
-        class: "%ezpublish_rest.output.value_object_visitor.cached_value.class%"
         parent: Ibexa\Contracts\Rest\Output\ValueObjectVisitor
         arguments:
             - '@ibexa.config.resolver'