diff --git a/composer.json b/composer.json
index ab755bc..891bc0e 100644
--- a/composer.json
+++ b/composer.json
@@ -42,15 +42,13 @@
         "psr-4": {
             "Ibexa\\HttpCache\\": "src/lib/",
             "Ibexa\\Bundle\\HttpCache\\": "src/bundle/",
-            "Ibexa\\Contracts\\HttpCache\\": "src/contracts/",
-            "EzSystems\\PlatformHttpCacheBundle\\": "src/bundle/"
+            "Ibexa\\Contracts\\HttpCache\\": "src/contracts/"
         }
     },
     "autoload-dev": {
         "psr-4": {
             "Ibexa\\Tests\\HttpCache\\": "tests/lib/",
-            "Ibexa\\Tests\\Bundle\\HttpCache\\": "tests/bundle/",
-            "EzSystems\\PlatformHttpCacheBundle\\Tests\\": "tests"
+            "Ibexa\\Tests\\Bundle\\HttpCache\\": "tests/bundle/"
         }
     },
     "scripts": {
diff --git a/features/setup/symfonyCache.feature b/features/setup/symfonyCache.feature
index 1827b25..2164b2c 100644
--- a/features/setup/symfonyCache.feature
+++ b/features/setup/symfonyCache.feature
@@ -21,7 +21,7 @@ index 9982c21..03ac40a 100644
  <?php
  
  use App\Kernel;
-+use EzSystems\PlatformHttpCacheBundle\AppCache;
++use Ibexa\Bundle\HttpCache\AppCache;
 +use Symfony\Component\HttpFoundation\Request;
  
  require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
diff --git a/src/bundle/AppCache.php b/src/bundle/AppCache.php
index 26af836..e55e158 100644
--- a/src/bundle/AppCache.php
+++ b/src/bundle/AppCache.php
@@ -116,5 +116,3 @@ protected function cleanupHeadersForProd(Response $response)
         }
     }
 }
-
-class_alias(AppCache::class, 'EzSystems\PlatformHttpCacheBundle\AppCache');
diff --git a/src/bundle/Controller/InvalidateTokenController.php b/src/bundle/Controller/InvalidateTokenController.php
index 37d9aba..587277e 100644
--- a/src/bundle/Controller/InvalidateTokenController.php
+++ b/src/bundle/Controller/InvalidateTokenController.php
@@ -80,5 +80,3 @@ public function tokenAction(Request $request)
         return $response;
     }
 }
-
-class_alias(InvalidateTokenController::class, 'EzSystems\PlatformHttpCacheBundle\Controller\InvalidateTokenController');
diff --git a/src/bundle/DependencyInjection/Compiler/DriverPass.php b/src/bundle/DependencyInjection/Compiler/DriverPass.php
index 50e388e..7f94090 100644
--- a/src/bundle/DependencyInjection/Compiler/DriverPass.php
+++ b/src/bundle/DependencyInjection/Compiler/DriverPass.php
@@ -70,5 +70,3 @@ public static function getTaggedService(ContainerBuilder $container, $tag)
         return $configuredTagHandlerServiceId;
     }
 }
-
-class_alias(DriverPass::class, 'EzSystems\PlatformHttpCacheBundle\DependencyInjection\Compiler\DriverPass');
diff --git a/src/bundle/DependencyInjection/Compiler/KernelPass.php b/src/bundle/DependencyInjection/Compiler/KernelPass.php
index 7bede9a..9653d93 100644
--- a/src/bundle/DependencyInjection/Compiler/KernelPass.php
+++ b/src/bundle/DependencyInjection/Compiler/KernelPass.php
@@ -93,5 +93,3 @@ protected function isCachePurger($id)
         return strpos($id, 'ezpublish.http_cache.purger.') === 0;
     }
 }
-
-class_alias(KernelPass::class, 'EzSystems\PlatformHttpCacheBundle\DependencyInjection\Compiler\KernelPass');
diff --git a/src/bundle/DependencyInjection/Compiler/ResponseTaggersPass.php b/src/bundle/DependencyInjection/Compiler/ResponseTaggersPass.php
index 0741b31..3f2dc3f 100644
--- a/src/bundle/DependencyInjection/Compiler/ResponseTaggersPass.php
+++ b/src/bundle/DependencyInjection/Compiler/ResponseTaggersPass.php
@@ -34,5 +34,3 @@ public function process(ContainerBuilder $container)
         $dispatcher->replaceArgument(0, $taggers);
     }
 }
