From c86874d4ba6093c390a2670de9f727acebd78d9d Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 20 Aug 2013 15:32:25 +0200
Subject: [PATCH] =?UTF-8?q?Rename=20namespace=20Monitoring=20to=20Icing?=
 =?UTF-8?q?=C3=A6\Module\Monitoring?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

refs #4586
---
 .../controllers/CommandController.php         | 20 +++++++++----------
 .../controllers/ListController.php            |  3 +--
 .../controllers/ShowController.php            |  7 +++----
 .../forms/Command/AcknowledgeForm.php         |  2 +-
 .../application/forms/Command/CommandForm.php |  2 +-
 .../Command/CommandWithIdentifierForm.php     |  2 +-
 .../application/forms/Command/CommentForm.php |  2 +-
 .../forms/Command/CustomNotificationForm.php  |  2 +-
 .../forms/Command/DelayNotificationForm.php   |  2 +-
 .../forms/Command/RescheduleNextCheckForm.php |  2 +-
 .../forms/Command/ScheduleDowntimeForm.php    |  2 +-
 .../Command/SubmitPassiveCheckResultForm.php  |  2 +-
 .../forms/Command/WithChildrenCommandForm.php |  2 +-
 .../views/helpers/MonitoringCommands.php      |  2 +-
 .../application/views/helpers/Perfdata.php    |  2 +-
 modules/monitoring/bin/action/list.inc.php    |  2 +-
 .../monitoring/library/Monitoring/Backend.php |  5 ++---
 .../Monitoring/Backend/AbstractBackend.php    |  4 ++--
 .../library/Monitoring/Backend/Ido.php        |  2 +-
 .../Backend/Ido/Query/AbstractQuery.php       |  2 +-
 .../Backend/Ido/Query/CommentQuery.php        |  2 +-
 .../Backend/Ido/Query/ContactQuery.php        |  2 +-
 .../Backend/Ido/Query/ContactgroupQuery.php   |  2 +-
 .../Backend/Ido/Query/CustomvarQuery.php      |  2 +-
 .../Backend/Ido/Query/DowntimeQuery.php       |  2 +-
 .../Backend/Ido/Query/EventHistoryQuery.php   |  2 +-
 .../Backend/Ido/Query/HostgroupQuery.php      |  2 +-
 .../Backend/Ido/Query/HoststatusQuery.php     |  2 +-
 .../Backend/Ido/Query/NotificationQuery.php   |  2 +-
 .../Backend/Ido/Query/ServicegroupQuery.php   |  2 +-
 .../Backend/Ido/Query/ServicestatusQuery.php  |  2 +-
 .../Backend/Ido/Query/StatusQuery.php         |  2 +-
 .../library/Monitoring/Backend/Livestatus.php |  2 +-
 .../Backend/Livestatus/Query/StatusQuery.php  |  2 +-
 .../library/Monitoring/Backend/Statusdat.php  |  2 +-
 .../Backend/Statusdat/Criteria/Filter.php     |  2 +-
 .../Backend/Statusdat/Criteria/Order.php      |  2 +-
 .../Statusdat/DataView/HostStatusView.php     |  2 +-
 .../Statusdat/DataView/ServiceStatusView.php  |  2 +-
 .../DataView/StatusdatServiceView.php         |  2 +-
 .../Statusdat/Query/GroupsummaryQuery.php     |  2 +-
 .../Statusdat/Query/HostgroupsummaryQuery.php |  2 +-
 .../Backend/Statusdat/Query/HostlistQuery.php |  2 +-
 .../Backend/Statusdat/Query/Query.php         |  4 ++--
 .../Query/ServicegroupsummaryQuery.php        |  2 +-
 .../Statusdat/Query/ServicelistQuery.php      |  2 +-
 .../Backend/Statusdat/Query/StatusQuery.php   |  2 +-
 .../library/Monitoring/Command/Meta.php       |  2 +-
 .../library/Monitoring/Environment.php        |  2 +-
 .../Monitoring/Object/AbstractObject.php      |  4 ++--
 .../library/Monitoring/Object/Host.php        |  2 +-
 .../library/Monitoring/Object/Service.php     |  2 +-
 .../monitoring/library/Monitoring/Plugin.php  |  2 +-
 .../library/Monitoring/Plugin/Perfdata.php    |  2 +-
 .../library/Monitoring/Plugin/PerfdataSet.php |  2 +-
 .../library/Monitoring/View/CommentView.php   |  2 +-
 .../library/Monitoring/View/ContactView.php   |  2 +-
 .../Monitoring/View/ContactgroupView.php      |  2 +-
 .../library/Monitoring/View/CustomvarView.php |  2 +-
 .../library/Monitoring/View/DowntimeView.php  |  2 +-
 .../Monitoring/View/EventHistoryView.php      |  2 +-
 .../library/Monitoring/View/HostgroupView.php |  2 +-
 .../Monitoring/View/HoststatusView.php        |  2 +-
 .../Monitoring/View/MonitoringView.php        |  4 ++--
 .../Monitoring/View/NotificationView.php      |  2 +-
 .../Monitoring/View/ServicegroupView.php      |  2 +-
 .../library/Monitoring/View/StatusView.php    |  2 +-
 .../forms/Command/AcknowledgeFormTest.php     |  2 +-
 .../forms/Command/CommentFormTest.php         |  2 +-
 .../forms/Command/ConfirmationFormTest.php    |  3 +--
 .../ConfirmationWithIdentifierFormTest.php    |  2 +-
 .../Command/CustomNotificationFormTest.php    |  2 +-
 .../Command/DelayNotificationFormTest.php     |  2 +-
 .../Command/RescheduleNextCheckFormTest.php   |  2 +-
 .../Command/ScheduleDowntimeFormTest.php      |  2 +-
 .../Command/SubmitPassiveCheckResultTest.php  |  2 +-
 .../views/helpers/MonitoringCommandsTest.php  |  2 +-
 .../ServicegroupsummaryQueryTest.php          |  4 ++--
 .../test/php/library/Command/MetaTest.php     |  2 +-
 .../php/testlib/MonitoringControllerTest.php  |  6 +++---
 .../Paginator/Adapter/QueryAdapterTest.php    |  2 +-
 .../ScrollingStyle/SlidingWithBorderTest.php  |  2 +-
 82 files changed, 101 insertions(+), 105 deletions(-)

