diff --git a/application/controllers/CommandController.php b/application/controllers/CommandController.php
index 7ee45f1d..58bb1f93 100644
--- a/application/controllers/CommandController.php
+++ b/application/controllers/CommandController.php
@@ -1,10 +1,11 @@
 <?php
 
-use Icinga\Module\Director\Web\Controller\ObjectController;
+namespace Icinga\Module\Director\Controllers;
 
+use Icinga\Module\Director\Web\Controller\ObjectController;
 use Icinga\Data\Filter\Filter;
 
-class Director_CommandController extends ObjectController
+class CommandController extends ObjectController
 {
     public function init()
     {
diff --git a/application/controllers/CommandsController.php b/application/controllers/CommandsController.php
index e7c800d6..74511994 100644
--- a/application/controllers/CommandsController.php
+++ b/application/controllers/CommandsController.php
@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectsController;
 
-class Director_CommandsController extends ObjectsController
+class CommandsController extends ObjectsController
 {
 }
diff --git a/application/controllers/CommandtemplatesController.php b/application/controllers/CommandtemplatesController.php
index d3982346..8ae84ef5 100644
--- a/application/controllers/CommandtemplatesController.php
+++ b/application/controllers/CommandtemplatesController.php
@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectsController;
 
-class Director_CommandtemplatesController extends ObjectsController
+class CommandtemplatesController extends ObjectsController
 {
 }
diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 1c060ea0..6106ee03 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\IcingaConfig\IcingaConfig;
 use Icinga\Module\Director\Util;
 use Icinga\Module\Director\Web\Controller\ActionController;
@@ -8,7 +10,7 @@ use Icinga\Module\Director\Core\RestApiClient;
 use Icinga\Module\Director\Core\CoreApi;
 use Icinga\Web\Notification;
 
-class Director_ConfigController extends ActionController
+class ConfigController extends ActionController
 {
     public function deployAction()
     {
diff --git a/application/controllers/DatafieldController.php b/application/controllers/DatafieldController.php
index 35005279..d515599b 100644
--- a/application/controllers/DatafieldController.php
+++ b/application/controllers/DatafieldController.php
@@ -1,8 +1,10 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ActionController;
 
-class Director_DatafieldController extends ActionController
+class DatafieldController extends ActionController
 {
     public function addAction()
     {
diff --git a/application/controllers/DatalistController.php b/application/controllers/DatalistController.php
index 7b47d41f..73428fa7 100644
--- a/application/controllers/DatalistController.php
+++ b/application/controllers/DatalistController.php
@@ -1,8 +1,10 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ActionController;
 
-class Director_DatalistController extends ActionController
+class DatalistController extends ActionController
 {
     public function addAction()
     {
diff --git a/application/controllers/DatalistentryController.php b/application/controllers/DatalistentryController.php
index fc53aed2..de5076d2 100644
--- a/application/controllers/DatalistentryController.php
+++ b/application/controllers/DatalistentryController.php
@@ -1,8 +1,10 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ActionController;
 
-class Director_DatalistentryController extends ActionController
+class DatalistentryController extends ActionController
 {
     public function addAction()
     {
diff --git a/application/controllers/DeploymentController.php b/application/controllers/DeploymentController.php
index 21093c7b..2fd87211 100644
--- a/application/controllers/DeploymentController.php
+++ b/application/controllers/DeploymentController.php
@@ -1,10 +1,12 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ActionController;
 use Icinga\Module\Director\Objects\DirectorDeploymentLog;
 use Icinga\Module\Director\Util;
 
-class Director_DeploymentController extends ActionController
+class DeploymentController extends ActionController
 {
     public function showAction()
     {
diff --git a/application/controllers/EndpointController.php b/application/controllers/EndpointController.php
index f48841ac..e8a4fb01 100644
--- a/application/controllers/EndpointController.php
+++ b/application/controllers/EndpointController.php
@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectController;
 
-class Director_EndpointController extends ObjectController
+class EndpointController extends ObjectController
 {
 }
diff --git a/application/controllers/EndpointsController.php b/application/controllers/EndpointsController.php
index ae887fc0..40501a4f 100644
--- a/application/controllers/EndpointsController.php
+++ b/application/controllers/EndpointsController.php
@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectsController;
 
-class Director_EndpointsController extends ObjectsController
+class EndpointsController extends ObjectsController
 {
 }
diff --git a/application/controllers/HostController.php b/application/controllers/HostController.php
index 29fdf686..4c968078 100644
--- a/application/controllers/HostController.php
+++ b/application/controllers/HostController.php
@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectController;
 
-class Director_HostController extends ObjectController
+class HostController extends ObjectController
 {
 }
diff --git a/application/controllers/HostgroupController.php b/application/controllers/HostgroupController.php
index 8ada44d2..aa4cc518 100644
--- a/application/controllers/HostgroupController.php
+++ b/application/controllers/HostgroupController.php
@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectController;
 
-class Director_HostgroupController extends ObjectController
+class HostgroupController extends ObjectController
 {
 }
diff --git a/application/controllers/HostgroupsController.php b/application/controllers/HostgroupsController.php
index 1989717d..2b4b4171 100644
--- a/application/controllers/HostgroupsController.php
+++ b/application/controllers/HostgroupsController.php
@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectsController;
 
-class Director_HostgroupsController extends ObjectsController
+class HostgroupsController extends ObjectsController
 {
 }
diff --git a/application/controllers/HostsController.php b/application/controllers/HostsController.php
index 3a428a95..2d677d67 100644
--- a/application/controllers/HostsController.php
+++ b/application/controllers/HostsController.php
@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectsController;
 
-class Director_HostsController extends ObjectsController
+class HostsController extends ObjectsController
 {
 }
diff --git a/application/controllers/HosttemplatesController.php b/application/controllers/HosttemplatesController.php
index 49b15307..4c350b98 100644
--- a/application/controllers/HosttemplatesController.php
+++ b/application/controllers/HosttemplatesController.php
@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectsController;
 
-class Director_HosttemplatesController extends ObjectsController
+class HosttemplatesController extends ObjectsController
 {
 }
diff --git a/application/controllers/ImportrunController.php b/application/controllers/ImportrunController.php
index e2bb0688..0b88c3b1 100644
--- a/application/controllers/ImportrunController.php
+++ b/application/controllers/ImportrunController.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ActionController;
 use Icinga\Module\Director\Web\Hook\ImportSourceHook;
 use Icinga\Module\Director\Util;
@@ -8,7 +10,7 @@ use Icinga\Module\Director\Import\Import;
 use Icinga\Exception\InvalidPropertyException;
 use Icinga\Web\Notification;
 
-class Director_ImportrunController extends ActionController
+class ImportrunController extends ActionController
 {
     public function indexAction()
     {
diff --git a/application/controllers/ImportsourceController.php b/application/controllers/ImportsourceController.php
index 536384a6..6fd351eb 100644
--- a/application/controllers/ImportsourceController.php
+++ b/application/controllers/ImportsourceController.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ActionController;
 use Icinga\Module\Director\Web\Hook\ImportSourceHook;
 use Icinga\Module\Director\Objects\ImportSource;
@@ -8,7 +10,7 @@ use Icinga\Exception\InvalidPropertyException;
 use Icinga\Web\Notification;
 use Icinga\Web\Url;
 
-class Director_ImportsourceController extends ActionController
+class ImportsourceController extends ActionController
 {
     public function addAction()
     {
diff --git a/application/controllers/InspectController.php b/application/controllers/InspectController.php
index 878f0859..87368e77 100644
--- a/application/controllers/InspectController.php
+++ b/application/controllers/InspectController.php
@@ -1,10 +1,12 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ActionController;
 use Icinga\Module\Director\Core\RestApiClient;
 use Icinga\Module\Director\Core\CoreApi;
 
-class Director_InspectController extends ActionController
+class InspectController extends ActionController
 {
     public function typesAction()
     {
diff --git a/application/controllers/ListController.php b/application/controllers/ListController.php
index 8cac228d..036e47d0 100644
--- a/application/controllers/ListController.php
+++ b/application/controllers/ListController.php
@@ -1,11 +1,13 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ActionController;
 use Icinga\Module\Director\Core\RestApiClient;
 use Icinga\Module\Director\Core\CoreApi;
 use Exception;
 
-class Director_ListController extends ActionController
+class ListController extends ActionController
 {
     public function activitylogAction()
     {
diff --git a/application/controllers/SchemaController.php b/application/controllers/SchemaController.php
index e216cfce..6028a338 100644
--- a/application/controllers/SchemaController.php
+++ b/application/controllers/SchemaController.php
@@ -1,8 +1,10 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ActionController;
 
-class Director_SchemaController extends ActionController
+class SchemaController extends ActionController
 {
     protected $schema;
 
diff --git a/application/controllers/ServiceController.php b/application/controllers/ServiceController.php
index 2e30eeb7..68b56a88 100644
--- a/application/controllers/ServiceController.php
+++ b/application/controllers/ServiceController.php
@@ -1,8 +1,10 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectController;
 
-class Director_ServiceController extends ObjectController
+class ServiceController extends ObjectController
 {
     public function init()
     {
diff --git a/application/controllers/ServicegroupController.php b/application/controllers/ServicegroupController.php
index cd48538e..b2fc50ef 100644
--- a/application/controllers/ServicegroupController.php
+++ b/application/controllers/ServicegroupController.php
@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectController;
 
-class Director_ServicegroupController extends ObjectController
+class ServicegroupController extends ObjectController
 {
 }
diff --git a/application/controllers/ServicegroupsController.php b/application/controllers/ServicegroupsController.php
index 94a3f675..d35e6380 100644
--- a/application/controllers/ServicegroupsController.php
+++ b/application/controllers/ServicegroupsController.php
@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectsController;
 
-class Director_ServicegroupsController extends ObjectsController
+class ServicegroupsController extends ObjectsController
 {
 }
diff --git a/application/controllers/ServicesController.php b/application/controllers/ServicesController.php
index 7230200f..8afe2094 100644
--- a/application/controllers/ServicesController.php
+++ b/application/controllers/ServicesController.php
@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectsController;
 
-class Director_ServicesController extends ObjectsController
+class ServicesController extends ObjectsController
 {
 }
diff --git a/application/controllers/ServicetemplatesController.php b/application/controllers/ServicetemplatesController.php
index 0434ecaa..d053ff08 100644
--- a/application/controllers/ServicetemplatesController.php
+++ b/application/controllers/ServicetemplatesController.php
@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectsController;
 
-class Director_ServicetemplatesController extends ObjectsController
+class ServicetemplatesController extends ObjectsController
 {
 }
diff --git a/application/controllers/SettingsController.php b/application/controllers/SettingsController.php
index f86fb3a6..ad1e24b8 100644
--- a/application/controllers/SettingsController.php
+++ b/application/controllers/SettingsController.php
@@ -1,9 +1,11 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Forms\ConfigForm;
 use Icinga\Module\Director\Web\Controller\ActionController;
 
-class Director_SettingsController extends ActionController
+class SettingsController extends ActionController
 {
     public function indexAction()
     {
diff --git a/application/controllers/ShowController.php b/application/controllers/ShowController.php
index 87fcd412..c640a85c 100644
--- a/application/controllers/ShowController.php
+++ b/application/controllers/ShowController.php
@@ -1,12 +1,14 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\IcingaConfig\IcingaConfig;
 use Icinga\Module\Director\Objects\IcingaObject;
 use Icinga\Module\Director\ConfigDiff;
 use Icinga\Module\Director\Util;
 use Icinga\Module\Director\Web\Controller\ActionController;
 
-class Director_ShowController extends ActionController
+class ShowController extends ActionController
 {
     public function activitylogAction()
     {
diff --git a/application/controllers/SyncpropertyController.php b/application/controllers/SyncpropertyController.php
index 69fd922c..49793dbb 100644
--- a/application/controllers/SyncpropertyController.php
+++ b/application/controllers/SyncpropertyController.php
@@ -1,12 +1,14 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ActionController;
 use Icinga\Module\Director\Objects\SyncProperty;
 use Icinga\Module\Director\Sync\Sync;
 use Icinga\Exception\InvalidPropertyException;
 use Icinga\Web\Notification;
 
-class Director_SyncpropertyController extends ActionController
+class SyncpropertyController extends ActionController
 {
     public function addAction()
     {
diff --git a/application/controllers/SyncruleController.php b/application/controllers/SyncruleController.php
index 6975f59a..baee8979 100644
--- a/application/controllers/SyncruleController.php
+++ b/application/controllers/SyncruleController.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ActionController;
 use Icinga\Module\Director\Objects\SyncRule;
 use Icinga\Module\Director\Import\Sync;
@@ -7,7 +9,7 @@ use Icinga\Data\Filter\Filter;
 use Icinga\Exception\InvalidPropertyException;
 use Icinga\Web\Notification;
 
-class Director_SyncruleController extends ActionController
+class SyncruleController extends ActionController
 {
     public function addAction()
     {
diff --git a/application/controllers/TimeperiodController.php b/application/controllers/TimeperiodController.php
index 51026fd6..66489926 100644
--- a/application/controllers/TimeperiodController.php
+++ b/application/controllers/TimeperiodController.php
@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectController;
 
-class Director_TimeperiodController extends ObjectController
+class TimeperiodController extends ObjectController
 {
 }
diff --git a/application/controllers/TimeperiodsController.php b/application/controllers/TimeperiodsController.php
index 838f0d0f..e5adb192 100644
--- a/application/controllers/TimeperiodsController.php
+++ b/application/controllers/TimeperiodsController.php
@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectsController;
 
-class Director_TimeperiodsController extends ObjectsController
+class TimeperiodsController extends ObjectsController
 {
 }
diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index ab4f3e86..86c7d9f1 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectController;
 
-class Director_UserController extends ObjectController
+class UserController extends ObjectController
 {
 }
diff --git a/application/controllers/UsergroupController.php b/application/controllers/UsergroupController.php
index df68f28a..e58fd7e0 100644
--- a/application/controllers/UsergroupController.php
+++ b/application/controllers/UsergroupController.php
@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectController;
 
-class Director_UsergroupController extends ObjectController
+class UsergroupController extends ObjectController
 {
 }
diff --git a/application/controllers/UsergroupsController.php b/application/controllers/UsergroupsController.php
index 7811914e..057890f0 100644
--- a/application/controllers/UsergroupsController.php
+++ b/application/controllers/UsergroupsController.php
@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectsController;
 
-class Director_UsergroupsController extends ObjectsController
+class UsergroupsController extends ObjectsController
 {
 }
diff --git a/application/controllers/UsersController.php b/application/controllers/UsersController.php
index 1da86de9..dab1da01 100644
--- a/application/controllers/UsersController.php
+++ b/application/controllers/UsersController.php
@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectsController;
 
-class Director_UsersController extends ObjectsController
+class UsersController extends ObjectsController
 {
 }
diff --git a/application/controllers/WelcomeController.php b/application/controllers/WelcomeController.php
index 030e8bff..a380005a 100644
--- a/application/controllers/WelcomeController.php
+++ b/application/controllers/WelcomeController.php
@@ -1,8 +1,10 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ActionController;
 
-class Director_WelcomeController extends ActionController
+class WelcomeController extends ActionController
 {
     public function indexAction()
     {
diff --git a/application/controllers/ZoneController.php b/application/controllers/ZoneController.php
index e40c66e1..a4125bb8 100644
--- a/application/controllers/ZoneController.php
+++ b/application/controllers/ZoneController.php
@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectController;
 
-class Director_ZoneController extends ObjectController
+class ZoneController extends ObjectController
 {
 }
diff --git a/application/controllers/ZonesController.php b/application/controllers/ZonesController.php
index 69cba9d6..2dcaf584 100644
--- a/application/controllers/ZonesController.php
+++ b/application/controllers/ZonesController.php
@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectsController;
 
-class Director_ZonesController extends ObjectsController
+class ZonesController extends ObjectsController
 {
 }