-
-class_alias(ResponseTaggersPass::class, 'EzSystems\PlatformHttpCacheBundle\DependencyInjection\Compiler\ResponseTaggersPass');
diff --git a/src/bundle/DependencyInjection/Compiler/VarnishCachePass.php b/src/bundle/DependencyInjection/Compiler/VarnishCachePass.php
index 5e699fe..10d2be3 100644
--- a/src/bundle/DependencyInjection/Compiler/VarnishCachePass.php
+++ b/src/bundle/DependencyInjection/Compiler/VarnishCachePass.php
@@ -40,5 +40,3 @@ private function processVarnishProxyClientSettings(ContainerBuilder $container)
         );
     }
 }
-
-class_alias(VarnishCachePass::class, 'EzSystems\PlatformHttpCacheBundle\DependencyInjection\Compiler\VarnishCachePass');
diff --git a/src/bundle/DependencyInjection/ConfigResolver/HttpCacheConfigParser.php b/src/bundle/DependencyInjection/ConfigResolver/HttpCacheConfigParser.php
index fca28e7..6391406 100644
--- a/src/bundle/DependencyInjection/ConfigResolver/HttpCacheConfigParser.php
+++ b/src/bundle/DependencyInjection/ConfigResolver/HttpCacheConfigParser.php
@@ -97,5 +97,3 @@ private function getExtraConfigParsers()
         return $this->httpCacheExtension->getExtraConfigParsers();
     }
 }
-
-class_alias(HttpCacheConfigParser::class, 'EzSystems\PlatformHttpCacheBundle\DependencyInjection\ConfigResolver\HttpCacheConfigParser');
diff --git a/src/bundle/DependencyInjection/Configuration.php b/src/bundle/DependencyInjection/Configuration.php
index a195422..14ec118 100644
--- a/src/bundle/DependencyInjection/Configuration.php
+++ b/src/bundle/DependencyInjection/Configuration.php
@@ -25,5 +25,3 @@ public function getConfigTreeBuilder()
         return new TreeBuilder('ibexa_http_cache');
     }
 }
-
-class_alias(Configuration::class, 'EzSystems\PlatformHttpCacheBundle\DependencyInjection\Configuration');
diff --git a/src/bundle/DependencyInjection/IbexaHttpCacheExtension.php b/src/bundle/DependencyInjection/IbexaHttpCacheExtension.php
index b67e334..f7bba60 100644
--- a/src/bundle/DependencyInjection/IbexaHttpCacheExtension.php
+++ b/src/bundle/DependencyInjection/IbexaHttpCacheExtension.php
@@ -77,5 +77,3 @@ public function getExtraConfigParsers()
         return $this->extraConfigParsers;
     }
 }
-
-class_alias(IbexaHttpCacheExtension::class, 'EzSystems\PlatformHttpCacheBundle\DependencyInjection\EzPlatformHttpCacheExtension');
diff --git a/src/bundle/IbexaHttpCacheBundle.php b/src/bundle/IbexaHttpCacheBundle.php
index 7cb54ec..94bb4f2 100644
--- a/src/bundle/IbexaHttpCacheBundle.php
+++ b/src/bundle/IbexaHttpCacheBundle.php
@@ -67,5 +67,3 @@ public function registerConfigParser(ContainerBuilder $container)
         );
     }
 }
-
-class_alias(IbexaHttpCacheBundle::class, 'EzSystems\PlatformHttpCacheBundle\EzSystemsPlatformHttpCacheBundle');
diff --git a/src/contracts/Handler/ContentTagInterface.php b/src/contracts/Handler/ContentTagInterface.php
index 5ad048d..230ccd2 100644
--- a/src/contracts/Handler/ContentTagInterface.php
+++ b/src/contracts/Handler/ContentTagInterface.php
@@ -83,5 +83,3 @@ public function addRelationLocationTags(array $locationIds);
      */
     public function addContentTypeTags(array $contentTypeIds);
 }
-
-class_alias(ContentTagInterface::class, 'EzSystems\PlatformHttpCacheBundle\Handler\ContentTagInterface');
diff --git a/src/contracts/PurgeClient/PurgeClientInterface.php b/src/contracts/PurgeClient/PurgeClientInterface.php
index 4f14983..67a4f5a 100644
--- a/src/contracts/PurgeClient/PurgeClientInterface.php
+++ b/src/contracts/PurgeClient/PurgeClientInterface.php
@@ -28,5 +28,3 @@ public function purge(array $tags): void;
      */
     public function purgeAll(): void;
 }
-
-class_alias(PurgeClientInterface::class, 'EzSystems\PlatformHttpCacheBundle\PurgeClient\PurgeClientInterface');
diff --git a/src/contracts/ResponseTagger/ResponseTagger.php b/src/contracts/ResponseTagger/ResponseTagger.php
index 143e855..9e251cc 100644
--- a/src/contracts/ResponseTagger/ResponseTagger.php
+++ b/src/contracts/ResponseTagger/ResponseTagger.php
@@ -19,5 +19,3 @@ interface ResponseTagger
      */
     public function tag($value);
 }