diff --git a/modules/monitoring/application/controllers/CommandController.php b/modules/monitoring/application/controllers/CommandController.php
index 2b3d05afa..ce1dad859 100644
--- a/modules/monitoring/application/controllers/CommandController.php
+++ b/modules/monitoring/application/controllers/CommandController.php
@@ -28,7 +28,6 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 
 use \Icinga\Application\Icinga;
-use \Monitoring\Backend;
 use \Icinga\Application\Config;
 use \Icinga\Application\Logger;
 use \Icinga\Web\Form;
@@ -36,15 +35,16 @@ use \Icinga\Web\Controller\ActionController;
 use \Icinga\Protocol\Commandpipe\CommandPipe;
 use \Icinga\Exception\ConfigurationError;
 use \Icinga\Exception\MissingParameterException;
-use \Monitoring\Form\Command\AcknowledgeForm;
-use \Monitoring\Form\Command\CommentForm;
-use \Monitoring\Form\Command\CommandForm;
-use \Monitoring\Form\Command\CommandWithIdentifierForm;
-use \Monitoring\Form\Command\CustomNotificationForm;
-use \Monitoring\Form\Command\DelayNotificationForm;
-use \Monitoring\Form\Command\RescheduleNextCheckForm;
-use \Monitoring\Form\Command\ScheduleDowntimeForm;
-use \Monitoring\Form\Command\SubmitPassiveCheckResultForm;
+use \Icinga\Module\Monitoring\Backend;
+use \Icinga\Module\Monitoring\Form\Command\AcknowledgeForm;
+use \Icinga\Module\Monitoring\Form\Command\CommentForm;
+use \Icinga\Module\Monitoring\Form\Command\CommandForm;
+use \Icinga\Module\Monitoring\Form\Command\CommandWithIdentifierForm;
+use \Icinga\Module\Monitoring\Form\Command\CustomNotificationForm;
+use \Icinga\Module\Monitoring\Form\Command\DelayNotificationForm;
+use \Icinga\Module\Monitoring\Form\Command\RescheduleNextCheckForm;
+use \Icinga\Module\Monitoring\Form\Command\ScheduleDowntimeForm;
+use \Icinga\Module\Monitoring\Form\Command\SubmitPassiveCheckResultForm;
 
 /**
  * Class Monitoring_CommandController
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index b17412a9e..fc6c3c45e 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -27,7 +27,6 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-
 use \Icinga\Application\Benchmark;
 use \Icinga\Data\Db\Query;
 use \Icinga\File\Csv;
@@ -37,7 +36,7 @@ use \Icinga\Web\Widget\Tabextension\BasketAction;
 use \Icinga\Web\Widget\Tabextension\DashboardAction;
 use \Icinga\Web\Widget\Tabextension\OutputFormat;
 use \Icinga\Web\Widget\Tabs;
-use \Monitoring\Backend;
+use \Icinga\Module\Monitoring\Backend;
 
 class Monitoring_ListController extends ActionController
 {
diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index 41187f832..059e76935 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -27,13 +27,12 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-use Monitoring\Backend;
+use \Icinga\Module\Monitoring\Backend;
 use Icinga\Web\Controller\ActionController;
 use Icinga\Web\Hook;
-use Monitoring\Object\Host;
-use Monitoring\Object\Service;
+use \Icinga\Module\Monitoring\Object\Host;
+use \Icinga\Module\Monitoring\Object\Service;
 use Icinga\Application\Benchmark;
-
 use Icinga\Web\Widget\Tabextension\OutputFormat;
 use Icinga\Web\Widget\Tabextension\DashboardAction;
 use Icinga\Web\Widget\Tabextension\BasketAction;
diff --git a/modules/monitoring/application/forms/Command/AcknowledgeForm.php b/modules/monitoring/application/forms/Command/AcknowledgeForm.php
index c671046a6..00b35343b 100644
--- a/modules/monitoring/application/forms/Command/AcknowledgeForm.php
+++ b/modules/monitoring/application/forms/Command/AcknowledgeForm.php
@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Form\Command;
+namespace Icinga\Module\Monitoring\Form\Command;
 
 use \Icinga\Web\Form\Element\DateTimePicker;
 use \Icinga\Protocol\Commandpipe\Acknowledgement;
diff --git a/modules/monitoring/application/forms/Command/CommandForm.php b/modules/monitoring/application/forms/Command/CommandForm.php
index 04ef1150e..32bac99ce 100644
--- a/modules/monitoring/application/forms/Command/CommandForm.php
+++ b/modules/monitoring/application/forms/Command/CommandForm.php
@@ -26,7 +26,7 @@
 */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Form\Command;
+namespace Icinga\Module\Monitoring\Form\Command;
 
 use \Zend_Config;
 use \Icinga\Web\Form;
diff --git a/modules/monitoring/application/forms/Command/CommandWithIdentifierForm.php b/modules/monitoring/application/forms/Command/CommandWithIdentifierForm.php
index c59b737d3..cfc0bfaff 100644
--- a/modules/monitoring/application/forms/Command/CommandWithIdentifierForm.php
+++ b/modules/monitoring/application/forms/Command/CommandWithIdentifierForm.php
@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Form\Command;
+namespace Icinga\Module\Monitoring\Form\Command;
 
 use \Zend_Form_Element_Hidden;
 
