diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
new file mode 100644
index 00000000..4ba28536
--- /dev/null
+++ b/.php-cs-fixer.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+use Ibexa\CodeStyle\PhpCsFixer\InternalConfigFactory;
+
+$configFactory = new InternalConfigFactory();
+$configFactory->withRules([
+    'declare_strict_types' => false,
+]);
+
+return $configFactory
+    ->buildConfig()
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->in([
+                __DIR__ . '/src',
+                __DIR__ . '/tests',
+            ])
+            ->files()->name('*.php')
+    );
diff --git a/.php_cs b/.php_cs
deleted file mode 100644
index 0c73f93b..00000000
--- a/.php_cs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-return EzSystems\EzPlatformCodeStyle\PhpCsFixer\EzPlatformInternalConfigFactory::build()
-    ->setFinder(
-        PhpCsFixer\Finder::create()
-            ->in(__DIR__ . '/src')
-            ->in(__DIR__ . '/tests')
-            ->files()->name('*.php')
-    )
-;
diff --git a/composer.json b/composer.json
index 0925c191..b839ba29 100644
--- a/composer.json
+++ b/composer.json
@@ -24,13 +24,13 @@
         }
     },
     "require": {
-        "php": "^7.3",
+        "php": "^7.4",
         "ext-dom": "*",
         "ext-json": "*",
         "ext-libxml": "*",
         "ext-simplexml": "*",
         "ext-xmlwriter": "*",
-        "ezsystems/ezplatform-kernel": "^4.0@dev",
+        "ibexa/core": "^4.0@dev",
         "symfony/http-kernel": "^5.3",
         "symfony/dependency-injection": "^5.3",
         "symfony/routing": "^5.3",
@@ -47,9 +47,9 @@
     },
     "require-dev": {
         "ibexa/ci-scripts": "^0.2@dev",
-        "ezsystems/doctrine-dbal-schema": "^4.0@dev",
-        "ezsystems/ezplatform-code-style": "^0.1.0",
-        "friendsofphp/php-cs-fixer": "^2.16.0",
+        "ibexa/doctrine-schema": "^4.0@dev",
+        "ibexa/code-style": "^1.0",
+        "friendsofphp/php-cs-fixer": "^3.0",
         "phpunit/phpunit": "^8.5",
         "matthiasnoback/symfony-dependency-injection-test": "^4.1",
         "nyholm/psr7": "^1.1",
@@ -57,7 +57,7 @@
         "symfony/browser-kit": "^5.3"
     },
     "scripts": {
-        "fix-cs": "@php ./vendor/bin/php-cs-fixer fix -v --show-progress=estimating"
+        "fix-cs": "php-cs-fixer fix --config=.php-cs-fixer.php -v --show-progress=dots"
     },
     "extra": {
         "branch-alias": {
diff --git a/src/bundle/ApiLoader/Factory.php b/src/bundle/ApiLoader/Factory.php
index 01605a5f..c78323b0 100644
--- a/src/bundle/ApiLoader/Factory.php
+++ b/src/bundle/ApiLoader/Factory.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Bundle\Rest\ApiLoader;
 
-use eZ\Publish\Core\MVC\ConfigResolverInterface;
-use eZ\Publish\Core\MVC\Symfony\RequestStackAware;
-use eZ\Publish\API\Repository\Repository;
+use Ibexa\Contracts\Core\Repository\Repository;
+use Ibexa\Core\MVC\ConfigResolverInterface;
+use Ibexa\Core\MVC\Symfony\RequestStackAware;
 use Ibexa\Rest\FieldTypeProcessor\BinaryProcessor;
 use Ibexa\Rest\FieldTypeProcessor\ImageAssetFieldTypeProcessor;
 use Ibexa\Rest\FieldTypeProcessor\ImageProcessor;
@@ -20,18 +20,18 @@ class Factory
     use RequestStackAware;
 
     /**
-     * @var \eZ\Publish\Core\MVC\ConfigResolverInterface
+     * @var \Ibexa\Core\MVC\ConfigResolverInterface
      */
     protected $configResolver;
 
     /**
-     * @var \eZ\Publish\API\Repository\Repository
+     * @var \Ibexa\Contracts\Core\Repository\Repository
      */
     protected $repository;
 
     /**
-     * @param \eZ\Publish\Core\MVC\ConfigResolverInterface $configResolver
-     * @param \eZ\Publish\API\Repository\Repository $repository
+     * @param \Ibexa\Core\MVC\ConfigResolverInterface $configResolver
+     * @param \Ibexa\Contracts\Core\Repository\Repository $repository
      */
     public function __construct(ConfigResolverInterface $configResolver, Repository $repository)
     {
@@ -57,7 +57,7 @@ public function getMediaFieldTypeProcessor()
      *
      * @param \Symfony\Component\Routing\RouterInterface $router
      *
-     * @return \EzSystems\EzPlatformRest\FieldTypeProcessor\ImageProcessor
+     * @return \Ibexa\Rest\FieldTypeProcessor\ImageProcessor
      */
     public function getImageFieldTypeProcessor(RouterInterface $router)
     {
diff --git a/src/bundle/CorsOptions/RestProvider.php b/src/bundle/CorsOptions/RestProvider.php
index b484b39a..0c2300c0 100644
--- a/src/bundle/CorsOptions/RestProvider.php
+++ b/src/bundle/CorsOptions/RestProvider.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Bundle\Rest\CorsOptions;
 
 use Nelmio\CorsBundle\Options\ProviderInterface;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
-use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
+use Symfony\Component\Routing\Exception\ResourceNotFoundException;
+use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
 
 /**
  * REST Cors Options provider.
@@ -19,11 +19,11 @@
  */
 class RestProvider implements ProviderInterface
 {
-    /** @var RequestMatcherInterface */
+    /** @var \Symfony\Component\Routing\Matcher\RequestMatcherInterface */
     protected $requestMatcher;
 
     /**
-     * @param RequestMatcherInterface $requestMatcher
+     * @param \Symfony\Component\Routing\Matcher\RequestMatcherInterface $requestMatcher
      */
     public function __construct(RequestMatcherInterface $requestMatcher)
     {
diff --git a/src/bundle/DependencyInjection/Compiler/FieldTypeProcessorPass.php b/src/bundle/DependencyInjection/Compiler/FieldTypeProcessorPass.php
index db2a1a40..4e7959e6 100644
--- a/src/bundle/DependencyInjection/Compiler/FieldTypeProcessorPass.php
+++ b/src/bundle/DependencyInjection/Compiler/FieldTypeProcessorPass.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Bundle\Rest\DependencyInjection\Compiler;
 
-use eZ\Publish\Core\Base\Container\Compiler\TaggedServiceIdsIterator\BackwardCompatibleIterator;
+use Ibexa\Core\Base\Container\Compiler\TaggedServiceIdsIterator\BackwardCompatibleIterator;
 use LogicException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
diff --git a/src/bundle/DependencyInjection/Compiler/InputHandlerPass.php b/src/bundle/DependencyInjection/Compiler/InputHandlerPass.php
index 721df7ff..193030a9 100644
--- a/src/bundle/DependencyInjection/Compiler/InputHandlerPass.php
+++ b/src/bundle/DependencyInjection/Compiler/InputHandlerPass.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Bundle\Rest\DependencyInjection\Compiler;
diff --git a/src/bundle/DependencyInjection/Compiler/InputParserPass.php b/src/bundle/DependencyInjection/Compiler/InputParserPass.php
index 1eef93a6..ea6cdd58 100644
--- a/src/bundle/DependencyInjection/Compiler/InputParserPass.php
+++ b/src/bundle/DependencyInjection/Compiler/InputParserPass.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Bundle\Rest\DependencyInjection\Compiler;
diff --git a/src/bundle/DependencyInjection/Compiler/OutputVisitorPass.php b/src/bundle/DependencyInjection/Compiler/OutputVisitorPass.php
index 0930feea..809d844b 100644
--- a/src/bundle/DependencyInjection/Compiler/OutputVisitorPass.php
+++ b/src/bundle/DependencyInjection/Compiler/OutputVisitorPass.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Bundle\Rest\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Reference;
 
 /**
  * Compiler pass for the ezpublish_rest.output.visitor tag.
@@ -64,7 +64,8 @@ public function process(ContainerBuilder $container)
         foreach ($visitors as $visitor) {
             foreach ($visitor['regexps'] as $regexp) {
                 $definition->addMethodCall(
-                    'addVisitor', [
+                    'addVisitor',
+                    [
                         $regexp,
                         $visitor['reference'],
                     ]
diff --git a/src/bundle/DependencyInjection/Compiler/ValueObjectVisitorPass.php b/src/bundle/DependencyInjection/Compiler/ValueObjectVisitorPass.php
index 0a7810ca..1ca2e181 100644
--- a/src/bundle/DependencyInjection/Compiler/ValueObjectVisitorPass.php
+++ b/src/bundle/DependencyInjection/Compiler/ValueObjectVisitorPass.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Bundle\Rest\DependencyInjection\Compiler;
diff --git a/src/bundle/DependencyInjection/Configuration.php b/src/bundle/DependencyInjection/Configuration.php
index c787f9a1..287fa30e 100644
--- a/src/bundle/DependencyInjection/Configuration.php
+++ b/src/bundle/DependencyInjection/Configuration.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Bundle\Rest\DependencyInjection;
 
-use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Configuration\SiteAccessAware\Configuration as SiteAccessConfiguration;
+use Ibexa\Bundle\Core\DependencyInjection\Configuration\SiteAccessAware\Configuration as SiteAccessConfiguration;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 
 class Configuration extends SiteAccessConfiguration
diff --git a/src/bundle/DependencyInjection/IbexaRestExtension.php b/src/bundle/DependencyInjection/IbexaRestExtension.php
index 426e9c8f..df31b66b 100644
--- a/src/bundle/DependencyInjection/IbexaRestExtension.php
+++ b/src/bundle/DependencyInjection/IbexaRestExtension.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Bundle\Rest\DependencyInjection;
 
-use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Configuration\SiteAccessAware\ConfigurationProcessor;
+use Ibexa\Bundle\Core\DependencyInjection\Configuration\SiteAccessAware\ConfigurationProcessor;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -63,7 +63,7 @@ public function prepend(ContainerBuilder $container)
     private function prependRouterConfiguration(ContainerBuilder $container)
     {
         $config = ['router' => ['default_router' => ['non_siteaccess_aware_routes' => ['ezpublish_rest_']]]];
-        $container->prependExtensionConfig('ezpublish', $config);
+        $container->prependExtensionConfig('ibexa', $config);
     }
 }
 
diff --git a/src/bundle/DependencyInjection/Security/RestSessionBasedFactory.php b/src/bundle/DependencyInjection/Security/RestSessionBasedFactory.php
index b4cfe1d9..6a0165b2 100644
--- a/src/bundle/DependencyInjection/Security/RestSessionBasedFactory.php
+++ b/src/bundle/DependencyInjection/Security/RestSessionBasedFactory.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Bundle\Rest\DependencyInjection\Security;
diff --git a/src/bundle/EventListener/CsrfListener.php b/src/bundle/EventListener/CsrfListener.php
index b29faa56..8dff5441 100644
--- a/src/bundle/EventListener/CsrfListener.php
+++ b/src/bundle/EventListener/CsrfListener.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Bundle\Rest\EventListener;
 
+use Ibexa\Bundle\Rest\RestEvents;
+use Ibexa\Core\Base\Exceptions\UnauthorizedException;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
-use eZ\Publish\Core\Base\Exceptions\UnauthorizedException;
-use Ibexa\Bundle\Rest\RestEvents;
+use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\Security\Csrf\CsrfToken;
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 
@@ -21,10 +21,10 @@ class CsrfListener implements EventSubscriberInterface
     /**
      * Name of the HTTP header containing CSRF token.
      */
-    const CSRF_TOKEN_HEADER = 'X-CSRF-Token';
+    public const CSRF_TOKEN_HEADER = 'X-CSRF-Token';
 
     /**
-     * @var CsrfTokenManagerInterface|null
+     * @var \Symfony\Component\Security\Csrf\CsrfTokenManagerInterface|null
      */
     private $csrfTokenManager;
 
@@ -50,7 +50,7 @@ class CsrfListener implements EventSubscriberInterface
      * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $eventDispatcher
      * @param bool $csrfEnabled
      * @param string $csrfTokenIntention
-     * @param CsrfTokenManagerInterface|null $csrfTokenManager
+     * @param \Symfony\Component\Security\Csrf\CsrfTokenManagerInterface|null $csrfTokenManager
      */
     public function __construct(
         EventDispatcherInterface $eventDispatcher,
@@ -79,7 +79,7 @@ public static function getSubscribedEvents()
      *
      * @param \Symfony\Component\HttpKernel\Event\RequestEvent $event
      *
-     * @throws \eZ\Publish\Core\Base\Exceptions\UnauthorizedException
+     * @throws \Ibexa\Core\Base\Exceptions\UnauthorizedException
      */
     public function onKernelRequest(RequestEvent $event)
     {
@@ -161,7 +161,7 @@ protected function isSessionRoute($route)
     /**
      * Checks the validity of the request's csrf token header.
      *
-     * @param Request $request
+     * @param \Symfony\Component\HttpFoundation\Request $request
      *
      * @return bool true/false if the token is valid/invalid, false if none was found in the request's headers
      */
diff --git a/src/bundle/EventListener/RequestListener.php b/src/bundle/EventListener/RequestListener.php
index 87ed3a51..5b67493a 100644
--- a/src/bundle/EventListener/RequestListener.php
+++ b/src/bundle/EventListener/RequestListener.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Bundle\Rest\EventListener;
 
-use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
 
 /**
  * REST request listener.
@@ -18,7 +18,7 @@
  */
 class RequestListener implements EventSubscriberInterface
 {
-    const REST_PREFIX_PATTERN = '/^\/api\/[a-zA-Z0-9-_]+\/v\d+(\.\d+)?\//';
+    public const REST_PREFIX_PATTERN = '/^\/api\/[a-zA-Z0-9-_]+\/v\d+(\.\d+)?\//';
 
     /**
      * @return array
diff --git a/src/bundle/EventListener/ResponseListener.php b/src/bundle/EventListener/ResponseListener.php
index e5e210f7..46b01689 100644
--- a/src/bundle/EventListener/ResponseListener.php
+++ b/src/bundle/EventListener/ResponseListener.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Bundle\Rest\EventListener;
 
 use Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher;
-use Symfony\Component\HttpKernel\Event\ViewEvent;
-use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\ExceptionEvent;
+use Symfony\Component\HttpKernel\Event\ViewEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
 
 /**
  * REST Response Listener.
@@ -20,7 +20,7 @@
 class ResponseListener implements EventSubscriberInterface
 {
     /**
-     * @var AcceptHeaderVisitorDispatcher
+     * @var \Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher
      */
     private $viewDispatcher;
 
diff --git a/src/bundle/IbexaRestBundle.php b/src/bundle/IbexaRestBundle.php
index 5781ed58..9123bc51 100644
--- a/src/bundle/IbexaRestBundle.php
+++ b/src/bundle/IbexaRestBundle.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Bundle\Rest;
 
+use Ibexa\Bundle\Rest\DependencyInjection\Compiler;
 use Ibexa\Bundle\Rest\DependencyInjection\Security\RestSessionBasedFactory;
-use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Ibexa\Bundle\Rest\DependencyInjection\Compiler;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class IbexaRestBundle extends Bundle
 {
diff --git a/src/bundle/RequestParser/Router.php b/src/bundle/RequestParser/Router.php
index da2efd76..801d4034 100644
--- a/src/bundle/RequestParser/Router.php
+++ b/src/bundle/RequestParser/Router.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Bundle\Rest\RequestParser;
 
+use Ibexa\Contracts\Rest\Exceptions\InvalidArgumentException;
 use Ibexa\Rest\RequestParser;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\Routing\RouterInterface;
-use Ibexa\Contracts\Rest\Exceptions\InvalidArgumentException;
 
 /**
  * Router based request parser.
@@ -63,7 +63,7 @@ public function generate($type, array $values = [])
     }
 
     /**
-     * @throws \eZ\Publish\Core\Base\Exceptions\InvalidArgumentException If $attribute wasn't found in the match
+     * @throws \Ibexa\Core\Base\Exceptions\InvalidArgumentException If $attribute wasn't found in the match
      */
     public function parseHref($href, $attribute)
     {
@@ -81,7 +81,7 @@ public function parseHref($href, $attribute)
      *
      * @param array $match Match array returned by Router::match() / Router::matchRequest()
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\InvalidArgumentException if the \$match isn't valid
+     * @throws \Ibexa\Contracts\Rest\Exceptions\InvalidArgumentException if the \$match isn't valid
      *
      * @return bool
      */
diff --git a/src/bundle/Resources/config/input_parsers.yml b/src/bundle/Resources/config/input_parsers.yml
index a031c02b..44426023 100644
--- a/src/bundle/Resources/config/input_parsers.yml
+++ b/src/bundle/Resources/config/input_parsers.yml
@@ -575,7 +575,7 @@ services:
         class: '%ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class%'
         arguments:
             - 'ContentId'
-            - 'eZ\Publish\API\Repository\Values\Content\Query\SortClause\ContentId'
+            - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\ContentId'
         tags:
             - { name: ezpublish_rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.ContentId }
 
@@ -584,7 +584,7 @@ services:
         class: '%ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class%'
         arguments:
             - 'ContentName'
-            - 'eZ\Publish\API\Repository\Values\Content\Query\SortClause\ContentName'
+            - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\ContentName'
         tags:
             - { name: ezpublish_rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.ContentName }
 
@@ -593,7 +593,7 @@ services:
         class: '%ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class%'
         arguments:
             - 'DateModified'
-            - 'eZ\Publish\API\Repository\Values\Content\Query\SortClause\DateModified'
+            - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\DateModified'
         tags:
             - { name: ezpublish_rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.DateModified }
 
@@ -602,7 +602,7 @@ services:
         class: '%ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class%'
         arguments:
             - 'DatePublished'
-            - 'eZ\Publish\API\Repository\Values\Content\Query\SortClause\DatePublished'
+            - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\DatePublished'
         tags:
             - { name: ezpublish_rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.DatePublished }
 
@@ -611,7 +611,7 @@ services:
         class: '%ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class%'
         arguments:
             - 'LocationDepth'
-            - 'eZ\Publish\API\Repository\Values\Content\Query\SortClause\Location\Depth'
+            - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\Location\Depth'
         tags:
             - { name: ezpublish_rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.LocationDepth }
 
@@ -620,7 +620,7 @@ services:
         class: '%ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class%'
         arguments:
             - 'LocationPath'
-            - 'eZ\Publish\API\Repository\Values\Content\Query\SortClause\Location\Path'
+            - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\Location\Path'
         tags:
             - { name: ezpublish_rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.LocationPath }
 
@@ -629,7 +629,7 @@ services:
         class: '%ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class%'
         arguments:
             - 'LocationPriority'
-            - 'eZ\Publish\API\Repository\Values\Content\Query\SortClause\Location\Priority'
+            - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\Location\Priority'
         tags:
             - { name: ezpublish_rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.LocationPriority }
 
@@ -638,7 +638,7 @@ services:
         class: '%ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class%'
         arguments:
             - 'LocationId'
-            - 'eZ\Publish\API\Repository\Values\Content\Query\SortClause\Location\Id'
+            - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\Location\Id'
         tags:
             - { name: ezpublish_rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.LocationId }
 
@@ -647,7 +647,7 @@ services:
         class: '%ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class%'
         arguments:
             - 'SectionIdentifier'
-            - 'eZ\Publish\API\Repository\Values\Content\Query\SortClause\SectionIdentifier'
+            - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\SectionIdentifier'
         tags:
             - { name: ezpublish_rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.SectionIdentifier }
 
@@ -656,7 +656,7 @@ services:
         class: '%ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class%'
         arguments:
             - 'SectionName'
-            - 'eZ\Publish\API\Repository\Values\Content\Query\SortClause\SectionName'
+            - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\SectionName'
         tags:
             - { name: ezpublish_rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.SectionName }
 
@@ -665,7 +665,7 @@ services:
         class: 'Ibexa\Rest\Server\Input\Parser\SortClause\DataKeyValueObjectClass'
         arguments:
             - 'Score'
-            - 'eZ\Publish\API\Repository\Values\Content\Query\SortClause\Score'
+            - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\Score'
         tags:
             - { name: ezpublish_rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.Score }
 
@@ -880,7 +880,7 @@ services:
             - { name: ezpublish_rest.input.parser, mediaType: application/vnd.ez.api.internal.limitation.Subtree }
         arguments:
             - 'locationPath'
-            - 'eZ\Publish\API\Repository\Values\User\Limitation\SubtreeLimitation'
+            - 'Ibexa\Contracts\Core\Repository\Values\User\Limitation\SubtreeLimitation'
 
     ezpublish_rest.input.parser.internal.limitation.Section:
         parent: ezpublish_rest.input.parser
@@ -889,4 +889,4 @@ services:
             - { name: ezpublish_rest.input.parser, mediaType: application/vnd.ez.api.internal.limitation.Section }
         arguments:
             - 'sectionId'
-            - 'eZ\Publish\API\Repository\Values\User\Limitation\SectionLimitation'
+            - 'Ibexa\Contracts\Core\Repository\Values\User\Limitation\SectionLimitation'
diff --git a/src/bundle/Resources/config/security.yml b/src/bundle/Resources/config/security.yml
index 6b541422..133509dc 100644
--- a/src/bundle/Resources/config/security.yml
+++ b/src/bundle/Resources/config/security.yml
@@ -32,6 +32,6 @@ services:
 
     Ibexa\Rest\Server\Security\EventListener\SecurityListener:
         arguments:
-            - '@eZ\Publish\API\Repository\PermissionResolver'
+            - '@Ibexa\Contracts\Core\Repository\PermissionResolver'
         tags:
             - { name: kernel.event_subscriber }
diff --git a/src/bundle/Resources/config/services.yml b/src/bundle/Resources/config/services.yml
index 0e485d45..5e07ba25 100644
--- a/src/bundle/Resources/config/services.yml
+++ b/src/bundle/Resources/config/services.yml
@@ -214,7 +214,7 @@ services:
             - "@ezpublish.api.service.location"
             - "@ezpublish.api.service.section"
             - "@ezpublish.api.repository"
-            - '@eZ\Publish\API\Repository\PermissionResolver'
+            - '@Ibexa\Contracts\Core\Repository\PermissionResolver'
         tags: [controller.service_arguments]
 
     ezpublish_rest.controller.url_wildcard:
@@ -244,7 +244,7 @@ services:
         parent: ezpublish_rest.controller.base
         arguments:
             - "%ezpublish_rest.csrf_token_intention%"
-            - '@eZ\Publish\API\Repository\PermissionResolver'
+            - '@Ibexa\Contracts\Core\Repository\PermissionResolver'
             - '@ezpublish.api.service.user'
             - "@?ezpublish_rest.session_authenticator"
             - "@?ezpublish_rest.security.csrf.token_manager"
@@ -428,7 +428,7 @@ services:
     ezpublish_rest.output.value_object_visitor.Exception.InvalidArgumentException:
         class: "%ezpublish_rest.output.value_object_visitor.Exception.InvalidArgumentException.class%"
         tags:
-            - { name: ezpublish_rest.output.value_object_visitor, type: \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException }
+            - { name: ezpublish_rest.output.value_object_visitor, type: \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException }
 
     ezpublish_rest.input.dispatcher:
         class: "%ezpublish_rest.input.dispatcher.class%"
@@ -450,7 +450,7 @@ services:
             - { name: ezpublish_rest.input.handler, format: xml }
 
     ezpublish_rest.templated_router:
-        class: eZ\Bundle\EzPublishCoreBundle\Routing\DefaultRouter
+        class: Ibexa\Bundle\Core\Routing\DefaultRouter
         parent: hautelook.router.template
         calls:
             - [ setOption, [ strict_requirements, ~ ] ]
diff --git a/src/bundle/Resources/config/value_object_visitors.yml b/src/bundle/Resources/config/value_object_visitors.yml
index e48e0037..32f226c1 100644
--- a/src/bundle/Resources/config/value_object_visitors.yml
+++ b/src/bundle/Resources/config/value_object_visitors.yml
@@ -140,28 +140,28 @@ services:
         class: "%ezpublish_rest.output.value_object_visitor.InvalidArgumentException.class%"
         arguments: [ "%kernel.debug%", "@translator" ]
         tags:
-            - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Exceptions\InvalidArgumentException }
+            - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException }
 
     ezpublish_rest.output.value_object_visitor.NotFoundException:
         parent: ezpublish_rest.output.value_object_visitor.base
         class: "%ezpublish_rest.output.value_object_visitor.NotFoundException.class%"
         arguments: [ "%kernel.debug%", "@translator" ]
         tags:
-            - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Exceptions\NotFoundException }
+            - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException }
 
     ezpublish_rest.output.value_object_visitor.UnauthorizedException:
         parent: ezpublish_rest.output.value_object_visitor.base
         class: "%ezpublish_rest.output.value_object_visitor.UnauthorizedException.class%"
         arguments: [ "%kernel.debug%", "@translator" ]
         tags:
-            - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Exceptions\UnauthorizedException }
+            - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException }
 
     ezpublish_rest.output.value_object_visitor.BadStateException:
         parent: ezpublish_rest.output.value_object_visitor.base
         class: "%ezpublish_rest.output.value_object_visitor.BadStateException.class%"
         arguments: [ "%kernel.debug%", "@translator" ]
         tags:
-            - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Exceptions\BadStateException }
+            - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Exceptions\BadStateException }
 
     ezpublish_rest.output.value_object_visitor.BadRequestException:
         parent: ezpublish_rest.output.value_object_visitor.base
@@ -190,7 +190,7 @@ services:
         class: "%ezpublish_rest.output.value_object_visitor.NotImplementedException.class%"
         arguments: [ "%kernel.debug%", "@translator" ]
         tags:
-            - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Exceptions\NotImplementedException }
+            - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Exceptions\NotImplementedException }
 
     ezpublish_rest.output.value_object_visitor.Exception:
         parent: ezpublish_rest.output.value_object_visitor.base
@@ -210,7 +210,7 @@ services:
         parent: ezpublish_rest.output.value_object_visitor.base
         class: Ibexa\Rest\Server\Output\ValueObjectVisitor\Language
         tags:
-            - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\Content\Language }
+            - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\Language }
 
     # Section
     ezpublish_rest.output.value_object_visitor.SectionList:
@@ -229,7 +229,7 @@ services:
         parent: ezpublish_rest.output.value_object_visitor.base
         class: "%ezpublish_rest.output.value_object_visitor.Section.class%"
         tags:
-            - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\Content\Section }
+            - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\Section }
 
     # URLWildcard
     ezpublish_rest.output.value_object_visitor.URLWildcardList:
@@ -242,7 +242,7 @@ services:
         parent: ezpublish_rest.output.value_object_visitor.base
         class: "%ezpublish_rest.output.value_object_visitor.URLWildcard.class%"
         tags:
-            - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\Content\URLWildcard }
+            - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\URLWildcard }
 
     ezpublish_rest.output.value_object_visitor.CreatedURLWildcard:
         parent: ezpublish_rest.output.value_object_visitor.base
@@ -267,7 +267,7 @@ services:
         parent: ezpublish_rest.output.value_object_visitor.base
         class: "%ezpublish_rest.output.value_object_visitor.URLAlias.class%"
         tags:
-            - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\Content\URLAlias }
+            - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\URLAlias }
 
     ezpublish_rest.output.value_object_visitor.CreatedURLAlias:
         parent: ezpublish_rest.output.value_object_visitor.base
@@ -280,7 +280,7 @@ services:
         parent: ezpublish_rest.output.value_object_visitor.base
         class: Ibexa\Rest\Server\Output\ValueObjectVisitor\Author
         tags:
-            - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\Core\FieldType\Author\Author }
+            - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Core\FieldType\Author\Author }
 
     ezpublish_rest.output.value_object_visitor.ContentList:
         parent: ezpublish_rest.output.value_object_visitor.base
@@ -319,13 +319,13 @@ services:
         parent: ezpublish_rest.output.value_object_visitor.base
         class: "%ezpublish_rest.output.value_object_visitor.VersionInfo.class%"
         tags:
-            - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\Content\VersionInfo }
+            - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo }
 
     ezpublish_rest.output.value_object_visitor.ImageVariation:
         parent: ezpublish_rest.output.value_object_visitor.base
         class: "%ezpublish_rest.output.value_object_visitor.ImageVariation.class%"
         tags:
-            - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\SPI\Variation\Values\ImageVariation }
+            - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Variation\Values\ImageVariation }
 
     ezpublish_rest.output.value_object_visitor.Version:
         parent: ezpublish_rest.output.value_object_visitor.base
@@ -347,7 +347,7 @@ services:
         arguments:
             $contentService: '@ezpublish.api.service.content'
         tags:
-            - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\User\UserGroup }
+            - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\User\UserGroup }
 
     ezpublish_rest.output.value_object_visitor.RestUserGroup:
         parent: ezpublish_rest.output.value_object_visitor.base
@@ -398,7 +398,7 @@ services:
         arguments:
             $contentService: '@ezpublish.api.service.content'
         tags:
-            - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\User\User }
+            - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\User\User }
 
     ezpublish_rest.output.value_object_visitor.RestUser:
         parent: ezpublish_rest.output.value_object_visitor.base
@@ -428,7 +428,7 @@ services:
         parent: ezpublish_rest.output.value_object_visitor.base
         class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentType
         tags:
-            - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\ContentType\ContentType }
+            - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType }
 
     ezpublish_rest.output.value_object_visitor.RestContentType:
         parent: ezpublish_rest.output.value_object_visitor.base
@@ -458,7 +458,7 @@ services:
         parent: ezpublish_rest.output.value_object_visitor.base
         class: "%ezpublish_rest.output.value_object_visitor.ContentTypeGroup.class%"
         tags:
-            - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup }
+            - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup }
 
     ezpublish_rest.output.value_object_visitor.CreatedContentTypeGroup:
         parent: ezpublish_rest.output.value_object_visitor.base
@@ -540,15 +540,15 @@ services:
         parent: ezpublish_rest.output.value_object_visitor.base
         class: "%ezpublish_rest.output.value_object_visitor.Role.class%"
         tags:
-            - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\User\Role }
-            - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\User\RoleDraft }
+            - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\User\Role }
+            - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\User\RoleDraft }
 
     ezpublish_rest.output.value_object_visitor.Policy:
         parent: ezpublish_rest.output.value_object_visitor.base
         class: "%ezpublish_rest.output.value_object_visitor.Policy.class%"
         tags:
-            - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\User\Policy }
-            - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\User\PolicyDraft }
+            - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\User\Policy }
+            - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\User\PolicyDraft }
 
     ezpublish_rest.output.value_object_visitor.CreatedPolicy:
         parent: ezpublish_rest.output.value_object_visitor.base
@@ -597,7 +597,7 @@ services:
         parent: ezpublish_rest.output.value_object_visitor.base
         class: "%ezpublish_rest.output.value_object_visitor.Location.class%"
         tags:
-            - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\Content\Location }
+            - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\Location }
         arguments: ["@ezpublish.api.service.location"]
 
     ezpublish_rest.output.value_object_visitor.LocationList:
@@ -633,38 +633,38 @@ services:
         parent: ezpublish_rest.output.value_object_visitor.base
         class: Ibexa\Rest\Server\Output\ValueObjectVisitor\Range
         tags:
-            - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Range }
+            - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Range }
 
     ezpublish_rest.output.value_object_visitor.RangeAggregationResult:
         parent: ezpublish_rest.output.value_object_visitor.base
         class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RangeAggregationResult
         tags:
-            - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\Content\Search\AggregationResult\RangeAggregationResult }
+            - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\RangeAggregationResult }
 
     ezpublish_rest.output.value_object_visitor.StatsAggregationResult:
         parent: ezpublish_rest.output.value_object_visitor.base
         class: Ibexa\Rest\Server\Output\ValueObjectVisitor\StatsAggregationResult
         tags:
-            - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\Content\Search\AggregationResult\StatsAggregationResult }
+            - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\StatsAggregationResult }
 
     ezpublish_rest.output.value_object_visitor.TermAggregationResult:
         parent: ezpublish_rest.output.value_object_visitor.base
         class: Ibexa\Rest\Server\Output\ValueObjectVisitor\TermAggregationResult
         tags:
-            - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\Content\Search\AggregationResult\TermAggregationResult }
+            - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\TermAggregationResult }
 
     # Object state
     ezpublish_rest.output.value_object_visitor.ObjectState:
         parent: ezpublish_rest.output.value_object_visitor.base
         class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ObjectState
         tags:
-            - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\ObjectState\ObjectState }
+            - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectState }
 
     ezpublish_rest.output.value_object_visitor.ObjectStateGroup:
         parent: ezpublish_rest.output.value_object_visitor.base
         class: "%ezpublish_rest.output.value_object_visitor.ObjectStateGroup.class%"
         tags:
-            - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroup }
+            - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroup }
 
     ezpublish_rest.output.value_object_visitor.CreatedObjectStateGroup:
         parent: ezpublish_rest.output.value_object_visitor.base
diff --git a/src/bundle/RestEvents.php b/src/bundle/RestEvents.php
index 323ea7b4..cfd003a2 100644
--- a/src/bundle/RestEvents.php
+++ b/src/bundle/RestEvents.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Bundle\Rest;
@@ -11,7 +11,7 @@ final class RestEvents
     /**
      * The REST_CSRF_TOKEN_VALIDATED event occurs after CSRF token has been validated as correct.
      */
-    const REST_CSRF_TOKEN_VALIDATED = 'ezpublish.rest.csrf_token_validated';
+    public const REST_CSRF_TOKEN_VALIDATED = 'ezpublish.rest.csrf_token_validated';
 }
 
 class_alias(RestEvents::class, 'EzSystems\EzPlatformRestBundle\RestEvents');
diff --git a/src/bundle/Routing/OptionsLoader.php b/src/bundle/Routing/OptionsLoader.php
index 376c1d10..d72b582f 100644
--- a/src/bundle/Routing/OptionsLoader.php
+++ b/src/bundle/Routing/OptionsLoader.php
@@ -1,14 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Bundle\Rest\Routing;
 
-use Symfony\Component\Config\Loader\Loader;
 use Ibexa\Bundle\Rest\Routing\OptionsLoader\RouteCollectionMapper;
-use Symfony\Component\Routing\RouteCollection;
+use Symfony\Component\Config\Loader\Loader;
 
 /**
  * Goes through all REST routes, and registers new routes for all routes
@@ -28,7 +27,7 @@ public function __construct(RouteCollectionMapper $mapper)
      * @param mixed $resource
      * @param string $type
      *
-     * @return RouteCollection
+     * @return \Symfony\Component\Routing\RouteCollection
      */
     public function load($resource, $type = null)
     {
diff --git a/src/bundle/Routing/OptionsLoader/Mapper.php b/src/bundle/Routing/OptionsLoader/Mapper.php
index 2d7da6ec..2fdb2b61 100644
--- a/src/bundle/Routing/OptionsLoader/Mapper.php
+++ b/src/bundle/Routing/OptionsLoader/Mapper.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Bundle\Rest\Routing\OptionsLoader;
@@ -16,7 +16,7 @@ class Mapper
     /**
      * @param $route Route REST route
      *
-     * @return Route
+     * @return \Symfony\Component\Routing\Route
      */
     public function mapRoute(Route $route)
     {
@@ -38,10 +38,10 @@ public function mapRoute(Route $route)
     /**
      * Merges the methods from $restRoute into the _method default of $optionsRoute.
      *
-     * @param Route $restRoute
-     * @param Route $optionsRoute
+     * @param \Symfony\Component\Routing\Route $restRoute
+     * @param \Symfony\Component\Routing\Route $optionsRoute
      *
-     * @return Route $optionsRoute with the methods from $restRoute in the _methods default
+     * @return \Symfony\Component\Routing\Route $optionsRoute with the methods from $restRoute in the _methods default
      */
     public function mergeMethodsDefault(Route $optionsRoute, Route $restRoute)
     {
diff --git a/src/bundle/Routing/OptionsLoader/RouteCollectionMapper.php b/src/bundle/Routing/OptionsLoader/RouteCollectionMapper.php
index f20c5458..49a0b7b3 100644
--- a/src/bundle/Routing/OptionsLoader/RouteCollectionMapper.php
+++ b/src/bundle/Routing/OptionsLoader/RouteCollectionMapper.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Bundle\Rest\Routing\OptionsLoader;
@@ -28,9 +28,9 @@ public function __construct(Mapper $mapper)
     /**
      * Iterates over $restRouteCollection, and returns the corresponding RouteCollection of OPTIONS REST routes.
      *
-     * @param RouteCollection $restRouteCollection
+     * @param \Symfony\Component\Routing\RouteCollection $restRouteCollection
      *
-     * @return RouteCollection
+     * @return \Symfony\Component\Routing\RouteCollection
      */
     public function mapCollection(RouteCollection $restRouteCollection)
     {
diff --git a/src/contracts/Exceptions/ForbiddenException.php b/src/contracts/Exceptions/ForbiddenException.php
index 0d4cb25e..9f5cbf28 100644
--- a/src/contracts/Exceptions/ForbiddenException.php
+++ b/src/contracts/Exceptions/ForbiddenException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Contracts\Rest\Exceptions;
diff --git a/src/contracts/Exceptions/InvalidArgumentException.php b/src/contracts/Exceptions/InvalidArgumentException.php
index dc7a403a..7e462c7e 100644
--- a/src/contracts/Exceptions/InvalidArgumentException.php
+++ b/src/contracts/Exceptions/InvalidArgumentException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Contracts\Rest\Exceptions;
 
-use eZ\Publish\API\Repository\Exceptions\InvalidArgumentException as APIInvalidArgumentException;
+use Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException as APIInvalidArgumentException;
 
 /**
  * This exception is thrown if a service method is called with an illegal or non appropriate value.
diff --git a/src/contracts/Exceptions/NotFoundException.php b/src/contracts/Exceptions/NotFoundException.php
index 87d48da9..18a95e01 100644
--- a/src/contracts/Exceptions/NotFoundException.php
+++ b/src/contracts/Exceptions/NotFoundException.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Contracts\Rest\Exceptions;
 
-use eZ\Publish\API\Repository\Exceptions\NotFoundException as APINotFoundException;
+use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException as APINotFoundException;
 
 /**
  * Implementation of the {@link \eZ\Publish\API\Repository\Exceptions\NotFoundException}
  * interface.
  *
- * @see \eZ\Publish\API\Repository\Exceptions\NotFoundException
+ * @see \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
  */
 class NotFoundException extends APINotFoundException
 {
diff --git a/src/contracts/Exceptions/Parser.php b/src/contracts/Exceptions/Parser.php
index 8b5ffb80..1a8ca8c2 100644
--- a/src/contracts/Exceptions/Parser.php
+++ b/src/contracts/Exceptions/Parser.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Contracts\Rest\Exceptions;
diff --git a/src/contracts/FieldTypeProcessor.php b/src/contracts/FieldTypeProcessor.php
index 9cb28e9a..2e771530 100644
--- a/src/contracts/FieldTypeProcessor.php
+++ b/src/contracts/FieldTypeProcessor.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Contracts\Rest;
@@ -21,7 +21,7 @@ abstract class FieldTypeProcessor
      * apply to hashes accepted by fromHash(). The return value of this method
      * replaces the $incomingValueHash.
      *
-     * @see \EzSystems\EzPlatformRest\Input\FieldTypeParser
+     * @see \Ibexa\Rest\Input\FieldTypeParser
      *
      * @param mixed $incomingValueHash
      *
@@ -42,7 +42,7 @@ public function preProcessValueHash($incomingValueHash)
      * $outgoingValueHash and must obey to the same rules as the original
      * $outgoingValueHash.
      *
-     * @see \EzSystems\EzPlatformRest\Output\FieldTypeSerializer
+     * @see \Ibexa\Rest\Output\FieldTypeSerializer
      *
      * @param mixed $outgoingValueHash
      *
@@ -63,7 +63,7 @@ public function postProcessValueHash($outgoingValueHash)
      * need to apply to hashes accepted by fieldSettingsFromHash(). The return
      * value of this method replaces the $incomingSettingsHash.
      *
-     * @see \EzSystems\EzPlatformRest\Input\FieldTypeParser
+     * @see \Ibexa\Rest\Input\FieldTypeParser
      *
      * @param mixed $incomingSettingsHash
      *
@@ -84,7 +84,7 @@ public function preProcessFieldSettingsHash($incomingSettingsHash)
      * $outgoingSettingsHash and must obey to the same rules as the original
      * $outgoingSettingsHash.
      *
-     * @see \EzSystems\EzPlatformRest\Output\FieldTypeSerializer
+     * @see \Ibexa\Rest\Output\FieldTypeSerializer
      *
      * @param mixed $outgoingSettingsHash
      *
@@ -105,7 +105,7 @@ public function postProcessFieldSettingsHash($outgoingSettingsHash)
      * rules that need to apply to hashes accepted by validatorConfigurationFromHash().
      * The return value of this method replaces the $incomingValidatorConfigurationHash.
      *
-     * @see \EzSystems\EzPlatformRest\Input\FieldTypeParser
+     * @see \Ibexa\Rest\Input\FieldTypeParser
      *
      * @param mixed $incomingValidatorConfigurationHash
      *
@@ -126,7 +126,7 @@ public function preProcessValidatorConfigurationHash($incomingValidatorConfigura
      * $outgoingValidatorConfigurationHash and must obey to the same rules as the original
      * $outgoingValidatorConfigurationHash.
      *
-     * @see \EzSystems\EzPlatformRest\Output\FieldTypeSerializer
+     * @see \Ibexa\Rest\Output\FieldTypeSerializer
      *
      * @param mixed $outgoingValidatorConfigurationHash
      *
diff --git a/src/contracts/Input/Handler.php b/src/contracts/Input/Handler.php
index 3f41a2cc..46d6b14c 100644
--- a/src/contracts/Input/Handler.php
+++ b/src/contracts/Input/Handler.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Contracts\Rest\Input;
diff --git a/src/contracts/Input/Parser.php b/src/contracts/Input/Parser.php
index 022c6ebc..b9599286 100644
--- a/src/contracts/Input/Parser.php
+++ b/src/contracts/Input/Parser.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Contracts\Rest\Input;
@@ -15,9 +15,9 @@ abstract class Parser
      * Parse input structure.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @return \eZ\Publish\API\Repository\Values\ValueObject
+     * @return \Ibexa\Contracts\Core\Repository\Values\ValueObject
      */
     abstract public function parse(array $data, ParsingDispatcher $parsingDispatcher);
 }
diff --git a/src/contracts/Input/ParsingDispatcher.php b/src/contracts/Input/ParsingDispatcher.php
index f377aad2..f941a550 100644
--- a/src/contracts/Input/ParsingDispatcher.php
+++ b/src/contracts/Input/ParsingDispatcher.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Contracts\Rest\Input;
@@ -27,7 +27,7 @@ class ParsingDispatcher
      *  )
      * </code>
      *
-     * @var \EzSystems\EzPlatformRest\Input\Parser[]
+     * @var \Ibexa\Contracts\Rest\Input\Parser[]
      */
     protected $parsers = [];
 
@@ -47,7 +47,7 @@ public function __construct(array $parsers = [])
      * Adds another parser for the given Content Type.
      *
      * @param string $mediaType
-     * @param \EzSystems\EzPlatformRest\Input\Parser $parser
+     * @param \Ibexa\Contracts\Rest\Input\Parser $parser
      */
     public function addParser($mediaType, Parser $parser)
     {
@@ -61,7 +61,7 @@ public function addParser($mediaType, Parser $parser)
      * @param array $data
      * @param string $mediaType
      *
-     * @return \eZ\Publish\API\Repository\Values\ValueObject
+     * @return \Ibexa\Contracts\Core\Repository\Values\ValueObject
      */
     public function parse(array $data, $mediaType)
     {
diff --git a/src/contracts/Output/Exceptions/InvalidTypeException.php b/src/contracts/Output/Exceptions/InvalidTypeException.php
index e96bb1d2..9e0fb1a2 100644
--- a/src/contracts/Output/Exceptions/InvalidTypeException.php
+++ b/src/contracts/Output/Exceptions/InvalidTypeException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Contracts\Rest\Output\Exceptions;
diff --git a/src/contracts/Output/Exceptions/NoVisitorFoundException.php b/src/contracts/Output/Exceptions/NoVisitorFoundException.php
index 60ede32d..cfa847c0 100644
--- a/src/contracts/Output/Exceptions/NoVisitorFoundException.php
+++ b/src/contracts/Output/Exceptions/NoVisitorFoundException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Contracts\Rest\Output\Exceptions;
diff --git a/src/contracts/Output/Exceptions/OutputGeneratorException.php b/src/contracts/Output/Exceptions/OutputGeneratorException.php
index 8885dbbe..2b4f90d7 100644
--- a/src/contracts/Output/Exceptions/OutputGeneratorException.php
+++ b/src/contracts/Output/Exceptions/OutputGeneratorException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Contracts\Rest\Output\Exceptions;
diff --git a/src/contracts/Output/Generator.php b/src/contracts/Output/Generator.php
index d7f1c740..3a68b55a 100644
--- a/src/contracts/Output/Generator.php
+++ b/src/contracts/Output/Generator.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Contracts\Rest\Output;
diff --git a/src/contracts/Output/ValueObjectVisitor.php b/src/contracts/Output/ValueObjectVisitor.php
index 8481ccad..5591d555 100644
--- a/src/contracts/Output/ValueObjectVisitor.php
+++ b/src/contracts/Output/ValueObjectVisitor.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Contracts\Rest\Output;
 
+use Ibexa\Contracts\Core\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Values\User\Limitation;
 use Ibexa\Rest\RequestParser;
-use eZ\Publish\API\Repository\Values\User\Limitation;
-use eZ\Publish\API\Repository\Values\Content\Location;
 use Symfony\Component\Routing\RouterInterface;
 
 /**
@@ -19,7 +19,7 @@ abstract class ValueObjectVisitor
     /**
      * URL handler for URL generation.
      *
-     * @var \EzSystems\EzPlatformRest\RequestParser
+     * @var \Ibexa\Rest\RequestParser
      */
     protected $requestParser;
 
@@ -36,8 +36,8 @@ abstract class ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
      * @param mixed $data
      */
     abstract public function visit(Visitor $visitor, Generator $generator, $data);
@@ -63,7 +63,7 @@ public function setRequestParser(RequestParser $requestParser)
     /**
      * Returns a string representation for the given $boolValue.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
      * @param bool $boolValue
      *
      * @return mixed
@@ -76,7 +76,7 @@ protected function serializeBool(Generator $generator, $boolValue)
     /**
      * Visits the given list of $names.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
      * @param array $names
      */
     protected function visitNamesList(Generator $generator, array $names)
@@ -87,7 +87,7 @@ protected function visitNamesList(Generator $generator, array $names)
     /**
      * Visits the given list of $descriptions.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
      * @param array $descriptions
      */
     protected function visitDescriptionsList(Generator $generator, array $descriptions)
@@ -98,7 +98,7 @@ protected function visitDescriptionsList(Generator $generator, array $descriptio
     /**
      * Visits a list of translated elements.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
      * @param array $translatedElements
      * @param mixed $listName
      */
@@ -117,8 +117,8 @@ protected function visitTranslatedList(Generator $generator, array $translatedEl
     /**
      * Visits a limitation.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \eZ\Publish\API\Repository\Values\User\Limitation $limitation
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Contracts\Core\Repository\Values\User\Limitation $limitation
      */
     protected function visitLimitation(Generator $generator, Limitation $limitation)
     {
diff --git a/src/contracts/Output/ValueObjectVisitorDispatcher.php b/src/contracts/Output/ValueObjectVisitorDispatcher.php
index 35c9368b..65bb10a6 100644
--- a/src/contracts/Output/ValueObjectVisitorDispatcher.php
+++ b/src/contracts/Output/ValueObjectVisitorDispatcher.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Contracts\Rest\Output;
@@ -19,12 +19,12 @@ class ValueObjectVisitorDispatcher
     private $visitors;
 
     /**
-     * @var \EzSystems\EzPlatformRest\Output\Visitor
+     * @var \Ibexa\Contracts\Rest\Output\Visitor
      */
     private $outputVisitor;
 
     /**
-     * @var \EzSystems\EzPlatformRest\Output\Generator
+     * @var \Ibexa\Contracts\Rest\Output\Generator
      */
     private $outputGenerator;
 
@@ -40,7 +40,7 @@ public function setOutputGenerator(Generator $outputGenerator)
 
     /**
      * @param string $visitedClassName The FQN of the visited class
-     * @param \EzSystems\EzPlatformRest\Output\ValueObjectVisitor $visitor The visitor object
+     * @param \Ibexa\Contracts\Rest\Output\ValueObjectVisitor $visitor The visitor object
      */
     public function addVisitor($visitedClassName, ValueObjectVisitor $visitor)
     {
@@ -50,8 +50,8 @@ public function addVisitor($visitedClassName, ValueObjectVisitor $visitor)
     /**
      * @param object $data The visited object
      *
-     * @throws \EzSystems\EzPlatformRest\Output\Exceptions\NoVisitorFoundException
-     * @throws \EzSystems\EzPlatformRest\Output\Exceptions\InvalidTypeException
+     * @throws \Ibexa\Contracts\Rest\Output\Exceptions\NoVisitorFoundException
+     * @throws \Ibexa\Contracts\Rest\Output\Exceptions\InvalidTypeException
      *
      * @return mixed
      */
diff --git a/src/contracts/Output/Visitor.php b/src/contracts/Output/Visitor.php
index 0bfa26ef..69ec797e 100644
--- a/src/contracts/Output/Visitor.php
+++ b/src/contracts/Output/Visitor.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Contracts\Rest\Output;
@@ -14,21 +14,21 @@
 class Visitor
 {
     /**
-     * @var \EzSystems\EzPlatformRest\Output\ValueObjectVisitorDispatcher
+     * @var \Ibexa\Contracts\Rest\Output\ValueObjectVisitorDispatcher
      */
     protected $valueObjectVisitorDispatcher = [];
 
     /**
      * Generator.
      *
-     * @var \EzSystems\EzPlatformRest\Output\Generator
+     * @var \Ibexa\Contracts\Rest\Output\Generator
      */
     protected $generator;
 
     /**
      * HTTP Response Object.
      *
-     * @var Response
+     * @var \Symfony\Component\HttpFoundation\Response
      */
     protected $response;
 
@@ -42,8 +42,8 @@ class Visitor
     /**
      * Construct from Generator and an array of concrete view model visitors.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Output\ValueObjectVisitorDispatcher $valueObjectVisitorDispatcher
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Contracts\Rest\Output\ValueObjectVisitorDispatcher $valueObjectVisitorDispatcher
      *
      * @internal param array $visitors
      */
@@ -143,7 +143,7 @@ public function visitValueObject($data)
      *
      * @param string $type
      *
-     * @see \EzSystems\EzPlatformRest\Generator::getMediaType()
+     * @see \Ibexa\Rest\Generator::getMediaType()
      *
      * @return string
      */
@@ -153,7 +153,7 @@ public function getMediaType($type)
     }
 
     /**
-     * @return Response
+     * @return \Symfony\Component\HttpFoundation\Response
      */
     public function getResponse()
     {
diff --git a/src/lib/FieldTypeProcessor/AuthorProcessor.php b/src/lib/FieldTypeProcessor/AuthorProcessor.php
index 409c0cfc..c48f91b8 100644
--- a/src/lib/FieldTypeProcessor/AuthorProcessor.php
+++ b/src/lib/FieldTypeProcessor/AuthorProcessor.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\FieldTypeProcessor;
 
 use Ibexa\Contracts\Rest\FieldTypeProcessor;
-use eZ\Publish\Core\FieldType\Author\Type;
+use Ibexa\Core\FieldType\Author\Type;
 
 class AuthorProcessor extends FieldTypeProcessor
 {
diff --git a/src/lib/FieldTypeProcessor/BaseRelationProcessor.php b/src/lib/FieldTypeProcessor/BaseRelationProcessor.php
index 95594465..7be3d8c6 100644
--- a/src/lib/FieldTypeProcessor/BaseRelationProcessor.php
+++ b/src/lib/FieldTypeProcessor/BaseRelationProcessor.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\FieldTypeProcessor;
 
-use eZ\Publish\API\Repository\LocationService;
-use eZ\Publish\Core\FieldType\Relation\Type;
+use Ibexa\Contracts\Core\Repository\LocationService;
 use Ibexa\Contracts\Rest\FieldTypeProcessor;
+use Ibexa\Core\FieldType\Relation\Type;
 use Symfony\Component\Routing\RouterInterface;
 
 abstract class BaseRelationProcessor extends FieldTypeProcessor
@@ -19,7 +19,7 @@ abstract class BaseRelationProcessor extends FieldTypeProcessor
     private $router;
 
     /**
-     * @var \eZ\Publish\API\Repository\LocationService
+     * @var \Ibexa\Contracts\Core\Repository\LocationService
      */
     private $locationService;
 
@@ -32,7 +32,7 @@ public function setRouter(RouterInterface $router)
     }
 
     /**
-     * @param \eZ\Publish\API\Repository\LocationService $locationService
+     * @param \Ibexa\Contracts\Core\Repository\LocationService $locationService
      */
     public function setLocationService(LocationService $locationService)
     {
diff --git a/src/lib/FieldTypeProcessor/BinaryInputProcessor.php b/src/lib/FieldTypeProcessor/BinaryInputProcessor.php
index 4d03aafb..15ebafae 100644
--- a/src/lib/FieldTypeProcessor/BinaryInputProcessor.php
+++ b/src/lib/FieldTypeProcessor/BinaryInputProcessor.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\FieldTypeProcessor;
diff --git a/src/lib/FieldTypeProcessor/BinaryProcessor.php b/src/lib/FieldTypeProcessor/BinaryProcessor.php
index 15514eb0..6877a230 100644
--- a/src/lib/FieldTypeProcessor/BinaryProcessor.php
+++ b/src/lib/FieldTypeProcessor/BinaryProcessor.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\FieldTypeProcessor;
diff --git a/src/lib/FieldTypeProcessor/DateAndTimeProcessor.php b/src/lib/FieldTypeProcessor/DateAndTimeProcessor.php
index 9c06bf32..a6e807a6 100644
--- a/src/lib/FieldTypeProcessor/DateAndTimeProcessor.php
+++ b/src/lib/FieldTypeProcessor/DateAndTimeProcessor.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\FieldTypeProcessor;
 
 use Ibexa\Contracts\Rest\FieldTypeProcessor;
-use eZ\Publish\Core\FieldType\DateAndTime\Type;
+use Ibexa\Core\FieldType\DateAndTime\Type;
 
 class DateAndTimeProcessor extends FieldTypeProcessor
 {
diff --git a/src/lib/FieldTypeProcessor/DateProcessor.php b/src/lib/FieldTypeProcessor/DateProcessor.php
index 723b43e9..c213a3c6 100644
--- a/src/lib/FieldTypeProcessor/DateProcessor.php
+++ b/src/lib/FieldTypeProcessor/DateProcessor.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\FieldTypeProcessor;
 
 use Ibexa\Contracts\Rest\FieldTypeProcessor;
-use eZ\Publish\Core\FieldType\Date\Type;
+use Ibexa\Core\FieldType\Date\Type;
 
 class DateProcessor extends FieldTypeProcessor
 {
diff --git a/src/lib/FieldTypeProcessor/FloatProcessor.php b/src/lib/FieldTypeProcessor/FloatProcessor.php
index 6e16ffe0..cab282f5 100644
--- a/src/lib/FieldTypeProcessor/FloatProcessor.php
+++ b/src/lib/FieldTypeProcessor/FloatProcessor.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\FieldTypeProcessor;
diff --git a/src/lib/FieldTypeProcessor/ImageAssetFieldTypeProcessor.php b/src/lib/FieldTypeProcessor/ImageAssetFieldTypeProcessor.php
index 091cbf39..d067f5cb 100644
--- a/src/lib/FieldTypeProcessor/ImageAssetFieldTypeProcessor.php
+++ b/src/lib/FieldTypeProcessor/ImageAssetFieldTypeProcessor.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\FieldTypeProcessor;
 
-use eZ\Publish\API\Repository\ContentService;
-use eZ\Publish\API\Repository\Exceptions\NotFoundException;
+use Ibexa\Contracts\Core\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
 use Ibexa\Contracts\Rest\FieldTypeProcessor;
 use Symfony\Component\Routing\RouterInterface;
 
@@ -18,7 +18,7 @@ class ImageAssetFieldTypeProcessor extends FieldTypeProcessor
     /** @var \Symfony\Component\Routing\RouterInterface */
     private $router;
 
-    /** @var \eZ\Publish\API\Repository\ContentService */
+    /** @var \Ibexa\Contracts\Core\Repository\ContentService */
     private $contentService;
 
     /** @var string[] */
diff --git a/src/lib/FieldTypeProcessor/ImageProcessor.php b/src/lib/FieldTypeProcessor/ImageProcessor.php
index e04daed3..a5e8ed1a 100644
--- a/src/lib/FieldTypeProcessor/ImageProcessor.php
+++ b/src/lib/FieldTypeProcessor/ImageProcessor.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\FieldTypeProcessor;
@@ -29,7 +29,7 @@ class ImageProcessor extends BinaryInputProcessor
     protected $variations;
 
     /**
-     * @var RouterInterface
+     * @var \Symfony\Component\Routing\RouterInterface
      */
     protected $router;
 
diff --git a/src/lib/FieldTypeProcessor/MediaProcessor.php b/src/lib/FieldTypeProcessor/MediaProcessor.php
index 65807780..1d3c632b 100644
--- a/src/lib/FieldTypeProcessor/MediaProcessor.php
+++ b/src/lib/FieldTypeProcessor/MediaProcessor.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\FieldTypeProcessor;
 
-use eZ\Publish\Core\FieldType\Media\Type;
+use Ibexa\Core\FieldType\Media\Type;
 
 class MediaProcessor extends BinaryInputProcessor
 {
diff --git a/src/lib/FieldTypeProcessor/RelationListProcessor.php b/src/lib/FieldTypeProcessor/RelationListProcessor.php
index ee123ff0..1afa893d 100644
--- a/src/lib/FieldTypeProcessor/RelationListProcessor.php
+++ b/src/lib/FieldTypeProcessor/RelationListProcessor.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\FieldTypeProcessor;
diff --git a/src/lib/FieldTypeProcessor/RelationProcessor.php b/src/lib/FieldTypeProcessor/RelationProcessor.php
index 1c20388c..9713c19f 100644
--- a/src/lib/FieldTypeProcessor/RelationProcessor.php
+++ b/src/lib/FieldTypeProcessor/RelationProcessor.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\FieldTypeProcessor;
diff --git a/src/lib/FieldTypeProcessor/StringProcessor.php b/src/lib/FieldTypeProcessor/StringProcessor.php
index ae6247fd..996f1110 100644
--- a/src/lib/FieldTypeProcessor/StringProcessor.php
+++ b/src/lib/FieldTypeProcessor/StringProcessor.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\FieldTypeProcessor;
diff --git a/src/lib/FieldTypeProcessor/TimeProcessor.php b/src/lib/FieldTypeProcessor/TimeProcessor.php
index f0d85769..b8dba802 100644
--- a/src/lib/FieldTypeProcessor/TimeProcessor.php
+++ b/src/lib/FieldTypeProcessor/TimeProcessor.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\FieldTypeProcessor;
 
 use Ibexa\Contracts\Rest\FieldTypeProcessor;
-use eZ\Publish\Core\FieldType\Time\Type;
+use Ibexa\Core\FieldType\Time\Type;
 
 class TimeProcessor extends FieldTypeProcessor
 {
diff --git a/src/lib/FieldTypeProcessor/UserProcessor.php b/src/lib/FieldTypeProcessor/UserProcessor.php
index ec80e1c1..91dd90a8 100644
--- a/src/lib/FieldTypeProcessor/UserProcessor.php
+++ b/src/lib/FieldTypeProcessor/UserProcessor.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\FieldTypeProcessor;
diff --git a/src/lib/FieldTypeProcessorRegistry.php b/src/lib/FieldTypeProcessorRegistry.php
index 5fa8bf6a..22c833c5 100644
--- a/src/lib/FieldTypeProcessorRegistry.php
+++ b/src/lib/FieldTypeProcessorRegistry.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest;
@@ -16,12 +16,12 @@ class FieldTypeProcessorRegistry
     /**
      * Registered processors.
      *
-     * @var \EzSystems\EzPlatformRest\FieldTypeProcessor[]
+     * @var \Ibexa\Contracts\Rest\FieldTypeProcessor[]
      */
     private $processors = [];
 
     /**
-     * @param \EzSystems\EzPlatformRest\FieldTypeProcessor[] $processors
+     * @param \Ibexa\Contracts\Rest\FieldTypeProcessor[] $processors
      */
     public function __construct(array $processors = [])
     {
@@ -34,7 +34,7 @@ public function __construct(array $processors = [])
      * Registers $processor for $fieldTypeIdentifier.
      *
      * @param string $fieldTypeIdentifier
-     * @param \EzSystems\EzPlatformRest\FieldTypeProcessor $processor
+     * @param \Ibexa\Contracts\Rest\FieldTypeProcessor $processor
      */
     public function registerProcessor($fieldTypeIdentifier, FieldTypeProcessor $processor)
     {
@@ -60,7 +60,7 @@ public function hasProcessor($fieldTypeIdentifier)
      *
      * @throws \RuntimeException if not processor is registered for $fieldTypeIdentifier
      *
-     * @return \EzSystems\EzPlatformRest\FieldTypeProcessor
+     * @return \Ibexa\Contracts\Rest\FieldTypeProcessor
      */
     public function getProcessor($fieldTypeIdentifier)
     {
diff --git a/src/lib/Input/BaseParser.php b/src/lib/Input/BaseParser.php
index 26c54098..63275754 100644
--- a/src/lib/Input/BaseParser.php
+++ b/src/lib/Input/BaseParser.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Input;
@@ -14,7 +14,7 @@ abstract class BaseParser extends Parser
     /**
      * URL handler.
      *
-     * @var \EzSystems\EzPlatformRest\RequestParser
+     * @var \Ibexa\Rest\RequestParser
      */
     protected $requestParser;
 
diff --git a/src/lib/Input/Dispatcher.php b/src/lib/Input/Dispatcher.php
index d4711891..6fb4e722 100644
--- a/src/lib/Input/Dispatcher.php
+++ b/src/lib/Input/Dispatcher.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Input;
 
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\Handler;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Rest\Message;
-use Ibexa\Contracts\Rest\Exceptions;
 
 /**
  * Input dispatcher.
@@ -28,20 +28,20 @@ class Dispatcher
      *  )
      * </code>
      *
-     * @var \EzSystems\EzPlatformRest\Input\Handler[]
+     * @var \Ibexa\Contracts\Rest\Input\Handler[]
      */
     protected $handlers = [];
 
     /**
-     * @var \EzSystems\EzPlatformRest\Input\ParsingDispatcher
+     * @var \Ibexa\Contracts\Rest\Input\ParsingDispatcher
      */
     protected $parsingDispatcher;
 
     /**
      * Construct from optional parsers array.
      *
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
-     * @param \EzSystems\EzPlatformRest\Input\Handler[] $handlers
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\Handler[] $handlers
      */
     public function __construct(ParsingDispatcher $parsingDispatcher, array $handlers = [])
     {
@@ -55,7 +55,7 @@ public function __construct(ParsingDispatcher $parsingDispatcher, array $handler
      * Adds another handler for the given Content Type.
      *
      * @param string $type
-     * @param \EzSystems\EzPlatformRest\Input\Handler $handler
+     * @param \Ibexa\Contracts\Rest\Input\Handler $handler
      */
     public function addHandler($type, Handler $handler)
     {
@@ -65,7 +65,7 @@ public function addHandler($type, Handler $handler)
     /**
      * Parse provided request.
      *
-     * @param \EzSystems\EzPlatformRest\Message $message
+     * @param \Ibexa\Rest\Message $message
      *
      * @return mixed
      */
diff --git a/src/lib/Input/FieldTypeParser.php b/src/lib/Input/FieldTypeParser.php
index abeb7bc2..deb27407 100644
--- a/src/lib/Input/FieldTypeParser.php
+++ b/src/lib/Input/FieldTypeParser.php
@@ -1,43 +1,43 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Input;
 
+use Ibexa\Contracts\Core\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\ContentTypeService;
+use Ibexa\Contracts\Core\Repository\FieldTypeService;
 use Ibexa\Rest\FieldTypeProcessorRegistry;
-use eZ\Publish\API\Repository\ContentService;
-use eZ\Publish\API\Repository\ContentTypeService;
-use eZ\Publish\API\Repository\FieldTypeService;
 
 class FieldTypeParser
 {
     /**
-     * @var \eZ\Publish\API\Repository\ContentService
+     * @var \Ibexa\Contracts\Core\Repository\ContentService
      */
     protected $contentService;
 
     /**
-     * @var \eZ\Publish\API\Repository\ContentTypeService
+     * @var \Ibexa\Contracts\Core\Repository\ContentTypeService
      */
     protected $contentTypeService;
 
     /**
-     * @var \eZ\Publish\API\Repository\FieldTypeService
+     * @var \Ibexa\Contracts\Core\Repository\FieldTypeService
      */
     protected $fieldTypeService;
 
     /**
-     * @var \EzSystems\EzPlatformRest\FieldTypeProcessorRegistry
+     * @var \Ibexa\Rest\FieldTypeProcessorRegistry
      */
     protected $fieldTypeProcessorRegistry;
 
     /**
-     * @param \eZ\Publish\API\Repository\ContentService $contentService
-     * @param \eZ\Publish\API\Repository\ContentTypeService $contentTypeService
-     * @param \eZ\Publish\API\Repository\FieldTypeService $fieldTypeService
-     * @param \EzSystems\EzPlatformRest\FieldTypeProcessorRegistry $fieldTypeProcessorRegistry
+     * @param \Ibexa\Contracts\Core\Repository\ContentService $contentService
+     * @param \Ibexa\Contracts\Core\Repository\ContentTypeService $contentTypeService
+     * @param \Ibexa\Contracts\Core\Repository\FieldTypeService $fieldTypeService
+     * @param \Ibexa\Rest\FieldTypeProcessorRegistry $fieldTypeProcessorRegistry
      */
     public function __construct(
         ContentService $contentService,
diff --git a/src/lib/Input/Handler/Json.php b/src/lib/Input/Handler/Json.php
index bf3bc952..9fc8b326 100644
--- a/src/lib/Input/Handler/Json.php
+++ b/src/lib/Input/Handler/Json.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Input\Handler;
 
-use Ibexa\Contracts\Rest\Input\Handler;
 use Ibexa\Contracts\Rest\Exceptions\Parser as ParserException;
+use Ibexa\Contracts\Rest\Input\Handler;
 
 /**
  * Input format handler base class.
diff --git a/src/lib/Input/Handler/Xml.php b/src/lib/Input/Handler/Xml.php
index fd379103..c1a7f63f 100644
--- a/src/lib/Input/Handler/Xml.php
+++ b/src/lib/Input/Handler/Xml.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Input\Handler;
 
-use Ibexa\Contracts\Rest\Input\Handler;
 use Ibexa\Contracts\Rest\Exceptions;
+use Ibexa\Contracts\Rest\Input\Handler;
 
 /**
  * Input format handler base class.
diff --git a/src/lib/Input/Parser/ContentObjectStates.php b/src/lib/Input/Parser/ContentObjectStates.php
index 0dde56b2..2c4f2d11 100644
--- a/src/lib/Input/Parser/ContentObjectStates.php
+++ b/src/lib/Input/Parser/ContentObjectStates.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Input\Parser;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Contracts\Rest\Exceptions;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Core\Repository\Values\ObjectState\ObjectState;
+use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Rest\Values\RestObjectState;
-use eZ\Publish\Core\Repository\Values\ObjectState\ObjectState;
 
 /**
  * Parser for ContentObjectStates.
@@ -21,9 +21,9 @@ class ContentObjectStates extends BaseParser
      * Parse input structure.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @return \EzSystems\EzPlatformRest\Values\RestObjectState[]
+     * @return \Ibexa\Rest\Values\RestObjectState[]
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Input/ParserTools.php b/src/lib/Input/ParserTools.php
index 39dd60c2..b6aa3d5b 100644
--- a/src/lib/Input/ParserTools.php
+++ b/src/lib/Input/ParserTools.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Input;
 
-use eZ\Publish\API\Repository\Values;
 use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Core\Repository\Values;
 use RuntimeException;
 
 /**
@@ -20,7 +20,7 @@ class ParserTools
      * Parses the given $objectElement, if it contains embedded data.
      *
      * @param array $objectElement
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
      * @return mixed
      */
@@ -183,7 +183,7 @@ public function parseDefaultSortOrder($defaultSortOrderString)
      *
      * @param array $limitation
      *
-     * @return \eZ\Publish\API\Repository\Values\User\Limitation
+     * @return \Ibexa\Contracts\Core\Repository\Values\User\Limitation
      */
     public function parseLimitation(array $limitation)
     {
@@ -216,9 +216,9 @@ public function parseLimitation(array $limitation)
      *
      * @param string $identifier
      *
-     * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
      *
-     * @return \eZ\Publish\API\Repository\Values\User\Limitation
+     * @return \Ibexa\Contracts\Core\Repository\Values\User\Limitation
      *
      * @todo Use dependency injection system
      */
@@ -226,46 +226,46 @@ protected function getLimitationByIdentifier($identifier)
     {
         switch ($identifier) {
             case Values\User\Limitation::CONTENTTYPE:
-                return new \eZ\Publish\API\Repository\Values\User\Limitation\ContentTypeLimitation();
+                return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\ContentTypeLimitation();
 
             case Values\User\Limitation::LANGUAGE:
-                return new \eZ\Publish\API\Repository\Values\User\Limitation\LanguageLimitation();
+                return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\LanguageLimitation();
 
             case Values\User\Limitation::LOCATION:
-                return new \eZ\Publish\API\Repository\Values\User\Limitation\LocationLimitation();
+                return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\LocationLimitation();
 
             case Values\User\Limitation::OWNER:
-                return new \eZ\Publish\API\Repository\Values\User\Limitation\OwnerLimitation();
+                return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\OwnerLimitation();
 
             case Values\User\Limitation::PARENTOWNER:
-                return new \eZ\Publish\API\Repository\Values\User\Limitation\ParentOwnerLimitation();
+                return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\ParentOwnerLimitation();
 
             case Values\User\Limitation::PARENTCONTENTTYPE:
-                return new \eZ\Publish\API\Repository\Values\User\Limitation\ParentContentTypeLimitation();
+                return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\ParentContentTypeLimitation();
 
             case Values\User\Limitation::PARENTDEPTH:
-                return new \eZ\Publish\API\Repository\Values\User\Limitation\ParentDepthLimitation();
+                return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\ParentDepthLimitation();
 
             case Values\User\Limitation::SECTION:
-                return new \eZ\Publish\API\Repository\Values\User\Limitation\SectionLimitation();
+                return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\SectionLimitation();
 
             case Values\User\Limitation::SITEACCESS:
-                return new \eZ\Publish\API\Repository\Values\User\Limitation\SiteaccessLimitation();
+                return new \Ibexa\Core\Repository\Values\User\Limitation\SiteaccessLimitation();
 
             case Values\User\Limitation::STATE:
-                return new \eZ\Publish\API\Repository\Values\User\Limitation\ObjectStateLimitation();
+                return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\ObjectStateLimitation();
 
             case Values\User\Limitation::SUBTREE:
-                return new \eZ\Publish\API\Repository\Values\User\Limitation\SubtreeLimitation();
+                return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\SubtreeLimitation();
 
             case Values\User\Limitation::USERGROUP:
-                return new \eZ\Publish\API\Repository\Values\User\Limitation\UserGroupLimitation();
+                return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\UserGroupLimitation();
 
             case Values\User\Limitation::PARENTUSERGROUP:
-                return new \eZ\Publish\API\Repository\Values\User\Limitation\ParentUserGroupLimitation();
+                return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\ParentUserGroupLimitation();
 
             default:
-                throw new \eZ\Publish\Core\Base\Exceptions\NotFoundException('Limitation', $identifier);
+                throw new \Ibexa\Core\Base\Exceptions\NotFoundException('Limitation', $identifier);
         }
     }
 }
diff --git a/src/lib/Message.php b/src/lib/Message.php
index 2dd6a713..cafb8035 100644
--- a/src/lib/Message.php
+++ b/src/lib/Message.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest;
diff --git a/src/lib/Output/DelegateValueObjectVisitor.php b/src/lib/Output/DelegateValueObjectVisitor.php
index ae487473..45d98a8f 100644
--- a/src/lib/Output/DelegateValueObjectVisitor.php
+++ b/src/lib/Output/DelegateValueObjectVisitor.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
diff --git a/src/lib/Output/FieldTypeSerializer.php b/src/lib/Output/FieldTypeSerializer.php
index ca75e468..4bc7c07c 100644
--- a/src/lib/Output/FieldTypeSerializer.php
+++ b/src/lib/Output/FieldTypeSerializer.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Output;
 
+use Ibexa\Contracts\Core\Repository\FieldType;
+use Ibexa\Contracts\Core\Repository\FieldTypeService;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
 use Ibexa\Contracts\Rest\Output\Generator;
 use Ibexa\Rest\FieldTypeProcessorRegistry;
-use eZ\Publish\API\Repository\FieldTypeService;
-use eZ\Publish\API\Repository\FieldType;
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
-use eZ\Publish\API\Repository\Values\Content\Field;
 
 /**
  * Serializes FieldType related data for REST output.
@@ -21,18 +21,18 @@ class FieldTypeSerializer
     /**
      * FieldTypeService.
      *
-     * @var \eZ\Publish\API\Repository\FieldTypeService
+     * @var \Ibexa\Contracts\Core\Repository\FieldTypeService
      */
     protected $fieldTypeService;
 
     /**
-     * @var \EzSystems\EzPlatformRest\FieldTypeProcessorRegistry
+     * @var \Ibexa\Rest\FieldTypeProcessorRegistry
      */
     protected $fieldTypeProcessorRegistry;
 
     /**
-     * @param \eZ\Publish\API\Repository\FieldTypeService $fieldTypeService
-     * @param \EzSystems\EzPlatformRest\FieldTypeProcessorRegistry $fieldTypeProcessorRegistry
+     * @param \Ibexa\Contracts\Core\Repository\FieldTypeService $fieldTypeService
+     * @param \Ibexa\Rest\FieldTypeProcessorRegistry $fieldTypeProcessorRegistry
      */
     public function __construct(FieldTypeService $fieldTypeService, FieldTypeProcessorRegistry $fieldTypeProcessorRegistry)
     {
@@ -43,9 +43,9 @@ public function __construct(FieldTypeService $fieldTypeService, FieldTypeProcess
     /**
      * Serializes the field value of $field through $generator.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType $contentType
-     * @param \eZ\Publish\API\Repository\Values\Content\Field $field
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType $contentType
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Field $field
      */
     public function serializeFieldValue(Generator $generator, ContentType $contentType, Field $field)
     {
@@ -62,7 +62,7 @@ public function serializeFieldValue(Generator $generator, ContentType $contentTy
     /**
      * Serializes the $defaultValue for $fieldDefIdentifier through $generator.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
      * @param string $fieldTypeIdentifier
      * @param mixed $defaultValue
      */
@@ -80,7 +80,7 @@ public function serializeFieldDefaultValue(Generator $generator, $fieldTypeIdent
      * Serializes $settings as fieldSettings for $fieldDefinition using
      * $generator.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
      * @param string $fieldTypeIdentifier
      * @param mixed $settings
      */
@@ -100,7 +100,7 @@ public function serializeFieldSettings(Generator $generator, $fieldTypeIdentifie
     /**
      * Serializes $validatorConfiguration for $fieldDefinition using $generator.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
      * @param string $fieldTypeIdentifier
      * @param mixed $validatorConfiguration
      */
@@ -122,7 +122,7 @@ public function serializeValidatorConfiguration(Generator $generator, $fieldType
      *
      * @param string $fieldTypeIdentifier
      *
-     * @return \eZ\Publish\API\Repository\FieldType
+     * @return \Ibexa\Contracts\Core\Repository\FieldType
      */
     protected function getFieldType($fieldTypeIdentifier)
     {
@@ -136,8 +136,8 @@ protected function getFieldType($fieldTypeIdentifier)
      * $elementName.
      *
      * @param string $elementName
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \eZ\Publish\API\Repository\FieldType $fieldType
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Contracts\Core\Repository\FieldType $fieldType
      * @param mixed $value
      */
     protected function serializeValue($elementName, Generator $generator, FieldType $fieldType, $value)
@@ -157,7 +157,7 @@ protected function serializeValue($elementName, Generator $generator, FieldType
      * Serializes the given $hash with $generator into $elementName.
      *
      * @param string $elementName
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
      * @param mixed $hash
      */
     protected function serializeHash($elementName, Generator $generator, $hash)
diff --git a/src/lib/Output/Generator/Json.php b/src/lib/Output/Generator/Json.php
index aca906ef..31e9e1cd 100644
--- a/src/lib/Output/Generator/Json.php
+++ b/src/lib/Output/Generator/Json.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Output\Generator;
@@ -23,7 +23,7 @@ class Json extends Generator
     /**
      * Generator for field type hash values.
      *
-     * @var \EzSystems\EzPlatformRest\Output\Generator\Json\FieldTypeHashGenerator
+     * @var \Ibexa\Rest\Output\Generator\Json\FieldTypeHashGenerator
      */
     protected $fieldTypeHashGenerator;
 
@@ -42,7 +42,7 @@ class Json extends Generator
     protected $vendor;
 
     /**
-     * @param \EzSystems\EzPlatformRest\Output\Generator\Json\FieldTypeHashGenerator $fieldTypeHashGenerator
+     * @param \Ibexa\Rest\Output\Generator\Json\FieldTypeHashGenerator $fieldTypeHashGenerator
      * @param string $vendor
      */
     public function __construct(Json\FieldTypeHashGenerator $fieldTypeHashGenerator, $vendor = 'vnd.ez.api')
diff --git a/src/lib/Output/Generator/Json/ArrayObject.php b/src/lib/Output/Generator/Json/ArrayObject.php
index 55dd627f..0522883e 100644
--- a/src/lib/Output/Generator/Json/ArrayObject.php
+++ b/src/lib/Output/Generator/Json/ArrayObject.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Output\Generator\Json;
@@ -19,7 +19,7 @@ class ArrayObject extends NativeArrayObject
     /**
      * Reference to the parent node.
      *
-     * @var \EzSystems\EzPlatformRest\Output\Generator\Json\JsonObject
+     * @var \Ibexa\Rest\Output\Generator\Json\JsonObject
      */
     protected $_ref_parent;
 
@@ -36,7 +36,7 @@ public function __construct($_ref_parent)
     /**
      * Get Parent of current node.
      *
-     * @return \EzSystems\EzPlatformRest\Output\Generator\Json\JsonObject
+     * @return \Ibexa\Rest\Output\Generator\Json\JsonObject
      */
     public function getParent()
     {
diff --git a/src/lib/Output/Generator/Json/FieldTypeHashGenerator.php b/src/lib/Output/Generator/Json/FieldTypeHashGenerator.php
index b3982c74..4c67fec3 100644
--- a/src/lib/Output/Generator/Json/FieldTypeHashGenerator.php
+++ b/src/lib/Output/Generator/Json/FieldTypeHashGenerator.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Output\Generator\Json;
@@ -12,7 +12,7 @@ class FieldTypeHashGenerator
      * Generates the field type value $hashValue as a child of the given Object
      * using $hashElementName as the property name.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Generator\Json\ArrayObject|\EzSystems\EzPlatformRest\Output\Generator\Json\JsonObject $parent
+     * @param \Ibexa\Rest\Output\Generator\Json\ArrayObject|\Ibexa\Rest\Output\Generator\Json\JsonObject $parent
      * @param string $hashElementName
      * @param mixed $hashValue
      */
@@ -25,7 +25,7 @@ public function generateHashValue($parent, $hashElementName, $hashValue)
      * Generates and returns a value based on $hashValue type, with $parent (
      * if the type of $hashValue supports it).
      *
-     * @param \EzSystems\EzPlatformRest\Output\Generator\Json\ArrayObject|\EzSystems\EzPlatformRest\Output\Generator\Json\JsonObject $parent
+     * @param \Ibexa\Rest\Output\Generator\Json\ArrayObject|\Ibexa\Rest\Output\Generator\Json\JsonObject $parent
      * @param mixed $value
      *
      * @return mixed
@@ -59,10 +59,10 @@ protected function generateValue($parent, $value)
      * If $type only contains numeric keys, the resulting structure will be an
      * JSON array, otherwise a JSON object
      *
-     * @param \EzSystems\EzPlatformRest\Output\Generator\Json\ArrayObject|\EzSystems\EzPlatformRest\Output\Generator\Json\JsonObject $parent
+     * @param \Ibexa\Rest\Output\Generator\Json\ArrayObject|\Ibexa\Rest\Output\Generator\Json\JsonObject $parent
      * @param array $value
      *
-     * @return \EzSystems\EzPlatformRest\Output\Generator\Json\ArrayObject|\EzSystems\EzPlatformRest\Output\Generator\Json\JsonObject
+     * @return \Ibexa\Rest\Output\Generator\Json\ArrayObject|\Ibexa\Rest\Output\Generator\Json\JsonObject
      */
     protected function generateArrayValue($parent, array $value)
     {
@@ -76,10 +76,10 @@ protected function generateArrayValue($parent, array $value)
     /**
      * Generates a JSON array from the given $hashArray with $parent.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Generator\Json\ArrayObject|\EzSystems\EzPlatformRest\Output\Generator\Json\JsonObject $parent
+     * @param \Ibexa\Rest\Output\Generator\Json\ArrayObject|\Ibexa\Rest\Output\Generator\Json\JsonObject $parent
      * @param array $listArray
      *
-     * @return \EzSystems\EzPlatformRest\Output\Generator\Json\ArrayObject
+     * @return \Ibexa\Rest\Output\Generator\Json\ArrayObject
      */
     protected function generateListArray($parent, array $listArray)
     {
@@ -94,10 +94,10 @@ protected function generateListArray($parent, array $listArray)
     /**
      * Generates a JSON object from the given $hashArray with $parent.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Generator\Json\ArrayObject|\EzSystems\EzPlatformRest\Output\Generator\Json\JsonObject $parent
+     * @param \Ibexa\Rest\Output\Generator\Json\ArrayObject|\Ibexa\Rest\Output\Generator\Json\JsonObject $parent
      * @param array $hashArray
      *
-     * @return \EzSystems\EzPlatformRest\Output\Generator\Json\JsonObject
+     * @return \Ibexa\Rest\Output\Generator\Json\JsonObject
      */
     protected function generateHashArray($parent, array $hashArray)
     {
diff --git a/src/lib/Output/Generator/Json/JsonObject.php b/src/lib/Output/Generator/Json/JsonObject.php
index 6b2503a3..b03eeacf 100644
--- a/src/lib/Output/Generator/Json/JsonObject.php
+++ b/src/lib/Output/Generator/Json/JsonObject.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Output\Generator\Json;
@@ -17,7 +17,7 @@ class JsonObject
     /**
      * Reference to the parent node.
      *
-     * @var \EzSystems\EzPlatformRest\Output\Generator\Json\JsonObject
+     * @var \Ibexa\Rest\Output\Generator\Json\JsonObject
      */
     protected $_ref_parent;
 
@@ -34,7 +34,7 @@ public function __construct($_ref_parent = null)
     /**
      * Get Parent of current node.
      *
-     * @return \EzSystems\EzPlatformRest\Output\Generator\Json\JsonObject
+     * @return \Ibexa\Rest\Output\Generator\Json\JsonObject
      */
     public function getParent()
     {
diff --git a/src/lib/Output/Generator/Xml.php b/src/lib/Output/Generator/Xml.php
index 6db818b4..8ba15ac0 100644
--- a/src/lib/Output/Generator/Xml.php
+++ b/src/lib/Output/Generator/Xml.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Output\Generator;
@@ -23,7 +23,7 @@ class Xml extends Generator
     /**
      * Generator for field type hash values.
      *
-     * @var \EzSystems\EzPlatformRest\Output\Generator\Xml\FieldTypeHashGenerator
+     * @var \Ibexa\Rest\Output\Generator\Xml\FieldTypeHashGenerator
      */
     protected $hashGenerator;
 
@@ -42,7 +42,7 @@ class Xml extends Generator
     protected $vendor;
 
     /**
-     * @param \EzSystems\EzPlatformRest\Output\Generator\Xml\FieldTypeHashGenerator $hashGenerator
+     * @param \Ibexa\Rest\Output\Generator\Xml\FieldTypeHashGenerator $hashGenerator
      * @param string $vendor
      */
     public function __construct(Xml\FieldTypeHashGenerator $hashGenerator, $vendor = 'vnd.ez.api')
diff --git a/src/lib/Output/Generator/Xml/FieldTypeHashGenerator.php b/src/lib/Output/Generator/Xml/FieldTypeHashGenerator.php
index 1753b9b9..b85cfbb5 100644
--- a/src/lib/Output/Generator/Xml/FieldTypeHashGenerator.php
+++ b/src/lib/Output/Generator/Xml/FieldTypeHashGenerator.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Output\Generator\Xml;
diff --git a/src/lib/Output/ValueObjectVisitor/ContentObjectStates.php b/src/lib/Output/ValueObjectVisitor/ContentObjectStates.php
index 2f2dc602..48a73552 100644
--- a/src/lib/Output/ValueObjectVisitor/ContentObjectStates.php
+++ b/src/lib/Output/ValueObjectVisitor/ContentObjectStates.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 
 /**
@@ -18,9 +18,9 @@ class ContentObjectStates extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Values\ContentObjectStates $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Values\ContentObjectStates $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/RequestParser.php b/src/lib/RequestParser.php
index 34e79e75..9c22b6fd 100644
--- a/src/lib/RequestParser.php
+++ b/src/lib/RequestParser.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest;
diff --git a/src/lib/RequestParser/EzPublish.php b/src/lib/RequestParser/EzPublish.php
index b136e22b..1c960fb0 100644
--- a/src/lib/RequestParser/EzPublish.php
+++ b/src/lib/RequestParser/EzPublish.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\RequestParser;
diff --git a/src/lib/RequestParser/Pattern.php b/src/lib/RequestParser/Pattern.php
index d05ff2d6..c7806c77 100644
--- a/src/lib/RequestParser/Pattern.php
+++ b/src/lib/RequestParser/Pattern.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\RequestParser;
 
-use Ibexa\Rest\RequestParser;
 use Ibexa\Contracts\Rest\Exceptions;
+use Ibexa\Rest\RequestParser;
 
 /**
  * Pattern based Request parser.
@@ -38,12 +38,12 @@ class Pattern implements RequestParser
     /**
      * Pattern regular sub-expression.
      */
-    const STANDARD_VARIABLE_REGEX = '\{([A-Za-z-_]+)\}';
+    public const STANDARD_VARIABLE_REGEX = '\{([A-Za-z-_]+)\}';
 
     /**
      * Pattern regular sub-expression that might contain slashes.
      */
-    const SLASHES_VARIABLE_REGEX = '\{(?:\&\s*)([A-Za-z-_]+)\}';
+    public const SLASHES_VARIABLE_REGEX = '\{(?:\&\s*)([A-Za-z-_]+)\}';
 
     /**
      * Construct from optional initial map.
diff --git a/src/lib/Server/Controller.php b/src/lib/Server/Controller.php
index 4e6971b0..02ee0383 100644
--- a/src/lib/Server/Controller.php
+++ b/src/lib/Server/Controller.php
@@ -1,25 +1,25 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server;
 
-use eZ\Publish\API\Repository\Repository;
+use Ibexa\Contracts\Core\Repository\Repository;
+use Ibexa\Rest\Input\Dispatcher as InputDispatcher;
+use Ibexa\Rest\RequestParser;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
-use Symfony\Component\Routing\RouterInterface;
-use Ibexa\Rest\Input\Dispatcher as InputDispatcher;
 use Symfony\Component\HttpFoundation\Request;
-use Ibexa\Rest\RequestParser;
+use Symfony\Component\Routing\RouterInterface;
 
 abstract class Controller implements ContainerAwareInterface
 {
     use ContainerAwareTrait;
 
     /**
-     * @var \EzSystems\EzPlatformRest\Input\Dispatcher
+     * @var \Ibexa\Rest\Input\Dispatcher
      */
     protected $inputDispatcher;
 
@@ -29,14 +29,14 @@ abstract class Controller implements ContainerAwareInterface
     protected $router;
 
     /**
-     * @var \EzSystems\EzPlatformRest\RequestParser
+     * @var \Ibexa\Rest\RequestParser
      */
     protected $requestParser;
 
     /**
      * Repository.
      *
-     * @var \eZ\Publish\API\Repository\Repository
+     * @var \Ibexa\Contracts\Core\Repository\Repository
      */
     protected $repository;
 
diff --git a/src/lib/Server/Controller/BinaryContent.php b/src/lib/Server/Controller/BinaryContent.php
index 11a81fc6..e0a57751 100644
--- a/src/lib/Server/Controller/BinaryContent.php
+++ b/src/lib/Server/Controller/BinaryContent.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Controller;
 
-use eZ\Publish\API\Repository\Exceptions\InvalidVariationException;
-use eZ\Publish\Core\FieldType\Image\Value as ImageValue;
-use eZ\Publish\Core\FieldType\ImageAsset\Value as ImageAssetValue;
-use eZ\Publish\Core\MVC\ConfigResolverInterface;
-use eZ\Publish\SPI\Variation\VariationHandler;
+use Ibexa\Contracts\Core\Repository\Exceptions\InvalidVariationException;
+use Ibexa\Contracts\Core\Variation\VariationHandler;
 use Ibexa\Contracts\Rest\Exceptions;
+use Ibexa\Core\FieldType\Image\Value as ImageValue;
+use Ibexa\Core\FieldType\ImageAsset\Value as ImageAssetValue;
+use Ibexa\Core\MVC\ConfigResolverInterface;
 use Ibexa\Rest\Server\Controller as RestController;
 use Ibexa\Rest\Server\Values\CachedValue;
 
@@ -20,10 +20,10 @@
  */
 class BinaryContent extends RestController
 {
-    /** @var \eZ\Publish\SPI\Variation\VariationHandler */
+    /** @var \Ibexa\Contracts\Core\Variation\VariationHandler */
     protected $imageVariationHandler;
 
-    /** @var \eZ\Publish\Core\MVC\ConfigResolverInterface */
+    /** @var \Ibexa\Core\MVC\ConfigResolverInterface */
     private $configResolver;
 
     public function __construct(
@@ -44,9 +44,9 @@ public function __construct(
      *                        If the version number isn't specified, the default one is used.
      * @param string $variationIdentifier
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException
      *
-     * @return \eZ\Publish\SPI\Variation\Values\Variation
+     * @return \Ibexa\Contracts\Core\Variation\Values\Variation
      */
     public function getImageVariation($imageId, $variationIdentifier)
     {
@@ -104,7 +104,7 @@ public function getImageVariation($imageId, $variationIdentifier)
      * @return array An array with 3 keys: contentId, fieldId and versionNumber.
      *               If the versionNumber wasn't set, it is returned as null.
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException If the imageId format is invalid
+     * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException If the imageId format is invalid
      */
     private function parseImageId($imageId)
     {
diff --git a/src/lib/Server/Controller/Bookmark.php b/src/lib/Server/Controller/Bookmark.php
index 5c6e7e08..027caf7a 100644
--- a/src/lib/Server/Controller/Bookmark.php
+++ b/src/lib/Server/Controller/Bookmark.php
@@ -1,39 +1,39 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Controller;
 
-use eZ\Publish\API\Repository\BookmarkService;
-use eZ\Publish\API\Repository\Exceptions\InvalidArgumentException;
-use eZ\Publish\API\Repository\LocationService;
+use Ibexa\Contracts\Core\Repository\BookmarkService;
+use Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException;
+use Ibexa\Contracts\Core\Repository\LocationService;
 use Ibexa\Contracts\Rest\Exceptions;
-use Ibexa\Rest\Value as RestValue;
-use Ibexa\Rest\Server\Values;
 use Ibexa\Rest\Server\Controller as RestController;
+use Ibexa\Rest\Server\Values;
+use Ibexa\Rest\Value as RestValue;
 use Symfony\Component\HttpFoundation\Request;
 
 class Bookmark extends RestController
 {
     /**
-     * @var \eZ\Publish\API\Repository\BookmarkService
+     * @var \Ibexa\Contracts\Core\Repository\BookmarkService
      */
     protected $bookmarkService;
 
     /**
-     * @var \eZ\Publish\API\Repository\LocationService
+     * @var \Ibexa\Contracts\Core\Repository\LocationService
      */
     protected $locationService;
 
     /**
      * Bookmark constructor.
      *
-     * @param \eZ\Publish\API\Repository\BookmarkService $bookmarkService
-     * @param \eZ\Publish\API\Repository\LocationService $locationService
+     * @param \Ibexa\Contracts\Core\Repository\BookmarkService $bookmarkService
+     * @param \Ibexa\Contracts\Core\Repository\LocationService $locationService
      */
     public function __construct(BookmarkService $bookmarkService, LocationService $locationService)
     {
@@ -47,10 +47,10 @@ public function __construct(BookmarkService $bookmarkService, LocationService $l
      * @param \Symfony\Component\HttpFoundation\Request $request
      * @param int $locationId
      *
-     * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
-     * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
      *
-     * @return \EzSystems\EzPlatformRest\Value
+     * @return \Ibexa\Rest\Value
      */
     public function createBookmark(Request $request, int $locationId): RestValue
     {
@@ -78,10 +78,10 @@ public function createBookmark(Request $request, int $locationId): RestValue
      * @param \Symfony\Component\HttpFoundation\Request $request
      * @param int $locationId
      *
-     * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
-     * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
      *
-     * @return \EzSystems\EzPlatformRest\Value
+     * @return \Ibexa\Rest\Value
      */
     public function deleteBookmark(Request $request, int $locationId): RestValue
     {
@@ -102,10 +102,10 @@ public function deleteBookmark(Request $request, int $locationId): RestValue
      * @param \Symfony\Component\HttpFoundation\Request $request
      * @param int $locationId
      *
-     * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
-     * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\OK
+     * @return \Ibexa\Rest\Server\Values\OK
      */
     public function isBookmarked(Request $request, int $locationId): Values\OK
     {
@@ -123,9 +123,9 @@ public function isBookmarked(Request $request, int $locationId): Values\OK
      *
      * @param \Symfony\Component\HttpFoundation\Request $request
      *
-     * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException
      *
-     * @return \EzSystems\EzPlatformRest\Value
+     * @return \Ibexa\Rest\Value
      */
     public function loadBookmarks(Request $request): RestValue
     {
diff --git a/src/lib/Server/Controller/Content.php b/src/lib/Server/Controller/Content.php
index 1eef8dd1..e9983363 100644
--- a/src/lib/Server/Controller/Content.php
+++ b/src/lib/Server/Controller/Content.php
@@ -1,24 +1,24 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Controller;
 
-use eZ\Publish\API\Repository\Values\Content\Language;
-use Ibexa\Rest\Message;
+use Ibexa\Contracts\Core\Repository\Exceptions\ContentFieldValidationException;
+use Ibexa\Contracts\Core\Repository\Exceptions\ContentValidationException;
+use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
+use Ibexa\Contracts\Core\Repository\Values\Content\Language;
+use Ibexa\Contracts\Core\Repository\Values\Content\Relation;
+use Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo;
 use Ibexa\Contracts\Rest\Exceptions;
-use Ibexa\Rest\Server\Values;
+use Ibexa\Rest\Message;
 use Ibexa\Rest\Server\Controller as RestController;
-use eZ\Publish\API\Repository\Values\Content\Relation;
-use eZ\Publish\API\Repository\Values\Content\VersionInfo;
-use eZ\Publish\API\Repository\Exceptions\NotFoundException;
-use eZ\Publish\API\Repository\Exceptions\ContentFieldValidationException;
-use eZ\Publish\API\Repository\Exceptions\ContentValidationException;
-use Ibexa\Rest\Server\Exceptions\ForbiddenException;
 use Ibexa\Rest\Server\Exceptions\BadRequestException;
 use Ibexa\Rest\Server\Exceptions\ContentFieldValidationException as RESTContentFieldValidationException;
+use Ibexa\Rest\Server\Exceptions\ForbiddenException;
+use Ibexa\Rest\Server\Values;
 use Ibexa\Rest\Server\Values\RestContentCreateStruct;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -31,9 +31,9 @@ class Content extends RestController
     /**
      * Loads a content info by remote ID.
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\BadRequestException
+     * @throws \Ibexa\Rest\Server\Exceptions\BadRequestException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\TemporaryRedirect
+     * @return \Ibexa\Rest\Server\Values\TemporaryRedirect
      */
     public function redirectContent(Request $request)
     {
@@ -61,7 +61,7 @@ public function redirectContent(Request $request)
      * @param mixed $contentId
      * @param \Symfony\Component\HttpFoundation\Request $request
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RestContent
+     * @return \Ibexa\Rest\Server\Values\RestContent
      */
     public function loadContent($contentId, Request $request)
     {
@@ -110,7 +110,7 @@ public function loadContent($contentId, Request $request)
      *
      * @param mixed $contentId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RestContent
+     * @return \Ibexa\Rest\Server\Values\RestContent
      */
     public function updateContentMetadata($contentId, Request $request)
     {
@@ -160,7 +160,7 @@ public function updateContentMetadata($contentId, Request $request)
      *
      * @param mixed $contentId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\TemporaryRedirect
+     * @return \Ibexa\Rest\Server\Values\TemporaryRedirect
      */
     public function redirectCurrentVersion($contentId)
     {
@@ -183,7 +183,7 @@ public function redirectCurrentVersion($contentId)
      * @param mixed $contentId
      * @param int $versionNumber
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\Version
+     * @return \Ibexa\Rest\Server\Values\Version
      */
     public function loadContentInVersion($contentId, $versionNumber, Request $request)
     {
@@ -229,7 +229,7 @@ public function loadContentInVersion($contentId, $versionNumber, Request $reques
      *
      * @param \Symfony\Component\HttpFoundation\Request $request
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\CreatedContent
+     * @return \Ibexa\Rest\Server\Values\CreatedContent
      */
     public function createContent(Request $request)
     {
@@ -244,7 +244,7 @@ public function createContent(Request $request)
      *
      * @param mixed $contentId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\NoContent
+     * @return \Ibexa\Rest\Server\Values\NoContent
      */
     public function deleteContent($contentId)
     {
@@ -260,7 +260,7 @@ public function deleteContent($contentId)
      *
      * @param mixed $contentId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\ResourceCreated
+     * @return \Ibexa\Rest\Server\Values\ResourceCreated
      */
     public function copyContent($contentId, Request $request)
     {
@@ -288,7 +288,7 @@ public function copyContent($contentId, Request $request)
      * @param int $contentId
      * @param string $languageCode
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\NoContent
+     * @return \Ibexa\Rest\Server\Values\NoContent
      *
      * @throws \Exception
      */
@@ -319,7 +319,7 @@ public function deleteContentTranslation($contentId, $languageCode)
      *
      * @param mixed $contentId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\VersionList
+     * @return \Ibexa\Rest\Server\Values\VersionList
      */
     public function loadContentVersions($contentId, Request $request)
     {
@@ -337,9 +337,9 @@ public function loadContentVersions($contentId, Request $request)
      * @param mixed $contentId
      * @param mixed $versionNumber
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\NoContent
+     * @return \Ibexa\Rest\Server\Values\NoContent
      */
     public function deleteContentVersion($contentId, $versionNumber)
     {
@@ -366,9 +366,9 @@ public function deleteContentVersion($contentId, $versionNumber)
      * @param int $versionNumber
      * @param string $languageCode
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\NoContent
+     * @return \Ibexa\Rest\Server\Values\NoContent
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
      */
     public function deleteTranslationFromDraft($contentId, $versionNumber, $languageCode)
     {
@@ -390,7 +390,7 @@ public function deleteTranslationFromDraft($contentId, $versionNumber, $language
      * @param mixed $contentId
      * @param mixed $versionNumber
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\CreatedVersion
+     * @return \Ibexa\Rest\Server\Values\CreatedVersion
      */
     public function createDraftFromVersion($contentId, $versionNumber)
     {
@@ -417,9 +417,9 @@ public function createDraftFromVersion($contentId, $versionNumber)
      *
      * @param mixed $contentId
      *
-     * @throws ForbiddenException if the current version is already a draft
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException if the current version is already a draft
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\CreatedVersion
+     * @return \Ibexa\Rest\Server\Values\CreatedVersion
      */
     public function createDraftFromCurrentVersion($contentId)
     {
@@ -452,10 +452,10 @@ public function createDraftFromCurrentVersion($contentId)
      * @param mixed $contentId
      * @param mixed $versionNumber
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\BadRequestException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Rest\Server\Exceptions\BadRequestException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\Version
+     * @return \Ibexa\Rest\Server\Values\Version
      */
     public function updateVersion($contentId, $versionNumber, Request $request)
     {
@@ -521,9 +521,9 @@ public function updateVersion($contentId, $versionNumber, Request $request)
      * @param mixed $contentId
      * @param mixed $versionNumber
      *
-     * @throws ForbiddenException if version $versionNumber isn't a draft
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException if version $versionNumber isn't a draft
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\NoContent
+     * @return \Ibexa\Rest\Server\Values\NoContent
      */
     public function publishVersion($contentId, $versionNumber)
     {
@@ -548,7 +548,7 @@ public function publishVersion($contentId, $versionNumber)
      *
      * @param mixed $contentId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\TemporaryRedirect
+     * @return \Ibexa\Rest\Server\Values\TemporaryRedirect
      */
     public function redirectCurrentVersionRelations($contentId)
     {
@@ -571,7 +571,7 @@ public function redirectCurrentVersionRelations($contentId)
      * @param mixed $contentId
      * @param mixed $versionNumber
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RelationList
+     * @return \Ibexa\Rest\Server\Values\RelationList
      */
     public function loadVersionRelations($contentId, $versionNumber, Request $request)
     {
@@ -613,9 +613,9 @@ public function loadVersionRelations($contentId, $versionNumber, Request $reques
      * @param int $versionNumber
      * @param mixed $relationId
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RestRelation
+     * @return \Ibexa\Rest\Server\Values\RestRelation
      */
     public function loadVersionRelation($contentId, $versionNumber, $relationId, Request $request)
     {
@@ -649,10 +649,10 @@ public function loadVersionRelation($contentId, $versionNumber, $relationId, Req
      * @param int   $versionNumber
      * @param mixed $relationId
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
-     * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\NoContent
+     * @return \Ibexa\Rest\Server\Values\NoContent
      */
     public function removeRelation($contentId, $versionNumber, $relationId, Request $request)
     {
@@ -687,10 +687,10 @@ public function removeRelation($contentId, $versionNumber, $relationId, Request
      * @param mixed $contentId
      * @param int $versionNumber
      *
-     * @throws ForbiddenException if version $versionNumber isn't a draft
-     * @throws ForbiddenException if a relation to the same content already exists
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException if version $versionNumber isn't a draft
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException if a relation to the same content already exists
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\CreatedRelation
+     * @return \Ibexa\Rest\Server\Values\CreatedRelation
      */
     public function createRelation($contentId, $versionNumber, Request $request)
     {
@@ -730,8 +730,8 @@ public function createRelation($contentId, $versionNumber, Request $request)
     }
 
     /**
-     * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
-     * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
      */
     public function hideContent(int $contentId): Values\NoContent
     {
@@ -743,8 +743,8 @@ public function hideContent(int $contentId): Values\NoContent
     }
 
     /**
-     * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
-     * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
      */
     public function revealContent(int $contentId): Values\NoContent
     {
@@ -760,7 +760,7 @@ public function revealContent(int $contentId): Values\NoContent
      *
      * @deprecated Since platform 1.0. Forwards the request to the new /views location, but returns a 301.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RestExecutedView
+     * @return \Ibexa\Rest\Server\Values\RestExecutedView
      */
     public function createView()
     {
@@ -803,13 +803,13 @@ protected function parseContentRequest(Request $request)
 
     /**
      * @param \Symfony\Component\HttpFoundation\Request $request
-     * @param \EzSystems\EzPlatformRest\Server\Values\RestContentCreateStruct $contentCreate
+     * @param \Ibexa\Rest\Server\Values\RestContentCreateStruct $contentCreate
      *
-     * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
-     * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException
-     * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\CreatedContent
+     * @return \Ibexa\Rest\Server\Values\CreatedContent
      */
     protected function doCreateContent(Request $request, RestContentCreateStruct $contentCreate)
     {
diff --git a/src/lib/Server/Controller/ContentType.php b/src/lib/Server/Controller/ContentType.php
index 9ca3667a..fc0b4843 100644
--- a/src/lib/Server/Controller/ContentType.php
+++ b/src/lib/Server/Controller/ContentType.php
@@ -1,26 +1,26 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Controller;
 
-use eZ\Publish\API\Repository\Values\Content\Language;
-use Ibexa\Rest\Server\Exceptions\BadRequestException;
-use eZ\Publish\API\Repository\Exceptions\BadStateException;
-use Ibexa\Rest\Message;
+use Ibexa\Contracts\Core\Repository\ContentTypeService;
+use Ibexa\Contracts\Core\Repository\Exceptions\BadStateException;
+use Ibexa\Contracts\Core\Repository\Exceptions\ContentTypeFieldDefinitionValidationException;
+use Ibexa\Contracts\Core\Repository\Exceptions\ContentTypeValidationException;
+use Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException;
+use Ibexa\Contracts\Core\Repository\Values\Content\Language;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType as APIContentType;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroupCreateStruct;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroupUpdateStruct;
 use Ibexa\Contracts\Rest\Exceptions;
-use Ibexa\Rest\Server\Exceptions\ForbiddenException;
-use eZ\Publish\API\Repository\Exceptions\InvalidArgumentException;
-use eZ\Publish\API\Repository\Exceptions\ContentTypeValidationException;
-use eZ\Publish\API\Repository\Exceptions\ContentTypeFieldDefinitionValidationException;
+use Ibexa\Rest\Message;
 use Ibexa\Rest\Server\Controller as RestController;
+use Ibexa\Rest\Server\Exceptions\BadRequestException;
+use Ibexa\Rest\Server\Exceptions\ForbiddenException;
 use Ibexa\Rest\Server\Values;
-use eZ\Publish\API\Repository\ContentTypeService;
-use eZ\Publish\API\Repository\Values\ContentType\ContentType as APIContentType;
-use eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroupCreateStruct;
-use eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroupUpdateStruct;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -31,14 +31,14 @@ class ContentType extends RestController
     /**
      * Content type service.
      *
-     * @var \eZ\Publish\API\Repository\ContentTypeService
+     * @var \Ibexa\Contracts\Core\Repository\ContentTypeService
      */
     protected $contentTypeService;
 
     /**
      * Construct controller.
      *
-     * @param \eZ\Publish\API\Repository\ContentTypeService $contentTypeService
+     * @param \Ibexa\Contracts\Core\Repository\ContentTypeService $contentTypeService
      */
     public function __construct(ContentTypeService $contentTypeService)
     {
@@ -48,9 +48,9 @@ public function __construct(ContentTypeService $contentTypeService)
     /**
      * Creates a new content type group.
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\CreatedContentTypeGroup
+     * @return \Ibexa\Rest\Server\Values\CreatedContentTypeGroup
      */
     public function createContentTypeGroup(Request $request)
     {
@@ -77,9 +77,9 @@ public function createContentTypeGroup(Request $request)
      *
      * @param $contentTypeGroupId
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
      *
-     * @return \eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup
+     * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup
      */
     public function updateContentTypeGroup($contentTypeGroupId, Request $request)
     {
@@ -107,7 +107,7 @@ public function updateContentTypeGroup($contentTypeGroupId, Request $request)
      *
      * @param string $contentTypeGroupId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\ContentTypeList|\EzSystems\EzPlatformRest\Server\Values\ContentTypeInfoList
+     * @return \Ibexa\Rest\Server\Values\ContentTypeList|\Ibexa\Rest\Server\Values\ContentTypeInfoList
      */
     public function listContentTypesForGroup($contentTypeGroupId, Request $request)
     {
@@ -128,9 +128,9 @@ public function listContentTypesForGroup($contentTypeGroupId, Request $request)
      *
      * @param mixed $contentTypeGroupId
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\NoContent
+     * @return \Ibexa\Rest\Server\Values\NoContent
      */
     public function deleteContentTypeGroup($contentTypeGroupId)
     {
@@ -149,7 +149,7 @@ public function deleteContentTypeGroup($contentTypeGroupId)
     /**
      * Returns a list of all content type groups.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\ContentTypeGroupList
+     * @return \Ibexa\Rest\Server\Values\ContentTypeGroupList
      */
     public function loadContentTypeGroupList(Request $request)
     {
@@ -178,7 +178,7 @@ public function loadContentTypeGroupList(Request $request)
      *
      * @param $contentTypeGroupId
      *
-     * @return \eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup
+     * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup
      */
     public function loadContentTypeGroup($contentTypeGroupId)
     {
@@ -190,7 +190,7 @@ public function loadContentTypeGroup($contentTypeGroupId)
      *
      * @param $contentTypeId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RestContentType
+     * @return \Ibexa\Rest\Server\Values\RestContentType
      */
     public function loadContentType($contentTypeId)
     {
@@ -205,7 +205,7 @@ public function loadContentType($contentTypeId)
     /**
      * Returns a list of content types.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\ContentTypeList|\EzSystems\EzPlatformRest\Server\Values\ContentTypeInfoList
+     * @return \Ibexa\Rest\Server\Values\ContentTypeList|\Ibexa\Rest\Server\Values\ContentTypeInfoList
      */
     public function listContentTypes(Request $request)
     {
@@ -251,7 +251,7 @@ public function listContentTypes(Request $request)
     /**
      * Loads a content type by its identifier.
      *
-     * @return \eZ\Publish\API\Repository\Values\ContentType\ContentType
+     * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType
      */
     public function loadContentTypeByIdentifier(Request $request)
     {
@@ -264,7 +264,7 @@ public function loadContentTypeByIdentifier(Request $request)
     /**
      * Loads a content type by its remote ID.
      *
-     * @return \eZ\Publish\API\Repository\Values\ContentType\ContentType
+     * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType
      */
     public function loadContentTypeByRemoteId(Request $request)
     {
@@ -279,10 +279,10 @@ public function loadContentTypeByRemoteId(Request $request)
      *
      * @param $contentTypeGroupId
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\BadRequestException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Rest\Server\Exceptions\BadRequestException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\CreatedContentType
+     * @return \Ibexa\Rest\Server\Values\CreatedContentType
      */
     public function createContentType($contentTypeGroupId, Request $request)
     {
@@ -344,7 +344,7 @@ public function createContentType($contentTypeGroupId, Request $request)
      *
      * @param $contentTypeId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\ResourceCreated
+     * @return \Ibexa\Rest\Server\Values\ResourceCreated
      */
     public function copyContentType($contentTypeId)
     {
@@ -365,9 +365,9 @@ public function copyContentType($contentTypeId)
      *
      * @param $contentTypeId
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\CreatedContentType
+     * @return \Ibexa\Rest\Server\Values\CreatedContentType
      */
     public function createContentTypeDraft($contentTypeId, Request $request)
     {
@@ -416,7 +416,7 @@ public function createContentTypeDraft($contentTypeId, Request $request)
      *
      * @param $contentTypeId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RestContentType
+     * @return \Ibexa\Rest\Server\Values\RestContentType
      */
     public function loadContentTypeDraft($contentTypeId)
     {
@@ -433,9 +433,9 @@ public function loadContentTypeDraft($contentTypeId)
      *
      * @param $contentTypeId
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RestContentType
+     * @return \Ibexa\Rest\Server\Values\RestContentType
      */
     public function updateContentTypeDraft($contentTypeId, Request $request)
     {
@@ -471,10 +471,10 @@ public function updateContentTypeDraft($contentTypeId, Request $request)
      *
      * @param $contentTypeId
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
-     * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\CreatedFieldDefinition
+     * @return \Ibexa\Rest\Server\Values\CreatedFieldDefinition
      */
     public function addContentTypeDraftFieldDefinition($contentTypeId, Request $request)
     {
@@ -520,7 +520,7 @@ public function addContentTypeDraftFieldDefinition($contentTypeId, Request $requ
      *
      * @param $contentTypeId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\FieldDefinitionList
+     * @return \Ibexa\Rest\Server\Values\FieldDefinitionList
      *
      * @todo Check why this isn't in the specs
      */
@@ -540,9 +540,9 @@ public function loadContentTypeFieldDefinitionList($contentTypeId)
      * @param $contentTypeId
      * @param $fieldDefinitionId
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RestFieldDefinition
+     * @return \Ibexa\Rest\Server\Values\RestFieldDefinition
      */
     public function loadContentTypeFieldDefinition($contentTypeId, $fieldDefinitionId, Request $request)
     {
@@ -565,7 +565,7 @@ public function loadContentTypeFieldDefinition($contentTypeId, $fieldDefinitionI
      *
      * @param $contentTypeId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\FieldDefinitionList
+     * @return \Ibexa\Rest\Server\Values\FieldDefinitionList
      */
     public function loadContentTypeDraftFieldDefinitionList($contentTypeId)
     {
@@ -583,9 +583,9 @@ public function loadContentTypeDraftFieldDefinitionList($contentTypeId)
      * @param $contentTypeId
      * @param $fieldDefinitionId
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RestFieldDefinition
+     * @return \Ibexa\Rest\Server\Values\RestFieldDefinition
      */
     public function loadContentTypeDraftFieldDefinition($contentTypeId, $fieldDefinitionId, Request $request)
     {
@@ -609,10 +609,10 @@ public function loadContentTypeDraftFieldDefinition($contentTypeId, $fieldDefini
      * @param $contentTypeId
      * @param $fieldDefinitionId
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
-     * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\FieldDefinitionList
+     * @return \Ibexa\Rest\Server\Values\FieldDefinitionList
      */
     public function updateContentTypeDraftFieldDefinition($contentTypeId, $fieldDefinitionId, Request $request)
     {
@@ -665,9 +665,9 @@ public function updateContentTypeDraftFieldDefinition($contentTypeId, $fieldDefi
      * @param $contentTypeId
      * @param $fieldDefinitionId
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\NoContent
+     * @return \Ibexa\Rest\Server\Values\NoContent
      */
     public function removeContentTypeDraftFieldDefinition($contentTypeId, $fieldDefinitionId, Request $request)
     {
@@ -697,9 +697,9 @@ public function removeContentTypeDraftFieldDefinition($contentTypeId, $fieldDefi
      *
      * @param $contentTypeId
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RestContentType
+     * @return \Ibexa\Rest\Server\Values\RestContentType
      */
     public function publishContentTypeDraft($contentTypeId)
     {
@@ -725,9 +725,9 @@ public function publishContentTypeDraft($contentTypeId)
      *
      * @param $contentTypeId
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\NoContent
+     * @return \Ibexa\Rest\Server\Values\NoContent
      */
     public function deleteContentType($contentTypeId)
     {
@@ -747,7 +747,7 @@ public function deleteContentType($contentTypeId)
      *
      * @param $contentTypeId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\NoContent
+     * @return \Ibexa\Rest\Server\Values\NoContent
      */
     public function deleteContentTypeDraft($contentTypeId)
     {
@@ -762,7 +762,7 @@ public function deleteContentTypeDraft($contentTypeId)
      *
      * @param $contentTypeId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\ContentTypeGroupRefList
+     * @return \Ibexa\Rest\Server\Values\ContentTypeGroupRefList
      */
     public function loadGroupsOfContentType($contentTypeId)
     {
@@ -779,10 +779,10 @@ public function loadGroupsOfContentType($contentTypeId)
      *
      * @param mixed $contentTypeId
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\BadRequestException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Rest\Server\Exceptions\BadRequestException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\ContentTypeGroupRefList
+     * @return \Ibexa\Rest\Server\Values\ContentTypeGroupRefList
      */
     public function linkContentTypeToGroup($contentTypeId, Request $request)
     {
@@ -832,10 +832,10 @@ public function linkContentTypeToGroup($contentTypeId, Request $request)
      * @param $contentTypeId
      * @param $contentTypeGroupId
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
-     * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\ContentTypeGroupRefList
+     * @return \Ibexa\Rest\Server\Values\ContentTypeGroupRefList
      */
     public function unlinkContentTypeFromGroup($contentTypeId, $contentTypeGroupId)
     {
@@ -875,9 +875,9 @@ public function unlinkContentTypeFromGroup($contentTypeId, $contentTypeGroupId)
     /**
      * Converts the provided ContentTypeGroupCreateStruct to ContentTypeGroupUpdateStruct.
      *
-     * @param \eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroupCreateStruct $createStruct
+     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroupCreateStruct $createStruct
      *
-     * @return \eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroupUpdateStruct
+     * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroupUpdateStruct
      */
     private function mapToGroupUpdateStruct(ContentTypeGroupCreateStruct $createStruct)
     {
@@ -896,7 +896,7 @@ private function mapToGroupUpdateStruct(ContentTypeGroupCreateStruct $createStru
      *
      * @return mixed
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\BadRequestException
+     * @throws \Ibexa\Rest\Server\Exceptions\BadRequestException
      */
     protected function sortContentTypeList(array &$contentTypes, $orderby, $sort = 'asc')
     {
@@ -905,14 +905,14 @@ protected function sortContentTypeList(array &$contentTypes, $orderby, $sort = '
                 if ($sort === 'asc' || $sort === null) {
                     usort(
                         $contentTypes,
-                        function (APIContentType $contentType1, APIContentType $contentType2) {
+                        static function (APIContentType $contentType1, APIContentType $contentType2) {
                             return strcasecmp($contentType1->identifier, $contentType2->identifier);
                         }
                     );
                 } elseif ($sort === 'desc') {
                     usort(
                         $contentTypes,
-                        function (APIContentType $contentType1, APIContentType $contentType2) {
+                        static function (APIContentType $contentType1, APIContentType $contentType2) {
                             return strcasecmp($contentType1->identifier, $contentType2->identifier) * -1;
                         }
                     );
@@ -924,7 +924,7 @@ function (APIContentType $contentType1, APIContentType $contentType2) {
                 if ($sort === 'asc' || $sort === null) {
                     usort(
                         $contentTypes,
-                        function ($timeObj3, $timeObj4) {
+                        static function ($timeObj3, $timeObj4) {
                             $timeObj3 = strtotime($timeObj3->modificationDate->format('Y-m-d H:i:s'));
                             $timeObj4 = strtotime($timeObj4->modificationDate->format('Y-m-d H:i:s'));
 
@@ -934,7 +934,7 @@ function ($timeObj3, $timeObj4) {
                 } elseif ($sort === 'desc') {
                     usort(
                         $contentTypes,
-                        function ($timeObj3, $timeObj4) {
+                        static function ($timeObj3, $timeObj4) {
                             $timeObj3 = strtotime($timeObj3->modificationDate->format('Y-m-d H:i:s'));
                             $timeObj4 = strtotime($timeObj4->modificationDate->format('Y-m-d H:i:s'));
 
diff --git a/src/lib/Server/Controller/JWT.php b/src/lib/Server/Controller/JWT.php
index 8cd0a265..f6039cd5 100644
--- a/src/lib/Server/Controller/JWT.php
+++ b/src/lib/Server/Controller/JWT.php
@@ -1,19 +1,19 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Controller;
 
-use eZ\Publish\Core\Base\Exceptions\UnauthorizedException;
-use eZ\Publish\Core\MVC\Symfony\Security\Authentication\AuthenticatorInterface;
+use Ibexa\Core\Base\Exceptions\UnauthorizedException;
+use Ibexa\Core\MVC\Symfony\Security\Authentication\AuthenticatorInterface;
 use Ibexa\Rest\Message;
 use Ibexa\Rest\Server\Controller as RestController;
-use Ibexa\Rest\Server\Values;
 use Ibexa\Rest\Server\Security\JWTUser;
+use Ibexa\Rest\Server\Values;
 use Lexik\Bundle\JWTAuthenticationBundle\Services\JWTTokenManagerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
@@ -26,7 +26,7 @@ final class JWT extends RestController
     /** @var \Lexik\Bundle\JWTAuthenticationBundle\Services\JWTTokenManagerInterface */
     private $tokenManager;
 
-    /** @var \eZ\Publish\Core\MVC\Symfony\Security\Authentication\AuthenticatorInterface|null */
+    /** @var \Ibexa\Core\MVC\Symfony\Security\Authentication\AuthenticatorInterface|null */
     private $authenticator;
 
     public function __construct(
@@ -39,7 +39,7 @@ public function __construct(
 
     public function createToken(Request $request): Values\JWT
     {
-        /** @var \EzSystems\EzPlatformRest\Server\Values\JWTInput $jwtTokenInput */
+        /** @var \Ibexa\Rest\Server\Values\JWTInput $jwtTokenInput */
         $jwtTokenInput = $this->inputDispatcher->parse(
             new Message(
                 ['Content-Type' => $request->headers->get('Content-Type')],
diff --git a/src/lib/Server/Controller/Location.php b/src/lib/Server/Controller/Location.php
index 0d27dd7d..85547a20 100644
--- a/src/lib/Server/Controller/Location.php
+++ b/src/lib/Server/Controller/Location.php
@@ -1,22 +1,22 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Controller;
 
-use eZ\Publish\API\Repository\URLAliasService;
-use Ibexa\Rest\Message;
+use Ibexa\Contracts\Core\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException;
+use Ibexa\Contracts\Core\Repository\LocationService;
+use Ibexa\Contracts\Core\Repository\TrashService;
+use Ibexa\Contracts\Core\Repository\URLAliasService;
 use Ibexa\Contracts\Rest\Exceptions;
-use Ibexa\Rest\Server\Values;
+use Ibexa\Rest\Message;
 use Ibexa\Rest\Server\Controller as RestController;
-use eZ\Publish\API\Repository\LocationService;
-use eZ\Publish\API\Repository\ContentService;
-use eZ\Publish\API\Repository\TrashService;
-use eZ\Publish\API\Repository\Exceptions\InvalidArgumentException;
 use Ibexa\Rest\Server\Exceptions\BadRequestException;
 use Ibexa\Rest\Server\Exceptions\ForbiddenException;
+use Ibexa\Rest\Server\Values;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -27,38 +27,38 @@ class Location extends RestController
     /**
      * Location service.
      *
-     * @var \eZ\Publish\API\Repository\LocationService
+     * @var \Ibexa\Contracts\Core\Repository\LocationService
      */
     protected $locationService;
 
     /**
      * Content service.
      *
-     * @var \eZ\Publish\API\Repository\ContentService
+     * @var \Ibexa\Contracts\Core\Repository\ContentService
      */
     protected $contentService;
 
     /**
      * Trash service.
      *
-     * @var \eZ\Publish\API\Repository\TrashService
+     * @var \Ibexa\Contracts\Core\Repository\TrashService
      */
     protected $trashService;
 
     /**
      * URLAlias Service.
      *
-     * @var \eZ\Publish\API\Repository\URLAliasService
+     * @var \Ibexa\Contracts\Core\Repository\URLAliasService
      */
     protected $urlAliasService;
 
     /**
      * Construct controller.
      *
-     * @param \eZ\Publish\API\Repository\LocationService $locationService
-     * @param \eZ\Publish\API\Repository\ContentService $contentService
-     * @param \eZ\Publish\API\Repository\TrashService $trashService
-     * @param \eZ\Publish\API\Repository\URLAliasService $urlAliasService
+     * @param \Ibexa\Contracts\Core\Repository\LocationService $locationService
+     * @param \Ibexa\Contracts\Core\Repository\ContentService $contentService
+     * @param \Ibexa\Contracts\Core\Repository\TrashService $trashService
+     * @param \Ibexa\Contracts\Core\Repository\URLAliasService $urlAliasService
      */
     public function __construct(
         LocationService $locationService,
@@ -75,9 +75,9 @@ public function __construct(
     /**
      * Loads the location for a given ID (x)or remote ID.
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\BadRequestException
+     * @throws \Ibexa\Rest\Server\Exceptions\BadRequestException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\TemporaryRedirect
+     * @return \Ibexa\Rest\Server\Values\TemporaryRedirect
      */
     public function redirectLocation(Request $request)
     {
@@ -107,9 +107,9 @@ public function redirectLocation(Request $request)
      *
      * @param mixed $contentId
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\CreatedLocation
+     * @return \Ibexa\Rest\Server\Values\CreatedLocation
      */
     public function createLocation($contentId, Request $request)
     {
@@ -136,7 +136,7 @@ public function createLocation($contentId, Request $request)
      *
      * @param string $locationPath
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RestLocation
+     * @return \Ibexa\Rest\Server\Values\RestLocation
      */
     public function loadLocation($locationPath)
     {
@@ -164,7 +164,7 @@ public function loadLocation($locationPath)
      *
      * @param string $locationPath
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\NoContent
+     * @return \Ibexa\Rest\Server\Values\NoContent
      */
     public function deleteSubtree($locationPath)
     {
@@ -181,7 +181,7 @@ public function deleteSubtree($locationPath)
      *
      * @param string $locationPath
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\ResourceCreated
+     * @return \Ibexa\Rest\Server\Values\ResourceCreated
      */
     public function copySubtree($locationPath, Request $request)
     {
@@ -215,9 +215,9 @@ public function copySubtree($locationPath, Request $request)
      *
      * @param string $locationPath
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\BadRequestException if the Destination header cannot be parsed as location or trash
+     * @throws \Ibexa\Rest\Server\Exceptions\BadRequestException if the Destination header cannot be parsed as location or trash
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\ResourceCreated|\EzSystems\EzPlatformRest\Server\Values\NoContent
+     * @return \Ibexa\Rest\Server\Values\ResourceCreated|\Ibexa\Rest\Server\Values\NoContent
      */
     public function moveSubtree($locationPath, Request $request)
     {
@@ -282,7 +282,7 @@ public function moveSubtree($locationPath, Request $request)
      *
      * @param string $locationPath
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\NoContent
+     * @return \Ibexa\Rest\Server\Values\NoContent
      */
     public function swapLocation($locationPath, Request $request)
     {
@@ -308,7 +308,7 @@ public function swapLocation($locationPath, Request $request)
      *
      * @todo remove, or use in loadLocation with filter
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\LocationList
+     * @return \Ibexa\Rest\Server\Values\LocationList
      */
     public function loadLocationByRemoteId(Request $request)
     {
@@ -330,7 +330,7 @@ public function loadLocationByRemoteId(Request $request)
      *
      * @param mixed $contentId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\LocationList
+     * @return \Ibexa\Rest\Server\Values\LocationList
      */
     public function loadLocationsForContent($contentId, Request $request)
     {
@@ -355,7 +355,7 @@ public function loadLocationsForContent($contentId, Request $request)
      *
      * @param string $locationPath
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\LocationList
+     * @return \Ibexa\Rest\Server\Values\LocationList
      */
     public function loadLocationChildren($locationPath, Request $request)
     {
@@ -401,7 +401,7 @@ private function extractLocationIdFromPath($path)
      *
      * @param string $locationPath
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RestLocation
+     * @return \Ibexa\Rest\Server\Values\RestLocation
      */
     public function updateLocation($locationPath, Request $request)
     {
diff --git a/src/lib/Server/Controller/ObjectState.php b/src/lib/Server/Controller/ObjectState.php
index 7b18ece7..9ef65513 100644
--- a/src/lib/Server/Controller/ObjectState.php
+++ b/src/lib/Server/Controller/ObjectState.php
@@ -1,22 +1,22 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Controller;
 
-use eZ\Publish\API\Repository\Values\Content\Language;
+use Ibexa\Contracts\Core\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException;
+use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
+use Ibexa\Contracts\Core\Repository\ObjectStateService;
+use Ibexa\Contracts\Core\Repository\Values\Content\Language;
 use Ibexa\Rest\Message;
-use Ibexa\Rest\Server\Values;
-use Ibexa\Rest\Values\RestObjectState;
 use Ibexa\Rest\Server\Controller as RestController;
-use eZ\Publish\API\Repository\ObjectStateService;
-use eZ\Publish\API\Repository\ContentService;
-use Ibexa\Rest\Values\ContentObjectStates;
-use eZ\Publish\API\Repository\Exceptions\NotFoundException;
-use eZ\Publish\API\Repository\Exceptions\InvalidArgumentException;
 use Ibexa\Rest\Server\Exceptions\ForbiddenException;
+use Ibexa\Rest\Server\Values;
+use Ibexa\Rest\Values\ContentObjectStates;
+use Ibexa\Rest\Values\RestObjectState;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -27,22 +27,22 @@ class ObjectState extends RestController
     /**
      * ObjectState service.
      *
-     * @var \eZ\Publish\API\Repository\ObjectStateService
+     * @var \Ibexa\Contracts\Core\Repository\ObjectStateService
      */
     protected $objectStateService;
 
     /**
      * Content service.
      *
-     * @var \eZ\Publish\API\Repository\ContentService
+     * @var \Ibexa\Contracts\Core\Repository\ContentService
      */
     protected $contentService;
 
     /**
      * Construct controller.
      *
-     * @param \eZ\Publish\API\Repository\ObjectStateService $objectStateService
-     * @param \eZ\Publish\API\Repository\ContentService $contentService
+     * @param \Ibexa\Contracts\Core\Repository\ObjectStateService $objectStateService
+     * @param \Ibexa\Contracts\Core\Repository\ContentService $contentService
      */
     public function __construct(ObjectStateService $objectStateService, ContentService $contentService)
     {
@@ -53,9 +53,9 @@ public function __construct(ObjectStateService $objectStateService, ContentServi
     /**
      * Creates a new object state group.
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\CreatedObjectStateGroup
+     * @return \Ibexa\Rest\Server\Values\CreatedObjectStateGroup
      */
     public function createObjectStateGroup(Request $request)
     {
@@ -84,9 +84,9 @@ public function createObjectStateGroup(Request $request)
      *
      * @param $objectStateGroupId
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\CreatedObjectState
+     * @return \Ibexa\Rest\Server\Values\CreatedObjectState
      */
     public function createObjectState($objectStateGroupId, Request $request)
     {
@@ -121,7 +121,7 @@ public function createObjectState($objectStateGroupId, Request $request)
      *
      * @param $objectStateGroupId
      *
-     * @return \eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroup
+     * @return \Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroup
      */
     public function loadObjectStateGroup($objectStateGroupId)
     {
@@ -134,7 +134,7 @@ public function loadObjectStateGroup($objectStateGroupId)
      * @param $objectStateGroupId
      * @param $objectStateId
      *
-     * @return \EzSystems\EzPlatformRest\Values\RestObjectState
+     * @return \Ibexa\Rest\Values\RestObjectState
      */
     public function loadObjectState($objectStateGroupId, $objectStateId)
     {
@@ -147,7 +147,7 @@ public function loadObjectState($objectStateGroupId, $objectStateId)
     /**
      * Returns a list of all object state groups.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\ObjectStateGroupList
+     * @return \Ibexa\Rest\Server\Values\ObjectStateGroupList
      */
     public function loadObjectStateGroups()
     {
@@ -161,7 +161,7 @@ public function loadObjectStateGroups()
      *
      * @param $objectStateGroupId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\ObjectStateList
+     * @return \Ibexa\Rest\Server\Values\ObjectStateList
      */
     public function loadObjectStates($objectStateGroupId)
     {
@@ -178,7 +178,7 @@ public function loadObjectStates($objectStateGroupId)
      *
      * @param $objectStateGroupId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\NoContent
+     * @return \Ibexa\Rest\Server\Values\NoContent
      */
     public function deleteObjectStateGroup($objectStateGroupId)
     {
@@ -194,7 +194,7 @@ public function deleteObjectStateGroup($objectStateGroupId)
      *
      * @param $objectStateId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\NoContent
+     * @return \Ibexa\Rest\Server\Values\NoContent
      */
     public function deleteObjectState($objectStateId)
     {
@@ -210,9 +210,9 @@ public function deleteObjectState($objectStateId)
      *
      * @param $objectStateGroupId
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
      *
-     * @return \eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroup
+     * @return \Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroup
      */
     public function updateObjectStateGroup($objectStateGroupId, Request $request)
     {
@@ -240,9 +240,9 @@ public function updateObjectStateGroup($objectStateGroupId, Request $request)
      * @param $objectStateGroupId
      * @param $objectStateId
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
      *
-     * @return \EzSystems\EzPlatformRest\Values\RestObjectState
+     * @return \Ibexa\Rest\Values\RestObjectState
      */
     public function updateObjectState($objectStateGroupId, $objectStateId, Request $request)
     {
@@ -269,7 +269,7 @@ public function updateObjectState($objectStateGroupId, $objectStateId, Request $
      *
      * @param $contentId
      *
-     * @return \EzSystems\EzPlatformRest\Values\ContentObjectStates
+     * @return \Ibexa\Rest\Values\ContentObjectStates
      */
     public function getObjectStatesForContent($contentId)
     {
@@ -296,9 +296,9 @@ public function getObjectStatesForContent($contentId)
      *
      * @param $contentId
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
      *
-     * @return \EzSystems\EzPlatformRest\Values\ContentObjectStates
+     * @return \Ibexa\Rest\Values\ContentObjectStates
      */
     public function setObjectStatesForContent($contentId, Request $request)
     {
diff --git a/src/lib/Server/Controller/Options.php b/src/lib/Server/Controller/Options.php
index f8f69077..4b8a4fe1 100644
--- a/src/lib/Server/Controller/Options.php
+++ b/src/lib/Server/Controller/Options.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Controller;
 
-use Ibexa\Rest\Server\Values;
 use Ibexa\Rest\Server\Controller as RestController;
+use Ibexa\Rest\Server\Values;
 
 /**
  * Root controller.
diff --git a/src/lib/Server/Controller/Role.php b/src/lib/Server/Controller/Role.php
index 777cec12..859f07f9 100644
--- a/src/lib/Server/Controller/Role.php
+++ b/src/lib/Server/Controller/Role.php
@@ -1,27 +1,27 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Controller;
 
-use eZ\Publish\API\Repository\Exceptions\LimitationValidationException;
-use eZ\Publish\API\Repository\Exceptions\NotFoundException;
-use eZ\Publish\Core\Base\Exceptions\ForbiddenException;
-use eZ\Publish\Core\Base\Exceptions\InvalidArgumentException;
-use eZ\Publish\Core\Base\Exceptions\UnauthorizedException;
-use Ibexa\Rest\Message;
+use Ibexa\Contracts\Core\Repository\Exceptions\LimitationValidationException;
+use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
+use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException as APINotFoundException;
+use Ibexa\Contracts\Core\Repository\LocationService;
+use Ibexa\Contracts\Core\Repository\RoleService;
+use Ibexa\Contracts\Core\Repository\UserService;
+use Ibexa\Contracts\Core\Repository\Values\User\RoleCreateStruct;
+use Ibexa\Contracts\Core\Repository\Values\User\RoleUpdateStruct;
 use Ibexa\Contracts\Rest\Exceptions;
+use Ibexa\Core\Base\Exceptions\ForbiddenException;
+use Ibexa\Core\Base\Exceptions\InvalidArgumentException;
+use Ibexa\Core\Base\Exceptions\UnauthorizedException;
+use Ibexa\Rest\Message;
+use Ibexa\Rest\Server\Controller as RestController;
 use Ibexa\Rest\Server\Exceptions\BadRequestException;
 use Ibexa\Rest\Server\Values;
-use Ibexa\Rest\Server\Controller as RestController;
-use eZ\Publish\API\Repository\RoleService;
-use eZ\Publish\API\Repository\UserService;
-use eZ\Publish\API\Repository\LocationService;
-use eZ\Publish\API\Repository\Values\User\RoleCreateStruct;
-use eZ\Publish\API\Repository\Values\User\RoleUpdateStruct;
-use eZ\Publish\API\Repository\Exceptions\NotFoundException as APINotFoundException;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -32,30 +32,30 @@ class Role extends RestController
     /**
      * Role service.
      *
-     * @var \eZ\Publish\API\Repository\RoleService
+     * @var \Ibexa\Contracts\Core\Repository\RoleService
      */
     protected $roleService;
 
     /**
      * User service.
      *
-     * @var \eZ\Publish\API\Repository\UserService
+     * @var \Ibexa\Contracts\Core\Repository\UserService
      */
     protected $userService;
 
     /**
      * Location service.
      *
-     * @var \eZ\Publish\API\Repository\LocationService
+     * @var \Ibexa\Contracts\Core\Repository\LocationService
      */
     protected $locationService;
 
     /**
      * Construct controller.
      *
-     * @param \eZ\Publish\API\Repository\RoleService $roleService
-     * @param \eZ\Publish\API\Repository\UserService $userService
-     * @param \eZ\Publish\API\Repository\LocationService $locationService
+     * @param \Ibexa\Contracts\Core\Repository\RoleService $roleService
+     * @param \Ibexa\Contracts\Core\Repository\UserService $userService
+     * @param \Ibexa\Contracts\Core\Repository\LocationService $locationService
      */
     public function __construct(
         RoleService $roleService,
@@ -72,7 +72,7 @@ public function __construct(
      *
      * Defaults to publishing the role, but you can create a draft instead by setting the POST parameter publish=false
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\CreatedRole
+     * @return \Ibexa\Rest\Server\Values\CreatedRole
      */
     public function createRole(Request $request)
     {
@@ -126,11 +126,11 @@ public function createRole(Request $request)
      *
      * @since 6.2
      *
-     * @throws \eZ\Publish\API\Repository\Exceptions\ForbiddenException if the Role already has a Role Draft that will need to be removed first,
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\ForbiddenException if the Role already has a Role Draft that will need to be removed first,
      *                                                                  or if the authenticated user is not allowed to create a role
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\BadRequestException if a policy limitation in the $roleCreateStruct is not valid
+     * @throws \Ibexa\Rest\Server\Exceptions\BadRequestException if a policy limitation in the $roleCreateStruct is not valid
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\CreatedRole
+     * @return \Ibexa\Rest\Server\Values\CreatedRole
      */
     public function createRoleDraft($roleId, Request $request)
     {
@@ -154,7 +154,7 @@ public function createRoleDraft($roleId, Request $request)
     /**
      * Loads list of roles.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RoleList
+     * @return \Ibexa\Rest\Server\Values\RoleList
      */
     public function listRoles(Request $request)
     {
@@ -185,7 +185,7 @@ public function listRoles(Request $request)
      *
      * @param $roleId
      *
-     * @return \eZ\Publish\API\Repository\Values\User\Role
+     * @return \Ibexa\Contracts\Core\Repository\Values\User\Role
      */
     public function loadRole($roleId)
     {
@@ -197,7 +197,7 @@ public function loadRole($roleId)
      *
      * @param mixed $roleId Original role ID, or ID of the role draft itself
      *
-     * @return \eZ\Publish\API\Repository\Values\User\RoleDraft
+     * @return \Ibexa\Contracts\Core\Repository\Values\User\RoleDraft
      */
     public function loadRoleDraft($roleId)
     {
@@ -216,7 +216,7 @@ public function loadRoleDraft($roleId)
      *
      * @param $roleId
      *
-     * @return \eZ\Publish\API\Repository\Values\User\Role
+     * @return \Ibexa\Contracts\Core\Repository\Values\User\Role
      */
     public function updateRole($roleId, Request $request)
     {
@@ -244,7 +244,7 @@ public function updateRole($roleId, Request $request)
      *
      * @param mixed $roleId Original role ID, or ID of the role draft itself
      *
-     * @return \eZ\Publish\API\Repository\Values\User\RoleDraft
+     * @return \Ibexa\Contracts\Core\Repository\Values\User\RoleDraft
      */
     public function updateRoleDraft($roleId, Request $request)
     {
@@ -272,7 +272,7 @@ public function updateRoleDraft($roleId, Request $request)
      *
      * @param mixed $roleId Original role ID, or ID of the role draft itself
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\PublishedRole
+     * @return \Ibexa\Rest\Server\Values\PublishedRole
      */
     public function publishRoleDraft($roleId)
     {
@@ -297,7 +297,7 @@ public function publishRoleDraft($roleId)
      *
      * @param $roleId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\NoContent
+     * @return \Ibexa\Rest\Server\Values\NoContent
      */
     public function deleteRole($roleId)
     {
@@ -315,7 +315,7 @@ public function deleteRole($roleId)
      *
      * @param $roleId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\NoContent
+     * @return \Ibexa\Rest\Server\Values\NoContent
      */
     public function deleteRoleDraft($roleId)
     {
@@ -331,7 +331,7 @@ public function deleteRoleDraft($roleId)
      *
      * @param $roleId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\PolicyList
+     * @return \Ibexa\Rest\Server\Values\PolicyList
      */
     public function loadPolicies($roleId, Request $request)
     {
@@ -345,13 +345,13 @@ public function loadPolicies($roleId, Request $request)
      *
      * @param $roleId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\NoContent
+     * @return \Ibexa\Rest\Server\Values\NoContent
      */
     public function deletePolicies($roleId)
     {
         $loadedRole = $this->roleService->loadRole($roleId);
         $roleDraft = $this->roleService->createRoleDraft($loadedRole);
-        /** @var \eZ\Publish\API\Repository\Values\User\PolicyDraft $policyDraft */
+        /** @var \Ibexa\Contracts\Core\Repository\Values\User\PolicyDraft $policyDraft */
         foreach ($roleDraft->getPolicies() as $policyDraft) {
             $this->roleService->removePolicyByRoleDraft($roleDraft, $policyDraft);
         }
@@ -366,9 +366,9 @@ public function deletePolicies($roleId)
      * @param $roleId
      * @param $policyId
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException
      *
-     * @return \eZ\Publish\API\Repository\Values\User\Policy
+     * @return \Ibexa\Contracts\Core\Repository\Values\User\Policy
      */
     public function loadPolicy($roleId, $policyId, Request $request)
     {
@@ -387,7 +387,7 @@ public function loadPolicy($roleId, $policyId, Request $request)
      *
      * @param int $roleId ID of a role draft
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\CreatedPolicy
+     * @return \Ibexa\Rest\Server\Values\CreatedPolicy
      */
     public function addPolicy($roleId, Request $request)
     {
@@ -434,7 +434,7 @@ public function addPolicy($roleId, Request $request)
      *
      * @param $role \eZ\Publish\API\Repository\Values\User\Role
      *
-     * @return \eZ\Publish\API\Repository\Values\User\Policy
+     * @return \Ibexa\Contracts\Core\Repository\Values\User\Policy
      */
     private function getLastAddedPolicy($role)
     {
@@ -456,9 +456,9 @@ private function getLastAddedPolicy($role)
      * @param int $roleId ID of a role draft
      * @param int $policyId ID of a policy
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException
      *
-     * @return \eZ\Publish\API\Repository\Values\User\Policy
+     * @return \Ibexa\Contracts\Core\Repository\Values\User\Policy
      */
     public function updatePolicy($roleId, $policyId, Request $request)
     {
@@ -521,9 +521,9 @@ public function updatePolicy($roleId, $policyId, Request $request)
      * @param int $roleId ID of a role draft
      * @param int $policyId ID of a policy
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\NoContent
+     * @return \Ibexa\Rest\Server\Values\NoContent
      */
     public function deletePolicy($roleId, $policyId, Request $request)
     {
@@ -569,7 +569,7 @@ public function deletePolicy($roleId, $policyId, Request $request)
      *
      * @param $userId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RoleAssignmentList
+     * @return \Ibexa\Rest\Server\Values\RoleAssignmentList
      */
     public function assignRoleToUser($userId, Request $request)
     {
@@ -599,7 +599,7 @@ public function assignRoleToUser($userId, Request $request)
      *
      * @param $groupPath
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RoleAssignmentList
+     * @return \Ibexa\Rest\Server\Values\RoleAssignmentList
      */
     public function assignRoleToUserGroup($groupPath, Request $request)
     {
@@ -633,7 +633,7 @@ public function assignRoleToUserGroup($groupPath, Request $request)
      * @param $userId
      * @param $roleId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RoleAssignmentList
+     * @return \Ibexa\Rest\Server\Values\RoleAssignmentList
      */
     public function unassignRoleFromUser($userId, $roleId)
     {
@@ -656,7 +656,7 @@ public function unassignRoleFromUser($userId, $roleId)
      * @param $groupPath
      * @param $roleId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RoleAssignmentList
+     * @return \Ibexa\Rest\Server\Values\RoleAssignmentList
      */
     public function unassignRoleFromUserGroup($groupPath, $roleId)
     {
@@ -680,7 +680,7 @@ public function unassignRoleFromUserGroup($groupPath, $roleId)
      *
      * @param $userId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RoleAssignmentList
+     * @return \Ibexa\Rest\Server\Values\RoleAssignmentList
      */
     public function loadRoleAssignmentsForUser($userId)
     {
@@ -696,7 +696,7 @@ public function loadRoleAssignmentsForUser($userId)
      *
      * @param $groupPath
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RoleAssignmentList
+     * @return \Ibexa\Rest\Server\Values\RoleAssignmentList
      */
     public function loadRoleAssignmentsForUserGroup($groupPath)
     {
@@ -715,9 +715,9 @@ public function loadRoleAssignmentsForUserGroup($groupPath)
      * @param $userId
      * @param $roleId
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RestUserRoleAssignment
+     * @return \Ibexa\Rest\Server\Values\RestUserRoleAssignment
      */
     public function loadRoleAssignmentForUser($userId, $roleId, Request $request)
     {
@@ -739,9 +739,9 @@ public function loadRoleAssignmentForUser($userId, $roleId, Request $request)
      * @param $groupPath
      * @param $roleId
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RestUserGroupRoleAssignment
+     * @return \Ibexa\Rest\Server\Values\RestUserGroupRoleAssignment
      */
     public function loadRoleAssignmentForUserGroup($groupPath, $roleId, Request $request)
     {
@@ -762,7 +762,7 @@ public function loadRoleAssignmentForUserGroup($groupPath, $roleId, Request $req
     /**
      * Search all policies which are applied to a given user.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\PolicyList
+     * @return \Ibexa\Rest\Server\Values\PolicyList
      */
     public function listPoliciesForUser(Request $request)
     {
@@ -785,9 +785,9 @@ public function listPoliciesForUser(Request $request)
      *
      * Needed since both structs are encoded into the same media type on input.
      *
-     * @param \eZ\Publish\API\Repository\Values\User\RoleCreateStruct $createStruct
+     * @param \Ibexa\Contracts\Core\Repository\Values\User\RoleCreateStruct $createStruct
      *
-     * @return \eZ\Publish\API\Repository\Values\User\RoleUpdateStruct
+     * @return \Ibexa\Contracts\Core\Repository\Values\User\RoleUpdateStruct
      */
     protected function mapToUpdateStruct(RoleCreateStruct $createStruct)
     {
diff --git a/src/lib/Server/Controller/Root.php b/src/lib/Server/Controller/Root.php
index f2512d35..3041ade5 100644
--- a/src/lib/Server/Controller/Root.php
+++ b/src/lib/Server/Controller/Root.php
@@ -1,14 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Controller;
 
 use Ibexa\Contracts\Rest\Exceptions\NotFoundException;
 use Ibexa\Rest\Server\Controller as RestController;
-use Ibexa\Rest\Server\Service\RootResourceBuilderInterface;
 
 /**
  * Root controller.
@@ -16,7 +15,7 @@
 class Root extends RestController
 {
     /**
-     * @var RootResourceBuilderInterface
+     * @var \Ibexa\Rest\Server\Service\RootResourceBuilderInterface
      */
     private $rootResourceBuilder;
 
@@ -28,7 +27,7 @@ public function __construct($rootResourceBuilder)
     /**
      * List the root resources of the eZ Publish installation.
      *
-     * @return \EzSystems\EzPlatformRest\Values\Root
+     * @return \Ibexa\Rest\Values\Root
      */
     public function loadRootResource()
     {
@@ -38,7 +37,7 @@ public function loadRootResource()
     /**
      * Catch-all for REST requests.
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException
      */
     public function catchAll()
     {
diff --git a/src/lib/Server/Controller/Section.php b/src/lib/Server/Controller/Section.php
index 32a31696..34bb8b2d 100644
--- a/src/lib/Server/Controller/Section.php
+++ b/src/lib/Server/Controller/Section.php
@@ -1,20 +1,20 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Controller;
 
+use Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException;
+use Ibexa\Contracts\Core\Repository\SectionService;
+use Ibexa\Contracts\Core\Repository\Values\Content\SectionCreateStruct;
+use Ibexa\Contracts\Core\Repository\Values\Content\SectionUpdateStruct;
 use Ibexa\Rest\Message;
-use Ibexa\Rest\Server\Values;
 use Ibexa\Rest\Server\Controller as RestController;
-use eZ\Publish\API\Repository\SectionService;
-use eZ\Publish\API\Repository\Values\Content\SectionCreateStruct;
-use eZ\Publish\API\Repository\Values\Content\SectionUpdateStruct;
-use Ibexa\Rest\Server\Values\NoContent;
-use eZ\Publish\API\Repository\Exceptions\InvalidArgumentException;
 use Ibexa\Rest\Server\Exceptions\ForbiddenException;
+use Ibexa\Rest\Server\Values;
+use Ibexa\Rest\Server\Values\NoContent;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -25,14 +25,14 @@ class Section extends RestController
     /**
      * Section service.
      *
-     * @var \eZ\Publish\API\Repository\SectionService
+     * @var \Ibexa\Contracts\Core\Repository\SectionService
      */
     protected $sectionService;
 
     /**
      * Construct controller.
      *
-     * @param \eZ\Publish\API\Repository\SectionService $sectionService
+     * @param \Ibexa\Contracts\Core\Repository\SectionService $sectionService
      */
     public function __construct(SectionService $sectionService)
     {
@@ -42,7 +42,7 @@ public function __construct(SectionService $sectionService)
     /**
      * List sections.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\SectionList
+     * @return \Ibexa\Rest\Server\Values\SectionList
      */
     public function listSections(Request $request)
     {
@@ -60,7 +60,7 @@ public function listSections(Request $request)
     /**
      * Loads section by identifier.
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Section
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Section
      */
     public function loadSectionByIdentifier(Request $request)
     {
@@ -73,9 +73,9 @@ public function loadSectionByIdentifier(Request $request)
     /**
      * Create new section.
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\CreatedSection
+     * @return \Ibexa\Rest\Server\Values\CreatedSection
      */
     public function createSection(Request $request)
     {
@@ -104,7 +104,7 @@ public function createSection(Request $request)
      *
      * @param $sectionId
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Section
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Section
      */
     public function loadSection($sectionId)
     {
@@ -116,9 +116,9 @@ public function loadSection($sectionId)
      *
      * @param $sectionId
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Section
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Section
      */
     public function updateSection($sectionId, Request $request)
     {
@@ -144,7 +144,7 @@ public function updateSection($sectionId, Request $request)
      *
      * @param $sectionId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\NoContent
+     * @return \Ibexa\Rest\Server\Values\NoContent
      */
     public function deleteSection($sectionId)
     {
@@ -160,9 +160,9 @@ public function deleteSection($sectionId)
      *
      * Needed since both structs are encoded into the same media type on input.
      *
-     * @param \eZ\Publish\API\Repository\Values\Content\SectionCreateStruct $createStruct
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\SectionCreateStruct $createStruct
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\SectionUpdateStruct
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\SectionUpdateStruct
      */
     protected function mapToUpdateStruct(SectionCreateStruct $createStruct)
     {
diff --git a/src/lib/Server/Controller/Services.php b/src/lib/Server/Controller/Services.php
index aa71d733..d1cde104 100644
--- a/src/lib/Server/Controller/Services.php
+++ b/src/lib/Server/Controller/Services.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Controller;
diff --git a/src/lib/Server/Controller/SessionController.php b/src/lib/Server/Controller/SessionController.php
index 77a88faf..308803d5 100644
--- a/src/lib/Server/Controller/SessionController.php
+++ b/src/lib/Server/Controller/SessionController.php
@@ -1,42 +1,41 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Controller;
 
-use eZ\Publish\API\Repository\PermissionResolver;
-use eZ\Publish\API\Repository\UserService;
-use eZ\Publish\Core\Base\Exceptions\UnauthorizedException;
-use eZ\Publish\Core\MVC\Symfony\Security\Authentication\AuthenticatorInterface;
-use Ibexa\Contracts\Rest\Exceptions\NotFoundException;
+use Ibexa\Contracts\Core\Repository\PermissionResolver;
+use Ibexa\Contracts\Core\Repository\UserService;
+use Ibexa\Core\Base\Exceptions\UnauthorizedException;
+use Ibexa\Core\MVC\Symfony\Security\Authentication\AuthenticatorInterface;
 use Ibexa\Rest\Message;
 use Ibexa\Rest\Server\Controller;
-use Ibexa\Rest\Server\Values;
 use Ibexa\Rest\Server\Exceptions;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Security\Csrf\CsrfToken;
 use Ibexa\Rest\Server\Security\CsrfTokenManager;
+use Ibexa\Rest\Server\Values;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
+use Symfony\Component\Security\Csrf\CsrfToken;
 use Symfony\Component\Security\Csrf\TokenStorage\TokenStorageInterface;
 
 class SessionController extends Controller
 {
-    /** @var \eZ\Publish\Core\MVC\Symfony\Security\Authentication\AuthenticatorInterface|null */
+    /** @var \Ibexa\Core\MVC\Symfony\Security\Authentication\AuthenticatorInterface|null */
     private $authenticator;
 
-    /** @var \EzSystems\EzPlatformRest\Server\Security\CsrfTokenManager */
+    /** @var \Ibexa\Rest\Server\Security\CsrfTokenManager */
     private $csrfTokenManager;
 
     /** @var string */
     private $csrfTokenIntention;
 
-    /** @var \eZ\Publish\API\Repository\PermissionResolver */
+    /** @var \Ibexa\Contracts\Core\Repository\PermissionResolver */
     private $permissionResolver;
 
-    /** @var \eZ\Publish\API\Repository\UserService */
+    /** @var \Ibexa\Contracts\Core\Repository\UserService */
     private $userService;
 
     /** @var \Symfony\Component\Security\Csrf\TokenStorage\TokenStorageInterface */
@@ -61,7 +60,7 @@ public function __construct(
     /**
      * Creates a new session based on the credentials provided as POST parameters.
      *
-     * @throws \eZ\Publish\Core\Base\Exceptions\UnauthorizedException If the login or password are incorrect or invalid CSRF
+     * @throws \Ibexa\Core\Base\Exceptions\UnauthorizedException If the login or password are incorrect or invalid CSRF
      *
      * @return Values\UserSession|Values\Conflict
      */
@@ -110,9 +109,9 @@ public function createSessionAction(Request $request)
      *
      * @param string $sessionId
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\UserSession
+     * @return \Ibexa\Rest\Server\Values\UserSession
      */
     public function refreshSessionAction($sessionId, Request $request)
     {
@@ -146,7 +145,7 @@ public function refreshSessionAction($sessionId, Request $request)
      *
      * @return Values\DeletedUserSession
      *
-     * @throws NotFoundException
+     * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException
      */
     public function deleteSessionAction($sessionId, Request $request)
     {
@@ -181,9 +180,9 @@ private function hasStoredCsrfToken()
     /**
      * Checks the presence / validity of the CSRF token.
      *
-     * @param Request $request
+     * @param \Symfony\Component\HttpFoundation\Request $request
      *
-     * @throws UnauthorizedException if the token is missing or invalid
+     * @throws \Ibexa\Core\Base\Exceptions\UnauthorizedException if the token is missing or invalid
      */
     private function checkCsrfToken(Request $request)
     {
diff --git a/src/lib/Server/Controller/Trash.php b/src/lib/Server/Controller/Trash.php
index bb0410e5..88894263 100644
--- a/src/lib/Server/Controller/Trash.php
+++ b/src/lib/Server/Controller/Trash.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Controller;
 
-use Ibexa\Rest\Server\Values;
+use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
+use Ibexa\Contracts\Core\Repository\LocationService;
+use Ibexa\Contracts\Core\Repository\TrashService;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query;
 use Ibexa\Rest\Server\Controller as RestController;
-use eZ\Publish\API\Repository\TrashService;
-use eZ\Publish\API\Repository\LocationService;
-use eZ\Publish\API\Repository\Values\Content\Query;
-use eZ\Publish\API\Repository\Exceptions\NotFoundException;
 use Ibexa\Rest\Server\Exceptions\ForbiddenException;
+use Ibexa\Rest\Server\Values;
 use InvalidArgumentException;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -24,22 +24,22 @@ class Trash extends RestController
     /**
      * Trash service.
      *
-     * @var \eZ\Publish\API\Repository\TrashService
+     * @var \Ibexa\Contracts\Core\Repository\TrashService
      */
     protected $trashService;
 
     /**
      * Location service.
      *
-     * @var \eZ\Publish\API\Repository\LocationService
+     * @var \Ibexa\Contracts\Core\Repository\LocationService
      */
     protected $locationService;
 
     /**
      * Construct controller.
      *
-     * @param \eZ\Publish\API\Repository\TrashService $trashService
-     * @param \eZ\Publish\API\Repository\LocationService $locationService
+     * @param \Ibexa\Contracts\Core\Repository\TrashService $trashService
+     * @param \Ibexa\Contracts\Core\Repository\LocationService $locationService
      */
     public function __construct(TrashService $trashService, LocationService $locationService)
     {
@@ -50,7 +50,7 @@ public function __construct(TrashService $trashService, LocationService $locatio
     /**
      * Returns a list of all trash items.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\Trash
+     * @return \Ibexa\Rest\Server\Values\Trash
      */
     public function loadTrashItems(Request $request)
     {
@@ -81,7 +81,7 @@ public function loadTrashItems(Request $request)
      *
      * @param $trashItemId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RestTrashItem
+     * @return \Ibexa\Rest\Server\Values\RestTrashItem
      */
     public function loadTrashItem($trashItemId)
     {
@@ -94,7 +94,7 @@ public function loadTrashItem($trashItemId)
     /**
      * Empties the trash.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\NoContent
+     * @return \Ibexa\Rest\Server\Values\NoContent
      */
     public function emptyTrash()
     {
@@ -108,7 +108,7 @@ public function emptyTrash()
      *
      * @param $trashItemId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\NoContent
+     * @return \Ibexa\Rest\Server\Values\NoContent
      */
     public function deleteTrashItem($trashItemId)
     {
@@ -124,9 +124,9 @@ public function deleteTrashItem($trashItemId)
      *
      * @param $trashItemId
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\ResourceCreated
+     * @return \Ibexa\Rest\Server\Values\ResourceCreated
      */
     public function restoreTrashItem($trashItemId, Request $request)
     {
diff --git a/src/lib/Server/Controller/URLAlias.php b/src/lib/Server/Controller/URLAlias.php
index 6598cadc..541fa2d9 100644
--- a/src/lib/Server/Controller/URLAlias.php
+++ b/src/lib/Server/Controller/URLAlias.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Controller;
 
-use Ibexa\Rest\Server\Exceptions\ForbiddenException;
-use eZ\Publish\API\Repository\Exceptions\InvalidArgumentException;
+use Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException;
+use Ibexa\Contracts\Core\Repository\LocationService;
+use Ibexa\Contracts\Core\Repository\URLAliasService;
 use Ibexa\Rest\Message;
-use Ibexa\Rest\Server\Values;
 use Ibexa\Rest\Server\Controller as RestController;
-use eZ\Publish\API\Repository\URLAliasService;
-use eZ\Publish\API\Repository\LocationService;
+use Ibexa\Rest\Server\Exceptions\ForbiddenException;
+use Ibexa\Rest\Server\Values;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -23,22 +23,22 @@ class URLAlias extends RestController
     /**
      * URLAlias service.
      *
-     * @var \eZ\Publish\API\Repository\URLAliasService
+     * @var \Ibexa\Contracts\Core\Repository\URLAliasService
      */
     protected $urlAliasService;
 
     /**
      * Location service.
      *
-     * @var \eZ\Publish\API\Repository\LocationService
+     * @var \Ibexa\Contracts\Core\Repository\LocationService
      */
     protected $locationService;
 
     /**
      * Construct controller.
      *
-     * @param \eZ\Publish\API\Repository\URLAliasService $urlAliasService
-     * @param \eZ\Publish\API\Repository\LocationService $locationService
+     * @param \Ibexa\Contracts\Core\Repository\URLAliasService $urlAliasService
+     * @param \Ibexa\Contracts\Core\Repository\LocationService $locationService
      */
     public function __construct(URLAliasService $urlAliasService, LocationService $locationService)
     {
@@ -51,7 +51,7 @@ public function __construct(URLAliasService $urlAliasService, LocationService $l
      *
      * @param $urlAliasId
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\URLAlias
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\URLAlias
      */
     public function loadURLAlias($urlAliasId)
     {
@@ -61,7 +61,7 @@ public function loadURLAlias($urlAliasId)
     /**
      * Returns the list of global URL aliases.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\URLAliasRefList
+     * @return \Ibexa\Rest\Server\Values\URLAliasRefList
      */
     public function listGlobalURLAliases()
     {
@@ -76,7 +76,7 @@ public function listGlobalURLAliases()
      *
      * @param $locationPath
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\URLAliasRefList
+     * @return \Ibexa\Rest\Server\Values\URLAliasRefList
      */
     public function listLocationURLAliases($locationPath, Request $request)
     {
@@ -100,9 +100,9 @@ public function listLocationURLAliases($locationPath, Request $request)
     /**
      * Creates a new URL alias.
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\CreatedURLAlias
+     * @return \Ibexa\Rest\Server\Values\CreatedURLAlias
      */
     public function createURLAlias(Request $request)
     {
@@ -160,7 +160,7 @@ public function createURLAlias(Request $request)
      *
      * @param $urlAliasId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\NoContent
+     * @return \Ibexa\Rest\Server\Values\NoContent
      */
     public function deleteURLAlias($urlAliasId)
     {
diff --git a/src/lib/Server/Controller/URLWildcard.php b/src/lib/Server/Controller/URLWildcard.php
index a7ad152c..391c014d 100644
--- a/src/lib/Server/Controller/URLWildcard.php
+++ b/src/lib/Server/Controller/URLWildcard.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Controller;
 
-use Ibexa\Rest\Server\Exceptions\ForbiddenException;
-use eZ\Publish\API\Repository\Exceptions\InvalidArgumentException;
+use Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException;
+use Ibexa\Contracts\Core\Repository\URLWildcardService;
 use Ibexa\Rest\Message;
-use Ibexa\Rest\Server\Values;
 use Ibexa\Rest\Server\Controller as RestController;
-use eZ\Publish\API\Repository\URLWildcardService;
+use Ibexa\Rest\Server\Exceptions\ForbiddenException;
+use Ibexa\Rest\Server\Values;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -22,14 +22,14 @@ class URLWildcard extends RestController
     /**
      * URLWildcard service.
      *
-     * @var \eZ\Publish\API\Repository\URLWildcardService
+     * @var \Ibexa\Contracts\Core\Repository\URLWildcardService
      */
     protected $urlWildcardService;
 
     /**
      * Construct controller.
      *
-     * @param \eZ\Publish\API\Repository\URLWildcardService $urlWildcardService
+     * @param \Ibexa\Contracts\Core\Repository\URLWildcardService $urlWildcardService
      */
     public function __construct(URLWildcardService $urlWildcardService)
     {
@@ -41,7 +41,7 @@ public function __construct(URLWildcardService $urlWildcardService)
      *
      * @param $urlWildcardId
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\URLWildcard
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\URLWildcard
      */
     public function loadURLWildcard($urlWildcardId)
     {
@@ -51,7 +51,7 @@ public function loadURLWildcard($urlWildcardId)
     /**
      * Returns the list of URL wildcards.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\URLWildcardList
+     * @return \Ibexa\Rest\Server\Values\URLWildcardList
      */
     public function listURLWildcards()
     {
@@ -63,9 +63,9 @@ public function listURLWildcards()
     /**
      * Creates a new URL wildcard.
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\CreatedURLWildcard
+     * @return \Ibexa\Rest\Server\Values\CreatedURLWildcard
      */
     public function createURLWildcard(Request $request)
     {
@@ -98,7 +98,7 @@ public function createURLWildcard(Request $request)
      *
      * @param $urlWildcardId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\NoContent
+     * @return \Ibexa\Rest\Server\Values\NoContent
      */
     public function deleteURLWildcard($urlWildcardId)
     {
diff --git a/src/lib/Server/Controller/User.php b/src/lib/Server/Controller/User.php
index 14fab13f..9819bfcd 100644
--- a/src/lib/Server/Controller/User.php
+++ b/src/lib/Server/Controller/User.php
@@ -1,31 +1,31 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Controller;
 
-use eZ\Publish\API\Repository\PermissionResolver;
-use eZ\Publish\API\Repository\Values\Content\Language;
+use Ibexa\Contracts\Core\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\ContentTypeService;
+use Ibexa\Contracts\Core\Repository\LocationService;
+use Ibexa\Contracts\Core\Repository\PermissionResolver;
+use Ibexa\Contracts\Core\Repository\Repository;
+use Ibexa\Contracts\Core\Repository\RoleService;
+use Ibexa\Contracts\Core\Repository\SectionService;
+use Ibexa\Contracts\Core\Repository\UserService;
+use Ibexa\Contracts\Core\Repository\Values\Content\Language;
+use Ibexa\Contracts\Core\Repository\Values\User\User as RepositoryUser;
+use Ibexa\Contracts\Core\Repository\Values\User\UserGroupRoleAssignment;
+use Ibexa\Contracts\Core\Repository\Values\User\UserRoleAssignment;
+use Ibexa\Contracts\Rest\Exceptions\NotFoundException;
+use Ibexa\Core\Base\Exceptions\UnauthorizedException;
+use Ibexa\Core\Repository\Exceptions as ApiExceptions;
 use Ibexa\Rest\Message;
-use Ibexa\Rest\Server\Values;
-use Ibexa\Rest\Server\Exceptions;
 use Ibexa\Rest\Server\Controller as RestController;
-use eZ\Publish\API\Repository\UserService;
-use eZ\Publish\API\Repository\ContentService;
-use eZ\Publish\API\Repository\ContentTypeService;
-use eZ\Publish\API\Repository\RoleService;
-use eZ\Publish\API\Repository\LocationService;
-use eZ\Publish\API\Repository\SectionService;
-use eZ\Publish\API\Repository\Repository;
-use eZ\Publish\API\Repository\Values\User\UserRoleAssignment;
-use eZ\Publish\API\Repository\Values\User\UserGroupRoleAssignment;
-use eZ\Publish\API\Repository\Values\User\User as RepositoryUser;
-use eZ\Publish\API\Repository\Exceptions as ApiExceptions;
+use Ibexa\Rest\Server\Exceptions;
 use Ibexa\Rest\Server\Exceptions\ForbiddenException;
-use Ibexa\Contracts\Rest\Exceptions\NotFoundException;
-use eZ\Publish\Core\Base\Exceptions\UnauthorizedException;
+use Ibexa\Rest\Server\Values;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Csrf\TokenStorage\TokenStorageInterface;
 
@@ -37,49 +37,49 @@ class User extends RestController
     /**
      * User service.
      *
-     * @var \eZ\Publish\API\Repository\UserService
+     * @var \Ibexa\Contracts\Core\Repository\UserService
      */
     protected $userService;
 
     /**
      * Role service.
      *
-     * @var \eZ\Publish\API\Repository\RoleService
+     * @var \Ibexa\Contracts\Core\Repository\RoleService
      */
     protected $roleService;
 
     /**
      * Content service.
      *
-     * @var \eZ\Publish\API\Repository\ContentService
+     * @var \Ibexa\Contracts\Core\Repository\ContentService
      */
     protected $contentService;
 
     /**
      * Content service.
      *
-     * @var \eZ\Publish\API\Repository\ContentTypeService
+     * @var \Ibexa\Contracts\Core\Repository\ContentTypeService
      */
     protected $contentTypeService;
 
     /**
      * Location service.
      *
-     * @var \eZ\Publish\API\Repository\LocationService
+     * @var \Ibexa\Contracts\Core\Repository\LocationService
      */
     protected $locationService;
 
     /**
      * Section service.
      *
-     * @var \eZ\Publish\API\Repository\SectionService
+     * @var \Ibexa\Contracts\Core\Repository\SectionService
      */
     protected $sectionService;
 
     /**
      * Repository.
      *
-     * @var \eZ\Publish\API\Repository\Repository
+     * @var \Ibexa\Contracts\Core\Repository\Repository
      */
     protected $repository;
 
@@ -91,13 +91,13 @@ class User extends RestController
     private $csrfTokenStorage;
 
     /**
-     * @var \EzSystems\EzPlatformRest\Server\Controller\SessionController
+     * @var \Ibexa\Rest\Server\Controller\SessionController
      *
      * @deprecated This property is added for backward compatibility. It is deprecated, and will be removed in 7.0.
      */
     private $sessionController;
 
-    /** @var \eZ\Publish\API\Repository\PermissionResolver */
+    /** @var \Ibexa\Contracts\Core\Repository\PermissionResolver */
     private $permissionResolver;
 
     public function __construct(
@@ -123,7 +123,7 @@ public function __construct(
     /**
      * Redirects to the root user group.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\PermanentRedirect
+     * @return \Ibexa\Rest\Server\Values\PermanentRedirect
      */
     public function loadRootUserGroup()
     {
@@ -138,7 +138,7 @@ public function loadRootUserGroup()
      *
      * @param $groupPath
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RestUserGroup
+     * @return \Ibexa\Rest\Server\Values\RestUserGroup
      */
     public function loadUserGroup($groupPath)
     {
@@ -176,7 +176,7 @@ public function loadUserGroup($groupPath)
      *
      * @param $userId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RestUser
+     * @return \Ibexa\Rest\Server\Values\RestUser
      */
     public function loadUser($userId)
     {
@@ -221,9 +221,9 @@ function () use ($userContentInfo) {
      *
      * @param $groupPath
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\BadRequestException
+     * @throws \Ibexa\Rest\Server\Exceptions\BadRequestException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\CreatedUserGroup
+     * @return \Ibexa\Rest\Server\Values\CreatedUserGroup
      */
     public function createUserGroup($groupPath, Request $request)
     {
@@ -265,9 +265,9 @@ public function createUserGroup($groupPath, Request $request)
      *
      * @param $groupPath
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\CreatedUser
+     * @return \Ibexa\Rest\Server\Values\CreatedUser
      */
     public function createUser($groupPath, Request $request)
     {
@@ -311,7 +311,7 @@ public function createUser($groupPath, Request $request)
      *
      * @param $groupPath
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RestUserGroup
+     * @return \Ibexa\Rest\Server\Values\RestUserGroup
      */
     public function updateUserGroup($groupPath, Request $request)
     {
@@ -361,7 +361,7 @@ public function updateUserGroup($groupPath, Request $request)
      *
      * @param $userId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RestUser
+     * @return \Ibexa\Rest\Server\Values\RestUser
      */
     public function updateUser($userId, Request $request)
     {
@@ -405,9 +405,9 @@ public function updateUser($userId, Request $request)
      *
      * @param $groupPath
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\NoContent
+     * @return \Ibexa\Rest\Server\Values\NoContent
      */
     public function deleteUserGroup($groupPath)
     {
@@ -435,9 +435,9 @@ public function deleteUserGroup($groupPath)
      *
      * @param $userId
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\NoContent
+     * @return \Ibexa\Rest\Server\Values\NoContent
      */
     public function deleteUser($userId)
     {
@@ -455,7 +455,7 @@ public function deleteUser($userId)
     /**
      * Loads users.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\UserList|\EzSystems\EzPlatformRest\Server\Values\UserRefList
+     * @return \Ibexa\Rest\Server\Values\UserList|\Ibexa\Rest\Server\Values\UserRefList
      */
     public function loadUsers(Request $request)
     {
@@ -514,7 +514,7 @@ public function verifyUsers(Request $request)
      *
      * @param mixed $roleId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RestUser[]
+     * @return \Ibexa\Rest\Server\Values\RestUser[]
      */
     public function loadUsersAssignedToRole($roleId)
     {
@@ -549,7 +549,7 @@ private function buildRestUserObject(RepositoryUser $user)
     /**
      * Loads user groups.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\UserGroupList|\EzSystems\EzPlatformRest\Server\Values\UserGroupRefList
+     * @return \Ibexa\Rest\Server\Values\UserGroupList|\Ibexa\Rest\Server\Values\UserGroupRefList
      */
     public function loadUserGroups(Request $request)
     {
@@ -587,7 +587,7 @@ public function loadUserGroups(Request $request)
     /**
      * Loads a user group by its remote ID.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RestUserGroup
+     * @return \Ibexa\Rest\Server\Values\RestUserGroup
      */
     public function loadUserGroupByRemoteId(Request $request)
     {
@@ -610,7 +610,7 @@ public function loadUserGroupByRemoteId(Request $request)
      *
      * @param mixed $roleId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RestUserGroup[]
+     * @return \Ibexa\Rest\Server\Values\RestUserGroup[]
      */
     public function loadUserGroupsAssignedToRole($roleId)
     {
@@ -644,7 +644,7 @@ public function loadUserGroupsAssignedToRole($roleId)
      *
      * @param $userId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\VersionList
+     * @return \Ibexa\Rest\Server\Values\VersionList
      */
     public function loadUserDrafts($userId, Request $request)
     {
@@ -660,9 +660,9 @@ public function loadUserDrafts($userId, Request $request)
      *
      * @param $groupPath
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\ResourceCreated
+     * @return \Ibexa\Rest\Server\Values\ResourceCreated
      */
     public function moveUserGroup($groupPath, Request $request)
     {
@@ -710,7 +710,7 @@ public function moveUserGroup($groupPath, Request $request)
      *
      * @param $groupPath
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\UserGroupList|\EzSystems\EzPlatformRest\Server\Values\UserGroupRefList
+     * @return \Ibexa\Rest\Server\Values\UserGroupList|\Ibexa\Rest\Server\Values\UserGroupRefList
      */
     public function loadSubUserGroups($groupPath, Request $request)
     {
@@ -767,7 +767,7 @@ public function loadSubUserGroups($groupPath, Request $request)
      *
      * @param $userId
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\UserGroupRefList
+     * @return \Ibexa\Rest\Server\Values\UserGroupRefList
      */
     public function loadUserGroupsOfUser($userId, Request $request)
     {
@@ -808,7 +808,7 @@ public function loadUserGroupsOfUser($userId, Request $request)
      *
      * @param $groupPath
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\UserList|\EzSystems\EzPlatformRest\Server\Values\UserRefList
+     * @return \Ibexa\Rest\Server\Values\UserList|\Ibexa\Rest\Server\Values\UserRefList
      */
     public function loadUsersFromGroup($groupPath, Request $request)
     {
@@ -864,9 +864,9 @@ public function loadUsersFromGroup($groupPath, Request $request)
      * @param $userId
      * @param $groupPath
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\UserGroupRefList
+     * @return \Ibexa\Rest\Server\Values\UserGroupRefList
      */
     public function unassignUserFromUserGroup($userId, $groupPath)
     {
@@ -915,9 +915,9 @@ public function unassignUserFromUserGroup($userId, $groupPath)
      *
      * @param $userId
      *
-     * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException
+     * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\UserGroupRefList
+     * @return \Ibexa\Rest\Server\Values\UserGroupRefList
      */
     public function assignUserToUserGroup($userId, Request $request)
     {
@@ -974,7 +974,7 @@ public function assignUserToUserGroup($userId, Request $request)
     /**
      * Creates a new session based on the credentials provided as POST parameters.
      *
-     * @throws \eZ\Publish\Core\Base\Exceptions\UnauthorizedException If the login or password are incorrect or invalid CSRF
+     * @throws \Ibexa\Core\Base\Exceptions\UnauthorizedException If the login or password are incorrect or invalid CSRF
      *
      * @return Values\UserSession|Values\Conflict
      *
@@ -995,9 +995,9 @@ public function createSession(Request $request)
      *
      * @param string $sessionId
      *
-     * @throws \eZ\Publish\Core\Base\Exceptions\UnauthorizedException if the CSRF token is missing or invalid
+     * @throws \Ibexa\Core\Base\Exceptions\UnauthorizedException if the CSRF token is missing or invalid
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\UserSession
+     * @return \Ibexa\Rest\Server\Values\UserSession
      *
      * @deprecated Deprecated since 6.5. Use SessionController::refreshSessionAction().
      */
@@ -1018,7 +1018,7 @@ public function refreshSession($sessionId, Request $request)
      *
      * @return Values\DeletedUserSession|\Symfony\Component\HttpFoundation\Response
      *
-     * @throws \eZ\Publish\Core\Base\Exceptions\UnauthorizedException if the CSRF token is missing or invalid
+     * @throws \Ibexa\Core\Base\Exceptions\UnauthorizedException if the CSRF token is missing or invalid
      * @throws RestNotFoundException
      *
      * @deprecated Deprecated since 6.5. Use SessionController::refreshSessionAction().
diff --git a/src/lib/Server/Controller/Views.php b/src/lib/Server/Controller/Views.php
index 59141550..4b5e3bc1 100644
--- a/src/lib/Server/Controller/Views.php
+++ b/src/lib/Server/Controller/Views.php
@@ -1,19 +1,19 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Controller;
 
-use eZ\Publish\API\Repository\Exceptions\NotImplementedException;
-use eZ\Publish\API\Repository\SearchService;
-use eZ\Publish\API\Repository\Values\Content\Language;
-use eZ\Publish\API\Repository\Values\Content\LocationQuery;
-use Ibexa\Rest\Server\Controller;
-use Symfony\Component\HttpFoundation\Request;
+use Ibexa\Contracts\Core\Repository\Exceptions\NotImplementedException;
+use Ibexa\Contracts\Core\Repository\SearchService;
+use Ibexa\Contracts\Core\Repository\Values\Content\Language;
+use Ibexa\Contracts\Core\Repository\Values\Content\LocationQuery;
 use Ibexa\Rest\Message;
+use Ibexa\Rest\Server\Controller;
 use Ibexa\Rest\Server\Values;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Controller for Repository Views (Search, mostly).
@@ -21,7 +21,7 @@
 class Views extends Controller
 {
     /**
-     * @var \eZ\Publish\API\Repository\SearchService
+     * @var \Ibexa\Contracts\Core\Repository\SearchService
      */
     private $searchService;
 
@@ -33,7 +33,7 @@ public function __construct(SearchService $searchService)
     /**
      * Creates and executes a content view.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RestExecutedView
+     * @return \Ibexa\Rest\Server\Values\RestExecutedView
      */
     public function createView(Request $request)
     {
@@ -73,7 +73,7 @@ public function createView(Request $request)
     /**
      * List content views.
      *
-     * @return NotImplementedException;
+     * @return \Ibexa\Contracts\Core\Repository\Exceptions\NotImplementedException;
      */
     public function listView()
     {
@@ -83,7 +83,7 @@ public function listView()
     /**
      * Get a content view.
      *
-     * @return NotImplementedException;
+     * @return \Ibexa\Contracts\Core\Repository\Exceptions\NotImplementedException;
      */
     public function getView()
     {
@@ -93,7 +93,7 @@ public function getView()
     /**
      * Get a content view results.
      *
-     * @return NotImplementedException;
+     * @return \Ibexa\Contracts\Core\Repository\Exceptions\NotImplementedException;
      */
     public function loadViewResults()
     {
diff --git a/src/lib/Server/Exceptions/AuthenticationFailedException.php b/src/lib/Server/Exceptions/AuthenticationFailedException.php
index 69df264f..74ecc76c 100644
--- a/src/lib/Server/Exceptions/AuthenticationFailedException.php
+++ b/src/lib/Server/Exceptions/AuthenticationFailedException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Exceptions;
diff --git a/src/lib/Server/Exceptions/BadRequestException.php b/src/lib/Server/Exceptions/BadRequestException.php
index b8acfbf6..bbb5b45c 100644
--- a/src/lib/Server/Exceptions/BadRequestException.php
+++ b/src/lib/Server/Exceptions/BadRequestException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Exceptions;
diff --git a/src/lib/Server/Exceptions/ContentFieldValidationException.php b/src/lib/Server/Exceptions/ContentFieldValidationException.php
index f36911e3..2edba442 100644
--- a/src/lib/Server/Exceptions/ContentFieldValidationException.php
+++ b/src/lib/Server/Exceptions/ContentFieldValidationException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Exceptions;
 
-use eZ\Publish\API\Repository\Exceptions\ContentFieldValidationException as APIContentFieldValidationException;
+use Ibexa\Contracts\Core\Repository\Exceptions\ContentFieldValidationException as APIContentFieldValidationException;
 
 /**
  * Exception thrown if one or more content fields did not validate.
@@ -16,9 +16,9 @@ class ContentFieldValidationException extends BadRequestException
     /**
      * Contains an array of field ValidationError objects indexed with FieldDefinition id and language code.
      *
-     * @see eZ\Publish\Core\Base\Exceptions\ContentFieldValidationException
+     * @see \Ibexa\Core\Base\Exceptions\ContentFieldValidationException
      *
-     * @var \eZ\Publish\Core\FieldType\ValidationError[]
+     * @var \Ibexa\Core\FieldType\ValidationError[]
      */
     protected $errors;
 
@@ -32,7 +32,7 @@ public function __construct(APIContentFieldValidationException $e)
     /**
      * Returns an array of field validation error messages.
      *
-     * @return \eZ\Publish\Core\FieldType\ValidationError[]
+     * @return \Ibexa\Core\FieldType\ValidationError[]
      */
     public function getFieldErrors()
     {
diff --git a/src/lib/Server/Exceptions/ForbiddenException.php b/src/lib/Server/Exceptions/ForbiddenException.php
index 0597be4e..56110264 100644
--- a/src/lib/Server/Exceptions/ForbiddenException.php
+++ b/src/lib/Server/Exceptions/ForbiddenException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Exceptions;
diff --git a/src/lib/Server/Exceptions/InvalidUserTypeException.php b/src/lib/Server/Exceptions/InvalidUserTypeException.php
index fe1fae73..3dc62cba 100644
--- a/src/lib/Server/Exceptions/InvalidUserTypeException.php
+++ b/src/lib/Server/Exceptions/InvalidUserTypeException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Exceptions;
diff --git a/src/lib/Server/Exceptions/UserConflictException.php b/src/lib/Server/Exceptions/UserConflictException.php
index 8a323966..055e5d2f 100644
--- a/src/lib/Server/Exceptions/UserConflictException.php
+++ b/src/lib/Server/Exceptions/UserConflictException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Exceptions;
diff --git a/src/lib/Server/Input/Parser/Aggregation/AbstractRangeAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/AbstractRangeAggregationParser.php
index 43c53648..9d3ac507 100644
--- a/src/lib/Server/Input/Parser/Aggregation/AbstractRangeAggregationParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/AbstractRangeAggregationParser.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Aggregation;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation;
 use Ibexa\Contracts\Rest\Exceptions;
-use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 abstract class AbstractRangeAggregationParser extends BaseParser
 {
@@ -43,7 +43,7 @@ abstract protected function parseAggregation(
     ): AbstractRangeAggregation;
 
     /**
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Range[]
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Range[]
      */
     protected function dispatchRanges(ParsingDispatcher $dispatcher, array $data, string $mediaType): array
     {
diff --git a/src/lib/Server/Input/Parser/Aggregation/AbstractStatsAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/AbstractStatsAggregationParser.php
index 44148755..3388252f 100644
--- a/src/lib/Server/Input/Parser/Aggregation/AbstractStatsAggregationParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/AbstractStatsAggregationParser.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Aggregation;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractStatsAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractStatsAggregation;
 use Ibexa\Contracts\Rest\Exceptions;
-use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 abstract class AbstractStatsAggregationParser extends BaseParser
 {
diff --git a/src/lib/Server/Input/Parser/Aggregation/AbstractTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/AbstractTermAggregationParser.php
index 84bf3a69..128b89f4 100644
--- a/src/lib/Server/Input/Parser/Aggregation/AbstractTermAggregationParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/AbstractTermAggregationParser.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Aggregation;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
 use Ibexa\Contracts\Rest\Exceptions;
-use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 abstract class AbstractTermAggregationParser extends BaseParser
 {
diff --git a/src/lib/Server/Input/Parser/Aggregation/ContentTypeGroupTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/ContentTypeGroupTermAggregationParser.php
index 36829dc6..bb85a6dd 100644
--- a/src/lib/Server/Input/Parser/Aggregation/ContentTypeGroupTermAggregationParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/ContentTypeGroupTermAggregationParser.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Aggregation;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\ContentTypeGroupTermAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\ContentTypeGroupTermAggregation;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 
 final class ContentTypeGroupTermAggregationParser extends AbstractTermAggregationParser
diff --git a/src/lib/Server/Input/Parser/Aggregation/ContentTypeTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/ContentTypeTermAggregationParser.php
index 488c0f7a..dd0822db 100644
--- a/src/lib/Server/Input/Parser/Aggregation/ContentTypeTermAggregationParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/ContentTypeTermAggregationParser.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Aggregation;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\ContentTypeTermAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\ContentTypeTermAggregation;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 
 final class ContentTypeTermAggregationParser extends AbstractTermAggregationParser
diff --git a/src/lib/Server/Input/Parser/Aggregation/DateMetadataRangeAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/DateMetadataRangeAggregationParser.php
index 323717fe..a47d6e72 100644
--- a/src/lib/Server/Input/Parser/Aggregation/DateMetadataRangeAggregationParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/DateMetadataRangeAggregationParser.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Aggregation;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation;
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\DateMetadataRangeAggregation;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\DateMetadataRangeAggregation;
 use Ibexa\Contracts\Rest\Exceptions;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 
 final class DateMetadataRangeAggregationParser extends AbstractRangeAggregationParser
 {
diff --git a/src/lib/Server/Input/Parser/Aggregation/Field/AuthorTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/Field/AuthorTermAggregationParser.php
index 7cd2c25d..7ef58bf6 100644
--- a/src/lib/Server/Input/Parser/Aggregation/Field/AuthorTermAggregationParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/Field/AuthorTermAggregationParser.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Aggregation\Field;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\AuthorTermAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\AuthorTermAggregation;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Rest\Server\Input\Parser\Aggregation\AbstractTermAggregationParser;
-use Ibexa\Contracts\Rest\Exceptions;
 
 final class AuthorTermAggregationParser extends AbstractTermAggregationParser
 {
diff --git a/src/lib/Server/Input/Parser/Aggregation/Field/CheckboxTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/Field/CheckboxTermAggregationParser.php
index 4a0cf753..2a8c55cc 100644
--- a/src/lib/Server/Input/Parser/Aggregation/Field/CheckboxTermAggregationParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/Field/CheckboxTermAggregationParser.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Aggregation\Field;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\CheckboxTermAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\CheckboxTermAggregation;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Rest\Server\Input\Parser\Aggregation\AbstractTermAggregationParser;
-use Ibexa\Contracts\Rest\Exceptions;
 
 final class CheckboxTermAggregationParser extends AbstractTermAggregationParser
 {
diff --git a/src/lib/Server/Input/Parser/Aggregation/Field/CountryTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/Field/CountryTermAggregationParser.php
index f30bd54d..8721c583 100644
--- a/src/lib/Server/Input/Parser/Aggregation/Field/CountryTermAggregationParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/Field/CountryTermAggregationParser.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Aggregation\Field;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\CountryTermAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\CountryTermAggregation;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Rest\Server\Input\Parser\Aggregation\AbstractTermAggregationParser;
-use Ibexa\Contracts\Rest\Exceptions;
 
 final class CountryTermAggregationParser extends AbstractTermAggregationParser
 {
diff --git a/src/lib/Server/Input/Parser/Aggregation/Field/DateRangeAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/Field/DateRangeAggregationParser.php
index 70909cc7..069cf5a9 100644
--- a/src/lib/Server/Input/Parser/Aggregation/Field/DateRangeAggregationParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/Field/DateRangeAggregationParser.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Aggregation\Field;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation;
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\DateRangeAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\DateRangeAggregation;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Rest\Server\Input\Parser\Aggregation\AbstractRangeAggregationParser;
-use Ibexa\Contracts\Rest\Exceptions;
 
 final class DateRangeAggregationParser extends AbstractRangeAggregationParser
 {
diff --git a/src/lib/Server/Input/Parser/Aggregation/Field/DateTimeRangeAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/Field/DateTimeRangeAggregationParser.php
index 291f1abd..49abb34a 100644
--- a/src/lib/Server/Input/Parser/Aggregation/Field/DateTimeRangeAggregationParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/Field/DateTimeRangeAggregationParser.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Aggregation\Field;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation;
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\DateTimeRangeAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\DateTimeRangeAggregation;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Rest\Server\Input\Parser\Aggregation\AbstractRangeAggregationParser;
-use Ibexa\Contracts\Rest\Exceptions;
 
 final class DateTimeRangeAggregationParser extends AbstractRangeAggregationParser
 {
diff --git a/src/lib/Server/Input/Parser/Aggregation/Field/FloatRangeAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/Field/FloatRangeAggregationParser.php
index d58894f5..c0d7d596 100644
--- a/src/lib/Server/Input/Parser/Aggregation/Field/FloatRangeAggregationParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/Field/FloatRangeAggregationParser.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Aggregation\Field;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation;
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\FloatRangeAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\FloatRangeAggregation;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Rest\Server\Input\Parser\Aggregation\AbstractRangeAggregationParser;
-use Ibexa\Contracts\Rest\Exceptions;
 
 final class FloatRangeAggregationParser extends AbstractRangeAggregationParser
 {
diff --git a/src/lib/Server/Input/Parser/Aggregation/Field/FloatStatsAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/Field/FloatStatsAggregationParser.php
index a2a4ae03..8dd9e032 100644
--- a/src/lib/Server/Input/Parser/Aggregation/Field/FloatStatsAggregationParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/Field/FloatStatsAggregationParser.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Aggregation\Field;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractStatsAggregation;
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\FloatStatsAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractStatsAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\FloatStatsAggregation;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Rest\Server\Input\Parser\Aggregation\AbstractStatsAggregationParser;
-use Ibexa\Contracts\Rest\Exceptions;
 
 final class FloatStatsAggregationParser extends AbstractStatsAggregationParser
 {
diff --git a/src/lib/Server/Input/Parser/Aggregation/Field/IntegerRangeAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/Field/IntegerRangeAggregationParser.php
index 832c4afe..f11142ed 100644
--- a/src/lib/Server/Input/Parser/Aggregation/Field/IntegerRangeAggregationParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/Field/IntegerRangeAggregationParser.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Aggregation\Field;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation;
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\IntegerRangeAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\IntegerRangeAggregation;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Rest\Server\Input\Parser\Aggregation\AbstractRangeAggregationParser;
-use Ibexa\Contracts\Rest\Exceptions;
 
 final class IntegerRangeAggregationParser extends AbstractRangeAggregationParser
 {
diff --git a/src/lib/Server/Input/Parser/Aggregation/Field/IntegerStatsAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/Field/IntegerStatsAggregationParser.php
index 0fb86f94..9692fe50 100644
--- a/src/lib/Server/Input/Parser/Aggregation/Field/IntegerStatsAggregationParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/Field/IntegerStatsAggregationParser.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Aggregation\Field;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractStatsAggregation;
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\IntegerStatsAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractStatsAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\IntegerStatsAggregation;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Rest\Server\Input\Parser\Aggregation\AbstractStatsAggregationParser;
-use Ibexa\Contracts\Rest\Exceptions;
 
 final class IntegerStatsAggregationParser extends AbstractStatsAggregationParser
 {
diff --git a/src/lib/Server/Input/Parser/Aggregation/Field/KeywordTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/Field/KeywordTermAggregationParser.php
index d1d01e3d..9c3d519d 100644
--- a/src/lib/Server/Input/Parser/Aggregation/Field/KeywordTermAggregationParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/Field/KeywordTermAggregationParser.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Aggregation\Field;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\KeywordTermAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\KeywordTermAggregation;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Rest\Server\Input\Parser\Aggregation\AbstractTermAggregationParser;
-use Ibexa\Contracts\Rest\Exceptions;
 
 final class KeywordTermAggregationParser extends AbstractTermAggregationParser
 {
diff --git a/src/lib/Server/Input/Parser/Aggregation/Field/SelectionTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/Field/SelectionTermAggregationParser.php
index 9700beb7..88b93e65 100644
--- a/src/lib/Server/Input/Parser/Aggregation/Field/SelectionTermAggregationParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/Field/SelectionTermAggregationParser.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Aggregation\Field;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\SelectionTermAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\SelectionTermAggregation;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Rest\Server\Input\Parser\Aggregation\AbstractTermAggregationParser;
-use Ibexa\Contracts\Rest\Exceptions;
 
 final class SelectionTermAggregationParser extends AbstractTermAggregationParser
 {
diff --git a/src/lib/Server/Input/Parser/Aggregation/Field/TimeRangeAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/Field/TimeRangeAggregationParser.php
index 19e97531..7a7aba44 100644
--- a/src/lib/Server/Input/Parser/Aggregation/Field/TimeRangeAggregationParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/Field/TimeRangeAggregationParser.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Aggregation\Field;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation;
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\TimeRangeAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\TimeRangeAggregation;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Rest\Server\Input\Parser\Aggregation\AbstractRangeAggregationParser;
-use Ibexa\Contracts\Rest\Exceptions;
 
 final class TimeRangeAggregationParser extends AbstractRangeAggregationParser
 {
diff --git a/src/lib/Server/Input/Parser/Aggregation/LanguageTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/LanguageTermAggregationParser.php
index 66840335..99c8bb9e 100644
--- a/src/lib/Server/Input/Parser/Aggregation/LanguageTermAggregationParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/LanguageTermAggregationParser.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Aggregation;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\LanguageTermAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\LanguageTermAggregation;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 
 final class LanguageTermAggregationParser extends AbstractTermAggregationParser
diff --git a/src/lib/Server/Input/Parser/Aggregation/Location/LocationChildrenTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/Location/LocationChildrenTermAggregationParser.php
index 27af2048..131472f3 100644
--- a/src/lib/Server/Input/Parser/Aggregation/Location/LocationChildrenTermAggregationParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/Location/LocationChildrenTermAggregationParser.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Aggregation\Location;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Location\LocationChildrenTermAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Location\LocationChildrenTermAggregation;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Rest\Server\Input\Parser\Aggregation\AbstractTermAggregationParser;
 
diff --git a/src/lib/Server/Input/Parser/Aggregation/Location/SubtreeTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/Location/SubtreeTermAggregationParser.php
index 0103266d..74539d31 100644
--- a/src/lib/Server/Input/Parser/Aggregation/Location/SubtreeTermAggregationParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/Location/SubtreeTermAggregationParser.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Aggregation\Location;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Location\SubtreeTermAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Location\SubtreeTermAggregation;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Rest\Server\Input\Parser\Aggregation\AbstractTermAggregationParser;
-use Ibexa\Contracts\Rest\Exceptions;
 
 final class SubtreeTermAggregationParser extends AbstractTermAggregationParser
 {
diff --git a/src/lib/Server/Input/Parser/Aggregation/ObjectStateTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/ObjectStateTermAggregationParser.php
index 98dc6d9b..cc50d573 100644
--- a/src/lib/Server/Input/Parser/Aggregation/ObjectStateTermAggregationParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/ObjectStateTermAggregationParser.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Aggregation;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\ObjectStateTermAggregation;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\ObjectStateTermAggregation;
 use Ibexa\Contracts\Rest\Exceptions;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 
 final class ObjectStateTermAggregationParser extends AbstractTermAggregationParser
 {
diff --git a/src/lib/Server/Input/Parser/Aggregation/Range/AbstractRangeParser.php b/src/lib/Server/Input/Parser/Aggregation/Range/AbstractRangeParser.php
index c754fcbb..d941a2d0 100644
--- a/src/lib/Server/Input/Parser/Aggregation/Range/AbstractRangeParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/Range/AbstractRangeParser.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Aggregation\Range;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Range;
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Range;
 use Ibexa\Contracts\Rest\Exceptions;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 abstract class AbstractRangeParser extends BaseParser
 {
diff --git a/src/lib/Server/Input/Parser/Aggregation/Range/DateTimeRangeParser.php b/src/lib/Server/Input/Parser/Aggregation/Range/DateTimeRangeParser.php
index 09c0ac26..5c4171bb 100644
--- a/src/lib/Server/Input/Parser/Aggregation/Range/DateTimeRangeParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/Range/DateTimeRangeParser.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
diff --git a/src/lib/Server/Input/Parser/Aggregation/Range/FloatRangeParser.php b/src/lib/Server/Input/Parser/Aggregation/Range/FloatRangeParser.php
index d36fc627..5d0c1c3b 100644
--- a/src/lib/Server/Input/Parser/Aggregation/Range/FloatRangeParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/Range/FloatRangeParser.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
diff --git a/src/lib/Server/Input/Parser/Aggregation/Range/IntRangeParser.php b/src/lib/Server/Input/Parser/Aggregation/Range/IntRangeParser.php
index 9f136acb..5a6961af 100644
--- a/src/lib/Server/Input/Parser/Aggregation/Range/IntRangeParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/Range/IntRangeParser.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
diff --git a/src/lib/Server/Input/Parser/Aggregation/RawRangeAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/RawRangeAggregationParser.php
index 832f041e..928d9b64 100644
--- a/src/lib/Server/Input/Parser/Aggregation/RawRangeAggregationParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/RawRangeAggregationParser.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Aggregation;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation;
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\RawRangeAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\RawRangeAggregation;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 
 final class RawRangeAggregationParser extends AbstractRangeAggregationParser
diff --git a/src/lib/Server/Input/Parser/Aggregation/RawStatsAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/RawStatsAggregationParser.php
index 6b1956f2..742c422d 100644
--- a/src/lib/Server/Input/Parser/Aggregation/RawStatsAggregationParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/RawStatsAggregationParser.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Aggregation;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractStatsAggregation;
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\RawStatsAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractStatsAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\RawStatsAggregation;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 
 final class RawStatsAggregationParser extends AbstractStatsAggregationParser
diff --git a/src/lib/Server/Input/Parser/Aggregation/RawTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/RawTermAggregationParser.php
index 08d91cf7..5101136d 100644
--- a/src/lib/Server/Input/Parser/Aggregation/RawTermAggregationParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/RawTermAggregationParser.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Aggregation;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\RawTermAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\RawTermAggregation;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 
 final class RawTermAggregationParser extends AbstractTermAggregationParser
diff --git a/src/lib/Server/Input/Parser/Aggregation/SectionTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/SectionTermAggregationParser.php
index 8819c1ee..1c7302d8 100644
--- a/src/lib/Server/Input/Parser/Aggregation/SectionTermAggregationParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/SectionTermAggregationParser.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Aggregation;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\SectionTermAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\SectionTermAggregation;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 
 final class SectionTermAggregationParser extends AbstractTermAggregationParser
diff --git a/src/lib/Server/Input/Parser/Aggregation/UserMetadataTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/UserMetadataTermAggregationParser.php
index 3e00438f..2680fa75 100644
--- a/src/lib/Server/Input/Parser/Aggregation/UserMetadataTermAggregationParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/UserMetadataTermAggregationParser.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Aggregation;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\UserMetadataTermAggregation;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\UserMetadataTermAggregation;
 use Ibexa\Contracts\Rest\Exceptions;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 
 final class UserMetadataTermAggregationParser extends AbstractTermAggregationParser
 {
diff --git a/src/lib/Server/Input/Parser/Aggregation/VisibilityTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/VisibilityTermAggregationParser.php
index a1be7e29..7bd7c802 100644
--- a/src/lib/Server/Input/Parser/Aggregation/VisibilityTermAggregationParser.php
+++ b/src/lib/Server/Input/Parser/Aggregation/VisibilityTermAggregationParser.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Aggregation;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\VisibilityTermAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\VisibilityTermAggregation;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 
 final class VisibilityTermAggregationParser extends AbstractTermAggregationParser
diff --git a/src/lib/Server/Input/Parser/ContentCreate.php b/src/lib/Server/Input/Parser/ContentCreate.php
index 030ce75d..c90b5aee 100644
--- a/src/lib/Server/Input/Parser/ContentCreate.php
+++ b/src/lib/Server/Input/Parser/ContentCreate.php
@@ -1,20 +1,20 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Input\BaseParser;
+use DateTime;
+use Ibexa\Contracts\Core\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\ContentTypeService;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
-use Ibexa\Rest\Input\ParserTools;
+use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Rest\Input\FieldTypeParser;
-use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\ContentService;
-use eZ\Publish\API\Repository\ContentTypeService;
+use Ibexa\Rest\Input\ParserTools;
 use Ibexa\Rest\Server\Values\RestContentCreateStruct;
-use DateTime;
 
 /**
  * Parser for ContentCreate.
@@ -24,46 +24,46 @@ class ContentCreate extends BaseParser
     /**
      * Content service.
      *
-     * @var \eZ\Publish\API\Repository\ContentService
+     * @var \Ibexa\Contracts\Core\Repository\ContentService
      */
     protected $contentService;
 
     /**
      * ContentType service.
      *
-     * @var \eZ\Publish\API\Repository\ContentTypeService
+     * @var \Ibexa\Contracts\Core\Repository\ContentTypeService
      */
     protected $contentTypeService;
 
     /**
      * FieldType parser.
      *
-     * @var \EzSystems\EzPlatformRest\Input\FieldTypeParser
+     * @var \Ibexa\Rest\Input\FieldTypeParser
      */
     protected $fieldTypeParser;
 
     /**
      * LocationCreate parser.
      *
-     * @var \EzSystems\EzPlatformRest\Server\Input\Parser\LocationCreate
+     * @var \Ibexa\Rest\Server\Input\Parser\LocationCreate
      */
     protected $locationCreateParser;
 
     /**
      * Parser tools.
      *
-     * @var \EzSystems\EzPlatformRest\Input\ParserTools
+     * @var \Ibexa\Rest\Input\ParserTools
      */
     protected $parserTools;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\ContentService $contentService
-     * @param \eZ\Publish\API\Repository\ContentTypeService $contentTypeService
-     * @param \EzSystems\EzPlatformRest\Input\FieldTypeParser $fieldTypeParser
-     * @param \EzSystems\EzPlatformRest\Server\Input\Parser\LocationCreate $locationCreateParser
-     * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools
+     * @param \Ibexa\Contracts\Core\Repository\ContentService $contentService
+     * @param \Ibexa\Contracts\Core\Repository\ContentTypeService $contentTypeService
+     * @param \Ibexa\Rest\Input\FieldTypeParser $fieldTypeParser
+     * @param \Ibexa\Rest\Server\Input\Parser\LocationCreate $locationCreateParser
+     * @param \Ibexa\Rest\Input\ParserTools $parserTools
      */
     public function __construct(
         ContentService $contentService,
@@ -83,9 +83,9 @@ public function __construct(
      * Parse input structure.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RestContentCreateStruct
+     * @return \Ibexa\Rest\Server\Values\RestContentCreateStruct
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
@@ -161,8 +161,10 @@ public function parse(array $data, ParsingDispatcher $parsingDispatcher)
                 throw new Exceptions\Parser("Missing 'fieldValue' element for the '{$fieldData['fieldDefinitionIdentifier']}' identifier in ContentCreate.");
             }
 
-            $fieldValue = $this->fieldTypeParser->parseValue($fieldDefinition->fieldTypeIdentifier,
-                $fieldData['fieldValue']);
+            $fieldValue = $this->fieldTypeParser->parseValue(
+                $fieldDefinition->fieldTypeIdentifier,
+                $fieldData['fieldValue']
+            );
 
             $languageCode = null;
             if (array_key_exists('languageCode', $fieldData)) {
diff --git a/src/lib/Server/Input/Parser/ContentQuery.php b/src/lib/Server/Input/Parser/ContentQuery.php
index d14118d0..ced52438 100644
--- a/src/lib/Server/Input/Parser/ContentQuery.php
+++ b/src/lib/Server/Input/Parser/ContentQuery.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use eZ\Publish\API\Repository\Values\Content\Query;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query;
 use Ibexa\Rest\Server\Input\Parser\Query as QueryParser;
 
 /**
diff --git a/src/lib/Server/Input/Parser/ContentTypeCreate.php b/src/lib/Server/Input/Parser/ContentTypeCreate.php
index fdd3594b..2dc5a9cd 100644
--- a/src/lib/Server/Input/Parser/ContentTypeCreate.php
+++ b/src/lib/Server/Input/Parser/ContentTypeCreate.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Input\BaseParser;
+use DateTime;
+use Ibexa\Contracts\Core\Repository\ContentTypeService;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Rest\Input\ParserTools;
-use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\ContentTypeService;
-use DateTime;
 
 /**
  * Parser for ContentTypeCreate.
@@ -21,30 +21,30 @@ class ContentTypeCreate extends BaseParser
     /**
      * ContentType service.
      *
-     * @var \eZ\Publish\API\Repository\ContentTypeService
+     * @var \Ibexa\Contracts\Core\Repository\ContentTypeService
      */
     protected $contentTypeService;
 
     /**
      * FieldDefinitionCreate parser.
      *
-     * @var \EzSystems\EzPlatformRest\Server\Input\Parser\FieldDefinitionCreate
+     * @var \Ibexa\Rest\Server\Input\Parser\FieldDefinitionCreate
      */
     protected $fieldDefinitionCreateParser;
 
     /**
      * Parser tools.
      *
-     * @var \EzSystems\EzPlatformRest\Input\ParserTools
+     * @var \Ibexa\Rest\Input\ParserTools
      */
     protected $parserTools;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\ContentTypeService $contentTypeService
-     * @param \EzSystems\EzPlatformRest\Server\Input\Parser\FieldDefinitionCreate $fieldDefinitionCreateParser
-     * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools
+     * @param \Ibexa\Contracts\Core\Repository\ContentTypeService $contentTypeService
+     * @param \Ibexa\Rest\Server\Input\Parser\FieldDefinitionCreate $fieldDefinitionCreateParser
+     * @param \Ibexa\Rest\Input\ParserTools $parserTools
      */
     public function __construct(
         ContentTypeService $contentTypeService,
@@ -60,9 +60,9 @@ public function __construct(
      * Parse input structure.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @return \eZ\Publish\API\Repository\Values\ContentType\ContentTypeCreateStruct
+     * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeCreateStruct
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/ContentTypeGroupInput.php b/src/lib/Server/Input/Parser/ContentTypeGroupInput.php
index 7a456d13..1860e2b1 100644
--- a/src/lib/Server/Input/Parser/ContentTypeGroupInput.php
+++ b/src/lib/Server/Input/Parser/ContentTypeGroupInput.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Input\BaseParser;
+use DateTime;
+use Ibexa\Contracts\Core\Repository\ContentTypeService;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Rest\Input\ParserTools;
-use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\ContentTypeService;
-use DateTime;
 
 /**
  * Parser for ContentTypeGroupInput.
@@ -21,20 +21,20 @@ class ContentTypeGroupInput extends BaseParser
     /**
      * ContentType service.
      *
-     * @var \eZ\Publish\API\Repository\ContentTypeService
+     * @var \Ibexa\Contracts\Core\Repository\ContentTypeService
      */
     protected $contentTypeService;
 
     /**
-     * @var \EzSystems\EzPlatformRest\Input\ParserTools
+     * @var \Ibexa\Rest\Input\ParserTools
      */
     protected $parserTools;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\ContentTypeService $contentTypeService
-     * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools
+     * @param \Ibexa\Contracts\Core\Repository\ContentTypeService $contentTypeService
+     * @param \Ibexa\Rest\Input\ParserTools $parserTools
      */
     public function __construct(ContentTypeService $contentTypeService, ParserTools $parserTools)
     {
@@ -46,9 +46,9 @@ public function __construct(ContentTypeService $contentTypeService, ParserTools
      * Parse input structure.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @return \eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroupCreateStruct
+     * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroupCreateStruct
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/ContentTypeUpdate.php b/src/lib/Server/Input/Parser/ContentTypeUpdate.php
index 934437dc..53c311e7 100644
--- a/src/lib/Server/Input/Parser/ContentTypeUpdate.php
+++ b/src/lib/Server/Input/Parser/ContentTypeUpdate.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Input\BaseParser;
+use DateTime;
+use Ibexa\Contracts\Core\Repository\ContentTypeService;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Rest\Input\ParserTools;
-use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\ContentTypeService;
-use DateTime;
 
 /**
  * Parser for ContentTypeUpdate.
@@ -21,22 +21,22 @@ class ContentTypeUpdate extends BaseParser
     /**
      * ContentType service.
      *
-     * @var \eZ\Publish\API\Repository\ContentTypeService
+     * @var \Ibexa\Contracts\Core\Repository\ContentTypeService
      */
     protected $contentTypeService;
 
     /**
      * Parser tools.
      *
-     * @var \EzSystems\EzPlatformRest\Input\ParserTools
+     * @var \Ibexa\Rest\Input\ParserTools
      */
     protected $parserTools;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\ContentTypeService $contentTypeService
-     * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools
+     * @param \Ibexa\Contracts\Core\Repository\ContentTypeService $contentTypeService
+     * @param \Ibexa\Rest\Input\ParserTools $parserTools
      */
     public function __construct(ContentTypeService $contentTypeService, ParserTools $parserTools)
     {
@@ -48,9 +48,9 @@ public function __construct(ContentTypeService $contentTypeService, ParserTools
      * Parse input structure.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @return \eZ\Publish\API\Repository\Values\ContentType\ContentTypeUpdateStruct
+     * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeUpdateStruct
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/ContentUpdate.php b/src/lib/Server/Input/Parser/ContentUpdate.php
index 09e37af9..6a8995c8 100644
--- a/src/lib/Server/Input/Parser/ContentUpdate.php
+++ b/src/lib/Server/Input/Parser/ContentUpdate.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
-use Ibexa\Contracts\Rest\Exceptions;
-use Ibexa\Rest\Values\RestContentMetadataUpdateStruct;
 use DateTime;
 use Exception;
+use Ibexa\Contracts\Rest\Exceptions;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
+use Ibexa\Rest\Values\RestContentMetadataUpdateStruct;
 
 /**
  * Parser for ContentUpdate.
@@ -24,11 +24,11 @@ class ContentUpdate extends BaseParser
      * @todo use url handler instead of hardcoded URL matching
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @return \EzSystems\EzPlatformRest\Values\RestContentMetadataUpdateStruct
+     * @return \Ibexa\Rest\Values\RestContentMetadataUpdateStruct
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser if $data is invalid
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser if $data is invalid
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/Criterion.php b/src/lib/Server/Input/Parser/Criterion.php
index d328297b..fe0f451c 100644
--- a/src/lib/Server/Input/Parser/Criterion.php
+++ b/src/lib/Server/Input/Parser/Criterion.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation;
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation;
 use Ibexa\Contracts\Rest\Exceptions;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for ViewInput.
@@ -30,11 +30,11 @@ abstract class Criterion extends BaseParser
      *
      * @param string $criterionName
      * @param mixed $criterionData
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion
      */
     public function dispatchCriterion($criterionName, $criterionData, ParsingDispatcher $parsingDispatcher)
     {
@@ -51,11 +51,11 @@ public function dispatchCriterion($criterionName, $criterionData, ParsingDispatc
      *
      * @param string $facetBuilderName
      * @param mixed $facetBuilderData
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\ValueObject
+     * @return \Ibexa\Contracts\Core\Repository\Values\ValueObject
      */
     public function dispatchFacetBuilder($facetBuilderName, $facetBuilderData, ParsingDispatcher $parsingDispatcher)
     {
@@ -71,7 +71,7 @@ public function dispatchFacetBuilder($facetBuilderName, $facetBuilderData, Parsi
     /**
      * Dispatches parsing of a aggregation name + data to its own parser.
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\Aggregation
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation
      */
     public function dispatchAggregation(
         string $aggregationName,
@@ -91,11 +91,11 @@ public function dispatchAggregation(
      *
      * @param string $sortClauseName
      * @param string $direction
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion
      */
     public function dispatchSortClause($sortClauseName, $direction, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/Criterion/Ancestor.php b/src/lib/Server/Input/Parser/Criterion/Ancestor.php
index 52adbbb8..103c8c64 100644
--- a/src/lib/Server/Input/Parser/Criterion/Ancestor.php
+++ b/src/lib/Server/Input/Parser/Criterion/Ancestor.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Ancestor as AncestorCriterion;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Ancestor as AncestorCriterion;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for Ancestor Criterion.
@@ -20,11 +20,11 @@ class Ancestor extends BaseParser
      * Parses input structure to a Criterion object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\Ancestor
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Ancestor
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/Criterion/ContentId.php b/src/lib/Server/Input/Parser/Criterion/ContentId.php
index 87182997..2baf65bf 100644
--- a/src/lib/Server/Input/Parser/Criterion/ContentId.php
+++ b/src/lib/Server/Input/Parser/Criterion/ContentId.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ContentId as ContentIdCriterion;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\ContentId as ContentIdCriterion;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for ViewInput.
@@ -20,11 +20,11 @@ class ContentId extends BaseParser
      * Parses input structure to a Criterion object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\ContentId
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ContentId
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/Criterion/ContentRemoteId.php b/src/lib/Server/Input/Parser/Criterion/ContentRemoteId.php
index 17ad8dd3..c0390fb9 100644
--- a/src/lib/Server/Input/Parser/Criterion/ContentRemoteId.php
+++ b/src/lib/Server/Input/Parser/Criterion/ContentRemoteId.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\RemoteId as ContentRemoteIdCriterion;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\RemoteId as ContentRemoteIdCriterion;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for RemoteId Criterion.
@@ -20,11 +20,11 @@ class ContentRemoteId extends BaseParser
      * Parses input structure to a Criterion object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\RemoteId
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\RemoteId
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/Criterion/ContentTypeGroupId.php b/src/lib/Server/Input/Parser/Criterion/ContentTypeGroupId.php
index 02722128..c3a53206 100644
--- a/src/lib/Server/Input/Parser/Criterion/ContentTypeGroupId.php
+++ b/src/lib/Server/Input/Parser/Criterion/ContentTypeGroupId.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ContentTypeGroupId as ContentTypeGroupIdCriterion;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\ContentTypeGroupId as ContentTypeGroupIdCriterion;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for ContentTypeGroupId Criterion.
@@ -20,11 +20,11 @@ class ContentTypeGroupId extends BaseParser
      * Parses input structure to a Criterion object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\ContentTypeGroupId
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ContentTypeGroupId
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/Criterion/ContentTypeId.php b/src/lib/Server/Input/Parser/Criterion/ContentTypeId.php
index 4f383270..edb11d5e 100644
--- a/src/lib/Server/Input/Parser/Criterion/ContentTypeId.php
+++ b/src/lib/Server/Input/Parser/Criterion/ContentTypeId.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ContentTypeId as ContentTypeIdCriterion;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\ContentTypeId as ContentTypeIdCriterion;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for ViewInput.
@@ -20,11 +20,11 @@ class ContentTypeId extends BaseParser
      * Parses input structure to a Criterion object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\ContentTypeId
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ContentTypeId
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/Criterion/ContentTypeIdentifier.php b/src/lib/Server/Input/Parser/Criterion/ContentTypeIdentifier.php
index b860100b..2826f1f6 100644
--- a/src/lib/Server/Input/Parser/Criterion/ContentTypeIdentifier.php
+++ b/src/lib/Server/Input/Parser/Criterion/ContentTypeIdentifier.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\ContentTypeService;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ContentTypeId as ContentTypeIdCriterion;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\ContentTypeService;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\ContentTypeId as ContentTypeIdCriterion;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for ViewInput.
@@ -20,7 +20,7 @@ class ContentTypeIdentifier extends BaseParser
     /**
      * Content type service.
      *
-     * @var \eZ\Publish\API\Repository\ContentTypeService
+     * @var \Ibexa\Contracts\Core\Repository\ContentTypeService
      */
     protected $contentTypeService;
 
@@ -33,11 +33,11 @@ public function __construct(ContentTypeService $contentTypeService)
      * Parses input structure to a Criterion object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\ContentTypeId
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ContentTypeId
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/Criterion/DateMetadata.php b/src/lib/Server/Input/Parser/Criterion/DateMetadata.php
index 0a67a4db..c44d3a11 100644
--- a/src/lib/Server/Input/Parser/Criterion/DateMetadata.php
+++ b/src/lib/Server/Input/Parser/Criterion/DateMetadata.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\DateMetadata as DateMetadataCriterion;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\DateMetadata as DateMetadataCriterion;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator;
 use Ibexa\Contracts\Rest\Exceptions;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for ViewInput Criterion.
@@ -32,7 +32,7 @@ class DateMetadata extends BaseParser
      *
      * @param string[] $data
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher): DateMetadataCriterion
     {
@@ -76,7 +76,7 @@ public function parse(array $data, ParsingDispatcher $parsingDispatcher): DateMe
      *
      * For the full list of supported operators:
      *
-     * @see \eZ\Publish\API\Repository\Values\Content\Query\Criterion\DateMetadata::OPERATORS
+     * @see \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\DateMetadata::OPERATORS
      */
     private function getOperator(string $operatorName): string
     {
diff --git a/src/lib/Server/Input/Parser/Criterion/Field.php b/src/lib/Server/Input/Parser/Criterion/Field.php
index 6264857c..d3e6dcc4 100644
--- a/src/lib/Server/Input/Parser/Criterion/Field.php
+++ b/src/lib/Server/Input/Parser/Criterion/Field.php
@@ -1,23 +1,23 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Field as FieldCriterion;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator;
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Field as FieldCriterion;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator;
 use Ibexa\Contracts\Rest\Exceptions;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for Field Criterion.
  */
 class Field extends BaseParser
 {
-    const OPERATORS = [
+    public const OPERATORS = [
         'IN' => Operator::IN,
         'EQ' => Operator::EQ,
         'GT' => Operator::GT,
@@ -33,11 +33,11 @@ class Field extends BaseParser
      * Parses input structure to a Criterion object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\Field
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Field
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
@@ -64,7 +64,7 @@ public function parse(array $data, ParsingDispatcher $parsingDispatcher)
      *
      * For the full list of supported operators:
      *
-     * @see \EzSystems\EzPlatformRest\Server\Input\Parser\Criterion\Field::OPERATORS
+     * @see \Ibexa\Rest\Server\Input\Parser\Criterion\Field::OPERATORS
      *
      * @param string $operatorName operator literal operator name
      *
diff --git a/src/lib/Server/Input/Parser/Criterion/FullText.php b/src/lib/Server/Input/Parser/Criterion/FullText.php
index 608fdf6f..afb6b570 100644
--- a/src/lib/Server/Input/Parser/Criterion/FullText.php
+++ b/src/lib/Server/Input/Parser/Criterion/FullText.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\FullText as FullTextCriterion;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\FullText as FullTextCriterion;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for FullText Criterion.
@@ -20,11 +20,11 @@ class FullText extends BaseParser
      * Parses input structure to a FullText criterion.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\FullText
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\FullText
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/Criterion/IsUserBased.php b/src/lib/Server/Input/Parser/Criterion/IsUserBased.php
index 4223cc20..0b432c0b 100644
--- a/src/lib/Server/Input/Parser/Criterion/IsUserBased.php
+++ b/src/lib/Server/Input/Parser/Criterion/IsUserBased.php
@@ -1,22 +1,22 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\IsUserBased as IsUserBasedCriterion;
+use Ibexa\Contracts\Rest\Exceptions;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Rest\Input\ParserTools;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
-use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\IsUserBased as IsUserBasedCriterion;
 
 class IsUserBased extends BaseParser
 {
-    /** @var \EzSystems\EzPlatformRest\Input\ParserTools */
+    /** @var \Ibexa\Rest\Input\ParserTools */
     protected $parserTools;
 
     public function __construct(ParserTools $parserTools)
diff --git a/src/lib/Server/Input/Parser/Criterion/IsUserEnabled.php b/src/lib/Server/Input/Parser/Criterion/IsUserEnabled.php
index b31ca1ea..23dbbdae 100644
--- a/src/lib/Server/Input/Parser/Criterion/IsUserEnabled.php
+++ b/src/lib/Server/Input/Parser/Criterion/IsUserEnabled.php
@@ -1,22 +1,22 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\IsUserEnabled as IsUserEnabledCriterion;
+use Ibexa\Contracts\Rest\Exceptions;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Rest\Input\ParserTools;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
-use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\IsUserEnabled as IsUserEnabledCriterion;
 
 class IsUserEnabled extends BaseParser
 {
-    /** @var \EzSystems\EzPlatformRest\Input\ParserTools */
+    /** @var \Ibexa\Rest\Input\ParserTools */
     protected $parserTools;
 
     public function __construct(ParserTools $parserTools)
diff --git a/src/lib/Server/Input/Parser/Criterion/LanguageCode.php b/src/lib/Server/Input/Parser/Criterion/LanguageCode.php
index c636752e..04810fa0 100644
--- a/src/lib/Server/Input/Parser/Criterion/LanguageCode.php
+++ b/src/lib/Server/Input/Parser/Criterion/LanguageCode.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LanguageCode as LanguageCodeCriterion;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\LanguageCode as LanguageCodeCriterion;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for LanguageCode Criterion.
@@ -20,11 +20,11 @@ class LanguageCode extends BaseParser
      * Parses input structure to a LanguageCode Criterion object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\LanguageCode
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LanguageCode
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/Criterion/LocationId.php b/src/lib/Server/Input/Parser/Criterion/LocationId.php
index bee1c9be..51fe9027 100644
--- a/src/lib/Server/Input/Parser/Criterion/LocationId.php
+++ b/src/lib/Server/Input/Parser/Criterion/LocationId.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LocationId as LocationIdCriterion;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\LocationId as LocationIdCriterion;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for LocationId Criterion.
@@ -20,11 +20,11 @@ class LocationId extends BaseParser
      * Parses input structure to a Criterion object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\LocationId
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LocationId
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/Criterion/LocationRemoteId.php b/src/lib/Server/Input/Parser/Criterion/LocationRemoteId.php
index 198ff70e..5bafbac9 100644
--- a/src/lib/Server/Input/Parser/Criterion/LocationRemoteId.php
+++ b/src/lib/Server/Input/Parser/Criterion/LocationRemoteId.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LocationRemoteId as LocationRemoteIdCriterion;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\LocationRemoteId as LocationRemoteIdCriterion;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for LocationRemoteId Criterion.
@@ -20,11 +20,11 @@ class LocationRemoteId extends BaseParser
      * Parses input structure to a Criterion object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\LocationRemoteId
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LocationRemoteId
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/Criterion/LogicalAnd.php b/src/lib/Server/Input/Parser/Criterion/LogicalAnd.php
index 4d823031..24cf211d 100644
--- a/src/lib/Server/Input/Parser/Criterion/LogicalAnd.php
+++ b/src/lib/Server/Input/Parser/Criterion/LogicalAnd.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Core\Repository\Values;
 
 /**
  * Parser for LogicalAnd Criterion.
@@ -18,17 +18,17 @@ class LogicalAnd extends LogicalOperator
     /**
      * @var string
      */
-    const TAG_NAME = 'AND';
+    public const TAG_NAME = 'AND';
 
     /**
      * Parses input structure to a LogicalAnd Criterion object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\LogicalAnd
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LogicalAnd
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/Criterion/LogicalNot.php b/src/lib/Server/Input/Parser/Criterion/LogicalNot.php
index bdc92610..5bf03b78 100644
--- a/src/lib/Server/Input/Parser/Criterion/LogicalNot.php
+++ b/src/lib/Server/Input/Parser/Criterion/LogicalNot.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
-use Ibexa\Rest\Server\Input\Parser\Criterion as CriterionParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LogicalNot as LogicalNotCriterion;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\LogicalNot as LogicalNotCriterion;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Server\Input\Parser\Criterion as CriterionParser;
 
 /**
  * Parser for LogicalNot Criterion.
@@ -20,11 +20,11 @@ class LogicalNot extends CriterionParser
      * Parses input structure to a Criterion object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\LogicalNot
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LogicalNot
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/Criterion/LogicalOperator.php b/src/lib/Server/Input/Parser/Criterion/LogicalOperator.php
index 246fe6e5..155c76f2 100644
--- a/src/lib/Server/Input/Parser/Criterion/LogicalOperator.php
+++ b/src/lib/Server/Input/Parser/Criterion/LogicalOperator.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
@@ -18,11 +18,11 @@ class LogicalOperator extends Criterion
      * Parses input structure to a Criterion object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\LogicalOperator
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LogicalOperator
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/Criterion/LogicalOr.php b/src/lib/Server/Input/Parser/Criterion/LogicalOr.php
index e1c72dd1..f6de7346 100644
--- a/src/lib/Server/Input/Parser/Criterion/LogicalOr.php
+++ b/src/lib/Server/Input/Parser/Criterion/LogicalOr.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Core\Repository\Values;
 
 /**
  * Parser for LogicalOr Criterion.
@@ -18,17 +18,17 @@ class LogicalOr extends LogicalOperator
     /**
      * @var string
      */
-    const TAG_NAME = 'OR';
+    public const TAG_NAME = 'OR';
 
     /**
      * Parses input structure to a LogicalOr Criterion object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\LogicalOr
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LogicalOr
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/Criterion/MoreLikeThis.php b/src/lib/Server/Input/Parser/Criterion/MoreLikeThis.php
index 35ccf0a6..124d1086 100644
--- a/src/lib/Server/Input/Parser/Criterion/MoreLikeThis.php
+++ b/src/lib/Server/Input/Parser/Criterion/MoreLikeThis.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
-use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for MoreLikeThis Criterion.
@@ -18,11 +18,11 @@ class MoreLikeThis extends BaseParser
      * Parses input structure to a Criterion object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\MoreLikeThis
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\MoreLikeThis
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/Criterion/ObjectStateId.php b/src/lib/Server/Input/Parser/Criterion/ObjectStateId.php
index 37af4c9c..c7af6dd6 100644
--- a/src/lib/Server/Input/Parser/Criterion/ObjectStateId.php
+++ b/src/lib/Server/Input/Parser/Criterion/ObjectStateId.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ObjectStateId as ObjectStateIdCriterion;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\ObjectStateId as ObjectStateIdCriterion;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for ObjectStateId Criterion.
@@ -20,11 +20,11 @@ class ObjectStateId extends BaseParser
      * Parses input structure to a ObjectStateId Criterion object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\ObjectStateId
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ObjectStateId
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/Criterion/ObjectStateIdentifier.php b/src/lib/Server/Input/Parser/Criterion/ObjectStateIdentifier.php
index e6c71ad5..a0cabcfa 100644
--- a/src/lib/Server/Input/Parser/Criterion/ObjectStateIdentifier.php
+++ b/src/lib/Server/Input/Parser/Criterion/ObjectStateIdentifier.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ObjectStateIdentifier as ObjectStateIdentifierCriterion;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\ObjectStateIdentifier as ObjectStateIdentifierCriterion;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 class ObjectStateIdentifier extends BaseParser
 {
diff --git a/src/lib/Server/Input/Parser/Criterion/Operator.php b/src/lib/Server/Input/Parser/Criterion/Operator.php
index 61d3cdb9..26def8c6 100644
--- a/src/lib/Server/Input/Parser/Criterion/Operator.php
+++ b/src/lib/Server/Input/Parser/Criterion/Operator.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
-use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for Operator Criterion.
@@ -18,11 +18,11 @@ class Operator extends BaseParser
      * Parses input structure to a Criterion object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/Criterion/ParentLocationId.php b/src/lib/Server/Input/Parser/Criterion/ParentLocationId.php
index 56b72aea..7df7ea27 100644
--- a/src/lib/Server/Input/Parser/Criterion/ParentLocationId.php
+++ b/src/lib/Server/Input/Parser/Criterion/ParentLocationId.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ParentLocationId as ParentLocationIdCriterion;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\ParentLocationId as ParentLocationIdCriterion;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for LocationId Criterion.
@@ -20,11 +20,11 @@ class ParentLocationId extends BaseParser
      * Parses input structure to a ParentLocationId Criterion object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\ParentLocationId
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ParentLocationId
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/Criterion/ParentLocationRemoteId.php b/src/lib/Server/Input/Parser/Criterion/ParentLocationRemoteId.php
index d261c8f7..dedad939 100644
--- a/src/lib/Server/Input/Parser/Criterion/ParentLocationRemoteId.php
+++ b/src/lib/Server/Input/Parser/Criterion/ParentLocationRemoteId.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\LocationService;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ParentLocationId as ParentLocationIdCriterion;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\LocationService;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\ParentLocationId as ParentLocationIdCriterion;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for ParentLocationId Criterion.
@@ -20,7 +20,7 @@ class ParentLocationRemoteId extends BaseParser
     /**
      * Location service.
      *
-     * @var \eZ\Publish\API\Repository\LocationService
+     * @var \Ibexa\Contracts\Core\Repository\LocationService
      */
     protected $locationService;
 
@@ -33,11 +33,11 @@ public function __construct(LocationService $locationService)
      * Parses input structure to a Criterion object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\ParentLocationId
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ParentLocationId
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/Criterion/SectionId.php b/src/lib/Server/Input/Parser/Criterion/SectionId.php
index 71505fbc..1a5cb7b3 100644
--- a/src/lib/Server/Input/Parser/Criterion/SectionId.php
+++ b/src/lib/Server/Input/Parser/Criterion/SectionId.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\SectionId as SectionIdCriterion;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\SectionId as SectionIdCriterion;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for SectionId Criterion.
@@ -20,11 +20,11 @@ class SectionId extends BaseParser
      * Parses input structure to a SectionId Criterion object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\SectionId
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\SectionId
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/Criterion/SectionIdentifier.php b/src/lib/Server/Input/Parser/Criterion/SectionIdentifier.php
index 434c84e6..fd9f1468 100644
--- a/src/lib/Server/Input/Parser/Criterion/SectionIdentifier.php
+++ b/src/lib/Server/Input/Parser/Criterion/SectionIdentifier.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\SectionIdentifier as SectionIdentifierCriterion;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\SectionIdentifier as SectionIdentifierCriterion;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 class SectionIdentifier extends BaseParser
 {
diff --git a/src/lib/Server/Input/Parser/Criterion/Sibling.php b/src/lib/Server/Input/Parser/Criterion/Sibling.php
index 3f647ee1..95775360 100644
--- a/src/lib/Server/Input/Parser/Criterion/Sibling.php
+++ b/src/lib/Server/Input/Parser/Criterion/Sibling.php
@@ -1,22 +1,22 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
-use eZ\Publish\API\Repository\LocationService;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Sibling as SiblingCriterion;
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\LocationService;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Sibling as SiblingCriterion;
 use Ibexa\Contracts\Rest\Exceptions;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 class Sibling extends BaseParser
 {
-    /** @var \eZ\Publish\API\Repository\LocationService */
+    /** @var \Ibexa\Contracts\Core\Repository\LocationService */
     private $locationService;
 
     public function __construct(LocationService $locationService)
diff --git a/src/lib/Server/Input/Parser/Criterion/Subtree.php b/src/lib/Server/Input/Parser/Criterion/Subtree.php
index 8553d1dd..0523066a 100644
--- a/src/lib/Server/Input/Parser/Criterion/Subtree.php
+++ b/src/lib/Server/Input/Parser/Criterion/Subtree.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Subtree as SubtreeCriterion;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Subtree as SubtreeCriterion;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for Subtree Criterion.
@@ -20,11 +20,11 @@ class Subtree extends BaseParser
      * Parses input structure to a Criterion object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\Subtree
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Subtree
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/Criterion/UserEmail.php b/src/lib/Server/Input/Parser/Criterion/UserEmail.php
index e6fd205e..6efc838a 100644
--- a/src/lib/Server/Input/Parser/Criterion/UserEmail.php
+++ b/src/lib/Server/Input/Parser/Criterion/UserEmail.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator as QueryOperator;
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator as QueryOperator;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\UserEmail as UserEmailCriterion;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\UserEmail as UserEmailCriterion;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 class UserEmail extends BaseParser
 {
diff --git a/src/lib/Server/Input/Parser/Criterion/UserId.php b/src/lib/Server/Input/Parser/Criterion/UserId.php
index d416a500..b9e06683 100644
--- a/src/lib/Server/Input/Parser/Criterion/UserId.php
+++ b/src/lib/Server/Input/Parser/Criterion/UserId.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\UserId as UserIdCriterion;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\UserId as UserIdCriterion;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 class UserId extends BaseParser
 {
diff --git a/src/lib/Server/Input/Parser/Criterion/UserLogin.php b/src/lib/Server/Input/Parser/Criterion/UserLogin.php
index e2f1b875..5e11e726 100644
--- a/src/lib/Server/Input/Parser/Criterion/UserLogin.php
+++ b/src/lib/Server/Input/Parser/Criterion/UserLogin.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator as QueryOperator;
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator as QueryOperator;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\UserLogin as UserLoginCriterion;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\UserLogin as UserLoginCriterion;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 class UserLogin extends BaseParser
 {
diff --git a/src/lib/Server/Input/Parser/Criterion/UserMetadata.php b/src/lib/Server/Input/Parser/Criterion/UserMetadata.php
index 68986c58..eee7339a 100644
--- a/src/lib/Server/Input/Parser/Criterion/UserMetadata.php
+++ b/src/lib/Server/Input/Parser/Criterion/UserMetadata.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\UserMetadata as UserMetadataCriterion;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\UserMetadata as UserMetadataCriterion;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for ViewInput.
@@ -20,11 +20,11 @@ class UserMetadata extends BaseParser
      * Parses input structure to a Criterion object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\UserMetadata
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\UserMetadata
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/Criterion/Visibility.php b/src/lib/Server/Input/Parser/Criterion/Visibility.php
index 26880c54..109115ea 100644
--- a/src/lib/Server/Input/Parser/Criterion/Visibility.php
+++ b/src/lib/Server/Input/Parser/Criterion/Visibility.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Visibility as VisibilityCriterion;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Visibility as VisibilityCriterion;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for Visibility Criterion.
@@ -20,11 +20,11 @@ class Visibility extends BaseParser
      * Parses input structure to a Visibility Criterion object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\Visibility
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Visibility
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/FacetBuilder/ContentTypeParser.php b/src/lib/Server/Input/Parser/FacetBuilder/ContentTypeParser.php
index 115d4b84..522af508 100644
--- a/src/lib/Server/Input/Parser/FacetBuilder/ContentTypeParser.php
+++ b/src/lib/Server/Input/Parser/FacetBuilder/ContentTypeParser.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\FacetBuilder;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\ContentTypeFacetBuilder;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\ContentTypeFacetBuilder;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for ContentType facet builder.
@@ -20,11 +20,11 @@ class ContentTypeParser extends BaseParser
      * Parses input structure to a FacetBuilder object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\ContentTypeFacetBuilder
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\ContentTypeFacetBuilder
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/FacetBuilder/CriterionParser.php b/src/lib/Server/Input/Parser/FacetBuilder/CriterionParser.php
index c21f777b..4bd8452c 100644
--- a/src/lib/Server/Input/Parser/FacetBuilder/CriterionParser.php
+++ b/src/lib/Server/Input/Parser/FacetBuilder/CriterionParser.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\FacetBuilder;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\CriterionFacetBuilder;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\CriterionFacetBuilder;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for Criterion facet builder.
@@ -20,11 +20,11 @@ class CriterionParser extends BaseParser
      * Parses input structure to a FacetBuilder object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\CriterionFacetBuilder
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\CriterionFacetBuilder
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/FacetBuilder/DateRangeParser.php b/src/lib/Server/Input/Parser/FacetBuilder/DateRangeParser.php
index f216723a..e4de82c8 100644
--- a/src/lib/Server/Input/Parser/FacetBuilder/DateRangeParser.php
+++ b/src/lib/Server/Input/Parser/FacetBuilder/DateRangeParser.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\FacetBuilder;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\DateRangeFacetBuilder;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\DateRangeFacetBuilder;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for DateRange facet builder.
@@ -20,11 +20,11 @@ class DateRangeParser extends BaseParser
      * Parses input structure to a FacetBuilder object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\DateRangeFacetBuilder
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\DateRangeFacetBuilder
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/FacetBuilder/FieldParser.php b/src/lib/Server/Input/Parser/FacetBuilder/FieldParser.php
index 577f87fe..093c8af1 100644
--- a/src/lib/Server/Input/Parser/FacetBuilder/FieldParser.php
+++ b/src/lib/Server/Input/Parser/FacetBuilder/FieldParser.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\FacetBuilder;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\FieldFacetBuilder;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\FieldFacetBuilder;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for Field facet builder.
@@ -20,11 +20,11 @@ class FieldParser extends BaseParser
      * Parses input structure to a FacetBuilder object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\FieldFacetBuilder
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\FieldFacetBuilder
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/FacetBuilder/FieldRangeParser.php b/src/lib/Server/Input/Parser/FacetBuilder/FieldRangeParser.php
index c74666ef..6922f7c1 100644
--- a/src/lib/Server/Input/Parser/FacetBuilder/FieldRangeParser.php
+++ b/src/lib/Server/Input/Parser/FacetBuilder/FieldRangeParser.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\FacetBuilder;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Contracts\Rest\Exceptions;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for FieldRange facet builder.
@@ -19,11 +19,11 @@ class FieldRangeParser extends BaseParser
      * Parses input structure to a FacetBuilder object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\FieldRangeFacetBuilder
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\FieldRangeFacetBuilder
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/FacetBuilder/LocationParser.php b/src/lib/Server/Input/Parser/FacetBuilder/LocationParser.php
index 437798b1..93fb0393 100644
--- a/src/lib/Server/Input/Parser/FacetBuilder/LocationParser.php
+++ b/src/lib/Server/Input/Parser/FacetBuilder/LocationParser.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\FacetBuilder;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\LocationFacetBuilder;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\LocationFacetBuilder;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for Location facet builder.
@@ -20,11 +20,11 @@ class LocationParser extends BaseParser
      * Parses input structure to a FacetBuilder object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\LocationFacetBuilder
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\LocationFacetBuilder
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/FacetBuilder/SectionParser.php b/src/lib/Server/Input/Parser/FacetBuilder/SectionParser.php
index 3474814a..8a860eab 100644
--- a/src/lib/Server/Input/Parser/FacetBuilder/SectionParser.php
+++ b/src/lib/Server/Input/Parser/FacetBuilder/SectionParser.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\FacetBuilder;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\SectionFacetBuilder;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\SectionFacetBuilder;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for Section facet builder.
@@ -20,11 +20,11 @@ class SectionParser extends BaseParser
      * Parses input structure to a FacetBuilder object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\SectionFacetBuilder
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\SectionFacetBuilder
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/FacetBuilder/TermParser.php b/src/lib/Server/Input/Parser/FacetBuilder/TermParser.php
index e6660224..09036a76 100644
--- a/src/lib/Server/Input/Parser/FacetBuilder/TermParser.php
+++ b/src/lib/Server/Input/Parser/FacetBuilder/TermParser.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\FacetBuilder;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\TermFacetBuilder;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\TermFacetBuilder;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for Term facet builder.
@@ -20,11 +20,11 @@ class TermParser extends BaseParser
      * Parses input structure to a FacetBuilder object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\TermFacetBuilder
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\TermFacetBuilder
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/FacetBuilder/UserParser.php b/src/lib/Server/Input/Parser/FacetBuilder/UserParser.php
index 0436bd23..ed8aa9b2 100644
--- a/src/lib/Server/Input/Parser/FacetBuilder/UserParser.php
+++ b/src/lib/Server/Input/Parser/FacetBuilder/UserParser.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\FacetBuilder;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\UserFacetBuilder;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\UserFacetBuilder;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for User facet builder.
@@ -20,11 +20,11 @@ class UserParser extends BaseParser
      * Parses input structure to a FacetBuilder object.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\UserFacetBuilder
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\UserFacetBuilder
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/FieldDefinitionCreate.php b/src/lib/Server/Input/Parser/FieldDefinitionCreate.php
index 92ae18df..06f7eff2 100644
--- a/src/lib/Server/Input/Parser/FieldDefinitionCreate.php
+++ b/src/lib/Server/Input/Parser/FieldDefinitionCreate.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Input\BaseParser;
+use Exception;
+use Ibexa\Contracts\Core\Repository\ContentTypeService;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Rest\Input\FieldTypeParser;
 use Ibexa\Rest\Input\ParserTools;
-use eZ\Publish\API\Repository\ContentTypeService;
-use Ibexa\Contracts\Rest\Exceptions;
-use Exception;
 
 /**
  * Parser for FieldDefinitionCreate.
@@ -22,30 +22,30 @@ class FieldDefinitionCreate extends BaseParser
     /**
      * ContentType service.
      *
-     * @var \eZ\Publish\API\Repository\ContentTypeService
+     * @var \Ibexa\Contracts\Core\Repository\ContentTypeService
      */
     protected $contentTypeService;
 
     /**
      * FieldType parser.
      *
-     * @var \EzSystems\EzPlatformRest\Input\FieldTypeParser
+     * @var \Ibexa\Rest\Input\FieldTypeParser
      */
     protected $fieldTypeParser;
 
     /**
      * Parser tools.
      *
-     * @var \EzSystems\EzPlatformRest\Input\ParserTools
+     * @var \Ibexa\Rest\Input\ParserTools
      */
     protected $parserTools;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\ContentTypeService $contentTypeService
-     * @param \EzSystems\EzPlatformRest\Input\FieldTypeParser $fieldTypeParser
-     * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools
+     * @param \Ibexa\Contracts\Core\Repository\ContentTypeService $contentTypeService
+     * @param \Ibexa\Rest\Input\FieldTypeParser $fieldTypeParser
+     * @param \Ibexa\Rest\Input\ParserTools $parserTools
      */
     public function __construct(ContentTypeService $contentTypeService, FieldTypeParser $fieldTypeParser, ParserTools $parserTools)
     {
@@ -58,11 +58,11 @@ public function __construct(ContentTypeService $contentTypeService, FieldTypePar
      * Parse input structure.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser If an error is found while parsing
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser If an error is found while parsing
      *
-     * @return \eZ\Publish\API\Repository\Values\ContentType\FieldDefinitionCreateStruct
+     * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinitionCreateStruct
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/FieldDefinitionUpdate.php b/src/lib/Server/Input/Parser/FieldDefinitionUpdate.php
index 716f2712..3a4395bd 100644
--- a/src/lib/Server/Input/Parser/FieldDefinitionUpdate.php
+++ b/src/lib/Server/Input/Parser/FieldDefinitionUpdate.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Input\BaseParser;
+use Ibexa\Contracts\Core\Repository\ContentTypeService;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Rest\Input\FieldTypeParser;
 use Ibexa\Rest\Input\ParserTools;
-use eZ\Publish\API\Repository\ContentTypeService;
-use Ibexa\Contracts\Rest\Exceptions;
 
 /**
  * Parser for FieldDefinitionUpdate.
@@ -21,29 +21,29 @@ class FieldDefinitionUpdate extends BaseParser
     /**
      * ContentType service.
      *
-     * @var \eZ\Publish\API\Repository\ContentTypeService
+     * @var \Ibexa\Contracts\Core\Repository\ContentTypeService
      */
     protected $contentTypeService;
 
     /**
      * FieldType parser.
      *
-     * @var \EzSystems\EzPlatformRest\Input\FieldTypeParser
+     * @var \Ibexa\Rest\Input\FieldTypeParser
      */
     protected $fieldTypeParser;
 
     /**
      * Parser tools.
      *
-     * @var \EzSystems\EzPlatformRest\Input\ParserTools
+     * @var \Ibexa\Rest\Input\ParserTools
      */
     protected $parserTools;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\ContentTypeService $contentTypeService
-     * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools
+     * @param \Ibexa\Contracts\Core\Repository\ContentTypeService $contentTypeService
+     * @param \Ibexa\Rest\Input\ParserTools $parserTools
      */
     public function __construct(ContentTypeService $contentTypeService, FieldTypeParser $fieldTypeParser, ParserTools $parserTools)
     {
@@ -56,9 +56,9 @@ public function __construct(ContentTypeService $contentTypeService, FieldTypePar
      * Parse input structure.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @return \eZ\Publish\API\Repository\Values\ContentType\FieldDefinitionUpdateStruct
+     * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinitionUpdateStruct
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
@@ -150,13 +150,13 @@ public function parse(array $data, ParsingDispatcher $parsingDispatcher)
      *
      * @todo depends on temporary solution to give parser access to the URL
      *
-     * @see \EzSystems\EzPlatformRest\Server\Controller\ContentType::updateFieldDefinition
+     * @see \Ibexa\Rest\Server\Controller\ContentType::updateFieldDefinition
      *
-     * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
      *
      * @param array $data
      *
-     * @return \eZ\Publish\API\Repository\Values\ContentType\FieldDefinition
+     * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition
      */
     protected function getFieldDefinition(array $data)
     {
diff --git a/src/lib/Server/Input/Parser/JWTInput.php b/src/lib/Server/Input/Parser/JWTInput.php
index 27091f83..c1c6c113 100644
--- a/src/lib/Server/Input/Parser/JWTInput.php
+++ b/src/lib/Server/Input/Parser/JWTInput.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Contracts\Rest\Exceptions;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Rest\Server\Values\JWTInput as JWTInputValue;
 
 final class JWTInput extends BaseParser
diff --git a/src/lib/Server/Input/Parser/Limitation/PathStringRouteBasedLimitationParser.php b/src/lib/Server/Input/Parser/Limitation/PathStringRouteBasedLimitationParser.php
index d1a9b9e5..5473fcf8 100644
--- a/src/lib/Server/Input/Parser/Limitation/PathStringRouteBasedLimitationParser.php
+++ b/src/lib/Server/Input/Parser/Limitation/PathStringRouteBasedLimitationParser.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\Limitation;
 
-use eZ\Publish\API\Repository\Values;
 use Ibexa\Contracts\Rest\Exceptions;
+use Ibexa\Core\Repository\Values;
 
 /**
  * Generic limitation value parser.
@@ -22,7 +22,7 @@ class PathStringRouteBasedLimitationParser extends RouteBasedLimitationParser
     /**
      * Prefixes the value parsed by the parent with a '/'.
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser if the '_href' attribute doesn't end with a slash, since 6.4
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser if the '_href' attribute doesn't end with a slash, since 6.4
      *
      * @param $limitationValue
      *
diff --git a/src/lib/Server/Input/Parser/Limitation/RouteBasedLimitationParser.php b/src/lib/Server/Input/Parser/Limitation/RouteBasedLimitationParser.php
index 14b03698..404c60d3 100644
--- a/src/lib/Server/Input/Parser/Limitation/RouteBasedLimitationParser.php
+++ b/src/lib/Server/Input/Parser/Limitation/RouteBasedLimitationParser.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\Limitation;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Core\Repository\Values;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Generic limitation value parser.
@@ -53,9 +53,9 @@ public function __construct($limitationRouteParameterName, $limitationClass)
      * Parse input structure.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @return \eZ\Publish\API\Repository\Values\ValueObject
+     * @return \Ibexa\Contracts\Core\Repository\Values\ValueObject
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
@@ -81,7 +81,7 @@ public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     }
 
     /**
-     * @return \eZ\Publish\API\Repository\Values\User\Limitation
+     * @return \Ibexa\Contracts\Core\Repository\Values\User\Limitation
      */
     protected function buildLimitation()
     {
diff --git a/src/lib/Server/Input/Parser/LocationCreate.php b/src/lib/Server/Input/Parser/LocationCreate.php
index e2221250..6957449e 100644
--- a/src/lib/Server/Input/Parser/LocationCreate.php
+++ b/src/lib/Server/Input/Parser/LocationCreate.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Input\BaseParser;
+use Ibexa\Contracts\Core\Repository\LocationService;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Rest\Input\ParserTools;
-use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\LocationService;
 
 /**
  * Parser for LocationCreate.
@@ -20,22 +20,22 @@ class LocationCreate extends BaseParser
     /**
      * Location service.
      *
-     * @var \eZ\Publish\API\Repository\LocationService
+     * @var \Ibexa\Contracts\Core\Repository\LocationService
      */
     protected $locationService;
 
     /**
      * Parser tools.
      *
-     * @var \EzSystems\EzPlatformRest\Input\ParserTools
+     * @var \Ibexa\Rest\Input\ParserTools
      */
     protected $parserTools;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\LocationService $locationService
-     * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools
+     * @param \Ibexa\Contracts\Core\Repository\LocationService $locationService
+     * @param \Ibexa\Rest\Input\ParserTools $parserTools
      */
     public function __construct(LocationService $locationService, ParserTools $parserTools)
     {
@@ -47,9 +47,9 @@ public function __construct(LocationService $locationService, ParserTools $parse
      * Parse input structure.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\LocationCreateStruct
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\LocationCreateStruct
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/LocationQuery.php b/src/lib/Server/Input/Parser/LocationQuery.php
index dc6240ce..82fd80d0 100644
--- a/src/lib/Server/Input/Parser/LocationQuery.php
+++ b/src/lib/Server/Input/Parser/LocationQuery.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use eZ\Publish\API\Repository\Values\Content\LocationQuery as LocationQueryValueObject;
+use Ibexa\Contracts\Core\Repository\Values\Content\LocationQuery as LocationQueryValueObject;
 use Ibexa\Rest\Server\Input\Parser\Query as QueryParser;
 
 /**
diff --git a/src/lib/Server/Input/Parser/LocationUpdate.php b/src/lib/Server/Input/Parser/LocationUpdate.php
index 0367d3b7..5bfbc954 100644
--- a/src/lib/Server/Input/Parser/LocationUpdate.php
+++ b/src/lib/Server/Input/Parser/LocationUpdate.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Input\BaseParser;
+use Ibexa\Contracts\Core\Repository\LocationService;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Rest\Input\ParserTools;
-use eZ\Publish\API\Repository\LocationService;
 use Ibexa\Rest\Server\Values\RestLocationUpdateStruct;
 
 /**
@@ -20,22 +20,22 @@ class LocationUpdate extends BaseParser
     /**
      * Location service.
      *
-     * @var \eZ\Publish\API\Repository\LocationService
+     * @var \Ibexa\Contracts\Core\Repository\LocationService
      */
     protected $locationService;
 
     /**
      * Parser tools.
      *
-     * @var \EzSystems\EzPlatformRest\Input\ParserTools
+     * @var \Ibexa\Rest\Input\ParserTools
      */
     protected $parserTools;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\LocationService $locationService
-     * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools
+     * @param \Ibexa\Contracts\Core\Repository\LocationService $locationService
+     * @param \Ibexa\Rest\Input\ParserTools $parserTools
      */
     public function __construct(LocationService $locationService, ParserTools $parserTools)
     {
@@ -47,9 +47,9 @@ public function __construct(LocationService $locationService, ParserTools $parse
      * Parse input structure.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RestLocationUpdateStruct
+     * @return \Ibexa\Rest\Server\Values\RestLocationUpdateStruct
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/ObjectStateCreate.php b/src/lib/Server/Input/Parser/ObjectStateCreate.php
index 2225f994..6ed95925 100644
--- a/src/lib/Server/Input/Parser/ObjectStateCreate.php
+++ b/src/lib/Server/Input/Parser/ObjectStateCreate.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Input\BaseParser;
+use Ibexa\Contracts\Core\Repository\ObjectStateService;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Rest\Input\ParserTools;
-use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\ObjectStateService;
 
 /**
  * Parser for ObjectStateCreate.
@@ -20,20 +20,20 @@ class ObjectStateCreate extends BaseParser
     /**
      * Object state service.
      *
-     * @var \eZ\Publish\API\Repository\ObjectStateService
+     * @var \Ibexa\Contracts\Core\Repository\ObjectStateService
      */
     protected $objectStateService;
 
     /**
-     * @var \EzSystems\EzPlatformRest\Input\ParserTools
+     * @var \Ibexa\Rest\Input\ParserTools
      */
     protected $parserTools;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\ObjectStateService $objectStateService
-     * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools
+     * @param \Ibexa\Contracts\Core\Repository\ObjectStateService $objectStateService
+     * @param \Ibexa\Rest\Input\ParserTools $parserTools
      */
     public function __construct(ObjectStateService $objectStateService, ParserTools $parserTools)
     {
@@ -45,9 +45,9 @@ public function __construct(ObjectStateService $objectStateService, ParserTools
      * Parse input structure.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @return \eZ\Publish\API\Repository\Values\ObjectState\ObjectStateCreateStruct
+     * @return \Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateCreateStruct
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/ObjectStateGroupCreate.php b/src/lib/Server/Input/Parser/ObjectStateGroupCreate.php
index 89f8ff34..ca20e7ec 100644
--- a/src/lib/Server/Input/Parser/ObjectStateGroupCreate.php
+++ b/src/lib/Server/Input/Parser/ObjectStateGroupCreate.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Input\BaseParser;
+use Ibexa\Contracts\Core\Repository\ObjectStateService;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Rest\Input\ParserTools;
-use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\ObjectStateService;
 
 /**
  * Parser for ObjectStateGroupCreate.
@@ -20,20 +20,20 @@ class ObjectStateGroupCreate extends BaseParser
     /**
      * Object state service.
      *
-     * @var \eZ\Publish\API\Repository\ObjectStateService
+     * @var \Ibexa\Contracts\Core\Repository\ObjectStateService
      */
     protected $objectStateService;
 
     /**
-     * @var \EzSystems\EzPlatformRest\Input\ParserTools
+     * @var \Ibexa\Rest\Input\ParserTools
      */
     protected $parserTools;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\ObjectStateService $objectStateService
-     * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools
+     * @param \Ibexa\Contracts\Core\Repository\ObjectStateService $objectStateService
+     * @param \Ibexa\Rest\Input\ParserTools $parserTools
      */
     public function __construct(ObjectStateService $objectStateService, ParserTools $parserTools)
     {
@@ -45,9 +45,9 @@ public function __construct(ObjectStateService $objectStateService, ParserTools
      * Parse input structure.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @return \eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroupCreateStruct
+     * @return \Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroupCreateStruct
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/ObjectStateGroupUpdate.php b/src/lib/Server/Input/Parser/ObjectStateGroupUpdate.php
index 04610d36..f787d320 100644
--- a/src/lib/Server/Input/Parser/ObjectStateGroupUpdate.php
+++ b/src/lib/Server/Input/Parser/ObjectStateGroupUpdate.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Input\BaseParser;
+use Ibexa\Contracts\Core\Repository\ObjectStateService;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Rest\Input\ParserTools;
-use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\ObjectStateService;
 
 /**
  * Parser for ObjectStateGroupUpdate.
@@ -20,20 +20,20 @@ class ObjectStateGroupUpdate extends BaseParser
     /**
      * Object state service.
      *
-     * @var \eZ\Publish\API\Repository\ObjectStateService
+     * @var \Ibexa\Contracts\Core\Repository\ObjectStateService
      */
     protected $objectStateService;
 
     /**
-     * @var \EzSystems\EzPlatformRest\Input\ParserTools
+     * @var \Ibexa\Rest\Input\ParserTools
      */
     protected $parserTools;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\ObjectStateService $objectStateService
-     * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools
+     * @param \Ibexa\Contracts\Core\Repository\ObjectStateService $objectStateService
+     * @param \Ibexa\Rest\Input\ParserTools $parserTools
      */
     public function __construct(ObjectStateService $objectStateService, ParserTools $parserTools)
     {
@@ -45,9 +45,9 @@ public function __construct(ObjectStateService $objectStateService, ParserTools
      * Parse input structure.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @return \eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroupUpdateStruct
+     * @return \Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroupUpdateStruct
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/ObjectStateUpdate.php b/src/lib/Server/Input/Parser/ObjectStateUpdate.php
index 4f94adaa..a99f2458 100644
--- a/src/lib/Server/Input/Parser/ObjectStateUpdate.php
+++ b/src/lib/Server/Input/Parser/ObjectStateUpdate.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Input\BaseParser;
+use Ibexa\Contracts\Core\Repository\ObjectStateService;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Rest\Input\ParserTools;
-use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\ObjectStateService;
 
 /**
  * Parser for ObjectStateUpdate.
@@ -20,20 +20,20 @@ class ObjectStateUpdate extends BaseParser
     /**
      * Object state service.
      *
-     * @var \eZ\Publish\API\Repository\ObjectStateService
+     * @var \Ibexa\Contracts\Core\Repository\ObjectStateService
      */
     protected $objectStateService;
 
     /**
-     * @var \EzSystems\EzPlatformRest\Input\ParserTools
+     * @var \Ibexa\Rest\Input\ParserTools
      */
     protected $parserTools;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\ObjectStateService $objectStateService
-     * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools
+     * @param \Ibexa\Contracts\Core\Repository\ObjectStateService $objectStateService
+     * @param \Ibexa\Rest\Input\ParserTools $parserTools
      */
     public function __construct(ObjectStateService $objectStateService, ParserTools $parserTools)
     {
@@ -45,9 +45,9 @@ public function __construct(ObjectStateService $objectStateService, ParserTools
      * Parse input structure.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @return \eZ\Publish\API\Repository\Values\ObjectState\ObjectStateUpdateStruct
+     * @return \Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateUpdateStruct
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/PolicyCreate.php b/src/lib/Server/Input/Parser/PolicyCreate.php
index da7394af..336d1d4d 100644
--- a/src/lib/Server/Input/Parser/PolicyCreate.php
+++ b/src/lib/Server/Input/Parser/PolicyCreate.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Input\BaseParser;
+use Ibexa\Contracts\Core\Repository\RoleService;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Rest\Input\ParserTools;
-use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\RoleService;
 
 /**
  * Parser for PolicyCreate.
@@ -20,22 +20,22 @@ class PolicyCreate extends BaseParser
     /**
      * Role service.
      *
-     * @var \eZ\Publish\API\Repository\RoleService
+     * @var \Ibexa\Contracts\Core\Repository\RoleService
      */
     protected $roleService;
 
     /**
      * Parser tools.
      *
-     * @var \EzSystems\EzPlatformRest\Input\ParserTools
+     * @var \Ibexa\Rest\Input\ParserTools
      */
     protected $parserTools;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\RoleService $roleService
-     * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools
+     * @param \Ibexa\Contracts\Core\Repository\RoleService $roleService
+     * @param \Ibexa\Rest\Input\ParserTools $parserTools
      */
     public function __construct(RoleService $roleService, ParserTools $parserTools)
     {
@@ -47,9 +47,9 @@ public function __construct(RoleService $roleService, ParserTools $parserTools)
      * Parse input structure.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @return \eZ\Publish\API\Repository\Values\User\PolicyCreateStruct
+     * @return \Ibexa\Contracts\Core\Repository\Values\User\PolicyCreateStruct
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/PolicyUpdate.php b/src/lib/Server/Input/Parser/PolicyUpdate.php
index 2fc79f14..35d05674 100644
--- a/src/lib/Server/Input/Parser/PolicyUpdate.php
+++ b/src/lib/Server/Input/Parser/PolicyUpdate.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Input\BaseParser;
+use Ibexa\Contracts\Core\Repository\RoleService;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Rest\Input\ParserTools;
-use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\RoleService;
 
 /**
  * Parser for PolicyUpdate.
@@ -20,22 +20,22 @@ class PolicyUpdate extends BaseParser
     /**
      * Role service.
      *
-     * @var \eZ\Publish\API\Repository\RoleService
+     * @var \Ibexa\Contracts\Core\Repository\RoleService
      */
     protected $roleService;
 
     /**
      * Parser tools.
      *
-     * @var \EzSystems\EzPlatformRest\Input\ParserTools
+     * @var \Ibexa\Rest\Input\ParserTools
      */
     protected $parserTools;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\RoleService $roleService
-     * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools
+     * @param \Ibexa\Contracts\Core\Repository\RoleService $roleService
+     * @param \Ibexa\Rest\Input\ParserTools $parserTools
      */
     public function __construct(RoleService $roleService, ParserTools $parserTools)
     {
@@ -47,9 +47,9 @@ public function __construct(RoleService $roleService, ParserTools $parserTools)
      * Parse input structure.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @return \eZ\Publish\API\Repository\Values\User\PolicyUpdateStruct
+     * @return \Ibexa\Contracts\Core\Repository\Values\User\PolicyUpdateStruct
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/Query.php b/src/lib/Server/Input/Parser/Query.php
index 6fd49a0e..4479408d 100644
--- a/src/lib/Server/Input/Parser/Query.php
+++ b/src/lib/Server/Input/Parser/Query.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion as CriterionValue;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Rest\Server\Input\Parser\Criterion as CriterionParser;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion as CriterionValue;
 
 /**
  * Content/Location Query Parser.
@@ -19,11 +19,11 @@ abstract class Query extends CriterionParser
      * Parses input structure to a Query.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
@@ -82,15 +82,15 @@ public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     /**
      * Builds and returns the Query (Location or Content object).
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query
      */
     abstract protected function buildQuery();
 
     /**
      * @param array $criteriaArray
-     * @param ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @return CriterionValue|null A criterion, or a LogicalAnd with a set of Criterion, or null if an empty array was given
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion|null A criterion, or a LogicalAnd with a set of Criterion, or null if an empty array was given
      */
     private function processCriteriaArray(array $criteriaArray, ParsingDispatcher $parsingDispatcher)
     {
@@ -110,7 +110,7 @@ private function processCriteriaArray(array $criteriaArray, ParsingDispatcher $p
      * Handles SortClause data.
      *
      * @param array $sortClausesArray
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
      * @return array
      */
diff --git a/src/lib/Server/Input/Parser/RelationCreate.php b/src/lib/Server/Input/Parser/RelationCreate.php
index 7f265083..b595475e 100644
--- a/src/lib/Server/Input/Parser/RelationCreate.php
+++ b/src/lib/Server/Input/Parser/RelationCreate.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Contracts\Rest\Exceptions;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for RelationCreate.
@@ -19,7 +19,7 @@ class RelationCreate extends BaseParser
      * Parse input structure.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
      * @return mixed
      */
diff --git a/src/lib/Server/Input/Parser/RoleAssignInput.php b/src/lib/Server/Input/Parser/RoleAssignInput.php
index 53108435..ad6be49e 100644
--- a/src/lib/Server/Input/Parser/RoleAssignInput.php
+++ b/src/lib/Server/Input/Parser/RoleAssignInput.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Input\BaseParser;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Rest\Input\ParserTools;
-use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Rest\Server\Values\RoleAssignment;
 
 /**
@@ -20,14 +20,14 @@ class RoleAssignInput extends BaseParser
     /**
      * Parser tools.
      *
-     * @var \EzSystems\EzPlatformRest\Input\ParserTools
+     * @var \Ibexa\Rest\Input\ParserTools
      */
     protected $parserTools;
 
     /**
      * Construct.
      *
-     * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools
+     * @param \Ibexa\Rest\Input\ParserTools $parserTools
      */
     public function __construct(ParserTools $parserTools)
     {
@@ -38,9 +38,9 @@ public function __construct(ParserTools $parserTools)
      * Parse input structure.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RoleAssignment
+     * @return \Ibexa\Rest\Server\Values\RoleAssignment
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/RoleInput.php b/src/lib/Server/Input/Parser/RoleInput.php
index c2aa9052..fa97219c 100644
--- a/src/lib/Server/Input/Parser/RoleInput.php
+++ b/src/lib/Server/Input/Parser/RoleInput.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Input\BaseParser;
+use Ibexa\Contracts\Core\Repository\RoleService;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Rest\Input\ParserTools;
-use eZ\Publish\API\Repository\RoleService;
 
 /**
  * Parser for RoleInput.
@@ -19,20 +19,20 @@ class RoleInput extends BaseParser
     /**
      * Role service.
      *
-     * @var \eZ\Publish\API\Repository\RoleService
+     * @var \Ibexa\Contracts\Core\Repository\RoleService
      */
     protected $roleService;
 
     /**
-     * @var \EzSystems\EzPlatformRest\Input\ParserTools
+     * @var \Ibexa\Rest\Input\ParserTools
      */
     protected $parserTools;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\RoleService $roleService
-     * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools
+     * @param \Ibexa\Contracts\Core\Repository\RoleService $roleService
+     * @param \Ibexa\Rest\Input\ParserTools $parserTools
      */
     public function __construct(RoleService $roleService, ParserTools $parserTools)
     {
@@ -44,9 +44,9 @@ public function __construct(RoleService $roleService, ParserTools $parserTools)
      * Parse input structure.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @return \eZ\Publish\API\Repository\Values\User\RoleCreateStruct
+     * @return \Ibexa\Contracts\Core\Repository\Values\User\RoleCreateStruct
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/SectionInput.php b/src/lib/Server/Input/Parser/SectionInput.php
index 3dd4282c..1ee1a2af 100644
--- a/src/lib/Server/Input/Parser/SectionInput.php
+++ b/src/lib/Server/Input/Parser/SectionInput.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
-use eZ\Publish\API\Repository\SectionService;
+use Ibexa\Contracts\Core\Repository\SectionService;
 use Ibexa\Contracts\Rest\Exceptions;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 /**
  * Parser for SectionInput.
@@ -19,14 +19,14 @@ class SectionInput extends BaseParser
     /**
      * Section service.
      *
-     * @var \eZ\Publish\API\Repository\SectionService
+     * @var \Ibexa\Contracts\Core\Repository\SectionService
      */
     protected $sectionService;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\SectionService $sectionService
+     * @param \Ibexa\Contracts\Core\Repository\SectionService $sectionService
      */
     public function __construct(SectionService $sectionService)
     {
@@ -37,9 +37,9 @@ public function __construct(SectionService $sectionService)
      * Parse input structure.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\SectionCreateStruct
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\SectionCreateStruct
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/SessionInput.php b/src/lib/Server/Input/Parser/SessionInput.php
index 63150757..40926fb9 100644
--- a/src/lib/Server/Input/Parser/SessionInput.php
+++ b/src/lib/Server/Input/Parser/SessionInput.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Contracts\Rest\Exceptions;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Rest\Server\Values\SessionInput as SessionInputValue;
 
 /**
@@ -20,9 +20,9 @@ class SessionInput extends BaseParser
      * Parse input structure.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\SessionInput
+     * @return \Ibexa\Rest\Server\Values\SessionInput
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/SortClause/DataKeyValueObjectClass.php b/src/lib/Server/Input/Parser/SortClause/DataKeyValueObjectClass.php
index aa7f512e..b134ae37 100644
--- a/src/lib/Server/Input/Parser/SortClause/DataKeyValueObjectClass.php
+++ b/src/lib/Server/Input/Parser/SortClause/DataKeyValueObjectClass.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\SortClause;
 
-use eZ\Publish\API\Repository\Values\Content\Query;
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query;
 use Ibexa\Contracts\Rest\Exceptions;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 class DataKeyValueObjectClass extends BaseParser
 {
@@ -45,9 +45,9 @@ public function __construct($dataKey, $valueObjectClass)
      * Parse input structure.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @return \eZ\Publish\API\Repository\Values\ValueObject
+     * @return \Ibexa\Contracts\Core\Repository\Values\ValueObject
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/SortClause/Field.php b/src/lib/Server/Input/Parser/SortClause/Field.php
index 6d741c9e..3075a42b 100644
--- a/src/lib/Server/Input/Parser/SortClause/Field.php
+++ b/src/lib/Server/Input/Parser/SortClause/Field.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser\SortClause;
 
-use eZ\Publish\API\Repository\Values\Content\Query;
-use Ibexa\Rest\Input\BaseParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\Field as FieldSortClause;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\Values\Content\Query\SortClause\Field as FieldSortClause;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 
 class Field extends BaseParser
 {
@@ -18,9 +18,9 @@ class Field extends BaseParser
      * Parse input structure for Field sort clause.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Query\SortClause\Field
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\Field
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/URLAliasCreate.php b/src/lib/Server/Input/Parser/URLAliasCreate.php
index 518ac338..294c9db0 100644
--- a/src/lib/Server/Input/Parser/URLAliasCreate.php
+++ b/src/lib/Server/Input/Parser/URLAliasCreate.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Input\BaseParser;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Rest\Input\ParserTools;
-use Ibexa\Contracts\Rest\Exceptions;
 
 /**
  * Parser for URLAliasCreate.
@@ -19,14 +19,14 @@ class URLAliasCreate extends BaseParser
     /**
      * Parser tools.
      *
-     * @var \EzSystems\EzPlatformRest\Input\ParserTools
+     * @var \Ibexa\Rest\Input\ParserTools
      */
     protected $parserTools;
 
     /**
      * Construct.
      *
-     * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools
+     * @param \Ibexa\Rest\Input\ParserTools $parserTools
      */
     public function __construct(ParserTools $parserTools)
     {
@@ -37,7 +37,7 @@ public function __construct(ParserTools $parserTools)
      * Parse input structure.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
      * @return array
      */
diff --git a/src/lib/Server/Input/Parser/URLWildcardCreate.php b/src/lib/Server/Input/Parser/URLWildcardCreate.php
index e98cb9e5..436d8d79 100644
--- a/src/lib/Server/Input/Parser/URLWildcardCreate.php
+++ b/src/lib/Server/Input/Parser/URLWildcardCreate.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Input\BaseParser;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Rest\Input\ParserTools;
-use Ibexa\Contracts\Rest\Exceptions;
 
 /**
  * Parser for URLWildcardCreate.
@@ -19,14 +19,14 @@ class URLWildcardCreate extends BaseParser
     /**
      * Parser tools.
      *
-     * @var \EzSystems\EzPlatformRest\Input\ParserTools
+     * @var \Ibexa\Rest\Input\ParserTools
      */
     protected $parserTools;
 
     /**
      * Construct.
      *
-     * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools
+     * @param \Ibexa\Rest\Input\ParserTools $parserTools
      */
     public function __construct(ParserTools $parserTools)
     {
@@ -37,7 +37,7 @@ public function __construct(ParserTools $parserTools)
      * Parse input structure.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
      * @return array
      */
diff --git a/src/lib/Server/Input/Parser/UserCreate.php b/src/lib/Server/Input/Parser/UserCreate.php
index 48a0b606..bc607c83 100644
--- a/src/lib/Server/Input/Parser/UserCreate.php
+++ b/src/lib/Server/Input/Parser/UserCreate.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Input\BaseParser;
+use Ibexa\Contracts\Core\Repository\ContentTypeService;
+use Ibexa\Contracts\Core\Repository\UserService;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Rest\Input\FieldTypeParser;
 use Ibexa\Rest\Input\ParserTools;
-use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\UserService;
-use eZ\Publish\API\Repository\ContentTypeService;
 
 /**
  * Parser for UserCreate.
@@ -22,38 +22,38 @@ class UserCreate extends BaseParser
     /**
      * User service.
      *
-     * @var \eZ\Publish\API\Repository\UserService
+     * @var \Ibexa\Contracts\Core\Repository\UserService
      */
     protected $userService;
 
     /**
      * ContentType service.
      *
-     * @var \eZ\Publish\API\Repository\ContentTypeService
+     * @var \Ibexa\Contracts\Core\Repository\ContentTypeService
      */
     protected $contentTypeService;
 
     /**
      * FieldType parser.
      *
-     * @var \EzSystems\EzPlatformRest\Input\FieldTypeParser
+     * @var \Ibexa\Rest\Input\FieldTypeParser
      */
     protected $fieldTypeParser;
 
     /**
      * Parser tools.
      *
-     * @var \EzSystems\EzPlatformRest\Input\ParserTools
+     * @var \Ibexa\Rest\Input\ParserTools
      */
     protected $parserTools;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\UserService $userService
-     * @param \eZ\Publish\API\Repository\ContentTypeService $contentTypeService
-     * @param \EzSystems\EzPlatformRest\Input\FieldTypeParser $fieldTypeParser
-     * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools
+     * @param \Ibexa\Contracts\Core\Repository\UserService $userService
+     * @param \Ibexa\Contracts\Core\Repository\ContentTypeService $contentTypeService
+     * @param \Ibexa\Rest\Input\FieldTypeParser $fieldTypeParser
+     * @param \Ibexa\Rest\Input\ParserTools $parserTools
      */
     public function __construct(UserService $userService, ContentTypeService $contentTypeService, FieldTypeParser $fieldTypeParser, ParserTools $parserTools)
     {
@@ -67,9 +67,9 @@ public function __construct(UserService $userService, ContentTypeService $conten
      * Parse input structure.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @return \eZ\Publish\API\Repository\Values\User\UserCreateStruct
+     * @return \Ibexa\Contracts\Core\Repository\Values\User\UserCreateStruct
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/UserGroupCreate.php b/src/lib/Server/Input/Parser/UserGroupCreate.php
index ef5ed728..887263de 100644
--- a/src/lib/Server/Input/Parser/UserGroupCreate.php
+++ b/src/lib/Server/Input/Parser/UserGroupCreate.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Input\BaseParser;
+use Ibexa\Contracts\Core\Repository\ContentTypeService;
+use Ibexa\Contracts\Core\Repository\UserService;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Rest\Input\FieldTypeParser;
-use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\UserService;
-use eZ\Publish\API\Repository\ContentTypeService;
 
 /**
  * Parser for UserGroupCreate.
@@ -21,30 +21,30 @@ class UserGroupCreate extends BaseParser
     /**
      * User service.
      *
-     * @var \eZ\Publish\API\Repository\UserService
+     * @var \Ibexa\Contracts\Core\Repository\UserService
      */
     protected $userService;
 
     /**
      * ContentType service.
      *
-     * @var \eZ\Publish\API\Repository\ContentTypeService
+     * @var \Ibexa\Contracts\Core\Repository\ContentTypeService
      */
     protected $contentTypeService;
 
     /**
      * FieldType parser.
      *
-     * @var \EzSystems\EzPlatformRest\Input\FieldTypeParser
+     * @var \Ibexa\Rest\Input\FieldTypeParser
      */
     protected $fieldTypeParser;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\UserService $userService
-     * @param \eZ\Publish\API\Repository\ContentTypeService $contentTypeService
-     * @param \EzSystems\EzPlatformRest\Input\FieldTypeParser $fieldTypeParser
+     * @param \Ibexa\Contracts\Core\Repository\UserService $userService
+     * @param \Ibexa\Contracts\Core\Repository\ContentTypeService $contentTypeService
+     * @param \Ibexa\Rest\Input\FieldTypeParser $fieldTypeParser
      */
     public function __construct(UserService $userService, ContentTypeService $contentTypeService, FieldTypeParser $fieldTypeParser)
     {
@@ -57,9 +57,9 @@ public function __construct(UserService $userService, ContentTypeService $conten
      * Parse input structure.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @return \eZ\Publish\API\Repository\Values\User\UserGroupCreateStruct
+     * @return \Ibexa\Contracts\Core\Repository\Values\User\UserGroupCreateStruct
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/UserGroupUpdate.php b/src/lib/Server/Input/Parser/UserGroupUpdate.php
index 191b575b..e10929ba 100644
--- a/src/lib/Server/Input/Parser/UserGroupUpdate.php
+++ b/src/lib/Server/Input/Parser/UserGroupUpdate.php
@@ -1,19 +1,19 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Input\BaseParser;
+use Ibexa\Contracts\Core\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\LocationService;
+use Ibexa\Contracts\Core\Repository\UserService;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Rest\Input\FieldTypeParser;
-use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Rest\Server\Values\RestUserGroupUpdateStruct;
-use eZ\Publish\API\Repository\UserService;
-use eZ\Publish\API\Repository\ContentService;
-use eZ\Publish\API\Repository\LocationService;
 
 /**
  * Parser for UserGroupUpdate.
@@ -23,38 +23,38 @@ class UserGroupUpdate extends BaseParser
     /**
      * User service.
      *
-     * @var \eZ\Publish\API\Repository\UserService
+     * @var \Ibexa\Contracts\Core\Repository\UserService
      */
     protected $userService;
 
     /**
      * Content service.
      *
-     * @var \eZ\Publish\API\Repository\ContentService
+     * @var \Ibexa\Contracts\Core\Repository\ContentService
      */
     protected $contentService;
 
     /**
      * Location service.
      *
-     * @var \eZ\Publish\API\Repository\LocationService
+     * @var \Ibexa\Contracts\Core\Repository\LocationService
      */
     protected $locationService;
 
     /**
      * FieldType parser.
      *
-     * @var \EzSystems\EzPlatformRest\Input\FieldTypeParser
+     * @var \Ibexa\Rest\Input\FieldTypeParser
      */
     protected $fieldTypeParser;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\UserService $userService
-     * @param \eZ\Publish\API\Repository\ContentService $contentService
-     * @param \eZ\Publish\API\Repository\LocationService $locationService
-     * @param \EzSystems\EzPlatformRest\Input\FieldTypeParser $fieldTypeParser
+     * @param \Ibexa\Contracts\Core\Repository\UserService $userService
+     * @param \Ibexa\Contracts\Core\Repository\ContentService $contentService
+     * @param \Ibexa\Contracts\Core\Repository\LocationService $locationService
+     * @param \Ibexa\Rest\Input\FieldTypeParser $fieldTypeParser
      */
     public function __construct(UserService $userService, ContentService $contentService, LocationService $locationService, FieldTypeParser $fieldTypeParser)
     {
@@ -68,9 +68,9 @@ public function __construct(UserService $userService, ContentService $contentSer
      * Parse input structure.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RestUserGroupUpdateStruct
+     * @return \Ibexa\Rest\Server\Values\RestUserGroupUpdateStruct
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/UserUpdate.php b/src/lib/Server/Input/Parser/UserUpdate.php
index 9cb312b9..9b0112b6 100644
--- a/src/lib/Server/Input/Parser/UserUpdate.php
+++ b/src/lib/Server/Input/Parser/UserUpdate.php
@@ -1,19 +1,19 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Input\BaseParser;
+use Ibexa\Contracts\Core\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\UserService;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
 use Ibexa\Rest\Input\FieldTypeParser;
 use Ibexa\Rest\Input\ParserTools;
-use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Rest\Server\Values\RestUserUpdateStruct;
-use eZ\Publish\API\Repository\UserService;
-use eZ\Publish\API\Repository\ContentService;
 
 /**
  * Parser for UserUpdate.
@@ -23,38 +23,38 @@ class UserUpdate extends BaseParser
     /**
      * User service.
      *
-     * @var \eZ\Publish\API\Repository\UserService
+     * @var \Ibexa\Contracts\Core\Repository\UserService
      */
     protected $userService;
 
     /**
      * Content service.
      *
-     * @var \eZ\Publish\API\Repository\ContentService
+     * @var \Ibexa\Contracts\Core\Repository\ContentService
      */
     protected $contentService;
 
     /**
      * FieldType parser.
      *
-     * @var \EzSystems\EzPlatformRest\Input\FieldTypeParser
+     * @var \Ibexa\Rest\Input\FieldTypeParser
      */
     protected $fieldTypeParser;
 
     /**
      * Parser tools.
      *
-     * @var \EzSystems\EzPlatformRest\Input\ParserTools
+     * @var \Ibexa\Rest\Input\ParserTools
      */
     protected $parserTools;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\UserService $userService
-     * @param \eZ\Publish\API\Repository\ContentService $contentService
-     * @param \EzSystems\EzPlatformRest\Input\FieldTypeParser $fieldTypeParser
-     * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools
+     * @param \Ibexa\Contracts\Core\Repository\UserService $userService
+     * @param \Ibexa\Contracts\Core\Repository\ContentService $contentService
+     * @param \Ibexa\Rest\Input\FieldTypeParser $fieldTypeParser
+     * @param \Ibexa\Rest\Input\ParserTools $parserTools
      */
     public function __construct(UserService $userService, ContentService $contentService, FieldTypeParser $fieldTypeParser, ParserTools $parserTools)
     {
@@ -68,9 +68,9 @@ public function __construct(UserService $userService, ContentService $contentSer
      * Parse input structure.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RestUserUpdateStruct
+     * @return \Ibexa\Rest\Server\Values\RestUserUpdateStruct
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/VersionUpdate.php b/src/lib/Server/Input/Parser/VersionUpdate.php
index 86fcd350..6a230489 100644
--- a/src/lib/Server/Input/Parser/VersionUpdate.php
+++ b/src/lib/Server/Input/Parser/VersionUpdate.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
-use Ibexa\Rest\Input\FieldTypeParser;
+use Ibexa\Contracts\Core\Repository\ContentService;
 use Ibexa\Contracts\Rest\Exceptions;
-use eZ\Publish\API\Repository\ContentService;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Rest\Input\BaseParser;
+use Ibexa\Rest\Input\FieldTypeParser;
 
 /**
  * Parser for VersionUpdate.
@@ -20,22 +20,22 @@ class VersionUpdate extends BaseParser
     /**
      * Content service.
      *
-     * @var \eZ\Publish\API\Repository\ContentService
+     * @var \Ibexa\Contracts\Core\Repository\ContentService
      */
     protected $contentService;
 
     /**
      * FieldType parser.
      *
-     * @var \EzSystems\EzPlatformRest\Input\FieldTypeParser
+     * @var \Ibexa\Rest\Input\FieldTypeParser
      */
     protected $fieldTypeParser;
 
     /**
      * Construct from content service.
      *
-     * @param \eZ\Publish\API\Repository\ContentService $contentService
-     * @param \EzSystems\EzPlatformRest\Input\FieldTypeParser $fieldTypeParser
+     * @param \Ibexa\Contracts\Core\Repository\ContentService $contentService
+     * @param \Ibexa\Rest\Input\FieldTypeParser $fieldTypeParser
      */
     public function __construct(ContentService $contentService, FieldTypeParser $fieldTypeParser)
     {
@@ -47,9 +47,9 @@ public function __construct(ContentService $contentService, FieldTypeParser $fie
      * Parse input structure.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\ContentUpdateStruct
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\ContentUpdateStruct
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/ViewInput.php b/src/lib/Server/Input/Parser/ViewInput.php
index 705131d1..4b956113 100644
--- a/src/lib/Server/Input/Parser/ViewInput.php
+++ b/src/lib/Server/Input/Parser/ViewInput.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Contracts\Rest\Exceptions;
-use Ibexa\Rest\Server\Values\RestViewInput;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Rest\Input\BaseParser;
+use Ibexa\Rest\Server\Values\RestViewInput;
 
 /**
  * Parser for ViewInput.
@@ -20,11 +20,11 @@ class ViewInput extends BaseParser
      * Parses input structure to a RestViewInput struct.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RestViewInput
+     * @return \Ibexa\Rest\Server\Values\RestViewInput
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Input/Parser/ViewInputOneDotOne.php b/src/lib/Server/Input/Parser/ViewInputOneDotOne.php
index dc641ce2..b428ca91 100644
--- a/src/lib/Server/Input/Parser/ViewInputOneDotOne.php
+++ b/src/lib/Server/Input/Parser/ViewInputOneDotOne.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Server\Input\Parser\Criterion as CriterionParser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Contracts\Rest\Exceptions;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Server\Input\Parser\Criterion as CriterionParser;
 use Ibexa\Rest\Server\Values\RestViewInput;
 
 /**
@@ -20,11 +20,11 @@ class ViewInputOneDotOne extends CriterionParser
      * Parses input structure to a RestViewInput struct.
      *
      * @param array $data
-     * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher
+     * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
      *
-     * @throws \EzSystems\EzPlatformRest\Exceptions\Parser
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
      *
-     * @return \EzSystems\EzPlatformRest\Server\Values\RestViewInput
+     * @return \Ibexa\Rest\Server\Values\RestViewInput
      */
     public function parse(array $data, ParsingDispatcher $parsingDispatcher)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/Author.php b/src/lib/Server/Output/ValueObjectVisitor/Author.php
index 9fec0b05..a51784d4 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/Author.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/Author.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
@@ -15,7 +15,7 @@
 final class Author extends ValueObjectVisitor
 {
     /**
-     * @var \eZ\Publish\Core\FieldType\Author\Author
+     * @var \Ibexa\Core\FieldType\Author\Author
      */
     public function visit(Visitor $visitor, Generator $generator, $data): void
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/BadRequestException.php b/src/lib/Server/Output/ValueObjectVisitor/BadRequestException.php
index f0740cd4..19d21692 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/BadRequestException.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/BadRequestException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
diff --git a/src/lib/Server/Output/ValueObjectVisitor/BadStateException.php b/src/lib/Server/Output/ValueObjectVisitor/BadStateException.php
index f8c81481..3a268161 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/BadStateException.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/BadStateException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
diff --git a/src/lib/Server/Output/ValueObjectVisitor/BookmarkList.php b/src/lib/Server/Output/ValueObjectVisitor/BookmarkList.php
index e09284d1..c55c5c8c 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/BookmarkList.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/BookmarkList.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 use Ibexa\Rest\Server\Values\BookmarkList as BookmarkListValue;
 
diff --git a/src/lib/Server/Output/ValueObjectVisitor/CachedValue.php b/src/lib/Server/Output/ValueObjectVisitor/CachedValue.php
index feb28ec7..cc616426 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/CachedValue.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/CachedValue.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\Core\MVC\ConfigResolverInterface;
-use eZ\Publish\Core\MVC\Symfony\RequestStackAware;
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
+use Ibexa\Core\MVC\ConfigResolverInterface;
+use Ibexa\Core\MVC\Symfony\RequestStackAware;
 
 /**
  * CachedValue value object visitor.
@@ -19,7 +19,7 @@ class CachedValue extends ValueObjectVisitor
 {
     use RequestStackAware;
 
-    /** @var ConfigResolverInterface */
+    /** @var \Ibexa\Core\MVC\ConfigResolverInterface */
     protected $configResolver;
 
     public function __construct(ConfigResolverInterface $configResolver)
@@ -28,9 +28,9 @@ public function __construct(ConfigResolverInterface $configResolver)
     }
 
     /**
-     * @param Visitor   $visitor
-     * @param Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\CachedValue $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor   $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\CachedValue $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/Conflict.php b/src/lib/Server/Output/ValueObjectVisitor/Conflict.php
index 58e6ed4e..35ba5766 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/Conflict.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/Conflict.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 
 /**
diff --git a/src/lib/Server/Output/ValueObjectVisitor/ContentFieldValidationException.php b/src/lib/Server/Output/ValueObjectVisitor/ContentFieldValidationException.php
index 8b715671..2dfca06a 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/ContentFieldValidationException.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/ContentFieldValidationException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\API\Repository\Values\Translation;
+use Ibexa\Contracts\Core\Repository\Values\Translation;
 use Ibexa\Contracts\Rest\Output\Generator;
 use Ibexa\Contracts\Rest\Output\Visitor;
 
@@ -18,9 +18,9 @@ class ContentFieldValidationException extends BadRequestException
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Exceptions\ContentFieldValidationException $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Exceptions\ContentFieldValidationException $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
@@ -87,7 +87,7 @@ public function visit(Visitor $visitor, Generator $generator, $data)
     /**
      * Convert a Translation object to a string, detecting singular/plural as needed.
      *
-     * @param Translation $translation The Translation object
+     * @param \Ibexa\Contracts\Core\Repository\Values\Translation $translation The Translation object
      *
      * @return string
      */
diff --git a/src/lib/Server/Output/ValueObjectVisitor/ContentList.php b/src/lib/Server/Output/ValueObjectVisitor/ContentList.php
index c0b16dcb..390181f9 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/ContentList.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/ContentList.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 
 /**
@@ -18,9 +18,9 @@ class ContentList extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\ContentList $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\ContentList $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/ContentType.php b/src/lib/Server/Output/ValueObjectVisitor/ContentType.php
index 6ee3d7d6..c05daa3b 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/ContentType.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/ContentType.php
@@ -1,23 +1,23 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Rest\Output\DelegateValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
 use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
+use Ibexa\Rest\Output\DelegateValueObjectVisitor;
 use Ibexa\Rest\Server\Values\RestContentType;
 
 final class ContentType extends ValueObjectVisitor implements DelegateValueObjectVisitor
 {
     /**
-     * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType $data
+     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data): void
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/ContentTypeGroup.php b/src/lib/Server/Output/ValueObjectVisitor/ContentTypeGroup.php
index 8de3987e..330dc930 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/ContentTypeGroup.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/ContentTypeGroup.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup as ContentTypeGroupValue;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
-use eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup as ContentTypeGroupValue;
 
 /**
  * ContentTypeGroup value object visitor.
@@ -19,9 +19,9 @@ class ContentTypeGroup extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupList.php b/src/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupList.php
index b9abcf35..45689d5f 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupList.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupList.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 
 /**
@@ -18,9 +18,9 @@ class ContentTypeGroupList extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\ContentTypeGroupList $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\ContentTypeGroupList $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupRefList.php b/src/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupRefList.php
index f91db54a..827a445e 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupRefList.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupRefList.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 
 /**
@@ -18,9 +18,9 @@ class ContentTypeGroupRefList extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\ContentTypeGroupRefList $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\ContentTypeGroupRefList $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/ContentTypeInfoList.php b/src/lib/Server/Output/ValueObjectVisitor/ContentTypeInfoList.php
index 81ec831d..86b7e394 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/ContentTypeInfoList.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/ContentTypeInfoList.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 use Ibexa\Rest\Server\Values;
 
@@ -19,9 +19,9 @@ class ContentTypeInfoList extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\ContentTypeInfoList $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\ContentTypeInfoList $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/ContentTypeList.php b/src/lib/Server/Output/ValueObjectVisitor/ContentTypeList.php
index 9ed2ae25..4d5a5a69 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/ContentTypeList.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/ContentTypeList.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 use Ibexa\Rest\Server\Values;
 
@@ -19,9 +19,9 @@ class ContentTypeList extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\ContentTypeList $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\ContentTypeList $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/CountryList.php b/src/lib/Server/Output/ValueObjectVisitor/CountryList.php
index 51bfebeb..25d57b97 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/CountryList.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/CountryList.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 
 /**
@@ -18,9 +18,9 @@ class CountryList extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\CountryList $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\CountryList $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedContent.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedContent.php
index 44372984..67a3b4c7 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/CreatedContent.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedContent.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
@@ -17,9 +17,9 @@ class CreatedContent extends RestContent
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\CreatedContent $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\CreatedContent $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedContentType.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedContentType.php
index 7e47b881..7084a126 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/CreatedContentType.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedContentType.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
@@ -19,9 +19,9 @@ class CreatedContentType extends RestContentType
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\CreatedContentType $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\CreatedContentType $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedContentTypeGroup.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedContentTypeGroup.php
index 05334c00..7969d6ca 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/CreatedContentTypeGroup.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedContentTypeGroup.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
@@ -19,9 +19,9 @@ class CreatedContentTypeGroup extends ContentTypeGroup
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\CreatedContentTypeGroup $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\CreatedContentTypeGroup $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedFieldDefinition.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedFieldDefinition.php
index 4b865e58..f8b60356 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/CreatedFieldDefinition.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedFieldDefinition.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
@@ -19,9 +19,9 @@ class CreatedFieldDefinition extends RestFieldDefinition
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\CreatedFieldDefinition $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\CreatedFieldDefinition $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedLocation.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedLocation.php
index ee15c351..3a3fdd1b 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/CreatedLocation.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedLocation.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
@@ -19,9 +19,9 @@ class CreatedLocation extends RestLocation
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\CreatedLocation $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\CreatedLocation $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedObjectState.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedObjectState.php
index 959daa72..0c7b28eb 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/CreatedObjectState.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedObjectState.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
@@ -19,9 +19,9 @@ class CreatedObjectState extends RestObjectState
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\CreatedObjectState $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\CreatedObjectState $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedObjectStateGroup.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedObjectStateGroup.php
index fc973ceb..98a1bbb6 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/CreatedObjectStateGroup.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedObjectStateGroup.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
@@ -19,9 +19,9 @@ class CreatedObjectStateGroup extends ObjectStateGroup
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\CreatedObjectStateGroup $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\CreatedObjectStateGroup $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedPolicy.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedPolicy.php
index 58dc6bb3..567ce116 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/CreatedPolicy.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedPolicy.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
@@ -19,9 +19,9 @@ class CreatedPolicy extends Policy
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\CreatedPolicy $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\CreatedPolicy $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedRelation.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedRelation.php
index b3dd51c8..b3b67c92 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/CreatedRelation.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedRelation.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
@@ -19,9 +19,9 @@ class CreatedRelation extends RestRelation
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\CreatedRelation $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\CreatedRelation $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedRole.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedRole.php
index 6cc126d6..f6fdbae0 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/CreatedRole.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedRole.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
@@ -19,9 +19,9 @@ class CreatedRole extends Role
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\CreatedRole $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\CreatedRole $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedSection.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedSection.php
index d856e0d2..c214fe05 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/CreatedSection.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedSection.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
@@ -19,9 +19,9 @@ class CreatedSection extends Section
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\CreatedSection $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\CreatedSection $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedURLAlias.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedURLAlias.php
index c4af1801..876f44a1 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/CreatedURLAlias.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedURLAlias.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
@@ -19,9 +19,9 @@ class CreatedURLAlias extends URLAlias
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\CreatedURLAlias $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\CreatedURLAlias $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedURLWildcard.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedURLWildcard.php
index 106b2dcd..b4ca4ea1 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/CreatedURLWildcard.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedURLWildcard.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
@@ -19,9 +19,9 @@ class CreatedURLWildcard extends URLWildcard
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\CreatedURLWildcard $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\CreatedURLWildcard $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedUser.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedUser.php
index a252ee8b..e8ae2c59 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/CreatedUser.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedUser.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
@@ -19,9 +19,9 @@ class CreatedUser extends RestUser
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\CreatedUser $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\CreatedUser $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedUserGroup.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedUserGroup.php
index 702fb0a5..b730bb00 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/CreatedUserGroup.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedUserGroup.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
@@ -19,9 +19,9 @@ class CreatedUserGroup extends RestUserGroup
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\CreatedUserGroup $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\CreatedUserGroup $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedVersion.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedVersion.php
index aea66640..d84c023e 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/CreatedVersion.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedVersion.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
@@ -19,9 +19,9 @@ class CreatedVersion extends Version
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\CreatedVersion $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\CreatedVersion $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/DeletedUserSession.php b/src/lib/Server/Output/ValueObjectVisitor/DeletedUserSession.php
index f437f26f..ff65bac9 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/DeletedUserSession.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/DeletedUserSession.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
@@ -14,9 +14,9 @@ class DeletedUserSession extends NoContent
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\DeletedUserSession $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\DeletedUserSession $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/Exception.php b/src/lib/Server/Output/ValueObjectVisitor/Exception.php
index 97bbb254..51fe288b 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/Exception.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/Exception.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\Core\Base\Translatable;
 use Ibexa\Contracts\Rest\Output\Generator;
 use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
+use Ibexa\Core\Base\Translatable;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
@@ -95,8 +95,8 @@ protected function getStatus()
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
      * @param \Exception $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
diff --git a/src/lib/Server/Output/ValueObjectVisitor/FieldDefinitionList.php b/src/lib/Server/Output/ValueObjectVisitor/FieldDefinitionList.php
index 4d14b960..11f54fbf 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/FieldDefinitionList.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/FieldDefinitionList.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
@@ -18,9 +18,9 @@ class FieldDefinitionList extends RestContentTypeBase
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\FieldDefinitionList $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\FieldDefinitionList $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/ForbiddenException.php b/src/lib/Server/Output/ValueObjectVisitor/ForbiddenException.php
index 8a8abcf9..bba20032 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/ForbiddenException.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/ForbiddenException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
diff --git a/src/lib/Server/Output/ValueObjectVisitor/HttpException.php b/src/lib/Server/Output/ValueObjectVisitor/HttpException.php
index 216cfa25..b5f0e809 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/HttpException.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/HttpException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
diff --git a/src/lib/Server/Output/ValueObjectVisitor/ImageVariation.php b/src/lib/Server/Output/ValueObjectVisitor/ImageVariation.php
index 77722904..33c267fc 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/ImageVariation.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/ImageVariation.php
@@ -1,20 +1,20 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
+use Ibexa\Contracts\Core\Variation\Values\ImageVariation as ImageVariationValue;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
-use eZ\Publish\SPI\Variation\Values\ImageVariation as ImageVariationValue;
 
 class ImageVariation extends ValueObjectVisitor
 {
     /**
-     * @param \eZ\Publish\SPI\Variation\Values\ImageVariation $data
+     * @param \Ibexa\Contracts\Core\Variation\Values\ImageVariation $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/InvalidArgumentException.php b/src/lib/Server/Output/ValueObjectVisitor/InvalidArgumentException.php
index fadda1ea..4cf19821 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/InvalidArgumentException.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/InvalidArgumentException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
diff --git a/src/lib/Server/Output/ValueObjectVisitor/JWT.php b/src/lib/Server/Output/ValueObjectVisitor/JWT.php
index e7179efe..76716998 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/JWT.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/JWT.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
diff --git a/src/lib/Server/Output/ValueObjectVisitor/Language.php b/src/lib/Server/Output/ValueObjectVisitor/Language.php
index 78ed1480..f2290db5 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/Language.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/Language.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\API\Repository\Values\Content\Language as LanguageValue;
+use Ibexa\Contracts\Core\Repository\Values\Content\Language as LanguageValue;
 use Ibexa\Contracts\Rest\Output\Generator;
 use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
@@ -16,7 +16,7 @@
 final class Language extends ValueObjectVisitor
 {
     /**
-     * @param \eZ\Publish\API\Repository\Values\Content\Language $data
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Language $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data): void
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/Location.php b/src/lib/Server/Output/ValueObjectVisitor/Location.php
index 4448f595..2172fb39 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/Location.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/Location.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\API\Repository\LocationService;
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
+use Ibexa\Contracts\Core\Repository\LocationService;
+use Ibexa\Contracts\Core\Repository\Values\Content\Location as LocationValue;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 use Ibexa\Rest\Server\Values\RestContent as RestContentValue;
-use eZ\Publish\API\Repository\Values\Content\Location as LocationValue;
 
 /**
  * Location value object visitor.
@@ -19,7 +19,7 @@
 class Location extends ValueObjectVisitor
 {
     /**
-     * @var \eZ\Publish\API\Repository\LocationService
+     * @var \Ibexa\Contracts\Core\Repository\LocationService
      */
     private $locationService;
 
@@ -31,9 +31,9 @@ public function __construct(LocationService $locationService)
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \eZ\Publish\API\Repository\Values\Content\Location $location
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Location $location
      */
     public function visit(Visitor $visitor, Generator $generator, $location)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/LocationList.php b/src/lib/Server/Output/ValueObjectVisitor/LocationList.php
index cdba82f1..e0f9fd56 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/LocationList.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/LocationList.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 
 /**
@@ -18,9 +18,9 @@ class LocationList extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\LocationList $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\LocationList $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/NoContent.php b/src/lib/Server/Output/ValueObjectVisitor/NoContent.php
index 106f7b85..d81b064b 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/NoContent.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/NoContent.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 
 /**
@@ -18,9 +18,9 @@ class NoContent extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\NoContent $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\NoContent $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/NotFoundException.php b/src/lib/Server/Output/ValueObjectVisitor/NotFoundException.php
index 77469dfa..8f2b47bb 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/NotFoundException.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/NotFoundException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
diff --git a/src/lib/Server/Output/ValueObjectVisitor/NotImplementedException.php b/src/lib/Server/Output/ValueObjectVisitor/NotImplementedException.php
index 5ef86bbe..f5fe491a 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/NotImplementedException.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/NotImplementedException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
diff --git a/src/lib/Server/Output/ValueObjectVisitor/OK.php b/src/lib/Server/Output/ValueObjectVisitor/OK.php
index 29ad483a..988b0787 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/OK.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/OK.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
diff --git a/src/lib/Server/Output/ValueObjectVisitor/ObjectState.php b/src/lib/Server/Output/ValueObjectVisitor/ObjectState.php
index 6cd876e1..671947c0 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/ObjectState.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/ObjectState.php
@@ -1,23 +1,23 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Rest\Output\DelegateValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
 use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
+use Ibexa\Rest\Output\DelegateValueObjectVisitor;
 use Ibexa\Rest\Values\RestObjectState;
 
 final class ObjectState extends ValueObjectVisitor implements DelegateValueObjectVisitor
 {
     /**
-     * @param \eZ\Publish\API\Repository\Values\ObjectState\ObjectState $data
+     * @param \Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectState $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data): void
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/ObjectStateGroup.php b/src/lib/Server/Output/ValueObjectVisitor/ObjectStateGroup.php
index d8b194db..146e373d 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/ObjectStateGroup.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/ObjectStateGroup.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
+use Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroup as ObjectStateGroupValue;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
-use eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroup as ObjectStateGroupValue;
 
 /**
  * ObjectStateGroup value object visitor.
@@ -19,9 +19,9 @@ class ObjectStateGroup extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroup $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroup $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/ObjectStateGroupList.php b/src/lib/Server/Output/ValueObjectVisitor/ObjectStateGroupList.php
index e9441da7..fc96401d 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/ObjectStateGroupList.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/ObjectStateGroupList.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 
 /**
@@ -18,9 +18,9 @@ class ObjectStateGroupList extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\ObjectStateGroupList $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\ObjectStateGroupList $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/ObjectStateList.php b/src/lib/Server/Output/ValueObjectVisitor/ObjectStateList.php
index 2c949c8c..b79001bb 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/ObjectStateList.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/ObjectStateList.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 use Ibexa\Rest\Values\RestObjectState as RestObjectStateValue;
 
@@ -19,9 +19,9 @@ class ObjectStateList extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\ObjectStateList $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\ObjectStateList $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/Options.php b/src/lib/Server/Output/ValueObjectVisitor/Options.php
index eb551f6e..895579ed 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/Options.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/Options.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
diff --git a/src/lib/Server/Output/ValueObjectVisitor/PermanentRedirect.php b/src/lib/Server/Output/ValueObjectVisitor/PermanentRedirect.php
index 04f54783..ff5a568f 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/PermanentRedirect.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/PermanentRedirect.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 
 /**
@@ -18,9 +18,9 @@ class PermanentRedirect extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\PermanentRedirect $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\PermanentRedirect $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/Policy.php b/src/lib/Server/Output/ValueObjectVisitor/Policy.php
index 7b66469a..a3fe7f73 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/Policy.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/Policy.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\API\Repository\Values\User\PolicyDraft;
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
+use Ibexa\Contracts\Core\Repository\Values\User\Policy as PolicyValue;
+use Ibexa\Contracts\Core\Repository\Values\User\PolicyDraft;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
-use eZ\Publish\API\Repository\Values\User\Policy as PolicyValue;
 
 /**
  * Policy value object visitor.
@@ -20,9 +20,9 @@ class Policy extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param Policy|PolicyDraft $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param Policy|\Ibexa\Contracts\Core\Repository\Values\User\PolicyDraft $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/PolicyList.php b/src/lib/Server/Output/ValueObjectVisitor/PolicyList.php
index bd873432..1d5e793e 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/PolicyList.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/PolicyList.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 
 /**
@@ -18,9 +18,9 @@ class PolicyList extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\PolicyList $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\PolicyList $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/PublishedRole.php b/src/lib/Server/Output/ValueObjectVisitor/PublishedRole.php
index 150f80ef..d4a85e9e 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/PublishedRole.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/PublishedRole.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
@@ -19,9 +19,9 @@ class PublishedRole extends Role
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\PublishedRole $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\PublishedRole $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/Range.php b/src/lib/Server/Output/ValueObjectVisitor/Range.php
index 2a9c0a84..53c9c5b5 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/Range.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/Range.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
@@ -15,7 +15,7 @@
 final class Range extends ValueObjectVisitor
 {
     /**
-     * @param \eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Range $data
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Range $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data): void
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/RangeAggregationResult.php b/src/lib/Server/Output/ValueObjectVisitor/RangeAggregationResult.php
index 8a48b31c..e12eb652 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/RangeAggregationResult.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/RangeAggregationResult.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\API\Repository\Values\Content\Search\AggregationResult\RangeAggregationResultEntry;
+use Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\RangeAggregationResultEntry;
 use Ibexa\Contracts\Rest\Output\Generator;
 use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
@@ -16,7 +16,7 @@
 final class RangeAggregationResult extends ValueObjectVisitor
 {
     /**
-     * @param \eZ\Publish\API\Repository\Values\Content\Search\AggregationResult\RangeAggregationResult $data
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\RangeAggregationResult $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data): void
     {
@@ -44,7 +44,7 @@ private function visitEntry(Visitor $visitor, Generator $generator, RangeAggrega
     }
 
     /**
-     * @param \eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Range $key
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Range $key
      */
     private function visitKey(Visitor $visitor, Generator $generator, $key): void
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/RelationList.php b/src/lib/Server/Output/ValueObjectVisitor/RelationList.php
index 0688c673..7bd6c6c5 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/RelationList.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/RelationList.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 use Ibexa\Rest\Server\Values\RestRelation as ValuesRestRelation;
 
@@ -19,9 +19,9 @@ class RelationList extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\RelationList $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\RelationList $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/ResourceCreated.php b/src/lib/Server/Output/ValueObjectVisitor/ResourceCreated.php
index 56a201ca..d9e806a0 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/ResourceCreated.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/ResourceCreated.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 
 /**
@@ -18,9 +18,9 @@ class ResourceCreated extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\ResourceCreated $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\ResourceCreated $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/RestContent.php b/src/lib/Server/Output/ValueObjectVisitor/RestContent.php
index 774ad5cc..c119cb07 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/RestContent.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/RestContent.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\API\Repository\Values\Content\ContentInfo;
-use eZ\Publish\Core\Base\Exceptions\BadStateException as CoreBadStateException;
-use eZ\Publish\Core\Helper\TranslationHelper;
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
+use Ibexa\Core\Base\Exceptions\BadStateException as CoreBadStateException;
+use Ibexa\Core\Helper\TranslationHelper;
 use Ibexa\Rest\Server\Values\Version as VersionValue;
 
 /**
@@ -19,7 +19,7 @@
  */
 class RestContent extends ValueObjectVisitor
 {
-    /** @var \eZ\Publish\Core\Helper\TranslationHelper */
+    /** @var \Ibexa\Core\Helper\TranslationHelper */
     private $translationHelper;
 
     public function __construct(TranslationHelper $translationHelper)
@@ -30,9 +30,9 @@ public function __construct(TranslationHelper $translationHelper)
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\RestContent $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\RestContent $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
@@ -221,7 +221,7 @@ public function visit(Visitor $visitor, Generator $generator, $data)
      *
      * @param int $status
      *
-     * @throws \eZ\Publish\Core\Base\Exceptions\BadStateException
+     * @throws \Ibexa\Core\Base\Exceptions\BadStateException
      *
      * @return string
      */
diff --git a/src/lib/Server/Output/ValueObjectVisitor/RestContentType.php b/src/lib/Server/Output/ValueObjectVisitor/RestContentType.php
index bad3a043..68eebb2e 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/RestContentType.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/RestContentType.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType as APIContentType;
 use Ibexa\Contracts\Rest\Output\Generator;
 use Ibexa\Contracts\Rest\Output\Visitor;
-use eZ\Publish\API\Repository\Values\ContentType\ContentType as APIContentType;
 use Ibexa\Rest\Server\Values;
 
 /**
@@ -19,9 +19,9 @@ class RestContentType extends RestContentTypeBase
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\RestContentType $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\RestContentType $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/RestContentTypeBase.php b/src/lib/Server/Output/ValueObjectVisitor/RestContentTypeBase.php
index af2a43d9..988e3035 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/RestContentTypeBase.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/RestContentTypeBase.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
 use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
-use eZ\Publish\API\Repository\Values;
+use Ibexa\Core\Repository\Values;
 
 /**
  * Base for RestContentType related value object visitors.
diff --git a/src/lib/Server/Output/ValueObjectVisitor/RestExecutedView.php b/src/lib/Server/Output/ValueObjectVisitor/RestExecutedView.php
index 2b7bfef1..ae7e31b5 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/RestExecutedView.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/RestExecutedView.php
@@ -1,20 +1,20 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\API\Repository\Exceptions\NotFoundException;
-use eZ\Publish\API\Repository\Exceptions\UnauthorizedException;
-use eZ\Publish\API\Repository\Values\Content as ApiValues;
+use Ibexa\Contracts\Core\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
+use Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException;
+use Ibexa\Contracts\Core\Repository\LocationService;
 use Ibexa\Contracts\Rest\Exceptions;
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
-use eZ\Publish\API\Repository\ContentService;
-use eZ\Publish\API\Repository\LocationService;
+use Ibexa\Core\Repository\Values\Content as ApiValues;
 use Ibexa\Rest\Server\Values\RestContent as RestContentValue;
 
 /**
@@ -25,20 +25,20 @@ class RestExecutedView extends ValueObjectVisitor
     /**
      * Location service.
      *
-     * @var \eZ\Publish\API\Repository\LocationService
+     * @var \Ibexa\Contracts\Core\Repository\LocationService
      */
     protected $locationService;
 
     /**
      * Content service.
      *
-     * @var \eZ\Publish\API\Repository\ContentService
+     * @var \Ibexa\Contracts\Core\Repository\ContentService
      */
     protected $contentService;
 
     /**
-     * @param \eZ\Publish\API\Repository\LocationService $locationService
-     * @param \eZ\Publish\API\Repository\ContentService $contentService
+     * @param \Ibexa\Contracts\Core\Repository\LocationService $locationService
+     * @param \Ibexa\Contracts\Core\Repository\ContentService $contentService
      */
     public function __construct(
         LocationService $locationService,
@@ -51,9 +51,9 @@ public function __construct(
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\RestExecutedView $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\RestExecutedView $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
@@ -113,7 +113,7 @@ public function visit(Visitor $visitor, Generator $generator, $data)
 
             // @todo Refactor
             if ($searchHit->valueObject instanceof ApiValues\Content) {
-                /** @var \eZ\Publish\API\Repository\Values\Content\Content $searchHit->valueObject */
+                /** @var \Ibexa\Contracts\Core\Repository\Values\Content\Content $searchHit->valueObject */
                 $contentInfo = $searchHit->valueObject->contentInfo;
 
                 try {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/RestFieldDefinition.php b/src/lib/Server/Output/ValueObjectVisitor/RestFieldDefinition.php
index bc8e0065..8a4a126a 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/RestFieldDefinition.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/RestFieldDefinition.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType as APIContentType;
 use Ibexa\Contracts\Rest\Output\Generator;
 use Ibexa\Contracts\Rest\Output\Visitor;
 use Ibexa\Rest\Output\FieldTypeSerializer;
-use eZ\Publish\API\Repository\Values\ContentType\ContentType as APIContentType;
 
 /**
  * RestFieldDefinition value object visitor.
@@ -19,12 +19,12 @@
 class RestFieldDefinition extends RestContentTypeBase
 {
     /**
-     * @var \EzSystems\EzPlatformRest\Output\FieldTypeSerializer
+     * @var \Ibexa\Rest\Output\FieldTypeSerializer
      */
     protected $fieldTypeSerializer;
 
     /**
-     * @param \EzSystems\EzPlatformRest\Output\FieldTypeSerializer $fieldTypeSerializer
+     * @param \Ibexa\Rest\Output\FieldTypeSerializer $fieldTypeSerializer
      */
     public function __construct(FieldTypeSerializer $fieldTypeSerializer)
     {
@@ -34,9 +34,9 @@ public function __construct(FieldTypeSerializer $fieldTypeSerializer)
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\RestFieldDefinition $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\RestFieldDefinition $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/RestLocation.php b/src/lib/Server/Output/ValueObjectVisitor/RestLocation.php
index 5b00a764..ce19632a 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/RestLocation.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/RestLocation.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 use Ibexa\Rest\Server\Values\RestContent as RestContentValue;
 
@@ -19,9 +19,9 @@ class RestLocation extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\RestLocation $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\RestLocation $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/RestObjectState.php b/src/lib/Server/Output/ValueObjectVisitor/RestObjectState.php
index c4b23ed9..4d8ae311 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/RestObjectState.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/RestObjectState.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 
 /**
@@ -18,9 +18,9 @@ class RestObjectState extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Values\RestObjectState $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Values\RestObjectState $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/RestRelation.php b/src/lib/Server/Output/ValueObjectVisitor/RestRelation.php
index 06de4fe5..94435409 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/RestRelation.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/RestRelation.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
+use Ibexa\Contracts\Core\Repository\Values\Content\Relation as RelationValue;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
-use eZ\Publish\API\Repository\Values\Content\Relation as RelationValue;
 
 /**
  * RestRelation value object visitor.
@@ -19,9 +19,9 @@ class RestRelation extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\RestRelation $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\RestRelation $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/RestTrashItem.php b/src/lib/Server/Output/ValueObjectVisitor/RestTrashItem.php
index 0d4b06ce..aef11da3 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/RestTrashItem.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/RestTrashItem.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 use Ibexa\Rest\Server\Values\RestContent as RestContentValue;
 
@@ -19,9 +19,9 @@ class RestTrashItem extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\RestTrashItem $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\RestTrashItem $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/RestUser.php b/src/lib/Server/Output/ValueObjectVisitor/RestUser.php
index ea0708f8..ead5a382 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/RestUser.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/RestUser.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 use Ibexa\Rest\Server\Values\Version as VersionValue;
 
@@ -19,9 +19,9 @@ class RestUser extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\RestUser $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\RestUser $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/RestUserGroup.php b/src/lib/Server/Output/ValueObjectVisitor/RestUserGroup.php
index 104b8517..e30b0e2d 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/RestUserGroup.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/RestUserGroup.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 use Ibexa\Rest\Server\Values\Version as VersionValue;
 
@@ -19,9 +19,9 @@ class RestUserGroup extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\RestUserGroup $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\RestUserGroup $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/RestUserGroupRoleAssignment.php b/src/lib/Server/Output/ValueObjectVisitor/RestUserGroupRoleAssignment.php
index f9042dc0..8fa53ae9 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/RestUserGroupRoleAssignment.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/RestUserGroupRoleAssignment.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
+use Ibexa\Contracts\Core\Repository\Values\User\Limitation\RoleLimitation;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
-use eZ\Publish\API\Repository\Values\User\Limitation\RoleLimitation;
 
 /**
  * RestUserGroupRoleAssignment value object visitor.
@@ -19,9 +19,9 @@ class RestUserGroupRoleAssignment extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\RestUserGroupRoleAssignment $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\RestUserGroupRoleAssignment $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/RestUserRoleAssignment.php b/src/lib/Server/Output/ValueObjectVisitor/RestUserRoleAssignment.php
index 23139e8b..011ad416 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/RestUserRoleAssignment.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/RestUserRoleAssignment.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
+use Ibexa\Contracts\Core\Repository\Values\User\Limitation\RoleLimitation;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
-use eZ\Publish\API\Repository\Values\User\Limitation\RoleLimitation;
 
 /**
  * RestUserRoleAssignment value object visitor.
@@ -19,9 +19,9 @@ class RestUserRoleAssignment extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\RestUserRoleAssignment $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\RestUserRoleAssignment $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/Role.php b/src/lib/Server/Output/ValueObjectVisitor/Role.php
index 2b6b2b4c..a79533cc 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/Role.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/Role.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\API\Repository\Values\User\RoleDraft;
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
+use Ibexa\Contracts\Core\Repository\Values\User\RoleDraft;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 
 /**
@@ -19,9 +19,9 @@ class Role extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param Role|RoleDraft $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param Role|\Ibexa\Contracts\Core\Repository\Values\User\RoleDraft $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/RoleAssignmentList.php b/src/lib/Server/Output/ValueObjectVisitor/RoleAssignmentList.php
index 3e833bd4..16b596c3 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/RoleAssignmentList.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/RoleAssignmentList.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 use Ibexa\Rest\Server\Values;
 
@@ -19,9 +19,9 @@ class RoleAssignmentList extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\RoleAssignmentList $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\RoleAssignmentList $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/RoleList.php b/src/lib/Server/Output/ValueObjectVisitor/RoleList.php
index 2c9f7d61..fbf36493 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/RoleList.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/RoleList.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 
 /**
@@ -18,9 +18,9 @@ class RoleList extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\RoleList $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\RoleList $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/Root.php b/src/lib/Server/Output/ValueObjectVisitor/Root.php
index 7eb67ee7..ca61011c 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/Root.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/Root.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 
 /**
@@ -18,9 +18,9 @@ class Root extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Values\Root $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Values\Root $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/Section.php b/src/lib/Server/Output/ValueObjectVisitor/Section.php
index 69919fee..3397b2e8 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/Section.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/Section.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
+use Ibexa\Contracts\Core\Repository\Values\Content\Section as SectionValue;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
-use eZ\Publish\API\Repository\Values\Content\Section as SectionValue;
 
 /**
  * Section value object visitor.
@@ -19,9 +19,9 @@ class Section extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \eZ\Publish\API\Repository\Values\Content\Section $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Section $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/SectionList.php b/src/lib/Server/Output/ValueObjectVisitor/SectionList.php
index 080924c6..540a60ae 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/SectionList.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/SectionList.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 
 /**
@@ -18,9 +18,9 @@ class SectionList extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\SectionList $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\SectionList $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/SeeOther.php b/src/lib/Server/Output/ValueObjectVisitor/SeeOther.php
index 1263c7be..28183926 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/SeeOther.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/SeeOther.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 
 /**
diff --git a/src/lib/Server/Output/ValueObjectVisitor/StatsAggregationResult.php b/src/lib/Server/Output/ValueObjectVisitor/StatsAggregationResult.php
index a2f31886..85e14e62 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/StatsAggregationResult.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/StatsAggregationResult.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
@@ -15,7 +15,7 @@
 final class StatsAggregationResult extends ValueObjectVisitor
 {
     /**
-     * @param \eZ\Publish\API\Repository\Values\Content\Search\AggregationResult\StatsAggregationResult $data
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\StatsAggregationResult $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data): void
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/TemporaryRedirect.php b/src/lib/Server/Output/ValueObjectVisitor/TemporaryRedirect.php
index c66c67bd..21e0a485 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/TemporaryRedirect.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/TemporaryRedirect.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 
 /**
@@ -18,9 +18,9 @@ class TemporaryRedirect extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\TemporaryRedirect $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\TemporaryRedirect $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/TermAggregationResult.php b/src/lib/Server/Output/ValueObjectVisitor/TermAggregationResult.php
index 52bcec88..1b3d4a84 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/TermAggregationResult.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/TermAggregationResult.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\API\Repository\Values\Content\Search\AggregationResult\TermAggregationResultEntry;
+use Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\TermAggregationResultEntry;
 use Ibexa\Contracts\Rest\Output\Generator;
 use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
@@ -16,7 +16,7 @@
 final class TermAggregationResult extends ValueObjectVisitor
 {
     /**
-     * @param \eZ\Publish\API\Repository\Values\Content\Search\AggregationResult\TermAggregationResult $data
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\TermAggregationResult $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data): void
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/Trash.php b/src/lib/Server/Output/ValueObjectVisitor/Trash.php
index add2efea..90c86a0a 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/Trash.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/Trash.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 
 /**
@@ -18,9 +18,9 @@ class Trash extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\Trash $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\Trash $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/URLAlias.php b/src/lib/Server/Output/ValueObjectVisitor/URLAlias.php
index 966f80bc..4786b552 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/URLAlias.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/URLAlias.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
+use Ibexa\Contracts\Core\Repository\Values\Content\URLAlias as URLAliasValue;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
-use eZ\Publish\API\Repository\Values;
-use eZ\Publish\API\Repository\Values\Content\URLAlias as URLAliasValue;
+use Ibexa\Core\Repository\Values;
 
 /**
  * URLAlias value object visitor.
@@ -20,9 +20,9 @@ class URLAlias extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \eZ\Publish\API\Repository\Values\Content\URLAlias $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\URLAlias $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/URLAliasList.php b/src/lib/Server/Output/ValueObjectVisitor/URLAliasList.php
index 471a9fbe..1ddd6854 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/URLAliasList.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/URLAliasList.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 
 /**
@@ -18,9 +18,9 @@ class URLAliasList extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\URLAliasList $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\URLAliasList $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/URLAliasRefList.php b/src/lib/Server/Output/ValueObjectVisitor/URLAliasRefList.php
index 72fbe8bc..1e345396 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/URLAliasRefList.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/URLAliasRefList.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 
 /**
@@ -18,9 +18,9 @@ class URLAliasRefList extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\URLAliasRefList $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\URLAliasRefList $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/URLWildcard.php b/src/lib/Server/Output/ValueObjectVisitor/URLWildcard.php
index b16e1a5f..330be27f 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/URLWildcard.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/URLWildcard.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
+use Ibexa\Contracts\Core\Repository\Values\Content\URLWildcard as URLWildcardValue;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
-use eZ\Publish\API\Repository\Values\Content\URLWildcard as URLWildcardValue;
 
 /**
  * URLWildcard value object visitor.
@@ -19,9 +19,9 @@ class URLWildcard extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \eZ\Publish\API\Repository\Values\Content\URLWildcard $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\URLWildcard $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/URLWildcardList.php b/src/lib/Server/Output/ValueObjectVisitor/URLWildcardList.php
index 39950314..b530a1f2 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/URLWildcardList.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/URLWildcardList.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 
 /**
@@ -18,9 +18,9 @@ class URLWildcardList extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\URLWildcardList $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\URLWildcardList $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/UnauthorizedException.php b/src/lib/Server/Output/ValueObjectVisitor/UnauthorizedException.php
index b89c0502..3cd3e492 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/UnauthorizedException.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/UnauthorizedException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
diff --git a/src/lib/Server/Output/ValueObjectVisitor/User.php b/src/lib/Server/Output/ValueObjectVisitor/User.php
index 33ab4abd..c53f8a78 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/User.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/User.php
@@ -1,23 +1,23 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\API\Repository\ContentService;
-use Ibexa\Rest\Output\DelegateValueObjectVisitor;
+use Ibexa\Contracts\Core\Repository\ContentService;
 use Ibexa\Contracts\Rest\Output\Generator;
 use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
+use Ibexa\Rest\Output\DelegateValueObjectVisitor;
 use Ibexa\Rest\Server\Values\RestUser;
 
 final class User extends ValueObjectVisitor implements DelegateValueObjectVisitor
 {
-    /** @var \eZ\Publish\API\Repository\ContentService */
+    /** @var \Ibexa\Contracts\Core\Repository\ContentService */
     private $contentService;
 
     public function __construct(ContentService $contentService)
@@ -26,7 +26,7 @@ public function __construct(ContentService $contentService)
     }
 
     /**
-     * @param \eZ\Publish\API\Repository\Values\User\User $data
+     * @param \Ibexa\Contracts\Core\Repository\Values\User\User $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data): void
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/UserGroup.php b/src/lib/Server/Output/ValueObjectVisitor/UserGroup.php
index f2028953..5002c5fe 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/UserGroup.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/UserGroup.php
@@ -1,23 +1,23 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\API\Repository\ContentService;
-use Ibexa\Rest\Output\DelegateValueObjectVisitor;
+use Ibexa\Contracts\Core\Repository\ContentService;
 use Ibexa\Contracts\Rest\Output\Generator;
 use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
+use Ibexa\Rest\Output\DelegateValueObjectVisitor;
 use Ibexa\Rest\Server\Values\RestUserGroup;
 
 final class UserGroup extends ValueObjectVisitor implements DelegateValueObjectVisitor
 {
-    /** @var \eZ\Publish\API\Repository\ContentService */
+    /** @var \Ibexa\Contracts\Core\Repository\ContentService */
     private $contentService;
 
     public function __construct(ContentService $contentService)
@@ -26,7 +26,7 @@ public function __construct(ContentService $contentService)
     }
 
     /**
-     * @param \eZ\Publish\API\Repository\Values\User\UserGroup $data
+     * @param \Ibexa\Contracts\Core\Repository\Values\User\UserGroup $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data): void
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/UserGroupList.php b/src/lib/Server/Output/ValueObjectVisitor/UserGroupList.php
index 7c9ac609..04527e09 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/UserGroupList.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/UserGroupList.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 
 /**
@@ -18,9 +18,9 @@ class UserGroupList extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\UserGroupList $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\UserGroupList $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/UserGroupRefList.php b/src/lib/Server/Output/ValueObjectVisitor/UserGroupRefList.php
index 5d3076dc..010b6d4c 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/UserGroupRefList.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/UserGroupRefList.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 
 /**
@@ -18,9 +18,9 @@ class UserGroupRefList extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\UserGroupRefList $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\UserGroupRefList $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/UserList.php b/src/lib/Server/Output/ValueObjectVisitor/UserList.php
index a558a1d8..ecd26e99 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/UserList.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/UserList.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 
 /**
@@ -18,9 +18,9 @@ class UserList extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\UserList $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\UserList $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/UserRefList.php b/src/lib/Server/Output/ValueObjectVisitor/UserRefList.php
index 787ffb7a..00411197 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/UserRefList.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/UserRefList.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 
 /**
@@ -18,9 +18,9 @@ class UserRefList extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\UserRefList $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\UserRefList $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/UserSession.php b/src/lib/Server/Output/ValueObjectVisitor/UserSession.php
index a0ad7093..16cba0fb 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/UserSession.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/UserSession.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 use Ibexa\Rest\Server\Values\UserSession as UserSessionValue;
 
@@ -19,9 +19,9 @@ class UserSession extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\UserSession $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\UserSession $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/Version.php b/src/lib/Server/Output/ValueObjectVisitor/Version.php
index ddfece18..262d888c 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/Version.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/Version.php
@@ -1,20 +1,20 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\API\Repository\Values\Content\Thumbnail;
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
+use Ibexa\Contracts\Core\Repository\Values\Content\Thumbnail;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 use Ibexa\Rest\Output\FieldTypeSerializer;
 use Ibexa\Rest\Server\Values\RelationList as RelationListValue;
 use Ibexa\Rest\Server\Values\Version as VersionValue;
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
-use eZ\Publish\API\Repository\Values\Content\Field;
 
 /**
  * Version value object visitor.
@@ -22,12 +22,12 @@
 class Version extends ValueObjectVisitor
 {
     /**
-     * @var \EzSystems\EzPlatformRest\Output\FieldTypeSerializer
+     * @var \Ibexa\Rest\Output\FieldTypeSerializer
      */
     protected $fieldTypeSerializer;
 
     /**
-     * @param \EzSystems\EzPlatformRest\Output\FieldTypeSerializer $fieldTypeSerializer
+     * @param \Ibexa\Rest\Output\FieldTypeSerializer $fieldTypeSerializer
      */
     public function __construct(FieldTypeSerializer $fieldTypeSerializer)
     {
@@ -37,13 +37,13 @@ public function __construct(FieldTypeSerializer $fieldTypeSerializer)
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\Version $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\Version $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
-        /** @var \eZ\Publish\API\Repository\Values\Content\Content $content */
+        /** @var \Ibexa\Contracts\Core\Repository\Values\Content\Content $content */
         $content = $data->content;
 
         $generator->startObjectElement('Version');
@@ -60,9 +60,9 @@ public function visit(Visitor $visitor, Generator $generator, $data)
     /**
      * Visits a single content field and generates its content.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType $contentType
-     * @param \eZ\Publish\API\Repository\Values\Content\Field $field
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType $contentType
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Field $field
      */
     public function visitField(Generator $generator, ContentType $contentType, Field $field)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/VersionInfo.php b/src/lib/Server/Output/ValueObjectVisitor/VersionInfo.php
index ef59ca0e..0d64f7f0 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/VersionInfo.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/VersionInfo.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
+use Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo as VersionInfoValue;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
+use Ibexa\Core\Repository\Values;
 use Ibexa\Rest\Server\Values\VersionTranslationInfo as VersionTranslationInfoValue;
-use eZ\Publish\API\Repository\Values;
-use eZ\Publish\API\Repository\Values\Content\VersionInfo as VersionInfoValue;
 use RuntimeException;
 
 /**
@@ -22,9 +22,9 @@ class VersionInfo extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \eZ\Publish\API\Repository\Values\Content\VersionInfo $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
@@ -79,8 +79,10 @@ protected function visitVersionInfoAttributes(Visitor $visitor, Generator $gener
         $generator->startObjectElement('Creator', 'User');
         $generator->startAttribute(
             'href',
-            $this->router->generate('ezpublish_rest_loadUser',
-                ['userId' => $versionInfo->creatorId])
+            $this->router->generate(
+                'ezpublish_rest_loadUser',
+                ['userId' => $versionInfo->creatorId]
+            )
         );
         $generator->endAttribute('href');
         $generator->endObjectElement('Creator');
diff --git a/src/lib/Server/Output/ValueObjectVisitor/VersionList.php b/src/lib/Server/Output/ValueObjectVisitor/VersionList.php
index 2889748c..862d97b0 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/VersionList.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/VersionList.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 
 /**
@@ -18,9 +18,9 @@ class VersionList extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\VersionList $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\VersionList $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Output/ValueObjectVisitor/VersionTranslationInfo.php b/src/lib/Server/Output/ValueObjectVisitor/VersionTranslationInfo.php
index 8bed3e4d..1aac0787 100644
--- a/src/lib/Server/Output/ValueObjectVisitor/VersionTranslationInfo.php
+++ b/src/lib/Server/Output/ValueObjectVisitor/VersionTranslationInfo.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
 use Ibexa\Rest\Server\Values\VersionTranslationInfo as VersionTranslationInfoValue;
 
@@ -19,9 +19,9 @@ class VersionTranslationInfo extends ValueObjectVisitor
     /**
      * Visit struct returned by controllers.
      *
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
-     * @param \EzSystems\EzPlatformRest\Output\Generator $generator
-     * @param \EzSystems\EzPlatformRest\Server\Values\VersionTranslationInfo $data
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Generator $generator
+     * @param \Ibexa\Rest\Server\Values\VersionTranslationInfo $data
      */
     public function visit(Visitor $visitor, Generator $generator, $data)
     {
diff --git a/src/lib/Server/Security/CsrfTokenManager.php b/src/lib/Server/Security/CsrfTokenManager.php
index 5bcc0d25..8fe54e07 100644
--- a/src/lib/Server/Security/CsrfTokenManager.php
+++ b/src/lib/Server/Security/CsrfTokenManager.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Security;
@@ -27,8 +27,8 @@ class CsrfTokenManager extends BaseCsrfTokenManager
     public function __construct(
         TokenGeneratorInterface $generator = null,
         TokenStorageInterface $storage = null,
-        RequestStack $requestStack = null)
-    {
+        RequestStack $requestStack = null
+    ) {
         $this->storage = $storage ?: new NativeSessionTokenStorage();
         $this->namespace = $this->resolveNamespace($requestStack);
 
@@ -50,7 +50,7 @@ public function hasToken($tokenId)
     /**
      * Resolves token namespace.
      *
-     * @param RequestStack $requestStack
+     * @param \Symfony\Component\HttpFoundation\RequestStack $requestStack
      *
      * @return string
      */
diff --git a/src/lib/Server/Security/EventListener/SecurityListener.php b/src/lib/Server/Security/EventListener/SecurityListener.php
index 49b83479..73766b3e 100644
--- a/src/lib/Server/Security/EventListener/SecurityListener.php
+++ b/src/lib/Server/Security/EventListener/SecurityListener.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Security\EventListener;
 
-use eZ\Publish\API\Repository\PermissionResolver;
-use eZ\Publish\Core\MVC\Symfony\Security\UserInterface as EzPlatformUser;
+use Ibexa\Contracts\Core\Repository\PermissionResolver;
+use Ibexa\Core\MVC\Symfony\Security\UserInterface as EzPlatformUser;
 use Lexik\Bundle\JWTAuthenticationBundle\Security\Authentication\Token\JWTUserToken;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Security\Http\Event\InteractiveLoginEvent as BaseInteractiveLoginEvent;
@@ -21,7 +21,7 @@
  */
 final class SecurityListener implements EventSubscriberInterface
 {
-    /** @var \eZ\Publish\API\Repository\PermissionResolver */
+    /** @var \Ibexa\Contracts\Core\Repository\PermissionResolver */
     private $permissionResolver;
 
     public function __construct(
diff --git a/src/lib/Server/Security/JWTUser.php b/src/lib/Server/Security/JWTUser.php
index 5b532934..39f5bcf3 100644
--- a/src/lib/Server/Security/JWTUser.php
+++ b/src/lib/Server/Security/JWTUser.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
diff --git a/src/lib/Server/Security/RestAuthenticator.php b/src/lib/Server/Security/RestAuthenticator.php
index 8d49f699..028c0c70 100644
--- a/src/lib/Server/Security/RestAuthenticator.php
+++ b/src/lib/Server/Security/RestAuthenticator.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Security;
 
-use eZ\Publish\Core\MVC\ConfigResolverInterface;
-use eZ\Publish\Core\MVC\Symfony\Security\Authentication\AuthenticatorInterface;
-use eZ\Publish\Core\MVC\Symfony\Security\UserInterface as EzUser;
+use Ibexa\Core\MVC\ConfigResolverInterface;
+use Ibexa\Core\MVC\Symfony\Security\Authentication\AuthenticatorInterface;
+use Ibexa\Core\MVC\Symfony\Security\UserInterface as EzUser;
 use Ibexa\Rest\Server\Exceptions\InvalidUserTypeException;
 use Ibexa\Rest\Server\Exceptions\UserConflictException;
 use Psr\Log\LoggerInterface;
@@ -17,10 +17,10 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 use Symfony\Component\Security\Core\Exception\TokenNotFoundException;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
 use Symfony\Component\Security\Http\Logout\LogoutHandlerInterface;
 use Symfony\Component\Security\Http\Logout\SessionLogoutHandler;
@@ -47,6 +47,7 @@ class RestAuthenticator implements AuthenticatorInterface
      * @var \Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface
      */
     private $authenticationManager;
+
     /**
      * @var string
      */
@@ -63,7 +64,7 @@ class RestAuthenticator implements AuthenticatorInterface
     private $dispatcher;
 
     /**
-     * @var \eZ\Publish\Core\MVC\ConfigResolverInterface
+     * @var \Ibexa\Core\MVC\ConfigResolverInterface
      */
     private $configResolver;
 
@@ -183,8 +184,8 @@ private function attemptAuthentication(Request $request)
     /**
      * Checks if newly matched user is conflicting with previously non-anonymous logged in user, if any.
      *
-     * @param EzUser $user
-     * @param TokenInterface $previousToken
+     * @param \Ibexa\Core\MVC\Symfony\Security\UserInterface $user
+     * @param \Symfony\Component\Security\Core\Authentication\Token\TokenInterface $previousToken
      *
      * @return bool
      */
diff --git a/src/lib/Server/Security/RestLogoutHandler.php b/src/lib/Server/Security/RestLogoutHandler.php
index 7fe4582b..09d7b32f 100644
--- a/src/lib/Server/Security/RestLogoutHandler.php
+++ b/src/lib/Server/Security/RestLogoutHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Security;
 
-use eZ\Publish\Core\MVC\ConfigResolverInterface;
+use Ibexa\Core\MVC\ConfigResolverInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
@@ -19,12 +19,12 @@
 class RestLogoutHandler implements LogoutHandlerInterface
 {
     /**
-     * @var \eZ\Publish\Core\MVC\ConfigResolverInterface
+     * @var \Ibexa\Core\MVC\ConfigResolverInterface
      */
     private $configResolver;
 
     /**
-     * @param \eZ\Publish\Core\MVC\ConfigResolverInterface $configResolver
+     * @param \Ibexa\Core\MVC\ConfigResolverInterface $configResolver
      */
     public function __construct(ConfigResolverInterface $configResolver)
     {
diff --git a/src/lib/Server/Service/ExpressionRouterRootResourceBuilder.php b/src/lib/Server/Service/ExpressionRouterRootResourceBuilder.php
index 5820863b..2df970eb 100644
--- a/src/lib/Server/Service/ExpressionRouterRootResourceBuilder.php
+++ b/src/lib/Server/Service/ExpressionRouterRootResourceBuilder.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Rest\Server\Service;
 
-use eZ\Publish\Core\MVC\ConfigResolverInterface;
+use Ibexa\Core\MVC\ConfigResolverInterface;
 use Ibexa\Rest\Values;
 use Ibexa\Rest\Values\Root;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
@@ -41,7 +41,7 @@ class ExpressionRouterRootResourceBuilder implements RootResourceBuilderInterfac
     /** @var \Symfony\Component\Routing\RouterInterface */
     protected $templateRouter;
 
-    /** @var \eZ\Publish\Core\MVC\ConfigResolverInterface */
+    /** @var \Ibexa\Core\MVC\ConfigResolverInterface */
     protected $configResolver;
 
     public function __construct(RouterInterface $router, RouterInterface $templateRouter, ConfigResolverInterface $configResolver)
@@ -54,7 +54,7 @@ public function __construct(RouterInterface $router, RouterInterface $templateRo
     /**
      * Build root resource.
      *
-     * @return array|\EzSystems\EzPlatformRest\Values\Root
+     * @return array|\Ibexa\Rest\Values\Root
      */
     public function buildRootResource(): Root
     {
diff --git a/src/lib/Server/Service/RootResourceBuilderInterface.php b/src/lib/Server/Service/RootResourceBuilderInterface.php
index fba95b40..78e3a252 100644
--- a/src/lib/Server/Service/RootResourceBuilderInterface.php
+++ b/src/lib/Server/Service/RootResourceBuilderInterface.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Service;
@@ -11,7 +11,7 @@ interface RootResourceBuilderInterface
     /**
      * Build root resource.
      *
-     * @return array|\EzSystems\EzPlatformRest\Values\Root
+     * @return array|\Ibexa\Rest\Values\Root
      */
     public function buildRootResource();
 }
diff --git a/src/lib/Server/Values/BookmarkList.php b/src/lib/Server/Values/BookmarkList.php
index 87b87277..4a56cc7b 100644
--- a/src/lib/Server/Values/BookmarkList.php
+++ b/src/lib/Server/Values/BookmarkList.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
@@ -18,7 +18,7 @@ class BookmarkList extends RestValue
     public $totalCount = 0;
 
     /**
-     * @var \EzSystems\EzPlatformRest\Server\Values\RestLocation[]
+     * @var \Ibexa\Rest\Server\Values\RestLocation[]
      */
     public $items = [];
 
@@ -26,7 +26,7 @@ class BookmarkList extends RestValue
      * BookmarkList constructor.
      *
      * @param int $totalCount
-     * @param \EzSystems\EzPlatformRest\Server\Values\RestLocation[] $items
+     * @param \Ibexa\Rest\Server\Values\RestLocation[] $items
      */
     public function __construct(int $totalCount, array $items)
     {
diff --git a/src/lib/Server/Values/CachedValue.php b/src/lib/Server/Values/CachedValue.php
index ec54f744..83acf95a 100644
--- a/src/lib/Server/Values/CachedValue.php
+++ b/src/lib/Server/Values/CachedValue.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\Core\Base\Exceptions\InvalidArgumentException;
+use Ibexa\Core\Base\Exceptions\InvalidArgumentException;
 use Ibexa\Rest\Value as RestValue;
 
 class CachedValue extends RestValue
diff --git a/src/lib/Server/Values/Conflict.php b/src/lib/Server/Values/Conflict.php
index b574d0d3..3a52f556 100644
--- a/src/lib/Server/Values/Conflict.php
+++ b/src/lib/Server/Values/Conflict.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
diff --git a/src/lib/Server/Values/ContentList.php b/src/lib/Server/Values/ContentList.php
index 433aa77c..0ad72688 100644
--- a/src/lib/Server/Values/ContentList.php
+++ b/src/lib/Server/Values/ContentList.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
@@ -16,7 +16,7 @@ class ContentList extends RestValue
     /**
      * Contents.
      *
-     * @var \EzSystems\EzPlatformRest\Server\Values\RestContent[]
+     * @var \Ibexa\Rest\Server\Values\RestContent[]
      */
     public $contents;
 
@@ -30,7 +30,7 @@ class ContentList extends RestValue
     /**
      * Construct.
      *
-     * @param \EzSystems\EzPlatformRest\Server\Values\RestContent[] $contents
+     * @param \Ibexa\Rest\Server\Values\RestContent[] $contents
      * @param int $totalCount
      */
     public function __construct(array $contents, int $totalCount)
diff --git a/src/lib/Server/Values/ContentTypeGroupList.php b/src/lib/Server/Values/ContentTypeGroupList.php
index f5b4ca86..eab23c1f 100644
--- a/src/lib/Server/Values/ContentTypeGroupList.php
+++ b/src/lib/Server/Values/ContentTypeGroupList.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
@@ -16,14 +16,14 @@ class ContentTypeGroupList extends RestValue
     /**
      * Content type groups.
      *
-     * @var \eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup[]
+     * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup[]
      */
     public $contentTypeGroups;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup[] $contentTypeGroups
+     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup[] $contentTypeGroups
      */
     public function __construct(array $contentTypeGroups)
     {
diff --git a/src/lib/Server/Values/ContentTypeGroupRefList.php b/src/lib/Server/Values/ContentTypeGroupRefList.php
index 31b78d50..1aaef28e 100644
--- a/src/lib/Server/Values/ContentTypeGroupRefList.php
+++ b/src/lib/Server/Values/ContentTypeGroupRefList.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
 use Ibexa\Rest\Value as RestValue;
 
 /**
@@ -17,22 +17,22 @@ class ContentTypeGroupRefList extends RestValue
     /**
      * Content type.
      *
-     * @var \eZ\Publish\API\Repository\Values\ContentType\ContentType
+     * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType
      */
     public $contentType;
 
     /**
      * Content type groups of the content type.
      *
-     * @var \eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup[]
+     * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup[]
      */
     public $contentTypeGroups;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType $contentType
-     * @param \eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup[] $contentTypeGroups
+     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType $contentType
+     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup[] $contentTypeGroups
      */
     public function __construct(ContentType $contentType, array $contentTypeGroups)
     {
diff --git a/src/lib/Server/Values/ContentTypeInfoList.php b/src/lib/Server/Values/ContentTypeInfoList.php
index e4fa2ca0..3e03ccbf 100644
--- a/src/lib/Server/Values/ContentTypeInfoList.php
+++ b/src/lib/Server/Values/ContentTypeInfoList.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
@@ -16,7 +16,7 @@ class ContentTypeInfoList extends RestValue
     /**
      * Content types.
      *
-     * @var \eZ\Publish\API\Repository\Values\ContentType\ContentType[]
+     * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType[]
      */
     public $contentTypes;
 
@@ -30,7 +30,7 @@ class ContentTypeInfoList extends RestValue
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType[] $contentTypes
+     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType[] $contentTypes
      * @param string $path
      */
     public function __construct(array $contentTypes, $path)
diff --git a/src/lib/Server/Values/ContentTypeList.php b/src/lib/Server/Values/ContentTypeList.php
index d99f83e8..d13e37e5 100644
--- a/src/lib/Server/Values/ContentTypeList.php
+++ b/src/lib/Server/Values/ContentTypeList.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
@@ -16,7 +16,7 @@ class ContentTypeList extends RestValue
     /**
      * Content types.
      *
-     * @var \eZ\Publish\API\Repository\Values\ContentType\ContentType[]
+     * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType[]
      */
     public $contentTypes;
 
@@ -30,7 +30,7 @@ class ContentTypeList extends RestValue
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType[] $contentTypes
+     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType[] $contentTypes
      * @param string $path
      */
     public function __construct(array $contentTypes, $path)
diff --git a/src/lib/Server/Values/CountryList.php b/src/lib/Server/Values/CountryList.php
index 8e0f5cee..759d6ed4 100644
--- a/src/lib/Server/Values/CountryList.php
+++ b/src/lib/Server/Values/CountryList.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
@@ -14,7 +14,7 @@
 class CountryList extends RestValue
 {
     /**
-     * @var \eZ\Publish\API\Repository\Values\ContentType\Countries[]
+     * @var \Ibexa\Core\Repository\Values\ContentType\Countries[]
      */
     public $countries;
 
diff --git a/src/lib/Server/Values/CreatedContent.php b/src/lib/Server/Values/CreatedContent.php
index 8cd2e1ca..d08aee0e 100644
--- a/src/lib/Server/Values/CreatedContent.php
+++ b/src/lib/Server/Values/CreatedContent.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\ValueObject;
+use Ibexa\Contracts\Core\Repository\Values\ValueObject;
 
 /**
  * Struct representing a freshly created Content.
@@ -16,7 +16,7 @@ class CreatedContent extends ValueObject
     /**
      * The created content.
      *
-     * @var \EzSystems\EzPlatformRest\Server\Values\RestContent
+     * @var \Ibexa\Rest\Server\Values\RestContent
      */
     public $content;
 }
diff --git a/src/lib/Server/Values/CreatedContentType.php b/src/lib/Server/Values/CreatedContentType.php
index e66d9fde..2372d984 100644
--- a/src/lib/Server/Values/CreatedContentType.php
+++ b/src/lib/Server/Values/CreatedContentType.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\ValueObject;
+use Ibexa\Contracts\Core\Repository\Values\ValueObject;
 
 /**
  * Struct representing a freshly created ContentType.
@@ -16,7 +16,7 @@ class CreatedContentType extends ValueObject
     /**
      * The created content type.
      *
-     * @var \EzSystems\EzPlatformRest\Server\Values\RestContentType
+     * @var \Ibexa\Rest\Server\Values\RestContentType
      */
     public $contentType;
 }
diff --git a/src/lib/Server/Values/CreatedContentTypeGroup.php b/src/lib/Server/Values/CreatedContentTypeGroup.php
index eca34337..2b968dc0 100644
--- a/src/lib/Server/Values/CreatedContentTypeGroup.php
+++ b/src/lib/Server/Values/CreatedContentTypeGroup.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\ValueObject;
+use Ibexa\Contracts\Core\Repository\Values\ValueObject;
 
 /**
  * Struct representing a freshly created ContentTypeGroup.
@@ -16,7 +16,7 @@ class CreatedContentTypeGroup extends ValueObject
     /**
      * The created content type group.
      *
-     * @var \eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup
+     * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup
      */
     public $contentTypeGroup;
 }
diff --git a/src/lib/Server/Values/CreatedFieldDefinition.php b/src/lib/Server/Values/CreatedFieldDefinition.php
index 74b4bf59..a0c1572a 100644
--- a/src/lib/Server/Values/CreatedFieldDefinition.php
+++ b/src/lib/Server/Values/CreatedFieldDefinition.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\ValueObject;
+use Ibexa\Contracts\Core\Repository\Values\ValueObject;
 
 /**
  * Struct representing a freshly created field definition.
@@ -16,7 +16,7 @@ class CreatedFieldDefinition extends ValueObject
     /**
      * The created field definition.
      *
-     * @var \EzSystems\EzPlatformRest\Server\Values\RestFieldDefinition
+     * @var \Ibexa\Rest\Server\Values\RestFieldDefinition
      */
     public $fieldDefinition;
 }
diff --git a/src/lib/Server/Values/CreatedLocation.php b/src/lib/Server/Values/CreatedLocation.php
index 126cacc1..dd259119 100644
--- a/src/lib/Server/Values/CreatedLocation.php
+++ b/src/lib/Server/Values/CreatedLocation.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\ValueObject;
+use Ibexa\Contracts\Core\Repository\Values\ValueObject;
 
 /**
  * Struct representing a freshly created location.
@@ -16,7 +16,7 @@ class CreatedLocation extends ValueObject
     /**
      * The created location.
      *
-     * @var \EzSystems\EzPlatformRest\Server\Values\RestLocation
+     * @var \Ibexa\Rest\Server\Values\RestLocation
      */
     public $restLocation;
 }
diff --git a/src/lib/Server/Values/CreatedObjectState.php b/src/lib/Server/Values/CreatedObjectState.php
index ad400831..87d1db09 100644
--- a/src/lib/Server/Values/CreatedObjectState.php
+++ b/src/lib/Server/Values/CreatedObjectState.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\ValueObject;
+use Ibexa\Contracts\Core\Repository\Values\ValueObject;
 
 /**
  * Struct representing a freshly created object state.
@@ -16,7 +16,7 @@ class CreatedObjectState extends ValueObject
     /**
      * The created object state.
      *
-     * @var \EzSystems\EzPlatformRest\Values\RestObjectState
+     * @var \Ibexa\Rest\Values\RestObjectState
      */
     public $objectState;
 }
diff --git a/src/lib/Server/Values/CreatedObjectStateGroup.php b/src/lib/Server/Values/CreatedObjectStateGroup.php
index 77434242..803140fe 100644
--- a/src/lib/Server/Values/CreatedObjectStateGroup.php
+++ b/src/lib/Server/Values/CreatedObjectStateGroup.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\ValueObject;
+use Ibexa\Contracts\Core\Repository\Values\ValueObject;
 
 /**
  * Struct representing a freshly created object state group.
@@ -16,7 +16,7 @@ class CreatedObjectStateGroup extends ValueObject
     /**
      * The created object state group.
      *
-     * @var \eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroup
+     * @var \Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroup
      */
     public $objectStateGroup;
 }
diff --git a/src/lib/Server/Values/CreatedPolicy.php b/src/lib/Server/Values/CreatedPolicy.php
index 4ce15efa..50d885e1 100644
--- a/src/lib/Server/Values/CreatedPolicy.php
+++ b/src/lib/Server/Values/CreatedPolicy.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\ValueObject;
+use Ibexa\Contracts\Core\Repository\Values\ValueObject;
 
 /**
  * Struct representing a freshly created policy.
@@ -16,7 +16,7 @@ class CreatedPolicy extends ValueObject
     /**
      * The created policy.
      *
-     * @var \eZ\Publish\API\Repository\Values\User\Policy
+     * @var \Ibexa\Contracts\Core\Repository\Values\User\Policy
      */
     public $policy;
 }
diff --git a/src/lib/Server/Values/CreatedRelation.php b/src/lib/Server/Values/CreatedRelation.php
index 4449a846..3319ad1a 100644
--- a/src/lib/Server/Values/CreatedRelation.php
+++ b/src/lib/Server/Values/CreatedRelation.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\ValueObject;
+use Ibexa\Contracts\Core\Repository\Values\ValueObject;
 
 /**
  * Struct representing a freshly created relation.
@@ -16,7 +16,7 @@ class CreatedRelation extends ValueObject
     /**
      * The created relation.
      *
-     * @var \EzSystems\EzPlatformRest\Server\Values\RestRelation
+     * @var \Ibexa\Rest\Server\Values\RestRelation
      */
     public $relation;
 }
diff --git a/src/lib/Server/Values/CreatedRole.php b/src/lib/Server/Values/CreatedRole.php
index 9e4573aa..dddc9f0f 100644
--- a/src/lib/Server/Values/CreatedRole.php
+++ b/src/lib/Server/Values/CreatedRole.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\ValueObject;
+use Ibexa\Contracts\Core\Repository\Values\ValueObject;
 
 /**
  * Struct representing a freshly created Role.
@@ -16,7 +16,7 @@ class CreatedRole extends ValueObject
     /**
      * The created role.
      *
-     * @var \EzSystems\EzPlatformRest\Server\Values\RestRole
+     * @var \Ibexa\Rest\Server\Values\RestRole
      */
     public $role;
 }
diff --git a/src/lib/Server/Values/CreatedSection.php b/src/lib/Server/Values/CreatedSection.php
index 722f1afe..1e4b081c 100644
--- a/src/lib/Server/Values/CreatedSection.php
+++ b/src/lib/Server/Values/CreatedSection.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\ValueObject;
+use Ibexa\Contracts\Core\Repository\Values\ValueObject;
 
 /**
  * Struct representing a freshly created section.
@@ -16,7 +16,7 @@ class CreatedSection extends ValueObject
     /**
      * The created section.
      *
-     * @var \eZ\Publish\API\Repository\Values\Content\Section
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Section
      */
     public $section;
 }
diff --git a/src/lib/Server/Values/CreatedURLAlias.php b/src/lib/Server/Values/CreatedURLAlias.php
index 7ca398ee..604df5ea 100644
--- a/src/lib/Server/Values/CreatedURLAlias.php
+++ b/src/lib/Server/Values/CreatedURLAlias.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\ValueObject;
+use Ibexa\Contracts\Core\Repository\Values\ValueObject;
 
 /**
  * Struct representing a freshly created URLAlias.
@@ -16,7 +16,7 @@ class CreatedURLAlias extends ValueObject
     /**
      * The created URL alias.
      *
-     * @var \eZ\Publish\API\Repository\Values\Content\URLAlias
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\URLAlias
      */
     public $urlAlias;
 }
diff --git a/src/lib/Server/Values/CreatedURLWildcard.php b/src/lib/Server/Values/CreatedURLWildcard.php
index cff3206e..7832fa7a 100644
--- a/src/lib/Server/Values/CreatedURLWildcard.php
+++ b/src/lib/Server/Values/CreatedURLWildcard.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\ValueObject;
+use Ibexa\Contracts\Core\Repository\Values\ValueObject;
 
 /**
  * Struct representing a freshly created URLWildcard.
@@ -16,7 +16,7 @@ class CreatedURLWildcard extends ValueObject
     /**
      * The created URL wildcard.
      *
-     * @var \eZ\Publish\API\Repository\Values\Content\URLWildcard
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\URLWildcard
      */
     public $urlWildcard;
 }
diff --git a/src/lib/Server/Values/CreatedUser.php b/src/lib/Server/Values/CreatedUser.php
index 0532be67..f0359263 100644
--- a/src/lib/Server/Values/CreatedUser.php
+++ b/src/lib/Server/Values/CreatedUser.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\ValueObject;
+use Ibexa\Contracts\Core\Repository\Values\ValueObject;
 
 /**
  * Struct representing a freshly created User.
@@ -16,7 +16,7 @@ class CreatedUser extends ValueObject
     /**
      * The created user.
      *
-     * @var \EzSystems\EzPlatformRest\Server\Values\RestUser
+     * @var \Ibexa\Rest\Server\Values\RestUser
      */
     public $user;
 }
diff --git a/src/lib/Server/Values/CreatedUserGroup.php b/src/lib/Server/Values/CreatedUserGroup.php
index 1e4111ee..66536039 100644
--- a/src/lib/Server/Values/CreatedUserGroup.php
+++ b/src/lib/Server/Values/CreatedUserGroup.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\ValueObject;
+use Ibexa\Contracts\Core\Repository\Values\ValueObject;
 
 /**
  * Struct representing a freshly created UserGroup.
@@ -16,7 +16,7 @@ class CreatedUserGroup extends ValueObject
     /**
      * The created user group.
      *
-     * @var \EzSystems\EzPlatformRest\Server\Values\RestUserGroup
+     * @var \Ibexa\Rest\Server\Values\RestUserGroup
      */
     public $userGroup;
 }
diff --git a/src/lib/Server/Values/CreatedVersion.php b/src/lib/Server/Values/CreatedVersion.php
index 89a335fe..ca1fd50f 100644
--- a/src/lib/Server/Values/CreatedVersion.php
+++ b/src/lib/Server/Values/CreatedVersion.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\ValueObject;
+use Ibexa\Contracts\Core\Repository\Values\ValueObject;
 
 /**
  * Struct representing a freshly created version.
@@ -16,7 +16,7 @@ class CreatedVersion extends ValueObject
     /**
      * The created version.
      *
-     * @var \EzSystems\EzPlatformRest\Server\Values\Version
+     * @var \Ibexa\Rest\Server\Values\Version
      */
     public $version;
 }
diff --git a/src/lib/Server/Values/DeletedUserSession.php b/src/lib/Server/Values/DeletedUserSession.php
index 3aa67cb0..5cb34f18 100644
--- a/src/lib/Server/Values/DeletedUserSession.php
+++ b/src/lib/Server/Values/DeletedUserSession.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
@@ -14,7 +14,7 @@ class DeletedUserSession extends RestValue
     /**
      * Response generated by RestAuthenticator.
      *
-     * @see eZ\Publish\Core\MVC\Symfony\Security\Authentication\AuthenticatorInterface::logout()
+     * @see \Ibexa\Core\MVC\Symfony\Security\Authentication\AuthenticatorInterface::logout()
      *
      * @var \Symfony\Component\HttpFoundation\Response
      */
diff --git a/src/lib/Server/Values/FieldDefinitionList.php b/src/lib/Server/Values/FieldDefinitionList.php
index e86b98ca..dd46a224 100644
--- a/src/lib/Server/Values/FieldDefinitionList.php
+++ b/src/lib/Server/Values/FieldDefinitionList.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
 use Ibexa\Rest\Value as RestValue;
 
 /**
@@ -17,22 +17,22 @@ class FieldDefinitionList extends RestValue
     /**
      * ContentType the field definitions belong to.
      *
-     * @var \eZ\Publish\API\Repository\Values\ContentType\ContentType
+     * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType
      */
     public $contentType;
 
     /**
      * Field definitions.
      *
-     * @var \eZ\Publish\API\Repository\Values\ContentType\FieldDefinition[]
+     * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition[]
      */
     public $fieldDefinitions;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType $contentType
-     * @param \eZ\Publish\API\Repository\Values\ContentType\FieldDefinition[] $fieldDefinitions
+     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType $contentType
+     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition[] $fieldDefinitions
      */
     public function __construct(ContentType $contentType, array $fieldDefinitions)
     {
diff --git a/src/lib/Server/Values/JWT.php b/src/lib/Server/Values/JWT.php
index 98088ca8..4e683bd0 100644
--- a/src/lib/Server/Values/JWT.php
+++ b/src/lib/Server/Values/JWT.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
diff --git a/src/lib/Server/Values/JWTInput.php b/src/lib/Server/Values/JWTInput.php
index ad99cb14..03a5fe75 100644
--- a/src/lib/Server/Values/JWTInput.php
+++ b/src/lib/Server/Values/JWTInput.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
diff --git a/src/lib/Server/Values/LocationList.php b/src/lib/Server/Values/LocationList.php
index 768471c1..5dafcccd 100644
--- a/src/lib/Server/Values/LocationList.php
+++ b/src/lib/Server/Values/LocationList.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
@@ -16,7 +16,7 @@ class LocationList extends RestValue
     /**
      * Locations.
      *
-     * @var \EzSystems\EzPlatformRest\Server\Values\RestLocation[]
+     * @var \Ibexa\Rest\Server\Values\RestLocation[]
      */
     public $locations;
 
@@ -30,7 +30,7 @@ class LocationList extends RestValue
     /**
      * Construct.
      *
-     * @param \EzSystems\EzPlatformRest\Server\Values\RestLocation[] $locations
+     * @param \Ibexa\Rest\Server\Values\RestLocation[] $locations
      * @param string $path
      */
     public function __construct(array $locations, $path)
diff --git a/src/lib/Server/Values/NoContent.php b/src/lib/Server/Values/NoContent.php
index 65b26e13..d3aa4e19 100644
--- a/src/lib/Server/Values/NoContent.php
+++ b/src/lib/Server/Values/NoContent.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
diff --git a/src/lib/Server/Values/OK.php b/src/lib/Server/Values/OK.php
index 9fc8e00a..51798e4e 100644
--- a/src/lib/Server/Values/OK.php
+++ b/src/lib/Server/Values/OK.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
diff --git a/src/lib/Server/Values/ObjectStateGroupList.php b/src/lib/Server/Values/ObjectStateGroupList.php
index 605a480f..0d4f54eb 100644
--- a/src/lib/Server/Values/ObjectStateGroupList.php
+++ b/src/lib/Server/Values/ObjectStateGroupList.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
@@ -16,14 +16,14 @@ class ObjectStateGroupList extends RestValue
     /**
      * Object state groups.
      *
-     * @var \eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroup[]
+     * @var \Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroup[]
      */
     public $groups;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroup[] $groups
+     * @param \Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroup[] $groups
      */
     public function __construct(array $groups)
     {
diff --git a/src/lib/Server/Values/ObjectStateList.php b/src/lib/Server/Values/ObjectStateList.php
index 4e3672cc..93c1816e 100644
--- a/src/lib/Server/Values/ObjectStateList.php
+++ b/src/lib/Server/Values/ObjectStateList.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
@@ -16,7 +16,7 @@ class ObjectStateList extends RestValue
     /**
      * Object states.
      *
-     * @var \eZ\Publish\API\Repository\Values\ObjectState\ObjectState[]
+     * @var \Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectState[]
      */
     public $states;
 
@@ -30,7 +30,7 @@ class ObjectStateList extends RestValue
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\Values\ObjectState\ObjectState[] $states
+     * @param \Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectState[] $states
      * @param mixed $groupId
      */
     public function __construct(array $states, $groupId)
diff --git a/src/lib/Server/Values/Options.php b/src/lib/Server/Values/Options.php
index 2983af5c..92aa9025 100644
--- a/src/lib/Server/Values/Options.php
+++ b/src/lib/Server/Values/Options.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\ValueObject;
+use Ibexa\Contracts\Core\Repository\Values\ValueObject;
 
 /**
  * Struct representing a resource OPTIONS response.
diff --git a/src/lib/Server/Values/PermanentRedirect.php b/src/lib/Server/Values/PermanentRedirect.php
index bbdd3157..7e0dce3a 100644
--- a/src/lib/Server/Values/PermanentRedirect.php
+++ b/src/lib/Server/Values/PermanentRedirect.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
diff --git a/src/lib/Server/Values/PolicyList.php b/src/lib/Server/Values/PolicyList.php
index 7cecc43c..a436993b 100644
--- a/src/lib/Server/Values/PolicyList.php
+++ b/src/lib/Server/Values/PolicyList.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
@@ -16,7 +16,7 @@ class PolicyList extends RestValue
     /**
      * Policies.
      *
-     * @var \eZ\Publish\API\Repository\Values\User\Policy[]
+     * @var \Ibexa\Contracts\Core\Repository\Values\User\Policy[]
      */
     public $policies;
 
@@ -30,7 +30,7 @@ class PolicyList extends RestValue
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\Values\User\Policy[] $policies
+     * @param \Ibexa\Contracts\Core\Repository\Values\User\Policy[] $policies
      * @param string $path
      */
     public function __construct(array $policies, $path)
diff --git a/src/lib/Server/Values/PublishedRole.php b/src/lib/Server/Values/PublishedRole.php
index d928f481..acf38eed 100644
--- a/src/lib/Server/Values/PublishedRole.php
+++ b/src/lib/Server/Values/PublishedRole.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\ValueObject;
+use Ibexa\Contracts\Core\Repository\Values\ValueObject;
 
 /**
  * Struct representing a published Role.
@@ -16,7 +16,7 @@ class PublishedRole extends ValueObject
     /**
      * The published role.
      *
-     * @var \EzSystems\EzPlatformRest\Server\Values\RestRole
+     * @var \Ibexa\Rest\Server\Values\RestRole
      */
     public $role;
 }
diff --git a/src/lib/Server/Values/RelationList.php b/src/lib/Server/Values/RelationList.php
index 14cbfbcb..4562becb 100644
--- a/src/lib/Server/Values/RelationList.php
+++ b/src/lib/Server/Values/RelationList.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
@@ -16,7 +16,7 @@ class RelationList extends RestValue
     /**
      * Relations.
      *
-     * @var \eZ\Publish\API\Repository\Values\Content\Relation[]
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Relation[]
      */
     public $relations;
 
@@ -44,7 +44,7 @@ class RelationList extends RestValue
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\Values\Content\Relation[] $relations
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Relation[] $relations
      * @param mixed $contentId
      * @param mixed $versionNo
      * @param string $path
diff --git a/src/lib/Server/Values/ResourceCreated.php b/src/lib/Server/Values/ResourceCreated.php
index cc9536d0..685141e4 100644
--- a/src/lib/Server/Values/ResourceCreated.php
+++ b/src/lib/Server/Values/ResourceCreated.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
diff --git a/src/lib/Server/Values/RestContent.php b/src/lib/Server/Values/RestContent.php
index d416f8a5..f258d1a0 100644
--- a/src/lib/Server/Values/RestContent.php
+++ b/src/lib/Server/Values/RestContent.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\Content\ContentInfo;
-use eZ\Publish\API\Repository\Values\Content\Content;
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
-use eZ\Publish\API\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
+use Ibexa\Contracts\Core\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
 use Ibexa\Rest\Value as RestValue;
 
 /**
@@ -20,27 +20,27 @@
 class RestContent extends RestValue
 {
     /**
-     * @var \eZ\Publish\API\Repository\Values\Content\ContentInfo
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo
      */
     public $contentInfo;
 
     /**
-     * @var \eZ\Publish\API\Repository\Values\Content\Location
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Location
      */
     public $mainLocation;
 
     /**
-     * @var \eZ\Publish\API\Repository\Values\Content\Content
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Content
      */
     public $currentVersion;
 
     /**
-     * @var \eZ\Publish\API\Repository\Values\ContentType\ContentType
+     * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType
      */
     public $contentType;
 
     /**
-     * @var \eZ\Publish\API\Repository\Values\Content\Relation[]
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Relation[]
      */
     public $relations;
 
@@ -54,11 +54,11 @@ class RestContent extends RestValue
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\Values\Content\ContentInfo $contentInfo
-     * @param \eZ\Publish\API\Repository\Values\Content\Location|null $mainLocation
-     * @param \eZ\Publish\API\Repository\Values\Content\Content|null $currentVersion
-     * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType|null $contentType Can only be null if $currentVersion is
-     * @param \eZ\Publish\API\Repository\Values\Content\Relation[]|null $relations Can only be null if $currentVersion is
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo $contentInfo
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Location|null $mainLocation
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Content|null $currentVersion
+     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType|null $contentType Can only be null if $currentVersion is
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Relation[]|null $relations Can only be null if $currentVersion is
      * @param string $path
      */
     public function __construct(
diff --git a/src/lib/Server/Values/RestContentCreateStruct.php b/src/lib/Server/Values/RestContentCreateStruct.php
index a1699aac..26385908 100644
--- a/src/lib/Server/Values/RestContentCreateStruct.php
+++ b/src/lib/Server/Values/RestContentCreateStruct.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\Content\ContentCreateStruct;
-use eZ\Publish\API\Repository\Values\Content\LocationCreateStruct;
-use eZ\Publish\API\Repository\Values\ValueObject;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentCreateStruct;
+use Ibexa\Contracts\Core\Repository\Values\Content\LocationCreateStruct;
+use Ibexa\Contracts\Core\Repository\Values\ValueObject;
 
 /**
  * RestContentCreateStruct view model.
@@ -16,20 +16,20 @@
 class RestContentCreateStruct extends ValueObject
 {
     /**
-     * @var \eZ\Publish\API\Repository\Values\Content\ContentCreateStruct
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\ContentCreateStruct
      */
     public $contentCreateStruct;
 
     /**
-     * @var \eZ\Publish\API\Repository\Values\Content\LocationCreateStruct
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\LocationCreateStruct
      */
     public $locationCreateStruct;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\Values\Content\ContentCreateStruct $contentCreateStruct
-     * @param \eZ\Publish\API\Repository\Values\Content\LocationCreateStruct $locationCreateStruct
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\ContentCreateStruct $contentCreateStruct
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\LocationCreateStruct $locationCreateStruct
      */
     public function __construct(ContentCreateStruct $contentCreateStruct, LocationCreateStruct $locationCreateStruct)
     {
diff --git a/src/lib/Server/Values/RestContentType.php b/src/lib/Server/Values/RestContentType.php
index 667721e6..f2eaaaff 100644
--- a/src/lib/Server/Values/RestContentType.php
+++ b/src/lib/Server/Values/RestContentType.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
 use Ibexa\Rest\Value as RestValue;
 
 /**
@@ -17,20 +17,20 @@
 class RestContentType extends RestValue
 {
     /**
-     * @var \eZ\Publish\API\Repository\Values\ContentType\ContentType
+     * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType
      */
     public $contentType;
 
     /**
-     * @var \eZ\Publish\API\Repository\Values\ContentType\FieldDefinition[]
+     * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition[]
      */
     public $fieldDefinitions;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType $contentType
-     * @param \eZ\Publish\API\Repository\Values\ContentType\FieldDefinition[] $fieldDefinitions
+     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType $contentType
+     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition[] $fieldDefinitions
      */
     public function __construct(ContentType $contentType, array $fieldDefinitions = null)
     {
diff --git a/src/lib/Server/Values/RestExecutedView.php b/src/lib/Server/Values/RestExecutedView.php
index 941067bb..4c6fbe28 100644
--- a/src/lib/Server/Values/RestExecutedView.php
+++ b/src/lib/Server/Values/RestExecutedView.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\ValueObject;
+use Ibexa\Contracts\Core\Repository\Values\ValueObject;
 
 /**
  * RestContentCreateStruct view model.
@@ -16,7 +16,7 @@ class RestExecutedView extends ValueObject
     /**
      * The search results.
      *
-     * @var \eZ\Publish\API\Repository\Values\Content\Search\SearchResult
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Search\SearchResult
      */
     public $searchResults;
 
diff --git a/src/lib/Server/Values/RestFieldDefinition.php b/src/lib/Server/Values/RestFieldDefinition.php
index e2a67b97..ae1d65cd 100644
--- a/src/lib/Server/Values/RestFieldDefinition.php
+++ b/src/lib/Server/Values/RestFieldDefinition.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
-use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
 use Ibexa\Rest\Value as RestValue;
 
 /**
@@ -18,22 +18,22 @@ class RestFieldDefinition extends RestValue
     /**
      * ContentType the field definitions belong to.
      *
-     * @var \eZ\Publish\API\Repository\Values\ContentType\ContentType
+     * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType
      */
     public $contentType;
 
     /**
      * Field definition.
      *
-     * @var \eZ\Publish\API\Repository\Values\ContentType\FieldDefinition
+     * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition
      */
     public $fieldDefinition;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType $contentType
-     * @param \eZ\Publish\API\Repository\Values\ContentType\FieldDefinition $fieldDefinition
+     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType $contentType
+     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition $fieldDefinition
      */
     public function __construct(ContentType $contentType, FieldDefinition $fieldDefinition)
     {
diff --git a/src/lib/Server/Values/RestLocation.php b/src/lib/Server/Values/RestLocation.php
index 0dee7182..a3955afd 100644
--- a/src/lib/Server/Values/RestLocation.php
+++ b/src/lib/Server/Values/RestLocation.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Values\Content\Location;
 use Ibexa\Rest\Value as RestValue;
 
 /**
@@ -17,7 +17,7 @@ class RestLocation extends RestValue
     /**
      * A location.
      *
-     * @var \eZ\Publish\API\Repository\Values\Content\Location
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Location
      */
     public $location;
 
@@ -29,7 +29,7 @@ class RestLocation extends RestValue
     public $childCount;
 
     /**
-     * @param \eZ\Publish\API\Repository\Values\Content\Location $location
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Location $location
      * @param int $childCount
      */
     public function __construct(Location $location, $childCount)
diff --git a/src/lib/Server/Values/RestLocationUpdateStruct.php b/src/lib/Server/Values/RestLocationUpdateStruct.php
index de469620..1a85127c 100644
--- a/src/lib/Server/Values/RestLocationUpdateStruct.php
+++ b/src/lib/Server/Values/RestLocationUpdateStruct.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\Content\LocationUpdateStruct;
+use Ibexa\Contracts\Core\Repository\Values\Content\LocationUpdateStruct;
 use Ibexa\Rest\Value as RestValue;
 
 /**
@@ -17,7 +17,7 @@ class RestLocationUpdateStruct extends RestValue
     /**
      * Location update struct.
      *
-     * @var \eZ\Publish\API\Repository\Values\Content\LocationUpdateStruct
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\LocationUpdateStruct
      */
     public $locationUpdateStruct;
 
@@ -31,7 +31,7 @@ class RestLocationUpdateStruct extends RestValue
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\Values\Content\LocationUpdateStruct $locationUpdateStruct
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\LocationUpdateStruct $locationUpdateStruct
      * @param bool $hidden
      */
     public function __construct(LocationUpdateStruct $locationUpdateStruct, $hidden = null)
diff --git a/src/lib/Server/Values/RestRelation.php b/src/lib/Server/Values/RestRelation.php
index a28a1e4f..a9879eeb 100644
--- a/src/lib/Server/Values/RestRelation.php
+++ b/src/lib/Server/Values/RestRelation.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\Content\Relation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Relation;
 use Ibexa\Rest\Value as RestValue;
 
 /**
@@ -17,7 +17,7 @@ class RestRelation extends RestValue
     /**
      * A relation.
      *
-     * @var \eZ\Publish\API\Repository\Values\Content\Relation
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Relation
      */
     public $relation;
 
@@ -36,7 +36,7 @@ class RestRelation extends RestValue
     public $versionNo;
 
     /**
-     * @param \eZ\Publish\API\Repository\Values\Content\Relation $relation
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Relation $relation
      * @param mixed $contentId
      * @param mixed $versionNo
      */
diff --git a/src/lib/Server/Values/RestRole.php b/src/lib/Server/Values/RestRole.php
index 469ee52e..88862b9c 100644
--- a/src/lib/Server/Values/RestRole.php
+++ b/src/lib/Server/Values/RestRole.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\User\Role;
+use Ibexa\Contracts\Core\Repository\Values\User\Role;
 use Ibexa\Rest\Value as RestValue;
 
 /**
@@ -17,14 +17,14 @@ class RestRole extends RestValue
     /**
      * Holds internal role object.
      *
-     * @var \eZ\Publish\API\Repository\Values\User\Role
+     * @var \Ibexa\Contracts\Core\Repository\Values\User\Role
      */
     protected $innerRole;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\Values\User\Role $role
+     * @param \Ibexa\Contracts\Core\Repository\Values\User\Role $role
      */
     public function __construct(Role $role)
     {
diff --git a/src/lib/Server/Values/RestTrashItem.php b/src/lib/Server/Values/RestTrashItem.php
index c83ec679..338c573d 100644
--- a/src/lib/Server/Values/RestTrashItem.php
+++ b/src/lib/Server/Values/RestTrashItem.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\Content\TrashItem;
+use Ibexa\Contracts\Core\Repository\Values\Content\TrashItem;
 use Ibexa\Rest\Value as RestValue;
 
 /**
@@ -17,7 +17,7 @@ class RestTrashItem extends RestValue
     /**
      * A trash item.
      *
-     * @var \eZ\Publish\API\Repository\Values\Content\TrashItem
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\TrashItem
      */
     public $trashItem;
 
@@ -29,7 +29,7 @@ class RestTrashItem extends RestValue
     public $childCount;
 
     /**
-     * @param \eZ\Publish\API\Repository\Values\Content\TrashItem $trashItem
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\TrashItem $trashItem
      * @param int $childCount
      */
     public function __construct(TrashItem $trashItem, $childCount)
diff --git a/src/lib/Server/Values/RestUser.php b/src/lib/Server/Values/RestUser.php
index d54dd079..d70b94cb 100644
--- a/src/lib/Server/Values/RestUser.php
+++ b/src/lib/Server/Values/RestUser.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\Content\Content;
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
-use eZ\Publish\API\Repository\Values\Content\ContentInfo;
-use eZ\Publish\API\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
+use Ibexa\Contracts\Core\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
 use Ibexa\Rest\Value as RestValue;
 
 /**
@@ -18,37 +18,37 @@
 class RestUser extends RestValue
 {
     /**
-     * @var \eZ\Publish\API\Repository\Values\Content\Content
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Content
      */
     public $content;
 
     /**
-     * @var \eZ\Publish\API\Repository\Values\ContentType\ContentType
+     * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType
      */
     public $contentType;
 
     /**
-     * @var \eZ\Publish\API\Repository\Values\Content\ContentInfo
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo
      */
     public $contentInfo;
 
     /**
-     * @var \eZ\Publish\API\Repository\Values\Content\Relation[]
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Relation[]
      */
     public $relations;
 
     /**
-     * @var \eZ\Publish\API\Repository\Values\Content\Location
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Location
      */
     public $mainLocation;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\Values\Content\Content $content
-     * @param \eZ\Publish\API\Repository\Values\Content\ContentInfo $contentInfo
-     * @param \eZ\Publish\API\Repository\Values\Content\Location $mainLocation
-     * @param \eZ\Publish\API\Repository\Values\Content\Relation[] $relations
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Content $content
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo $contentInfo
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Location $mainLocation
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Relation[] $relations
      */
     public function __construct(Content $content, ContentType $contentType, ContentInfo $contentInfo, Location $mainLocation, array $relations)
     {
diff --git a/src/lib/Server/Values/RestUserGroup.php b/src/lib/Server/Values/RestUserGroup.php
index 2a3b88e3..d73d405f 100644
--- a/src/lib/Server/Values/RestUserGroup.php
+++ b/src/lib/Server/Values/RestUserGroup.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\Content\Content;
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
-use eZ\Publish\API\Repository\Values\Content\ContentInfo;
-use eZ\Publish\API\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
+use Ibexa\Contracts\Core\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
 use Ibexa\Rest\Value as RestValue;
 
 /**
@@ -18,38 +18,38 @@
 class RestUserGroup extends RestValue
 {
     /**
-     * @var \eZ\Publish\API\Repository\Values\Content\Content
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Content
      */
     public $content;
 
     /**
-     * @var \eZ\Publish\API\Repository\Values\ContentType\ContentType
+     * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType
      */
     public $contentType;
 
     /**
-     * @var \eZ\Publish\API\Repository\Values\Content\ContentInfo
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo
      */
     public $contentInfo;
 
     /**
-     * @var \eZ\Publish\API\Repository\Values\Content\Relation[]
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Relation[]
      */
     public $relations;
 
     /**
-     * @var \eZ\Publish\API\Repository\Values\Content\Location
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Location
      */
     public $mainLocation;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\Values\Content\Content $content
-     * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType $contentType
-     * @param \eZ\Publish\API\Repository\Values\Content\ContentInfo $contentInfo
-     * @param \eZ\Publish\API\Repository\Values\Content\Location $mainLocation
-     * @param \eZ\Publish\API\Repository\Values\Content\Relation[] $relations
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Content $content
+     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType $contentType
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo $contentInfo
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Location $mainLocation
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Relation[] $relations
      */
     public function __construct(
         Content $content,
diff --git a/src/lib/Server/Values/RestUserGroupRoleAssignment.php b/src/lib/Server/Values/RestUserGroupRoleAssignment.php
index dfd0b435..9d9da99b 100644
--- a/src/lib/Server/Values/RestUserGroupRoleAssignment.php
+++ b/src/lib/Server/Values/RestUserGroupRoleAssignment.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\User\UserGroupRoleAssignment;
+use Ibexa\Contracts\Core\Repository\Values\User\UserGroupRoleAssignment;
 use Ibexa\Rest\Value as RestValue;
 
 /**
@@ -17,7 +17,7 @@ class RestUserGroupRoleAssignment extends RestValue
     /**
      * Role assignment.
      *
-     * @var \eZ\Publish\API\Repository\Values\User\UserGroupRoleAssignment
+     * @var \Ibexa\Contracts\Core\Repository\Values\User\UserGroupRoleAssignment
      */
     public $roleAssignment;
 
@@ -31,7 +31,7 @@ class RestUserGroupRoleAssignment extends RestValue
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\Values\User\UserGroupRoleAssignment $roleAssignment
+     * @param \Ibexa\Contracts\Core\Repository\Values\User\UserGroupRoleAssignment $roleAssignment
      * @param mixed $id
      */
     public function __construct(UserGroupRoleAssignment $roleAssignment, $id)
diff --git a/src/lib/Server/Values/RestUserGroupUpdateStruct.php b/src/lib/Server/Values/RestUserGroupUpdateStruct.php
index 3e3ddae0..44f35cc0 100644
--- a/src/lib/Server/Values/RestUserGroupUpdateStruct.php
+++ b/src/lib/Server/Values/RestUserGroupUpdateStruct.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\User\UserGroupUpdateStruct;
+use Ibexa\Contracts\Core\Repository\Values\User\UserGroupUpdateStruct;
 use Ibexa\Rest\Value as RestValue;
 
 /**
@@ -17,7 +17,7 @@ class RestUserGroupUpdateStruct extends RestValue
     /**
      * UserGroup update struct.
      *
-     * @var \eZ\Publish\API\Repository\Values\User\UserGroupUpdateStruct
+     * @var \Ibexa\Contracts\Core\Repository\Values\User\UserGroupUpdateStruct
      */
     public $userGroupUpdateStruct;
 
@@ -31,7 +31,7 @@ class RestUserGroupUpdateStruct extends RestValue
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\Values\User\UserGroupUpdateStruct $userGroupUpdateStruct
+     * @param \Ibexa\Contracts\Core\Repository\Values\User\UserGroupUpdateStruct $userGroupUpdateStruct
      * @param mixed $sectionId
      */
     public function __construct(UserGroupUpdateStruct $userGroupUpdateStruct, $sectionId = null)
diff --git a/src/lib/Server/Values/RestUserRoleAssignment.php b/src/lib/Server/Values/RestUserRoleAssignment.php
index 7e0210d6..0669d3cc 100644
--- a/src/lib/Server/Values/RestUserRoleAssignment.php
+++ b/src/lib/Server/Values/RestUserRoleAssignment.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\User\UserRoleAssignment;
+use Ibexa\Contracts\Core\Repository\Values\User\UserRoleAssignment;
 use Ibexa\Rest\Value as RestValue;
 
 /**
@@ -17,7 +17,7 @@ class RestUserRoleAssignment extends RestValue
     /**
      * Role assignment.
      *
-     * @var \eZ\Publish\API\Repository\Values\User\UserRoleAssignment
+     * @var \Ibexa\Contracts\Core\Repository\Values\User\UserRoleAssignment
      */
     public $roleAssignment;
 
@@ -31,7 +31,7 @@ class RestUserRoleAssignment extends RestValue
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\Values\User\UserRoleAssignment $roleAssignment
+     * @param \Ibexa\Contracts\Core\Repository\Values\User\UserRoleAssignment $roleAssignment
      * @param mixed $id
      */
     public function __construct(UserRoleAssignment $roleAssignment, $id)
diff --git a/src/lib/Server/Values/RestUserUpdateStruct.php b/src/lib/Server/Values/RestUserUpdateStruct.php
index 384edaf3..743d1380 100644
--- a/src/lib/Server/Values/RestUserUpdateStruct.php
+++ b/src/lib/Server/Values/RestUserUpdateStruct.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\User\UserUpdateStruct;
+use Ibexa\Contracts\Core\Repository\Values\User\UserUpdateStruct;
 use Ibexa\Rest\Value as RestValue;
 
 /**
@@ -17,7 +17,7 @@ class RestUserUpdateStruct extends RestValue
     /**
      * User update struct.
      *
-     * @var \eZ\Publish\API\Repository\Values\User\UserUpdateStruct
+     * @var \Ibexa\Contracts\Core\Repository\Values\User\UserUpdateStruct
      */
     public $userUpdateStruct;
 
@@ -31,7 +31,7 @@ class RestUserUpdateStruct extends RestValue
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\Values\User\UserUpdateStruct $userUpdateStruct
+     * @param \Ibexa\Contracts\Core\Repository\Values\User\UserUpdateStruct $userUpdateStruct
      * @param mixed $sectionId
      */
     public function __construct(UserUpdateStruct $userUpdateStruct, $sectionId = null)
diff --git a/src/lib/Server/Values/RestViewInput.php b/src/lib/Server/Values/RestViewInput.php
index 4963868d..0a4b79c9 100644
--- a/src/lib/Server/Values/RestViewInput.php
+++ b/src/lib/Server/Values/RestViewInput.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
@@ -16,7 +16,7 @@ class RestViewInput extends RestValue
     /**
      * The search query.
      *
-     * @var \eZ\Publish\API\Repository\Values\Content\Query
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Query
      */
     public $query;
 
diff --git a/src/lib/Server/Values/RoleAssignment.php b/src/lib/Server/Values/RoleAssignment.php
index 52bdf08a..807e441d 100644
--- a/src/lib/Server/Values/RoleAssignment.php
+++ b/src/lib/Server/Values/RoleAssignment.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\User\Limitation\RoleLimitation;
+use Ibexa\Contracts\Core\Repository\Values\User\Limitation\RoleLimitation;
 use Ibexa\Rest\Value as RestValue;
 
 /**
@@ -24,7 +24,7 @@ class RoleAssignment extends RestValue
     /**
      * Role limitation.
      *
-     * @var \eZ\Publish\API\Repository\Values\User\Limitation\RoleLimitation
+     * @var \Ibexa\Contracts\Core\Repository\Values\User\Limitation\RoleLimitation
      */
     public $limitation;
 
@@ -32,7 +32,7 @@ class RoleAssignment extends RestValue
      * Construct.
      *
      * @param mixed $roleId
-     * @param \eZ\Publish\API\Repository\Values\User\Limitation\RoleLimitation $limitation
+     * @param \Ibexa\Contracts\Core\Repository\Values\User\Limitation\RoleLimitation $limitation
      */
     public function __construct($roleId, RoleLimitation $limitation = null)
     {
diff --git a/src/lib/Server/Values/RoleAssignmentList.php b/src/lib/Server/Values/RoleAssignmentList.php
index b837bda1..1b453cd2 100644
--- a/src/lib/Server/Values/RoleAssignmentList.php
+++ b/src/lib/Server/Values/RoleAssignmentList.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
@@ -16,7 +16,7 @@ class RoleAssignmentList extends RestValue
     /**
      * Role assignments.
      *
-     * @var \eZ\Publish\API\Repository\Values\User\RoleAssignment[]
+     * @var \Ibexa\Contracts\Core\Repository\Values\User\RoleAssignment[]
      */
     public $roleAssignments;
 
@@ -37,7 +37,7 @@ class RoleAssignmentList extends RestValue
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\Values\User\RoleAssignment[] $roleAssignments
+     * @param \Ibexa\Contracts\Core\Repository\Values\User\RoleAssignment[] $roleAssignments
      * @param mixed $id
      * @param bool $isGroupAssignment
      */
diff --git a/src/lib/Server/Values/RoleList.php b/src/lib/Server/Values/RoleList.php
index e0629f93..4426fb77 100644
--- a/src/lib/Server/Values/RoleList.php
+++ b/src/lib/Server/Values/RoleList.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
@@ -16,7 +16,7 @@ class RoleList extends RestValue
     /**
      * Roles.
      *
-     * @var \eZ\Publish\API\Repository\Values\User\Role[]
+     * @var \Ibexa\Contracts\Core\Repository\Values\User\Role[]
      */
     public $roles;
 
@@ -30,7 +30,7 @@ class RoleList extends RestValue
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\Values\User\Role[] $roles
+     * @param \Ibexa\Contracts\Core\Repository\Values\User\Role[] $roles
      * @param string $path
      */
     public function __construct(array $roles, $path)
diff --git a/src/lib/Server/Values/SectionList.php b/src/lib/Server/Values/SectionList.php
index dff8698d..15409fad 100644
--- a/src/lib/Server/Values/SectionList.php
+++ b/src/lib/Server/Values/SectionList.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
@@ -16,7 +16,7 @@ class SectionList extends RestValue
     /**
      * Sections.
      *
-     * @var \eZ\Publish\API\Repository\Values\Content\Section[]
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Section[]
      */
     public $sections;
 
@@ -30,7 +30,7 @@ class SectionList extends RestValue
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\Values\Content\Section[] $sections
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Section[] $sections
      * @param string $path
      */
     public function __construct(array $sections, $path)
diff --git a/src/lib/Server/Values/SeeOther.php b/src/lib/Server/Values/SeeOther.php
index a2725339..60d844f0 100644
--- a/src/lib/Server/Values/SeeOther.php
+++ b/src/lib/Server/Values/SeeOther.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
diff --git a/src/lib/Server/Values/SessionInput.php b/src/lib/Server/Values/SessionInput.php
index e6f4846c..9e8f370b 100644
--- a/src/lib/Server/Values/SessionInput.php
+++ b/src/lib/Server/Values/SessionInput.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\ValueObject;
+use Ibexa\Contracts\Core\Repository\Values\ValueObject;
 
 /**
  * SessionInput view model.
diff --git a/src/lib/Server/Values/TemporaryRedirect.php b/src/lib/Server/Values/TemporaryRedirect.php
index ace5fa23..71d4ae30 100644
--- a/src/lib/Server/Values/TemporaryRedirect.php
+++ b/src/lib/Server/Values/TemporaryRedirect.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
diff --git a/src/lib/Server/Values/Trash.php b/src/lib/Server/Values/Trash.php
index 42d7116b..282c89a4 100644
--- a/src/lib/Server/Values/Trash.php
+++ b/src/lib/Server/Values/Trash.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
@@ -16,7 +16,7 @@ class Trash extends RestValue
     /**
      * Trash items.
      *
-     * @var \EzSystems\EzPlatformRest\Server\Values\RestTrashItem[]
+     * @var \Ibexa\Rest\Server\Values\RestTrashItem[]
      */
     public $trashItems;
 
@@ -30,7 +30,7 @@ class Trash extends RestValue
     /**
      * Construct.
      *
-     * @param \EzSystems\EzPlatformRest\Server\Values\RestTrashItem[] $trashItems
+     * @param \Ibexa\Rest\Server\Values\RestTrashItem[] $trashItems
      * @param string $path
      */
     public function __construct(array $trashItems, $path)
diff --git a/src/lib/Server/Values/URLAliasList.php b/src/lib/Server/Values/URLAliasList.php
index 3e6e3c5c..ebda18bd 100644
--- a/src/lib/Server/Values/URLAliasList.php
+++ b/src/lib/Server/Values/URLAliasList.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
@@ -16,7 +16,7 @@ class URLAliasList extends RestValue
     /**
      * URL aliases.
      *
-     * @var \eZ\Publish\API\Repository\Values\Content\URLAlias[]
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\URLAlias[]
      */
     public $urlAliases;
 
@@ -30,7 +30,7 @@ class URLAliasList extends RestValue
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\Values\Content\URLAlias[] $urlAliases
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\URLAlias[] $urlAliases
      * @param string $path
      */
     public function __construct(array $urlAliases, $path)
diff --git a/src/lib/Server/Values/URLAliasRefList.php b/src/lib/Server/Values/URLAliasRefList.php
index ca1b81f4..7a98deea 100644
--- a/src/lib/Server/Values/URLAliasRefList.php
+++ b/src/lib/Server/Values/URLAliasRefList.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
@@ -16,7 +16,7 @@ class URLAliasRefList extends RestValue
     /**
      * URL aliases.
      *
-     * @var \eZ\Publish\API\Repository\Values\Content\URLAlias[]
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\URLAlias[]
      */
     public $urlAliases;
 
@@ -30,7 +30,7 @@ class URLAliasRefList extends RestValue
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\Values\Content\URLAlias[] $urlAliases
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\URLAlias[] $urlAliases
      * @param string $path
      */
     public function __construct(array $urlAliases, $path)
diff --git a/src/lib/Server/Values/URLWildcardList.php b/src/lib/Server/Values/URLWildcardList.php
index 39c1ef63..09666657 100644
--- a/src/lib/Server/Values/URLWildcardList.php
+++ b/src/lib/Server/Values/URLWildcardList.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
@@ -16,14 +16,14 @@ class URLWildcardList extends RestValue
     /**
      * URL wildcards.
      *
-     * @var \eZ\Publish\API\Repository\Values\Content\URLWildcard[]
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\URLWildcard[]
      */
     public $urlWildcards;
 
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\Values\Content\URLWildcard[] $urlWildcards
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\URLWildcard[] $urlWildcards
      */
     public function __construct(array $urlWildcards)
     {
diff --git a/src/lib/Server/Values/UserGroupList.php b/src/lib/Server/Values/UserGroupList.php
index 272c3243..69a04ea1 100644
--- a/src/lib/Server/Values/UserGroupList.php
+++ b/src/lib/Server/Values/UserGroupList.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
@@ -16,7 +16,7 @@ class UserGroupList extends RestValue
     /**
      * User groups.
      *
-     * @var \EzSystems\EzPlatformRest\Server\Values\RestUserGroup[]
+     * @var \Ibexa\Rest\Server\Values\RestUserGroup[]
      */
     public $userGroups;
 
@@ -30,7 +30,7 @@ class UserGroupList extends RestValue
     /**
      * Construct.
      *
-     * @param \EzSystems\EzPlatformRest\Server\Values\RestUserGroup[] $userGroups
+     * @param \Ibexa\Rest\Server\Values\RestUserGroup[] $userGroups
      * @param string $path
      */
     public function __construct(array $userGroups, $path)
diff --git a/src/lib/Server/Values/UserGroupRefList.php b/src/lib/Server/Values/UserGroupRefList.php
index 434f5838..051f153f 100644
--- a/src/lib/Server/Values/UserGroupRefList.php
+++ b/src/lib/Server/Values/UserGroupRefList.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
@@ -16,7 +16,7 @@ class UserGroupRefList extends RestValue
     /**
      * User groups.
      *
-     * @var \EzSystems\EzPlatformRest\Server\Values\RestUserGroup[]
+     * @var \Ibexa\Rest\Server\Values\RestUserGroup[]
      */
     public $userGroups;
 
@@ -37,7 +37,7 @@ class UserGroupRefList extends RestValue
     /**
      * Construct.
      *
-     * @param \EzSystems\EzPlatformRest\Server\Values\RestUserGroup[] $userGroups
+     * @param \Ibexa\Rest\Server\Values\RestUserGroup[] $userGroups
      * @param string $path
      * @param mixed $userId
      */
diff --git a/src/lib/Server/Values/UserList.php b/src/lib/Server/Values/UserList.php
index 758aac98..ae03a7e7 100644
--- a/src/lib/Server/Values/UserList.php
+++ b/src/lib/Server/Values/UserList.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
@@ -16,7 +16,7 @@ class UserList extends RestValue
     /**
      * Users.
      *
-     * @var \EzSystems\EzPlatformRest\Server\Values\RestUser[]
+     * @var \Ibexa\Rest\Server\Values\RestUser[]
      */
     public $users;
 
@@ -30,7 +30,7 @@ class UserList extends RestValue
     /**
      * Construct.
      *
-     * @param \EzSystems\EzPlatformRest\Server\Values\RestUser[] $users
+     * @param \Ibexa\Rest\Server\Values\RestUser[] $users
      * @param string $path
      */
     public function __construct(array $users, $path)
diff --git a/src/lib/Server/Values/UserRefList.php b/src/lib/Server/Values/UserRefList.php
index a8bb3555..d6896b89 100644
--- a/src/lib/Server/Values/UserRefList.php
+++ b/src/lib/Server/Values/UserRefList.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
@@ -16,7 +16,7 @@ class UserRefList extends RestValue
     /**
      * Users.
      *
-     * @var \EzSystems\EzPlatformRest\Server\Values\RestUser[]
+     * @var \Ibexa\Rest\Server\Values\RestUser[]
      */
     public $users;
 
@@ -30,7 +30,7 @@ class UserRefList extends RestValue
     /**
      * Construct.
      *
-     * @param \EzSystems\EzPlatformRest\Server\Values\RestUser[] $users
+     * @param \Ibexa\Rest\Server\Values\RestUser[] $users
      * @param string $path
      */
     public function __construct(array $users, $path)
diff --git a/src/lib/Server/Values/UserSession.php b/src/lib/Server/Values/UserSession.php
index 6d747747..ef967f3c 100644
--- a/src/lib/Server/Values/UserSession.php
+++ b/src/lib/Server/Values/UserSession.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
+use Ibexa\Contracts\Core\Repository\Values\User\User;
 use Ibexa\Rest\Value as RestValue;
-use eZ\Publish\API\Repository\Values\User\User;
 
 /**
  * User list view model.
@@ -17,7 +17,7 @@ class UserSession extends RestValue
     /**
      * User.
      *
-     * @var \eZ\Publish\API\Repository\Values\User\User
+     * @var \Ibexa\Contracts\Core\Repository\Values\User\User
      */
     public $user;
 
@@ -50,7 +50,7 @@ class UserSession extends RestValue
     public $exists;
 
     /**
-     * @param \eZ\Publish\API\Repository\Values\User\User $user
+     * @param \Ibexa\Contracts\Core\Repository\Values\User\User $user
      * @param string $sessionName
      * @param string $sessionId
      * @param string $csrfToken
diff --git a/src/lib/Server/Values/Version.php b/src/lib/Server/Values/Version.php
index 0daa3a36..96ca3e0d 100644
--- a/src/lib/Server/Values/Version.php
+++ b/src/lib/Server/Values/Version.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\Content\Content;
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
 use Ibexa\Rest\Value as RestValue;
 
 /**
@@ -16,17 +16,17 @@
 class Version extends RestValue
 {
     /**
-     * @var \eZ\Publish\API\Repository\Values\Content\Content
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Content
      */
     public $content;
 
     /**
-     * @var \eZ\Publish\API\Repository\Values\ContentType\ContentType
+     * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType
      */
     public $contentType;
 
     /**
-     * @var \eZ\Publish\API\Repository\Values\Content\Relation[]
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Relation[]
      */
     public $relations;
 
@@ -40,9 +40,9 @@ class Version extends RestValue
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\Values\Content\Content $content
-     * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType $contentType
-     * @param \eZ\Publish\API\Repository\Values\Content\Relation[] $relations
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Content $content
+     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType $contentType
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Relation[] $relations
      * @param string $path
      */
     public function __construct(Content $content, ContentType $contentType, array $relations, $path = null)
diff --git a/src/lib/Server/Values/VersionList.php b/src/lib/Server/Values/VersionList.php
index e9d00b1d..f9e483a4 100644
--- a/src/lib/Server/Values/VersionList.php
+++ b/src/lib/Server/Values/VersionList.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
@@ -16,7 +16,7 @@ class VersionList extends RestValue
     /**
      * Versions.
      *
-     * @var \eZ\Publish\API\Repository\Values\Content\VersionInfo[]
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo[]
      */
     public $versions;
 
@@ -30,7 +30,7 @@ class VersionList extends RestValue
     /**
      * Construct.
      *
-     * @param \eZ\Publish\API\Repository\Values\Content\VersionInfo[] $versions
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo[] $versions
      * @param string $path
      */
     public function __construct(array $versions, $path)
diff --git a/src/lib/Server/Values/VersionTranslationInfo.php b/src/lib/Server/Values/VersionTranslationInfo.php
index 7659b5c8..8e4ada43 100644
--- a/src/lib/Server/Values/VersionTranslationInfo.php
+++ b/src/lib/Server/Values/VersionTranslationInfo.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\Values;
 
-use eZ\Publish\API\Repository\Values\Content\VersionInfo;
+use Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo;
 use Ibexa\Rest\Value as RestValue;
 
 /**
@@ -15,12 +15,12 @@
 class VersionTranslationInfo extends RestValue
 {
     /**
-     * @var \eZ\Publish\API\Repository\Values\Content\VersionInfo
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo
      */
     private $versionInfo;
 
     /**
-     * @param \eZ\Publish\API\Repository\Values\Content\VersionInfo $versionInfo
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo $versionInfo
      */
     public function __construct(VersionInfo $versionInfo)
     {
@@ -28,7 +28,7 @@ public function __construct(VersionInfo $versionInfo)
     }
 
     /**
-     * @return \eZ\Publish\API\Repository\Values\Content\VersionInfo
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo
      */
     public function getVersionInfo()
     {
diff --git a/src/lib/Server/View/AcceptHeaderVisitorDispatcher.php b/src/lib/Server/View/AcceptHeaderVisitorDispatcher.php
index 94d5202e..39a2caad 100644
--- a/src/lib/Server/View/AcceptHeaderVisitorDispatcher.php
+++ b/src/lib/Server/View/AcceptHeaderVisitorDispatcher.php
@@ -1,15 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Server\View;
 
-use Symfony\Component\HttpFoundation\Request;
 use Ibexa\Contracts\Rest\Output\Visitor as OutputVisitor;
-use Symfony\Component\HttpFoundation\Response;
 use RuntimeException;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Dispatcher for various visitors depending on the mime-type accept header.
@@ -28,7 +27,7 @@ class AcceptHeaderVisitorDispatcher
      * Adds view handler.
      *
      * @param string $regexp
-     * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor
+     * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor
      */
     public function addVisitor($regexp, OutputVisitor $visitor)
     {
@@ -41,14 +40,14 @@ public function addVisitor($regexp, OutputVisitor $visitor)
      * @param \Symfony\Component\HttpFoundation\Request $request
      * @param mixed $result
      *
-     * @throws RuntimeException
+     * @throws \RuntimeException
      *
-     * @return Response
+     * @return \Symfony\Component\HttpFoundation\Response
      */
     public function dispatch(Request $request, $result)
     {
         foreach ($request->getAcceptableContentTypes() as $mimeType) {
-            /** @var \EzSystems\EzPlatformRest\Output\Visitor $visitor */
+            /** @var \Ibexa\Contracts\Rest\Output\Visitor $visitor */
             foreach ($this->mapping as $regexp => $visitor) {
                 if (preg_match($regexp, $mimeType)) {
                     return $visitor->visit($result);
diff --git a/src/lib/Value.php b/src/lib/Value.php
index ff865641..1850c282 100644
--- a/src/lib/Value.php
+++ b/src/lib/Value.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest;
diff --git a/src/lib/Values/ContentObjectStates.php b/src/lib/Values/ContentObjectStates.php
index 0d6f9c09..e0cdae35 100644
--- a/src/lib/Values/ContentObjectStates.php
+++ b/src/lib/Values/ContentObjectStates.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Values;
diff --git a/src/lib/Values/Resource.php b/src/lib/Values/Resource.php
index 19b12f16..586d5b9f 100644
--- a/src/lib/Values/Resource.php
+++ b/src/lib/Values/Resource.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Values;
diff --git a/src/lib/Values/RestContentMetadataUpdateStruct.php b/src/lib/Values/RestContentMetadataUpdateStruct.php
index c18ceacc..661c2df7 100644
--- a/src/lib/Values/RestContentMetadataUpdateStruct.php
+++ b/src/lib/Values/RestContentMetadataUpdateStruct.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Values;
 
-use eZ\Publish\API\Repository\Values\Content\ContentMetadataUpdateStruct;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentMetadataUpdateStruct;
 
 /**
  * Extended ContentMetadataUpdateStruct that includes section information.
diff --git a/src/lib/Values/RestObjectState.php b/src/lib/Values/RestObjectState.php
index 6a4578c3..88fd3625 100644
--- a/src/lib/Values/RestObjectState.php
+++ b/src/lib/Values/RestObjectState.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Values;
 
-use eZ\Publish\API\Repository\Values\ObjectState\ObjectState;
+use Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectState;
 use Ibexa\Rest\Value as RestValue;
 
 /**
@@ -17,7 +17,7 @@ class RestObjectState extends RestValue
     /**
      * Wrapped object state.
      *
-     * @var \eZ\Publish\API\Repository\Values\ObjectState\ObjectState
+     * @var \Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectState
      */
     public $objectState;
 
@@ -31,7 +31,7 @@ class RestObjectState extends RestValue
     /**
      * Constructor.
      *
-     * @param \eZ\Publish\API\Repository\Values\ObjectState\ObjectState $objectState
+     * @param \Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectState $objectState
      * @param mixed $groupId
      */
     public function __construct(ObjectState $objectState, $groupId)
diff --git a/src/lib/Values/Root.php b/src/lib/Values/Root.php
index 2096ad15..3a165d21 100644
--- a/src/lib/Values/Root.php
+++ b/src/lib/Values/Root.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Rest\Values;
diff --git a/tests/bundle/CorsOptions/RestProviderTest.php b/tests/bundle/CorsOptions/RestProviderTest.php
index 0aa49adc..7747a73c 100644
--- a/tests/bundle/CorsOptions/RestProviderTest.php
+++ b/tests/bundle/CorsOptions/RestProviderTest.php
@@ -1,19 +1,18 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\CorsOptions;
 
+use Exception;
 use Ibexa\Bundle\Rest\CorsOptions\RestProvider;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
-use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\TestCase;
-use Exception;
 
 class RestProviderTest extends TestCase
 {
@@ -88,7 +87,7 @@ public function testGetOptionsNotRestRequest()
     /**
      * @param bool $isRestRequest wether or not to set the is_rest_request attribute
      *
-     * @return Request
+     * @return \Symfony\Component\HttpFoundation\Request
      */
     protected function createRequest($isRestRequest = true)
     {
@@ -108,7 +107,7 @@ protected function getProvider()
     }
 
     /**
-     * @return MockObject|RequestMatcherInterface
+     * @return \PHPUnit\Framework\MockObject\MockObject|\Symfony\Component\Routing\Matcher\RequestMatcherInterface
      */
     protected function getRequestMatcherMock()
     {
diff --git a/tests/bundle/DependencyInjection/Compiler/FieldTypeProcessorPassTest.php b/tests/bundle/DependencyInjection/Compiler/FieldTypeProcessorPassTest.php
index 5569faf0..c333a7c2 100644
--- a/tests/bundle/DependencyInjection/Compiler/FieldTypeProcessorPassTest.php
+++ b/tests/bundle/DependencyInjection/Compiler/FieldTypeProcessorPassTest.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\DependencyInjection\Compiler;
 
 use Ibexa\Bundle\Rest\DependencyInjection\Compiler\FieldTypeProcessorPass;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
-use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Reference;
 
 class FieldTypeProcessorPassTest extends TestCase
diff --git a/tests/bundle/DependencyInjection/Compiler/InputHandlerPassTest.php b/tests/bundle/DependencyInjection/Compiler/InputHandlerPassTest.php
index f916e520..684657c7 100644
--- a/tests/bundle/DependencyInjection/Compiler/InputHandlerPassTest.php
+++ b/tests/bundle/DependencyInjection/Compiler/InputHandlerPassTest.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\DependencyInjection\Compiler;
 
 use Ibexa\Bundle\Rest\DependencyInjection\Compiler\InputHandlerPass;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
-use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Reference;
 
 class InputHandlerPassTest extends TestCase
diff --git a/tests/bundle/DependencyInjection/Compiler/InputParserPassTest.php b/tests/bundle/DependencyInjection/Compiler/InputParserPassTest.php
index 24e3c3de..78521435 100644
--- a/tests/bundle/DependencyInjection/Compiler/InputParserPassTest.php
+++ b/tests/bundle/DependencyInjection/Compiler/InputParserPassTest.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\DependencyInjection\Compiler;
 
 use Ibexa\Bundle\Rest\DependencyInjection\Compiler\InputParserPass;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
-use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Reference;
 
 class InputParserPassTest extends TestCase
diff --git a/tests/bundle/DependencyInjection/Compiler/OutputVisitorPassTest.php b/tests/bundle/DependencyInjection/Compiler/OutputVisitorPassTest.php
index 1bb61ca1..3c8287b9 100644
--- a/tests/bundle/DependencyInjection/Compiler/OutputVisitorPassTest.php
+++ b/tests/bundle/DependencyInjection/Compiler/OutputVisitorPassTest.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\DependencyInjection\Compiler;
 
 use Ibexa\Bundle\Rest\DependencyInjection\Compiler\OutputVisitorPass;
+use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractCompilerPassTestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
-use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractCompilerPassTestCase;
 use Symfony\Component\DependencyInjection\Reference;
 
 class OutputVisitorPassTest extends AbstractCompilerPassTestCase
@@ -106,7 +106,7 @@ protected function getVisitorsInRegistrationOrder()
     {
         $calls = $this->container->getDefinition('ezpublish_rest.output.visitor.dispatcher')->getMethodCalls();
 
-        return array_map(function ($call) {
+        return array_map(static function ($call) {
             return (string) $call[1][1];
         }, $calls);
     }
diff --git a/tests/bundle/DependencyInjection/Compiler/ValueObjectVisitorPassTest.php b/tests/bundle/DependencyInjection/Compiler/ValueObjectVisitorPassTest.php
index 7d897236..fd0df34b 100644
--- a/tests/bundle/DependencyInjection/Compiler/ValueObjectVisitorPassTest.php
+++ b/tests/bundle/DependencyInjection/Compiler/ValueObjectVisitorPassTest.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\DependencyInjection\Compiler;
 
 use Ibexa\Bundle\Rest\DependencyInjection\Compiler\ValueObjectVisitorPass;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
-use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Reference;
 
 class ValueObjectVisitorPassTest extends TestCase
diff --git a/tests/bundle/EventListener/CsrfListenerTest.php b/tests/bundle/EventListener/CsrfListenerTest.php
index 85f6ef89..7c6deb7d 100644
--- a/tests/bundle/EventListener/CsrfListenerTest.php
+++ b/tests/bundle/EventListener/CsrfListenerTest.php
@@ -1,31 +1,28 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\EventListener;
 
-use eZ\Publish\Core\Base\Exceptions\UnauthorizedException;
-use PHPUnit\Framework\MockObject\MockObject;
+use Ibexa\Bundle\Rest\EventListener\CsrfListener;
+use Ibexa\Core\Base\Exceptions\UnauthorizedException;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
-use Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface;
-use Ibexa\Bundle\Rest\EventListener\CsrfListener;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\Security\Csrf\CsrfToken;
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 
 class CsrfListenerTest extends EventListenerTest
 {
-    const VALID_TOKEN = 'valid';
-    const INVALID_TOKEN = 'invalid';
-    const INTENTION = 'rest';
+    public const VALID_TOKEN = 'valid';
+    public const INVALID_TOKEN = 'invalid';
+    public const INTENTION = 'rest';
 
-    /** @var EventDispatcherInterface */
+    /** @var \Symfony\Component\EventDispatcher\EventDispatcherInterface */
     protected $eventDispatcherMock;
 
     /**
@@ -174,7 +171,7 @@ public function testValidToken()
     }
 
     /**
-     * @return CsrfProviderInterface|MockObject
+     * @return \Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     protected function getCsrfProviderMock()
     {
@@ -182,7 +179,7 @@ protected function getCsrfProviderMock()
         $provider->expects($this->any())
             ->method('isTokenValid')
             ->willReturnCallback(
-                function (CsrfToken $token) {
+                static function (CsrfToken $token) {
                     if ($token == new CsrfToken(self::INTENTION, self::VALID_TOKEN)) {
                         return true;
                     }
@@ -195,7 +192,7 @@ function (CsrfToken $token) {
     }
 
     /**
-     * @return MockObject|RequestEvent
+     * @return \PHPUnit\Framework\MockObject\MockObject|\Symfony\Component\HttpKernel\Event\RequestEvent
      */
     protected function getEvent($class = null)
     {
@@ -228,7 +225,7 @@ protected function getSessionMock()
     }
 
     /**
-     * @return ParameterBag|MockObject
+     * @return \Symfony\Component\HttpFoundation\ParameterBag|\PHPUnit\Framework\MockObject\MockObject
      */
     protected function getRequestHeadersMock()
     {
@@ -262,7 +259,7 @@ protected function getRequestHeadersMock()
     }
 
     /**
-     * @return MockObject|Request
+     * @return \PHPUnit\Framework\MockObject\MockObject|\Symfony\Component\HttpFoundation\Request
      */
     protected function getRequestMock()
     {
@@ -297,7 +294,7 @@ protected function getRequestMock()
     }
 
     /**
-     * @return MockObject|EventDispatcherInterface
+     * @return \PHPUnit\Framework\MockObject\MockObject|\Symfony\Component\EventDispatcher\EventDispatcherInterface
      */
     protected function getEventDispatcherMock()
     {
@@ -311,7 +308,7 @@ protected function getEventDispatcherMock()
     /**
      * @param bool $csrfEnabled
      *
-     * @return CsrfListener
+     * @return \Ibexa\Bundle\Rest\EventListener\CsrfListener
      */
     protected function getEventListener($csrfEnabled = true)
     {
diff --git a/tests/bundle/EventListener/EventListenerTest.php b/tests/bundle/EventListener/EventListenerTest.php
index 4b86fa3f..c41cd34f 100644
--- a/tests/bundle/EventListener/EventListenerTest.php
+++ b/tests/bundle/EventListener/EventListenerTest.php
@@ -1,31 +1,28 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\EventListener;
 
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Ibexa\Bundle\Rest\EventListener\CsrfListener;
-use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\TestCase;
 
 abstract class EventListenerTest extends TestCase
 {
-    /** @var EventDispatcherInterface */
+    /** @var \Symfony\Component\EventDispatcher\EventDispatcherInterface */
     protected $event;
 
-    /** @var Request|MockObject */
+    /** @var \Symfony\Component\HttpFoundation\Request|\PHPUnit\Framework\MockObject\MockObject */
     protected $requestMock;
 
-    /** @var ParameterBag|MockObject */
+    /** @var \Symfony\Component\HttpFoundation\ParameterBag|\PHPUnit\Framework\MockObject\MockObject */
     protected $requestAttributesMock;
 
-    /** @var ParameterBag|MockObject */
+    /** @var \Symfony\Component\HttpFoundation\ParameterBag|\PHPUnit\Framework\MockObject\MockObject */
     protected $requestHeadersMock;
 
     protected $isRestRequest = true;
@@ -59,7 +56,7 @@ public function testGetSubscribedEvents($expectedEventTypes)
     }
 
     /**
-     * @return MockObject|$class
+     * @return \PHPUnit\Framework\MockObject\MockObject|$class
      */
     protected function getEvent($class)
     {
@@ -78,7 +75,7 @@ protected function getEvent($class)
     }
 
     /**
-     * @return ParameterBag|MockObject
+     * @return \Symfony\Component\HttpFoundation\ParameterBag|\PHPUnit\Framework\MockObject\MockObject
      */
     protected function getRequestAttributesMock()
     {
@@ -100,7 +97,7 @@ protected function getRequestAttributesMock()
     }
 
     /**
-     * @return MockObject|Request
+     * @return \PHPUnit\Framework\MockObject\MockObject|\Symfony\Component\HttpFoundation\Request
      */
     protected function getRequestMock()
     {
@@ -125,7 +122,7 @@ protected function getRequestMock()
     }
 
     /**
-     * @return ParameterBag|MockObject
+     * @return \Symfony\Component\HttpFoundation\ParameterBag|\PHPUnit\Framework\MockObject\MockObject
      */
     protected function getRequestHeadersMock()
     {
@@ -139,7 +136,7 @@ protected function getRequestHeadersMock()
     /**
      * @param bool $csrfEnabled
      *
-     * @return CsrfListener
+     * @return \Ibexa\Bundle\Rest\EventListener\CsrfListener
      */
     abstract protected function getEventListener();
 
diff --git a/tests/bundle/EventListener/RequestListenerTest.php b/tests/bundle/EventListener/RequestListenerTest.php
index 1153c3c7..44839805 100644
--- a/tests/bundle/EventListener/RequestListenerTest.php
+++ b/tests/bundle/EventListener/RequestListenerTest.php
@@ -1,23 +1,22 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\EventListener;
 
+use Ibexa\Bundle\Rest\EventListener\RequestListener;
 use Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Ibexa\Bundle\Rest\EventListener\RequestListener;
 use Symfony\Component\HttpKernel\KernelEvents;
-use PHPUnit\Framework\MockObject\MockObject;
 
 class RequestListenerTest extends EventListenerTest
 {
-    const REST_ROUTE = '/api/ezp/v2/rest-route';
-    const NON_REST_ROUTE = '/non-rest-route';
+    public const REST_ROUTE = '/api/ezp/v2/rest-route';
+    public const NON_REST_ROUTE = '/non-rest-route';
 
     public function provideExpectedSubscribedEventTypes()
     {
@@ -98,7 +97,7 @@ public function testNonRestRequestVariations($uri)
     }
 
     /**
-     * @return RequestListener
+     * @return \Ibexa\Bundle\Rest\EventListener\RequestListener
      */
     protected function getEventListener()
     {
@@ -108,7 +107,7 @@ protected function getEventListener()
     }
 
     /**
-     * @return AcceptHeaderVisitorDispatcher|MockObject
+     * @return \Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher|\PHPUnit\Framework\MockObject\MockObject
      */
     public function getVisitorDispatcherMock()
     {
@@ -116,7 +115,7 @@ public function getVisitorDispatcherMock()
     }
 
     /**
-     * @return Request
+     * @return \Symfony\Component\HttpFoundation\Request
      */
     protected function performFakeRequest($uri, $type = HttpKernelInterface::MASTER_REQUEST)
     {
diff --git a/tests/bundle/EventListener/ResponseListenerTest.php b/tests/bundle/EventListener/ResponseListenerTest.php
index 5ace38ba..19ccc74c 100644
--- a/tests/bundle/EventListener/ResponseListenerTest.php
+++ b/tests/bundle/EventListener/ResponseListenerTest.php
@@ -1,46 +1,44 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\EventListener;
 
 use Exception;
+use Ibexa\Bundle\Rest\EventListener\ResponseListener;
 use Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher;
-use PHPUnit\Framework\MockObject\MockObject;
+use stdClass;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpKernel\Event\ViewEvent;
-use Symfony\Component\HttpKernel\Event\ExceptionEvent;
-use Ibexa\Bundle\Rest\EventListener\ResponseListener;
-use stdClass;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\KernelInterface;
-use Symfony\Contracts\EventDispatcher\Event;
 
 class ResponseListenerTest extends EventListenerTest
 {
-    /** @var AcceptHeaderVisitorDispatcher|MockObject */
+    /** @var \Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher|\PHPUnit\Framework\MockObject\MockObject */
     protected $visitorDispatcherMock;
 
     /** @var \stdClass */
     protected $eventValue;
 
-    /** @var Exception */
+    /** @var \Exception */
     protected $exceptionEventValue;
 
     protected $dispatcherMessage;
 
     protected $controllerResult;
 
-    /** @var Response */
+    /** @var \Symfony\Component\HttpFoundation\Response */
     protected $response;
 
-    /** @var Event */
+    /** @var \Symfony\Contracts\EventDispatcher\Event */
     protected $event;
 
-    /** @var KernelInterface|MockObject */
+    /** @var \Symfony\Component\HttpKernel\KernelInterface|\PHPUnit\Framework\MockObject\MockObject */
     protected $kernelMock;
 
     public function setUp(): void
@@ -114,7 +112,7 @@ protected function onKernelView($method, $event, $value)
     }
 
     /**
-     * @return AcceptHeaderVisitorDispatcher|MockObject
+     * @return \Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher|\PHPUnit\Framework\MockObject\MockObject
      */
     public function getVisitorDispatcherMock()
     {
@@ -126,7 +124,7 @@ public function getVisitorDispatcherMock()
     }
 
     /**
-     * @return ResponseListener
+     * @return \Ibexa\Bundle\Rest\EventListener\ResponseListener
      */
     protected function getEventListener()
     {
@@ -136,7 +134,7 @@ protected function getEventListener()
     }
 
     /**
-     * @return ViewEvent
+     * @return \Symfony\Component\HttpKernel\Event\ViewEvent
      */
     protected function getControllerResultEvent(): ViewEvent
     {
@@ -153,7 +151,7 @@ protected function getControllerResultEvent(): ViewEvent
     }
 
     /**
-     * @return MockObject|KernelInterface
+     * @return \PHPUnit\Framework\MockObject\MockObject|\Symfony\Component\HttpKernel\KernelInterface
      */
     protected function getKernelMock(): KernelInterface
     {
@@ -165,7 +163,7 @@ protected function getKernelMock(): KernelInterface
     }
 
     /**
-     * @return ExceptionEvent
+     * @return \Symfony\Component\HttpKernel\Event\ExceptionEvent
      */
     protected function getExceptionEvent(): ExceptionEvent
     {
diff --git a/tests/bundle/Functional/BinaryContentTest.php b/tests/bundle/Functional/BinaryContentTest.php
index 6314b87a..b6789b0e 100644
--- a/tests/bundle/Functional/BinaryContentTest.php
+++ b/tests/bundle/Functional/BinaryContentTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\Functional;
diff --git a/tests/bundle/Functional/BookmarkTest.php b/tests/bundle/Functional/BookmarkTest.php
index 4ef67764..d665623e 100644
--- a/tests/bundle/Functional/BookmarkTest.php
+++ b/tests/bundle/Functional/BookmarkTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
@@ -22,7 +22,8 @@ public function testCreateBookmark(): int
         $locationId = (int) array_pop($locationPathParts);
 
         $request = $this->createHttpRequest(
-            'POST', '/api/ezp/v2/bookmark/' . $locationId
+            'POST',
+            '/api/ezp/v2/bookmark/' . $locationId
         );
 
         $response = $this->sendHttpRequest($request);
@@ -38,7 +39,8 @@ public function testCreateBookmark(): int
     public function testCreateBookmarkIfAlreadyExists(int $locationId): void
     {
         $request = $this->createHttpRequest(
-            'POST', '/api/ezp/v2/bookmark/' . $locationId
+            'POST',
+            '/api/ezp/v2/bookmark/' . $locationId
         );
 
         $response = $this->sendHttpRequest($request);
@@ -52,7 +54,8 @@ public function testCreateBookmarkIfAlreadyExists(int $locationId): void
     public function testIsBookmarked(int $locationId): void
     {
         $request = $this->createHttpRequest(
-            'HEAD', '/api/ezp/v2/bookmark/' . $locationId
+            'HEAD',
+            '/api/ezp/v2/bookmark/' . $locationId
         );
 
         $response = $this->sendHttpRequest($request);
@@ -65,7 +68,8 @@ public function testIsBookmarkedReturnsNotFound(): void
         $locationId = 43;
 
         $request = $this->createHttpRequest(
-            'HEAD', '/api/ezp/v2/bookmark/' . $locationId
+            'HEAD',
+            '/api/ezp/v2/bookmark/' . $locationId
         );
 
         $response = $this->sendHttpRequest($request);
@@ -79,7 +83,8 @@ public function testIsBookmarkedReturnsNotFound(): void
     public function testDeleteBookmark(int $locationId): void
     {
         $request = $this->createHttpRequest(
-            'DELETE', '/api/ezp/v2/bookmark/' . $locationId
+            'DELETE',
+            '/api/ezp/v2/bookmark/' . $locationId
         );
 
         $response = $this->sendHttpRequest($request);
@@ -106,7 +111,8 @@ public function testDeleteBookmarkReturnNotFound(): void
         $locationId = 43;
 
         $request = $this->createHttpRequest(
-            'DELETE', '/api/ezp/v2/bookmark/' . $locationId
+            'DELETE',
+            '/api/ezp/v2/bookmark/' . $locationId
         );
 
         $response = $this->sendHttpRequest($request);
diff --git a/tests/bundle/Functional/ContentTest.php b/tests/bundle/Functional/ContentTest.php
index 5958c0f4..b1fd1d09 100644
--- a/tests/bundle/Functional/ContentTest.php
+++ b/tests/bundle/Functional/ContentTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\Functional;
diff --git a/tests/bundle/Functional/ContentTypeTest.php b/tests/bundle/Functional/ContentTypeTest.php
index a6aa547b..572b5f26 100644
--- a/tests/bundle/Functional/ContentTypeTest.php
+++ b/tests/bundle/Functional/ContentTypeTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\Functional;
diff --git a/tests/bundle/Functional/HttpOptionsTest.php b/tests/bundle/Functional/HttpOptionsTest.php
index 8d0ce77d..cde4bc4d 100644
--- a/tests/bundle/Functional/HttpOptionsTest.php
+++ b/tests/bundle/Functional/HttpOptionsTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
diff --git a/tests/bundle/Functional/LocationTest.php b/tests/bundle/Functional/LocationTest.php
index 07d30883..934c6b9b 100644
--- a/tests/bundle/Functional/LocationTest.php
+++ b/tests/bundle/Functional/LocationTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\Functional;
diff --git a/tests/bundle/Functional/ObjectStateTest.php b/tests/bundle/Functional/ObjectStateTest.php
index 167005e5..a6301b00 100644
--- a/tests/bundle/Functional/ObjectStateTest.php
+++ b/tests/bundle/Functional/ObjectStateTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\Functional;
diff --git a/tests/bundle/Functional/RelationTest.php b/tests/bundle/Functional/RelationTest.php
index 936a3035..98158f43 100644
--- a/tests/bundle/Functional/RelationTest.php
+++ b/tests/bundle/Functional/RelationTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\Functional;
diff --git a/tests/bundle/Functional/RoleTest.php b/tests/bundle/Functional/RoleTest.php
index 88d48c72..d428bf99 100644
--- a/tests/bundle/Functional/RoleTest.php
+++ b/tests/bundle/Functional/RoleTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\Functional;
diff --git a/tests/bundle/Functional/RootTest.php b/tests/bundle/Functional/RootTest.php
index bdf28522..80d05619 100644
--- a/tests/bundle/Functional/RootTest.php
+++ b/tests/bundle/Functional/RootTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\Functional;
diff --git a/tests/bundle/Functional/SearchView/Criterion/IsUserBasedTest.php b/tests/bundle/Functional/SearchView/Criterion/IsUserBasedTest.php
index bff60eca..24ed1e7b 100644
--- a/tests/bundle/Functional/SearchView/Criterion/IsUserBasedTest.php
+++ b/tests/bundle/Functional/SearchView/Criterion/IsUserBasedTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
diff --git a/tests/bundle/Functional/SearchView/Criterion/IsUserEnabledTest.php b/tests/bundle/Functional/SearchView/Criterion/IsUserEnabledTest.php
index 0e3db00f..9177386b 100644
--- a/tests/bundle/Functional/SearchView/Criterion/IsUserEnabledTest.php
+++ b/tests/bundle/Functional/SearchView/Criterion/IsUserEnabledTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
diff --git a/tests/bundle/Functional/SearchView/Criterion/ObjectStateIdentifierTest.php b/tests/bundle/Functional/SearchView/Criterion/ObjectStateIdentifierTest.php
index 9c03f720..3707639e 100644
--- a/tests/bundle/Functional/SearchView/Criterion/ObjectStateIdentifierTest.php
+++ b/tests/bundle/Functional/SearchView/Criterion/ObjectStateIdentifierTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
diff --git a/tests/bundle/Functional/SearchView/Criterion/SectionIdentifierTest.php b/tests/bundle/Functional/SearchView/Criterion/SectionIdentifierTest.php
index 12c94a8f..4e812fb8 100644
--- a/tests/bundle/Functional/SearchView/Criterion/SectionIdentifierTest.php
+++ b/tests/bundle/Functional/SearchView/Criterion/SectionIdentifierTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
diff --git a/tests/bundle/Functional/SearchView/Criterion/SiblingTest.php b/tests/bundle/Functional/SearchView/Criterion/SiblingTest.php
index 9acb5243..a63e1a17 100644
--- a/tests/bundle/Functional/SearchView/Criterion/SiblingTest.php
+++ b/tests/bundle/Functional/SearchView/Criterion/SiblingTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
diff --git a/tests/bundle/Functional/SearchView/Criterion/UserEmailTest.php b/tests/bundle/Functional/SearchView/Criterion/UserEmailTest.php
index e26a1574..054cb576 100644
--- a/tests/bundle/Functional/SearchView/Criterion/UserEmailTest.php
+++ b/tests/bundle/Functional/SearchView/Criterion/UserEmailTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
diff --git a/tests/bundle/Functional/SearchView/Criterion/UserIdTest.php b/tests/bundle/Functional/SearchView/Criterion/UserIdTest.php
index c1015c8d..491eb311 100644
--- a/tests/bundle/Functional/SearchView/Criterion/UserIdTest.php
+++ b/tests/bundle/Functional/SearchView/Criterion/UserIdTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
diff --git a/tests/bundle/Functional/SearchView/Criterion/UserLoginTest.php b/tests/bundle/Functional/SearchView/Criterion/UserLoginTest.php
index 1e760c34..f9fa088d 100644
--- a/tests/bundle/Functional/SearchView/Criterion/UserLoginTest.php
+++ b/tests/bundle/Functional/SearchView/Criterion/UserLoginTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
diff --git a/tests/bundle/Functional/SearchView/SearchCriterionTestCase.php b/tests/bundle/Functional/SearchView/SearchCriterionTestCase.php
index a1b1756a..ee371325 100644
--- a/tests/bundle/Functional/SearchView/SearchCriterionTestCase.php
+++ b/tests/bundle/Functional/SearchView/SearchCriterionTestCase.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
diff --git a/tests/bundle/Functional/SearchView/SearchViewTest.php b/tests/bundle/Functional/SearchView/SearchViewTest.php
index 9ccd6edf..3ec5c3d7 100644
--- a/tests/bundle/Functional/SearchView/SearchViewTest.php
+++ b/tests/bundle/Functional/SearchView/SearchViewTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
@@ -10,7 +10,7 @@
 
 use DOMDocument;
 use DOMElement;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator;
 
 class SearchViewTest extends SearchViewTestCase
 {
@@ -328,7 +328,7 @@ public function jsonProvider(): array
      * @param string $operator
      * @param string|string[] $value
      *
-     * @return DOMElement
+     * @return \DOMElement
      */
     private function buildFieldXml(string $name, string $operator, $value): DOMElement
     {
diff --git a/tests/bundle/Functional/SearchView/SearchViewTestCase.php b/tests/bundle/Functional/SearchView/SearchViewTestCase.php
index d9879e75..1638bbbf 100644
--- a/tests/bundle/Functional/SearchView/SearchViewTestCase.php
+++ b/tests/bundle/Functional/SearchView/SearchViewTestCase.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
diff --git a/tests/bundle/Functional/SectionTest.php b/tests/bundle/Functional/SectionTest.php
index fd92825a..ad861feb 100644
--- a/tests/bundle/Functional/SectionTest.php
+++ b/tests/bundle/Functional/SectionTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\Functional;
diff --git a/tests/bundle/Functional/SessionTest.php b/tests/bundle/Functional/SessionTest.php
index 5bdf01e4..a85e174a 100644
--- a/tests/bundle/Functional/SessionTest.php
+++ b/tests/bundle/Functional/SessionTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\Functional;
diff --git a/tests/bundle/Functional/SortClauseTest.php b/tests/bundle/Functional/SortClauseTest.php
index 427222fa..56c5850e 100644
--- a/tests/bundle/Functional/SortClauseTest.php
+++ b/tests/bundle/Functional/SortClauseTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\Functional;
diff --git a/tests/bundle/Functional/TestCase.php b/tests/bundle/Functional/TestCase.php
index 566b8c9f..26614983 100644
--- a/tests/bundle/Functional/TestCase.php
+++ b/tests/bundle/Functional/TestCase.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\Functional;
 
 use Nyholm\Psr7\Request as HttpRequest;
-use PHPUnit\Framework\TestCase as BaseTestCase;
 use PHPUnit\Framework\ExpectationFailedException;
+use PHPUnit\Framework\TestCase as BaseTestCase;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use RuntimeException;
@@ -18,7 +18,7 @@
 
 class TestCase extends BaseTestCase
 {
-    const X_HTTP_METHOD_OVERRIDE_MAP = [
+    public const X_HTTP_METHOD_OVERRIDE_MAP = [
         'PUBLISH' => 'POST',
         'MOVE' => 'POST',
         'PATCH' => 'PATCH',
@@ -265,7 +265,7 @@ protected function getMediaFromTypeString($typeString)
     protected function addCreatedElement($href)
     {
         $testCase = $this;
-        self::$createdContent[$href] = function () use ($href, $testCase) {
+        self::$createdContent[$href] = static function () use ($href, $testCase) {
             $testCase->sendHttpRequest(
                 $testCase->createHttpRequest('DELETE', $href)
             );
diff --git a/tests/bundle/Functional/TrashTest.php b/tests/bundle/Functional/TrashTest.php
index 4ef81159..ec402e4f 100644
--- a/tests/bundle/Functional/TrashTest.php
+++ b/tests/bundle/Functional/TrashTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\Functional;
diff --git a/tests/bundle/Functional/UrlAliasTest.php b/tests/bundle/Functional/UrlAliasTest.php
index 71facbb7..2ef6ffbb 100644
--- a/tests/bundle/Functional/UrlAliasTest.php
+++ b/tests/bundle/Functional/UrlAliasTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\Functional;
diff --git a/tests/bundle/Functional/UrlWildcardTest.php b/tests/bundle/Functional/UrlWildcardTest.php
index 0e0d5165..bac29e4d 100644
--- a/tests/bundle/Functional/UrlWildcardTest.php
+++ b/tests/bundle/Functional/UrlWildcardTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\Functional;
diff --git a/tests/bundle/Functional/UserTest.php b/tests/bundle/Functional/UserTest.php
index 74ea0f81..d4338942 100644
--- a/tests/bundle/Functional/UserTest.php
+++ b/tests/bundle/Functional/UserTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\Functional;
diff --git a/tests/bundle/Functional/ViewTest.php b/tests/bundle/Functional/ViewTest.php
index 36e7e84e..76efb34e 100644
--- a/tests/bundle/Functional/ViewTest.php
+++ b/tests/bundle/Functional/ViewTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\Functional;
diff --git a/tests/bundle/RequestParser/RouterTest.php b/tests/bundle/RequestParser/RouterTest.php
index 89b3f204..bae9c715 100644
--- a/tests/bundle/RequestParser/RouterTest.php
+++ b/tests/bundle/RequestParser/RouterTest.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\RequestParser;
 
+use Ibexa\Bundle\Rest\RequestParser\Router as RouterRequestParser;
 use Ibexa\Contracts\Rest\Exceptions\InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
-use Ibexa\Bundle\Rest\RequestParser\Router as RouterRequestParser;
 use Symfony\Cmf\Component\Routing\ChainRouter;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
@@ -129,7 +129,7 @@ public function testGenerate()
     }
 
     /**
-     * @return \EzSystems\EzPlatformRestBundle\RequestParser\Router
+     * @return \Ibexa\Bundle\Rest\RequestParser\Router
      */
     private function getRequestParser()
     {
diff --git a/tests/bundle/Routing/OptionsLoader/MapperTest.php b/tests/bundle/Routing/OptionsLoader/MapperTest.php
index b9d51ab4..10cc2796 100644
--- a/tests/bundle/Routing/OptionsLoader/MapperTest.php
+++ b/tests/bundle/Routing/OptionsLoader/MapperTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\Routing\OptionsLoader;
@@ -12,7 +12,7 @@
 
 class MapperTest extends TestCase
 {
-    /** @var Mapper */
+    /** @var \Ibexa\Bundle\Rest\Routing\OptionsLoader\Mapper */
     protected $mapper;
 
     public function setUp(): void
diff --git a/tests/bundle/Routing/OptionsLoader/RouteCollectionMapperTest.php b/tests/bundle/Routing/OptionsLoader/RouteCollectionMapperTest.php
index 073f83fc..f9f39934 100644
--- a/tests/bundle/Routing/OptionsLoader/RouteCollectionMapperTest.php
+++ b/tests/bundle/Routing/OptionsLoader/RouteCollectionMapperTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\Routing\OptionsLoader;
@@ -17,7 +17,7 @@
  */
 class RouteCollectionMapperTest extends TestCase
 {
-    /** @var RouteCollectionMapper */
+    /** @var \Ibexa\Bundle\Rest\Routing\OptionsLoader\RouteCollectionMapper */
     protected $collectionMapper;
 
     public function setUp(): void
@@ -66,7 +66,7 @@ public function testAddRestRoutesCollection()
      * @param string $path
      * @param array $methods
      *
-     * @return Route
+     * @return \Symfony\Component\Routing\Route
      */
     private function createRoute($path, array $methods)
     {
diff --git a/tests/bundle/Routing/OptionsLoaderTest.php b/tests/bundle/Routing/OptionsLoaderTest.php
index 4d9d216c..3b3eaa25 100644
--- a/tests/bundle/Routing/OptionsLoaderTest.php
+++ b/tests/bundle/Routing/OptionsLoaderTest.php
@@ -1,13 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Bundle\Rest\Routing;
 
 use Ibexa\Bundle\Rest\Routing\OptionsLoader;
-use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Routing\RouteCollection;
 
@@ -55,7 +54,7 @@ public function testLoad()
     /**
      * Returns a partially mocked OptionsLoader, with the import method mocked.
      *
-     * @return OptionsLoader|MockObject
+     * @return \Ibexa\Bundle\Rest\Routing\OptionsLoader|\PHPUnit\Framework\MockObject\MockObject
      */
     protected function getOptionsLoader()
     {
@@ -73,7 +72,7 @@ protected function getOptionsLoader()
     }
 
     /**
-     * @return MockObject
+     * @return \PHPUnit\Framework\MockObject\MockObject
      */
     protected function getRouteCollectionMapperMock()
     {
diff --git a/tests/lib/AssertXmlTagTrait.php b/tests/lib/AssertXmlTagTrait.php
index ef3b0e9d..fc9d26e2 100644
--- a/tests/lib/AssertXmlTagTrait.php
+++ b/tests/lib/AssertXmlTagTrait.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest;
diff --git a/tests/lib/FieldTypeProcessor/AuthorProcessorTest.php b/tests/lib/FieldTypeProcessor/AuthorProcessorTest.php
index 4ba79a60..fed3a7a4 100644
--- a/tests/lib/FieldTypeProcessor/AuthorProcessorTest.php
+++ b/tests/lib/FieldTypeProcessor/AuthorProcessorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\FieldTypeProcessor;
@@ -19,7 +19,7 @@ class AuthorProcessorTest extends TestCase
     public function fieldSettingsHashes()
     {
         return array_map(
-            function ($constantName) {
+            static function ($constantName) {
                 return [
                     ['defaultAuthor' => $constantName],
                     ['defaultAuthor' => constant("eZ\\Publish\\Core\\FieldType\\Author\\Type::{$constantName}")],
@@ -58,7 +58,7 @@ public function testPostProcessFieldSettingsHash($outputSettings, $inputSettings
     }
 
     /**
-     * @return \EzSystems\EzPlatformRest\FieldTypeProcessor\AuthorProcessor
+     * @return \Ibexa\Rest\FieldTypeProcessor\AuthorProcessor
      */
     protected function getProcessor()
     {
diff --git a/tests/lib/FieldTypeProcessor/BinaryInputProcessorTest.php b/tests/lib/FieldTypeProcessor/BinaryInputProcessorTest.php
index 1b09aba2..d779bb3d 100644
--- a/tests/lib/FieldTypeProcessor/BinaryInputProcessorTest.php
+++ b/tests/lib/FieldTypeProcessor/BinaryInputProcessorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\FieldTypeProcessor;
@@ -86,7 +86,7 @@ public function testPreProcessValueHash()
     /**
      * Returns the processor under test.
      *
-     * @return \EzSystems\EzPlatformRest\FieldTypeProcessor\BinaryInputProcessor
+     * @return \Ibexa\Rest\FieldTypeProcessor\BinaryInputProcessor
      */
     abstract protected function getProcessor();
 }
diff --git a/tests/lib/FieldTypeProcessor/BinaryProcessorTest.php b/tests/lib/FieldTypeProcessor/BinaryProcessorTest.php
index f481d17e..59eace5b 100644
--- a/tests/lib/FieldTypeProcessor/BinaryProcessorTest.php
+++ b/tests/lib/FieldTypeProcessor/BinaryProcessorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\FieldTypeProcessor;
@@ -10,7 +10,7 @@
 
 class BinaryProcessorTest extends BinaryInputProcessorTest
 {
-    const TEMPLATE_URL = 'http://ez.no/subdir/var/rest_test/storage/original/{path}';
+    public const TEMPLATE_URL = 'http://ez.no/subdir/var/rest_test/storage/original/{path}';
 
     /**
      * @covers \EzSystems\EzPlatformRest\FieldTypeProcessor\BinaryProcessor::postProcessValueHash
@@ -39,7 +39,7 @@ public function testPostProcessValueHash()
     /**
      * Returns the processor under test.
      *
-     * @return \EzSystems\EzPlatformRest\FieldTypeProcessor\BinaryProcessor
+     * @return \Ibexa\Rest\FieldTypeProcessor\BinaryProcessor
      */
     protected function getProcessor()
     {
diff --git a/tests/lib/FieldTypeProcessor/DateAndTimeProcessorTest.php b/tests/lib/FieldTypeProcessor/DateAndTimeProcessorTest.php
index 7cd4f076..542b5c8d 100644
--- a/tests/lib/FieldTypeProcessor/DateAndTimeProcessorTest.php
+++ b/tests/lib/FieldTypeProcessor/DateAndTimeProcessorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\FieldTypeProcessor;
@@ -20,7 +20,7 @@ class DateAndTimeProcessorTest extends TestCase
     public function fieldSettingsHashes()
     {
         return array_map(
-            function ($constantName) {
+            static function ($constantName) {
                 return [
                     ['defaultType' => $constantName],
                     ['defaultType' => constant("eZ\\Publish\\Core\\FieldType\\DateAndTime\\Type::{$constantName}")],
@@ -59,7 +59,7 @@ public function testPostProcessFieldSettingsHash($outputSettings, $inputSettings
     }
 
     /**
-     * @return \EzSystems\EzPlatformRest\FieldTypeProcessor\DateAndTimeProcessor
+     * @return \Ibexa\Rest\FieldTypeProcessor\DateAndTimeProcessor
      */
     protected function getProcessor()
     {
diff --git a/tests/lib/FieldTypeProcessor/DateProcessorTest.php b/tests/lib/FieldTypeProcessor/DateProcessorTest.php
index eb918d84..7c183afc 100644
--- a/tests/lib/FieldTypeProcessor/DateProcessorTest.php
+++ b/tests/lib/FieldTypeProcessor/DateProcessorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\FieldTypeProcessor;
@@ -19,7 +19,7 @@ class DateProcessorTest extends TestCase
     public function fieldSettingsHashes()
     {
         return array_map(
-            function ($constantName) {
+            static function ($constantName) {
                 return [
                     ['defaultType' => $constantName],
                     ['defaultType' => constant("eZ\\Publish\\Core\\FieldType\\Date\\Type::{$constantName}")],
@@ -58,7 +58,7 @@ public function testPostProcessFieldSettingsHash($outputSettings, $inputSettings
     }
 
     /**
-     * @return \EzSystems\EzPlatformRest\FieldTypeProcessor\DateProcessor
+     * @return \Ibexa\Rest\FieldTypeProcessor\DateProcessor
      */
     protected function getProcessor()
     {
diff --git a/tests/lib/FieldTypeProcessor/ImageProcessorTest.php b/tests/lib/FieldTypeProcessor/ImageProcessorTest.php
index 57f72a10..8a052e0a 100644
--- a/tests/lib/FieldTypeProcessor/ImageProcessorTest.php
+++ b/tests/lib/FieldTypeProcessor/ImageProcessorTest.php
@@ -1,18 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\FieldTypeProcessor;
 
 use Ibexa\Rest\FieldTypeProcessor\ImageProcessor;
-use Ibexa\Rest\RequestParser;
 use Symfony\Component\Routing\RouterInterface;
 
 class ImageProcessorTest extends BinaryInputProcessorTest
 {
-    /** @var RequestParser */
+    /** @var \Ibexa\Rest\RequestParser */
     protected $requestParser;
 
     /**
@@ -57,7 +56,7 @@ public function testPostProcessValueHash()
     /**
      * Returns the processor under test.
      *
-     * @return \EzSystems\EzPlatformRest\FieldTypeProcessor\ImageProcessor
+     * @return \Ibexa\Rest\FieldTypeProcessor\ImageProcessor
      */
     protected function getProcessor()
     {
diff --git a/tests/lib/FieldTypeProcessor/MediaProcessorTest.php b/tests/lib/FieldTypeProcessor/MediaProcessorTest.php
index dc0841e3..4d905864 100644
--- a/tests/lib/FieldTypeProcessor/MediaProcessorTest.php
+++ b/tests/lib/FieldTypeProcessor/MediaProcessorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\FieldTypeProcessor;
@@ -23,7 +23,7 @@ class MediaProcessorTest extends BinaryInputProcessorTest
     public function fieldSettingsHashes()
     {
         return array_map(
-            function ($constantName) {
+            static function ($constantName) {
                 return [
                     ['mediaType' => $constantName],
                     ['mediaType' => constant("eZ\\Publish\\Core\\FieldType\\Media\\Type::{$constantName}")],
@@ -62,7 +62,7 @@ public function testPostProcessFieldSettingsHash($outputSettings, $inputSettings
     }
 
     /**
-     * @return \EzSystems\EzPlatformRest\FieldTypeProcessor\MediaProcessor
+     * @return \Ibexa\Rest\FieldTypeProcessor\MediaProcessor
      */
     protected function getProcessor()
     {
diff --git a/tests/lib/FieldTypeProcessor/RelationListProcessorTest.php b/tests/lib/FieldTypeProcessor/RelationListProcessorTest.php
index 1f21fdc9..fa6730c7 100644
--- a/tests/lib/FieldTypeProcessor/RelationListProcessorTest.php
+++ b/tests/lib/FieldTypeProcessor/RelationListProcessorTest.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\FieldTypeProcessor;
 
-use eZ\Publish\API\Repository\LocationService;
-use eZ\Publish\Core\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\LocationService;
+use Ibexa\Core\Repository\Values\Content\Location;
 use Ibexa\Rest\FieldTypeProcessor\RelationListProcessor;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Routing\RouterInterface;
@@ -22,7 +22,7 @@ class RelationListProcessorTest extends TestCase
     public function fieldSettingsHashes()
     {
         return array_map(
-            function ($constantName) {
+            static function ($constantName) {
                 return [
                     ['selectionMethod' => $constantName],
                     ['selectionMethod' => constant("eZ\\Publish\\Core\\FieldType\\RelationList\\Type::{$constantName}")],
@@ -119,7 +119,7 @@ public function testPostProcessValueHash()
     }
 
     /**
-     * @return \EzSystems\EzPlatformRest\FieldTypeProcessor\RelationListProcessor
+     * @return \Ibexa\Rest\FieldTypeProcessor\RelationListProcessor
      */
     protected function getProcessor()
     {
diff --git a/tests/lib/FieldTypeProcessor/RelationProcessorTest.php b/tests/lib/FieldTypeProcessor/RelationProcessorTest.php
index f1d28c01..09bdbce2 100644
--- a/tests/lib/FieldTypeProcessor/RelationProcessorTest.php
+++ b/tests/lib/FieldTypeProcessor/RelationProcessorTest.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\FieldTypeProcessor;
 
-use eZ\Publish\API\Repository\LocationService;
-use eZ\Publish\Core\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\LocationService;
+use Ibexa\Core\Repository\Values\Content\Location;
 use Ibexa\Rest\FieldTypeProcessor\RelationProcessor;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Routing\RouterInterface;
@@ -22,7 +22,7 @@ class RelationProcessorTest extends TestCase
     public function fieldSettingsHashes()
     {
         return array_map(
-            function ($constantName) {
+            static function ($constantName) {
                 return [
                     ['selectionMethod' => $constantName],
                     ['selectionMethod' => constant("eZ\\Publish\\Core\\FieldType\\Relation\\Type::{$constantName}")],
@@ -128,7 +128,7 @@ public function testPostProcessFieldValueHashNullValue()
     }
 
     /**
-     * @return \EzSystems\EzPlatformRest\FieldTypeProcessor\RelationProcessor
+     * @return \Ibexa\Rest\FieldTypeProcessor\RelationProcessor
      */
     protected function getProcessor()
     {
diff --git a/tests/lib/FieldTypeProcessor/TimeProcessorTest.php b/tests/lib/FieldTypeProcessor/TimeProcessorTest.php
index 914704df..a69d91e1 100644
--- a/tests/lib/FieldTypeProcessor/TimeProcessorTest.php
+++ b/tests/lib/FieldTypeProcessor/TimeProcessorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\FieldTypeProcessor;
@@ -19,7 +19,7 @@ class TimeProcessorTest extends TestCase
     public function fieldSettingsHashes()
     {
         return array_map(
-            function ($constantName) {
+            static function ($constantName) {
                 return [
                     ['defaultType' => $constantName],
                     ['defaultType' => constant("eZ\\Publish\\Core\\FieldType\\Time\\Type::{$constantName}")],
@@ -58,7 +58,7 @@ public function testPostProcessFieldSettingsHash($outputSettings, $inputSettings
     }
 
     /**
-     * @return \EzSystems\EzPlatformRest\FieldTypeProcessor\TimeProcessor
+     * @return \Ibexa\Rest\FieldTypeProcessor\TimeProcessor
      */
     protected function getProcessor()
     {
diff --git a/tests/lib/FieldTypeProcessorRegistryTest.php b/tests/lib/FieldTypeProcessorRegistryTest.php
index 31fb273f..3ea13662 100644
--- a/tests/lib/FieldTypeProcessorRegistryTest.php
+++ b/tests/lib/FieldTypeProcessorRegistryTest.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest;
 
-use Ibexa\Rest\FieldTypeProcessorRegistry;
 use Ibexa\Contracts\Rest\FieldTypeProcessor;
+use Ibexa\Rest\FieldTypeProcessorRegistry;
 use Ibexa\Tests\Rest\Server\BaseTest;
 use RuntimeException;
 
@@ -87,7 +87,7 @@ public function testRegisterProcessorsOverwrite()
     /**
      * Get FieldTypeProcessor mock object.
      *
-     * @return \EzSystems\EzPlatformRest\FieldTypeProcessor
+     * @return \Ibexa\Contracts\Rest\FieldTypeProcessor
      */
     protected function getAProcessorMock()
     {
diff --git a/tests/lib/Input/DispatcherTest.php b/tests/lib/Input/DispatcherTest.php
index 3711104f..35829187 100644
--- a/tests/lib/Input/DispatcherTest.php
+++ b/tests/lib/Input/DispatcherTest.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Input;
 
 use Ibexa\Contracts\Rest\Exceptions\Parser;
-use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Contracts\Rest\Input\Handler;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
 use Ibexa\Rest\Input\Dispatcher;
 use Ibexa\Rest\Message;
 use PHPUnit\Framework\TestCase;
@@ -125,7 +125,7 @@ public function testParseSpecialUrlHeader()
             ->method('convert')
             ->with('Hello world!')
             ->willReturn(
-                    [
+                [
                         [
                             'someKey' => 'someValue',
                         ],
diff --git a/tests/lib/Input/FieldTypeParserTest.php b/tests/lib/Input/FieldTypeParserTest.php
index 3ae0ad9d..d689cf05 100644
--- a/tests/lib/Input/FieldTypeParserTest.php
+++ b/tests/lib/Input/FieldTypeParserTest.php
@@ -1,21 +1,21 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Input;
 
-use Ibexa\Rest\Input\FieldTypeParser;
-use eZ\Publish\API\Repository\Values\Content\ContentInfo;
-use eZ\Publish\API\Repository\ContentService;
-use eZ\Publish\API\Repository\ContentTypeService;
-use eZ\Publish\API\Repository\FieldType;
-use eZ\Publish\API\Repository\FieldTypeService;
-use eZ\Publish\Core\Repository\Values\ContentType\ContentType;
-use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinition;
-use Ibexa\Rest\FieldTypeProcessorRegistry;
+use Ibexa\Contracts\Core\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\ContentTypeService;
+use Ibexa\Contracts\Core\Repository\FieldType;
+use Ibexa\Contracts\Core\Repository\FieldTypeService;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
 use Ibexa\Contracts\Rest\FieldTypeProcessor;
+use Ibexa\Core\Repository\Values\ContentType\ContentType;
+use Ibexa\Core\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Rest\FieldTypeProcessorRegistry;
+use Ibexa\Rest\Input\FieldTypeParser;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -65,7 +65,7 @@ public function testParseFieldValue()
             ->with('42')
             ->willReturnCallback(
                 // Avoid PHPUnit cloning
-                function () use ($contentTypeMock) {
+                static function () use ($contentTypeMock) {
                     return $contentTypeMock;
                 }
             );
@@ -92,7 +92,7 @@ function () use ($contentTypeMock) {
             ->with($this->equalTo('some-fancy-field-type'))
             ->willReturnCallback(
                 // Avoid PHPUnit cloning
-                function () use ($fieldTypeMock) {
+                static function () use ($fieldTypeMock) {
                     return $fieldTypeMock;
                 }
             );
@@ -127,7 +127,7 @@ public function testParseValue()
             ->with($this->equalTo('some-fancy-field-type'))
             ->willReturnCallback(
                 // Avoid PHPUnit cloning
-                function () use ($fieldTypeMock) {
+                static function () use ($fieldTypeMock) {
                     return $fieldTypeMock;
                 }
             );
@@ -160,7 +160,7 @@ public function testParseValueWithPreProcessing()
             ->method('getProcessor')
             ->with($this->equalTo('some-fancy-field-type'))
             ->willReturnCallback(
-                function () use ($processor) {
+                static function () use ($processor) {
                     return $processor;
                 }
             );
@@ -176,7 +176,7 @@ function () use ($processor) {
             ->with($this->equalTo('some-fancy-field-type'))
             ->willReturnCallback(
                 // Avoid PHPUnit cloning
-                function () use ($fieldTypeMock) {
+                static function () use ($fieldTypeMock) {
                     return $fieldTypeMock;
                 }
             );
@@ -205,7 +205,7 @@ public function testParseFieldSettings()
             ->with($this->equalTo('some-fancy-field-type'))
             ->willReturnCallback(
                 // Avoid PHPUnit cloning
-                function () use ($fieldTypeMock) {
+                static function () use ($fieldTypeMock) {
                     return $fieldTypeMock;
                 }
             );
@@ -238,7 +238,7 @@ public function testParseFieldSettingsWithPreProcessing()
             ->method('getProcessor')
             ->with($this->equalTo('some-fancy-field-type'))
             ->willReturnCallback(
-                function () use ($processor) {
+                static function () use ($processor) {
                     return $processor;
                 }
             );
@@ -254,7 +254,7 @@ function () use ($processor) {
             ->with($this->equalTo('some-fancy-field-type'))
             ->willReturnCallback(
                 // Avoid PHPUnit cloning
-                function () use ($fieldTypeMock) {
+                static function () use ($fieldTypeMock) {
                     return $fieldTypeMock;
                 }
             );
@@ -283,7 +283,7 @@ public function testParseValidatorConfiguration()
             ->with($this->equalTo('some-fancy-field-type'))
             ->willReturnCallback(
                 // Avoid PHPUnit cloning
-                function () use ($fieldTypeMock) {
+                static function () use ($fieldTypeMock) {
                     return $fieldTypeMock;
                 }
             );
@@ -316,7 +316,7 @@ public function testParseValidatorConfigurationWithPreProcessing()
             ->method('getProcessor')
             ->with($this->equalTo('some-fancy-field-type'))
             ->willReturnCallback(
-                function () use ($processor) {
+                static function () use ($processor) {
                     return $processor;
                 }
             );
@@ -332,7 +332,7 @@ function () use ($processor) {
             ->with($this->equalTo('some-fancy-field-type'))
             ->willReturnCallback(
                 // Avoid PHPUnit cloning
-                function () use ($fieldTypeMock) {
+                static function () use ($fieldTypeMock) {
                     return $fieldTypeMock;
                 }
             );
diff --git a/tests/lib/Input/Handler/JsonTest.php b/tests/lib/Input/Handler/JsonTest.php
index 732bdd2e..6ca12abb 100644
--- a/tests/lib/Input/Handler/JsonTest.php
+++ b/tests/lib/Input/Handler/JsonTest.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Input\Handler;
 
-use Ibexa\Rest\Input\Handler\Json;
 use Ibexa\Contracts\Rest\Exceptions\Parser;
+use Ibexa\Rest\Input\Handler\Json;
 use PHPUnit\Framework\TestCase;
 
 /**
diff --git a/tests/lib/Input/Handler/XmlTest.php b/tests/lib/Input/Handler/XmlTest.php
index b3b279a8..1ccd3301 100644
--- a/tests/lib/Input/Handler/XmlTest.php
+++ b/tests/lib/Input/Handler/XmlTest.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Input\Handler;
 
-use Ibexa\Rest\Input\Handler\Xml;
 use Ibexa\Contracts\Rest\Exceptions\Parser;
+use Ibexa\Rest\Input\Handler\Xml;
 use PHPUnit\Framework\TestCase;
 
 /**
diff --git a/tests/lib/Input/Handler/_fixtures/forceList.xml.php b/tests/lib/Input/Handler/_fixtures/forceList.xml.php
index 14f4244e..dba24e1f 100644
--- a/tests/lib/Input/Handler/_fixtures/forceList.xml.php
+++ b/tests/lib/Input/Handler/_fixtures/forceList.xml.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 return [
diff --git a/tests/lib/Input/Handler/_fixtures/forceListDouble.xml.php b/tests/lib/Input/Handler/_fixtures/forceListDouble.xml.php
index 79fa2f9c..f074f266 100644
--- a/tests/lib/Input/Handler/_fixtures/forceListDouble.xml.php
+++ b/tests/lib/Input/Handler/_fixtures/forceListDouble.xml.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 return [
diff --git a/tests/lib/Input/Handler/_fixtures/testGeneratorAttribute.xml.php b/tests/lib/Input/Handler/_fixtures/testGeneratorAttribute.xml.php
index 9a2e45af..192d6196 100644
--- a/tests/lib/Input/Handler/_fixtures/testGeneratorAttribute.xml.php
+++ b/tests/lib/Input/Handler/_fixtures/testGeneratorAttribute.xml.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 return [
diff --git a/tests/lib/Input/Handler/_fixtures/testGeneratorElement.xml.php b/tests/lib/Input/Handler/_fixtures/testGeneratorElement.xml.php
index f105daa2..0aefdcb3 100644
--- a/tests/lib/Input/Handler/_fixtures/testGeneratorElement.xml.php
+++ b/tests/lib/Input/Handler/_fixtures/testGeneratorElement.xml.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 return [
diff --git a/tests/lib/Input/Handler/_fixtures/testGeneratorElementList.xml.php b/tests/lib/Input/Handler/_fixtures/testGeneratorElementList.xml.php
index 45fcb1d1..2bdbb0ec 100644
--- a/tests/lib/Input/Handler/_fixtures/testGeneratorElementList.xml.php
+++ b/tests/lib/Input/Handler/_fixtures/testGeneratorElementList.xml.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 return [
diff --git a/tests/lib/Input/Handler/_fixtures/testGeneratorEmptyValueElement.xml.php b/tests/lib/Input/Handler/_fixtures/testGeneratorEmptyValueElement.xml.php
index 00d58a6f..e5ecb8d5 100644
--- a/tests/lib/Input/Handler/_fixtures/testGeneratorEmptyValueElement.xml.php
+++ b/tests/lib/Input/Handler/_fixtures/testGeneratorEmptyValueElement.xml.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 return [
diff --git a/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeSettingsRelation.xml.php b/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeSettingsRelation.xml.php
index a4dedd2b..812d62bd 100644
--- a/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeSettingsRelation.xml.php
+++ b/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeSettingsRelation.xml.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 return [
diff --git a/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValidatorConfigurationStringLength.xml.php b/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValidatorConfigurationStringLength.xml.php
index 93a3fcda..ae308ed7 100644
--- a/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValidatorConfigurationStringLength.xml.php
+++ b/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValidatorConfigurationStringLength.xml.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 return [
diff --git a/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueBoolFalse.xml.php b/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueBoolFalse.xml.php
index ca36f0b7..f8f3af1b 100644
--- a/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueBoolFalse.xml.php
+++ b/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueBoolFalse.xml.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 return [
diff --git a/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueBoolTrue.xml.php b/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueBoolTrue.xml.php
index d50ff96e..b4a1aa40 100644
--- a/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueBoolTrue.xml.php
+++ b/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueBoolTrue.xml.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 return [
diff --git a/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueComplexAuthor.xml.php b/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueComplexAuthor.xml.php
index bba0dec4..df0e7c26 100644
--- a/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueComplexAuthor.xml.php
+++ b/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueComplexAuthor.xml.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 return [
diff --git a/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueFloat.xml.php b/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueFloat.xml.php
index da023cfa..333366f6 100644
--- a/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueFloat.xml.php
+++ b/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueFloat.xml.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 return [
diff --git a/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueHash.xml.php b/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueHash.xml.php
index 99865433..3a57bb33 100644
--- a/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueHash.xml.php
+++ b/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueHash.xml.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 return [
diff --git a/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueInteger.xml.php b/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueInteger.xml.php
index bb6aef33..921b94e9 100644
--- a/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueInteger.xml.php
+++ b/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueInteger.xml.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 return [
diff --git a/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueList.xml.php b/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueList.xml.php
index 96d2e1f2..deb5ce98 100644
--- a/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueList.xml.php
+++ b/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueList.xml.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 return [
diff --git a/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueNull.xml.php b/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueNull.xml.php
index 4485fb08..6e92a84a 100644
--- a/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueNull.xml.php
+++ b/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueNull.xml.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 return [
diff --git a/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueString.xml.php b/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueString.xml.php
index 8bf02e7d..1aa00d91 100644
--- a/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueString.xml.php
+++ b/tests/lib/Input/Handler/_fixtures/testGeneratorFieldTypeValueString.xml.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 return [
diff --git a/tests/lib/Input/Handler/_fixtures/testGeneratorHashElement.xml.php b/tests/lib/Input/Handler/_fixtures/testGeneratorHashElement.xml.php
index 255ab151..db7f685e 100644
--- a/tests/lib/Input/Handler/_fixtures/testGeneratorHashElement.xml.php
+++ b/tests/lib/Input/Handler/_fixtures/testGeneratorHashElement.xml.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 return [
diff --git a/tests/lib/Input/Handler/_fixtures/testGeneratorMultipleAttributes.xml.php b/tests/lib/Input/Handler/_fixtures/testGeneratorMultipleAttributes.xml.php
index 0fb004d9..208a3afa 100644
--- a/tests/lib/Input/Handler/_fixtures/testGeneratorMultipleAttributes.xml.php
+++ b/tests/lib/Input/Handler/_fixtures/testGeneratorMultipleAttributes.xml.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 return [
diff --git a/tests/lib/Input/Handler/_fixtures/testGeneratorStackedElement.xml.php b/tests/lib/Input/Handler/_fixtures/testGeneratorStackedElement.xml.php
index 784e21ef..445285a4 100644
--- a/tests/lib/Input/Handler/_fixtures/testGeneratorStackedElement.xml.php
+++ b/tests/lib/Input/Handler/_fixtures/testGeneratorStackedElement.xml.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 return [
diff --git a/tests/lib/Input/Handler/_fixtures/testGeneratorTripleElementList.xml.php b/tests/lib/Input/Handler/_fixtures/testGeneratorTripleElementList.xml.php
index d4f60cf5..8704ec9a 100644
--- a/tests/lib/Input/Handler/_fixtures/testGeneratorTripleElementList.xml.php
+++ b/tests/lib/Input/Handler/_fixtures/testGeneratorTripleElementList.xml.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 return [
diff --git a/tests/lib/Input/Handler/_fixtures/testGeneratorValueElement.xml.php b/tests/lib/Input/Handler/_fixtures/testGeneratorValueElement.xml.php
index 1f299d49..7e1e68d0 100644
--- a/tests/lib/Input/Handler/_fixtures/testGeneratorValueElement.xml.php
+++ b/tests/lib/Input/Handler/_fixtures/testGeneratorValueElement.xml.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 return [
diff --git a/tests/lib/Input/ParserToolsTest.php b/tests/lib/Input/ParserToolsTest.php
index 40f476d6..f1bc51c3 100644
--- a/tests/lib/Input/ParserToolsTest.php
+++ b/tests/lib/Input/ParserToolsTest.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Input;
 
-use Ibexa\Rest\Input\ParserTools;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\ParserTools;
 use PHPUnit\Framework\TestCase;
 use RuntimeException;
 
diff --git a/tests/lib/Input/ParsingDispatcherTest.php b/tests/lib/Input/ParsingDispatcherTest.php
index 224994a9..09abb991 100644
--- a/tests/lib/Input/ParsingDispatcherTest.php
+++ b/tests/lib/Input/ParsingDispatcherTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Input;
@@ -17,7 +17,7 @@ class ParsingDispatcherTest extends TestCase
 {
     public function testParseMissingContentType()
     {
-        $this->expectException(\EzSystems\EzPlatformRest\Exceptions\Parser::class);
+        $this->expectException(\Ibexa\Contracts\Rest\Exceptions\Parser::class);
 
         $dispatcher = new ParsingDispatcher();
 
@@ -96,7 +96,7 @@ public function testParseStripFormat()
     }
 
     /**
-     * @return \EzSystems\EzPlatformRest\Input\Parser|\PHPUnit\Framework\MockObject\MockObject
+     * @return \Ibexa\Contracts\Rest\Input\Parser|\PHPUnit\Framework\MockObject\MockObject
      */
     private function createParserMock()
     {
diff --git a/tests/lib/MessageTest.php b/tests/lib/MessageTest.php
index a381fb31..ec5a5bc7 100644
--- a/tests/lib/MessageTest.php
+++ b/tests/lib/MessageTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest;
diff --git a/tests/lib/Output/FieldTypeSerializerTest.php b/tests/lib/Output/FieldTypeSerializerTest.php
index b0002cac..38165621 100644
--- a/tests/lib/Output/FieldTypeSerializerTest.php
+++ b/tests/lib/Output/FieldTypeSerializerTest.php
@@ -1,19 +1,19 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Output;
 
-use eZ\Publish\API\Repository\FieldTypeService;
-use eZ\Publish\API\Repository\Values\Content\Field;
+use Ibexa\Contracts\Core\Repository\FieldType as APIFieldType;
+use Ibexa\Contracts\Core\Repository\FieldTypeService;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType as APIContentType;
+use Ibexa\Contracts\Rest\FieldTypeProcessor;
 use Ibexa\Contracts\Rest\Output\Generator;
-use eZ\Publish\API\Repository\FieldType as APIFieldType;
-use eZ\Publish\API\Repository\Values\ContentType\ContentType as APIContentType;
-use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Core\Repository\Values\ContentType\FieldDefinition;
 use Ibexa\Rest\FieldTypeProcessorRegistry;
-use Ibexa\Contracts\Rest\FieldTypeProcessor;
 use Ibexa\Rest\Output\FieldTypeSerializer;
 use PHPUnit\Framework\TestCase;
 
@@ -62,7 +62,7 @@ public function testSerializeFieldValue()
             ->method('getFieldType')
             ->with($this->equalTo('myFancyFieldType'))
             ->willReturnCallback(
-                function () use ($fieldTypeMock) {
+                static function () use ($fieldTypeMock) {
                     return $fieldTypeMock;
                 }
             );
@@ -100,11 +100,11 @@ public function testSerializeFieldValueWithProcessor()
             ->with(
                 $this->equalTo('some-field')
             )->willReturn(
-                    new FieldDefinition(
-                        [
+                new FieldDefinition(
+                    [
                             'fieldTypeIdentifier' => 'myFancyFieldType',
                         ]
-                    )
+                )
             );
 
         $processorMock = $this->getFieldTypeProcessorMock();
@@ -118,7 +118,7 @@ public function testSerializeFieldValueWithProcessor()
             ->method('getProcessor')
             ->with('myFancyFieldType')
             ->willReturnCallback(
-                function () use ($processorMock) {
+                static function () use ($processorMock) {
                     return $processorMock;
                 }
             );
@@ -132,7 +132,7 @@ function () use ($processorMock) {
             ->method('getFieldType')
             ->with($this->equalTo('myFancyFieldType'))
             ->willReturnCallback(
-                function () use ($fieldTypeMock) {
+                static function () use ($fieldTypeMock) {
                     return $fieldTypeMock;
                 }
             );
@@ -173,7 +173,7 @@ public function testSerializeFieldDefaultValue()
             ->method('getFieldType')
             ->with($this->equalTo('myFancyFieldType'))
             ->willReturnCallback(
-                function () use ($fieldTypeMock) {
+                static function () use ($fieldTypeMock) {
                     return $fieldTypeMock;
                 }
             );
@@ -206,7 +206,7 @@ public function testSerializeFieldSettings()
             ->method('getFieldType')
             ->with($this->equalTo('myFancyFieldType'))
             ->willReturnCallback(
-                function () use ($fieldTypeMock) {
+                static function () use ($fieldTypeMock) {
                     return $fieldTypeMock;
                 }
             );
@@ -239,7 +239,7 @@ public function testSerializeFieldSettingsWithPostProcessing()
             ->method('getProcessor')
             ->with('myFancyFieldType')
             ->willReturnCallback(
-                function () use ($processorMock) {
+                static function () use ($processorMock) {
                     return $processorMock;
                 }
             );
@@ -259,7 +259,7 @@ function () use ($processorMock) {
             ->method('getFieldType')
             ->with($this->equalTo('myFancyFieldType'))
             ->willReturnCallback(
-                function () use ($fieldTypeMock) {
+                static function () use ($fieldTypeMock) {
                     return $fieldTypeMock;
                 }
             );
@@ -292,7 +292,7 @@ public function testSerializeValidatorConfiguration()
             ->method('getFieldType')
             ->with($this->equalTo('myFancyFieldType'))
             ->willReturnCallback(
-                function () use ($fieldTypeMock) {
+                static function () use ($fieldTypeMock) {
                     return $fieldTypeMock;
                 }
             );
@@ -325,7 +325,7 @@ public function testSerializeValidatorConfigurationWithPostProcessing()
             ->method('getProcessor')
             ->with('myFancyFieldType')
             ->willReturnCallback(
-                function () use ($processorMock) {
+                static function () use ($processorMock) {
                     return $processorMock;
                 }
             );
@@ -339,7 +339,7 @@ function () use ($processorMock) {
             ->method('getFieldType')
             ->with($this->equalTo('myFancyFieldType'))
             ->willReturnCallback(
-                function () use ($fieldTypeMock) {
+                static function () use ($fieldTypeMock) {
                     return $fieldTypeMock;
                 }
             );
@@ -355,7 +355,7 @@ function () use ($fieldTypeMock) {
             ->method('getFieldType')
             ->with($this->equalTo('myFancyFieldType'))
             ->willReturnCallback(
-                function () use ($fieldTypeMock) {
+                static function () use ($fieldTypeMock) {
                     return $fieldTypeMock;
                 }
             );
diff --git a/tests/lib/Output/Generator/FieldTypeHashGeneratorBaseTest.php b/tests/lib/Output/Generator/FieldTypeHashGeneratorBaseTest.php
index 11a9cdc6..d045d1e9 100644
--- a/tests/lib/Output/Generator/FieldTypeHashGeneratorBaseTest.php
+++ b/tests/lib/Output/Generator/FieldTypeHashGeneratorBaseTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Output\Generator;
@@ -38,7 +38,7 @@ abstract protected function initializeFieldTypeHashGenerator();
     /**
      * Initializes the generator.
      *
-     * @return \EzSystems\EzPlatformRest\Output\Generator
+     * @return \Ibexa\Contracts\Rest\Output\Generator
      */
     abstract protected function initializeGenerator();
 
@@ -223,7 +223,7 @@ private function getFixtureFile($functionName)
 
     private function getRelativeClassIdentifier()
     {
-        $fqClassName = get_called_class();
+        $fqClassName = static::class;
 
         return strtr(
             substr(
diff --git a/tests/lib/Output/Generator/Json/FieldTypeHashGeneratorTest.php b/tests/lib/Output/Generator/Json/FieldTypeHashGeneratorTest.php
index 2cc8823e..e462b671 100644
--- a/tests/lib/Output/Generator/Json/FieldTypeHashGeneratorTest.php
+++ b/tests/lib/Output/Generator/Json/FieldTypeHashGeneratorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Output\Generator\Json;
@@ -15,7 +15,7 @@ class FieldTypeHashGeneratorTest extends FieldTypeHashGeneratorBaseTest
     /**
      * Initializes the field type hash generator.
      *
-     * @return \EzSystems\EzPlatformRest\Output\Generator\Json\FieldTypeHashGenerator
+     * @return \Ibexa\Rest\Output\Generator\Json\FieldTypeHashGenerator
      */
     protected function initializeFieldTypeHashGenerator()
     {
@@ -25,7 +25,7 @@ protected function initializeFieldTypeHashGenerator()
     /**
      * Initializes the generator.
      *
-     * @return \EzSystems\EzPlatformRest\Output\Generator
+     * @return \Ibexa\Contracts\Rest\Output\Generator
      */
     protected function initializeGenerator()
     {
diff --git a/tests/lib/Output/Generator/JsonTest.php b/tests/lib/Output/Generator/JsonTest.php
index 94b2e2a9..10714f5d 100644
--- a/tests/lib/Output/Generator/JsonTest.php
+++ b/tests/lib/Output/Generator/JsonTest.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Output\Generator;
 
 use Ibexa\Contracts\Rest\Output\Exceptions\OutputGeneratorException;
-use Ibexa\Tests\Rest\Output\GeneratorTest;
 use Ibexa\Rest\Output\Generator\Json;
 use Ibexa\Rest\Output\Generator\Json\FieldTypeHashGenerator;
+use Ibexa\Tests\Rest\Output\GeneratorTest;
 
 require_once __DIR__ . '/../GeneratorTest.php';
 
diff --git a/tests/lib/Output/Generator/Xml/FieldTypeHashGeneratorTest.php b/tests/lib/Output/Generator/Xml/FieldTypeHashGeneratorTest.php
index 590943db..3b168527 100644
--- a/tests/lib/Output/Generator/Xml/FieldTypeHashGeneratorTest.php
+++ b/tests/lib/Output/Generator/Xml/FieldTypeHashGeneratorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Output\Generator\Xml;
@@ -15,7 +15,7 @@ class FieldTypeHashGeneratorTest extends FieldTypeHashGeneratorBaseTest
     /**
      * Initializes the field type hash generator.
      *
-     * @return \EzSystems\EzPlatformRest\Output\Generator\Xml\FieldTypeHashGenerator
+     * @return \Ibexa\Rest\Output\Generator\Xml\FieldTypeHashGenerator
      */
     protected function initializeFieldTypeHashGenerator()
     {
@@ -25,7 +25,7 @@ protected function initializeFieldTypeHashGenerator()
     /**
      * Initializes the generator.
      *
-     * @return \EzSystems\EzPlatformRest\Output\Generator
+     * @return \Ibexa\Contracts\Rest\Output\Generator
      */
     protected function initializeGenerator()
     {
diff --git a/tests/lib/Output/Generator/XmlTest.php b/tests/lib/Output/Generator/XmlTest.php
index 16cb0081..c7d6db1d 100644
--- a/tests/lib/Output/Generator/XmlTest.php
+++ b/tests/lib/Output/Generator/XmlTest.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Output\Generator;
 
-use Ibexa\Tests\Rest\Output\GeneratorTest;
-use Ibexa\Rest\Output\Generator\Xml\FieldTypeHashGenerator;
 use Ibexa\Rest\Output\Generator\Xml;
+use Ibexa\Rest\Output\Generator\Xml\FieldTypeHashGenerator;
+use Ibexa\Tests\Rest\Output\GeneratorTest;
 
 require_once __DIR__ . '/../GeneratorTest.php';
 
diff --git a/tests/lib/Output/GeneratorTest.php b/tests/lib/Output/GeneratorTest.php
index e3ca5d33..40a6f5e0 100644
--- a/tests/lib/Output/GeneratorTest.php
+++ b/tests/lib/Output/GeneratorTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Output;
@@ -15,12 +15,12 @@
 abstract class GeneratorTest extends TestCase
 {
     /**
-     * @var \EzSystems\EzPlatformRest\Output\Generator
+     * @var \Ibexa\Contracts\Rest\Output\Generator
      */
     protected $generator;
 
     /**
-     * @return \EzSystems\EzPlatformRest\Output\Generator
+     * @return \Ibexa\Contracts\Rest\Output\Generator
      */
     abstract protected function getGenerator();
 
diff --git a/tests/lib/Output/ValueObject.php b/tests/lib/Output/ValueObject.php
index 53f0ef5e..5c34b3de 100644
--- a/tests/lib/Output/ValueObject.php
+++ b/tests/lib/Output/ValueObject.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Output;
diff --git a/tests/lib/Output/ValueObjectVisitorBaseTest.php b/tests/lib/Output/ValueObjectVisitorBaseTest.php
index 0cd92c65..71c55363 100644
--- a/tests/lib/Output/ValueObjectVisitorBaseTest.php
+++ b/tests/lib/Output/ValueObjectVisitorBaseTest.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Output;
 
-use Ibexa\Tests\Rest\AssertXmlTagTrait;
-use Ibexa\Tests\Rest\Server;
+use Ibexa\Contracts\Rest\Output\Visitor;
 use Ibexa\Rest\Output\Generator;
 use Ibexa\Rest\RequestParser;
-use Ibexa\Contracts\Rest\Output\Visitor;
+use Ibexa\Tests\Rest\AssertXmlTagTrait;
+use Ibexa\Tests\Rest\Server;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\RouterInterface;
 
@@ -21,19 +21,19 @@ abstract class ValueObjectVisitorBaseTest extends Server\BaseTest
     /**
      * Visitor mock.
      *
-     * @var \EzSystems\EzPlatformRest\Output\Visitor
+     * @var \Ibexa\Contracts\Rest\Output\Visitor
      */
     protected $visitorMock;
 
     /**
      * Output generator.
      *
-     * @var \EzSystems\EzPlatformRest\Output\Generator\Xml
+     * @var \Ibexa\Rest\Output\Generator\Xml
      */
     protected $generator;
 
     /**
-     * @var \EzSystems\EzPlatformRest\RequestParser
+     * @var \Ibexa\Rest\RequestParser
      */
     protected $requestParser;
 
@@ -56,7 +56,7 @@ abstract class ValueObjectVisitorBaseTest extends Server\BaseTest
     /**
      * Gets the visitor mock.
      *
-     * @return \EzSystems\EzPlatformRest\Output\Visitor|\PHPUnit\Framework\MockObject\MockObject
+     * @return \Ibexa\Contracts\Rest\Output\Visitor|\PHPUnit\Framework\MockObject\MockObject
      */
     protected function getVisitorMock()
     {
@@ -88,7 +88,7 @@ protected function getResponseMock()
     /**
      * Gets the output generator.
      *
-     * @return \EzSystems\EzPlatformRest\Output\Generator\Xml
+     * @return \Ibexa\Rest\Output\Generator\Xml
      */
     protected function getGenerator()
     {
@@ -137,7 +137,7 @@ protected function getVisitor()
     }
 
     /**
-     * @return \EzSystems\EzPlatformRest\RequestParser|\PHPUnit\Framework\MockObject\MockObject
+     * @return \Ibexa\Rest\RequestParser|\PHPUnit\Framework\MockObject\MockObject
      */
     protected function getRequestParser()
     {
@@ -222,7 +222,7 @@ protected function addTemplatedRouteExpectation($routeName, $arguments, $returnV
     /**
      * Must return an instance of the tested visitor object.
      *
-     * @return \EzSystems\EzPlatformRest\Output\ValueObjectVisitor
+     * @return \Ibexa\Contracts\Rest\Output\ValueObjectVisitor
      */
     abstract protected function internalGetVisitor();
 }
diff --git a/tests/lib/Output/ValueObjectVisitorDispatcherTest.php b/tests/lib/Output/ValueObjectVisitorDispatcherTest.php
index 2370e63a..a9400afc 100644
--- a/tests/lib/Output/ValueObjectVisitorDispatcherTest.php
+++ b/tests/lib/Output/ValueObjectVisitorDispatcherTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Output;
@@ -10,11 +10,11 @@
 use Ibexa\Contracts\Rest\Output\Exceptions\InvalidTypeException;
 use Ibexa\Contracts\Rest\Output\Exceptions\NoVisitorFoundException;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\ValueObjectVisitorDispatcher;
 use Ibexa\Contracts\Rest\Output\Visitor;
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
-use stdClass;
 use PHPUnit\Framework\TestCase;
+use stdClass;
 
 /**
  * Visitor test.
@@ -22,12 +22,12 @@
 class ValueObjectVisitorDispatcherTest extends TestCase
 {
     /**
-     * @var \PHPUnit\Framework\MockObject\MockObject|Common\Output\Visitor
+     * @var \PHPUnit\Framework\MockObject\MockObject|\Ibexa\Contracts\Rest\Output\Visitor
      */
     private $outputVisitorMock;
 
     /**
-     * @var \PHPUnit\Framework\MockObject\MockObject|Common\Output\Generator
+     * @var \PHPUnit\Framework\MockObject\MockObject|\Ibexa\Contracts\Rest\Output\Generator
      */
     private $outputGeneratorMock;
 
@@ -111,7 +111,7 @@ public function testVisitError(): void
     }
 
     /**
-     * @return Common\Output\ValueObjectVisitorDispatcher
+     * @return \Ibexa\Contracts\Rest\Output\ValueObjectVisitorDispatcher
      */
     private function getValueObjectDispatcher()
     {
@@ -123,7 +123,7 @@ private function getValueObjectDispatcher()
     }
 
     /**
-     * @return \PHPUnit\Framework\MockObject\MockObject|\EzSystems\EzPlatformRest\Output\ValueObjectVisitor
+     * @return \PHPUnit\Framework\MockObject\MockObject|\Ibexa\Contracts\Rest\Output\ValueObjectVisitor
      */
     private function getValueObjectVisitorMock()
     {
@@ -131,7 +131,7 @@ private function getValueObjectVisitorMock()
     }
 
     /**
-     * @return \PHPUnit\Framework\MockObject\MockObject|Common\Output\Visitor
+     * @return \PHPUnit\Framework\MockObject\MockObject|\Ibexa\Contracts\Rest\Output\Visitor
      */
     private function getOutputVisitorMock()
     {
@@ -143,7 +143,7 @@ private function getOutputVisitorMock()
     }
 
     /**
-     * @return \PHPUnit\Framework\MockObject\MockObject|Common\Output\Generator
+     * @return \PHPUnit\Framework\MockObject\MockObject|\Ibexa\Contracts\Rest\Output\Generator
      */
     private function getOutputGeneratorMock()
     {
diff --git a/tests/lib/Output/VisitorTest.php b/tests/lib/Output/VisitorTest.php
index 85f0f8d4..afb6441f 100644
--- a/tests/lib/Output/VisitorTest.php
+++ b/tests/lib/Output/VisitorTest.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Output;
 
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitorDispatcher;
 use Ibexa\Contracts\Rest\Output\Generator;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitorDispatcher;
 use Ibexa\Contracts\Rest\Output\Visitor;
 use PHPUnit\Framework\TestCase;
 use stdClass;
@@ -84,7 +84,7 @@ public function testVisitValueObject()
     {
         $data = new stdClass();
 
-        /** @var \PHPUnit\Framework\MockObject\MockObject|Common\Output\Generator $generatorMock */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|\Ibexa\Contracts\Rest\Output\Generator $generatorMock */
         $generatorMock = $this->getGeneratorMock();
 
         $valueObjectDispatcherMock = $this->getValueObjectDispatcherMock();
@@ -119,7 +119,7 @@ public function testSetHeaders()
     /**
      * @todo This is a test for a feature that needs refactoring.
      *
-     * @see \EzSystems\EzPlatformRest\Output\Visitor::visit
+     * @see \Ibexa\Contracts\Rest\Output\Visitor::visit
      */
     public function testSetFilteredHeaders()
     {
@@ -217,7 +217,7 @@ public function testSetStatusCodeNoOverride()
     }
 
     /**
-     * @return Common\Output\ValueObjectVisitorDispatcher|\PHPUnit\Framework\MockObject\MockObject
+     * @return \Ibexa\Contracts\Rest\Output\ValueObjectVisitorDispatcher|\PHPUnit\Framework\MockObject\MockObject
      */
     public function getValueObjectDispatcherMock()
     {
diff --git a/tests/lib/Server/BaseTest.php b/tests/lib/Server/BaseTest.php
index 74688490..1704b68f 100644
--- a/tests/lib/Server/BaseTest.php
+++ b/tests/lib/Server/BaseTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server;
diff --git a/tests/lib/Server/Input/Parser/BaseTest.php b/tests/lib/Server/Input/Parser/BaseTest.php
index 2ad87009..cb6e7b07 100644
--- a/tests/lib/Server/Input/Parser/BaseTest.php
+++ b/tests/lib/Server/Input/Parser/BaseTest.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Input;
-use Ibexa\Tests\Rest\Server\BaseTest as ParentBaseTest;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input;
 use Ibexa\Rest\RequestParser;
+use Ibexa\Tests\Rest\Server\BaseTest as ParentBaseTest;
 
 /**
  * Base test for input parsers.
@@ -17,24 +17,24 @@
 abstract class BaseTest extends ParentBaseTest
 {
     /**
-     * @var \EzSystems\EzPlatformRest\Input\ParsingDispatcher|\PHPUnit\Framework\MockObject\MockObject
+     * @var \Ibexa\Contracts\Rest\Input\ParsingDispatcher|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $parsingDispatcherMock;
 
     /**
-     * @var \EzSystems\EzPlatformRest\RequestParser|\PHPUnit\Framework\MockObject\MockObject
+     * @var \Ibexa\Rest\RequestParser|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $requestParserMock;
 
     /**
-     * @var \EzSystems\EzPlatformRest\Input\ParserTools
+     * @var \Ibexa\Rest\Input\ParserTools
      */
     protected $parserTools;
 
     /**
      * Get the parsing dispatcher.
      *
-     * @return \EzSystems\EzPlatformRest\Input\ParsingDispatcher
+     * @return \Ibexa\Contracts\Rest\Input\ParsingDispatcher
      */
     protected function getParsingDispatcherMock()
     {
@@ -61,14 +61,14 @@ public function getParseHrefExpectationsMap()
     /**
      * Get the Request parser.
      *
-     * @return \EzSystems\EzPlatformRest\RequestParser|\PHPUnit\Framework\MockObject\MockObject
+     * @return \Ibexa\Rest\RequestParser|\PHPUnit\Framework\MockObject\MockObject
      */
     protected function getRequestParserMock()
     {
         if (!isset($this->requestParserMock)) {
             $that = &$this;
 
-            $callback = function ($href, $attribute) use ($that) {
+            $callback = static function ($href, $attribute) use ($that) {
                 foreach ($that->getParseHrefExpectationsMap() as $map) {
                     if ($map[0] == $href && $map[1] == $attribute) {
                         if ($map[2] instanceof \Exception) {
@@ -96,7 +96,7 @@ protected function getRequestParserMock()
     /**
      * Get the parser tools.
      *
-     * @return \EzSystems\EzPlatformRest\Input\ParserTools
+     * @return \Ibexa\Rest\Input\ParserTools
      */
     protected function getParserTools()
     {
@@ -118,7 +118,7 @@ protected function getParser()
     /**
      * Must return the tested parser object.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\Base
+     * @return \Ibexa\Rest\Server\Input\Parser\Base
      */
     abstract protected function internalGetParser();
 }
diff --git a/tests/lib/Server/Input/Parser/ContentCreateTest.php b/tests/lib/Server/Input/Parser/ContentCreateTest.php
index 1c412efa..3b400765 100644
--- a/tests/lib/Server/Input/Parser/ContentCreateTest.php
+++ b/tests/lib/Server/Input/Parser/ContentCreateTest.php
@@ -1,23 +1,23 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
 
-use eZ\Publish\API\Repository\Values\Content\LocationCreateStruct;
-use eZ\Publish\Core\Repository\ContentService;
-use eZ\Publish\Core\Repository\ContentTypeService;
-use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinition;
-use eZ\Publish\Core\Repository\Values\Content\ContentCreateStruct;
-use eZ\Publish\Core\Repository\Values\ContentType\ContentType;
-use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinitionCollection;
+use Ibexa\Contracts\Core\Repository\FieldTypeService;
+use Ibexa\Contracts\Core\Repository\Values\Content\LocationCreateStruct;
+use Ibexa\Contracts\Rest\Exceptions\Parser;
+use Ibexa\Core\Repository\ContentService;
+use Ibexa\Core\Repository\ContentTypeService;
+use Ibexa\Core\Repository\Values\Content\ContentCreateStruct;
+use Ibexa\Core\Repository\Values\ContentType\ContentType;
+use Ibexa\Core\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Core\Repository\Values\ContentType\FieldDefinitionCollection;
+use Ibexa\Rest\Input\FieldTypeParser;
 use Ibexa\Rest\Server\Input\Parser\ContentCreate;
 use Ibexa\Rest\Server\Input\Parser\LocationCreate;
-use Ibexa\Rest\Input\FieldTypeParser;
-use eZ\Publish\API\Repository\FieldTypeService;
-use Ibexa\Contracts\Rest\Exceptions\Parser;
 
 class ContentCreateTest extends BaseTest
 {
@@ -493,7 +493,7 @@ public function testParseExceptionOnMissingFieldValue()
     /**
      * Returns the ContentCreate parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\ContentCreate
+     * @return \Ibexa\Rest\Server\Input\Parser\ContentCreate
      */
     protected function internalGetParser()
     {
@@ -509,7 +509,7 @@ protected function internalGetParser()
     /**
      * Get the field type parser mock object.
      *
-     * @return \EzSystems\EzPlatformRest\Input\FieldTypeParser ;
+     * @return \Ibexa\Rest\Input\FieldTypeParser ;
      */
     private function getFieldTypeParserMock()
     {
@@ -536,7 +536,7 @@ private function getFieldTypeParserMock()
     /**
      * Returns the LocationCreate parser mock object.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\LocationCreate
+     * @return \Ibexa\Rest\Server\Input\Parser\LocationCreate
      */
     private function getLocationCreateParserMock()
     {
@@ -553,7 +553,7 @@ private function getLocationCreateParserMock()
     /**
      * Get the content service mock object.
      *
-     * @return \eZ\Publish\API\Repository\ContentService
+     * @return \Ibexa\Contracts\Core\Repository\ContentService
      */
     protected function getContentServiceMock()
     {
@@ -567,12 +567,12 @@ protected function getContentServiceMock()
                 $this->equalTo('eng-US')
             )
             ->willReturn(
-                    new ContentCreateStruct(
-                        [
+                new ContentCreateStruct(
+                    [
                             'contentType' => $contentType,
                             'mainLanguageCode' => 'eng-US',
                         ]
-                    )
+                )
             );
 
         return $contentServiceMock;
@@ -581,7 +581,7 @@ protected function getContentServiceMock()
     /**
      * Get the content type service mock object.
      *
-     * @return \eZ\Publish\API\Repository\ContentTypeService
+     * @return \Ibexa\Contracts\Core\Repository\ContentTypeService
      */
     protected function getContentTypeServiceMock()
     {
@@ -607,7 +607,7 @@ public function getParseHrefExpectationsMap()
     /**
      * Get the content type used in ContentCreate parser.
      *
-     * @return \eZ\Publish\API\Repository\Values\ContentType\ContentType
+     * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType
      */
     protected function getContentType()
     {
diff --git a/tests/lib/Server/Input/Parser/ContentObjectStatesTest.php b/tests/lib/Server/Input/Parser/ContentObjectStatesTest.php
index 7d7ddbaa..93c65929 100644
--- a/tests/lib/Server/Input/Parser/ContentObjectStatesTest.php
+++ b/tests/lib/Server/Input/Parser/ContentObjectStatesTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
@@ -89,7 +89,7 @@ public function getParseHrefExpectationsMap()
     /**
      * Gets the ContentObjectStates parser.
      *
-     * @return \EzSystems\EzPlatformRest\Input\Parser\ContentObjectStates ;
+     * @return \Ibexa\Rest\Input\Parser\ContentObjectStates ;
      */
     protected function internalGetParser()
     {
diff --git a/tests/lib/Server/Input/Parser/ContentTypeCreateTest.php b/tests/lib/Server/Input/Parser/ContentTypeCreateTest.php
index 4c7c11b5..a1b062fb 100644
--- a/tests/lib/Server/Input/Parser/ContentTypeCreateTest.php
+++ b/tests/lib/Server/Input/Parser/ContentTypeCreateTest.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
 
-use eZ\Publish\API\Repository\Values\Content\Location;
-use eZ\Publish\API\Repository\Values\ContentType\FieldDefinitionCreateStruct;
-use eZ\Publish\Core\Repository\ContentTypeService;
-use eZ\Publish\Core\Repository\Values\ContentType\ContentTypeCreateStruct;
-use Ibexa\Rest\Server\Input\Parser\FieldDefinitionCreate;
-use Ibexa\Rest\Server\Input\Parser\ContentTypeCreate;
+use Ibexa\Contracts\Core\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinitionCreateStruct;
 use Ibexa\Contracts\Rest\Exceptions\Parser;
+use Ibexa\Core\Repository\ContentTypeService;
+use Ibexa\Core\Repository\Values\ContentType\ContentTypeCreateStruct;
+use Ibexa\Rest\Server\Input\Parser\ContentTypeCreate;
+use Ibexa\Rest\Server\Input\Parser\FieldDefinitionCreate;
 
 class ContentTypeCreateTest extends BaseTest
 {
@@ -234,7 +234,7 @@ public function testParseExceptionOnInvalidFieldDefinition()
     /**
      * Returns the ContentTypeCreate parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\ContentTypeCreate
+     * @return \Ibexa\Rest\Server\Input\Parser\ContentTypeCreate
      */
     protected function internalGetParser()
     {
@@ -248,7 +248,7 @@ protected function internalGetParser()
     /**
      * Returns the FieldDefinitionCreate parser mock object.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\FieldDefinitionCreate
+     * @return \Ibexa\Rest\Server\Input\Parser\FieldDefinitionCreate
      */
     private function getFieldDefinitionCreateParserMock()
     {
@@ -265,7 +265,7 @@ private function getFieldDefinitionCreateParserMock()
     /**
      * Get the content type service mock object.
      *
-     * @return \eZ\Publish\API\Repository\ContentTypeService
+     * @return \Ibexa\Contracts\Core\Repository\ContentTypeService
      */
     protected function getContentTypeServiceMock()
     {
@@ -275,11 +275,11 @@ protected function getContentTypeServiceMock()
             ->method('newContentTypeCreateStruct')
             ->with($this->equalTo('new_content_type'))
             ->willReturn(
-                    new ContentTypeCreateStruct(
-                        [
+                new ContentTypeCreateStruct(
+                    [
                             'identifier' => 'new_content_type',
                         ]
-                    )
+                )
             );
 
         return $contentTypeServiceMock;
diff --git a/tests/lib/Server/Input/Parser/ContentTypeGroupInputTest.php b/tests/lib/Server/Input/Parser/ContentTypeGroupInputTest.php
index 661cb28a..1f2bac97 100644
--- a/tests/lib/Server/Input/Parser/ContentTypeGroupInputTest.php
+++ b/tests/lib/Server/Input/Parser/ContentTypeGroupInputTest.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
 
-use eZ\Publish\Core\Repository\ContentTypeService;
-use Ibexa\Rest\Server\Input\Parser\ContentTypeGroupInput;
-use eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroupCreateStruct;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroupCreateStruct;
 use Ibexa\Contracts\Rest\Exceptions\Parser;
+use Ibexa\Core\Repository\ContentTypeService;
+use Ibexa\Rest\Server\Input\Parser\ContentTypeGroupInput;
 
 class ContentTypeGroupInputTest extends BaseTest
 {
@@ -74,7 +74,7 @@ public function testParseExceptionOnInvalidUser()
     /**
      * Returns the content type group input parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\ContentTypeGroupInput
+     * @return \Ibexa\Rest\Server\Input\Parser\ContentTypeGroupInput
      */
     protected function internalGetParser()
     {
@@ -87,7 +87,7 @@ protected function internalGetParser()
     /**
      * Get the content type service mock object.
      *
-     * @return \eZ\Publish\API\Repository\ContentTypeService
+     * @return \Ibexa\Contracts\Core\Repository\ContentTypeService
      */
     protected function getContentTypeServiceMock()
     {
diff --git a/tests/lib/Server/Input/Parser/ContentTypeUpdateTest.php b/tests/lib/Server/Input/Parser/ContentTypeUpdateTest.php
index 26ea357f..d744a20c 100644
--- a/tests/lib/Server/Input/Parser/ContentTypeUpdateTest.php
+++ b/tests/lib/Server/Input/Parser/ContentTypeUpdateTest.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
 
-use eZ\Publish\API\Repository\Values\Content\Location;
-use eZ\Publish\API\Repository\Values\ContentType\ContentTypeUpdateStruct;
-use eZ\Publish\Core\Repository\ContentTypeService;
-use Ibexa\Rest\Server\Input\Parser\ContentTypeUpdate;
+use Ibexa\Contracts\Core\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeUpdateStruct;
 use Ibexa\Contracts\Rest\Exceptions\Parser;
+use Ibexa\Core\Repository\ContentTypeService;
+use Ibexa\Rest\Server\Input\Parser\ContentTypeUpdate;
 
 class ContentTypeUpdateTest extends BaseTest
 {
@@ -152,7 +152,7 @@ public function testParseExceptionOnInvalidUser()
     /**
      * Returns the ContentTypeUpdate parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\ContentTypeUpdate
+     * @return \Ibexa\Rest\Server\Input\Parser\ContentTypeUpdate
      */
     protected function internalGetParser()
     {
@@ -165,7 +165,7 @@ protected function internalGetParser()
     /**
      * Get the content type service mock object.
      *
-     * @return \eZ\Publish\API\Repository\ContentTypeService
+     * @return \Ibexa\Contracts\Core\Repository\ContentTypeService
      */
     protected function getContentTypeServiceMock()
     {
diff --git a/tests/lib/Server/Input/Parser/ContentUpdateTest.php b/tests/lib/Server/Input/Parser/ContentUpdateTest.php
index 80acdbed..d79ddc3c 100644
--- a/tests/lib/Server/Input/Parser/ContentUpdateTest.php
+++ b/tests/lib/Server/Input/Parser/ContentUpdateTest.php
@@ -1,23 +1,23 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
 
+use DateTime;
 use Ibexa\Contracts\Rest\Exceptions\InvalidArgumentException;
+use Ibexa\Contracts\Rest\Exceptions\Parser;
 use Ibexa\Rest\Server\Input\Parser\ContentUpdate as ContentUpdateParser;
 use Ibexa\Rest\Values\RestContentMetadataUpdateStruct;
-use Ibexa\Contracts\Rest\Exceptions\Parser;
-use DateTime;
 
 class ContentUpdateTest extends BaseTest
 {
     /**
      * Tests the ContentUpdate parser.
      *
-     * @return \EzSystems\EzPlatformRest\Values\RestContentMetadataUpdateStruct
+     * @return \Ibexa\Rest\Values\RestContentMetadataUpdateStruct
      */
     public function testParseValid()
     {
@@ -40,7 +40,7 @@ public function testParseValid()
     /**
      * Test for valid owner ID value in result.
      *
-     * @param \EzSystems\EzPlatformRest\Values\RestContentMetadataUpdateStruct $result
+     * @param \Ibexa\Rest\Values\RestContentMetadataUpdateStruct $result
      *
      * @depends testParseValid
      */
@@ -130,7 +130,7 @@ public function providerForTestParseFailureInvalidDate()
     /**
      * Returns the ContentUpdate parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\ContentUpdate
+     * @return \Ibexa\Rest\Server\Input\Parser\ContentUpdate
      */
     protected function internalGetParser()
     {
@@ -140,7 +140,7 @@ protected function internalGetParser()
     /**
      * Returns a valid RestContentMetadataUpdateStruct that matches the structure from getValidInputData().
      *
-     * @return \EzSystems\EzPlatformRest\Values\RestContentMetadataUpdateStruct
+     * @return \Ibexa\Rest\Values\RestContentMetadataUpdateStruct
      */
     protected function getContentUpdateStruct()
     {
diff --git a/tests/lib/Server/Input/Parser/Criterion/DateMetadataTest.php b/tests/lib/Server/Input/Parser/Criterion/DateMetadataTest.php
index 642ec8bd..2b77db0c 100644
--- a/tests/lib/Server/Input/Parser/Criterion/DateMetadataTest.php
+++ b/tests/lib/Server/Input/Parser/Criterion/DateMetadataTest.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser\Criterion;
 
-use Ibexa\Tests\Rest\Server\Input\Parser\BaseTest;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\DateMetadata as DateMetadataCriterion;
-use Ibexa\Rest\Server\Input\Parser\Criterion\DateMetadata;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\DateMetadata as DateMetadataCriterion;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator;
 use Ibexa\Contracts\Rest\Exceptions;
+use Ibexa\Rest\Server\Input\Parser\Criterion\DateMetadata;
+use Ibexa\Tests\Rest\Server\Input\Parser\BaseTest;
 
 final class DateMetadataTest extends BaseTest
 {
diff --git a/tests/lib/Server/Input/Parser/Criterion/LogicalAndTest.php b/tests/lib/Server/Input/Parser/Criterion/LogicalAndTest.php
index e19416f8..e98767f0 100644
--- a/tests/lib/Server/Input/Parser/Criterion/LogicalAndTest.php
+++ b/tests/lib/Server/Input/Parser/Criterion/LogicalAndTest.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser\Criterion;
 
-use eZ\Publish\API\Repository\Values\Content;
 use Ibexa\Contracts\Rest\Exceptions\Parser as ParserException;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Core\Repository\Values\Content;
 use Ibexa\Rest\Server\Input\Parser;
 use Ibexa\Tests\Rest\Server\Input\Parser\BaseTest;
 
@@ -54,7 +54,7 @@ public function testParseLogicalAnd()
 
         $criterionMock = $this->createMock(Content\Query\Criterion::class, [], [], '', false);
 
-        $parserMock = $this->createMock(\EzSystems\EzPlatformRest\Input\Parser::class);
+        $parserMock = $this->createMock(\Ibexa\Contracts\Rest\Input\Parser::class);
         $parserMock->method('parse')->willReturn($criterionMock);
 
         $result = $this->internalGetParser()->parse($logicalAndParsedFromXml, new ParsingDispatcher([
diff --git a/tests/lib/Server/Input/Parser/Criterion/LogicalOrTest.php b/tests/lib/Server/Input/Parser/Criterion/LogicalOrTest.php
index c61e90a5..b6f0c049 100644
--- a/tests/lib/Server/Input/Parser/Criterion/LogicalOrTest.php
+++ b/tests/lib/Server/Input/Parser/Criterion/LogicalOrTest.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser\Criterion;
 
-use eZ\Publish\API\Repository\Values\Content;
 use Ibexa\Contracts\Rest\Exceptions\Parser as ParserException;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Core\Repository\Values\Content;
 use Ibexa\Rest\Server\Input\Parser;
 use Ibexa\Tests\Rest\Server\Input\Parser\BaseTest;
 
@@ -66,7 +66,7 @@ public function testParseLogicalOr()
 
         $criterionMock = $this->createMock(Content\Query\Criterion::class, [], [], '', false);
 
-        $parserMock = $this->createMock(\EzSystems\EzPlatformRest\Input\Parser::class);
+        $parserMock = $this->createMock(\Ibexa\Contracts\Rest\Input\Parser::class);
         $parserMock->method('parse')->willReturn($criterionMock);
 
         $result = $this->internalGetParser()->parse($logicalOrParsedFromXml, new ParsingDispatcher([
diff --git a/tests/lib/Server/Input/Parser/Criterion/SiblingTest.php b/tests/lib/Server/Input/Parser/Criterion/SiblingTest.php
index 136acd06..05c7ba70 100644
--- a/tests/lib/Server/Input/Parser/Criterion/SiblingTest.php
+++ b/tests/lib/Server/Input/Parser/Criterion/SiblingTest.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Tests\Rest\Server\Input\Parser\Criterion;
 
-use eZ\Publish\API\Repository\LocationService;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Sibling as SiblingCriterion;
-use eZ\Publish\Core\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\LocationService;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Sibling as SiblingCriterion;
 use Ibexa\Contracts\Rest\Exceptions\Parser as ParserExpcetion;
+use Ibexa\Core\Repository\Values\Content\Location;
 use Ibexa\Rest\Server\Input\Parser\Criterion\Sibling as SiblingParser;
 use Ibexa\Tests\Rest\Server\Input\Parser\BaseTest;
 
@@ -20,7 +20,7 @@ final class SiblingTest extends BaseTest
     private const EXAMPLE_LOCATION_ID = 54;
     private const EXAMPLE_PARENT_LOCATION_ID = 2;
 
-    /** @var \eZ\Publish\API\Repository\LocationService */
+    /** @var \Ibexa\Contracts\Core\Repository\LocationService */
     private $locationService;
 
     protected function setUp(): void
diff --git a/tests/lib/Server/Input/Parser/Criterion/UserMetadataTest.php b/tests/lib/Server/Input/Parser/Criterion/UserMetadataTest.php
index 672707b1..dc5a73fa 100644
--- a/tests/lib/Server/Input/Parser/Criterion/UserMetadataTest.php
+++ b/tests/lib/Server/Input/Parser/Criterion/UserMetadataTest.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser\Criterion;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\UserMetadata as UserMetadataCriterion;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\UserMetadata as UserMetadataCriterion;
+use Ibexa\Contracts\Rest\Exceptions\Parser;
 use Ibexa\Rest\Server\Input\Parser\Criterion\UserMetadata;
 use Ibexa\Tests\Rest\Server\Input\Parser\BaseTest;
-use Ibexa\Contracts\Rest\Exceptions\Parser;
 
 class UserMetadataTest extends BaseTest
 {
@@ -121,7 +121,7 @@ public function testParseExceptionOnWrongValueType()
     /**
      * Returns the UserMetadata criterion parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\Criterion\UserMetadata
+     * @return \Ibexa\Rest\Server\Input\Parser\Criterion\UserMetadata
      */
     protected function internalGetParser()
     {
diff --git a/tests/lib/Server/Input/Parser/FacetBuilder/FacetBuilderBaseTest.php b/tests/lib/Server/Input/Parser/FacetBuilder/FacetBuilderBaseTest.php
index 6ad4fc63..9770110b 100644
--- a/tests/lib/Server/Input/Parser/FacetBuilder/FacetBuilderBaseTest.php
+++ b/tests/lib/Server/Input/Parser/FacetBuilder/FacetBuilderBaseTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser\FacetBuilder;
@@ -22,7 +22,7 @@
 abstract class FacetBuilderBaseTest extends BaseTest
 {
     /**
-     * @return \EzSystems\EzPlatformRest\Input\ParsingDispatcher
+     * @return \Ibexa\Contracts\Rest\Input\ParsingDispatcher
      */
     protected function getParsingDispatcher()
     {
@@ -79,7 +79,7 @@ protected function getParsingDispatcher()
     /**
      * Returns the query parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\ContentQuery
+     * @return \Ibexa\Rest\Server\Input\Parser\ContentQuery
      */
     protected function internalGetParser()
     {
diff --git a/tests/lib/Server/Input/Parser/FacetBuilder/FacetBuilderParserTest.php b/tests/lib/Server/Input/Parser/FacetBuilder/FacetBuilderParserTest.php
index 218f0c84..c288a21e 100644
--- a/tests/lib/Server/Input/Parser/FacetBuilder/FacetBuilderParserTest.php
+++ b/tests/lib/Server/Input/Parser/FacetBuilder/FacetBuilderParserTest.php
@@ -1,20 +1,20 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser\FacetBuilder;
 
-use eZ\Publish\Core\Repository\Values\Content\Location;
-use eZ\Publish\API\Repository\Values\Content\Query;
-use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\ContentTypeFacetBuilder;
-use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\CriterionFacetBuilder;
-use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\FieldFacetBuilder;
-use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\LocationFacetBuilder;
-use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\SectionFacetBuilder;
-use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\TermFacetBuilder;
-use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\UserFacetBuilder;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\ContentTypeFacetBuilder;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\CriterionFacetBuilder;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\FieldFacetBuilder;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\LocationFacetBuilder;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\SectionFacetBuilder;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\TermFacetBuilder;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\UserFacetBuilder;
+use Ibexa\Core\Repository\Values\Content\Location;
 use Ibexa\Rest\Server\Input\Parser\Criterion\LocationId;
 
 class FacetBuilderParserTest extends FacetBuilderBaseTest
diff --git a/tests/lib/Server/Input/Parser/FieldDefinitionCreateTest.php b/tests/lib/Server/Input/Parser/FieldDefinitionCreateTest.php
index 1f3bb822..f2c7141b 100644
--- a/tests/lib/Server/Input/Parser/FieldDefinitionCreateTest.php
+++ b/tests/lib/Server/Input/Parser/FieldDefinitionCreateTest.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
 
-use eZ\Publish\API\Repository\Values\ContentType\FieldDefinitionCreateStruct;
-use eZ\Publish\Core\Repository\ContentTypeService;
-use Ibexa\Rest\Server\Input\Parser\FieldDefinitionCreate;
-use Ibexa\Rest\Input\FieldTypeParser;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinitionCreateStruct;
 use Ibexa\Contracts\Rest\Exceptions\Parser;
+use Ibexa\Core\Repository\ContentTypeService;
+use Ibexa\Rest\Input\FieldTypeParser;
+use Ibexa\Rest\Server\Input\Parser\FieldDefinitionCreate;
 
 /**
  * @todo Test with fieldSettings and validatorConfiguration when specified
@@ -172,7 +172,7 @@ public function testParseExceptionOnInvalidDescriptions()
     /**
      * Returns the FieldDefinitionCreate parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\FieldDefinitionCreate
+     * @return \Ibexa\Rest\Server\Input\Parser\FieldDefinitionCreate
      */
     protected function internalGetParser()
     {
@@ -186,7 +186,7 @@ protected function internalGetParser()
     /**
      * Get the FieldTypeParser mock object.
      *
-     * @return \EzSystems\EzPlatformRest\Input\FieldTypeParser
+     * @return \Ibexa\Rest\Input\FieldTypeParser
      */
     protected function getFieldTypeParserMock()
     {
@@ -217,7 +217,7 @@ protected function getFieldTypeParserMock()
     /**
      * Get the content type service mock object.
      *
-     * @return \eZ\Publish\API\Repository\ContentTypeService
+     * @return \Ibexa\Contracts\Core\Repository\ContentTypeService
      */
     protected function getContentTypeServiceMock()
     {
@@ -227,12 +227,12 @@ protected function getContentTypeServiceMock()
             ->method('newFieldDefinitionCreateStruct')
             ->with($this->equalTo('title'), $this->equalTo('ezstring'))
             ->willReturn(
-                    new FieldDefinitionCreateStruct(
-                        [
+                new FieldDefinitionCreateStruct(
+                    [
                             'identifier' => 'title',
                             'fieldTypeIdentifier' => 'ezstring',
                         ]
-                    )
+                )
             );
 
         return $contentTypeServiceMock;
diff --git a/tests/lib/Server/Input/Parser/FieldDefinitionUpdateTest.php b/tests/lib/Server/Input/Parser/FieldDefinitionUpdateTest.php
index 2ff7e0ce..d7472186 100644
--- a/tests/lib/Server/Input/Parser/FieldDefinitionUpdateTest.php
+++ b/tests/lib/Server/Input/Parser/FieldDefinitionUpdateTest.php
@@ -1,20 +1,20 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
 
-use eZ\Publish\API\Repository\Values\ContentType\FieldDefinitionUpdateStruct;
-use eZ\Publish\Core\Repository\ContentTypeService;
-use eZ\Publish\Core\Repository\Values\ContentType\ContentTypeDraft;
-use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinitionCollection;
-use Ibexa\Rest\Server\Input\Parser\FieldDefinitionUpdate;
-use eZ\Publish\Core\Repository\Values\ContentType\ContentType;
-use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinition;
-use Ibexa\Rest\Input\FieldTypeParser;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinitionUpdateStruct;
 use Ibexa\Contracts\Rest\Exceptions\Parser;
+use Ibexa\Core\Repository\ContentTypeService;
+use Ibexa\Core\Repository\Values\ContentType\ContentType;
+use Ibexa\Core\Repository\Values\ContentType\ContentTypeDraft;
+use Ibexa\Core\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Core\Repository\Values\ContentType\FieldDefinitionCollection;
+use Ibexa\Rest\Input\FieldTypeParser;
+use Ibexa\Rest\Server\Input\Parser\FieldDefinitionUpdate;
 
 /**
  * @todo Test with fieldSettings and validatorConfiguration when specified
@@ -142,7 +142,7 @@ public function testParseExceptionOnInvalidDescriptions()
     /**
      * Returns the FieldDefinitionUpdate parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\FieldDefinitionUpdate
+     * @return \Ibexa\Rest\Server\Input\Parser\FieldDefinitionUpdate
      */
     protected function internalGetParser()
     {
@@ -156,7 +156,7 @@ protected function internalGetParser()
     /**
      * Get the FieldTypeParser mock object.
      *
-     * @return \EzSystems\EzPlatformRest\Input\FieldTypeParser
+     * @return \Ibexa\Rest\Input\FieldTypeParser
      */
     protected function getFieldTypeParserMock()
     {
@@ -187,7 +187,7 @@ protected function getFieldTypeParserMock()
     /**
      * Get the content type service mock object.
      *
-     * @return \eZ\Publish\API\Repository\ContentTypeService
+     * @return \Ibexa\Contracts\Core\Repository\ContentTypeService
      */
     protected function getContentTypeServiceMock()
     {
@@ -196,15 +196,15 @@ protected function getContentTypeServiceMock()
         $contentTypeServiceMock->expects($this->any())
             ->method('newFieldDefinitionUpdateStruct')
             ->willReturn(
-                    new FieldDefinitionUpdateStruct()
+                new FieldDefinitionUpdateStruct()
             );
 
         $contentTypeServiceMock->expects($this->any())
             ->method('loadContentTypeDraft')
             ->with($this->equalTo(42))
             ->willReturn(
-                    new ContentTypeDraft(
-                        [
+                new ContentTypeDraft(
+                    [
                             'innerContentType' => new ContentType([
                                 'fieldDefinitions' => new FieldDefinitionCollection([
                                     new FieldDefinition(
@@ -216,7 +216,7 @@ protected function getContentTypeServiceMock()
                                 ]),
                             ]),
                         ]
-                    )
+                )
             );
 
         return $contentTypeServiceMock;
diff --git a/tests/lib/Server/Input/Parser/JWTInputTest.php b/tests/lib/Server/Input/Parser/JWTInputTest.php
index a784c654..988bfe4c 100644
--- a/tests/lib/Server/Input/Parser/JWTInputTest.php
+++ b/tests/lib/Server/Input/Parser/JWTInputTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
diff --git a/tests/lib/Server/Input/Parser/Limitation/PathStringRouteBasedLimitationParserTest.php b/tests/lib/Server/Input/Parser/Limitation/PathStringRouteBasedLimitationParserTest.php
index 014837e4..087391ba 100644
--- a/tests/lib/Server/Input/Parser/Limitation/PathStringRouteBasedLimitationParserTest.php
+++ b/tests/lib/Server/Input/Parser/Limitation/PathStringRouteBasedLimitationParserTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser\Limitation;
@@ -33,7 +33,7 @@ public function testParse()
     /**
      * Must return the tested parser object.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\Limitation\RouteBasedLimitationParser
+     * @return \Ibexa\Rest\Server\Input\Parser\Limitation\RouteBasedLimitationParser
      */
     protected function internalGetParser()
     {
diff --git a/tests/lib/Server/Input/Parser/Limitation/RouteBasedLimitationParserTest.php b/tests/lib/Server/Input/Parser/Limitation/RouteBasedLimitationParserTest.php
index 8c72c4a5..e7639f22 100644
--- a/tests/lib/Server/Input/Parser/Limitation/RouteBasedLimitationParserTest.php
+++ b/tests/lib/Server/Input/Parser/Limitation/RouteBasedLimitationParserTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser\Limitation;
@@ -33,7 +33,7 @@ public function testParse()
     /**
      * Must return the tested parser object.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\Limitation\RouteBasedLimitationParser
+     * @return \Ibexa\Rest\Server\Input\Parser\Limitation\RouteBasedLimitationParser
      */
     protected function internalGetParser()
     {
diff --git a/tests/lib/Server/Input/Parser/LocationCreateTest.php b/tests/lib/Server/Input/Parser/LocationCreateTest.php
index 0ce5c18f..9bbfc9ff 100644
--- a/tests/lib/Server/Input/Parser/LocationCreateTest.php
+++ b/tests/lib/Server/Input/Parser/LocationCreateTest.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
 
-use eZ\Publish\Core\Repository\LocationService;
-use Ibexa\Rest\Server\Input\Parser\LocationCreate;
-use eZ\Publish\API\Repository\Values\Content\LocationCreateStruct;
-use eZ\Publish\API\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Values\Content\LocationCreateStruct;
 use Ibexa\Contracts\Rest\Exceptions\Parser;
+use Ibexa\Core\Repository\LocationService;
+use Ibexa\Rest\Server\Input\Parser\LocationCreate;
 
 class LocationCreateTest extends BaseTest
 {
@@ -159,7 +159,7 @@ public function testParseExceptionOnMissingSortOrder()
     /**
      * Returns the LocationCreateStruct parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\LocationCreate
+     * @return \Ibexa\Rest\Server\Input\Parser\LocationCreate
      */
     protected function internalGetParser()
     {
@@ -172,7 +172,7 @@ protected function internalGetParser()
     /**
      * Get the location service mock object.
      *
-     * @return \eZ\Publish\API\Repository\LocationService
+     * @return \Ibexa\Contracts\Core\Repository\LocationService
      */
     protected function getLocationServiceMock()
     {
diff --git a/tests/lib/Server/Input/Parser/LocationUpdateTest.php b/tests/lib/Server/Input/Parser/LocationUpdateTest.php
index 3d6cba2d..792d4d5e 100644
--- a/tests/lib/Server/Input/Parser/LocationUpdateTest.php
+++ b/tests/lib/Server/Input/Parser/LocationUpdateTest.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
 
-use eZ\Publish\Core\Repository\LocationService;
+use Ibexa\Contracts\Core\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Values\Content\LocationUpdateStruct;
+use Ibexa\Contracts\Rest\Exceptions\Parser;
+use Ibexa\Core\Repository\LocationService;
 use Ibexa\Rest\Server\Input\Parser\LocationUpdate;
-use eZ\Publish\API\Repository\Values\Content\LocationUpdateStruct;
-use eZ\Publish\API\Repository\Values\Content\Location;
 use Ibexa\Rest\Server\Values\RestLocationUpdateStruct;
-use Ibexa\Contracts\Rest\Exceptions\Parser;
 
 class LocationUpdateTest extends BaseTest
 {
@@ -134,7 +134,7 @@ public function testParseWithMissingSortOrder()
     /**
      * Returns the LocationUpdateStruct parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\LocationUpdate
+     * @return \Ibexa\Rest\Server\Input\Parser\LocationUpdate
      */
     protected function internalGetParser()
     {
@@ -147,7 +147,7 @@ protected function internalGetParser()
     /**
      * Get the location service mock object.
      *
-     * @return \eZ\Publish\API\Repository\LocationService
+     * @return \Ibexa\Contracts\Core\Repository\LocationService
      */
     protected function getLocationServiceMock()
     {
diff --git a/tests/lib/Server/Input/Parser/ObjectStateCreateTest.php b/tests/lib/Server/Input/Parser/ObjectStateCreateTest.php
index 59b2fbad..e06a3720 100644
--- a/tests/lib/Server/Input/Parser/ObjectStateCreateTest.php
+++ b/tests/lib/Server/Input/Parser/ObjectStateCreateTest.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
 
-use eZ\Publish\Core\Repository\ObjectStateService;
-use Ibexa\Rest\Server\Input\Parser\ObjectStateCreate;
-use eZ\Publish\API\Repository\Values\ObjectState\ObjectStateCreateStruct;
+use Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateCreateStruct;
 use Ibexa\Contracts\Rest\Exceptions\Parser;
+use Ibexa\Core\Repository\ObjectStateService;
+use Ibexa\Rest\Server\Input\Parser\ObjectStateCreate;
 
 class ObjectStateCreateTest extends BaseTest
 {
@@ -230,7 +230,7 @@ public function testParseExceptionOnInvalidNames()
     /**
      * Returns the ObjectStateCreate parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\ObjectStateCreate
+     * @return \Ibexa\Rest\Server\Input\Parser\ObjectStateCreate
      */
     protected function internalGetParser()
     {
@@ -243,7 +243,7 @@ protected function internalGetParser()
     /**
      * Get the object state service mock object.
      *
-     * @return \eZ\Publish\API\Repository\ObjectStateService
+     * @return \Ibexa\Contracts\Core\Repository\ObjectStateService
      */
     protected function getObjectStateServiceMock()
     {
diff --git a/tests/lib/Server/Input/Parser/ObjectStateGroupCreateTest.php b/tests/lib/Server/Input/Parser/ObjectStateGroupCreateTest.php
index 5c00f9c7..b485e832 100644
--- a/tests/lib/Server/Input/Parser/ObjectStateGroupCreateTest.php
+++ b/tests/lib/Server/Input/Parser/ObjectStateGroupCreateTest.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
 
-use eZ\Publish\Core\Repository\ObjectStateService;
-use Ibexa\Rest\Server\Input\Parser\ObjectStateGroupCreate;
-use eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroupCreateStruct;
+use Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroupCreateStruct;
 use Ibexa\Contracts\Rest\Exceptions\Parser;
+use Ibexa\Core\Repository\ObjectStateService;
+use Ibexa\Rest\Server\Input\Parser\ObjectStateGroupCreate;
 
 class ObjectStateGroupCreateTest extends BaseTest
 {
@@ -187,7 +187,7 @@ public function testParseExceptionOnInvalidNames()
     /**
      * Returns the ObjectStateGroupCreate parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\ObjectStateGroupCreate
+     * @return \Ibexa\Rest\Server\Input\Parser\ObjectStateGroupCreate
      */
     protected function internalGetParser()
     {
@@ -200,7 +200,7 @@ protected function internalGetParser()
     /**
      * Get the object state service mock object.
      *
-     * @return \eZ\Publish\API\Repository\ObjectStateService
+     * @return \Ibexa\Contracts\Core\Repository\ObjectStateService
      */
     protected function getObjectStateServiceMock()
     {
diff --git a/tests/lib/Server/Input/Parser/ObjectStateGroupUpdateTest.php b/tests/lib/Server/Input/Parser/ObjectStateGroupUpdateTest.php
index 81040d65..bf56f8b6 100644
--- a/tests/lib/Server/Input/Parser/ObjectStateGroupUpdateTest.php
+++ b/tests/lib/Server/Input/Parser/ObjectStateGroupUpdateTest.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
 
-use eZ\Publish\Core\Repository\ObjectStateService;
-use Ibexa\Rest\Server\Input\Parser\ObjectStateGroupUpdate;
-use eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroupUpdateStruct;
+use Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroupUpdateStruct;
 use Ibexa\Contracts\Rest\Exceptions\Parser;
+use Ibexa\Core\Repository\ObjectStateService;
+use Ibexa\Rest\Server\Input\Parser\ObjectStateGroupUpdate;
 
 class ObjectStateGroupUpdateTest extends BaseTest
 {
@@ -101,7 +101,7 @@ public function testParseExceptionOnInvalidNames()
     /**
      * Returns the ObjectStateGroupUpdate parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\ObjectStateGroupUpdate
+     * @return \Ibexa\Rest\Server\Input\Parser\ObjectStateGroupUpdate
      */
     protected function internalGetParser()
     {
@@ -114,7 +114,7 @@ protected function internalGetParser()
     /**
      * Get the object state service mock object.
      *
-     * @return \eZ\Publish\API\Repository\ObjectStateService
+     * @return \Ibexa\Contracts\Core\Repository\ObjectStateService
      */
     protected function getObjectStateServiceMock()
     {
diff --git a/tests/lib/Server/Input/Parser/ObjectStateUpdateTest.php b/tests/lib/Server/Input/Parser/ObjectStateUpdateTest.php
index 61293cc0..b499dc98 100644
--- a/tests/lib/Server/Input/Parser/ObjectStateUpdateTest.php
+++ b/tests/lib/Server/Input/Parser/ObjectStateUpdateTest.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
 
-use eZ\Publish\Core\Repository\ObjectStateService;
-use Ibexa\Rest\Server\Input\Parser\ObjectStateUpdate;
-use eZ\Publish\API\Repository\Values\ObjectState\ObjectStateUpdateStruct;
+use Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateUpdateStruct;
 use Ibexa\Contracts\Rest\Exceptions\Parser;
+use Ibexa\Core\Repository\ObjectStateService;
+use Ibexa\Rest\Server\Input\Parser\ObjectStateUpdate;
 
 class ObjectStateUpdateTest extends BaseTest
 {
@@ -101,7 +101,7 @@ public function testParseExceptionOnInvalidNames()
     /**
      * Returns the ObjectStateUpdate parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\ObjectStateUpdate
+     * @return \Ibexa\Rest\Server\Input\Parser\ObjectStateUpdate
      */
     protected function internalGetParser()
     {
@@ -114,7 +114,7 @@ protected function internalGetParser()
     /**
      * Get the object state service mock object.
      *
-     * @return \eZ\Publish\API\Repository\ObjectStateService
+     * @return \Ibexa\Contracts\Core\Repository\ObjectStateService
      */
     protected function getObjectStateServiceMock()
     {
diff --git a/tests/lib/Server/Input/Parser/PolicyCreateTest.php b/tests/lib/Server/Input/Parser/PolicyCreateTest.php
index aea433c9..b628a4de 100644
--- a/tests/lib/Server/Input/Parser/PolicyCreateTest.php
+++ b/tests/lib/Server/Input/Parser/PolicyCreateTest.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
 
-use eZ\Publish\API\Repository\Values\User\Limitation;
-use eZ\Publish\Core\Repository\RoleService;
-use Ibexa\Rest\Server\Input\Parser\PolicyCreate;
-use eZ\Publish\Core\Repository\Values\User\PolicyCreateStruct;
+use Ibexa\Contracts\Core\Repository\Values\User\Limitation;
 use Ibexa\Contracts\Rest\Exceptions\Parser;
+use Ibexa\Core\Repository\RoleService;
+use Ibexa\Core\Repository\Values\User\PolicyCreateStruct;
+use Ibexa\Rest\Server\Input\Parser\PolicyCreate;
 
 class PolicyCreateTest extends BaseTest
 {
@@ -225,7 +225,7 @@ public function testParseExceptionOnMissingLimitationValues()
     /**
      * Returns the PolicyCreateStruct parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\PolicyCreate
+     * @return \Ibexa\Rest\Server\Input\Parser\PolicyCreate
      */
     protected function internalGetParser()
     {
@@ -238,7 +238,7 @@ protected function internalGetParser()
     /**
      * Get the role service mock object.
      *
-     * @return \eZ\Publish\API\Repository\RoleService
+     * @return \Ibexa\Contracts\Core\Repository\RoleService
      */
     protected function getRoleServiceMock()
     {
diff --git a/tests/lib/Server/Input/Parser/PolicyUpdateTest.php b/tests/lib/Server/Input/Parser/PolicyUpdateTest.php
index 3a0793e3..79d7dd03 100644
--- a/tests/lib/Server/Input/Parser/PolicyUpdateTest.php
+++ b/tests/lib/Server/Input/Parser/PolicyUpdateTest.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
 
-use eZ\Publish\API\Repository\Values\User\Limitation;
-use eZ\Publish\Core\Repository\RoleService;
-use Ibexa\Rest\Server\Input\Parser\PolicyUpdate;
-use eZ\Publish\Core\Repository\Values\User\PolicyUpdateStruct;
+use Ibexa\Contracts\Core\Repository\Values\User\Limitation;
 use Ibexa\Contracts\Rest\Exceptions\Parser;
+use Ibexa\Core\Repository\RoleService;
+use Ibexa\Core\Repository\Values\User\PolicyUpdateStruct;
+use Ibexa\Rest\Server\Input\Parser\PolicyUpdate;
 
 class PolicyUpdateTest extends BaseTest
 {
@@ -137,7 +137,7 @@ public function testParseExceptionOnMissingLimitationValues()
     /**
      * Returns the PolicyUpdateStruct parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\PolicyUpdate
+     * @return \Ibexa\Rest\Server\Input\Parser\PolicyUpdate
      */
     protected function internalGetParser()
     {
@@ -150,7 +150,7 @@ protected function internalGetParser()
     /**
      * Get the role service mock object.
      *
-     * @return \eZ\Publish\API\Repository\RoleService
+     * @return \Ibexa\Contracts\Core\Repository\RoleService
      */
     protected function getRoleServiceMock()
     {
diff --git a/tests/lib/Server/Input/Parser/QueryParserTest.php b/tests/lib/Server/Input/Parser/QueryParserTest.php
index c36086f2..d010b505 100644
--- a/tests/lib/Server/Input/Parser/QueryParserTest.php
+++ b/tests/lib/Server/Input/Parser/QueryParserTest.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
 
-use eZ\Publish\API\Repository\Values\Content\Query;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query;
 use Ibexa\Rest\Server\Input\Parser\ContentQuery as QueryParser;
 
 class QueryParserTest extends BaseTest
diff --git a/tests/lib/Server/Input/Parser/RelationCreateTest.php b/tests/lib/Server/Input/Parser/RelationCreateTest.php
index dad2b01b..fa323d29 100644
--- a/tests/lib/Server/Input/Parser/RelationCreateTest.php
+++ b/tests/lib/Server/Input/Parser/RelationCreateTest.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Server\Input\Parser\RelationCreate;
 use Ibexa\Contracts\Rest\Exceptions\Parser;
+use Ibexa\Rest\Server\Input\Parser\RelationCreate;
 
 class RelationCreateTest extends BaseTest
 {
@@ -63,7 +63,7 @@ public function testParseExceptionOnMissingDestinationHref()
     /**
      * Returns the RelationCreate parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\RelationCreate
+     * @return \Ibexa\Rest\Server\Input\Parser\RelationCreate
      */
     protected function internalGetParser()
     {
diff --git a/tests/lib/Server/Input/Parser/RoleAssignInputTest.php b/tests/lib/Server/Input/Parser/RoleAssignInputTest.php
index 838f5a97..d4d5c941 100644
--- a/tests/lib/Server/Input/Parser/RoleAssignInputTest.php
+++ b/tests/lib/Server/Input/Parser/RoleAssignInputTest.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
 
-use eZ\Publish\API\Repository\Values\User\Limitation\RoleLimitation;
-use eZ\Publish\API\Repository\Values\User\Limitation\SectionLimitation;
+use Ibexa\Contracts\Core\Repository\Values\User\Limitation\RoleLimitation;
+use Ibexa\Contracts\Core\Repository\Values\User\Limitation\SectionLimitation;
+use Ibexa\Contracts\Rest\Exceptions\Parser;
 use Ibexa\Rest\Server\Input\Parser\RoleAssignInput;
 use Ibexa\Rest\Server\Values\RoleAssignment;
-use Ibexa\Contracts\Rest\Exceptions\Parser;
 
 class RoleAssignInputTest extends BaseTest
 {
@@ -155,7 +155,7 @@ public function testParseExceptionOnMissingLimitationIdentifier()
     /**
      * Returns the role assign input parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\RoleAssignInput
+     * @return \Ibexa\Rest\Server\Input\Parser\RoleAssignInput
      */
     protected function internalGetParser()
     {
diff --git a/tests/lib/Server/Input/Parser/RoleInputTest.php b/tests/lib/Server/Input/Parser/RoleInputTest.php
index ada5c954..71c4aa82 100644
--- a/tests/lib/Server/Input/Parser/RoleInputTest.php
+++ b/tests/lib/Server/Input/Parser/RoleInputTest.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
 
-use eZ\Publish\Core\Repository\RoleService;
+use Ibexa\Core\Repository\RoleService;
+use Ibexa\Core\Repository\Values\User\RoleCreateStruct;
 use Ibexa\Rest\Server\Input\Parser\RoleInput;
-use eZ\Publish\Core\Repository\Values\User\RoleCreateStruct;
 
 class RoleInputTest extends BaseTest
 {
@@ -73,7 +73,7 @@ public function testParse()
     /**
      * Returns the role input parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\RoleInput
+     * @return \Ibexa\Rest\Server\Input\Parser\RoleInput
      */
     protected function internalGetParser()
     {
@@ -86,7 +86,7 @@ protected function internalGetParser()
     /**
      * Get the role service mock object.
      *
-     * @return \eZ\Publish\API\Repository\RoleService
+     * @return \Ibexa\Contracts\Core\Repository\RoleService
      */
     protected function getRoleServiceMock()
     {
diff --git a/tests/lib/Server/Input/Parser/SectionInputTest.php b/tests/lib/Server/Input/Parser/SectionInputTest.php
index b67ce6d7..7d50ea4a 100644
--- a/tests/lib/Server/Input/Parser/SectionInputTest.php
+++ b/tests/lib/Server/Input/Parser/SectionInputTest.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
 
-use eZ\Publish\Core\Repository\SectionService;
-use Ibexa\Rest\Server\Input\Parser\SectionInput;
-use eZ\Publish\API\Repository\Values\Content\SectionCreateStruct;
+use Ibexa\Contracts\Core\Repository\Values\Content\SectionCreateStruct;
 use Ibexa\Contracts\Rest\Exceptions\Parser;
+use Ibexa\Core\Repository\SectionService;
+use Ibexa\Rest\Server\Input\Parser\SectionInput;
 
 class SectionInputTest extends BaseTest
 {
@@ -66,7 +66,7 @@ public function testParseExceptionOnMissingName()
     /**
      * Returns the section input parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\SectionInput
+     * @return \Ibexa\Rest\Server\Input\Parser\SectionInput
      */
     protected function internalGetParser()
     {
@@ -78,7 +78,7 @@ protected function internalGetParser()
     /**
      * Get the section service mock object.
      *
-     * @return \eZ\Publish\API\Repository\SectionService
+     * @return \Ibexa\Contracts\Core\Repository\SectionService
      */
     protected function getSectionServiceMock()
     {
diff --git a/tests/lib/Server/Input/Parser/SessionInputTest.php b/tests/lib/Server/Input/Parser/SessionInputTest.php
index 86b7566d..7cf5ef8f 100644
--- a/tests/lib/Server/Input/Parser/SessionInputTest.php
+++ b/tests/lib/Server/Input/Parser/SessionInputTest.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
 
+use Ibexa\Contracts\Rest\Exceptions\Parser;
 use Ibexa\Rest\Server\Input\Parser\SessionInput;
 use Ibexa\Rest\Server\Values\SessionInput as SessionInputValue;
-use Ibexa\Contracts\Rest\Exceptions\Parser;
 
 class SessionInputTest extends BaseTest
 {
@@ -65,7 +65,7 @@ public function testParseExceptionOnMissingName()
     /**
      * Returns the session input parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\SessionInput
+     * @return \Ibexa\Rest\Server\Input\Parser\SessionInput
      */
     protected function internalGetParser()
     {
diff --git a/tests/lib/Server/Input/Parser/SortClause/DataKeyValueObjectClassTest.php b/tests/lib/Server/Input/Parser/SortClause/DataKeyValueObjectClassTest.php
index f91c6d54..ebe4d663 100644
--- a/tests/lib/Server/Input/Parser/SortClause/DataKeyValueObjectClassTest.php
+++ b/tests/lib/Server/Input/Parser/SortClause/DataKeyValueObjectClassTest.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser\SortClause;
 
-use eZ\Publish\API\Repository\Values\Content\Query;
-use eZ\Publish\API\Repository\Values\Content\Query\SortClause\DatePublished;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\DatePublished;
+use Ibexa\Contracts\Rest\Exceptions\Parser;
 use Ibexa\Rest\Server\Input\Parser\SortClause\DataKeyValueObjectClass;
 use Ibexa\Tests\Rest\Server\Input\Parser\BaseTest;
-use Ibexa\Contracts\Rest\Exceptions\Parser;
 
 class DataKeyValueObjectClassTest extends BaseTest
 {
@@ -84,7 +84,7 @@ public function testParseExceptionOnNonexistingValueObjectClass()
     /**
      * Returns the DataKeyValueObjectClass parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\SortClause\DataKeyValueObjectClass
+     * @return \Ibexa\Rest\Server\Input\Parser\SortClause\DataKeyValueObjectClass
      */
     protected function internalGetParser()
     {
diff --git a/tests/lib/Server/Input/Parser/SortClause/FieldTest.php b/tests/lib/Server/Input/Parser/SortClause/FieldTest.php
index d518a009..cae9b4c4 100644
--- a/tests/lib/Server/Input/Parser/SortClause/FieldTest.php
+++ b/tests/lib/Server/Input/Parser/SortClause/FieldTest.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser\SortClause;
 
-use eZ\Publish\API\Repository\Values\Content\Query;
-use eZ\Publish\API\Repository\Values\Content\Query\SortClause\Field;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\Field;
+use Ibexa\Contracts\Rest\Exceptions\Parser;
 use Ibexa\Rest\Server\Input\Parser\SortClause\Field as FieldParser;
 use Ibexa\Tests\Rest\Server\Input\Parser\BaseTest;
-use Ibexa\Contracts\Rest\Exceptions\Parser;
 
 class FieldTest extends BaseTest
 {
@@ -72,7 +72,7 @@ public function testParseExceptionOnInvalidDirectionFormat()
     /**
      * Returns the Field parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\SortClause\Field
+     * @return \Ibexa\Rest\Server\Input\Parser\SortClause\Field
      */
     protected function internalGetParser()
     {
diff --git a/tests/lib/Server/Input/Parser/URLWildcardCreateTest.php b/tests/lib/Server/Input/Parser/URLWildcardCreateTest.php
index df67bd54..aac314c0 100644
--- a/tests/lib/Server/Input/Parser/URLWildcardCreateTest.php
+++ b/tests/lib/Server/Input/Parser/URLWildcardCreateTest.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Server\Input\Parser\URLWildcardCreate;
 use Ibexa\Contracts\Rest\Exceptions\Parser;
+use Ibexa\Rest\Server\Input\Parser\URLWildcardCreate;
 
 class URLWildcardCreateTest extends BaseTest
 {
@@ -87,7 +87,7 @@ public function testParseExceptionOnMissingForward()
     /**
      * Returns the URLWildcard input parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\URLWildcardCreate
+     * @return \Ibexa\Rest\Server\Input\Parser\URLWildcardCreate
      */
     protected function internalGetParser()
     {
diff --git a/tests/lib/Server/Input/Parser/UserCreateTest.php b/tests/lib/Server/Input/Parser/UserCreateTest.php
index 171646c8..26003e4e 100644
--- a/tests/lib/Server/Input/Parser/UserCreateTest.php
+++ b/tests/lib/Server/Input/Parser/UserCreateTest.php
@@ -1,22 +1,22 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
 
-use eZ\Publish\Core\Repository\ContentTypeService;
-use eZ\Publish\Core\Repository\UserService;
-use eZ\Publish\API\Repository\ContentService;
-use eZ\Publish\API\Repository\FieldTypeService;
-use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinitionCollection;
-use Ibexa\Rest\Server\Input\Parser\UserCreate;
-use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinition;
-use eZ\Publish\Core\Repository\Values\ContentType\ContentType;
-use eZ\Publish\Core\Repository\Values\User\UserCreateStruct;
-use Ibexa\Rest\Input\FieldTypeParser;
+use Ibexa\Contracts\Core\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\FieldTypeService;
 use Ibexa\Contracts\Rest\Exceptions\Parser;
+use Ibexa\Core\Repository\ContentTypeService;
+use Ibexa\Core\Repository\UserService;
+use Ibexa\Core\Repository\Values\ContentType\ContentType;
+use Ibexa\Core\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Core\Repository\Values\ContentType\FieldDefinitionCollection;
+use Ibexa\Core\Repository\Values\User\UserCreateStruct;
+use Ibexa\Rest\Input\FieldTypeParser;
+use Ibexa\Rest\Server\Input\Parser\UserCreate;
 
 class UserCreateTest extends BaseTest
 {
@@ -425,7 +425,7 @@ public function testParseExceptionOnMissingFieldValue()
     /**
      * Returns the UserCreate parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\UserCreate
+     * @return \Ibexa\Rest\Server\Input\Parser\UserCreate
      */
     protected function internalGetParser()
     {
@@ -440,7 +440,7 @@ protected function internalGetParser()
     /**
      * Get the field type parser mock object.
      *
-     * @return \EzSystems\EzPlatformRest\Input\FieldTypeParser ;
+     * @return \Ibexa\Rest\Input\FieldTypeParser ;
      */
     private function getFieldTypeParserMock()
     {
@@ -467,7 +467,7 @@ private function getFieldTypeParserMock()
     /**
      * Get the user service mock object.
      *
-     * @return \eZ\Publish\API\Repository\UserService
+     * @return \Ibexa\Contracts\Core\Repository\UserService
      */
     protected function getUserServiceMock()
     {
@@ -484,12 +484,12 @@ protected function getUserServiceMock()
                 $this->equalTo($contentType)
             )
             ->willReturn(
-                    new UserCreateStruct(
-                        [
+                new UserCreateStruct(
+                    [
                             'contentType' => $contentType,
                             'mainLanguageCode' => 'eng-US',
                         ]
-                    )
+                )
             );
 
         return $userServiceMock;
@@ -498,7 +498,7 @@ protected function getUserServiceMock()
     /**
      * Get the content type service mock object.
      *
-     * @return \eZ\Publish\API\Repository\ContentTypeService
+     * @return \Ibexa\Contracts\Core\Repository\ContentTypeService
      */
     protected function getContentTypeServiceMock()
     {
@@ -515,7 +515,7 @@ protected function getContentTypeServiceMock()
     /**
      * Get the content type used in UserCreate parser.
      *
-     * @return \eZ\Publish\API\Repository\Values\ContentType\ContentType
+     * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType
      */
     protected function getContentType()
     {
diff --git a/tests/lib/Server/Input/Parser/UserGroupCreateTest.php b/tests/lib/Server/Input/Parser/UserGroupCreateTest.php
index 4ac2ca42..4a158aaf 100644
--- a/tests/lib/Server/Input/Parser/UserGroupCreateTest.php
+++ b/tests/lib/Server/Input/Parser/UserGroupCreateTest.php
@@ -1,22 +1,22 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
 
-use eZ\Publish\Core\Repository\ContentTypeService;
-use eZ\Publish\Core\Repository\UserService;
-use eZ\Publish\API\Repository\ContentService;
-use eZ\Publish\API\Repository\FieldTypeService;
-use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinitionCollection;
-use Ibexa\Rest\Server\Input\Parser\UserGroupCreate;
-use eZ\Publish\Core\Repository\Values\User\UserGroupCreateStruct;
-use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinition;
-use eZ\Publish\Core\Repository\Values\ContentType\ContentType;
-use Ibexa\Rest\Input\FieldTypeParser;
+use Ibexa\Contracts\Core\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\FieldTypeService;
 use Ibexa\Contracts\Rest\Exceptions\Parser;
+use Ibexa\Core\Repository\ContentTypeService;
+use Ibexa\Core\Repository\UserService;
+use Ibexa\Core\Repository\Values\ContentType\ContentType;
+use Ibexa\Core\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Core\Repository\Values\ContentType\FieldDefinitionCollection;
+use Ibexa\Core\Repository\Values\User\UserGroupCreateStruct;
+use Ibexa\Rest\Input\FieldTypeParser;
+use Ibexa\Rest\Server\Input\Parser\UserGroupCreate;
 
 class UserGroupCreateTest extends BaseTest
 {
@@ -54,7 +54,7 @@ public function testParse()
         );
 
         $this->assertInstanceOf(
-            \eZ\Publish\API\Repository\Values\ContentType\ContentType::class,
+            \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType::class,
             $result->contentType,
             'contentType not created correctly.'
         );
@@ -294,7 +294,7 @@ public function testParseExceptionOnMissingFieldValue()
     /**
      * Returns the UserGroupCreate parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\UserGroupCreate
+     * @return \Ibexa\Rest\Server\Input\Parser\UserGroupCreate
      */
     protected function internalGetParser()
     {
@@ -308,7 +308,7 @@ protected function internalGetParser()
     /**
      * Get the field type parser mock object.
      *
-     * @return \EzSystems\EzPlatformRest\Input\FieldTypeParser ;
+     * @return \Ibexa\Rest\Input\FieldTypeParser ;
      */
     private function getFieldTypeParserMock()
     {
@@ -335,7 +335,7 @@ private function getFieldTypeParserMock()
     /**
      * Get the user service mock object.
      *
-     * @return \eZ\Publish\API\Repository\UserService
+     * @return \Ibexa\Contracts\Core\Repository\UserService
      */
     protected function getUserServiceMock()
     {
@@ -349,12 +349,12 @@ protected function getUserServiceMock()
                 $this->equalTo($contentType)
             )
             ->willReturn(
-                    new UserGroupCreateStruct(
-                        [
+                new UserGroupCreateStruct(
+                    [
                             'contentType' => $contentType,
                             'mainLanguageCode' => 'eng-US',
                         ]
-                    )
+                )
             );
 
         return $userServiceMock;
@@ -363,7 +363,7 @@ protected function getUserServiceMock()
     /**
      * Get the content type service mock object.
      *
-     * @return \eZ\Publish\API\Repository\ContentTypeService
+     * @return \Ibexa\Contracts\Core\Repository\ContentTypeService
      */
     protected function getContentTypeServiceMock()
     {
@@ -380,7 +380,7 @@ protected function getContentTypeServiceMock()
     /**
      * Get the content type used in UserGroupCreate parser.
      *
-     * @return \eZ\Publish\API\Repository\Values\ContentType\ContentType
+     * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType
      */
     protected function getContentType()
     {
diff --git a/tests/lib/Server/Input/Parser/UserGroupUpdateTest.php b/tests/lib/Server/Input/Parser/UserGroupUpdateTest.php
index 26a03841..7e1b0302 100644
--- a/tests/lib/Server/Input/Parser/UserGroupUpdateTest.php
+++ b/tests/lib/Server/Input/Parser/UserGroupUpdateTest.php
@@ -1,25 +1,25 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
 
-use eZ\Publish\Core\Repository\ContentService;
-use eZ\Publish\Core\Repository\ContentTypeService;
-use eZ\Publish\Core\Repository\FieldTypeService;
-use eZ\Publish\Core\Repository\LocationService;
-use eZ\Publish\Core\Repository\UserService;
-use Ibexa\Rest\Server\Input\Parser\UserGroupUpdate;
-use eZ\Publish\API\Repository\Values\Content\ContentInfo;
-use eZ\Publish\Core\Repository\Values\Content\Location;
-use eZ\Publish\API\Repository\Values\Content\ContentMetadataUpdateStruct;
-use eZ\Publish\API\Repository\Values\User\UserGroupUpdateStruct;
-use eZ\Publish\Core\Repository\Values\Content\ContentUpdateStruct;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentMetadataUpdateStruct;
+use Ibexa\Contracts\Core\Repository\Values\User\UserGroupUpdateStruct;
+use Ibexa\Contracts\Rest\Exceptions\Parser;
+use Ibexa\Core\Repository\ContentService;
+use Ibexa\Core\Repository\ContentTypeService;
+use Ibexa\Core\Repository\FieldTypeService;
+use Ibexa\Core\Repository\LocationService;
+use Ibexa\Core\Repository\UserService;
+use Ibexa\Core\Repository\Values\Content\ContentUpdateStruct;
+use Ibexa\Core\Repository\Values\Content\Location;
 use Ibexa\Rest\Input\FieldTypeParser;
+use Ibexa\Rest\Server\Input\Parser\UserGroupUpdate;
 use Ibexa\Rest\Server\Values\RestUserGroupUpdateStruct;
-use Ibexa\Contracts\Rest\Exceptions\Parser;
 
 class UserGroupUpdateTest extends BaseTest
 {
@@ -197,7 +197,7 @@ public function testParseExceptionOnMissingFieldValue()
     /**
      * Returns the UserGroupUpdate parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\UserGroupUpdate
+     * @return \Ibexa\Rest\Server\Input\Parser\UserGroupUpdate
      */
     protected function internalGetParser()
     {
@@ -212,7 +212,7 @@ protected function internalGetParser()
     /**
      * Get the field type parser mock object.
      *
-     * @return \EzSystems\EzPlatformRest\Input\FieldTypeParser ;
+     * @return \Ibexa\Rest\Input\FieldTypeParser ;
      */
     private function getFieldTypeParserMock()
     {
@@ -239,7 +239,7 @@ private function getFieldTypeParserMock()
     /**
      * Get the user service mock object.
      *
-     * @return \eZ\Publish\API\Repository\UserService
+     * @return \Ibexa\Contracts\Core\Repository\UserService
      */
     protected function getUserServiceMock()
     {
@@ -257,7 +257,7 @@ protected function getUserServiceMock()
     /**
      * Get the location service mock object.
      *
-     * @return \eZ\Publish\API\Repository\LocationService
+     * @return \Ibexa\Contracts\Core\Repository\LocationService
      */
     protected function getLocationServiceMock()
     {
@@ -267,15 +267,15 @@ protected function getLocationServiceMock()
             ->method('loadLocation')
             ->with($this->equalTo(5))
             ->willReturn(
-                    new Location(
-                        [
+                new Location(
+                    [
                             'contentInfo' => new ContentInfo(
                                 [
                                     'id' => 4,
                                 ]
                             ),
                         ]
-                    )
+                )
             );
 
         return $userServiceMock;
@@ -284,7 +284,7 @@ protected function getLocationServiceMock()
     /**
      * Get the content service mock object.
      *
-     * @return \eZ\Publish\API\Repository\ContentService
+     * @return \Ibexa\Contracts\Core\Repository\ContentService
      */
     protected function getContentServiceMock()
     {
diff --git a/tests/lib/Server/Input/Parser/UserUpdateTest.php b/tests/lib/Server/Input/Parser/UserUpdateTest.php
index 20a64ca4..0b9e2c87 100644
--- a/tests/lib/Server/Input/Parser/UserUpdateTest.php
+++ b/tests/lib/Server/Input/Parser/UserUpdateTest.php
@@ -1,22 +1,22 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
 
-use eZ\Publish\Core\Repository\ContentService;
-use eZ\Publish\Core\Repository\UserService;
-use eZ\Publish\API\Repository\ContentTypeService;
-use eZ\Publish\API\Repository\FieldTypeService;
-use Ibexa\Rest\Server\Input\Parser\UserUpdate;
-use eZ\Publish\API\Repository\Values\Content\ContentMetadataUpdateStruct;
-use eZ\Publish\API\Repository\Values\User\UserUpdateStruct;
-use eZ\Publish\Core\Repository\Values\Content\ContentUpdateStruct;
+use Ibexa\Contracts\Core\Repository\ContentTypeService;
+use Ibexa\Contracts\Core\Repository\FieldTypeService;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentMetadataUpdateStruct;
+use Ibexa\Contracts\Core\Repository\Values\User\UserUpdateStruct;
+use Ibexa\Contracts\Rest\Exceptions\Parser;
+use Ibexa\Core\Repository\ContentService;
+use Ibexa\Core\Repository\UserService;
+use Ibexa\Core\Repository\Values\Content\ContentUpdateStruct;
 use Ibexa\Rest\Input\FieldTypeParser;
+use Ibexa\Rest\Server\Input\Parser\UserUpdate;
 use Ibexa\Rest\Server\Values\RestUserUpdateStruct;
-use Ibexa\Contracts\Rest\Exceptions\Parser;
 
 class UserUpdateTest extends BaseTest
 {
@@ -226,7 +226,7 @@ public function testParseExceptionOnMissingFieldValue()
     /**
      * Returns the UserUpdate parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\UserUpdate
+     * @return \Ibexa\Rest\Server\Input\Parser\UserUpdate
      */
     protected function internalGetParser()
     {
@@ -241,7 +241,7 @@ protected function internalGetParser()
     /**
      * Get the field type parser mock object.
      *
-     * @return \EzSystems\EzPlatformRest\Input\FieldTypeParser ;
+     * @return \Ibexa\Rest\Input\FieldTypeParser ;
      */
     private function getFieldTypeParserMock()
     {
@@ -268,7 +268,7 @@ private function getFieldTypeParserMock()
     /**
      * Get the user service mock object.
      *
-     * @return \eZ\Publish\API\Repository\UserService
+     * @return \Ibexa\Contracts\Core\Repository\UserService
      */
     protected function getUserServiceMock()
     {
@@ -286,7 +286,7 @@ protected function getUserServiceMock()
     /**
      * Get the Content service mock object.
      *
-     * @return \eZ\Publish\API\Repository\ContentService
+     * @return \Ibexa\Contracts\Core\Repository\ContentService
      */
     protected function getContentServiceMock()
     {
diff --git a/tests/lib/Server/Input/Parser/VersionUpdateTest.php b/tests/lib/Server/Input/Parser/VersionUpdateTest.php
index 839625ba..d317648d 100644
--- a/tests/lib/Server/Input/Parser/VersionUpdateTest.php
+++ b/tests/lib/Server/Input/Parser/VersionUpdateTest.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
 
-use eZ\Publish\Core\Repository\ContentService;
-use eZ\Publish\API\Repository\ContentTypeService;
-use eZ\Publish\API\Repository\FieldTypeService;
-use Ibexa\Rest\Server\Input\Parser\VersionUpdate;
-use eZ\Publish\Core\Repository\Values\Content\ContentUpdateStruct;
-use Ibexa\Rest\Input\FieldTypeParser;
+use Ibexa\Contracts\Core\Repository\ContentTypeService;
+use Ibexa\Contracts\Core\Repository\FieldTypeService;
 use Ibexa\Contracts\Rest\Exceptions\Parser;
+use Ibexa\Core\Repository\ContentService;
+use Ibexa\Core\Repository\Values\Content\ContentUpdateStruct;
+use Ibexa\Rest\Input\FieldTypeParser;
+use Ibexa\Rest\Server\Input\Parser\VersionUpdate;
 
 class VersionUpdateTest extends BaseTest
 {
@@ -124,7 +124,7 @@ public function testParseExceptionOnMissingFieldValue()
     /**
      * Returns the VersionUpdate parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\VersionUpdate
+     * @return \Ibexa\Rest\Server\Input\Parser\VersionUpdate
      */
     protected function internalGetParser()
     {
@@ -137,7 +137,7 @@ protected function internalGetParser()
     /**
      * Get the field type parser mock object.
      *
-     * @return \EzSystems\EzPlatformRest\Input\FieldTypeParser ;
+     * @return \Ibexa\Rest\Input\FieldTypeParser ;
      */
     private function getFieldTypeParserMock()
     {
@@ -164,7 +164,7 @@ private function getFieldTypeParserMock()
     /**
      * Get the Content service mock object.
      *
-     * @return \eZ\Publish\API\Repository\ContentService
+     * @return \Ibexa\Contracts\Core\Repository\ContentService
      */
     protected function getContentServiceMock()
     {
diff --git a/tests/lib/Server/Input/Parser/ViewInputOneDotOneTest.php b/tests/lib/Server/Input/Parser/ViewInputOneDotOneTest.php
index bb4ed9ad..76fdcc8d 100644
--- a/tests/lib/Server/Input/Parser/ViewInputOneDotOneTest.php
+++ b/tests/lib/Server/Input/Parser/ViewInputOneDotOneTest.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
 
-use eZ\Publish\API\Repository\Values\Content\LocationQuery;
-use eZ\Publish\API\Repository\Values\Content\Query;
+use Ibexa\Contracts\Core\Repository\Values\Content\LocationQuery;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query;
+use Ibexa\Contracts\Rest\Exceptions\Parser;
 use Ibexa\Rest\Server\Input\Parser\ViewInputOneDotOne;
 use Ibexa\Rest\Server\Values\RestViewInput;
-use Ibexa\Contracts\Rest\Exceptions\Parser;
 
 class ViewInputOneDotOneTest extends BaseTest
 {
@@ -85,7 +85,7 @@ public function testThrowsExceptionOnMissingQuery()
     /**
      * Returns the session input parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\ViewInput
+     * @return \Ibexa\Rest\Server\Input\Parser\ViewInput
      */
     protected function internalGetParser()
     {
diff --git a/tests/lib/Server/Input/Parser/ViewInputTest.php b/tests/lib/Server/Input/Parser/ViewInputTest.php
index b50377e8..0ca44d84 100644
--- a/tests/lib/Server/Input/Parser/ViewInputTest.php
+++ b/tests/lib/Server/Input/Parser/ViewInputTest.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Input\Parser;
 
-use eZ\Publish\API\Repository\Values\Content\Query;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query;
 use Ibexa\Rest\Server\Input\Parser\ViewInput;
 use Ibexa\Rest\Server\Values\RestViewInput;
 
@@ -56,7 +56,7 @@ public function testThrowsExceptionOnMissingQuery()
     /**
      * Returns the session input parser.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Input\Parser\ViewInput
+     * @return \Ibexa\Rest\Server\Input\Parser\ViewInput
      */
     protected function internalGetParser()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/BadRequestExceptionTest.php b/tests/lib/Server/Output/ValueObjectVisitor/BadRequestExceptionTest.php
index c6ef120b..6e4ccad9 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/BadRequestExceptionTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/BadRequestExceptionTest.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Exceptions;
+use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
 class BadRequestExceptionTest extends ExceptionTest
 {
@@ -44,7 +44,7 @@ protected function getException()
     /**
      * Gets the exception visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\BadRequestException
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\BadRequestException
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/BadStateExceptionTest.php b/tests/lib/Server/Output/ValueObjectVisitor/BadStateExceptionTest.php
index c1b5058b..95743953 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/BadStateExceptionTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/BadStateExceptionTest.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
+use Ibexa\Contracts\Core\Repository\Exceptions\BadStateException;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
-use eZ\Publish\API\Repository\Exceptions\BadStateException;
 
 class BadStateExceptionTest extends ExceptionTest
 {
@@ -44,7 +44,7 @@ protected function getException()
     /**
      * Gets the exception visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\BadStateException
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\BadStateException
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/BookmarkListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/BookmarkListTest.php
index 7eb09669..f9030db3 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/BookmarkListTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/BookmarkListTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
@@ -10,16 +10,16 @@
 
 use DOMDocument;
 use DOMXPath;
-use eZ\Publish\API\Repository\Values\Content\Location;
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Contracts\Core\Repository\Values\Content\Location;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values\BookmarkList;
 use Ibexa\Rest\Server\Values\RestLocation;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class BookmarkListTest extends ValueObjectVisitorBaseTest
 {
     /**
-     * @var \EzSystems\EzPlatformRest\Server\Values\BookmarkList
+     * @var \Ibexa\Rest\Server\Values\BookmarkList
      */
     private $data;
 
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/CachedValueTest.php b/tests/lib/Server/Output/ValueObjectVisitor/CachedValueTest.php
index 8bc9565c..432472ae 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/CachedValueTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/CachedValueTest.php
@@ -1,16 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\Core\MVC\ConfigResolverInterface;
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Core\MVC\ConfigResolverInterface;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values\CachedValue;
-use PHPUnit\Framework\MockObject\MockObject;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 use stdClass;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -26,7 +25,7 @@ class CachedValueTest extends ValueObjectVisitorBaseTest
     ];
 
     /**
-     * @var Request
+     * @var \Symfony\Component\HttpFoundation\Request
      */
     protected $request;
 
@@ -139,7 +138,7 @@ protected function visit($value)
     /**
      * Must return an instance of the tested visitor object.
      *
-     * @return \EzSystems\EzPlatformRest\Output\ValueObjectVisitor
+     * @return \Ibexa\Contracts\Rest\Output\ValueObjectVisitor
      */
     protected function internalGetVisitor()
     {
@@ -156,7 +155,7 @@ protected function internalGetVisitor()
     }
 
     /**
-     * @return ConfigResolverInterface|MockObject
+     * @return \Ibexa\Core\MVC\ConfigResolverInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     protected function getConfigProviderMock()
     {
@@ -167,17 +166,17 @@ protected function getConfigProviderMock()
             ->expects($this->any())
             ->method('hasParameter')
             ->willReturnCallback(
-                    function ($parameterName) use ($options) {
-                        return isset($options[$parameterName]);
-                    }
+                static function ($parameterName) use ($options) {
+                    return isset($options[$parameterName]);
+                }
             );
         $mock
             ->expects($this->any())
             ->method('getParameter')
             ->willReturnCallback(
-                    function ($parameterName, $defaultValue) use ($options) {
-                        return isset($options[$parameterName]) ? $options[$parameterName] : $defaultValue;
-                    }
+                static function ($parameterName, $defaultValue) use ($options) {
+                    return isset($options[$parameterName]) ? $options[$parameterName] : $defaultValue;
+                }
             );
 
         return $mock;
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ConflictTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ConflictTest.php
index 969860a4..8bd66f20 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/ConflictTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/ConflictTest.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class ConflictTest extends ValueObjectVisitorBaseTest
 {
@@ -42,7 +42,7 @@ public function testVisit()
     /**
      * Get the Conflict visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\Conflict
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\Conflict
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ContentFieldValidationExceptionTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ContentFieldValidationExceptionTest.php
index 125da151..311ebf32 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/ContentFieldValidationExceptionTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/ContentFieldValidationExceptionTest.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\Core\Base\Exceptions\ContentFieldValidationException as CoreContentFieldValidationException;
-use eZ\Publish\Core\FieldType\ValidationError;
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
-use Ibexa\Rest\Server\Output\ValueObjectVisitor;
+use Ibexa\Core\Base\Exceptions\ContentFieldValidationException as CoreContentFieldValidationException;
+use Ibexa\Core\FieldType\ValidationError;
 use Ibexa\Rest\Server\Exceptions;
+use Ibexa\Rest\Server\Output\ValueObjectVisitor;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 use Symfony\Component\Translation\Translator;
 
 class ContentFieldValidationExceptionTest extends ValueObjectVisitorBaseTest
@@ -149,7 +149,7 @@ protected function getException()
     /**
      * Gets the exception visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\ContentFieldValidationException
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentFieldValidationException
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ContentListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ContentListTest.php
index ea612aeb..533ade39 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/ContentListTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/ContentListTest.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values\ContentList;
 use Ibexa\Rest\Server\Values\RestContent;
-use eZ\Publish\API\Repository\Values\Content\ContentInfo;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class ContentListTest extends ValueObjectVisitorBaseTest
 {
@@ -145,7 +145,7 @@ public function testResultContainsTotalCountAttributes(string $result): void
     /**
      * Get the ContentList visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\ContentList
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentList
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ContentObjectStatesTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ContentObjectStatesTest.php
index 80c4584f..8f69fc4b 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/ContentObjectStatesTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/ContentObjectStatesTest.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 use Ibexa\Rest\Output\ValueObjectVisitor;
 use Ibexa\Rest\Values\ContentObjectStates;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class ContentObjectStatesTest extends ValueObjectVisitorBaseTest
 {
@@ -84,7 +84,7 @@ public function testResultContainsContentObjectStatesAttributes($result)
     /**
      * Get the ContentObjectStates visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\ContentObjectStates
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentObjectStates
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupListTest.php
index bd5d9229..5facb3cc 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupListTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupListTest.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup;
+use Ibexa\Core\Repository\Values\ContentType;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values\ContentTypeGroupList;
-use eZ\Publish\Core\Repository\Values\ContentType;
-use eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class ContentTypeGroupListTest extends ValueObjectVisitorBaseTest
 {
@@ -116,7 +116,7 @@ public function testContentTypeGroupListVisitsChildren()
     /**
      * Get the ContentTypeGroupList visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\ContentTypeGroupList
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeGroupList
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupRefListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupRefListTest.php
index 2cd156ca..f389c6f5 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupRefListTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupRefListTest.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
-use eZ\Publish\Core\Repository\Values\ContentType\ContentTypeGroup;
-use eZ\Publish\Core\Repository\Values\ContentType\ContentType;
+use Ibexa\Core\Repository\Values\ContentType\ContentType;
+use Ibexa\Core\Repository\Values\ContentType\ContentTypeGroup;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values\ContentTypeGroupRefList;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class ContentTypeGroupRefListTest extends ValueObjectVisitorBaseTest
 {
@@ -204,7 +204,7 @@ public function testSecondContentTypeGroupRefUnlinkMethodCorrect(\DOMDocument $d
     /**
      * Get the ContentTypeGroupRefList visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\ContentTypeGroupRefList
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeGroupRefList
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupTest.php
index 00ada357..5eb03745 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupTest.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Core\Repository\Values\ContentType;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
-use eZ\Publish\Core\Repository\Values\ContentType;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class ContentTypeGroupTest extends ValueObjectVisitorBaseTest
 {
@@ -339,7 +339,7 @@ public function testResultContainsContentTypesAttributes($result)
     /**
      * Get the ContentTypeGroup visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\ContentTypeGroup
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeGroup
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeInfoListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeInfoListTest.php
index 12d22e9b..31358d9d 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeInfoListTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeInfoListTest.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Core\Repository\Values\ContentType;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values\ContentTypeInfoList;
-use eZ\Publish\Core\Repository\Values\ContentType;
 use Ibexa\Rest\Server\Values\RestContentType;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class ContentTypeInfoListTest extends ValueObjectVisitorBaseTest
 {
@@ -123,7 +123,7 @@ public function testContentTypeInfoListVisitsChildren()
     /**
      * Get the ContentTypeInfoList visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\ContentTypeInfoList
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeInfoList
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeListTest.php
index f3a95cd9..6da4db73 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeListTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeListTest.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Core\Repository\Values\ContentType;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values\ContentTypeList;
-use eZ\Publish\Core\Repository\Values\ContentType;
 use Ibexa\Rest\Server\Values\RestContentType;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class ContentTypeListTest extends ValueObjectVisitorBaseTest
 {
@@ -123,7 +123,7 @@ public function testContentTypeListVisitsChildren()
     /**
      * Get the ContentTypeList visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\ContentTypeList
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeList
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/CountryListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/CountryListTest.php
index cd010206..3e62ea28 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/CountryListTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/CountryListTest.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values\CountryList;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class CountryListTest extends ValueObjectVisitorBaseTest
 {
@@ -127,7 +127,7 @@ public function testCountryListIDC(\DOMDocument $dom)
     /**
      * Get the CountryList visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\CountryList
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\CountryList
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/DeletedUserSessionTest.php b/tests/lib/Server/Output/ValueObjectVisitor/DeletedUserSessionTest.php
index ce869992..eaec8090 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/DeletedUserSessionTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/DeletedUserSessionTest.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 use Symfony\Component\HttpFoundation\Cookie;
 use Symfony\Component\HttpFoundation\Response;
 
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ExceptionTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ExceptionTest.php
index 9bf94c90..dc3ba5ec 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/ExceptionTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/ExceptionTest.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Rest\Output\Generator\Xml;
-use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 use DOMDocument;
 use DOMXPath;
+use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
+use Ibexa\Rest\Output\Generator\Xml;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor\Exception as ExceptionValueObjectVisitor;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class ExceptionTest extends ValueObjectVisitorBaseTest
@@ -208,7 +208,7 @@ protected function getException()
     /**
      * Gets the exception visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\Exception
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\Exception
      */
     protected function internalGetVisitor()
     {
@@ -218,7 +218,7 @@ protected function internalGetVisitor()
     /**
      * Gets the exception visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\Exception
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\Exception
      */
     protected function internalGetNonDebugVisitor(): ExceptionValueObjectVisitor
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/FieldDefinitionListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/FieldDefinitionListTest.php
index d5b0592e..0e8fd8be 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/FieldDefinitionListTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/FieldDefinitionListTest.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
-use Ibexa\Rest\Server\Output\ValueObjectVisitor;
+use Ibexa\Core\Repository\Values;
 use Ibexa\Rest\Server;
-use eZ\Publish\Core\Repository\Values;
+use Ibexa\Rest\Server\Output\ValueObjectVisitor;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 /**
  * @todo coverage add unit test for a content type draft
@@ -102,7 +102,7 @@ public function testGeneratedXml($xpath, \DOMDocument $dom)
     /**
      * Get the Content visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\FieldDefinitionList
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\FieldDefinitionList
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ForbiddenExceptionTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ForbiddenExceptionTest.php
index 50816fb2..9b9bddc6 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/ForbiddenExceptionTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/ForbiddenExceptionTest.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Exceptions;
+use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
 class ForbiddenExceptionTest extends ExceptionTest
 {
@@ -44,7 +44,7 @@ protected function getException()
     /**
      * Gets the exception visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\ForbiddenException
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\ForbiddenException
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ImageVariationTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ImageVariationTest.php
index 93580577..b0c3d2d0 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/ImageVariationTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/ImageVariationTest.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Contracts\Core\Variation\Values\ImageVariation;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
-use eZ\Publish\SPI\Variation\Values\ImageVariation;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class ImageVariationTest extends ValueObjectVisitorBaseTest
 {
@@ -180,7 +180,7 @@ public function testFileSizeTagValue(\DOMDocument $dom)
     }
 
     /**
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\ImageVariation
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\ImageVariation
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/InvalidArgumentExceptionTest.php b/tests/lib/Server/Output/ValueObjectVisitor/InvalidArgumentExceptionTest.php
index 3f655954..fb834d2a 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/InvalidArgumentExceptionTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/InvalidArgumentExceptionTest.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Exceptions;
+use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
 class InvalidArgumentExceptionTest extends ExceptionTest
 {
@@ -44,7 +44,7 @@ protected function getException()
     /**
      * Gets the exception visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\InvalidArgumentException
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\InvalidArgumentException
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/JWTTest.php b/tests/lib/Server/Output/ValueObjectVisitor/JWTTest.php
index 662854e1..e4491322 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/JWTTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/JWTTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/LocationListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/LocationListTest.php
index a7c61858..31d933d1 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/LocationListTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/LocationListTest.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values\LocationList;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class LocationListTest extends ValueObjectVisitorBaseTest
 {
@@ -85,7 +85,7 @@ public function testResultContainsLocationListAttributes($result)
     /**
      * Get the LocationList visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\LocationList
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\LocationList
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/NoContentTest.php b/tests/lib/Server/Output/ValueObjectVisitor/NoContentTest.php
index 9da394f4..067ae101 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/NoContentTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/NoContentTest.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class NoContentTest extends ValueObjectVisitorBaseTest
 {
@@ -42,7 +42,7 @@ public function testVisit()
     /**
      * Get the NoContent visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\NoContent
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\NoContent
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/NotFoundExceptionTest.php b/tests/lib/Server/Output/ValueObjectVisitor/NotFoundExceptionTest.php
index 4edaefc8..f426a7b0 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/NotFoundExceptionTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/NotFoundExceptionTest.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\API\Repository\Exceptions\NotFoundException;
+use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
 class NotFoundExceptionTest extends ExceptionTest
@@ -44,7 +44,7 @@ protected function getException()
     /**
      * Get the exception visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\NotFoundException
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\NotFoundException
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/NotImplementedExceptionTest.php b/tests/lib/Server/Output/ValueObjectVisitor/NotImplementedExceptionTest.php
index 33fbb06b..32560f7b 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/NotImplementedExceptionTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/NotImplementedExceptionTest.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\API\Repository\Exceptions\NotImplementedException;
+use Ibexa\Contracts\Core\Repository\Exceptions\NotImplementedException;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
 class NotImplementedExceptionTest extends ExceptionTest
@@ -44,7 +44,7 @@ protected function getException()
     /**
      * Gets the exception visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\NotImplementedException
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\NotImplementedException
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ObjectStateGroupListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ObjectStateGroupListTest.php
index 16ce09af..8a5f182f 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/ObjectStateGroupListTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/ObjectStateGroupListTest.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Core\Repository\Values\ObjectState\ObjectStateGroup;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values\ObjectStateGroupList;
-use eZ\Publish\Core\Repository\Values\ObjectState\ObjectStateGroup;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class ObjectStateGroupListTest extends ValueObjectVisitorBaseTest
 {
@@ -103,7 +103,7 @@ public function testObjectStateGroupListVisitsChildren()
 
         $this->getVisitorMock()->expects($this->exactly(2))
             ->method('visitValueObject')
-            ->with($this->isInstanceOf(\eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroup::class));
+            ->with($this->isInstanceOf(\Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroup::class));
 
         $visitor->visit(
             $this->getVisitorMock(),
@@ -115,7 +115,7 @@ public function testObjectStateGroupListVisitsChildren()
     /**
      * Get the ObjectStateGroupList visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\ObjectStateGroupList
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\ObjectStateGroupList
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ObjectStateGroupTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ObjectStateGroupTest.php
index dd2eca73..e5a23cb0 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/ObjectStateGroupTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/ObjectStateGroupTest.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Core\Repository\Values\ObjectState;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
-use eZ\Publish\Core\Repository\Values\ObjectState;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class ObjectStateGroupTest extends ValueObjectVisitorBaseTest
 {
@@ -238,7 +238,7 @@ public function testResultContainsDescriptionsElement($result)
     /**
      * Get the ObjectStateGroup visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\ObjectStateGroup
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\ObjectStateGroup
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ObjectStateListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ObjectStateListTest.php
index cd6c09a0..3f3d12f1 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/ObjectStateListTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/ObjectStateListTest.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
-use Ibexa\Rest\Values\RestObjectState;
+use Ibexa\Core\Repository\Values\ObjectState\ObjectState;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values\ObjectStateList;
-use eZ\Publish\Core\Repository\Values\ObjectState\ObjectState;
+use Ibexa\Rest\Values\RestObjectState;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class ObjectStateListTest extends ValueObjectVisitorBaseTest
 {
@@ -122,7 +122,7 @@ public function testObjectStateListVisitsChildren()
     /**
      * Get the ObjectStateList visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\ObjectStateList
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\ObjectStateList
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/OptionsTest.php b/tests/lib/Server/Output/ValueObjectVisitor/OptionsTest.php
index dcf49efb..7e905a64 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/OptionsTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/OptionsTest.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class OptionsTest extends ValueObjectVisitorBaseTest
 {
@@ -33,8 +33,8 @@ public function testVisit()
         $this->getVisitorMock()->expects($this->exactly(2))
             ->method('setHeader')
             ->willReturnMap(
-                 ['Allow', 'GET,POST'],
-                 ['Content-Length', 0]
+                ['Allow', 'GET,POST'],
+                ['Content-Length', 0]
             );
 
         $visitor->visit(
@@ -47,7 +47,7 @@ public function testVisit()
     /**
      * Get the NoContent visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\NoContent
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\NoContent
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/PermanentRedirectTest.php b/tests/lib/Server/Output/ValueObjectVisitor/PermanentRedirectTest.php
index 5cea179c..a4e95238 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/PermanentRedirectTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/PermanentRedirectTest.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class PermanentRedirectTest extends ValueObjectVisitorBaseTest
 {
@@ -45,7 +45,7 @@ public function testVisit()
     /**
      * Get the PermanentRedirect visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\PermanentRedirect
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\PermanentRedirect
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/PolicyListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/PolicyListTest.php
index 8bc7ffef..c276f44c 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/PolicyListTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/PolicyListTest.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\API\Repository\Values\User\Policy;
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Contracts\Core\Repository\Values\User\Policy;
+use Ibexa\Core\Repository\Values\User;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values\PolicyList;
-use eZ\Publish\Core\Repository\Values\User;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class PolicyListTest extends ValueObjectVisitorBaseTest
 {
@@ -115,7 +115,7 @@ public function testPolicyListVisitsChildren()
     /**
      * Get the PolicyList visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\PolicyList
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\PolicyList
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/PolicyTest.php b/tests/lib/Server/Output/ValueObjectVisitor/PolicyTest.php
index 1a836a4c..090ded60 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/PolicyTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/PolicyTest.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Core\Repository\Values\User;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
-use eZ\Publish\Core\Repository\Values\User;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class PolicyTest extends ValueObjectVisitorBaseTest
 {
@@ -24,7 +24,7 @@ public function testVisit()
 
         $generator->startDocument(null);
 
-        $contentTypeLimitation = new \eZ\Publish\API\Repository\Values\User\Limitation\ContentTypeLimitation();
+        $contentTypeLimitation = new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\ContentTypeLimitation();
         $contentTypeLimitation->limitationValues = [1, 2, 3];
 
         $policy = new User\Policy(
@@ -205,7 +205,7 @@ public function testResultContainsLimitationsAttributes($result)
     /**
      * Get the Policy visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\Policy
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\Policy
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RelationListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RelationListTest.php
index 1835b186..245db68d 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/RelationListTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/RelationListTest.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Core\Repository\Values\Content;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values\RelationList;
-use eZ\Publish\Core\Repository\Values\Content;
 use Ibexa\Rest\Server\Values\RestRelation;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class RelationListTest extends ValueObjectVisitorBaseTest
 {
@@ -125,7 +125,7 @@ public function testRelationListVisitsChildren()
     /**
      * Get the RelationList visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RelationList
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RelationList
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ResourceCreatedTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ResourceCreatedTest.php
index a37dc4c2..a9433cf4 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/ResourceCreatedTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/ResourceCreatedTest.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class ResourceCreatedTest extends ValueObjectVisitorBaseTest
 {
@@ -47,7 +47,7 @@ public function testVisit()
     /**
      * Get the ResourceCreated visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\ResourceCreated
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\ResourceCreated
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RestContentTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RestContentTest.php
index 43b45da9..7cbffd2c 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/RestContentTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/RestContentTest.php
@@ -1,23 +1,23 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
-use Ibexa\Rest\Server\Values\RestContent;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
+use Ibexa\Core\Helper\TranslationHelper;
+use Ibexa\Core\Repository\Values;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
-use eZ\Publish\Core\Repository\Values;
-use eZ\Publish\Core\Helper\TranslationHelper;
-use eZ\Publish\API\Repository\Values\Content\ContentInfo;
+use Ibexa\Rest\Server\Values\RestContent;
 use Ibexa\Rest\Server\Values\Version;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class RestContentTest extends ValueObjectVisitorBaseTest
 {
-    /** @var \eZ\Publish\Core\Helper\TranslationHelper|\PHPUnit\Framework\MockObject\MockObject */
+    /** @var \Ibexa\Core\Helper\TranslationHelper|\PHPUnit\Framework\MockObject\MockObject */
     private $translationHelper;
 
     protected function setUp(): void
@@ -25,7 +25,7 @@ protected function setUp(): void
         $this->translationHelper = $this->createMock(TranslationHelper::class);
         $this->translationHelper
             ->method('getTranslatedContentNameByContentInfo')
-            ->willReturnCallback(function (ContentInfo $content) {
+            ->willReturnCallback(static function (ContentInfo $content) {
                 return $content->name . ' (Translated)';
             });
     }
@@ -515,7 +515,7 @@ public function testEmbeddedCurrentVersionMediaTypeCorrect(\DOMDocument $dom)
     /**
      * Get the Content visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RestContent
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RestContent
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RestContentTypeTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RestContentTypeTest.php
index c439d10f..5fe18c15 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/RestContentTypeTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/RestContentTypeTest.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Core\Repository\Values;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
-use eZ\Publish\Core\Repository\Values;
 use Ibexa\Rest\Server\Values\FieldDefinitionList;
 use Ibexa\Rest\Server\Values\RestContentType;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 /**
  * @todo coverage add unit test for testVisitDraftType
@@ -381,7 +381,7 @@ public function testDefaultSortOrder(\DOMDocument $dom)
     /**
      * Get the RestContentType visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RestContentType
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RestContentType
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RestExecutedViewTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RestExecutedViewTest.php
index 4ef59d61..0d06b158 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/RestExecutedViewTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/RestExecutedViewTest.php
@@ -1,23 +1,23 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\API\Repository\ContentService;
-use eZ\Publish\API\Repository\ContentTypeService;
-use eZ\Publish\API\Repository\LocationService;
-use eZ\Publish\API\Repository\Values\Content\ContentInfo;
-use eZ\Publish\API\Repository\Values\Content\Search\SearchHit;
-use eZ\Publish\API\Repository\Values\Content\Search\SearchResult;
-use eZ\Publish\Core\Repository\Values\ContentType\ContentType;
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Contracts\Core\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\ContentTypeService;
+use Ibexa\Contracts\Core\Repository\LocationService;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
+use Ibexa\Contracts\Core\Repository\Values\Content\Search\SearchHit;
+use Ibexa\Contracts\Core\Repository\Values\Content\Search\SearchResult;
+use Ibexa\Core\Repository\Values\Content;
+use Ibexa\Core\Repository\Values\Content as ApiValues;
+use Ibexa\Core\Repository\Values\ContentType\ContentType;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
-use eZ\Publish\Core\Repository\Values\Content;
 use Ibexa\Rest\Server\Values\RestExecutedView;
-use eZ\Publish\Core\Repository\Values\Content as ApiValues;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class RestExecutedViewTest extends ValueObjectVisitorBaseTest
 {
@@ -107,7 +107,7 @@ public function testGeneratedXml($xpath, \DOMDocument $dom)
     /**
      * Get the Relation visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RestExecutedView
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RestExecutedView
      */
     protected function internalGetVisitor()
     {
@@ -118,7 +118,7 @@ protected function internalGetVisitor()
     }
 
     /**
-     * @return \eZ\Publish\API\Repository\LocationService|\PHPUnit\Framework\MockObject\MockObject
+     * @return \Ibexa\Contracts\Core\Repository\LocationService|\PHPUnit\Framework\MockObject\MockObject
      */
     public function getLocationServiceMock()
     {
@@ -126,7 +126,7 @@ public function getLocationServiceMock()
     }
 
     /**
-     * @return \eZ\Publish\API\Repository\ContentService|\PHPUnit\Framework\MockObject\MockObject
+     * @return \Ibexa\Contracts\Core\Repository\ContentService|\PHPUnit\Framework\MockObject\MockObject
      */
     public function getContentServiceMock()
     {
@@ -137,7 +137,7 @@ public function getContentServiceMock()
     }
 
     /**
-     * @return \eZ\Publish\API\Repository\ContentTypeService|\PHPUnit\Framework\MockObject\MockObject
+     * @return \Ibexa\Contracts\Core\Repository\ContentTypeService|\PHPUnit\Framework\MockObject\MockObject
      */
     public function getContentTypeServiceMock()
     {
@@ -145,7 +145,7 @@ public function getContentTypeServiceMock()
     }
 
     /**
-     * @return \eZ\Publish\API\Repository\Values\Content\Search\SearchHit
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Search\SearchHit
      */
     protected function buildContentSearchHit()
     {
@@ -164,7 +164,7 @@ protected function buildContentSearchHit()
     }
 
     /**
-     * @return \eZ\Publish\API\Repository\Values\Content\Search\SearchHit
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Search\SearchHit
      */
     protected function buildLocationSearchHit()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RestFieldDefinitionTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RestFieldDefinitionTest.php
index 1aa107f6..408a828a 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/RestFieldDefinitionTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/RestFieldDefinitionTest.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
-use Ibexa\Rest\Server\Output\ValueObjectVisitor;
+use Ibexa\Core\Repository\Values;
 use Ibexa\Rest\Output\FieldTypeSerializer;
 use Ibexa\Rest\Server;
-use eZ\Publish\Core\Repository\Values;
+use Ibexa\Rest\Server\Output\ValueObjectVisitor;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class RestFieldDefinitionTest extends ValueObjectVisitorBaseTest
 {
@@ -119,7 +119,7 @@ public function provideXpathAssertions()
         ];
 
         return array_map(
-            function ($xpath) {
+            static function ($xpath) {
                 return [$xpath];
             },
             $xpathAssertions
@@ -141,7 +141,7 @@ public function testGeneratedXml($xpath, \DOMDocument $dom)
     /**
      * Get the Content visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RestFieldDefinition
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RestFieldDefinition
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RestLocationRootNodeTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RestLocationRootNodeTest.php
index 9f1ca670..6edd5921 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/RestLocationRootNodeTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/RestLocationRootNodeTest.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
+use Ibexa\Core\Repository\Values\Content\Location;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values\RestContent;
 use Ibexa\Rest\Server\Values\RestLocation;
-use eZ\Publish\Core\Repository\Values\Content\Location;
-use eZ\Publish\API\Repository\Values\Content\ContentInfo;
 
 class RestLocationRootNodeTest extends RestLocationTest
 {
@@ -248,7 +248,7 @@ public function testResultContainsUrlAliasesTagAttributes($result)
     /**
      * Get the Location visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RestLocation
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RestLocation
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RestLocationTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RestLocationTest.php
index 1ec9f5d2..1de922cb 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/RestLocationTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/RestLocationTest.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
+use Ibexa\Core\Repository\Values\Content\Location;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values\RestContent;
 use Ibexa\Rest\Server\Values\RestLocation;
-use eZ\Publish\Core\Repository\Values\Content\Location;
-use eZ\Publish\API\Repository\Values\Content\ContentInfo;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class RestLocationTest extends ValueObjectVisitorBaseTest
 {
@@ -578,7 +578,7 @@ public function testResultContainsUrlAliasesTagAttributes($result)
     /**
      * Get the Location visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RestLocation
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RestLocation
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RestObjectStateTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RestObjectStateTest.php
index 0d2d43b6..f1b73d01 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/RestObjectStateTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/RestObjectStateTest.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Core\Repository\Values\ObjectState\ObjectState;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
-use eZ\Publish\Core\Repository\Values\ObjectState\ObjectState;
 use Ibexa\Rest\Values;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class RestObjectStateTest extends ValueObjectVisitorBaseTest
 {
@@ -304,7 +304,7 @@ public function testResultContainsDescriptionsElement($result)
     /**
      * Get the ObjectState visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RestObjectState
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RestObjectState
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RestRelationTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RestRelationTest.php
index cd2153b9..d778dc8a 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/RestRelationTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/RestRelationTest.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
+use Ibexa\Core\Repository\Values\Content;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
-use eZ\Publish\Core\Repository\Values\Content;
 use Ibexa\Rest\Server\Values\RestRelation;
-use eZ\Publish\API\Repository\Values\Content\ContentInfo;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class RestRelationTest extends ValueObjectVisitorBaseTest
 {
@@ -208,7 +208,7 @@ public function testResultContainsRelationTypeElement($result)
     /**
      * Get the Relation visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RestRelation
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RestRelation
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RestTrashItemTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RestTrashItemTest.php
index 0a71da6e..107f1b40 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/RestTrashItemTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/RestTrashItemTest.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
+use Ibexa\Core\Repository\Values\Content\TrashItem;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values\RestContent;
 use Ibexa\Rest\Server\Values\RestTrashItem;
-use eZ\Publish\Core\Repository\Values\Content\TrashItem;
-use eZ\Publish\API\Repository\Values\Content\ContentInfo;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class RestTrashItemTest extends ValueObjectVisitorBaseTest
 {
@@ -468,7 +468,7 @@ public function testResultContainsSortOrderValueElement($result)
     /**
      * Get the TrashItem visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RestTrashItem
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RestTrashItem
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RestUserGroupRoleAssignmentTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RestUserGroupRoleAssignmentTest.php
index bb9c8a32..6370a80c 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/RestUserGroupRoleAssignmentTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/RestUserGroupRoleAssignmentTest.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Core\Repository\Values\User;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
-use eZ\Publish\Core\Repository\Values\User;
 use Ibexa\Rest\Server\Values;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class RestUserGroupRoleAssignmentTest extends ValueObjectVisitorBaseTest
 {
@@ -156,7 +156,7 @@ public function testResultContainsRoleAttributes($result)
     /**
      * Get the RestUserGroupRoleAssignment visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RestUserGroupRoleAssignment
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RestUserGroupRoleAssignment
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RestUserGroupTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RestUserGroupTest.php
index 48fb96b9..35dc3032 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/RestUserGroupTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/RestUserGroupTest.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
-use Ibexa\Rest\Server\Values\RestUserGroup;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
+use Ibexa\Core\Repository\Values;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
-use eZ\Publish\Core\Repository\Values;
-use eZ\Publish\API\Repository\Values\Content\ContentInfo;
+use Ibexa\Rest\Server\Values\RestUserGroup;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class RestUserGroupTest extends ValueObjectVisitorBaseTest
 {
@@ -418,7 +418,7 @@ public function testRolesMediaTypeCorrect(\DOMDocument $dom)
     /**
      * Get the UserGroup visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RestUserGroup
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RestUserGroup
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RestUserRoleAssignmentTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RestUserRoleAssignmentTest.php
index 753482d8..7e5fc573 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/RestUserRoleAssignmentTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/RestUserRoleAssignmentTest.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Core\Repository\Values\User;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
-use eZ\Publish\Core\Repository\Values\User;
 use Ibexa\Rest\Server\Values;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class RestUserRoleAssignmentTest extends ValueObjectVisitorBaseTest
 {
@@ -157,7 +157,7 @@ public function testResultContainsRoleAttributes($result)
     /**
      * Get the UserRoleAssignment visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RestUserRoleAssignment
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RestUserRoleAssignment
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RestUserTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RestUserTest.php
index 27afd745..9fd8ebc2 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/RestUserTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/RestUserTest.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
-use Ibexa\Rest\Server\Values\RestUser;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
+use Ibexa\Core\Repository\Values;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
-use eZ\Publish\Core\Repository\Values;
-use eZ\Publish\API\Repository\Values\Content\ContentInfo;
+use Ibexa\Rest\Server\Values\RestUser;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class RestUserTest extends ValueObjectVisitorBaseTest
 {
@@ -373,7 +373,7 @@ public function testRolesMediaTypeCorrect(\DOMDocument $dom)
     /**
      * Get the User visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RestUser
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RestUser
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RoleAssignmentListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RoleAssignmentListTest.php
index 451ab4e3..fa184697 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/RoleAssignmentListTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/RoleAssignmentListTest.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Core\Repository\Values\User;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values\RestUserRoleAssignment;
 use Ibexa\Rest\Server\Values\RoleAssignmentList;
-use eZ\Publish\Core\Repository\Values\User;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class RoleAssignmentListTest extends ValueObjectVisitorBaseTest
 {
@@ -179,7 +179,7 @@ public function testResultContainsGroupRoleAssignmentListAttributes($result)
     /**
      * Get the RoleAssignmentList visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RoleAssignmentList
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RoleAssignmentList
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RoleListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RoleListTest.php
index a8be17fa..55367046 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/RoleListTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/RoleListTest.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\API\Repository\Values\User\Role;
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Contracts\Core\Repository\Values\User\Role;
+use Ibexa\Core\Repository\Values\User;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values\RoleList;
-use eZ\Publish\Core\Repository\Values\User;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class RoleListTest extends ValueObjectVisitorBaseTest
 {
@@ -115,7 +115,7 @@ public function testRoleListVisitsChildren()
     /**
      * Get the RoleList visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RoleList
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RoleList
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RoleTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RoleTest.php
index d11a93ab..9fe33b71 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/RoleTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/RoleTest.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Core\Repository\Values\User;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
-use eZ\Publish\Core\Repository\Values\User;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class RoleTest extends ValueObjectVisitorBaseTest
 {
@@ -235,7 +235,7 @@ public function testResultContainsPoliciesAttributes($result)
     /**
      * Get the Role visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\Role
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\Role
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RootTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RootTest.php
index 31f8d23b..00458c99 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/RootTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/RootTest.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\Core\MVC\ConfigResolverInterface;
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Core\MVC\ConfigResolverInterface;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Service\ExpressionRouterRootResourceBuilder;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class RootTest extends ValueObjectVisitorBaseTest
 {
@@ -182,7 +182,7 @@ public function testResultContainsTemplateRouterWithAttributes($result)
     /**
      * Get the Role visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\Root
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\Root
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/SectionListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/SectionListTest.php
index 1cb04530..8d6cbb20 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/SectionListTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/SectionListTest.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Core\Repository\Values\Content;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values\SectionList;
-use eZ\Publish\API\Repository\Values\Content;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class SectionListTest extends ValueObjectVisitorBaseTest
 {
@@ -114,7 +114,7 @@ public function testSectionListVisitsChildren()
     /**
      * Get the SectionList visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\SectionList
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\SectionList
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/SectionTest.php b/tests/lib/Server/Output/ValueObjectVisitor/SectionTest.php
index d0e72c3b..bfaeda21 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/SectionTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/SectionTest.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Core\Repository\Values\Content;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
-use eZ\Publish\API\Repository\Values\Content;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class SectionTest extends ValueObjectVisitorBaseTest
 {
@@ -160,7 +160,7 @@ public function testResultContainsNameValueElement($result)
     /**
      * Get the Section visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\Section
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\Section
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/TemporaryRedirectTest.php b/tests/lib/Server/Output/ValueObjectVisitor/TemporaryRedirectTest.php
index f1a0ecae..2a1f9733 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/TemporaryRedirectTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/TemporaryRedirectTest.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class TemporaryRedirectTest extends ValueObjectVisitorBaseTest
 {
@@ -45,7 +45,7 @@ public function testVisit()
     /**
      * Get the TemporaryRedirect visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\TemporaryRedirect
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\TemporaryRedirect
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/TrashTest.php b/tests/lib/Server/Output/ValueObjectVisitor/TrashTest.php
index 1ecb0d16..4b79cf52 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/TrashTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/TrashTest.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Core\Repository\Values\Content;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
-use Ibexa\Rest\Server\Values\Trash;
 use Ibexa\Rest\Server\Values\RestTrashItem;
-use eZ\Publish\Core\Repository\Values\Content;
+use Ibexa\Rest\Server\Values\Trash;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class TrashTest extends ValueObjectVisitorBaseTest
 {
@@ -123,7 +123,7 @@ public function testTrashVisitsChildren()
     /**
      * Get the Trash visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\Trash
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\Trash
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/URLAliasListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/URLAliasListTest.php
index 8045a9ff..d72c9fd7 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/URLAliasListTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/URLAliasListTest.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Core\Repository\Values\Content;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values\URLAliasList;
-use eZ\Publish\API\Repository\Values\Content;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class URLAliasListTest extends ValueObjectVisitorBaseTest
 {
@@ -114,7 +114,7 @@ public function testURLAliasListVisitsChildren()
     /**
      * Get the URLAliasList visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\URLAliasList
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\URLAliasList
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/URLAliasRefListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/URLAliasRefListTest.php
index 5492e6ab..d9b5bbf4 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/URLAliasRefListTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/URLAliasRefListTest.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Contracts\Core\Repository\Values\Content\URLAlias;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values\URLAliasRefList;
-use eZ\Publish\API\Repository\Values\Content\URLAlias;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class URLAliasRefListTest extends ValueObjectVisitorBaseTest
 {
@@ -101,7 +101,7 @@ public function testUrlAliasMediaTypeCorrect(\DOMDocument $dom)
     /**
      * Get the URLAliasRefList visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\URLAliasRefList
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\URLAliasRefList
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/URLAliasTest.php b/tests/lib/Server/Output/ValueObjectVisitor/URLAliasTest.php
index 87c041da..c3c20607 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/URLAliasTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/URLAliasTest.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Core\Repository\Values\Content;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
-use eZ\Publish\API\Repository\Values\Content;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class URLAliasTest extends ValueObjectVisitorBaseTest
 {
@@ -248,7 +248,7 @@ public function testResultContainsCustomValueElement($result)
     /**
      * Get the URLAlias visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\URLAlias
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\URLAlias
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/URLWildcardListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/URLWildcardListTest.php
index af6d31d7..4f804f07 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/URLWildcardListTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/URLWildcardListTest.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Core\Repository\Values\Content;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values\URLWildcardList;
-use eZ\Publish\API\Repository\Values\Content;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class URLWildcardListTest extends ValueObjectVisitorBaseTest
 {
@@ -119,7 +119,7 @@ public function testURLWildcardListVisitsChildren()
     /**
      * Get the URLWildcardList visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\URLWildcardList
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\URLWildcardList
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/URLWildcardTest.php b/tests/lib/Server/Output/ValueObjectVisitor/URLWildcardTest.php
index 5c04a2e7..801efa7d 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/URLWildcardTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/URLWildcardTest.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Core\Repository\Values\Content;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
-use eZ\Publish\API\Repository\Values\Content;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class URLWildcardTest extends ValueObjectVisitorBaseTest
 {
@@ -162,7 +162,7 @@ public function testResultContainsForwardValueElement($result)
     /**
      * Get the URLWildcard visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\URLWildcard
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\URLWildcard
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/UnauthorizedExceptionTest.php b/tests/lib/Server/Output/ValueObjectVisitor/UnauthorizedExceptionTest.php
index 315c638a..d539bf0f 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/UnauthorizedExceptionTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/UnauthorizedExceptionTest.php
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
+use Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
-use eZ\Publish\API\Repository\Exceptions\UnauthorizedException;
 
 class UnauthorizedExceptionTest extends ExceptionTest
 {
@@ -44,7 +44,7 @@ protected function getException()
     /**
      * Gets the exception visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\UnauthorizedException
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\UnauthorizedException
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/UserGroupListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/UserGroupListTest.php
index f0f61483..89947260 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/UserGroupListTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/UserGroupListTest.php
@@ -1,19 +1,19 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
+use Ibexa\Core\Repository\Values\Content\Content;
+use Ibexa\Core\Repository\Values\Content\Location;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
-use Ibexa\Rest\Server\Values\UserGroupList;
 use Ibexa\Rest\Server\Values\RestUserGroup;
-use eZ\Publish\API\Repository\Values\Content\ContentInfo;
-use eZ\Publish\Core\Repository\Values\Content\Content;
-use eZ\Publish\Core\Repository\Values\Content\Location;
+use Ibexa\Rest\Server\Values\UserGroupList;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class UserGroupListTest extends ValueObjectVisitorBaseTest
 {
@@ -138,7 +138,7 @@ public function testUserGroupListVisitsChildren()
     /**
      * Get the UserGroupList visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\UserGroupList
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\UserGroupList
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/UserGroupRefListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/UserGroupRefListTest.php
index 7e660e9e..d7f5c957 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/UserGroupRefListTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/UserGroupRefListTest.php
@@ -1,19 +1,19 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
-use eZ\Publish\Core\Repository\Values\User\UserGroup;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
+use Ibexa\Core\Repository\Values\Content\Location;
+use Ibexa\Core\Repository\Values\User\UserGroup;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
-use Ibexa\Rest\Server\Values\UserGroupRefList;
 use Ibexa\Rest\Server\Values\RestUserGroup;
-use eZ\Publish\API\Repository\Values\Content\ContentInfo;
-use eZ\Publish\Core\Repository\Values\Content\Location;
+use Ibexa\Rest\Server\Values\UserGroupRefList;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class UserGroupRefListTest extends ValueObjectVisitorBaseTest
 {
@@ -203,7 +203,7 @@ public function testSecondUserGroupUnassignMethodCorrect(\DOMDocument $dom)
     /**
      * Get the UserGroupRefList visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\UserGroupRefList
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\UserGroupRefList
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/UserListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/UserListTest.php
index 547a2013..bca04720 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/UserListTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/UserListTest.php
@@ -1,19 +1,19 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
+use Ibexa\Core\Repository\Values\Content\Content;
+use Ibexa\Core\Repository\Values\Content\Location;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
-use Ibexa\Rest\Server\Values\UserList;
 use Ibexa\Rest\Server\Values\RestUser;
-use eZ\Publish\API\Repository\Values\Content\ContentInfo;
-use eZ\Publish\Core\Repository\Values\Content\Content;
-use eZ\Publish\Core\Repository\Values\Content\Location;
+use Ibexa\Rest\Server\Values\UserList;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class UserListTest extends ValueObjectVisitorBaseTest
 {
@@ -138,7 +138,7 @@ public function testUserListVisitsChildren()
     /**
      * Get the UserList visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\UserList
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\UserList
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/UserRefListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/UserRefListTest.php
index 08c5ccab..1c8d230f 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/UserRefListTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/UserRefListTest.php
@@ -1,19 +1,19 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
-use eZ\Publish\Core\Repository\Values\User\User;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
+use Ibexa\Core\Repository\Values\Content\Location;
+use Ibexa\Core\Repository\Values\User\User;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
-use Ibexa\Rest\Server\Values\UserRefList;
 use Ibexa\Rest\Server\Values\RestUser;
-use eZ\Publish\API\Repository\Values\Content\ContentInfo;
-use eZ\Publish\Core\Repository\Values\Content\Location;
+use Ibexa\Rest\Server\Values\UserRefList;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class UserRefListTest extends ValueObjectVisitorBaseTest
 {
@@ -111,7 +111,7 @@ public function testUserMediaTypeCorrect(\DOMDocument $dom)
     /**
      * Get the UserRefList visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\UserRefList
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\UserRefList
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/UserSessionCreatedTest.php b/tests/lib/Server/Output/ValueObjectVisitor/UserSessionCreatedTest.php
index 01e3711a..ccc6914e 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/UserSessionCreatedTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/UserSessionCreatedTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/UserSessionTest.php b/tests/lib/Server/Output/ValueObjectVisitor/UserSessionTest.php
index f4d11ce0..21c19e64 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/UserSessionTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/UserSessionTest.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\API\Repository\Values\User\User;
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Contracts\Core\Repository\Values\User\User;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class UserSessionTest extends ValueObjectVisitorBaseTest
 {
@@ -229,7 +229,7 @@ public function testResultContainsUserAttributes($result)
     /**
      * Get the Session visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\UserSession
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\UserSession
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/VersionInfoTest.php b/tests/lib/Server/Output/ValueObjectVisitor/VersionInfoTest.php
index 03429985..b6d94dda 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/VersionInfoTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/VersionInfoTest.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
+use Ibexa\Core\Repository\Values\Content;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
-use eZ\Publish\Core\Repository\Values\Content;
-use eZ\Publish\API\Repository\Values\Content\ContentInfo;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class VersionInfoTest extends ValueObjectVisitorBaseTest
 {
@@ -276,7 +276,7 @@ public function testVersionInfoContentElement($result)
     /**
      * Get the VersionInfo visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\VersionInfo
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\VersionInfo
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/VersionListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/VersionListTest.php
index 63b2d744..771978e0 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/VersionListTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/VersionListTest.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
+use Ibexa\Core\Repository\Values\Content\VersionInfo;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 use Ibexa\Rest\Server\Values\VersionList;
-use eZ\Publish\API\Repository\Values\Content\ContentInfo;
-use eZ\Publish\Core\Repository\Values\Content\VersionInfo;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class VersionListTest extends ValueObjectVisitorBaseTest
 {
@@ -136,7 +136,7 @@ public function testVersionListVisitsChildren()
 
         $this->getVisitorMock()->expects($this->exactly(2))
             ->method('visitValueObject')
-            ->with($this->isInstanceOf(\eZ\Publish\API\Repository\Values\Content\VersionInfo::class));
+            ->with($this->isInstanceOf(\Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo::class));
 
         $visitor->visit(
             $this->getVisitorMock(),
@@ -148,7 +148,7 @@ public function testVersionListVisitsChildren()
     /**
      * Get the VersionList visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\VersionList
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\VersionList
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Output/ValueObjectVisitor/VersionTest.php b/tests/lib/Server/Output/ValueObjectVisitor/VersionTest.php
index cb9e6107..ae4cb635 100644
--- a/tests/lib/Server/Output/ValueObjectVisitor/VersionTest.php
+++ b/tests/lib/Server/Output/ValueObjectVisitor/VersionTest.php
@@ -1,20 +1,20 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
 use Ibexa\Contracts\Rest\Output\Generator;
-use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
+use Ibexa\Core\Repository\Values;
+use Ibexa\Rest\Output\FieldTypeSerializer;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
-use eZ\Publish\Core\Repository\Values;
 use Ibexa\Rest\Server\Values\Version;
-use eZ\Publish\API\Repository\Values\Content\Field;
-use eZ\Publish\API\Repository\Values\Content\ContentInfo;
-use Ibexa\Rest\Output\FieldTypeSerializer;
+use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest;
 
 class VersionTest extends ValueObjectVisitorBaseTest
 {
@@ -174,7 +174,7 @@ public function testResultContainsFieldsChildren($result)
     /**
      * Get the Version visitor.
      *
-     * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\Version
+     * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\Version
      */
     protected function internalGetVisitor()
     {
diff --git a/tests/lib/Server/Security/CsrfTokenManagerTest.php b/tests/lib/Server/Security/CsrfTokenManagerTest.php
index d2b5e4c7..610472e8 100644
--- a/tests/lib/Server/Security/CsrfTokenManagerTest.php
+++ b/tests/lib/Server/Security/CsrfTokenManagerTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Security;
@@ -15,10 +15,11 @@
 
 class CsrfTokenManagerTest extends TestCase
 {
-    const CSRF_TOKEN_INTENTION = 'csrf';
+    public const CSRF_TOKEN_INTENTION = 'csrf';
 
     /** @var \PHPUnit\Framework\MockObject\MockObject|\Symfony\Component\Security\Csrf\TokenStorage\TokenStorageInterface */
     private $tokenStorage;
+
     /** @var \PHPUnit\Framework\MockObject\MockObject|\Symfony\Component\HttpFoundation\RequestStack */
     private $requestStack;
 
diff --git a/tests/lib/Server/Security/RestLogoutHandlerTest.php b/tests/lib/Server/Security/RestLogoutHandlerTest.php
index 197b8db2..2577d28c 100644
--- a/tests/lib/Server/Security/RestLogoutHandlerTest.php
+++ b/tests/lib/Server/Security/RestLogoutHandlerTest.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Security;
 
-use eZ\Publish\Core\MVC\ConfigResolverInterface;
+use Ibexa\Core\MVC\ConfigResolverInterface;
 use Ibexa\Rest\Server\Security\RestLogoutHandler;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/tests/lib/Server/Security/RestSessionBasedAuthenticatorTest.php b/tests/lib/Server/Security/RestSessionBasedAuthenticatorTest.php
index 18101ad5..411c8ca6 100644
--- a/tests/lib/Server/Security/RestSessionBasedAuthenticatorTest.php
+++ b/tests/lib/Server/Security/RestSessionBasedAuthenticatorTest.php
@@ -1,15 +1,17 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\Server\Security;
 
-use eZ\Publish\API\Repository\Values\User\User;
-use eZ\Publish\Core\MVC\ConfigResolverInterface;
+use Ibexa\Contracts\Core\Repository\Values\User\User;
+use Ibexa\Core\MVC\ConfigResolverInterface;
+use Ibexa\Core\MVC\Symfony\Security\User as EzUser;
+use Ibexa\Rest\Server\Exceptions\InvalidUserTypeException;
+use Ibexa\Rest\Server\Exceptions\UserConflictException;
 use Ibexa\Rest\Server\Security\RestAuthenticator;
-use eZ\Publish\Core\MVC\Symfony\Security\User as EzUser;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -17,22 +19,20 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
+use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
+use Symfony\Component\Security\Core\Exception\TokenNotFoundException;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
 use Symfony\Component\Security\Http\Logout\LogoutHandlerInterface;
 use Symfony\Component\Security\Http\Logout\SessionLogoutHandler;
 use Symfony\Component\Security\Http\SecurityEvents;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface;
-use Symfony\Component\Security\Core\Exception\TokenNotFoundException;
-use Ibexa\Rest\Server\Exceptions\InvalidUserTypeException;
-use Ibexa\Rest\Server\Exceptions\UserConflictException;
 
 class RestSessionBasedAuthenticatorTest extends TestCase
 {
-    const PROVIDER_KEY = 'test_key';
+    public const PROVIDER_KEY = 'test_key';
 
     /**
      * @var \PHPUnit\Framework\MockObject\MockObject
@@ -60,7 +60,7 @@ class RestSessionBasedAuthenticatorTest extends TestCase
     private $logger;
 
     /**
-     * @var \EzSystems\EzPlatformRest\Server\Security\RestAuthenticator
+     * @var \Ibexa\Rest\Server\Security\RestAuthenticator
      */
     private $authenticator;
 
@@ -203,7 +203,7 @@ public function testAuthenticateInvalidUser()
     /**
      * @param $userId
      *
-     * @return EzUser
+     * @return \Ibexa\Core\MVC\Symfony\Security\User
      */
     private function createUser($userId)
     {
diff --git a/tests/lib/Server/Security/SecurityListenerTest.php b/tests/lib/Server/Security/SecurityListenerTest.php
index 1e3ea2cf..8f413ad9 100644
--- a/tests/lib/Server/Security/SecurityListenerTest.php
+++ b/tests/lib/Server/Security/SecurityListenerTest.php
@@ -1,25 +1,25 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 declare(strict_types=1);
 
 namespace Ibexa\Tests\Rest\Server\Security;
 
-use eZ\Publish\API\Repository\PermissionResolver;
-use eZ\Publish\API\Repository\Values\User\User;
-use eZ\Publish\Core\MVC\Symfony\Security\UserInterface;
-use Lexik\Bundle\JWTAuthenticationBundle\Security\Authentication\Token\JWTUserToken;
+use Ibexa\Contracts\Core\Repository\PermissionResolver;
+use Ibexa\Contracts\Core\Repository\Values\User\User;
+use Ibexa\Core\MVC\Symfony\Security\UserInterface;
 use Ibexa\Rest\Server\Security\EventListener\SecurityListener;
+use Lexik\Bundle\JWTAuthenticationBundle\Security\Authentication\Token\JWTUserToken;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
 
 class SecurityListenerTest extends TestCase
 {
-    /** @var \eZ\Publish\API\Repository\PermissionResolver|\PHPUnit\Framework\MockObject\MockObject */
+    /** @var \Ibexa\Contracts\Core\Repository\PermissionResolver|\PHPUnit\Framework\MockObject\MockObject */
     private $permissionResolver;
 
     protected function setUp(): void
diff --git a/tests/lib/UrlHandler/PatternTest.php b/tests/lib/UrlHandler/PatternTest.php
index 71b61ea3..9020486e 100644
--- a/tests/lib/UrlHandler/PatternTest.php
+++ b/tests/lib/UrlHandler/PatternTest.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 namespace Ibexa\Tests\Rest\UrlHandler;
 
-use eZ\Publish\API\Repository\Exceptions\InvalidArgumentException;
+use Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException;
 use Ibexa\Rest\RequestParser\Pattern;
 use PHPUnit\Framework\TestCase;
 
@@ -198,7 +198,7 @@ public function testGenerateUrl($type, $url, $values)
     /**
      * Returns the URL handler.
      *
-     * @return \EzSystems\EzPlatformRest\RequestParser\Pattern
+     * @return \Ibexa\Rest\RequestParser\Pattern
      */
     protected function getWorkingUrlHandler()
     {