-
-class_alias(ResponseTagger::class, 'EzSystems\PlatformHttpCacheBundle\ResponseTagger\ResponseTagger');
diff --git a/src/lib/ContextProvider/RoleIdentify.php b/src/lib/ContextProvider/RoleIdentify.php
index db591f7..acd5c48 100644
--- a/src/lib/ContextProvider/RoleIdentify.php
+++ b/src/lib/ContextProvider/RoleIdentify.php
@@ -78,5 +78,3 @@ static function (Repository $repository) use ($user) {
         $context->addParameter('roleLimitationList', $limitationValues);
     }
 }
-
-class_alias(RoleIdentify::class, 'EzSystems\PlatformHttpCacheBundle\ContextProvider\RoleIdentify');
diff --git a/src/lib/EventListener/ConditionallyRemoveVaryHeaderListener.php b/src/lib/EventListener/ConditionallyRemoveVaryHeaderListener.php
index 0b20c05..d8853a7 100644
--- a/src/lib/EventListener/ConditionallyRemoveVaryHeaderListener.php
+++ b/src/lib/EventListener/ConditionallyRemoveVaryHeaderListener.php
@@ -79,5 +79,3 @@ public static function getSubscribedEvents()
         ];
     }
 }
-
-class_alias(ConditionallyRemoveVaryHeaderListener::class, 'EzSystems\PlatformHttpCacheBundle\EventListener\ConditionallyRemoveVaryHeaderListener');
diff --git a/src/lib/EventSubscriber/CachePurge/AbstractSubscriber.php b/src/lib/EventSubscriber/CachePurge/AbstractSubscriber.php
index 2df7004..ce222fd 100644
--- a/src/lib/EventSubscriber/CachePurge/AbstractSubscriber.php
+++ b/src/lib/EventSubscriber/CachePurge/AbstractSubscriber.php
@@ -93,5 +93,3 @@ public function getContentUrlTags(int $urlId): array
         return $tags;
     }
 }
-
-class_alias(AbstractSubscriber::class, 'EzSystems\PlatformHttpCacheBundle\EventSubscriber\CachePurge\AbstractSubscriber');
diff --git a/src/lib/EventSubscriber/CachePurge/ContentEventsSubscriber.php b/src/lib/EventSubscriber/CachePurge/ContentEventsSubscriber.php
index be75444..f804c5a 100644
--- a/src/lib/EventSubscriber/CachePurge/ContentEventsSubscriber.php
+++ b/src/lib/EventSubscriber/CachePurge/ContentEventsSubscriber.php
@@ -194,5 +194,3 @@ private function isContentTypeFullyTranslatable(ContentType $contentType): bool
         });
     }
 }
-
-class_alias(ContentEventsSubscriber::class, 'EzSystems\PlatformHttpCacheBundle\EventSubscriber\CachePurge\ContentEventsSubscriber');
diff --git a/src/lib/EventSubscriber/CachePurge/ContentTypeEventsSubscriber.php b/src/lib/EventSubscriber/CachePurge/ContentTypeEventsSubscriber.php
index a92ac85..c73b07a 100644
--- a/src/lib/EventSubscriber/CachePurge/ContentTypeEventsSubscriber.php
+++ b/src/lib/EventSubscriber/CachePurge/ContentTypeEventsSubscriber.php
@@ -89,5 +89,3 @@ public function onUpdateContentTypeGroup(UpdateContentTypeGroupEvent $event): vo
         ]);
     }
 }
-
-class_alias(ContentTypeEventsSubscriber::class, 'EzSystems\PlatformHttpCacheBundle\EventSubscriber\CachePurge\ContentTypeEventsSubscriber');
diff --git a/src/lib/EventSubscriber/CachePurge/LocationEventsSubscriber.php b/src/lib/EventSubscriber/CachePurge/LocationEventsSubscriber.php
index 4479e1d..d6b3d3c 100644
--- a/src/lib/EventSubscriber/CachePurge/LocationEventsSubscriber.php
+++ b/src/lib/EventSubscriber/CachePurge/LocationEventsSubscriber.php
@@ -167,5 +167,3 @@ public function onUpdateLocation(UpdateLocationEvent $event): void
         $this->purgeClient->purge($tags);
     }
 }
-
-class_alias(LocationEventsSubscriber::class, 'EzSystems\PlatformHttpCacheBundle\EventSubscriber\CachePurge\LocationEventsSubscriber');
diff --git a/src/lib/EventSubscriber/CachePurge/ObjectStateEventsSubscriber.php b/src/lib/EventSubscriber/CachePurge/ObjectStateEventsSubscriber.php
index 5312d57..7697a8b 100644
--- a/src/lib/EventSubscriber/CachePurge/ObjectStateEventsSubscriber.php
+++ b/src/lib/EventSubscriber/CachePurge/ObjectStateEventsSubscriber.php
@@ -31,5 +31,3 @@ public function onSetContentState(SetContentStateEvent $event): void
         $this->purgeClient->purge($tags);
     }
 }