diff --git a/modules/monitoring/application/forms/Command/CommentForm.php b/modules/monitoring/application/forms/Command/CommentForm.php
index 28f79f444..a9175d1cb 100644
--- a/modules/monitoring/application/forms/Command/CommentForm.php
+++ b/modules/monitoring/application/forms/Command/CommentForm.php
@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Form\Command;
+namespace Icinga\Module\Monitoring\Form\Command;
 
 use \Icinga\Protocol\Commandpipe\Comment;
 
diff --git a/modules/monitoring/application/forms/Command/CustomNotificationForm.php b/modules/monitoring/application/forms/Command/CustomNotificationForm.php
index c4c5fbfd9..1e07220d7 100644
--- a/modules/monitoring/application/forms/Command/CustomNotificationForm.php
+++ b/modules/monitoring/application/forms/Command/CustomNotificationForm.php
@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Form\Command;
+namespace Icinga\Module\Monitoring\Form\Command;
 
 use \Icinga\Protocol\Commandpipe\CustomNotification;
 
diff --git a/modules/monitoring/application/forms/Command/DelayNotificationForm.php b/modules/monitoring/application/forms/Command/DelayNotificationForm.php
index acf15b445..34bda250e 100644
--- a/modules/monitoring/application/forms/Command/DelayNotificationForm.php
+++ b/modules/monitoring/application/forms/Command/DelayNotificationForm.php
@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Form\Command;
+namespace Icinga\Module\Monitoring\Form\Command;
 
 /**
  * Form for the delay notification command
diff --git a/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php b/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php
index a1b7f11dc..0aa18e903 100644
--- a/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php
+++ b/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php
@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Form\Command;
+namespace Icinga\Module\Monitoring\Form\Command;
 
 use \Zend_Form_Element_Checkbox;
 use \Icinga\Web\Form\Element\DateTimePicker;
diff --git a/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php b/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php
index 5eb13f62b..2944aef21 100644
--- a/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php
+++ b/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php
@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Form\Command;
+namespace Icinga\Module\Monitoring\Form\Command;
 
 use \Zend_Form_Element_Text;
 use \Zend_Validate_GreaterThan;
diff --git a/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php b/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php
index e70c18ec0..54471e4b3 100644
--- a/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php
+++ b/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php
@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Form\Command;
+namespace Icinga\Module\Monitoring\Form\Command;
 
 use \Icinga\Exception\ProgrammingError;
 
diff --git a/modules/monitoring/application/forms/Command/WithChildrenCommandForm.php b/modules/monitoring/application/forms/Command/WithChildrenCommandForm.php
index 4a6c6360c..ff5a4df62 100644
--- a/modules/monitoring/application/forms/Command/WithChildrenCommandForm.php
+++ b/modules/monitoring/application/forms/Command/WithChildrenCommandForm.php
@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Form\Command;
+namespace Icinga\Module\Monitoring\Form\Command;
 
 /**
  * Base class for command forms which allow to propagate the command to child objects too
diff --git a/modules/monitoring/application/views/helpers/MonitoringCommands.php b/modules/monitoring/application/views/helpers/MonitoringCommands.php
index 0c35460b9..abd9588ef 100644
--- a/modules/monitoring/application/views/helpers/MonitoringCommands.php
+++ b/modules/monitoring/application/views/helpers/MonitoringCommands.php
@@ -23,7 +23,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-use \Monitoring\Command\Meta;
+use \Icinga\Module\Monitoring\Command\Meta;
 
 /**
  * Class MonitoringCommands
diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index 2b7e938a6..3668f86ad 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -1,6 +1,6 @@
 <?php
 
-use Monitoring\Plugin\PerfdataSet;
+use \Icinga\Module\Monitoring\Plugin\PerfdataSet;
 
 class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
 {
diff --git a/modules/monitoring/bin/action/list.inc.php b/modules/monitoring/bin/action/list.inc.php
index 828368489..81d401cb9 100644
--- a/modules/monitoring/bin/action/list.inc.php
+++ b/modules/monitoring/bin/action/list.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-use Monitoring\Backend;
+use \Icinga\Module\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 f5afce884..54579c09d 100644
--- a/modules/monitoring/library/Monitoring/Backend.php
+++ b/modules/monitoring/library/Monitoring/Backend.php
@@ -26,12 +26,11 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring;
+namespace Icinga\Module\Monitoring;
 
 use \Exception;
 use \Icinga\Application\Config as IcingaConfig;
 use \Icinga\Authentication\Manager as AuthManager;
-use \Monitoring\Backend\AbstractBackend;
 
 /**
  * Container for monitoring backends
@@ -140,7 +139,7 @@ class Backend
             $config = self::$backendConfigs[$name];
             $type = $config->type;
             $type[0] = strtoupper($type[0]);
-            $class = '\\Monitoring\\Backend\\' . $type;
+            $class = '\\Icinga\\Module\\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 1c38fd2f8..581e0ac89 100644
--- a/modules/monitoring/library/Monitoring/Backend/AbstractBackend.php
+++ b/modules/monitoring/library/Monitoring/Backend/AbstractBackend.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\Backend;
+namespace Icinga\Module\Monitoring\Backend;
 
 use Icinga\Data\DatasourceInterface;
 use Icinga\Exception\ProgrammingError;
@@ -68,7 +68,7 @@ class AbstractBackend implements DatasourceInterface
 
     protected function tableToClassName($virtual_table)
     {
-        return 'Monitoring\\View\\'
+        return '\\Icinga\\Module\\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 9af41fdd5..2290855cf 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\Backend;
+namespace Icinga\Module\Monitoring\Backend;
 
 use Icinga\Data\Db\Connection;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/AbstractQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/AbstractQuery.php
index 4309a3571..e05fa2e51 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 Monitoring\Backend\Ido\Query;
+namespace Icinga\Module\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 1cdd90304..a21dbc1e9 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 Monitoring\Backend\Ido\Query;
+namespace Icinga\Module\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 9e035c0c9..e08ec6e76 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 Monitoring\Backend\Ido\Query;
+namespace Icinga\Module\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 318623ec2..60842acd1 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 Monitoring\Backend\Ido\Query;
+namespace Icinga\Module\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 cc64c4902..5fc988c14 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 Monitoring\Backend\Ido\Query;
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
 class CustomvarQuery extends AbstractQuery
 {
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
index 39a201748..d142f4dda 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
@@ -23,7 +23,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Backend\Ido\Query;
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
 
 /**
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
index 356bfae39..0c1db46b0 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 Monitoring\Backend\Ido\Query;
+namespace Icinga\Module\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 fe80aa092..1c9e213bd 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 Monitoring\Backend\Ido\Query;
+namespace Icinga\Module\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 52b5bb56e..98336ea18 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 Monitoring\Backend\Ido\Query;
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
 class HoststatusQuery extends AbstractQuery
 {
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
index 879c141d2..4d5e8d811 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
@@ -23,7 +23,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Backend\Ido\Query;
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
 /**
  * Notification query
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
index 1b01306bc..90a21573b 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 Monitoring\Backend\Ido\Query;
+namespace Icinga\Module\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 c2abc8ede..a0185140e 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 Monitoring\Backend\Ido\Query;
+namespace Icinga\Module\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 e7f471104..b68e789a2 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
@@ -3,7 +3,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Backend\Ido\Query;
+namespace Icinga\Module\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 6a552b298..46defab3f 100644
--- a/modules/monitoring/library/Monitoring/Backend/Livestatus.php
+++ b/modules/monitoring/library/Monitoring/Backend/Livestatus.php
@@ -5,7 +5,7 @@
  *
  * @package Monitoring
  */
