diff --git a/src/Core/Events/AbstractEvent.php b/src/Core/Events/AbstractEvent.php
index 6fce3665..aca1539e 100644
--- a/src/Core/Events/AbstractEvent.php
+++ b/src/Core/Events/AbstractEvent.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace XcVm\Core\Events;
+use XcVm\Core\Events\Contract\StoppableEventInterface;
+
 /**
  * Base class for stoppable events.
  *
diff --git a/src/Core/Events/Auth/UserAuthenticatedEvent.php b/src/Core/Events/Auth/UserAuthenticatedEvent.php
index bf9c569a..b0fea934 100644
--- a/src/Core/Events/Auth/UserAuthenticatedEvent.php
+++ b/src/Core/Events/Auth/UserAuthenticatedEvent.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace XcVm\Core\Events\Auth;
+
 /**
  * Fired after a user successfully authenticates.
  *
diff --git a/src/Core/Events/Auth/UserLoggedOutEvent.php b/src/Core/Events/Auth/UserLoggedOutEvent.php
index 805b654e..2a4f9d4a 100644
--- a/src/Core/Events/Auth/UserLoggedOutEvent.php
+++ b/src/Core/Events/Auth/UserLoggedOutEvent.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace XcVm\Core\Events\Auth;
+
 /**
  * Fired after a user session is terminated.
  *
diff --git a/src/Core/Events/Contract/StoppableEventInterface.php b/src/Core/Events/Contract/StoppableEventInterface.php
index 2f9bac77..26b26c1e 100644
--- a/src/Core/Events/Contract/StoppableEventInterface.php
+++ b/src/Core/Events/Contract/StoppableEventInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace XcVm\Core\Events\Contract;
+
 /**
  * Marks an event as stoppable — listeners can halt further propagation.
  *
diff --git a/src/Core/Events/EventDispatcher.php b/src/Core/Events/EventDispatcher.php
index d5e5b748..484b7ac1 100644
--- a/src/Core/Events/EventDispatcher.php
+++ b/src/Core/Events/EventDispatcher.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace XcVm\Core\Events;
+use XcVm\Core\Events\Contract\StoppableEventInterface;
+
 use XcVm\Core\Module\ModuleLoader;
 /**
  * Event dispatcher with PSR-14-style typed events and priority-ordered listeners.
diff --git a/src/Core/Events/ListenerProvider.php b/src/Core/Events/ListenerProvider.php
index 93c726a8..a7091fda 100644
--- a/src/Core/Events/ListenerProvider.php
+++ b/src/Core/Events/ListenerProvider.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace XcVm\Core\Events;
+
 /**
  * Registry of event listeners with per-event priority ordering.
  *
diff --git a/src/Core/Events/ListensTo.php b/src/Core/Events/ListensTo.php
index 05689740..53fe3117 100644
--- a/src/Core/Events/ListensTo.php
+++ b/src/Core/Events/ListensTo.php
@@ -1,6 +1,8 @@
 <?php
 
 declare(strict_types=1);
+namespace XcVm\Core\Events;
+
 
 /**
  * Declarative listener registration via PHP 8.1 attribute.
diff --git a/src/Core/Events/Module/ModuleBootedEvent.php b/src/Core/Events/Module/ModuleBootedEvent.php
index 02bcbb25..db62c446 100644
--- a/src/Core/Events/Module/ModuleBootedEvent.php
+++ b/src/Core/Events/Module/ModuleBootedEvent.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace XcVm\Core\Events\Module;
+
 use XcVm\Core\Module\ModuleLoader;
 /**
  * Fired by ModuleLoader after a module's boot() has been called.
diff --git a/src/Core/Events/Module/ModuleLoadedEvent.php b/src/Core/Events/Module/ModuleLoadedEvent.php
index f5992734..4b460c34 100644
--- a/src/Core/Events/Module/ModuleLoadedEvent.php
+++ b/src/Core/Events/Module/ModuleLoadedEvent.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace XcVm\Core\Events\Module;
+
 use XcVm\Core\Module\ModuleLoader;
 /**
  * Fired by ModuleLoader after a module class is instantiated and stored.
diff --git a/src/Core/Events/Module/PackageInstalledEvent.php b/src/Core/Events/Module/PackageInstalledEvent.php
index 866d967d..23b1d9e8 100644
--- a/src/Core/Events/Module/PackageInstalledEvent.php
+++ b/src/Core/Events/Module/PackageInstalledEvent.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace XcVm\Core\Events\Module;
+
 /**
  * Fired after XC_VM::module_install() completes successfully.
  *
diff --git a/src/Core/Events/Settings/SettingsChangedEvent.php b/src/Core/Events/Settings/SettingsChangedEvent.php
index 224764c8..9b4671db 100644
--- a/src/Core/Events/Settings/SettingsChangedEvent.php
+++ b/src/Core/Events/Settings/SettingsChangedEvent.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace XcVm\Core\Events\Settings;
+
 /**
  * Fired after panel settings are saved.
  *
diff --git a/src/Core/Events/Stream/StreamStartedEvent.php b/src/Core/Events/Stream/StreamStartedEvent.php
index 39b2976e..1a777540 100644
--- a/src/Core/Events/Stream/StreamStartedEvent.php
+++ b/src/Core/Events/Stream/StreamStartedEvent.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace XcVm\Core\Events\Stream;
+
 /**
  * Fired after a stream has successfully started.
  *
diff --git a/src/Core/Events/Stream/StreamStartingEvent.php b/src/Core/Events/Stream/StreamStartingEvent.php
index 16abbcd6..e838291f 100644
--- a/src/Core/Events/Stream/StreamStartingEvent.php
+++ b/src/Core/Events/Stream/StreamStartingEvent.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace XcVm\Core\Events\Stream;
+use XcVm\Core\Events\AbstractEvent;
+
 /**
  * Fired before a stream starts — stoppable.
  *
diff --git a/src/Core/Events/Stream/StreamStoppedEvent.php b/src/Core/Events/Stream/StreamStoppedEvent.php
index a07f0def..721dcaf4 100644
--- a/src/Core/Events/Stream/StreamStoppedEvent.php
+++ b/src/Core/Events/Stream/StreamStoppedEvent.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace XcVm\Core\Events\Stream;
+
 /**
  * Fired after a stream session ends (normally or via abort).
  *
diff --git a/src/Core/Module/ModuleLoader.php b/src/Core/Module/ModuleLoader.php
index a99e227e..3bf654f7 100644
--- a/src/Core/Module/ModuleLoader.php
+++ b/src/Core/Module/ModuleLoader.php
@@ -1,6 +1,8 @@
 <?php
 
 namespace XcVm\Core\Module;
+use XcVm\Core\Events\ListensTo;
+use XcVm\Core\Events\EventDispatcher;
 use XcVm\Core\Container\ServiceContainer;
 use XcVm\Core\Module\Contract\StreamMiddlewareProviderInterface;
 use XcVm\Core\Module\Contract\ServiceProviderInterface;
@@ -611,13 +613,13 @@ class ModuleLoader {
      *   1. getEventSubscribers() — legacy array API:
      *        ['EventClass' => callable]  or  ['EventClass' => [callable, $priority]]
      *
-     *   2. #[\ListensTo] attribute — declarative PHP 8.1 attribute on public methods:
-     *        #[\ListensTo(SomeEvent::class, priority: 10)]
+     *   2. #[\XcVm\Core\Events\ListensTo] attribute — declarative PHP 8.1 attribute on public methods:
+     *        #[\XcVm\Core\Events\ListensTo(SomeEvent::class, priority: 10)]
      *        public function onSome(SomeEvent $e): void { ... }
      *
      * Both paths are additive — using one does not disable the other.
      *
-     * If the event class named in a #[\ListensTo] attribute does not exist at
+     * If the event class named in a #[\XcVm\Core\Events\ListensTo] attribute does not exist at
      * registration time the listener is silently skipped (graceful degradation).
      *
      * @param ServiceProviderInterface $module
@@ -625,9 +627,9 @@ class ModuleLoader {
      * @return 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) {
+        // Verify the container holds an actual \XcVm\Core\Events\EventDispatcher instance (not just the class name).
+        // Static calls below route to the same instance via \XcVm\Core\Events\EventDispatcher::getInstance().
+        if (!$container->has('events') || !$container->get('events') instanceof \XcVm\Core\Events\EventDispatcher) {
             return;
         }
 
@@ -636,22 +638,22 @@ class ModuleLoader {
         foreach ($subscribers as $event => $handler) {
             if (is_array($handler) && isset($handler[0]) && is_callable($handler[0])) {
                 // [callable, int $priority] tuple — new PSR-14 style
-                \EventDispatcher::listen($event, $handler[0], $handler[1] ?? 0);
+                \XcVm\Core\Events\EventDispatcher::listen($event, $handler[0], $handler[1] ?? 0);
             } else {
                 // Legacy: string event name or class-string, plain callable
-                \EventDispatcher::listen($event, $handler);
+                \XcVm\Core\Events\EventDispatcher::listen($event, $handler);
             }
         }
 
-        // ── 2. #[\ListensTo] attribute scan via Reflection ─────────────────
+        // ── 2. #[\XcVm\Core\Events\ListensTo] attribute scan via Reflection ─────────────────
         $reflection = new \ReflectionClass($module);
         foreach ($reflection->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
-            $attributes = $method->getAttributes(\ListensTo::class);
+            $attributes = $method->getAttributes(\XcVm\Core\Events\ListensTo::class);
             if (empty($attributes)) {
                 continue;
             }
             foreach ($attributes as $attribute) {
-                /** @var \ListensTo $listensTo */
+                /** @var \XcVm\Core\Events\ListensTo $listensTo */
                 $listensTo = $attribute->newInstance();
 
                 // Graceful degradation: skip if the event class is not (yet) loadable.