-
-class_alias(ObjectStateEventsSubscriber::class, 'EzSystems\PlatformHttpCacheBundle\EventSubscriber\CachePurge\ObjectStateEventsSubscriber');
diff --git a/src/lib/EventSubscriber/CachePurge/RoleEventsSubscriber.php b/src/lib/EventSubscriber/CachePurge/RoleEventsSubscriber.php
index 7c19970..a34d78a 100644
--- a/src/lib/EventSubscriber/CachePurge/RoleEventsSubscriber.php
+++ b/src/lib/EventSubscriber/CachePurge/RoleEventsSubscriber.php
@@ -35,5 +35,3 @@ public function clearUserContextHashCache(Event $event)
         ]);
     }
 }
-
-class_alias(RoleEventsSubscriber::class, 'EzSystems\PlatformHttpCacheBundle\EventSubscriber\CachePurge\RoleEventsSubscriber');
diff --git a/src/lib/EventSubscriber/CachePurge/SectionEventsSubscriber.php b/src/lib/EventSubscriber/CachePurge/SectionEventsSubscriber.php
index f114da7..879de91 100644
--- a/src/lib/EventSubscriber/CachePurge/SectionEventsSubscriber.php
+++ b/src/lib/EventSubscriber/CachePurge/SectionEventsSubscriber.php
@@ -73,5 +73,3 @@ public function onAssignSectionToSubtree(AssignSectionToSubtreeEvent $event): vo
         $this->purgeClient->purge($tags);
     }
 }
-
-class_alias(SectionEventsSubscriber::class, 'EzSystems\PlatformHttpCacheBundle\EventSubscriber\CachePurge\SectionEventsSubscriber');
diff --git a/src/lib/EventSubscriber/CachePurge/TranslationEventsSubscriber.php b/src/lib/EventSubscriber/CachePurge/TranslationEventsSubscriber.php
index 15db205..1e9f3c5 100644
--- a/src/lib/EventSubscriber/CachePurge/TranslationEventsSubscriber.php
+++ b/src/lib/EventSubscriber/CachePurge/TranslationEventsSubscriber.php
@@ -31,5 +31,3 @@ public function onDeleteTranslation(DeleteTranslationEvent $event): void
         $this->purgeClient->purge($tags);
     }
 }
-
-class_alias(TranslationEventsSubscriber::class, 'EzSystems\PlatformHttpCacheBundle\EventSubscriber\CachePurge\TranslationEventsSubscriber');
diff --git a/src/lib/EventSubscriber/CachePurge/TrashEventsSubscriber.php b/src/lib/EventSubscriber/CachePurge/TrashEventsSubscriber.php
index 369a754..20d3f70 100644
--- a/src/lib/EventSubscriber/CachePurge/TrashEventsSubscriber.php
+++ b/src/lib/EventSubscriber/CachePurge/TrashEventsSubscriber.php
@@ -49,5 +49,3 @@ public function onRecover(RecoverEvent $event): void
         $this->purgeClient->purge($tags);
     }
 }
-
-class_alias(TrashEventsSubscriber::class, 'EzSystems\PlatformHttpCacheBundle\EventSubscriber\CachePurge\TrashEventsSubscriber');
diff --git a/src/lib/EventSubscriber/CachePurge/UrlEventsSubscriber.php b/src/lib/EventSubscriber/CachePurge/UrlEventsSubscriber.php
index 398b58f..19e3e8f 100644
--- a/src/lib/EventSubscriber/CachePurge/UrlEventsSubscriber.php
+++ b/src/lib/EventSubscriber/CachePurge/UrlEventsSubscriber.php
@@ -30,5 +30,3 @@ public function onUrlUpdate(UpdateUrlEvent $event): void
         }
     }
 }
-
-class_alias(UrlEventsSubscriber::class, 'EzSystems\PlatformHttpCacheBundle\EventSubscriber\CachePurge\UrlEventsSubscriber');
diff --git a/src/lib/EventSubscriber/CachePurge/UserEventsSubscriber.php b/src/lib/EventSubscriber/CachePurge/UserEventsSubscriber.php
index 3aebc50..b8b3a38 100644
--- a/src/lib/EventSubscriber/CachePurge/UserEventsSubscriber.php
+++ b/src/lib/EventSubscriber/CachePurge/UserEventsSubscriber.php
@@ -102,5 +102,3 @@ public function onUpdateUser(UpdateUserEvent $event): void
         $this->purgeClient->purge($tags);
     }
 }