-namespace Monitoring\Backend;
+namespace Icinga\Module\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 cc1be7363..d3e259421 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 \Icinga\Module\Monitoring\Backend\Livestatus\Query;
 
 use Icinga\Data\AbstractQuery;
 
diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat.php b/modules/monitoring/library/Monitoring/Backend/Statusdat.php
index 87d9d6e59..ddee757d1 100755
--- a/modules/monitoring/library/Monitoring/Backend/Statusdat.php
+++ b/modules/monitoring/library/Monitoring/Backend/Statusdat.php
@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Backend;
+namespace Icinga\Module\Monitoring\Backend;
 
 
 use Icinga\Protocol\Statusdat as StatusdatProtocol;
diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Criteria/Filter.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Criteria/Filter.php
index fe680ed2a..484740c46 100755
--- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Criteria/Filter.php
+++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Criteria/Filter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\Backend\Statusdat\Criteria;
+namespace Icinga\Module\Monitoring\Backend\Statusdat\Criteria;
 
 /**
  * Constants for filter definitions.
diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Criteria/Order.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Criteria/Order.php
index c67c055ad..502eeb722 100755
--- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Criteria/Order.php
+++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Criteria/Order.php
@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Backend\Statusdat\Criteria;
+namespace Icinga\Module\Monitoring\Backend\Statusdat\Criteria;
 
 /**
  * Class Order
diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/HostStatusView.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/HostStatusView.php
index 0d9acad4c..e68eef399 100644
--- a/modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/HostStatusView.php
+++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/HostStatusView.php
@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Backend\Statusdat\DataView;
+namespace Icinga\Module\Monitoring\Backend\Statusdat\DataView;
 
 use Icinga\Protocol\Statusdat\View\ObjectRemappingView;
 use Icinga\Protocol\Statusdat\IReader;
diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/ServiceStatusView.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/ServiceStatusView.php
index cddaad26b..0351280e1 100644
--- a/modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/ServiceStatusView.php
+++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/ServiceStatusView.php
@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Backend\Statusdat\DataView;
+namespace Icinga\Module\Monitoring\Backend\Statusdat\DataView;
 
 use Icinga\Protocol\Statusdat\View\ObjectRemappingView;
 use Icinga\Protocol\Statusdat\IReader;
diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/StatusdatServiceView.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/StatusdatServiceView.php
index f40c3c3eb..0ac9fae47 100644
--- a/modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/StatusdatServiceView.php
+++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/StatusdatServiceView.php
@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Backend\Statusdat\DataView;
+namespace Icinga\Module\Monitoring\Backend\Statusdat\DataView;
 
 use Icinga\Protocol\Statusdat\View\ObjectRemappingView;
 use \Icinga\Protocol\Statusdat\IReader;
diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/GroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/GroupsummaryQuery.php
index 1db687c4d..3e4e4db9c 100755
--- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/GroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/GroupsummaryQuery.php
@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Backend\Statusdat\Query;
+namespace Icinga\Module\Monitoring\Backend\Statusdat\Query;
 
 abstract class GroupsummaryQuery extends Query
 {
diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostgroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostgroupsummaryQuery.php
index 3c6c395cf..4653c8979 100755
--- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostgroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostgroupsummaryQuery.php
@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Backend\Statusdat\Query;
+namespace Icinga\Module\Monitoring\Backend\Statusdat\Query;
 
 /**
  * Class HostgroupsummaryQuery
diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostlistQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostlistQuery.php
index 141cc39a6..74656badb 100755
--- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostlistQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostlistQuery.php
@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Backend\Statusdat\Query;
+namespace Icinga\Module\Monitoring\Backend\Statusdat\Query;
 
 use Icinga\Protocol\Statusdat;
 use Icinga\Exception;
diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/Query.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/Query.php
index 199b8eff8..9cadb6827 100644
--- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/Query.php
+++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/Query.php
@@ -26,9 +26,9 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Backend\Statusdat\Query;
+namespace Icinga\Module\Monitoring\Backend\Statusdat\Query;
 
-use Monitoring\Backend\Statusdat\Criteria\Order;
+use \Icinga\Module\Monitoring\Backend\Statusdat\Criteria\Order;
 use Icinga\Protocol\Statusdat;
 use Icinga\Exception;
 use Icinga\Data\AbstractQuery;
diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicegroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicegroupsummaryQuery.php
index b62b3faa4..e1717fc54 100644
--- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicegroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicegroupsummaryQuery.php
@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Backend\Statusdat\Query;
+namespace Icinga\Module\Monitoring\Backend\Statusdat\Query;
 
 /**
  * Class ServicegroupsummaryQuery
diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicelistQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicelistQuery.php
index c8843ac84..a9d7612f8 100755
--- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicelistQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicelistQuery.php
@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Backend\Statusdat\Query;
+namespace Icinga\Module\Monitoring\Backend\Statusdat\Query;
 
 use Icinga\Protocol\Statusdat;
 use Icinga\Exception;
diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusQuery.php
index eb656c429..707e2d568 100644
--- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusQuery.php
@@ -7,7 +7,7 @@
  * To change this template use File | Settings | File Templates.
  */
 
