diff --git a/composer.json b/composer.json
index bbd8992..657d21c 100644
--- a/composer.json
+++ b/composer.json
@@ -39,17 +39,13 @@
         "psr-4": {
             "Ibexa\\DesignEngine\\": "src/lib/",
             "Ibexa\\Bundle\\DesignEngine\\": "src/bundle/",
-            "Ibexa\\Contracts\\DesignEngine\\": "src/contracts/",
-            "EzSystems\\EzPlatformDesignEngine\\": "src/lib/",
-            "EzSystems\\EzPlatformDesignEngineBundle\\": "src/bundle/"
+            "Ibexa\\Contracts\\DesignEngine\\": "src/contracts/"
         }
     },
     "autoload-dev": {
         "psr-4": {
             "Ibexa\\Tests\\Bundle\\DesignEngine\\": "tests/bundle/",
-            "Ibexa\\Tests\\DesignEngine\\": "tests/lib/",
-            "EzSystems\\EzPlatformDesignEngine\\Tests\\": "tests/lib",
-            "EzSystems\\EzPlatformDesignEngineBundle\\Tests\\": "tests/bundle"
+            "Ibexa\\Tests\\DesignEngine\\": "tests/lib/"
         }
     },
     "scripts": {
diff --git a/src/bundle/DataCollector/TwigDataCollector.php b/src/bundle/DataCollector/TwigDataCollector.php
index 2a2477e..f506b8b 100644
--- a/src/bundle/DataCollector/TwigDataCollector.php
+++ b/src/bundle/DataCollector/TwigDataCollector.php
@@ -91,5 +91,3 @@ public function getProfile()
         return $profile;
     }
 }
-
-class_alias(TwigDataCollector::class, 'EzSystems\EzPlatformDesignEngineBundle\DataCollector\TwigDataCollector');
diff --git a/src/bundle/DependencyInjection/Compiler/AssetPathResolutionPass.php b/src/bundle/DependencyInjection/Compiler/AssetPathResolutionPass.php
index f0dcf9f..8b38f9f 100644
--- a/src/bundle/DependencyInjection/Compiler/AssetPathResolutionPass.php
+++ b/src/bundle/DependencyInjection/Compiler/AssetPathResolutionPass.php
@@ -49,5 +49,3 @@ private function preResolveAssetsPaths(AssetPathProvisionerInterface $provisione
         return $resolvedPathsByDesign;
     }
 }
-
-class_alias(AssetPathResolutionPass::class, 'EzSystems\EzPlatformDesignEngineBundle\DependencyInjection\Compiler\AssetPathResolutionPass');
diff --git a/src/bundle/DependencyInjection/Compiler/AssetThemePass.php b/src/bundle/DependencyInjection/Compiler/AssetThemePass.php
index 08d2db1..bcf8489 100644
--- a/src/bundle/DependencyInjection/Compiler/AssetThemePass.php
+++ b/src/bundle/DependencyInjection/Compiler/AssetThemePass.php
@@ -91,5 +91,3 @@ public function process(ContainerBuilder $container)
             ->addMethodCall('addPackage', [DesignAwareInterface::DESIGN_NAMESPACE, $container->findDefinition(ThemePackage::class)]);
     }
 }
-
-class_alias(AssetThemePass::class, 'EzSystems\EzPlatformDesignEngineBundle\DependencyInjection\Compiler\AssetThemePass');
diff --git a/src/bundle/DependencyInjection/Compiler/TwigThemePass.php b/src/bundle/DependencyInjection/Compiler/TwigThemePass.php
index ffea8ab..cddd5e4 100644
--- a/src/bundle/DependencyInjection/Compiler/TwigThemePass.php
+++ b/src/bundle/DependencyInjection/Compiler/TwigThemePass.php
@@ -108,5 +108,3 @@ public function process(ContainerBuilder $container)
         $twigDataCollector->addArgument(new Reference(TemplatePathRegistry::class));
     }
 }
-
-class_alias(TwigThemePass::class, 'EzSystems\EzPlatformDesignEngineBundle\DependencyInjection\Compiler\TwigThemePass');
diff --git a/src/bundle/DependencyInjection/Configuration.php b/src/bundle/DependencyInjection/Configuration.php
index 3b33b36..8518ab9 100644
--- a/src/bundle/DependencyInjection/Configuration.php
+++ b/src/bundle/DependencyInjection/Configuration.php
@@ -49,5 +49,3 @@ public function getConfigTreeBuilder()
         return $treeBuilder;
     }
 }