-
-class_alias(UserEventsSubscriber::class, 'EzSystems\PlatformHttpCacheBundle\EventSubscriber\CachePurge\UserEventsSubscriber');
diff --git a/src/lib/EventSubscriber/HiddenLocationExceptionSubscriber.php b/src/lib/EventSubscriber/HiddenLocationExceptionSubscriber.php
index e80f106..4800663 100644
--- a/src/lib/EventSubscriber/HiddenLocationExceptionSubscriber.php
+++ b/src/lib/EventSubscriber/HiddenLocationExceptionSubscriber.php
@@ -49,5 +49,3 @@ public function tagHiddenLocationExceptionResponse(ExceptionEvent $event)
         $this->contentInfoTagger->tag($location->getContentInfo());
     }
 }
-
-class_alias(HiddenLocationExceptionSubscriber::class, 'EzSystems\PlatformHttpCacheBundle\EventSubscriber\HiddenLocationExceptionSubscriber');
diff --git a/src/lib/EventSubscriber/HttpCacheResponseSubscriber.php b/src/lib/EventSubscriber/HttpCacheResponseSubscriber.php
index 9e89e21..5c687a9 100644
--- a/src/lib/EventSubscriber/HttpCacheResponseSubscriber.php
+++ b/src/lib/EventSubscriber/HttpCacheResponseSubscriber.php
@@ -55,5 +55,3 @@ public function configureCache(ResponseEvent $event)
         // NB!: FOSHTTPCacheBundle is taking care about writing the tags in own tag handler happening with priority 0
     }
 }
-
-class_alias(HttpCacheResponseSubscriber::class, 'EzSystems\PlatformHttpCacheBundle\EventSubscriber\HttpCacheResponseSubscriber');
diff --git a/src/lib/EventSubscriber/RequestEventSubscriber.php b/src/lib/EventSubscriber/RequestEventSubscriber.php
index 518684a..bf8f429 100644
--- a/src/lib/EventSubscriber/RequestEventSubscriber.php
+++ b/src/lib/EventSubscriber/RequestEventSubscriber.php
@@ -48,5 +48,3 @@ public function onKernelRequestForward(RequestEvent $event): void
         }
     }
 }
-
-class_alias(RequestEventSubscriber::class, 'EzSystems\PlatformHttpCacheBundle\EventSubscriber\RequestEventSubscriber');
diff --git a/src/lib/EventSubscriber/RestKernelViewSubscriber.php b/src/lib/EventSubscriber/RestKernelViewSubscriber.php
index 98abf72..d5bf3e5 100644
--- a/src/lib/EventSubscriber/RestKernelViewSubscriber.php
+++ b/src/lib/EventSubscriber/RestKernelViewSubscriber.php
@@ -109,5 +109,3 @@ protected function getTags($value)
         return $tags;
     }
 }
-
-class_alias(RestKernelViewSubscriber::class, 'EzSystems\PlatformHttpCacheBundle\EventSubscriber\RestKernelViewSubscriber');
diff --git a/src/lib/EventSubscriber/UserContextSiteAccessMatchSubscriber.php b/src/lib/EventSubscriber/UserContextSiteAccessMatchSubscriber.php
index a2d2b3f..6f9d05d 100644
--- a/src/lib/EventSubscriber/UserContextSiteAccessMatchSubscriber.php
+++ b/src/lib/EventSubscriber/UserContextSiteAccessMatchSubscriber.php
@@ -50,5 +50,3 @@ public function checkIfRequestForUserContextHash(RequestEvent $event)
         $this->innerSubscriber->onKernelRequest($event);
     }
 }
-
-class_alias(UserContextSiteAccessMatchSubscriber::class, 'EzSystems\PlatformHttpCacheBundle\EventSubscriber\UserContextSiteAccessMatchSubscriber');
diff --git a/src/lib/EventSubscriber/UserContextSubscriber.php b/src/lib/EventSubscriber/UserContextSubscriber.php
index 09db11b..2d5c832 100644
--- a/src/lib/EventSubscriber/UserContextSubscriber.php
+++ b/src/lib/EventSubscriber/UserContextSubscriber.php
@@ -68,5 +68,3 @@ public function tagUserContext(ResponseEvent $event)
         $response->headers->set($this->tagHeader, $this->prefixService->getRepositoryPrefix() . 'ez-user-context-hash');
     }
 }
