diff --git a/composer.json b/composer.json
index 0c12a055..2f56a8c2 100644
--- a/composer.json
+++ b/composer.json
@@ -174,7 +174,7 @@
         ],
         "psr-4": {
             "App\\": "src/",
-            "RZ\\": "lib/Models/src/",
+            "RZ\\Roadiz\\": "lib/Models/src/",
             "RZ\\Roadiz\\Bag\\": "lib/Models/src/Roadiz/Bag/",
             "RZ\\Roadiz\\CompatBundle\\": "lib/RoadizCompatBundle/src/",
             "RZ\\Roadiz\\CoreBundle\\": "lib/RoadizCoreBundle/src/",
diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml
index e0a32669..df98608f 100644
--- a/config/packages/doctrine.yaml
+++ b/config/packages/doctrine.yaml
@@ -34,7 +34,7 @@ doctrine:
             RZ\Roadiz\Core:
                 is_bundle: false
                 type: attribute
-                dir: '%kernel.project_dir%/lib/Models/src/Roadiz/Core/AbstractEntities'
+                dir: '%kernel.project_dir%/lib/Models/src/Core/AbstractEntities'
                 prefix: 'RZ\Roadiz\Core\AbstractEntities'
                 alias: AbstractEntities
             App\GeneratedEntity:
diff --git a/lib/Models/composer.json b/lib/Models/composer.json
index 67117372..54ecc44c 100644
--- a/lib/Models/composer.json
+++ b/lib/Models/composer.json
@@ -35,7 +35,7 @@
     },
     "autoload": {
         "psr-4": {
-            "RZ\\": "src/"
+            "RZ\\Roadiz\\": "src/"
         }
     },
     "config": {
diff --git a/lib/Models/src/Roadiz/Bag/LazyParameterBag.php b/lib/Models/src/Bag/LazyParameterBag.php
similarity index 100%
rename from lib/Models/src/Roadiz/Bag/LazyParameterBag.php
rename to lib/Models/src/Bag/LazyParameterBag.php
diff --git a/lib/Models/src/Roadiz/Core/AbstractEntities/AbstractDateTimed.php b/lib/Models/src/Core/AbstractEntities/AbstractDateTimed.php
similarity index 100%
rename from lib/Models/src/Roadiz/Core/AbstractEntities/AbstractDateTimed.php
rename to lib/Models/src/Core/AbstractEntities/AbstractDateTimed.php
diff --git a/lib/Models/src/Roadiz/Core/AbstractEntities/AbstractDateTimedPositioned.php b/lib/Models/src/Core/AbstractEntities/AbstractDateTimedPositioned.php
similarity index 100%
rename from lib/Models/src/Roadiz/Core/AbstractEntities/AbstractDateTimedPositioned.php
rename to lib/Models/src/Core/AbstractEntities/AbstractDateTimedPositioned.php
diff --git a/lib/Models/src/Roadiz/Core/AbstractEntities/AbstractEntity.php b/lib/Models/src/Core/AbstractEntities/AbstractEntity.php
similarity index 100%
rename from lib/Models/src/Roadiz/Core/AbstractEntities/AbstractEntity.php
rename to lib/Models/src/Core/AbstractEntities/AbstractEntity.php
diff --git a/lib/Models/src/Roadiz/Core/AbstractEntities/AbstractField.php b/lib/Models/src/Core/AbstractEntities/AbstractField.php
similarity index 100%
rename from lib/Models/src/Roadiz/Core/AbstractEntities/AbstractField.php
rename to lib/Models/src/Core/AbstractEntities/AbstractField.php
diff --git a/lib/Models/src/Roadiz/Core/AbstractEntities/AbstractHuman.php b/lib/Models/src/Core/AbstractEntities/AbstractHuman.php
similarity index 100%
rename from lib/Models/src/Roadiz/Core/AbstractEntities/AbstractHuman.php
rename to lib/Models/src/Core/AbstractEntities/AbstractHuman.php
diff --git a/lib/Models/src/Roadiz/Core/AbstractEntities/AbstractPositioned.php b/lib/Models/src/Core/AbstractEntities/AbstractPositioned.php
similarity index 100%
rename from lib/Models/src/Roadiz/Core/AbstractEntities/AbstractPositioned.php
rename to lib/Models/src/Core/AbstractEntities/AbstractPositioned.php
diff --git a/lib/Models/src/Roadiz/Core/AbstractEntities/LeafInterface.php b/lib/Models/src/Core/AbstractEntities/LeafInterface.php
similarity index 100%
rename from lib/Models/src/Roadiz/Core/AbstractEntities/LeafInterface.php
rename to lib/Models/src/Core/AbstractEntities/LeafInterface.php
diff --git a/lib/Models/src/Roadiz/Core/AbstractEntities/LeafTrait.php b/lib/Models/src/Core/AbstractEntities/LeafTrait.php
similarity index 100%
rename from lib/Models/src/Roadiz/Core/AbstractEntities/LeafTrait.php
rename to lib/Models/src/Core/AbstractEntities/LeafTrait.php
diff --git a/lib/Models/src/Roadiz/Core/AbstractEntities/PersistableInterface.php b/lib/Models/src/Core/AbstractEntities/PersistableInterface.php
similarity index 100%
rename from lib/Models/src/Roadiz/Core/AbstractEntities/PersistableInterface.php
rename to lib/Models/src/Core/AbstractEntities/PersistableInterface.php
diff --git a/lib/Models/src/Roadiz/Core/AbstractEntities/PositionedInterface.php b/lib/Models/src/Core/AbstractEntities/PositionedInterface.php
similarity index 100%
rename from lib/Models/src/Roadiz/Core/AbstractEntities/PositionedInterface.php
rename to lib/Models/src/Core/AbstractEntities/PositionedInterface.php
diff --git a/lib/Models/src/Roadiz/Core/AbstractEntities/PositionedTrait.php b/lib/Models/src/Core/AbstractEntities/PositionedTrait.php
similarity index 100%
rename from lib/Models/src/Roadiz/Core/AbstractEntities/PositionedTrait.php
rename to lib/Models/src/Core/AbstractEntities/PositionedTrait.php
diff --git a/lib/Models/src/Roadiz/Core/AbstractEntities/TranslationInterface.php b/lib/Models/src/Core/AbstractEntities/TranslationInterface.php
similarity index 100%
rename from lib/Models/src/Roadiz/Core/AbstractEntities/TranslationInterface.php
rename to lib/Models/src/Core/AbstractEntities/TranslationInterface.php
diff --git a/lib/Models/src/Roadiz/Core/Events/LeafEntityLifeCycleSubscriber.php b/lib/Models/src/Core/Events/LeafEntityLifeCycleSubscriber.php
similarity index 100%
rename from lib/Models/src/Roadiz/Core/Events/LeafEntityLifeCycleSubscriber.php
rename to lib/Models/src/Core/Events/LeafEntityLifeCycleSubscriber.php
diff --git a/lib/Models/src/Roadiz/Core/Handlers/AbstractHandler.php b/lib/Models/src/Core/Handlers/AbstractHandler.php
similarity index 100%
rename from lib/Models/src/Roadiz/Core/Handlers/AbstractHandler.php
rename to lib/Models/src/Core/Handlers/AbstractHandler.php
diff --git a/lib/Models/src/Roadiz/Core/Handlers/HandlerFactoryInterface.php b/lib/Models/src/Core/Handlers/HandlerFactoryInterface.php
similarity index 100%
rename from lib/Models/src/Roadiz/Core/Handlers/HandlerFactoryInterface.php
rename to lib/Models/src/Core/Handlers/HandlerFactoryInterface.php
diff --git a/lib/Models/src/Roadiz/Utils/StringHandler.php b/lib/Models/src/Utils/StringHandler.php
similarity index 100%
rename from lib/Models/src/Roadiz/Utils/StringHandler.php
rename to lib/Models/src/Utils/StringHandler.php
diff --git a/lib/RoadizCoreBundle/config/packages/doctrine.yaml b/lib/RoadizCoreBundle/config/packages/doctrine.yaml
index 2a964139..a4e1bd98 100644
--- a/lib/RoadizCoreBundle/config/packages/doctrine.yaml
+++ b/lib/RoadizCoreBundle/config/packages/doctrine.yaml
@@ -27,7 +27,7 @@ doctrine:
             RZ\Roadiz\Core:
                 is_bundle: false
                 type: annotation
-                dir: '%kernel.project_dir%/vendor/roadiz/models/src/Roadiz/Core/AbstractEntities'
+                dir: '%kernel.project_dir%/vendor/roadiz/models/src/Core/AbstractEntities'
                 prefix: 'RZ\Roadiz\Core\AbstractEntities'
                 alias: AbstractEntities
             App\GeneratedEntity:
diff --git a/lib/RoadizRozierBundle/src/Aliases.php b/lib/RoadizRozierBundle/src/Aliases.php
index 5358a283..b29be74e 100644
--- a/lib/RoadizRozierBundle/src/Aliases.php
+++ b/lib/RoadizRozierBundle/src/Aliases.php
@@ -12,7 +12,6 @@ final class Aliases
     public static function getAliases(): array
     {
         return [
-            \RZ\Roadiz\RozierBundle\Controller\BackendController::class => \RZ\Roadiz\CMS\Controllers\BackendController::class,
             \RZ\Roadiz\RozierBundle\Form\DocumentTranslationType::class => \Themes\Rozier\Forms\DocumentTranslationType::class,
             \RZ\Roadiz\RozierBundle\Form\CustomFormType::class => \Themes\Rozier\Forms\CustomFormType::class,
             \RZ\Roadiz\RozierBundle\ListManager\SessionListFilters::class => \Themes\Rozier\Utils\SessionListFilters::class,
diff --git a/lib/RoadizRozierBundle/src/Controller/BackendController.php b/lib/RoadizRozierBundle/src/Controller/BackendController.php
deleted file mode 100644
index f5f26d47..00000000
--- a/lib/RoadizRozierBundle/src/Controller/BackendController.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace RZ\Roadiz\RozierBundle\Controller;
-
-use Psr\Log\LoggerInterface;
-use RZ\Roadiz\CompatBundle\Controller\AppController;
-use RZ\Roadiz\CoreBundle\Bag\NodeTypes;
-use RZ\Roadiz\CoreBundle\Bag\Roles;
-use RZ\Roadiz\CoreBundle\Bag\Settings;
-use RZ\Roadiz\CoreBundle\ListManager\EntityListManagerInterface;
-use RZ\Roadiz\CoreBundle\Mailer\EmailManager;
-use RZ\Roadiz\Documents\Packages;
-use RZ\Roadiz\OpenId\OAuth2LinkGenerator;
-use Symfony\Component\HttpKernel\KernelInterface;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
-use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
-use Themes\Rozier\Explorer\FoldersProvider;
-use Themes\Rozier\Explorer\SettingsProvider;
-use Themes\Rozier\Explorer\UsersProvider;
-use Themes\Rozier\RozierServiceRegistry;
-
-/**
- * Special controller app file for backend themes.
- *
- * This AppController implementation will use a security scheme
- */
-abstract class BackendController extends AppController
-{
-    protected static bool $backendTheme = true;
-    public static int $priority = -10;
-
-    public static function getSubscribedServices(): array
-    {
-        return array_merge(parent::getSubscribedServices(), [
-            'securityAuthenticationUtils' => AuthenticationUtils::class,
-            'urlGenerator' => UrlGeneratorInterface::class,
-            EmailManager::class => EmailManager::class,
-            'logger' => LoggerInterface::class,
-            'kernel' => KernelInterface::class,
-            'settingsBag' => Settings::class,
-            'nodeTypesBag' => NodeTypes::class,
-            'rolesBag' => Roles::class,
-            'assetPackages' => Packages::class,
-            'csrfTokenManager' => CsrfTokenManagerInterface::class,
-            OAuth2LinkGenerator::class => OAuth2LinkGenerator::class,
-            RozierServiceRegistry::class => RozierServiceRegistry::class,
-            UsersProvider::class => UsersProvider::class,
-            SettingsProvider::class => SettingsProvider::class,
-            FoldersProvider::class => FoldersProvider::class,
-        ]);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function createEntityListManager(string $entity, array $criteria = [], array $ordering = []): EntityListManagerInterface
-    {
-        return parent::createEntityListManager($entity, $criteria, $ordering)
-            ->setDisplayingNotPublishedNodes(true);
-    }
-}