diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/Query.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/Query.php
index 9cadb6827..4c4d54c7c 100644
--- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/Query.php
+++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/Query.php
@@ -48,7 +48,7 @@ abstract class Query extends AbstractQuery
     /**
      * @var string
      */
-    private $viewClass = '\Monitoring\Backend\Statusdat\DataView\StatusdatServiceView';
+    private $viewClass = '\Icinga\Module\Monitoring\Backend\Statusdat\DataView\StatusdatServiceView';
     private $baseQuery = null;
 
     public function setBaseQuery(StatusdatQuery $query)
@@ -58,7 +58,7 @@ abstract class Query extends AbstractQuery
 
     public function setResultViewClass($viewClass)
     {
-        $this->viewClass = '\Monitoring\Backend\Statusdat\DataView\\'.$viewClass;
+        $this->viewClass = '\Icinga\Module\Monitoring\Backend\Statusdat\DataView\\'.$viewClass;
     }
 
 
diff --git a/modules/monitoring/test/php/application/forms/Command/AcknowledgeFormTest.php b/modules/monitoring/test/php/application/forms/Command/AcknowledgeFormTest.php
index 415beae40..f89ce5169 100644
--- a/modules/monitoring/test/php/application/forms/Command/AcknowledgeFormTest.php
+++ b/modules/monitoring/test/php/application/forms/Command/AcknowledgeFormTest.php
@@ -18,7 +18,7 @@ use \Test\Icinga\Web\Form\BaseFormTest;
 
 class AcknowledgeFormTest extends BaseFormTest
 {
-    const FORMCLASS = 'Monitoring\Form\Command\AcknowledgeForm';
+    const FORMCLASS = '\Icinga\Module\Monitoring\Form\Command\AcknowledgeForm';
 
     /**
      * Set up the default time zone
diff --git a/modules/monitoring/test/php/application/forms/Command/CommentFormTest.php b/modules/monitoring/test/php/application/forms/Command/CommentFormTest.php
index 2dd1f5793..2485b7c59 100644
--- a/modules/monitoring/test/php/application/forms/Command/CommentFormTest.php
+++ b/modules/monitoring/test/php/application/forms/Command/CommentFormTest.php
@@ -13,7 +13,7 @@ use \Test\Icinga\Web\Form\BaseFormTest;
 
 class CommentFormTest extends BaseFormTest
 {
-    const FORMCLASS = 'Monitoring\Form\Command\CommentForm';
+    const FORMCLASS = '\Icinga\Module\Monitoring\Form\Command\CommentForm';
 
     public function testCorrectCommentValidation()
     {
diff --git a/modules/monitoring/test/php/application/forms/Command/ConfirmationWithIdentifierFormTest.php b/modules/monitoring/test/php/application/forms/Command/ConfirmationWithIdentifierFormTest.php
index 618d094ac..7c3436395 100644
--- a/modules/monitoring/test/php/application/forms/Command/ConfirmationWithIdentifierFormTest.php
+++ b/modules/monitoring/test/php/application/forms/Command/ConfirmationWithIdentifierFormTest.php
@@ -15,7 +15,7 @@ use \Test\Icinga\Web\Form\BaseFormTest;
 
 class CommandWithIdentifierFormTest extends BaseFormTest
 {
-    const FORMCLASS = "Monitoring\Form\Command\CommandWithIdentifierForm";
+    const FORMCLASS = "\Icinga\Module\Monitoring\Form\Command\CommandWithIdentifierForm";
     public function testForm()
     {
         $form = $this->getRequestForm(array(), self::FORMCLASS);
diff --git a/modules/monitoring/test/php/application/forms/Command/CustomNotificationFormTest.php b/modules/monitoring/test/php/application/forms/Command/CustomNotificationFormTest.php
index c26ef4f8e..39a3e72d6 100644
--- a/modules/monitoring/test/php/application/forms/Command/CustomNotificationFormTest.php
+++ b/modules/monitoring/test/php/application/forms/Command/CustomNotificationFormTest.php
@@ -13,7 +13,7 @@ use \Icinga\Module\Monitoring\Form\Command\CustomNotificationForm; // Used by co
 
 class CustomNotificationFormTest extends BaseFormTest
 {
-    const FORM_CLASS = 'Monitoring\Form\Command\CustomNotificationForm';
+    const FORM_CLASS = '\Icinga\Module\Monitoring\Form\Command\CustomNotificationForm';
 
     public function testFormInvalidWhenCommentMissing()
     {
diff --git a/modules/monitoring/test/php/application/forms/Command/DelayNotificationFormTest.php b/modules/monitoring/test/php/application/forms/Command/DelayNotificationFormTest.php
index 51900f7ab..25e8a757d 100644
--- a/modules/monitoring/test/php/application/forms/Command/DelayNotificationFormTest.php
+++ b/modules/monitoring/test/php/application/forms/Command/DelayNotificationFormTest.php
@@ -13,7 +13,7 @@ use \Icinga\Module\Monitoring\Form\Command\DelayNotificationForm; // Used by con
 
 class DelayNotificationFormTest extends BaseFormTest
 {
-    const FORM_CLASS = 'Monitoring\Form\Command\DelayNotificationForm';
+    const FORM_CLASS = '\Icinga\Module\Monitoring\Form\Command\DelayNotificationForm';
 
     public function testFormInvalidWhenNotificationDelayMissing()
     {
diff --git a/modules/monitoring/test/php/application/forms/Command/RescheduleNextCheckFormTest.php b/modules/monitoring/test/php/application/forms/Command/RescheduleNextCheckFormTest.php
index bfbc191fc..5d90c6eda 100644
--- a/modules/monitoring/test/php/application/forms/Command/RescheduleNextCheckFormTest.php
+++ b/modules/monitoring/test/php/application/forms/Command/RescheduleNextCheckFormTest.php
@@ -17,7 +17,7 @@ use \Test\Icinga\Web\Form\BaseFormTest;
 
 class RescheduleNextCheckFormTest extends BaseFormTest
 {
-    const FORM_CLASS = 'Monitoring\Form\Command\RescheduleNextCheckForm';
+    const FORM_CLASS = '\Icinga\Module\Monitoring\Form\Command\RescheduleNextCheckForm';
 
     /**
      * Set up the default time zone
diff --git a/modules/monitoring/test/php/application/forms/Command/ScheduleDowntimeFormTest.php b/modules/monitoring/test/php/application/forms/Command/ScheduleDowntimeFormTest.php
index 5f2282916..b17f05a30 100644
--- a/modules/monitoring/test/php/application/forms/Command/ScheduleDowntimeFormTest.php
+++ b/modules/monitoring/test/php/application/forms/Command/ScheduleDowntimeFormTest.php
@@ -17,7 +17,7 @@ use \Test\Icinga\Web\Form\BaseFormTest;
 
 class ScheduleDowntimeFormTest extends BaseFormTest
 {
-    const FORM_CLASS = 'Monitoring\Form\Command\ScheduleDowntimeForm';
+    const FORM_CLASS = '\Icinga\Module\Monitoring\Form\Command\ScheduleDowntimeForm';
 
     /**
      * Set up the default time zone
diff --git a/modules/monitoring/test/php/application/forms/Command/SubmitPassiveCheckResultTest.php b/modules/monitoring/test/php/application/forms/Command/SubmitPassiveCheckResultTest.php
index 4c027065e..085d8120b 100644
--- a/modules/monitoring/test/php/application/forms/Command/SubmitPassiveCheckResultTest.php
+++ b/modules/monitoring/test/php/application/forms/Command/SubmitPassiveCheckResultTest.php
@@ -13,7 +13,7 @@ use \Icinga\Module\Monitoring\Form\Command\SubmitPassiveCheckResultForm; // Used
 
 class SubmitPassiveCheckResultFormTest extends BaseFormTest
 {
-    const FORM_CLASS = 'Monitoring\Form\Command\SubmitPassiveCheckResultForm';
+    const FORM_CLASS = '\Icinga\Module\Monitoring\Form\Command\SubmitPassiveCheckResultForm';
 
     public function testStateTypes()
     {