-
-class_alias(UserContextSubscriber::class, 'EzSystems\PlatformHttpCacheBundle\EventSubscriber\UserContextSubscriber');
diff --git a/src/lib/EventSubscriber/XLocationIdResponseSubscriber.php b/src/lib/EventSubscriber/XLocationIdResponseSubscriber.php
index ed88497..5b4e013 100644
--- a/src/lib/EventSubscriber/XLocationIdResponseSubscriber.php
+++ b/src/lib/EventSubscriber/XLocationIdResponseSubscriber.php
@@ -90,5 +90,3 @@ public function rewriteCacheHeader(ResponseEvent $event)
         $response->headers->remove(static::LOCATION_ID_HEADER);
     }
 }
-
-class_alias(XLocationIdResponseSubscriber::class, 'EzSystems\PlatformHttpCacheBundle\EventSubscriber\XLocationIdResponseSubscriber');
diff --git a/src/lib/Handler/TagHandler.php b/src/lib/Handler/TagHandler.php
index 4dee668..409b1b4 100644
--- a/src/lib/Handler/TagHandler.php
+++ b/src/lib/Handler/TagHandler.php
@@ -191,5 +191,3 @@ public function addContentTypeTags(array $contentTypeIds)
         }, $contentTypeIds));
     }
 }
-
-class_alias(TagHandler::class, 'EzSystems\PlatformHttpCacheBundle\Handler\TagHandler');
diff --git a/src/lib/Proxy/UserContextListener.php b/src/lib/Proxy/UserContextListener.php
index d025bbd..a32528f 100644
--- a/src/lib/Proxy/UserContextListener.php
+++ b/src/lib/Proxy/UserContextListener.php
@@ -24,5 +24,3 @@ protected function cleanupHashLookupRequest(Request $hashLookupRequest, Request
         $hashLookupRequest->attributes->set('_ez_original_request', $originalRequest);
     }
 }
-
-class_alias(UserContextListener::class, 'EzSystems\PlatformHttpCacheBundle\Proxy\UserContextListener');
diff --git a/src/lib/ProxyClient/HttpDispatcherFactory.php b/src/lib/ProxyClient/HttpDispatcherFactory.php
index cd22d06..f586d70 100644
--- a/src/lib/ProxyClient/HttpDispatcherFactory.php
+++ b/src/lib/ProxyClient/HttpDispatcherFactory.php
@@ -62,5 +62,3 @@ public function buildHttpDispatcher(array $servers, string $baseUrl = '')
         return new $this->httpDispatcherClass($allServers, $baseUrl);
     }
 }
-
-class_alias(HttpDispatcherFactory::class, 'EzSystems\PlatformHttpCacheBundle\ProxyClient\HttpDispatcherFactory');
diff --git a/src/lib/ProxyClient/Varnish.php b/src/lib/ProxyClient/Varnish.php
index 2e18751..5c2164f 100644
--- a/src/lib/ProxyClient/Varnish.php
+++ b/src/lib/ProxyClient/Varnish.php
@@ -57,5 +57,3 @@ protected function queueRequest($method, $url, array $headers, $validateHost = t
         parent::queueRequest($method, $url, $this->fetchAndMergeAuthHeaders($headers), $body);
     }
 }
-
-class_alias(Varnish::class, 'EzSystems\PlatformHttpCacheBundle\ProxyClient\Varnish');
diff --git a/src/lib/PurgeClient/LocalPurgeClient.php b/src/lib/PurgeClient/LocalPurgeClient.php
index 9ff7441..64c6cb5 100644
--- a/src/lib/PurgeClient/LocalPurgeClient.php
+++ b/src/lib/PurgeClient/LocalPurgeClient.php
@@ -34,5 +34,3 @@ public function purgeAll(): void
         $this->cacheStore->invalidateTags(['ez-all']);
     }
 }
-
-class_alias(LocalPurgeClient::class, 'EzSystems\PlatformHttpCacheBundle\PurgeClient\LocalPurgeClient');
diff --git a/src/lib/PurgeClient/RepositoryPrefixDecorator.php b/src/lib/PurgeClient/RepositoryPrefixDecorator.php
index d9970ff..da3106e 100644
--- a/src/lib/PurgeClient/RepositoryPrefixDecorator.php
+++ b/src/lib/PurgeClient/RepositoryPrefixDecorator.php
@@ -53,5 +53,3 @@ public function purgeAll(): void
         $this->purgeClient->purgeAll();
     }
 }
-
-class_alias(RepositoryPrefixDecorator::class, 'EzSystems\PlatformHttpCacheBundle\PurgeClient\RepositoryPrefixDecorator');
diff --git a/src/lib/PurgeClient/VarnishPurgeClient.php b/src/lib/PurgeClient/VarnishPurgeClient.php
index 0248ea6..d3e5f15 100644
--- a/src/lib/PurgeClient/VarnishPurgeClient.php
+++ b/src/lib/PurgeClient/VarnishPurgeClient.php
@@ -34,5 +34,3 @@ public function purgeAll(): void
         $this->cacheManager->invalidateTags(['ez-all']);
     }
 }