-
-class_alias(Configuration::class, 'EzSystems\EzPlatformDesignEngineBundle\DependencyInjection\Configuration');
diff --git a/src/bundle/DependencyInjection/DesignConfigParser.php b/src/bundle/DependencyInjection/DesignConfigParser.php
index b190aa6..7282e01 100644
--- a/src/bundle/DependencyInjection/DesignConfigParser.php
+++ b/src/bundle/DependencyInjection/DesignConfigParser.php
@@ -37,5 +37,3 @@ public function addSemanticConfig(NodeBuilder $nodeBuilder)
             ->end();
     }
 }
-
-class_alias(DesignConfigParser::class, 'EzSystems\EzPlatformDesignEngineBundle\DependencyInjection\DesignConfigParser');
diff --git a/src/bundle/DependencyInjection/IbexaDesignEngineExtension.php b/src/bundle/DependencyInjection/IbexaDesignEngineExtension.php
index 3a2dea2..cfae004 100644
--- a/src/bundle/DependencyInjection/IbexaDesignEngineExtension.php
+++ b/src/bundle/DependencyInjection/IbexaDesignEngineExtension.php
@@ -50,5 +50,3 @@ private function configureDesigns(array $config, ConfigurationProcessor $process
         $container->setParameter('ibexa.design.assets.resolution.disabled', $config['disable_assets_pre_resolution']);
     }
 }
-
-class_alias(IbexaDesignEngineExtension::class, 'EzSystems\EzPlatformDesignEngineBundle\DependencyInjection\EzPlatformDesignEngineExtension');
diff --git a/src/bundle/IbexaDesignEngineBundle.php b/src/bundle/IbexaDesignEngineBundle.php
index 59f3dcb..5cb7322 100644
--- a/src/bundle/IbexaDesignEngineBundle.php
+++ b/src/bundle/IbexaDesignEngineBundle.php
@@ -41,5 +41,3 @@ public function getContainerExtension()
         return $this->extension;
     }
 }
-
-class_alias(IbexaDesignEngineBundle::class, 'EzSystems\EzPlatformDesignEngineBundle\EzPlatformDesignEngineBundle');
diff --git a/src/contracts/DesignAwareInterface.php b/src/contracts/DesignAwareInterface.php
index 463e23e..5cad927 100644
--- a/src/contracts/DesignAwareInterface.php
+++ b/src/contracts/DesignAwareInterface.php
@@ -13,5 +13,3 @@ interface DesignAwareInterface
 
     public function getCurrentDesign(): ?string;
 }
-
-class_alias(DesignAwareInterface::class, 'EzSystems\EzPlatformDesignEngine\DesignAwareInterface');
diff --git a/src/lib/Asset/AssetPathProvisionerInterface.php b/src/lib/Asset/AssetPathProvisionerInterface.php
index b0a3e2b..a33f0a9 100644
--- a/src/lib/Asset/AssetPathProvisionerInterface.php
+++ b/src/lib/Asset/AssetPathProvisionerInterface.php
@@ -20,5 +20,3 @@ interface AssetPathProvisionerInterface
      */
     public function provisionResolvedPaths(array $assetsPaths, $design);
 }
-
-class_alias(AssetPathProvisionerInterface::class, 'EzSystems\EzPlatformDesignEngine\Asset\AssetPathProvisionerInterface');
diff --git a/src/lib/Asset/AssetPathResolver.php b/src/lib/Asset/AssetPathResolver.php
index 1543bae..41e141c 100644
--- a/src/lib/Asset/AssetPathResolver.php
+++ b/src/lib/Asset/AssetPathResolver.php
@@ -58,5 +58,3 @@ public function resolveAssetPath($path, $design)
         return $path;
     }
 }
-
-class_alias(AssetPathResolver::class, 'EzSystems\EzPlatformDesignEngine\Asset\AssetPathResolver');
diff --git a/src/lib/Asset/AssetPathResolverInterface.php b/src/lib/Asset/AssetPathResolverInterface.php
index fb5f958..a08c9b6 100644
--- a/src/lib/Asset/AssetPathResolverInterface.php
+++ b/src/lib/Asset/AssetPathResolverInterface.php
@@ -23,5 +23,3 @@ interface AssetPathResolverInterface
      */
     public function resolveAssetPath($path, $design);
 }
