diff --git a/library/Icinga/Protocol/Statusdat/View/ObjectRemappingView.php b/library/Icinga/Protocol/Statusdat/View/ObjectRemappingView.php
index 1a216fad6..5c2f218c7 100755
--- a/library/Icinga/Protocol/Statusdat/View/ObjectRemappingView.php
+++ b/library/Icinga/Protocol/Statusdat/View/ObjectRemappingView.php
@@ -51,7 +51,7 @@ class ObjectRemappingView implements AccessorStrategy
 
     /**
      * When implementing your own Mapper, this contains the static mapping rules.
-     * @see Monitoring\Backend\Statusdat\DataView\StatusdatServiceView for an example
+     * @see Icinga\Module\Monitoring\Backend\Statusdat\DataView\StatusdatServiceView for an example
      *
      * @var array
      */
diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php
index 76b12df08..cc5f18b4a 100644
--- a/modules/monitoring/application/controllers/ConfigController.php
+++ b/modules/monitoring/application/controllers/ConfigController.php
@@ -35,12 +35,12 @@ use \Icinga\Web\Controller\BaseConfigController;
 use \Icinga\Web\Widget\Tab;
 use \Icinga\Web\Url;
 
-use \Monitoring\Form\Config\ConfirmRemovalForm;
-use \Monitoring\Form\Config\Backend\EditBackendForm;
-use \Monitoring\Form\Config\Backend\CreateBackendForm;
+use Icinga\Module\Monitoring\Form\Config\ConfirmRemovalForm;
+use Icinga\Module\Monitoring\Form\Config\Backend\EditBackendForm;
+use Icinga\Module\Monitoring\Form\Config\Backend\CreateBackendForm;
 