-namespace Monitoring\Backend\Statusdat\Query;
+namespace Icinga\Module\Monitoring\Backend\Statusdat\Query;
 
 use Icinga\Protocol\Statusdat;
 use Icinga\Exception;
diff --git a/modules/monitoring/library/Monitoring/Command/Meta.php b/modules/monitoring/library/Monitoring/Command/Meta.php
index f2fd3c893..f26ebf383 100644
--- a/modules/monitoring/library/Monitoring/Command/Meta.php
+++ b/modules/monitoring/library/Monitoring/Command/Meta.php
@@ -23,7 +23,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Command;
+namespace Icinga\Module\Monitoring\Command;
 
 use Icinga\User;
 use Icinga\Exception\ProgrammingError;
diff --git a/modules/monitoring/library/Monitoring/Environment.php b/modules/monitoring/library/Monitoring/Environment.php
index cef5dea8e..a218ccb78 100644
--- a/modules/monitoring/library/Monitoring/Environment.php
+++ b/modules/monitoring/library/Monitoring/Environment.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring;
+namespace Icinga\Module\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 60716bcce..234fc3504 100644
--- a/modules/monitoring/library/Monitoring/Object/AbstractObject.php
+++ b/modules/monitoring/library/Monitoring/Object/AbstractObject.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Monitoring\Object;
+namespace Icinga\Module\Monitoring\Object;
 
 use Icinga\Data\AbstractQuery as Query;
