diff --git a/library/Icinga/Application/Loader.php b/library/Icinga/Application/Loader.php
index 6a625f8e7..6853ca3e3 100755
--- a/library/Icinga/Application/Loader.php
+++ b/library/Icinga/Application/Loader.php
@@ -40,6 +40,9 @@ class Loader
      */
     private $namespaces = array();
 
+    /**
+     * Detach spl autoload method from stack
+     */
     public function __destruct()
     {
         $this->unRegister();
diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
index e95e4d805..ceb159a1d 100644
--- a/library/Icinga/Application/Modules/Module.php
+++ b/library/Icinga/Application/Modules/Module.php
@@ -30,6 +30,11 @@ use Icinga\Application\Config;
 use Icinga\Web\Hook;
 use Zend_Controller_Router_Route as Route;
 
+/**
+ * Module handling
+ *
+ * Register modules and initialize it
+ */
 class Module
 {
     /**
@@ -112,6 +117,11 @@ class Module
         return true;
     }
 
+    /**
+     * Test for an enabled module by name
+     * @param string $name
+     * @return boolean
+     */
     public static function exists($name)
     {
         return Icinga::app()->moduleManager()->hasEnabled($name);
@@ -215,9 +225,6 @@ class Module
 
             $this->app->getLoader()->registerNamespace($moduleName, $moduleLibraryDir);
 
-            // TODO(mh): Old namespace for convenience (#4409). Should be removed immediately
-            $this->app->getLoader()->registerNamespace('Icinga\\'. $moduleName, $moduleLibraryDir);
-
             $this->app->getLoader()->registerNamespace($moduleName. '\\Form', $this->getFormDir());
         }
 
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 67d496051..6aace688c 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -3,7 +3,7 @@
 use Icinga\Web\ModuleActionController;
 use Icinga\Web\Hook;
 use Icinga\File\Csv;
-use Icinga\Monitoring\Backend;
+use Monitoring\Backend;
 
 class Monitoring_ListController extends ModuleActionController
 {
diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index 6755b13b1..cb3314893 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -1,10 +1,10 @@
 <?php
 
-use Icinga\Monitoring\Backend;
+use Monitoring\Backend;
 use Icinga\Web\ModuleActionController;
 use Icinga\Web\Hook;
-use Icinga\Monitoring\Object\Host;
-use Icinga\Monitoring\Object\Service;
+use Monitoring\Object\Host;
+use Monitoring\Object\Service;
 
 class Monitoring_ShowController extends ModuleActionController
 {
diff --git a/modules/monitoring/application/controllers/SoapController.php b/modules/monitoring/application/controllers/SoapController.php
index f88f7da59..d6a7a1d80 100644
--- a/modules/monitoring/application/controllers/SoapController.php
+++ b/modules/monitoring/application/controllers/SoapController.php
@@ -2,7 +2,7 @@
 
 use Icinga\Web\ModuleActionController;
 use Icinga\Web\Url;
-use Icinga\Monitoring\Backend;
+use Monitoring\Backend;
 use Zend_Soap_Server as ZfSoapServer;
 use Zend_Soap_AutoDiscover as ZfSoapAutoDiscover;
 
diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index f7ae4672f..73590234c 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -1,6 +1,6 @@
 <?php
 
-use Icinga\Monitoring\Plugin\PerfdataSet;
+use Monitoring\Plugin\PerfdataSet;
 
 class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
 {
diff --git a/modules/monitoring/application/views/scripts/show/history.phtml b/modules/monitoring/application/views/scripts/show/history.phtml
index 9dad5e6f0..92d25fd07 100644
--- a/modules/monitoring/application/views/scripts/show/history.phtml
+++ b/modules/monitoring/application/views/scripts/show/history.phtml
@@ -27,7 +27,7 @@ $row_class = array_key_exists($event->state, $states) ? $states[$event->state] :
 <? if (! $object): ?>
 <td><?= $this->escape($event->host_name) ?></td>
 <? endif ?>
-<? if (! $object instanceof Icinga\Monitoring\Object\Service): ?>
+<? if (! $object instanceof Monitoring\Object\Service): ?>
 <td><? if ($object): ?>
 <?= $this->qlink(
     $event->service_description,
diff --git a/modules/monitoring/bin/action/list.inc.php b/modules/monitoring/bin/action/list.inc.php
index c46d14a81..cb6debf1c 100644
--- a/modules/monitoring/bin/action/list.inc.php
+++ b/modules/monitoring/bin/action/list.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-use Icinga\Monitoring\Backend;
+use Monitoring\Backend;
 use Icinga\Util\Format;
 
 $backend = Backend::getInstance($params->shift('backend'));
diff --git a/modules/monitoring/library/Monitoring/Backend.php b/modules/monitoring/library/Monitoring/Backend.php
index 92f03b323..d67030713 100644
--- a/modules/monitoring/library/Monitoring/Backend.php
+++ b/modules/monitoring/library/Monitoring/Backend.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring;
+namespace Monitoring;
 
 use Icinga\Application\Config as IcingaConfig;
 use Icinga\Authentication\Manager as AuthManager;
@@ -62,7 +62,7 @@ class Backend
             $config = self::$backendConfigs[$name];
             $type = $config->type;
             $type[0] = strtoupper($type[0]);
-            $class = '\\Icinga\\Monitoring\\Backend\\' . $type;
+            $class = '\\Monitoring\\Backend\\' . $type;
             self::$instances[$name] = new $class($config);
         }
         return self::$instances[$name];
diff --git a/modules/monitoring/library/Monitoring/Backend/AbstractBackend.php b/modules/monitoring/library/Monitoring/Backend/AbstractBackend.php
index 82ca86126..8b47da9a5 100644
--- a/modules/monitoring/library/Monitoring/Backend/AbstractBackend.php
+++ b/modules/monitoring/library/Monitoring/Backend/AbstractBackend.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Backend;
+namespace Monitoring\Backend;
 
 use Icinga\Data\DatasourceInterface;
 use Icinga\Exception\ProgrammingError;
@@ -66,7 +66,7 @@ class AbstractBackend implements DatasourceInterface
 
     protected function tableToClassName($virtual_table)
     {
-        return 'Icinga\\Monitoring\\View\\'
+        return 'Monitoring\\View\\'
              // . $this->getName()
              // . '\\'
              . ucfirst($virtual_table)
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido.php b/modules/monitoring/library/Monitoring/Backend/Ido.php
index b456d1957..9af41fdd5 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Icinga\Monitoring\Backend;
+namespace Monitoring\Backend;
 
 use Icinga\Data\Db\Connection;
 
 /**
  * This class provides an easy-to-use interface to the IDO database
  *
- * You should usually not directly use this class but go through Icinga\Monitoring\Backend.
+ * You should usually not directly use this class but go through Monitoring\Backend.
  *
  * New MySQL indexes:
  * <code>
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/AbstractQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/AbstractQuery.php
index 3f8c877f4..9f057d455 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/AbstractQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/AbstractQuery.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Backend\Ido\Query;
+namespace Monitoring\Backend\Ido\Query;
 
 use Icinga\Data\Db\Query;
 use Icinga\Application\Benchmark;
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
index 49692a949..1cdd90304 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Backend\Ido\Query;
+namespace Monitoring\Backend\Ido\Query;
 
 class CommentQuery extends AbstractQuery
 {
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
index ca81845b5..9e035c0c9 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Backend\Ido\Query;
+namespace Monitoring\Backend\Ido\Query;
 
 class ContactQuery extends AbstractQuery
 {
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
index e4fb8e788..318623ec2 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Backend\Ido\Query;
+namespace Monitoring\Backend\Ido\Query;
 
 class ContactgroupQuery extends AbstractQuery
 {
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php
index d12b3f416..cc64c4902 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Backend\Ido\Query;
+namespace Monitoring\Backend\Ido\Query;
 
 class CustomvarQuery extends AbstractQuery
 {
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
index b8ab36e46..356bfae39 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Backend\Ido\Query;
+namespace Monitoring\Backend\Ido\Query;
 
 use Icinga\Exception\ProgrammingError;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
index b5245c220..fe80aa092 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Backend\Ido\Query;
+namespace Monitoring\Backend\Ido\Query;
 
 class HostgroupQuery extends AbstractQuery
 {
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index a98037c5a..52b5bb56e 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Backend\Ido\Query;
+namespace Monitoring\Backend\Ido\Query;
 
 class HoststatusQuery extends AbstractQuery
 {
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
index 5ee261010..1b01306bc 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Backend\Ido\Query;
+namespace Monitoring\Backend\Ido\Query;
 
 class ServicegroupQuery extends AbstractQuery
 {
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
index 3b24dbca8..c2abc8ede 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Backend\Ido\Query;
+namespace Monitoring\Backend\Ido\Query;
 
 class ServicestatusQuery extends AbstractQuery
 {
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
index e68f64260..91a98a1c7 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Backend\Ido\Query;
+namespace Monitoring\Backend\Ido\Query;
 
 class StatusQuery extends AbstractQuery
 {
diff --git a/modules/monitoring/library/Monitoring/Backend/Livestatus.php b/modules/monitoring/library/Monitoring/Backend/Livestatus.php
index 0cc038291..6a552b298 100644
--- a/modules/monitoring/library/Monitoring/Backend/Livestatus.php
+++ b/modules/monitoring/library/Monitoring/Backend/Livestatus.php
@@ -3,9 +3,9 @@
 /**
  * Icinga Livestatus Backend
  *
- * @package Icinga\Monitoring
+ * @package Monitoring
  */
-namespace Icinga\Monitoring\Backend;
+namespace Monitoring\Backend;
 
 use Icinga\Protocol\Livestatus\Connection;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusQuery.php
index 08fcfa1c8..ece3c02c0 100644
--- a/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusQuery.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Backend\Livestatus\Query;
+namespace Monitoring\Backend\Livestatus\Query;
 
 use Icinga\Data\AbstractQuery;
 
diff --git a/modules/monitoring/library/Monitoring/Environment.php b/modules/monitoring/library/Monitoring/Environment.php
index bf198db4f..8d4e4e5cf 100644
--- a/modules/monitoring/library/Monitoring/Environment.php
+++ b/modules/monitoring/library/Monitoring/Environment.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring;
+namespace Monitoring;
 
 use Icinga\Application\Config;
 use Icinga\Web\Session;
diff --git a/modules/monitoring/library/Monitoring/Object/AbstractObject.php b/modules/monitoring/library/Monitoring/Object/AbstractObject.php
index 0b1748231..f8b415dc7 100644
--- a/modules/monitoring/library/Monitoring/Object/AbstractObject.php
+++ b/modules/monitoring/library/Monitoring/Object/AbstractObject.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Icinga\Monitoring\Object;
+namespace Monitoring\Object;
 
 use Icinga\Data\AbstractQuery as Query;
-use Icinga\Monitoring\Backend\AbstractBackend;
+use Monitoring\Backend\AbstractBackend;
 
 abstract class AbstractObject
 {
diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
index b6b852273..9d9928522 100644
--- a/modules/monitoring/library/Monitoring/Object/Host.php
+++ b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Object;
+namespace Monitoring\Object;
 
 use Icinga\Data\AbstractQuery as Query;
 
diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index aa6133146..1753456cd 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Object;
+namespace Monitoring\Object;
 
 use Icinga\Data\AbstractQuery as Query;
 
diff --git a/modules/monitoring/library/Monitoring/Plugin.php b/modules/monitoring/library/Monitoring/Plugin.php
index 80475f5d9..d83100e1c 100644
--- a/modules/monitoring/library/Monitoring/Plugin.php
+++ b/modules/monitoring/library/Monitoring/Plugin.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring;
+namespace Monitoring;
 
 require_once ICINGA_LIBDIR . '/Icinga/Application/Cli.php';
 
diff --git a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
index 214383c4c..40d386048 100644
--- a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
+++ b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Plugin;
+namespace Monitoring\Plugin;
 
 class Perfdata
 {
diff --git a/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php b/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php
index e43a7c56c..dc35cd43c 100644
--- a/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php
+++ b/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Plugin;
+namespace Monitoring\Plugin;
 
 class PerfdataSet
 {
diff --git a/modules/monitoring/library/Monitoring/View/CommentView.php b/modules/monitoring/library/Monitoring/View/CommentView.php
index b5fbaf1e4..ca5a123e5 100644
--- a/modules/monitoring/library/Monitoring/View/CommentView.php
+++ b/modules/monitoring/library/Monitoring/View/CommentView.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\View;
+namespace Monitoring\View;
 
 class CommentView extends MonitoringView
 {
diff --git a/modules/monitoring/library/Monitoring/View/ContactView.php b/modules/monitoring/library/Monitoring/View/ContactView.php
index 11b015b63..ac9ce176e 100644
--- a/modules/monitoring/library/Monitoring/View/ContactView.php
+++ b/modules/monitoring/library/Monitoring/View/ContactView.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\View;
+namespace Monitoring\View;
 
 class ContactView extends MonitoringView
 {
diff --git a/modules/monitoring/library/Monitoring/View/ContactgroupView.php b/modules/monitoring/library/Monitoring/View/ContactgroupView.php
index 0f4b0c36c..f1b94f820 100644
--- a/modules/monitoring/library/Monitoring/View/ContactgroupView.php
+++ b/modules/monitoring/library/Monitoring/View/ContactgroupView.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\View;
+namespace Monitoring\View;
 
 class ContactgroupView extends MonitoringView
 {
diff --git a/modules/monitoring/library/Monitoring/View/CustomvarView.php b/modules/monitoring/library/Monitoring/View/CustomvarView.php
index 37e45ebf0..9070663ad 100644
--- a/modules/monitoring/library/Monitoring/View/CustomvarView.php
+++ b/modules/monitoring/library/Monitoring/View/CustomvarView.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\View;
+namespace Monitoring\View;
 
 class CustomvarView extends MonitoringView
 {
diff --git a/modules/monitoring/library/Monitoring/View/EventHistoryView.php b/modules/monitoring/library/Monitoring/View/EventHistoryView.php
index 68c38e87d..16a90158d 100644
--- a/modules/monitoring/library/Monitoring/View/EventHistoryView.php
+++ b/modules/monitoring/library/Monitoring/View/EventHistoryView.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\View;
+namespace Monitoring\View;
 
 class EventHistoryView extends MonitoringView
 {
diff --git a/modules/monitoring/library/Monitoring/View/HostgroupView.php b/modules/monitoring/library/Monitoring/View/HostgroupView.php
index 61e204b49..94933b666 100644
--- a/modules/monitoring/library/Monitoring/View/HostgroupView.php
+++ b/modules/monitoring/library/Monitoring/View/HostgroupView.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\View;
+namespace Monitoring\View;
 
 class HostgroupView extends MonitoringView
 {
diff --git a/modules/monitoring/library/Monitoring/View/HoststatusView.php b/modules/monitoring/library/Monitoring/View/HoststatusView.php
index a2a23ea45..65733ae79 100644
--- a/modules/monitoring/library/Monitoring/View/HoststatusView.php
+++ b/modules/monitoring/library/Monitoring/View/HoststatusView.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\View;
+namespace Monitoring\View;
 
 class HoststatusView extends MonitoringView
 {
diff --git a/modules/monitoring/library/Monitoring/View/MonitoringView.php b/modules/monitoring/library/Monitoring/View/MonitoringView.php
index 11aad5101..6e4766276 100644
--- a/modules/monitoring/library/Monitoring/View/MonitoringView.php
+++ b/modules/monitoring/library/Monitoring/View/MonitoringView.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\View;
+namespace Monitoring\View;
 
 use Icinga\Data\AbstractQuery;
 use Icinga\Data\Filter;
@@ -13,11 +13,11 @@ use Icinga\Data\Filter;
  *
  * You should not directly instantiate such a view but always go through the
  * Monitoring Backend. Using the Backend's select() method selecting from
- * 'virtualtable' returns a Icinga\Monitoring\View\VirtualtableView instance.
+ * 'virtualtable' returns a Monitoring\View\VirtualtableView instance.
  *
  * Usage example:
  * <code>
- * use Icinga\Monitoring\Backend;
+ * use Monitoring\Backend;
  * $backend = Backend::getInstance();
  * $query = $backend->select()->from('viewname', array(
  *     'one_column',
diff --git a/modules/monitoring/library/Monitoring/View/ServicegroupView.php b/modules/monitoring/library/Monitoring/View/ServicegroupView.php
index 3401af68c..da872a6c7 100644
--- a/modules/monitoring/library/Monitoring/View/ServicegroupView.php
+++ b/modules/monitoring/library/Monitoring/View/ServicegroupView.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\View;
+namespace Monitoring\View;
 
 class ServicegroupView extends MonitoringView
 {
diff --git a/modules/monitoring/library/Monitoring/View/StatusView.php b/modules/monitoring/library/Monitoring/View/StatusView.php
index 7c8a67dc1..b99bd2058 100644
--- a/modules/monitoring/library/Monitoring/View/StatusView.php
+++ b/modules/monitoring/library/Monitoring/View/StatusView.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\View;
+namespace Monitoring\View;
 
 class StatusView extends MonitoringView
 {