-use \Monitoring\Form\Config\Instance\EditInstanceForm;
-use \Monitoring\Form\Config\Instance\CreateInstanceForm;
+use Icinga\Module\Monitoring\Form\Config\Instance\EditInstanceForm;
+use Icinga\Module\Monitoring\Form\Config\Instance\CreateInstanceForm;
 
 /**
  * Configuration controller for editing monitoring resources
diff --git a/modules/monitoring/application/forms/Config/Backend/CreateBackendForm.php b/modules/monitoring/application/forms/Config/Backend/CreateBackendForm.php
index 3f0055451..1e51d7107 100644
--- a/modules/monitoring/application/forms/Config/Backend/CreateBackendForm.php
+++ b/modules/monitoring/application/forms/Config/Backend/CreateBackendForm.php
@@ -27,7 +27,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 
 
-namespace Monitoring\Form\Config\Backend;
+namespace Icinga\Module\Monitoring\Form\Config\Backend;
 
 use \Zend_Config;
 
diff --git a/modules/monitoring/application/forms/Config/Backend/EditBackendForm.php b/modules/monitoring/application/forms/Config/Backend/EditBackendForm.php
index 8694c493e..58501df97 100644
--- a/modules/monitoring/application/forms/Config/Backend/EditBackendForm.php
+++ b/modules/monitoring/application/forms/Config/Backend/EditBackendForm.php
@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Form\Config\Backend;
+namespace Icinga\Module\Monitoring\Form\Config\Backend;
 
 use \Zend_Config;
 use \Icinga\Web\Form;
diff --git a/modules/monitoring/application/forms/Config/ConfirmRemovalForm.php b/modules/monitoring/application/forms/Config/ConfirmRemovalForm.php
index d8008addd..64d914d73 100644
--- a/modules/monitoring/application/forms/Config/ConfirmRemovalForm.php
+++ b/modules/monitoring/application/forms/Config/ConfirmRemovalForm.php
@@ -27,7 +27,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 
 
-namespace Monitoring\Form\Config;
+namespace Icinga\Module\Monitoring\Form\Config;
 
 use Icinga\Web\Form;
 
diff --git a/modules/monitoring/application/forms/Config/Instance/CreateInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/CreateInstanceForm.php
index b46021eed..9a6a4d5f9 100644
--- a/modules/monitoring/application/forms/Config/Instance/CreateInstanceForm.php
+++ b/modules/monitoring/application/forms/Config/Instance/CreateInstanceForm.php
@@ -27,7 +27,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 
 
-namespace Monitoring\Form\Config\Instance;
+namespace Icinga\Module\Monitoring\Form\Config\Instance;
 
 use \Icinga\Web\Form;
 use \Zend_Config;
diff --git a/modules/monitoring/application/forms/Config/Instance/EditInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/EditInstanceForm.php
index f04084941..cd7082a81 100644
--- a/modules/monitoring/application/forms/Config/Instance/EditInstanceForm.php
+++ b/modules/monitoring/application/forms/Config/Instance/EditInstanceForm.php
@@ -27,7 +27,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 
 
-namespace Monitoring\Form\Config\Instance;
+namespace Icinga\Module\Monitoring\Form\Config\Instance;
 
 use \Zend_Config;
 use \Icinga\Web\Form;
diff --git a/modules/monitoring/application/views/scripts/show/history.phtml b/modules/monitoring/application/views/scripts/show/history.phtml
index dc89aea56..b58838045 100644
--- a/modules/monitoring/application/views/scripts/show/history.phtml
+++ b/modules/monitoring/application/views/scripts/show/history.phtml
@@ -27,7 +27,7 @@ There are no matching history entries right now
       <td><?= $this->escape($event->host_name) ?></td>
       <? endif ?>
 
-      <? if (! $object instanceof Monitoring\Object\Service): ?>
+      <? if (! $object instanceof Icinga\Module\Monitoring\Object\Service): ?>
       <td>
         <? if ($object): ?>
         <a href="<?= $this->href('monitoring/show/service',array(
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido.php b/modules/monitoring/library/Monitoring/Backend/Ido.php
index 2290855cf..f936c33e5 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido.php
@@ -7,7 +7,7 @@ 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 Monitoring\Backend.
+ * You should usually not directly use this class but go through Icinga\Module\Monitoring\Backend.
  *
  * New MySQL indexes:
  * <code>
diff --git a/modules/monitoring/library/Monitoring/View/MonitoringView.php b/modules/monitoring/library/Monitoring/View/MonitoringView.php
index 0c9451916..278f65030 100644
--- a/modules/monitoring/library/Monitoring/View/MonitoringView.php
+++ b/modules/monitoring/library/Monitoring/View/MonitoringView.php
@@ -13,7 +13,7 @@ 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 Monitoring\View\VirtualtableView instance.
+ * 'virtualtable' returns a Icinga\Module\Monitoring\View\VirtualtableView instance.
  *
  * Usage example:
  * <code>
diff --git a/test/php/library/Icinga/Test/BaseTestCaseFormTest.php b/test/php/library/Icinga/Test/BaseTestCaseFormTest.php
deleted file mode 100644
index 8210cff10..000000000
--- a/test/php/library/Icinga/Test/BaseTestCaseFormTest.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-/**
- * This file is part of Icinga 2 Web.
- *
- * Icinga 2 Web - Head for multiple monitoring backends.
- * Copyright (C) 2013 Icinga Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * @copyright 2013 Icinga Development Team <info@icinga.org>
- * @license   http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2
- * @author    Icinga Development Team <info@icinga.org>
- */
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Tests\Icinga\Test;
-
-require_once realpath(__DIR__ . '/../../../../../library/Icinga/Test/BaseTestCase.php');
-
-use \Icinga\Test\BaseTestCase;
-
-require_once BaseTestCase::$appDir . '/forms/Authentication/LoginForm.php';
-require_once BaseTestCase::$moduleDir . '/monitoring/application/forms/Config/ConfirmRemovalForm.php';
-
-class BaseTestCaseFormTest extends BaseTestCase
-{
-    public function testFormCreation()
-    {
-        $form1 = $this->createForm('Icinga\Form\Authentication\LoginForm');
-        $this->assertInstanceOf('Icinga\Web\Form', $form1);
-        $form2 = $this->createForm('Monitoring\Form\Config\ConfirmRemovalForm');
-        $this->assertInstanceOf('Icinga\Web\Form', $form2);
-    }
-}