diff --git a/src/Cli/CronJobs/ModuleLicensesCronJob.php b/src/Cli/CronJobs/ModuleLicensesCronJob.php
index ddfbc49b..9b8d2a0a 100644
--- a/src/Cli/CronJobs/ModuleLicensesCronJob.php
+++ b/src/Cli/CronJobs/ModuleLicensesCronJob.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Container\ServiceContainer;
 use XcVm\Core\Module\ModuleManager;
 use XcVm\Core\Config\SettingsManager;
 require_once __DIR__ . '/../CronTrait.php';
diff --git a/src/Core/Cache/CacheInterface.php b/src/Core/Cache/CacheInterface.php
index ef7b7e4c..b69e4149 100644
--- a/src/Core/Cache/CacheInterface.php
+++ b/src/Core/Cache/CacheInterface.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Container\ServiceContainer;
 /**
  * Cache Interface (Contract)
  *
diff --git a/src/Core/Cache/FileCache.php b/src/Core/Cache/FileCache.php
index 2c6fc4be..89d38c5d 100644
--- a/src/Core/Cache/FileCache.php
+++ b/src/Core/Cache/FileCache.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Container\ServiceContainer;
 /**
  * File Cache Driver (igbinary)
  *
diff --git a/src/Core/Cache/RedisCache.php b/src/Core/Cache/RedisCache.php
index b254cd41..dc8468db 100644
--- a/src/Core/Cache/RedisCache.php
+++ b/src/Core/Cache/RedisCache.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Container\ServiceContainer;
 /**
  * Redis Cache Driver
  *
diff --git a/src/Core/Container/Psr/ContainerExceptionInterface.php b/src/Core/Container/Psr/ContainerExceptionInterface.php
index 3ab47506..eb912286 100644
--- a/src/Core/Container/Psr/ContainerExceptionInterface.php
+++ b/src/Core/Container/Psr/ContainerExceptionInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace XcVm\Core\Container\Psr;
+
 /**
  * PSR-11: Base interface for container exceptions.
  *
@@ -8,4 +10,4 @@
  * @package XC_VM_Core_Container
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
-interface ContainerExceptionInterface extends Throwable {}
+interface ContainerExceptionInterface extends \Throwable {}
diff --git a/src/Core/Container/Psr/ContainerInterface.php b/src/Core/Container/Psr/ContainerInterface.php
index a418ecc3..e063f402 100644
--- a/src/Core/Container/Psr/ContainerInterface.php
+++ b/src/Core/Container/Psr/ContainerInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace XcVm\Core\Container\Psr;
+
 /**
  * PSR-11 ContainerInterface.
  *
diff --git a/src/Core/Container/Psr/NotFoundException.php b/src/Core/Container/Psr/NotFoundException.php
index ff6632b8..cfcbdaca 100644
--- a/src/Core/Container/Psr/NotFoundException.php
+++ b/src/Core/Container/Psr/NotFoundException.php
@@ -1,9 +1,11 @@
 <?php
 
+namespace XcVm\Core\Container\Psr;
+
 /**
  * Thrown when a service identifier is not found in the container.
  *
  * @package XC_VM_Core_Container
  * @license AGPL-3.0 https://www.gnu.org/licenses/agpl-3.0.html
  */