-
-class_alias(VarnishPurgeClient::class, 'EzSystems\PlatformHttpCacheBundle\PurgeClient\VarnishPurgeClient');
diff --git a/src/lib/RepositoryTagPrefix.php b/src/lib/RepositoryTagPrefix.php
index 73a56ad..ebdf493 100644
--- a/src/lib/RepositoryTagPrefix.php
+++ b/src/lib/RepositoryTagPrefix.php
@@ -54,5 +54,3 @@ public function getRepositoryPrefix()
         return (string) (empty($repositoryIdentifier) ? '' : $this->repositoryMap[$repositoryIdentifier]);
     }
 }
-
-class_alias(RepositoryTagPrefix::class, 'EzSystems\PlatformHttpCacheBundle\RepositoryTagPrefix');
diff --git a/src/lib/ResponseConfigurator/ConfigurableResponseCacheConfigurator.php b/src/lib/ResponseConfigurator/ConfigurableResponseCacheConfigurator.php
index c2fc300..86a55b4 100644
--- a/src/lib/ResponseConfigurator/ConfigurableResponseCacheConfigurator.php
+++ b/src/lib/ResponseConfigurator/ConfigurableResponseCacheConfigurator.php
@@ -57,5 +57,3 @@ private function getDefaultTTL(): int
         return (int)$this->configResolver->getParameter('content.default_ttl');
     }
 }
-
-class_alias(ConfigurableResponseCacheConfigurator::class, 'EzSystems\PlatformHttpCacheBundle\ResponseConfigurator\ConfigurableResponseCacheConfigurator');
diff --git a/src/lib/ResponseConfigurator/ResponseCacheConfigurator.php b/src/lib/ResponseConfigurator/ResponseCacheConfigurator.php
index 9511250..efbc8b6 100644
--- a/src/lib/ResponseConfigurator/ResponseCacheConfigurator.php
+++ b/src/lib/ResponseConfigurator/ResponseCacheConfigurator.php
@@ -32,5 +32,3 @@ public function enableCache(Response $response);
      */
     public function setSharedMaxAge(Response $response);
 }
-
-class_alias(ResponseCacheConfigurator::class, 'EzSystems\PlatformHttpCacheBundle\ResponseConfigurator\ResponseCacheConfigurator');
diff --git a/src/lib/ResponseTagger/Delegator/ContentValueViewTagger.php b/src/lib/ResponseTagger/Delegator/ContentValueViewTagger.php
index a5b7322..b29124a 100644
--- a/src/lib/ResponseTagger/Delegator/ContentValueViewTagger.php
+++ b/src/lib/ResponseTagger/Delegator/ContentValueViewTagger.php
@@ -33,5 +33,3 @@ public function tag($view)
         $this->contentInfoTagger->tag($contentInfo);
     }
 }
-
-class_alias(ContentValueViewTagger::class, 'EzSystems\PlatformHttpCacheBundle\ResponseTagger\Delegator\ContentValueViewTagger');
diff --git a/src/lib/ResponseTagger/Delegator/DispatcherTagger.php b/src/lib/ResponseTagger/Delegator/DispatcherTagger.php
index d564ed1..b0e9e52 100644
--- a/src/lib/ResponseTagger/Delegator/DispatcherTagger.php
+++ b/src/lib/ResponseTagger/Delegator/DispatcherTagger.php
@@ -31,5 +31,3 @@ public function tag($value)
         }
     }
 }
-
-class_alias(DispatcherTagger::class, 'EzSystems\PlatformHttpCacheBundle\ResponseTagger\Delegator\DispatcherTagger');
diff --git a/src/lib/ResponseTagger/Delegator/LocationValueViewTagger.php b/src/lib/ResponseTagger/Delegator/LocationValueViewTagger.php
index 6593519..8559c49 100644
--- a/src/lib/ResponseTagger/Delegator/LocationValueViewTagger.php
+++ b/src/lib/ResponseTagger/Delegator/LocationValueViewTagger.php
@@ -32,5 +32,3 @@ public function tag($view)
         $this->locationTagger->tag($location);
     }
 }
-
-class_alias(LocationValueViewTagger::class, 'EzSystems\PlatformHttpCacheBundle\ResponseTagger\Delegator\LocationValueViewTagger');
diff --git a/src/lib/ResponseTagger/Value/AbstractValueTagger.php b/src/lib/ResponseTagger/Value/AbstractValueTagger.php
index 44ba30d..9b566da 100644
--- a/src/lib/ResponseTagger/Value/AbstractValueTagger.php
+++ b/src/lib/ResponseTagger/Value/AbstractValueTagger.php
@@ -20,5 +20,3 @@ public function __construct(FosResponseTagger $responseTagger)
         $this->responseTagger = $responseTagger;
     }
 }