-
-class_alias(AssetPathResolverInterface::class, 'EzSystems\EzPlatformDesignEngine\Asset\AssetPathResolverInterface');
diff --git a/src/lib/Asset/ProvisionedPathResolver.php b/src/lib/Asset/ProvisionedPathResolver.php
index ce77a36..e91d7ec 100644
--- a/src/lib/Asset/ProvisionedPathResolver.php
+++ b/src/lib/Asset/ProvisionedPathResolver.php
@@ -91,5 +91,3 @@ private function computeLogicalPathFromPhysicalAssets($themePath)
         return $logicalPaths;
     }
 }
-
-class_alias(ProvisionedPathResolver::class, 'EzSystems\EzPlatformDesignEngine\Asset\ProvisionedPathResolver');
diff --git a/src/lib/Asset/ThemePackage.php b/src/lib/Asset/ThemePackage.php
index 261ec2e..29feb91 100644
--- a/src/lib/Asset/ThemePackage.php
+++ b/src/lib/Asset/ThemePackage.php
@@ -41,5 +41,3 @@ public function getVersion($path)
         return $this->innerPackage->getVersion($this->pathResolver->resolveAssetPath($path, $this->getCurrentDesign()));
     }
 }
-
-class_alias(ThemePackage::class, 'EzSystems\EzPlatformDesignEngine\Asset\ThemePackage');
diff --git a/src/lib/DesignAwareTrait.php b/src/lib/DesignAwareTrait.php
index 8ef6bdc..45ae87b 100644
--- a/src/lib/DesignAwareTrait.php
+++ b/src/lib/DesignAwareTrait.php
@@ -26,5 +26,3 @@ public function getCurrentDesign(): ?string
         return $this->configResolver->getParameter('design');
     }
 }
-
-class_alias(DesignAwareTrait::class, 'EzSystems\EzPlatformDesignEngine\DesignAwareTrait');
diff --git a/src/lib/Exception/InvalidDesignException.php b/src/lib/Exception/InvalidDesignException.php
index cf1d125..4d7d0fc 100644
--- a/src/lib/Exception/InvalidDesignException.php
+++ b/src/lib/Exception/InvalidDesignException.php
@@ -12,5 +12,3 @@
 class InvalidDesignException extends InvalidArgumentException
 {
 }
-
-class_alias(InvalidDesignException::class, 'EzSystems\EzPlatformDesignEngine\Exception\InvalidDesignException');
diff --git a/src/lib/Templating/TemplateNameResolverInterface.php b/src/lib/Templating/TemplateNameResolverInterface.php
index a15af89..93880fe 100644
--- a/src/lib/Templating/TemplateNameResolverInterface.php
+++ b/src/lib/Templating/TemplateNameResolverInterface.php
@@ -39,5 +39,3 @@ public function resolveTemplateName($name);
      */
     public function isTemplateDesignNamespaced($name);
 }
-
-class_alias(TemplateNameResolverInterface::class, 'EzSystems\EzPlatformDesignEngine\Templating\TemplateNameResolverInterface');
diff --git a/src/lib/Templating/TemplatePathRegistry.php b/src/lib/Templating/TemplatePathRegistry.php
index a28f174..9cddb81 100644
--- a/src/lib/Templating/TemplatePathRegistry.php
+++ b/src/lib/Templating/TemplatePathRegistry.php
@@ -57,5 +57,3 @@ public function __unserialize(array $data): void
         [$this->pathMap, $this->kernelRootDir] = $data;
     }
 }
-
-class_alias(TemplatePathRegistry::class, 'EzSystems\EzPlatformDesignEngine\Templating\TemplatePathRegistry');
diff --git a/src/lib/Templating/TemplatePathRegistryInterface.php b/src/lib/Templating/TemplatePathRegistryInterface.php
index 1eaaca5..3994b09 100644
--- a/src/lib/Templating/TemplatePathRegistryInterface.php
+++ b/src/lib/Templating/TemplatePathRegistryInterface.php
@@ -37,5 +37,3 @@ public function getTemplatePath($templateName);
      */
     public function getPathMap();
 }
-
-class_alias(TemplatePathRegistryInterface::class, 'EzSystems\EzPlatformDesignEngine\Templating\TemplatePathRegistryInterface');
diff --git a/src/lib/Templating/ThemeTemplateNameResolver.php b/src/lib/Templating/ThemeTemplateNameResolver.php
index 31cc984..ae68dc5 100644
--- a/src/lib/Templating/ThemeTemplateNameResolver.php
+++ b/src/lib/Templating/ThemeTemplateNameResolver.php
@@ -44,5 +44,3 @@ public function isTemplateDesignNamespaced($name)
         return (strpos($name, '@' . static::DESIGN_NAMESPACE) !== false) || (strpos($name, '@' . $this->getCurrentDesign()) !== false);
     }
 }
