diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
index 86f0546e7..1bc88c84b 100644
--- a/library/Icinga/Application/Modules/Module.php
+++ b/library/Icinga/Application/Modules/Module.php
@@ -272,9 +272,9 @@ class Module
             $moduleName = ucfirst($this->getName());
             $moduleLibraryDir = $this->getLibDir(). '/'. $moduleName;
 
-            $this->app->getLoader()->registerNamespace($moduleName, $moduleLibraryDir);
+            $this->app->getLoader()->registerNamespace('Icinga\\Module\\' . $moduleName, $moduleLibraryDir);
             if (is_dir($this->getFormDir())) {
-                $this->app->getLoader()->registerNamespace($moduleName. '\\Form', $this->getFormDir());
+                $this->app->getLoader()->registerNamespace('Icinga\\Module\\' . $moduleName. '\\Form', $this->getFormDir());
             }
         }