-
-class_alias(AbstractValueTagger::class, 'EzSystems\PlatformHttpCacheBundle\ResponseTagger\Value\AbstractValueTagger');
diff --git a/src/lib/ResponseTagger/Value/ContentInfoTagger.php b/src/lib/ResponseTagger/Value/ContentInfoTagger.php
index a712758..ba1846d 100644
--- a/src/lib/ResponseTagger/Value/ContentInfoTagger.php
+++ b/src/lib/ResponseTagger/Value/ContentInfoTagger.php
@@ -28,5 +28,3 @@ public function tag($value)
         }
     }
 }
-
-class_alias(ContentInfoTagger::class, 'EzSystems\PlatformHttpCacheBundle\ResponseTagger\Value\ContentInfoTagger');
diff --git a/src/lib/ResponseTagger/Value/LocationTagger.php b/src/lib/ResponseTagger/Value/LocationTagger.php
index 75aea05..e5b9a03 100644
--- a/src/lib/ResponseTagger/Value/LocationTagger.php
+++ b/src/lib/ResponseTagger/Value/LocationTagger.php
@@ -33,5 +33,3 @@ static function ($pathItem) {
         );
     }
 }
-
-class_alias(LocationTagger::class, 'EzSystems\PlatformHttpCacheBundle\ResponseTagger\Value\LocationTagger');
diff --git a/src/lib/Twig/ContentTaggingExtension.php b/src/lib/Twig/ContentTaggingExtension.php
index 09af5bd..5d8a11e 100644
--- a/src/lib/Twig/ContentTaggingExtension.php
+++ b/src/lib/Twig/ContentTaggingExtension.php
@@ -121,5 +121,3 @@ public function tagHttpCacheForRelationLocationIds($locationIds)
         $this->contentTagHandler->addRelationLocationTags((array)$locationIds);
     }
 }
-
-class_alias(ContentTaggingExtension::class, 'EzSystems\PlatformHttpCacheBundle\Twig\ContentTaggingExtension');
diff --git a/tests/lib/ContextProvider/RoleIdentifyTest.php b/tests/lib/ContextProvider/RoleIdentifyTest.php
index 49f1c6d..7b45ec6 100644
--- a/tests/lib/ContextProvider/RoleIdentifyTest.php
+++ b/tests/lib/ContextProvider/RoleIdentifyTest.php
@@ -192,5 +192,3 @@ protected function getUserServiceMock()
             ->getMockForAbstractClass();
     }
 }
-
-class_alias(RoleIdentifyTest::class, 'EzSystems\PlatformHttpCacheBundle\Tests\ContextProvider\RoleIdentifyTest');
diff --git a/tests/lib/PurgeClient/LocalPurgeClientTest.php b/tests/lib/PurgeClient/LocalPurgeClientTest.php
index c2400fe..96734c4 100644
--- a/tests/lib/PurgeClient/LocalPurgeClientTest.php
+++ b/tests/lib/PurgeClient/LocalPurgeClientTest.php
@@ -40,5 +40,3 @@ static function ($id) {
         $purgeClient->purge($keys);
     }
 }
-
-class_alias(LocalPurgeClientTest::class, 'EzSystems\PlatformHttpCacheBundle\Tests\PurgeClient\LocalPurgeClientTest');
diff --git a/tests/lib/PurgeClient/RepositoryPrefixDecoratorTest.php b/tests/lib/PurgeClient/RepositoryPrefixDecoratorTest.php
index 787fce1..7ed6cdb 100644
--- a/tests/lib/PurgeClient/RepositoryPrefixDecoratorTest.php
+++ b/tests/lib/PurgeClient/RepositoryPrefixDecoratorTest.php
@@ -88,5 +88,3 @@ public function testPurgeAll()
         $this->prefixDecorator->purgeAll();
     }
 }
-
-class_alias(RepositoryPrefixDecoratorTest::class, 'EzSystems\PlatformHttpCacheBundle\Tests\PurgeClient\RepositoryPrefixDecoratorTest');
diff --git a/tests/lib/PurgeClient/VarnishPurgeClientTest.php b/tests/lib/PurgeClient/VarnishPurgeClientTest.php
index 033791a..03904be 100644
--- a/tests/lib/PurgeClient/VarnishPurgeClientTest.php
+++ b/tests/lib/PurgeClient/VarnishPurgeClientTest.php
@@ -88,5 +88,3 @@ public function testPurgeAll()
         $this->purgeClient->purgeAll();
     }
 }
-
-class_alias(VarnishPurgeClientTest::class, 'EzSystems\PlatformHttpCacheBundle\Tests\PurgeClient\VarnishPurgeClientTest');