-use Monitoring\Backend\AbstractBackend;
+use \Icinga\Module\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 88ce4ef46..f77950d1d 100644
--- a/modules/monitoring/library/Monitoring/Object/Host.php
+++ b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\Object;
+namespace Icinga\Module\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 82bfa791a..045bc7eff 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\Object;
+namespace Icinga\Module\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 d83100e1c..3f900d7a1 100644
--- a/modules/monitoring/library/Monitoring/Plugin.php
+++ b/modules/monitoring/library/Monitoring/Plugin.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring;
+namespace Icinga\Module\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 40d386048..731182bd5 100644
--- a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
+++ b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\Plugin;
+namespace Icinga\Module\Monitoring\Plugin;
 
 class Perfdata
 {
diff --git a/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php b/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php
index 7c478e6a0..690658734 100644
--- a/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php
+++ b/modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\Plugin;
+namespace Icinga\Module\Monitoring\Plugin;
 
 class PerfdataSet
 {
diff --git a/modules/monitoring/library/Monitoring/View/CommentView.php b/modules/monitoring/library/Monitoring/View/CommentView.php
index ca5a123e5..ecc0f75eb 100644
--- a/modules/monitoring/library/Monitoring/View/CommentView.php
+++ b/modules/monitoring/library/Monitoring/View/CommentView.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\View;
+namespace Icinga\Module\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 ac9ce176e..4bd43719b 100644
--- a/modules/monitoring/library/Monitoring/View/ContactView.php
+++ b/modules/monitoring/library/Monitoring/View/ContactView.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\View;
+namespace Icinga\Module\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 f1b94f820..d52f6e8ef 100644
--- a/modules/monitoring/library/Monitoring/View/ContactgroupView.php
+++ b/modules/monitoring/library/Monitoring/View/ContactgroupView.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\View;
+namespace Icinga\Module\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 9070663ad..e50fbcb75 100644
--- a/modules/monitoring/library/Monitoring/View/CustomvarView.php
+++ b/modules/monitoring/library/Monitoring/View/CustomvarView.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\View;
+namespace Icinga\Module\Monitoring\View;
 
 class CustomvarView extends MonitoringView
 {
diff --git a/modules/monitoring/library/Monitoring/View/DowntimeView.php b/modules/monitoring/library/Monitoring/View/DowntimeView.php
index 6300f25ff..7c3b74dc1 100644
--- a/modules/monitoring/library/Monitoring/View/DowntimeView.php
+++ b/modules/monitoring/library/Monitoring/View/DowntimeView.php
@@ -22,7 +22,7 @@
  * @author Icinga Development Team <info@icinga.org>
  */
 // {{{ICINGA_LICENSE_HEADER}}}
-namespace Monitoring\View;
+namespace Icinga\Module\Monitoring\View;
 
 /**
  * Class DowntimeView
diff --git a/modules/monitoring/library/Monitoring/View/EventHistoryView.php b/modules/monitoring/library/Monitoring/View/EventHistoryView.php
index 16a90158d..0feac0e17 100644
--- a/modules/monitoring/library/Monitoring/View/EventHistoryView.php
+++ b/modules/monitoring/library/Monitoring/View/EventHistoryView.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\View;
+namespace Icinga\Module\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 94933b666..c1b53bac3 100644
--- a/modules/monitoring/library/Monitoring/View/HostgroupView.php
+++ b/modules/monitoring/library/Monitoring/View/HostgroupView.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\View;
+namespace Icinga\Module\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 65733ae79..91930e6b6 100644
--- a/modules/monitoring/library/Monitoring/View/HoststatusView.php
+++ b/modules/monitoring/library/Monitoring/View/HoststatusView.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\View;
+namespace Icinga\Module\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 3677b26b0..0c9451916 100644
--- a/modules/monitoring/library/Monitoring/View/MonitoringView.php
+++ b/modules/monitoring/library/Monitoring/View/MonitoringView.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\View;
+namespace Icinga\Module\Monitoring\View;
 
 use Icinga\Data\AbstractQuery;
 use Icinga\Data\Filter;
@@ -17,7 +17,7 @@ use Icinga\Data\Filter;
  *
  * Usage example:
  * <code>
- * use Monitoring\Backend;
+ * use \Icinga\Module\Monitoring\Backend;
  * $backend = Backend::getInstance();
  * $query = $backend->select()->from('viewname', array(
  *     'one_column',
diff --git a/modules/monitoring/library/Monitoring/View/NotificationView.php b/modules/monitoring/library/Monitoring/View/NotificationView.php
index bad01cbde..b0372f6a9 100644
--- a/modules/monitoring/library/Monitoring/View/NotificationView.php
+++ b/modules/monitoring/library/Monitoring/View/NotificationView.php
@@ -23,7 +23,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\View;
+namespace Icinga\Module\Monitoring\View;
 
 /**
  * NotificationView
diff --git a/modules/monitoring/library/Monitoring/View/ServicegroupView.php b/modules/monitoring/library/Monitoring/View/ServicegroupView.php
index da872a6c7..73fd1efa7 100644
--- a/modules/monitoring/library/Monitoring/View/ServicegroupView.php
+++ b/modules/monitoring/library/Monitoring/View/ServicegroupView.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\View;
+namespace Icinga\Module\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 cb5895eee..9af1bb3a8 100644
--- a/modules/monitoring/library/Monitoring/View/StatusView.php
+++ b/modules/monitoring/library/Monitoring/View/StatusView.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\View;
+namespace Icinga\Module\Monitoring\View;
 
 class StatusView extends MonitoringView
 {
diff --git a/modules/monitoring/test/php/application/forms/Command/AcknowledgeFormTest.php b/modules/monitoring/test/php/application/forms/Command/AcknowledgeFormTest.php
index 5c7066f32..415beae40 100644
--- a/modules/monitoring/test/php/application/forms/Command/AcknowledgeFormTest.php
+++ b/modules/monitoring/test/php/application/forms/Command/AcknowledgeFormTest.php
@@ -12,7 +12,7 @@ require_once realpath(__DIR__ . '/../../../../../../../library/Icinga/Util/Confi
 require_once realpath(__DIR__ . '/../../../../../../../library/Icinga/Util/DateTimeFactory.php');
 
 use \DateTimeZone;
-use \Monitoring\Form\Command\AcknowledgeForm; // Used by constant FORMCLASS
+use \Icinga\Module\Monitoring\Form\Command\AcknowledgeForm; // Used by constant FORMCLASS
 use \Icinga\Util\DateTimeFactory;
 use \Test\Icinga\Web\Form\BaseFormTest;
 
diff --git a/modules/monitoring/test/php/application/forms/Command/CommentFormTest.php b/modules/monitoring/test/php/application/forms/Command/CommentFormTest.php
index e740b7101..2dd1f5793 100644
--- a/modules/monitoring/test/php/application/forms/Command/CommentFormTest.php
+++ b/modules/monitoring/test/php/application/forms/Command/CommentFormTest.php
@@ -8,7 +8,7 @@ namespace Test\Monitoring\Forms\Command;
 require_once realpath('library/Icinga/Web/Form/BaseFormTest.php');
 require_once realpath(__DIR__ . '/../../../../../../../modules/monitoring/application/forms/Command/CommentForm.php');
 
-use \Monitoring\Form\Command\CommentForm; // Used by constant FORMCLASS
+use \Icinga\Module\Monitoring\Form\Command\CommentForm; // Used by constant FORMCLASS
 use \Test\Icinga\Web\Form\BaseFormTest;
 
 class CommentFormTest extends BaseFormTest
diff --git a/modules/monitoring/test/php/application/forms/Command/ConfirmationFormTest.php b/modules/monitoring/test/php/application/forms/Command/ConfirmationFormTest.php
index 8d003cad0..5a515308d 100644
--- a/modules/monitoring/test/php/application/forms/Command/ConfirmationFormTest.php
+++ b/modules/monitoring/test/php/application/forms/Command/ConfirmationFormTest.php
@@ -9,8 +9,7 @@ require_once __DIR__. '/../../../../../application/forms/Command/CommandForm.php
 
 use \Zend_View;
 use \Test\Icinga\Web\Form\BaseFormTest;
-
-use Monitoring\Form\Command\CommandForm;
+use \Icinga\Module\Monitoring\Form\Command\CommandForm;
 
 class CommandFormTest extends BaseFormTest
 {
diff --git a/modules/monitoring/test/php/application/forms/Command/ConfirmationWithIdentifierFormTest.php b/modules/monitoring/test/php/application/forms/Command/ConfirmationWithIdentifierFormTest.php
index 6abb08390..618d094ac 100644
--- a/modules/monitoring/test/php/application/forms/Command/ConfirmationWithIdentifierFormTest.php
+++ b/modules/monitoring/test/php/application/forms/Command/ConfirmationWithIdentifierFormTest.php
@@ -8,7 +8,7 @@ require_once __DIR__. '/../../../../../application/forms/Command/CommandForm.php
 require_once __DIR__. '/../../../../../application/forms/Command/WithChildrenCommandForm.php';
 require_once __DIR__. '/../../../../../application/forms/Command/CommandWithIdentifierForm.php';
 
-use Monitoring\Form\Command\CommandWithIdentifierForm;
+use \Icinga\Module\Monitoring\Form\Command\CommandWithIdentifierForm;
 use \Zend_View;
 use \Zend_Test_PHPUnit_ControllerTestCase;
 use \Test\Icinga\Web\Form\BaseFormTest;
diff --git a/modules/monitoring/test/php/application/forms/Command/CustomNotificationFormTest.php b/modules/monitoring/test/php/application/forms/Command/CustomNotificationFormTest.php
index a77505221..c26ef4f8e 100644
--- a/modules/monitoring/test/php/application/forms/Command/CustomNotificationFormTest.php
+++ b/modules/monitoring/test/php/application/forms/Command/CustomNotificationFormTest.php
@@ -8,8 +8,8 @@ namespace Test\Monitoring\Forms\Command;
 require_once realpath('library/Icinga/Web/Form/BaseFormTest.php');
 require_once realpath(__DIR__ . '/../../../../../application/forms/Command/CustomNotificationForm.php');
 
-use \Monitoring\Form\Command\CustomNotificationForm; // Used by constant FORM_CLASS
 use \Test\Icinga\Web\Form\BaseFormTest;
+use \Icinga\Module\Monitoring\Form\Command\CustomNotificationForm; // Used by constant FORM_CLASS
 
 class CustomNotificationFormTest extends BaseFormTest
 {
diff --git a/modules/monitoring/test/php/application/forms/Command/DelayNotificationFormTest.php b/modules/monitoring/test/php/application/forms/Command/DelayNotificationFormTest.php
index 1f9ca201c..51900f7ab 100644
--- a/modules/monitoring/test/php/application/forms/Command/DelayNotificationFormTest.php
+++ b/modules/monitoring/test/php/application/forms/Command/DelayNotificationFormTest.php
@@ -8,8 +8,8 @@ namespace Test\Monitoring\Forms\Command;
 require_once realpath('library/Icinga/Web/Form/BaseFormTest.php');
 require_once realpath(__DIR__ . '/../../../../../application/forms/Command/DelayNotificationForm.php');
 
-use \Monitoring\Form\Command\DelayNotificationForm; // Used by constant FORM_CLASS
 use \Test\Icinga\Web\Form\BaseFormTest;
+use \Icinga\Module\Monitoring\Form\Command\DelayNotificationForm; // Used by constant FORM_CLASS
 
 class DelayNotificationFormTest extends BaseFormTest
 {
diff --git a/modules/monitoring/test/php/application/forms/Command/RescheduleNextCheckFormTest.php b/modules/monitoring/test/php/application/forms/Command/RescheduleNextCheckFormTest.php
index 49d33449b..bfbc191fc 100644
--- a/modules/monitoring/test/php/application/forms/Command/RescheduleNextCheckFormTest.php
+++ b/modules/monitoring/test/php/application/forms/Command/RescheduleNextCheckFormTest.php
@@ -10,7 +10,7 @@ require_once realpath(__DIR__ . '/../../../../../application/forms/Command/Resch
 require_once realpath(__DIR__ . '/../../../../../../../library/Icinga/Util/ConfigAwareFactory.php');
 require_once realpath(__DIR__ . '/../../../../../../../library/Icinga/Util/DateTimeFactory.php');
 
-use \Monitoring\Form\Command\RescheduleNextCheckForm; // Used by constant FORM_CLASS
+use \Icinga\Module\Monitoring\Form\Command\RescheduleNextCheckForm; // Used by constant FORM_CLASS
 use \DateTimeZone;
 use \Icinga\Util\DateTimeFactory;
 use \Test\Icinga\Web\Form\BaseFormTest;
diff --git a/modules/monitoring/test/php/application/forms/Command/ScheduleDowntimeFormTest.php b/modules/monitoring/test/php/application/forms/Command/ScheduleDowntimeFormTest.php
index 2f13b83c9..5f2282916 100644
--- a/modules/monitoring/test/php/application/forms/Command/ScheduleDowntimeFormTest.php
+++ b/modules/monitoring/test/php/application/forms/Command/ScheduleDowntimeFormTest.php
@@ -10,7 +10,7 @@ require_once realpath(__DIR__ . '/../../../../../../../modules/monitoring/applic
 require_once realpath(__DIR__ . '/../../../../../../../library/Icinga/Util/ConfigAwareFactory.php');
 require_once realpath(__DIR__ . '/../../../../../../../library/Icinga/Util/DateTimeFactory.php');
 
-use \Monitoring\Form\Command\ScheduleDowntimeForm; // Used by constant FORM_CLASS
+use \Icinga\Module\Monitoring\Form\Command\ScheduleDowntimeForm; // Used by constant FORM_CLASS
 use \DateTimeZone;
 use \Icinga\Util\DateTimeFactory;
 use \Test\Icinga\Web\Form\BaseFormTest;
diff --git a/modules/monitoring/test/php/application/forms/Command/SubmitPassiveCheckResultTest.php b/modules/monitoring/test/php/application/forms/Command/SubmitPassiveCheckResultTest.php
index d4d22e9bd..4c027065e 100644
--- a/modules/monitoring/test/php/application/forms/Command/SubmitPassiveCheckResultTest.php
+++ b/modules/monitoring/test/php/application/forms/Command/SubmitPassiveCheckResultTest.php
@@ -8,8 +8,8 @@ namespace Test\Monitoring\Forms\Command;
 require_once realpath('library/Icinga/Web/Form/BaseFormTest.php');
 require_once realpath(__DIR__ . '/../../../../../application/forms/Command/SubmitPassiveCheckResultForm.php');
 
-use \Monitoring\Form\Command\SubmitPassiveCheckResultForm; // Used by constant FORM_CLASS
 use \Test\Icinga\Web\Form\BaseFormTest;
+use \Icinga\Module\Monitoring\Form\Command\SubmitPassiveCheckResultForm; // Used by constant FORM_CLASS
 
 class SubmitPassiveCheckResultFormTest extends BaseFormTest
 {
diff --git a/modules/monitoring/test/php/application/views/helpers/MonitoringCommandsTest.php b/modules/monitoring/test/php/application/views/helpers/MonitoringCommandsTest.php
index dbb12ba59..1b7c4ea5e 100644
--- a/modules/monitoring/test/php/application/views/helpers/MonitoringCommandsTest.php
+++ b/modules/monitoring/test/php/application/views/helpers/MonitoringCommandsTest.php
@@ -2,7 +2,7 @@
 
 namespace Test\Modules\Monitoring\Application\Views\Helpers;
 
-use Monitoring\Command\Meta;
+use \Icinga\Module\Monitoring\Command\Meta;
 
 require_once 'Zend/View/Helper/Abstract.php';
 require_once 'Zend/View.php';
diff --git a/modules/monitoring/test/php/library/Backend/Statusdat/ServicegroupsummaryQueryTest.php b/modules/monitoring/test/php/library/Backend/Statusdat/ServicegroupsummaryQueryTest.php
index 799cb633d..f22dc997f 100644
--- a/modules/monitoring/test/php/library/Backend/Statusdat/ServicegroupsummaryQueryTest.php
+++ b/modules/monitoring/test/php/library/Backend/Statusdat/ServicegroupsummaryQueryTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Monitoring\Backend\Statusdat;
 use Tests\Icinga\Protocol\Statusdat\ReaderMock as ReaderMock;
-use Monitoring\Backend\Statusdat\Query\ServicegroupsummaryQuery;
+use \Icinga\Module\Monitoring\Backend\Statusdat\Query\ServicegroupsummaryQuery;
 use Tests\Icinga\Protocol\Statusdat\StatusdatTestLoader;
 
 $base = dirname(__FILE__)."/../../../../..";
@@ -12,7 +12,7 @@ StatusdatTestLoader::requireLibrary();
 require_once(realpath($base."/library/Monitoring/Backend/Statusdat/Query/GroupsummaryQuery.php"));
 require_once(realpath($base."/library/Monitoring/Backend/Statusdat/Query/ServicegroupsummaryQuery.php"));
 
-class BackendMock  extends \Monitoring\Backend\AbstractBackend
+class BackendMock  extends \Icinga\Module\Monitoring\Backend\AbstractBackend
 {
     public $reader;
 
diff --git a/modules/monitoring/test/php/library/Command/MetaTest.php b/modules/monitoring/test/php/library/Command/MetaTest.php
index 8341915fe..94e814ac1 100644
--- a/modules/monitoring/test/php/library/Command/MetaTest.php
+++ b/modules/monitoring/test/php/library/Command/MetaTest.php
@@ -5,7 +5,7 @@ namespace Test\Modules\Monitoring\Library\Command;
 require_once __DIR__. '/../../../../library/Monitoring/Command/Meta.php';
 require_once __DIR__. '/../../../../../../library/Icinga/Exception/ProgrammingError.php';
 
-use Monitoring\Command\Meta;
+use \Icinga\Module\Monitoring\Command\Meta;
 
 class HostStruct extends \stdClass
 {
diff --git a/modules/monitoring/test/php/testlib/MonitoringControllerTest.php b/modules/monitoring/test/php/testlib/MonitoringControllerTest.php
index 2414328c9..7cb226aff 100644
--- a/modules/monitoring/test/php/testlib/MonitoringControllerTest.php
+++ b/modules/monitoring/test/php/testlib/MonitoringControllerTest.php
@@ -40,8 +40,8 @@ use \Zend_Test_PHPUnit_ControllerTestCase;
 use \Icinga\Protocol\Statusdat\Reader;
 use \Icinga\Web\Controller\ActionController;
 use \Icinga\Application\DbAdapterFactory;
-use \Monitoring\Backend\Ido;
-use \Monitoring\Backend\Statusdat;
+use \Icinga\Module\Monitoring\Backend\Ido;
+use \Icinga\Moudle\Monitoring\Backend\Statusdat;
 use \Test\Monitoring\Testlib\DataSource\TestFixture;
 use \Test\Monitoring\Testlib\DataSource\DataSourceTestSetup;
 
@@ -262,4 +262,4 @@ abstract class MonitoringControllerTest extends Zend_Test_PHPUnit_ControllerTest
             );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/php/library/Icinga/Web/Paginator/Adapter/QueryAdapterTest.php b/test/php/library/Icinga/Web/Paginator/Adapter/QueryAdapterTest.php
index fa3d5f6f4..1094b7486 100644
--- a/test/php/library/Icinga/Web/Paginator/Adapter/QueryAdapterTest.php
+++ b/test/php/library/Icinga/Web/Paginator/Adapter/QueryAdapterTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Icinga\Web\Paginator\Adapter;
 
-use Monitoring\Backend\Statusdat;
+use \Icinga\Module\Monitoring\Backend\Statusdat;
 use Icinga\Protocol\Statusdat\Reader;
 use Icinga\Web\Paginator\Adapter\QueryAdapter;
 use Tests\Icinga\Protocol\Statusdat\StatusdatTestLoader;
diff --git a/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php b/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php
index 47a178c93..78cf32fb5 100755
--- a/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php
+++ b/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Icinga\Web\Paginator\ScrollingStyle;
 
-use Monitoring\Backend\Statusdat;
+use \Icinga\Module\Monitoring\Backend\Statusdat;
 use Icinga\Protocol\Statusdat\Reader;
 use Icinga\Web\Paginator\Adapter\QueryAdapter;
 use Tests\Icinga\Protocol\Statusdat\StatusdatTestLoader;