-
-class_alias(ThemeTemplateNameResolver::class, 'EzSystems\EzPlatformDesignEngine\Templating\ThemeTemplateNameResolver');
diff --git a/src/lib/Templating/Twig/TwigThemeLoader.php b/src/lib/Templating/Twig/TwigThemeLoader.php
index 81af5f7..58e281e 100644
--- a/src/lib/Templating/Twig/TwigThemeLoader.php
+++ b/src/lib/Templating/Twig/TwigThemeLoader.php
@@ -97,5 +97,3 @@ public function prependPath($path, $namespace = FilesystemLoader::MAIN_NAMESPACE
         $this->innerFilesystemLoader->prependPath($path, $namespace);
     }
 }
-
-class_alias(TwigThemeLoader::class, 'EzSystems\EzPlatformDesignEngine\Templating\Twig\TwigThemeLoader');
diff --git a/tests/lib/Asset/AssetPathResolverTest.php b/tests/lib/Asset/AssetPathResolverTest.php
index 8545ca7..4beb268 100644
--- a/tests/lib/Asset/AssetPathResolverTest.php
+++ b/tests/lib/Asset/AssetPathResolverTest.php
@@ -132,5 +132,3 @@ public function testResolveAssetPath(array $designPaths, array $existingPaths, $
         self::assertSame($resolvedPath, $resolver->resolveAssetPath($path, 'foo'));
     }
 }
-
-class_alias(AssetPathResolverTest::class, 'EzSystems\EzPlatformDesignEngine\Tests\Asset\AssetPathResolverTest');
diff --git a/tests/lib/Asset/ProvisionedPathResolverTest.php b/tests/lib/Asset/ProvisionedPathResolverTest.php
index 683b385..0680f28 100644
--- a/tests/lib/Asset/ProvisionedPathResolverTest.php
+++ b/tests/lib/Asset/ProvisionedPathResolverTest.php
@@ -112,5 +112,3 @@ public function testProvisionResolvedPaths()
         self::assertEquals($expectedResolvedPaths, $provisioner->provisionResolvedPaths($themesPaths, $design));
     }
 }
-
-class_alias(ProvisionedPathResolverTest::class, 'EzSystems\EzPlatformDesignEngine\Tests\Asset\ProvisionedPathResolverTest');
diff --git a/tests/lib/Asset/ThemePackageTest.php b/tests/lib/Asset/ThemePackageTest.php
index aecfac8..7ec6452 100644
--- a/tests/lib/Asset/ThemePackageTest.php
+++ b/tests/lib/Asset/ThemePackageTest.php
@@ -92,5 +92,3 @@ public function testGetVersion()
         self::assertSame($version, $package->getVersion($assetPath));
     }
 }
-
-class_alias(ThemePackageTest::class, 'EzSystems\EzPlatformDesignEngine\Tests\Asset\ThemePackageTest');
diff --git a/tests/lib/Templating/TemplatePathRegistryTest.php b/tests/lib/Templating/TemplatePathRegistryTest.php
index 509ce38..7d7ec92 100644
--- a/tests/lib/Templating/TemplatePathRegistryTest.php
+++ b/tests/lib/Templating/TemplatePathRegistryTest.php
@@ -55,5 +55,3 @@ public function testGetTemplatePathNotMapped()
         self::assertSame($templateLogicalName, $registry->getTemplatePath($templateLogicalName));
     }
 }
-
-class_alias(TemplatePathRegistryTest::class, 'EzSystems\EzPlatformDesignEngine\Tests\Templating\TemplatePathRegistryTest');
diff --git a/tests/lib/Templating/ThemeTemplateNameResolverTest.php b/tests/lib/Templating/ThemeTemplateNameResolverTest.php
index aec33c3..f700432 100644
--- a/tests/lib/Templating/ThemeTemplateNameResolverTest.php
+++ b/tests/lib/Templating/ThemeTemplateNameResolverTest.php
@@ -70,5 +70,3 @@ public function testIsTemplateDesignNamespaced($currentDesign, $templateName, $e
         self::assertSame($expected, $resolver->isTemplateDesignNamespaced($templateName));
     }
 }
-
-class_alias(ThemeTemplateNameResolverTest::class, 'EzSystems\EzPlatformDesignEngine\Tests\Templating\ThemeTemplateNameResolverTest');