@@ -659,7 +661,7 @@ class ModuleLoader {
                     continue;
                 }
 
-                \EventDispatcher::listen(
+                \XcVm\Core\Events\EventDispatcher::listen(
                     $listensTo->eventClass,
                     [$module, $method->getName()],
                     $listensTo->priority,
diff --git a/src/Core/Module/ModuleManager.php b/src/Core/Module/ModuleManager.php
index ee7a90b0..21fc00a8 100644
--- a/src/Core/Module/ModuleManager.php
+++ b/src/Core/Module/ModuleManager.php
@@ -1,6 +1,8 @@
 <?php
 
 namespace XcVm\Core\Module;
+use XcVm\Core\Events\Module\PackageInstalledEvent;
+use XcVm\Core\Events\EventDispatcher;
 use XcVm\Core\Container\ServiceContainer;
 
 use XcVm\Core\Http\Router;
@@ -480,7 +482,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
+     * Fires \XcVm\Core\Events\Module\PackageInstalledEvent and hot-reloads the module into the
      * current \XcVm\Core\Container\ServiceContainer without requiring a PHP-FPM restart.
      *
      * @param string      $slug    Module slug as listed on the platform.
@@ -515,7 +517,7 @@ class ModuleManager {
             // installs); the module's module.json/getVersion() may lag behind.
             $this->installModule($slug, $resolvedVersion);
 
-            \EventDispatcher::dispatch(new \PackageInstalledEvent(
+            \XcVm\Core\Events\EventDispatcher::dispatch(new \XcVm\Core\Events\Module\PackageInstalledEvent(
                 slug:        $result['module'],
                 version:     $resolvedVersion,
                 path:        $modulePath,
@@ -760,7 +762,7 @@ class ModuleManager {
     public function deployFromPlatformFilesOnly(string $slug, string $version, ?string $apiKey = null): void {
         $result = $this->pullFilesFromPlatform($slug, $version, $apiKey);
 
-        \EventDispatcher::dispatch(new \PackageInstalledEvent(
+        \XcVm\Core\Events\EventDispatcher::dispatch(new \XcVm\Core\Events\Module\PackageInstalledEvent(
             slug:        $result['module'],
             version:     $result['version'],
             path:        $result['path'],
diff --git a/src/bootstrap.php b/src/bootstrap.php
index 9c5ec7cd..c74066f1 100644
--- a/src/bootstrap.php
+++ b/src/bootstrap.php
@@ -54,6 +54,7 @@
  */
 
 declare(strict_types=0);
+use XcVm\Core\Events\EventDispatcher;
 use XcVm\Core\Container\ServiceContainer;
 use XcVm\Core\Database\Database;
 use XcVm\Core\Database\DatabaseHandler;
diff --git a/tests/Unit/ComposerDiscoveryTest.php b/tests/Unit/ComposerDiscoveryTest.php
index a3fc3cc3..859fd9ab 100644
--- a/tests/Unit/ComposerDiscoveryTest.php
+++ b/tests/Unit/ComposerDiscoveryTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Events\EventDispatcher;
 use XcVm\Core\Container\ServiceContainer;
 use XcVm\Core\Module\ModuleLoader;
 use XcVm\Core\Module\NavbarRegistry;
diff --git a/tests/Unit/EventDispatcherTest.php b/tests/Unit/EventDispatcherTest.php
index 343badfc..9533499c 100644
--- a/tests/Unit/EventDispatcherTest.php
+++ b/tests/Unit/EventDispatcherTest.php
@@ -1,5 +1,8 @@
 <?php
 
+use XcVm\Core\Events\Contract\StoppableEventInterface;
+use XcVm\Core\Events\EventDispatcher;
+use XcVm\Core\Events\AbstractEvent;
 use PHPUnit\Framework\TestCase;
 
 final class EventDispatcherTest extends TestCase {
diff --git a/tests/Unit/InterfaceContractTest.php b/tests/Unit/InterfaceContractTest.php
index 439e6c30..e8dacb48 100644
--- a/tests/Unit/InterfaceContractTest.php
+++ b/tests/Unit/InterfaceContractTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use XcVm\Core\Events\ListensTo;
+use XcVm\Core\Events\EventDispatcher;
 use XcVm\Core\Container\ServiceContainer;
 use XcVm\Core\Module\Contract\StreamMiddlewareProviderInterface;
 use XcVm\Core\Module\Contract\ServiceProviderInterface;
diff --git a/tests/Unit/ListensToAttributeTest.php b/tests/Unit/ListensToAttributeTest.php
index cf90f16a..597c86f6 100644
--- a/tests/Unit/ListensToAttributeTest.php
+++ b/tests/Unit/ListensToAttributeTest.php
@@ -1,8 +1,10 @@
 <?php
 
+use XcVm\Core\Events\EventDispatcher;
 use XcVm\Core\Container\ServiceContainer;
 use XcVm\Core\Module\ModuleLoader;
 use XcVm\Core\Module\BaseModule;
+use XcVm\Core\Events\ListensTo;
 use PHPUnit\Framework\TestCase;
 
 final class ListensToTestEventAlpha {}
@@ -178,7 +180,7 @@ final class ListensToAttributeTest extends TestCase {
 <?php
 namespace {$ns};
 use XcVm\Core\Module\BaseModule;
-use ListensTo;
+use XcVm\Core\Events\ListensTo;
 use ListensToTestEventAlpha;
 class {$cls} extends BaseModule {
     public function getName(): string    { return '{$name}'; }
@@ -216,7 +218,7 @@ PHP);
 <?php
 namespace {$ns};
 use XcVm\Core\Module\BaseModule;
-use ListensTo;
+use XcVm\Core\Events\ListensTo;
 use ListensToTestEventAlpha;
 use ListensToTestEventBeta;
 class {$cls} extends BaseModule {
@@ -241,7 +243,7 @@ PHP);
 <?php
 namespace {$ns};
 use XcVm\Core\Module\BaseModule;
-use ListensTo;
+use XcVm\Core\Events\ListensTo;
 use ListensToTestEventAlpha;
 use ListensToTestEventBeta;
 class {$cls} extends BaseModule {
@@ -264,7 +266,7 @@ PHP);
 <?php
 namespace {$ns};
 use XcVm\Core\Module\BaseModule;
-use ListensTo;
+use XcVm\Core\Events\ListensTo;
 class {$cls} extends BaseModule {
     public function getName(): string    { return '{$name}'; }
     public function getVersion(): string { return '1.0.0'; }
diff --git a/tests/Unit/ModuleLoaderBootTest.php b/tests/Unit/ModuleLoaderBootTest.php
index c6489ffd..8c6de78b 100644
--- a/tests/Unit/ModuleLoaderBootTest.php
+++ b/tests/Unit/ModuleLoaderBootTest.php
@@ -5,6 +5,7 @@ use XcVm\Core\Module\ModuleLoader;
 use XcVm\Core\Module\NavbarRegistry;
 use XcVm\Core\Module\ModuleInterface;
 use XcVm\Core\Container\ServiceContainer;
+use XcVm\Core\Events\EventDispatcher;
 use PHPUnit\Framework\TestCase;
 
 // Shared tracker — loaded by PHPUnit before any module PHP file is require_once'd by ModuleLoader.
diff --git a/tests/Unit/ModuleLoaderPsr4ResolverTest.php b/tests/Unit/ModuleLoaderPsr4ResolverTest.php
index c13132e4..bcf946a7 100644
--- a/tests/Unit/ModuleLoaderPsr4ResolverTest.php
+++ b/tests/Unit/ModuleLoaderPsr4ResolverTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Events\EventDispatcher;
 use XcVm\Core\Container\ServiceContainer;
 use XcVm\Core\Module\ModuleLoader;
 use XcVm\Core\Module\NavbarRegistry;