-class NotFoundException extends ContainerException implements NotFoundExceptionInterface {}
+class NotFoundException extends \ContainerException implements NotFoundExceptionInterface {}
diff --git a/src/Core/Container/Psr/NotFoundExceptionInterface.php b/src/Core/Container/Psr/NotFoundExceptionInterface.php
index 4f3c0c23..8ffd4468 100644
--- a/src/Core/Container/Psr/NotFoundExceptionInterface.php
+++ b/src/Core/Container/Psr/NotFoundExceptionInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace XcVm\Core\Container\Psr;
+
 /**
  * PSR-11: Thrown when an identifier is not found in the container.
  *
diff --git a/src/Core/Container/ServiceContainer.php b/src/Core/Container/ServiceContainer.php
index 05852212..10e31c7d 100644
--- a/src/Core/Container/ServiceContainer.php
+++ b/src/Core/Container/ServiceContainer.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace XcVm\Core\Container;
+use XcVm\Core\Container\Psr\NotFoundException;
+use XcVm\Core\Container\Psr\ContainerInterface;
+
 use XcVm\Core\Module\ModuleInterface;
 use XcVm\Core\Http\Request;
 use XcVm\Core\Database\Database;
@@ -70,7 +74,7 @@ use XcVm\Core\Config\SettingsManager;
  *           $db    = $container->get('db');
  *           $cache = $container->get('cache');
  *           $container->set('plex.service', function($c) {
- *               return new PlexService($c->get('db'), $c->get('settings'));
+ *               return new \PlexService($c->get('db'), $c->get('settings'));
  *           });
  *       }
  *   }
@@ -227,24 +231,24 @@ class ServiceContainer implements ContainerInterface {
      * highest priority wraps outermost (called first by callers).
      *
      * Example:
-     *   $c->decorate('stream.service', FingerprintDecorator::class, priority: 20);
-     *   $c->decorate('stream.service', LoggingDecorator::class, priority: 10);
-     *   // Call order: FingerprintDecorator → LoggingDecorator → original
+     *   $c->decorate('stream.service', \FingerprintDecorator::class, priority: 20);
+     *   $c->decorate('stream.service', \LoggingDecorator::class, priority: 10);
+     *   // Call order: \FingerprintDecorator → \LoggingDecorator → original
      *
      * @param string               $id        Service identifier
      * @param class-string|callable $decorator Class-string or callable($inner, $container): mixed
      * @param int                  $priority  Higher = outer layer (default 0)
-     * @throws RuntimeException If the service is protected or not registered as a factory
+     * @throws \RuntimeException If the service is protected or not registered as a factory
      */
     public function decorate(string $id, string|callable $decorator, int $priority = 0): static {
         if (in_array($id, $this->protectedServices, true)) {
-            throw new ContainerException(
+            throw new \ContainerException(
                 "ServiceContainer: сервис '{$id}' защищён от декорирования модулями."
             );
         }
 
         if (!isset($this->factories[$id]) && !array_key_exists($id, $this->resolved)) {
-            throw new ContainerException(
+            throw new \ContainerException(
                 "ServiceContainer: невозможно декорировать незарегистрированный сервис '{$id}'."
             );
         }
@@ -275,7 +279,7 @@ class ServiceContainer implements ContainerInterface {
      * @param string $id Идентификатор
      * @return mixed
      * @throws NotFoundException           Если сервис не зарегистрирован
-     * @throws RuntimeException            Если обнаружена циклическая зависимость или фабрика бросила исключение
+     * @throws \RuntimeException            Если обнаружена циклическая зависимость или фабрика бросила исключение
      */
     public function get(string $id): mixed {
         // 1. Уже разрешён (singleton) — мгновенный возврат
@@ -295,12 +299,12 @@ class ServiceContainer implements ContainerInterface {
             try {
                 $service = call_user_func($this->factories[$id], $this);
                 $service = $this->applyDecorators($id, $service);
-            } catch (XcVmException $e) {
+            } catch (\XcVmException $e) {
                 unset($this->creating[$id]);
                 throw $e;
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 unset($this->creating[$id]);
-                throw new ServiceCreationException(
+                throw new \ServiceCreationException(
                     "ServiceContainer: ошибка при создании сервиса '{$id}': " . $e->getMessage(),
                     0,
                     $e
@@ -485,14 +489,14 @@ class ServiceContainer implements ContainerInterface {
     // ─────────────────────────────────────────────────────────
 
     /**
-     * Throw a CircularDependencyException describing the resolution chain.
+     * Throw a \CircularDependencyException describing the resolution chain.
      *
      * @param string $id Service id whose creation closed the cycle.
      * @return never
-     * @throws CircularDependencyException Always.
+     * @throws \CircularDependencyException Always.
      */
     private function throwCircularDependency(string $id): never {
-        throw new CircularDependencyException(
+        throw new \CircularDependencyException(
             "ServiceContainer: циклическая зависимость при создании сервиса '{$id}'. "
             . "Цепочка: " . implode(' → ', array_keys($this->creating)) . " → {$id}"
         );
diff --git a/src/Core/Database/DatabaseHandler.php b/src/Core/Database/DatabaseHandler.php
index 1a9f5257..19b52430 100644
--- a/src/Core/Database/DatabaseHandler.php
+++ b/src/Core/Database/DatabaseHandler.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace XcVm\Core\Database;
+use XcVm\Core\Container\ServiceContainer;
 
 /**
  * Менеджер базы данных (\PDO)
diff --git a/src/Core/Exception/Container/CircularDependencyException.php b/src/Core/Exception/Container/CircularDependencyException.php
index 523221b5..fc9d2a94 100644
--- a/src/Core/Exception/Container/CircularDependencyException.php
+++ b/src/Core/Exception/Container/CircularDependencyException.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Container\ServiceContainer;
 /**
  * Thrown when ServiceContainer detects a circular dependency chain.
  *
diff --git a/src/Core/Exception/Container/ContainerException.php b/src/Core/Exception/Container/ContainerException.php
index 94890fdf..e9e3ae4f 100644
--- a/src/Core/Exception/Container/ContainerException.php
+++ b/src/Core/Exception/Container/ContainerException.php
@@ -1,5 +1,7 @@
 <?php
 
+use XcVm\Core\Container\Psr\ContainerExceptionInterface;
+use XcVm\Core\Container\ServiceContainer;
 /**
  * Base exception for ServiceContainer errors.
  *
diff --git a/src/Core/Exception/Container/ServiceCreationException.php b/src/Core/Exception/Container/ServiceCreationException.php
index 70e98e03..3e141488 100644
--- a/src/Core/Exception/Container/ServiceCreationException.php
+++ b/src/Core/Exception/Container/ServiceCreationException.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Container\ServiceContainer;
 /**
  * Thrown when a service factory throws during ServiceContainer::get().
  *
diff --git a/src/Core/Http/Router.php b/src/Core/Http/Router.php
index 16872df6..e349842e 100644
--- a/src/Core/Http/Router.php
+++ b/src/Core/Http/Router.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace XcVm\Core\Http;
+use XcVm\Core\Container\ServiceContainer;
 use XcVm\Core\Module\ModuleInterface;
 use XcVm\Core\Auth\Authorization;
 
@@ -505,8 +506,8 @@ class Router {
             $method = $handler[1];
 
             // Попытка получить экземпляр через ServiceContainer (DI)
-            if (class_exists('ServiceContainer', false)) {
-                $container = \ServiceContainer::getInstance();
+            if (class_exists(\XcVm\Core\Container\ServiceContainer::class, false)) {
+                $container = \XcVm\Core\Container\ServiceContainer::getInstance();
                 try {
                     $obj = $container->get($class);
                 } catch (\Throwable $e) {
diff --git a/src/Core/Init/LegacyInitializer.php b/src/Core/Init/LegacyInitializer.php
index 184ece8e..1b1011d0 100644
--- a/src/Core/Init/LegacyInitializer.php
+++ b/src/Core/Init/LegacyInitializer.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Container\ServiceContainer;
 use XcVm\Core\Http\Request;
 use XcVm\Core\Http\RequestManager;
 use XcVm\Core\Config\SettingsRepository;
diff --git a/src/Core/Module/BaseModule.php b/src/Core/Module/BaseModule.php
index 15e34ee5..ae32d6d2 100644
--- a/src/Core/Module/BaseModule.php
+++ b/src/Core/Module/BaseModule.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace XcVm\Core\Module;
+use XcVm\Core\Container\ServiceContainer;
 use XcVm\Core\Module\Contract\CronProviderInterface;
 
 use XcVm\Core\Http\Router;
@@ -39,10 +40,10 @@ abstract class BaseModule implements ModuleInterface, MigratableInterface, CronP
     /**
      * Boot hook: register services/bindings into the container. No-op by default.
      *
-     * @param \ServiceContainer $container The DI container.
+     * @param \XcVm\Core\Container\ServiceContainer $container The DI container.
      * @return void
      */
-    public function boot(\ServiceContainer $container): void {}
+    public function boot(\XcVm\Core\Container\ServiceContainer $container): void {}
 
     /**
      * Event subscribers provided by the module. Empty by default.
diff --git a/src/Core/Module/Contract/ServiceProviderInterface.php b/src/Core/Module/Contract/ServiceProviderInterface.php
index b3ac0bbf..2d3f8923 100644
--- a/src/Core/Module/Contract/ServiceProviderInterface.php
+++ b/src/Core/Module/Contract/ServiceProviderInterface.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace XcVm\Core\Module\Contract;
+use XcVm\Core\Container\ServiceContainer;
 
 /**
  * @package XC_VM_Core_Module
@@ -15,9 +16,9 @@ interface ServiceProviderInterface {
      *
      * Called once per request during module boot phase.
      *
-     * @param \ServiceContainer $container
+     * @param \XcVm\Core\Container\ServiceContainer $container
      */
-    public function boot(\ServiceContainer $container): void;
+    public function boot(\XcVm\Core\Container\ServiceContainer $container): void;
 
     /**
      * Return event subscribers declared by this module.
diff --git a/src/Core/Module/MigratableInterface.php b/src/Core/Module/MigratableInterface.php
index 8e324e6d..7c3f988c 100644
--- a/src/Core/Module/MigratableInterface.php
+++ b/src/Core/Module/MigratableInterface.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace XcVm\Core\Module;
+use XcVm\Core\Container\ServiceContainer;
 
 /**
  * MigratableInterface — module upgrade migrations contract.
@@ -16,8 +17,8 @@ namespace XcVm\Core\Module;
  * Example:
  *   public function getMigrations(): array {
  *       return [
- *           '1.1.0' => function (\ServiceContainer $c) { $c->get('db')->execute('ALTER TABLE ...'); },
- *           '2.0.0' => function (\ServiceContainer $c) { $c->get('db')->execute('CREATE TABLE ...'); },
+ *           '1.1.0' => function (\XcVm\Core\Container\ServiceContainer $c) { $c->get('db')->execute('ALTER TABLE ...'); },
+ *           '2.0.0' => function (\XcVm\Core\Container\ServiceContainer $c) { $c->get('db')->execute('CREATE TABLE ...'); },
  *       ];
  *   }
  *
@@ -33,9 +34,9 @@ interface MigratableInterface {
      *
      * Keys are semver strings (e.g. "1.1.0"). Values are callables
      * that perform the schema or data change for that version step.
-     * Each callable receives the \ServiceContainer — use it to access db, settings, etc.
+     * Each callable receives the \XcVm\Core\Container\ServiceContainer — use it to access db, settings, etc.
      *
-     * @return array<string, callable(\ServiceContainer): void>
+     * @return array<string, callable(\XcVm\Core\Container\ServiceContainer): void>
      */
     public function getMigrations(): array;
 }
diff --git a/src/Core/Module/ModuleLoader.php b/src/Core/Module/ModuleLoader.php
index 4f511fa8..a99e227e 100644
--- a/src/Core/Module/ModuleLoader.php
+++ b/src/Core/Module/ModuleLoader.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace XcVm\Core\Module;
+use XcVm\Core\Container\ServiceContainer;
 use XcVm\Core\Module\Contract\StreamMiddlewareProviderInterface;
 use XcVm\Core\Module\Contract\ServiceProviderInterface;
 use XcVm\Core\Module\Contract\RouteProviderInterface;
@@ -182,12 +183,12 @@ class ModuleLoader {
      * Checks each sub-interface via instanceof so modules can implement
      * only the contracts they need. Core navbar is registered first.
      *
-     * @param \ServiceContainer $container Service container for dependency injection.
+     * @param \XcVm\Core\Container\ServiceContainer $container Service container for dependency injection.
      * @param Router|null $router Optional router for module route registration.
      * @param StreamPipeline|null $pipeline Optional stream pipeline for middleware registration.
      * @return void
      */
-    public function bootAll(\ServiceContainer $container, ?Router $router = null, ?StreamPipeline $pipeline = null): void {
+    public function bootAll(\XcVm\Core\Container\ServiceContainer $container, ?Router $router = null, ?StreamPipeline $pipeline = null): void {
         $navbarRegistry = new NavbarRegistry();
         (new CoreNavbarProvider())->registerNavbar($navbarRegistry);
 
@@ -620,10 +621,10 @@ class ModuleLoader {
      * registration time the listener is silently skipped (graceful degradation).
      *
      * @param ServiceProviderInterface $module
-     * @param \ServiceContainer $container
+     * @param \XcVm\Core\Container\ServiceContainer $container
      * @return void
      */
-    private function registerEventSubscribers(ServiceProviderInterface $module, \ServiceContainer $container): void {
+    private function registerEventSubscribers(ServiceProviderInterface $module, \XcVm\Core\Container\ServiceContainer $container): void {
         // Verify the container holds an actual \EventDispatcher instance (not just the class name).
         // Static calls below route to the same instance via \EventDispatcher::getInstance().
         if (!$container->has('events') || !$container->get('events') instanceof \EventDispatcher) {
diff --git a/src/Core/Module/ModuleManager.php b/src/Core/Module/ModuleManager.php
index e522adf3..ee7a90b0 100644
--- a/src/Core/Module/ModuleManager.php
+++ b/src/Core/Module/ModuleManager.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace XcVm\Core\Module;
+use XcVm\Core\Container\ServiceContainer;
 
 use XcVm\Core\Http\Router;
 use XcVm\Core\Database\Database;
@@ -24,19 +25,19 @@ class ModuleManager {
     private string $modulesPath;
     private string $overridesPath;
     private string $archivesPath;
-    private ?\ServiceContainer $container;
+    private ?\XcVm\Core\Container\ServiceContainer $container;
 
     /**
      * Initialize the module manager.
      *
      * @param string|null $modulesPath   Path to the modules directory.
      * @param string|null $overridesPath Path to the config/modules.php overrides file.
-     * @param \ServiceContainer|null $container Service container for DB access and DI.
+     * @param \XcVm\Core\Container\ServiceContainer|null $container Service container for DB access and DI.
      */
     public function __construct(
         ?string $modulesPath = null,
         ?string $overridesPath = null,
-        ?\ServiceContainer $container = null
+        ?\XcVm\Core\Container\ServiceContainer $container = null
     ) {
         $this->modulesPath   = $modulesPath   ?: (defined('MAIN_HOME')   ? MAIN_HOME   . 'Modules'      : dirname(__DIR__, 2) . '/Modules');
         $this->overridesPath = $overridesPath ?: (defined('CONFIG_PATH') ? CONFIG_PATH . 'modules.php'  : dirname(__DIR__, 2) . '/config/modules.php');
@@ -480,7 +481,7 @@ class ModuleManager {
      * Delegates the full download → key-unwrap → extract flow to the
      * XC_VM C extension, then runs installModule() to register it.
      * Fires \PackageInstalledEvent and hot-reloads the module into the
-     * current \ServiceContainer without requiring a PHP-FPM restart.
+     * current \XcVm\Core\Container\ServiceContainer without requiring a PHP-FPM restart.
      *
      * @param string      $slug    Module slug as listed on the platform.
      * @param string      $version Exact version string (e.g. "1.2.0"), or '' for the latest.
@@ -815,7 +816,7 @@ class ModuleManager {
     }
 
     /**
-     * Hot-reload a newly installed module into the running \ServiceContainer.
+     * Hot-reload a newly installed module into the running \XcVm\Core\Container\ServiceContainer.
      *
      * Loads and boots the module within the current request so it becomes
      * immediately usable without a PHP-FPM restart.
@@ -853,7 +854,7 @@ class ModuleManager {
      * @return void
      */
     private function hotReload(string $slug, string $modulePath): void {
-        $container = \ServiceContainer::getInstance();
+        $container = \XcVm\Core\Container\ServiceContainer::getInstance();
 
         $loader = new ModuleLoader();
         if (!$loader->load($slug, $modulePath)) {
diff --git a/src/Modules/plex/PlexModule.php b/src/Modules/plex/PlexModule.php
index d688e42a..94a9ec8d 100644
--- a/src/Modules/plex/PlexModule.php
+++ b/src/Modules/plex/PlexModule.php
@@ -5,7 +5,7 @@ use XcVm\Core\Module\NavbarRegistry;
 use XcVm\Core\Module\NavbarItem;
 use XcVm\Core\Module\BaseModule;
 
-use ServiceContainer;
+use XcVm\Core\Container\ServiceContainer;
 use XcVm\Core\Http\Router;
 use CommandRegistry;
 use PlexService;
diff --git a/src/Modules/tmdb/TmdbModule.php b/src/Modules/tmdb/TmdbModule.php
index a594bf0f..e1b5556a 100644
--- a/src/Modules/tmdb/TmdbModule.php
+++ b/src/Modules/tmdb/TmdbModule.php
@@ -3,7 +3,7 @@
 namespace XcVm\Module\Tmdb;
 use XcVm\Core\Module\BaseModule;
 
-use ServiceContainer;
+use XcVm\Core\Container\ServiceContainer;
 use XcVm\Core\Http\Router;
 use CommandRegistry;
 use TmdbController;
diff --git a/src/Modules/watch/WatchModule.php b/src/Modules/watch/WatchModule.php
index fdb49503..42fc1d89 100644
--- a/src/Modules/watch/WatchModule.php
+++ b/src/Modules/watch/WatchModule.php
@@ -5,7 +5,7 @@ use XcVm\Core\Module\NavbarRegistry;
 use XcVm\Core\Module\NavbarItem;
 use XcVm\Core\Module\BaseModule;
 
-use ServiceContainer;
+use XcVm\Core\Container\ServiceContainer;
 use XcVm\Core\Http\Router;
 use CommandRegistry;
 use WatchService;
diff --git a/src/Public/Controllers/Admin/ModulesController.php b/src/Public/Controllers/Admin/ModulesController.php
index 8456bda9..7de2440a 100644
--- a/src/Public/Controllers/Admin/ModulesController.php
+++ b/src/Public/Controllers/Admin/ModulesController.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Container\ServiceContainer;
 use XcVm\Core\Module\ModuleManager;
 use XcVm\Core\Config\SettingsManager;
 /**
diff --git a/src/bootstrap.php b/src/bootstrap.php
index 09acc275..9c5ec7cd 100644
--- a/src/bootstrap.php
+++ b/src/bootstrap.php
@@ -54,6 +54,7 @@
  */
 
 declare(strict_types=0);
+use XcVm\Core\Container\ServiceContainer;
 use XcVm\Core\Database\Database;
 use XcVm\Core\Database\DatabaseHandler;
 use XcVm\Core\Config\SettingsManager;
diff --git a/tests/Unit/ArchitectureTest.php b/tests/Unit/ArchitectureTest.php
index 664ba0b8..3f7f74f2 100644
--- a/tests/Unit/ArchitectureTest.php
+++ b/tests/Unit/ArchitectureTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Container\ServiceContainer;
 use PHPUnit\Framework\TestCase;
 
 /**
diff --git a/tests/Unit/ComposerDiscoveryTest.php b/tests/Unit/ComposerDiscoveryTest.php
index 0278f7c8..a3fc3cc3 100644
--- a/tests/Unit/ComposerDiscoveryTest.php
+++ b/tests/Unit/ComposerDiscoveryTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Container\ServiceContainer;
 use XcVm\Core\Module\ModuleLoader;
 use XcVm\Core\Module\NavbarRegistry;
 use XcVm\Core\Module\BaseModule;
diff --git a/tests/Unit/CronProviderTest.php b/tests/Unit/CronProviderTest.php
index a00f808b..03edd44b 100644
--- a/tests/Unit/CronProviderTest.php
+++ b/tests/Unit/CronProviderTest.php
@@ -174,7 +174,7 @@ final class CronProviderTest extends TestCase {
         $code = "<?php\n"
             . "namespace {$ns};\n"
             . "use XcVm\Core\Module\BaseModule;\n"
-            . "use ServiceContainer;\n"
+            . "use XcVm\Core\Container\ServiceContainer;\n"
             . "class {$cls} extends BaseModule {\n"
             . "\tpublic function getName(): string    { return '{$name}'; }\n"
             . "\tpublic function getVersion(): string { return '1.0.0'; }\n"
@@ -200,7 +200,7 @@ final class CronProviderTest extends TestCase {
         $code = "<?php\n"
             . "namespace {$ns};\n"
             . "use XcVm\Core\Module\ModuleInterface;\n"
-            . "use ServiceContainer;\n"
+            . "use XcVm\Core\Container\ServiceContainer;\n"
             . "use XcVm\\Core\\Http\\Router;\n"
             . "use CommandRegistry;\n"
             . "use XcVm\Core\Module\NavbarRegistry;\n"
diff --git a/tests/Unit/ExceptionHierarchyTest.php b/tests/Unit/ExceptionHierarchyTest.php
index 51010641..e635e1a3 100644
--- a/tests/Unit/ExceptionHierarchyTest.php
+++ b/tests/Unit/ExceptionHierarchyTest.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+use XcVm\Core\Container\Psr\NotFoundException;
+use XcVm\Core\Container\Psr\NotFoundExceptionInterface;
+use XcVm\Core\Container\Psr\ContainerExceptionInterface;
 
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/Unit/InterfaceContractTest.php b/tests/Unit/InterfaceContractTest.php
index 2499e98c..439e6c30 100644
--- a/tests/Unit/InterfaceContractTest.php
+++ b/tests/Unit/InterfaceContractTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Container\ServiceContainer;
 use XcVm\Core\Module\Contract\StreamMiddlewareProviderInterface;
 use XcVm\Core\Module\Contract\ServiceProviderInterface;
 use XcVm\Core\Module\Contract\RouteProviderInterface;
@@ -67,7 +68,7 @@ final class InterfaceContractTest extends TestCase {
 
     public function testServiceProviderInterfaceHasBoot(): void {
         $rc = new ReflectionClass(ServiceProviderInterface::class);
-        $this->assertInterfaceMethod($rc, 'boot', ['ServiceContainer'], 'void');
+        $this->assertInterfaceMethod($rc, 'boot', ['XcVm\Core\Container\ServiceContainer'], 'void');
     }
 
     public function testServiceProviderInterfaceHasGetEventSubscribers(): void {
diff --git a/tests/Unit/ListensToAttributeTest.php b/tests/Unit/ListensToAttributeTest.php
index 9b619598..cf90f16a 100644
--- a/tests/Unit/ListensToAttributeTest.php
+++ b/tests/Unit/ListensToAttributeTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Container\ServiceContainer;
 use XcVm\Core\Module\ModuleLoader;
 use XcVm\Core\Module\BaseModule;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Unit/ModuleLoaderBootTest.php b/tests/Unit/ModuleLoaderBootTest.php
index 100a8360..c6489ffd 100644
--- a/tests/Unit/ModuleLoaderBootTest.php
+++ b/tests/Unit/ModuleLoaderBootTest.php
@@ -4,6 +4,7 @@ use XcVm\Core\Http\Router;
 use XcVm\Core\Module\ModuleLoader;
 use XcVm\Core\Module\NavbarRegistry;
 use XcVm\Core\Module\ModuleInterface;
+use XcVm\Core\Container\ServiceContainer;
 use PHPUnit\Framework\TestCase;
 
 // Shared tracker — loaded by PHPUnit before any module PHP file is require_once'd by ModuleLoader.
@@ -225,7 +226,7 @@ final class ModuleLoaderBootTest extends TestCase {
         $code = "<?php\n"
             . "namespace {$ns};\n"
             . "use XcVm\Core\Module\ModuleInterface;\n"
-            . "use ServiceContainer;\n"
+            . "use XcVm\Core\Container\ServiceContainer;\n"
             . "use XcVm\\Core\\Http\\Router;\n"
             . "use CommandRegistry;\n"
             . "use XcVm\Core\Module\NavbarRegistry;\n"
@@ -255,7 +256,7 @@ final class ModuleLoaderBootTest extends TestCase {
         $code = "<?php\n"
             . "namespace {$ns};\n"
             . "use XcVm\Core\Module\BaseModule;\n"
-            . "use ServiceContainer;\n"
+            . "use XcVm\Core\Container\ServiceContainer;\n"
             . "class {$cls} extends BaseModule {\n"
             . "\tpublic function getName(): string { return '{$name}'; }\n"
             . "\tpublic function getVersion(): string { return '1.0.0'; }\n"
diff --git a/tests/Unit/ModuleLoaderPriorityTest.php b/tests/Unit/ModuleLoaderPriorityTest.php
index aec8872a..7c6c6d4e 100644
--- a/tests/Unit/ModuleLoaderPriorityTest.php
+++ b/tests/Unit/ModuleLoaderPriorityTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Container\ServiceContainer;
 use XcVm\Core\Module\ModuleLoader;
 use XcVm\Core\Module\NavbarRegistry;
 use XcVm\Core\Module\ModuleInterface;
@@ -132,7 +133,7 @@ final class ModuleLoaderPriorityTest extends TestCase {
         $php = '<?php' . "\n"
             . 'namespace ' . $namespace . ';' . "\n"
             . 'use XcVm\Core\Module\ModuleInterface;' . "\n"
-            . 'use ServiceContainer;' . "\n"
+            . 'use XcVm\Core\Container\ServiceContainer;' . "\n"
             . 'use XcVm\Core\Http\Router;' . "\n"
             . 'use CommandRegistry;' . "\n"
             . 'use XcVm\Core\Module\NavbarRegistry;' . "\n"
diff --git a/tests/Unit/ModuleLoaderPsr4ResolverTest.php b/tests/Unit/ModuleLoaderPsr4ResolverTest.php
index 3a2f87e6..c13132e4 100644
--- a/tests/Unit/ModuleLoaderPsr4ResolverTest.php
+++ b/tests/Unit/ModuleLoaderPsr4ResolverTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Container\ServiceContainer;
 use XcVm\Core\Module\ModuleLoader;
 use XcVm\Core\Module\NavbarRegistry;
 use XcVm\Core\Module\BaseModule;
diff --git a/tests/Unit/ModuleLoaderTest.php b/tests/Unit/ModuleLoaderTest.php
index ef4dddf4..61b28df6 100644
--- a/tests/Unit/ModuleLoaderTest.php
+++ b/tests/Unit/ModuleLoaderTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Container\ServiceContainer;
 use XcVm\Core\Module\ModuleLoader;
 use XcVm\Core\Module\NavbarRegistry;
 use XcVm\Core\Module\ModuleInterface;
@@ -85,7 +86,7 @@ final class ModuleLoaderTest extends TestCase {
 		$php = '<?php' . "\n"
 			. 'namespace ' . $namespace . ';' . "\n"
 			. 'use XcVm\Core\Module\ModuleInterface;' . "\n"
-			. 'use ServiceContainer;' . "\n"
+			. 'use XcVm\Core\Container\ServiceContainer;' . "\n"
 			. 'use Router;' . "\n"
 			. 'use CommandRegistry;' . "\n"
 			. 'use XcVm\Core\Module\NavbarRegistry;' . "\n"
diff --git a/tests/Unit/ModuleManagerMigrationsTest.php b/tests/Unit/ModuleManagerMigrationsTest.php
index 7ac0e473..c2caba84 100644
--- a/tests/Unit/ModuleManagerMigrationsTest.php
+++ b/tests/Unit/ModuleManagerMigrationsTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Container\ServiceContainer;
 use XcVm\Core\Module\ModuleManager;
 use XcVm\Core\Module\BaseModule;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Unit/ServiceContainerTest.php b/tests/Unit/ServiceContainerTest.php
index 40f52c9b..825473ea 100644
--- a/tests/Unit/ServiceContainerTest.php
+++ b/tests/Unit/ServiceContainerTest.php
@@ -1,5 +1,10 @@
 <?php
 
+use XcVm\Core\Container\Psr\NotFoundException;
+use XcVm\Core\Container\Psr\NotFoundExceptionInterface;
+use XcVm\Core\Container\Psr\ContainerExceptionInterface;
+use XcVm\Core\Container\Psr\ContainerInterface;
+use XcVm\Core\Container\ServiceContainer;
 use PHPUnit\Framework\TestCase;
 
 final class ServiceContainerTest extends TestCase {