diff --git a/application/controllers/CommentController.php b/application/controllers/CommentController.php
index 4a68ddaf..641530b9 100644
--- a/application/controllers/CommentController.php
+++ b/application/controllers/CommentController.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Icinga\Module\Eagle\Controllers;
+namespace Icinga\Module\Icingadb\Controllers;
 
 use Icinga\Exception\NotFoundError;
-use Icinga\Module\Eagle\Common\CommandActions;
-use Icinga\Module\Eagle\Common\HostLink;
-use Icinga\Module\Eagle\Common\Links;
-use Icinga\Module\Eagle\Common\ServiceLink;
-use Icinga\Module\Eagle\Model\Comment;
-use Icinga\Module\Eagle\Web\Controller;
-use Icinga\Module\Eagle\Widget\Detail\CommentDetail;
+use Icinga\Module\Icingadb\Common\CommandActions;
+use Icinga\Module\Icingadb\Common\HostLink;
+use Icinga\Module\Icingadb\Common\Links;
+use Icinga\Module\Icingadb\Common\ServiceLink;
+use Icinga\Module\Icingadb\Model\Comment;
+use Icinga\Module\Icingadb\Web\Controller;
+use Icinga\Module\Icingadb\Widget\Detail\CommentDetail;
 
 class CommentController extends Controller
 {
diff --git a/application/controllers/CommentsController.php b/application/controllers/CommentsController.php
index 5db7fea3..442806d9 100644
--- a/application/controllers/CommentsController.php
+++ b/application/controllers/CommentsController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Icinga\Module\Eagle\Controllers;
+namespace Icinga\Module\Icingadb\Controllers;
 
-use Icinga\Module\Eagle\Model\Comment;
-use Icinga\Module\Eagle\Web\Controller;
-use Icinga\Module\Eagle\Widget\ItemList\CommentList;
+use Icinga\Module\Icingadb\Model\Comment;
+use Icinga\Module\Icingadb\Web\Controller;
+use Icinga\Module\Icingadb\Widget\ItemList\CommentList;
 
 class CommentsController extends Controller
 {
diff --git a/application/controllers/DowntimesController.php b/application/controllers/DowntimesController.php
index 1c7f81d1..d7eea394 100644
--- a/application/controllers/DowntimesController.php
+++ b/application/controllers/DowntimesController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Icinga\Module\Eagle\Controllers;
+namespace Icinga\Module\Icingadb\Controllers;
 
-use Icinga\Module\Eagle\Model\Downtime;
-use Icinga\Module\Eagle\Web\Controller;
-use Icinga\Module\Eagle\Widget\DowntimeList;
+use Icinga\Module\Icingadb\Model\Downtime;
+use Icinga\Module\Icingadb\Web\Controller;
+use Icinga\Module\Icingadb\Widget\DowntimeList;
 
 class DowntimesController extends Controller
 {
diff --git a/application/controllers/HostController.php b/application/controllers/HostController.php
index ef1feae9..24be5796 100644
--- a/application/controllers/HostController.php
+++ b/application/controllers/HostController.php
@@ -1,22 +1,22 @@
 <?php
 
-namespace Icinga\Module\Eagle\Controllers;
+namespace Icinga\Module\Icingadb\Controllers;
 
 use Icinga\Exception\NotFoundError;
-use Icinga\Module\Eagle\Common\CommandActions;
-use Icinga\Module\Eagle\Common\HostLinks;
-use Icinga\Module\Eagle\Common\Links;
-use Icinga\Module\Eagle\Model\History;
-use Icinga\Module\Eagle\Model\Host;
-use Icinga\Module\Eagle\Model\Service;
-use Icinga\Module\Eagle\Web\Controller;
-use Icinga\Module\Eagle\Widget\Detail\ObjectDetail;
-use Icinga\Module\Eagle\Widget\Detail\QuickActions;
-use Icinga\Module\Eagle\Widget\DowntimeList;
-use Icinga\Module\Eagle\Widget\HostList;
-use Icinga\Module\Eagle\Widget\ItemList\CommentList;
-use Icinga\Module\Eagle\Widget\ItemList\HistoryList;
-use Icinga\Module\Eagle\Widget\ServiceList;
+use Icinga\Module\Icingadb\Common\CommandActions;
+use Icinga\Module\Icingadb\Common\HostLinks;
+use Icinga\Module\Icingadb\Common\Links;
+use Icinga\Module\Icingadb\Model\History;
+use Icinga\Module\Icingadb\Model\Host;
+use Icinga\Module\Icingadb\Model\Service;
+use Icinga\Module\Icingadb\Web\Controller;
+use Icinga\Module\Icingadb\Widget\Detail\ObjectDetail;
+use Icinga\Module\Icingadb\Widget\Detail\QuickActions;
+use Icinga\Module\Icingadb\Widget\DowntimeList;
+use Icinga\Module\Icingadb\Widget\HostList;
+use Icinga\Module\Icingadb\Widget\ItemList\CommentList;
+use Icinga\Module\Icingadb\Widget\ItemList\HistoryList;
+use Icinga\Module\Icingadb\Widget\ServiceList;
 
 class HostController extends Controller
 {
diff --git a/application/controllers/HostgroupController.php b/application/controllers/HostgroupController.php
index b7991349..94a7f778 100644
--- a/application/controllers/HostgroupController.php
+++ b/application/controllers/HostgroupController.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Icinga\Module\Eagle\Controllers;
+namespace Icinga\Module\Icingadb\Controllers;
 
 use Icinga\Data\Filter\FilterExpression;
 use Icinga\Exception\NotFoundError;
-use Icinga\Module\Eagle\Model\Host;
-use Icinga\Module\Eagle\Model\Hostgroupsummary;
-use Icinga\Module\Eagle\Web\Controller;
-use Icinga\Module\Eagle\Widget\HostList;
-use Icinga\Module\Eagle\Widget\ItemList\HostgroupList;
+use Icinga\Module\Icingadb\Model\Host;
+use Icinga\Module\Icingadb\Model\Hostgroupsummary;
+use Icinga\Module\Icingadb\Web\Controller;
+use Icinga\Module\Icingadb\Widget\HostList;
+use Icinga\Module\Icingadb\Widget\ItemList\HostgroupList;
 use ipl\Orm\Compat\FilterProcessor;
 
 class HostgroupController extends Controller
diff --git a/application/controllers/HostgroupsController.php b/application/controllers/HostgroupsController.php
index afc5b945..e3b30a3f 100644
--- a/application/controllers/HostgroupsController.php
+++ b/application/controllers/HostgroupsController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Icinga\Module\Eagle\Controllers;
+namespace Icinga\Module\Icingadb\Controllers;
 
-use Icinga\Module\Eagle\Model\Hostgroupsummary;
-use Icinga\Module\Eagle\Web\Controller;
-use Icinga\Module\Eagle\Widget\ItemList\HostgroupList;
+use Icinga\Module\Icingadb\Model\Hostgroupsummary;
+use Icinga\Module\Icingadb\Web\Controller;
+use Icinga\Module\Icingadb\Widget\ItemList\HostgroupList;
 
 class HostgroupsController extends Controller
 {
diff --git a/application/controllers/HostsController.php b/application/controllers/HostsController.php
index 09bd3f54..39cd34af 100644
--- a/application/controllers/HostsController.php
+++ b/application/controllers/HostsController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Icinga\Module\Eagle\Controllers;
+namespace Icinga\Module\Icingadb\Controllers;
 
-use Icinga\Module\Eagle\Model\Host;
-use Icinga\Module\Eagle\Web\Controller;
-use Icinga\Module\Eagle\Widget\HostList;
+use Icinga\Module\Icingadb\Model\Host;
+use Icinga\Module\Icingadb\Web\Controller;
+use Icinga\Module\Icingadb\Widget\HostList;
 
 class HostsController extends Controller
 {
diff --git a/application/controllers/NotificationsController.php b/application/controllers/NotificationsController.php
index 65a38f85..00592173 100644
--- a/application/controllers/NotificationsController.php
+++ b/application/controllers/NotificationsController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Icinga\Module\Eagle\Controllers;
+namespace Icinga\Module\Icingadb\Controllers;
 
-use Icinga\Module\Eagle\Model\NotificationHistory;
-use Icinga\Module\Eagle\Web\Controller;
-use Icinga\Module\Eagle\Widget\ItemList\NotificationList;
+use Icinga\Module\Icingadb\Model\NotificationHistory;
+use Icinga\Module\Icingadb\Web\Controller;
+use Icinga\Module\Icingadb\Widget\ItemList\NotificationList;
 
 class NotificationsController extends Controller
 {
diff --git a/application/controllers/ServiceController.php b/application/controllers/ServiceController.php
index 237ed72b..57251568 100644
--- a/application/controllers/ServiceController.php
+++ b/application/controllers/ServiceController.php
@@ -1,22 +1,22 @@
 <?php
 
-namespace Icinga\Module\Eagle\Controllers;
+namespace Icinga\Module\Icingadb\Controllers;
 
 use Exception;
 use Icinga\Exception\NotFoundError;
-use Icinga\Module\Eagle\Common\CommandActions;
-use Icinga\Module\Eagle\Common\Links;
-use Icinga\Module\Eagle\Common\ServiceLinks;
-use Icinga\Module\Eagle\Model\History;
-use Icinga\Module\Eagle\Model\Service;
-use Icinga\Module\Eagle\Web\Controller;
-use Icinga\Module\Eagle\Widget\Detail\ObjectDetail;
-use Icinga\Module\Eagle\Widget\Detail\QuickActions;
-use Icinga\Module\Eagle\Widget\DowntimeList;
-use Icinga\Module\Eagle\Widget\HostList;
-use Icinga\Module\Eagle\Widget\ItemList\CommentList;
-use Icinga\Module\Eagle\Widget\ItemList\HistoryList;
-use Icinga\Module\Eagle\Widget\ServiceList;
+use Icinga\Module\Icingadb\Common\CommandActions;
+use Icinga\Module\Icingadb\Common\Links;
+use Icinga\Module\Icingadb\Common\ServiceLinks;
+use Icinga\Module\Icingadb\Model\History;
+use Icinga\Module\Icingadb\Model\Service;
+use Icinga\Module\Icingadb\Web\Controller;
+use Icinga\Module\Icingadb\Widget\Detail\ObjectDetail;
+use Icinga\Module\Icingadb\Widget\Detail\QuickActions;
+use Icinga\Module\Icingadb\Widget\DowntimeList;
+use Icinga\Module\Icingadb\Widget\HostList;
+use Icinga\Module\Icingadb\Widget\ItemList\CommentList;
+use Icinga\Module\Icingadb\Widget\ItemList\HistoryList;
+use Icinga\Module\Icingadb\Widget\ServiceList;
 use ipl\Sql\Sql;
 
 class ServiceController extends Controller
diff --git a/application/controllers/ServicegroupController.php b/application/controllers/ServicegroupController.php
index 98314476..d316887e 100644
--- a/application/controllers/ServicegroupController.php
+++ b/application/controllers/ServicegroupController.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Icinga\Module\Eagle\Controllers;
+namespace Icinga\Module\Icingadb\Controllers;
 
 use Icinga\Data\Filter\FilterExpression;
 use Icinga\Exception\NotFoundError;
-use Icinga\Module\Eagle\Model\Service;
-use Icinga\Module\Eagle\Model\Servicegroupsummary;
-use Icinga\Module\Eagle\Web\Controller;
-use Icinga\Module\Eagle\Widget\ServiceList;
-use Icinga\Module\Eagle\Widget\ItemList\ServicegroupList;
+use Icinga\Module\Icingadb\Model\Service;
+use Icinga\Module\Icingadb\Model\Servicegroupsummary;
+use Icinga\Module\Icingadb\Web\Controller;
+use Icinga\Module\Icingadb\Widget\ServiceList;
+use Icinga\Module\Icingadb\Widget\ItemList\ServicegroupList;
 use ipl\Orm\Compat\FilterProcessor;
 
 class ServicegroupController extends Controller
diff --git a/application/controllers/ServicegroupsController.php b/application/controllers/ServicegroupsController.php
index f40c6bd2..193647b9 100644
--- a/application/controllers/ServicegroupsController.php
+++ b/application/controllers/ServicegroupsController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Icinga\Module\Eagle\Controllers;
+namespace Icinga\Module\Icingadb\Controllers;
 
-use Icinga\Module\Eagle\Model\Servicegroupsummary;
-use Icinga\Module\Eagle\Web\Controller;
-use Icinga\Module\Eagle\Widget\ItemList\ServicegroupList;
+use Icinga\Module\Icingadb\Model\Servicegroupsummary;
+use Icinga\Module\Icingadb\Web\Controller;
+use Icinga\Module\Icingadb\Widget\ItemList\ServicegroupList;
 
 class ServicegroupsController extends Controller
 {
diff --git a/application/controllers/ServicesController.php b/application/controllers/ServicesController.php
index 2a7469d7..65e98d4a 100644
--- a/application/controllers/ServicesController.php
+++ b/application/controllers/ServicesController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Icinga\Module\Eagle\Controllers;
+namespace Icinga\Module\Icingadb\Controllers;
 
-use Icinga\Module\Eagle\Model\Service;
-use Icinga\Module\Eagle\Web\Controller;
-use Icinga\Module\Eagle\Widget\ServiceList;
+use Icinga\Module\Icingadb\Model\Service;
+use Icinga\Module\Icingadb\Web\Controller;
+use Icinga\Module\Icingadb\Widget\ServiceList;
 
 class ServicesController extends Controller
 {
diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index e4d18ef5..5ca8c712 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Icinga\Module\Eagle\Controllers;
+namespace Icinga\Module\Icingadb\Controllers;
 
 use Icinga\Exception\NotFoundError;
-use Icinga\Module\Eagle\Model\User;
-use Icinga\Module\Eagle\Web\Controller;
-use Icinga\Module\Eagle\Widget\ItemList\UserList;
+use Icinga\Module\Icingadb\Model\User;
+use Icinga\Module\Icingadb\Web\Controller;
+use Icinga\Module\Icingadb\Widget\ItemList\UserList;
 use ipl\Html\Html;
 
 class UserController extends Controller
diff --git a/application/controllers/UsergroupsController.php b/application/controllers/UsergroupsController.php
index 0a6d3b4f..57f27787 100644
--- a/application/controllers/UsergroupsController.php
+++ b/application/controllers/UsergroupsController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Icinga\Module\Eagle\Controllers;
+namespace Icinga\Module\Icingadb\Controllers;
 
-use Icinga\Module\Eagle\Model\Usergroup;
-use Icinga\Module\Eagle\Web\Controller;
-use Icinga\Module\Eagle\Widget\ItemList\UsergroupList;
+use Icinga\Module\Icingadb\Model\Usergroup;
+use Icinga\Module\Icingadb\Web\Controller;
+use Icinga\Module\Icingadb\Widget\ItemList\UsergroupList;
 
 class UsergroupsController extends Controller
 {
diff --git a/application/controllers/UsersController.php b/application/controllers/UsersController.php
index 2c0c2b4b..fda38a1d 100644
--- a/application/controllers/UsersController.php
+++ b/application/controllers/UsersController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Icinga\Module\Eagle\Controllers;
+namespace Icinga\Module\Icingadb\Controllers;
 
-use Icinga\Module\Eagle\Model\User;
-use Icinga\Module\Eagle\Web\Controller;
-use Icinga\Module\Eagle\Widget\ItemList\UserList;
+use Icinga\Module\Icingadb\Model\User;
+use Icinga\Module\Icingadb\Web\Controller;
+use Icinga\Module\Icingadb\Widget\ItemList\UserList;
 
 class UsersController extends Controller
 {
diff --git a/configuration.php b/configuration.php
index 2789f970..5ced70be 100644
--- a/configuration.php
+++ b/configuration.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle
+namespace Icinga\Module\Icingadb
 {
     /** @var \Icinga\Application\Modules\Module $this */
     $section = $this->menuSection(N_('Icinga DB'), [
@@ -9,43 +9,43 @@ namespace Icinga\Module\Eagle
     ]);
 
     $section->add(N_('Hosts'), [
-        'url' => 'eagle/hosts',
+        'url' => 'icingadb/hosts',
         'priority' => 10
     ]);
     $section->add(N_('Services'), [
-        'url' => 'eagle/services',
+        'url' => 'icingadb/services',
         'priority' => 20
     ]);
     $section->add(N_('Downtimes'), [
-        'url' => 'eagle/downtimes',
+        'url' => 'icingadb/downtimes',
         'priority' => 30
     ]);
     $section->add(N_('Comments'), [
-        'url' => 'eagle/comments',
+        'url' => 'icingadb/comments',
         'priority' => 40
     ]);
     $section->add(N_('Notifications'), [
-        'url' => 'eagle/notifications',
+        'url' => 'icingadb/notifications',
         'priority' => 50
     ]);
     $section->add(N_('Users'), [
-        'url' => 'eagle/users',
+        'url' => 'icingadb/users',
         'priority' => 60
     ]);
     $section->add(N_('User Groups'), [
-        'url' => 'eagle/usergroups',
+        'url' => 'icingadb/usergroups',
         'priority' => 70
     ]);
     $section->add(N_('Host Groups'), [
-        'url' => 'eagle/hostgroups',
+        'url' => 'icingadb/hostgroups',
         'priority' => 80
     ]);
     $section->add(N_('Service Groups'), [
-        'url' => 'eagle/servicegroups',
+        'url' => 'icingadb/servicegroups',
         'priority' => 80
     ]);
     $section->add(N_('History'), [
-        'url' => 'eagle/history',
+        'url' => 'icingadb/history',
         'priority' => 90
     ]);
 
diff --git a/library/Icingadb/Common/BaseTableRowItem.php b/library/Icingadb/Common/BaseTableRowItem.php
index efa3753e..98ffe5da 100644
--- a/library/Icingadb/Common/BaseTableRowItem.php
+++ b/library/Icingadb/Common/BaseTableRowItem.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Common;
+namespace Icinga\Module\Icingadb\Common;
 
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
diff --git a/library/Icingadb/Common/CommandActions.php b/library/Icingadb/Common/CommandActions.php
index e8655c0f..97bcd5bc 100644
--- a/library/Icingadb/Common/CommandActions.php
+++ b/library/Icingadb/Common/CommandActions.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Icinga\Module\Eagle\Common;
+namespace Icinga\Module\Icingadb\Common;
 
-use Icinga\Module\Eagle\Compat\CompatBackend;
-use Icinga\Module\Eagle\Compat\CompatHost;
-use Icinga\Module\Eagle\Compat\CompatObjects;
-use Icinga\Module\Eagle\Compat\CompatService;
+use Icinga\Module\Icingadb\Compat\CompatBackend;
+use Icinga\Module\Icingadb\Compat\CompatHost;
+use Icinga\Module\Icingadb\Compat\CompatObjects;
+use Icinga\Module\Icingadb\Compat\CompatService;
 use Icinga\Module\Monitoring\Forms\Command\Object\AcknowledgeProblemCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\AddCommentCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\CheckNowCommandForm;
diff --git a/library/Icingadb/Common/HostLink.php b/library/Icingadb/Common/HostLink.php
index 2778e9d6..0e02c31a 100644
--- a/library/Icingadb/Common/HostLink.php
+++ b/library/Icingadb/Common/HostLink.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Icinga\Module\Eagle\Common;
+namespace Icinga\Module\Icingadb\Common;
 
-use Icinga\Module\Eagle\Model\Host;
+use Icinga\Module\Icingadb\Model\Host;
 use ipl\Html\Html;
 use ipl\Web\Widget\StateBall;
 
diff --git a/library/Icingadb/Common/HostLinks.php b/library/Icingadb/Common/HostLinks.php
index 99f01cb7..652faff9 100644
--- a/library/Icingadb/Common/HostLinks.php
+++ b/library/Icingadb/Common/HostLinks.php
@@ -1,64 +1,64 @@
 <?php
 
-namespace Icinga\Module\Eagle\Common;
+namespace Icinga\Module\Icingadb\Common;
 
-use Icinga\Module\Eagle\Model\Host;
+use Icinga\Module\Icingadb\Model\Host;
 use ipl\Web\Url;
 
 abstract class HostLinks
 {
     public static function acknowledge(Host $host)
     {
-        return Url::fromPath('eagle/host/acknowledge', ['name' => $host->name]);
+        return Url::fromPath('icingadb/host/acknowledge', ['name' => $host->name]);
     }
 
     public static function addComment(Host $host)
     {
-        return Url::fromPath('eagle/host/add-comment', ['name' => $host->name]);
+        return Url::fromPath('icingadb/host/add-comment', ['name' => $host->name]);
     }
 
     public static function checkNow(Host $host)
     {
-        return Url::fromPath('eagle/host/check-now', ['name' => $host->name]);
+        return Url::fromPath('icingadb/host/check-now', ['name' => $host->name]);
     }
 
     public static function comments(Host $host)
     {
-        return Url::fromPath('eagle/host/comments', ['name' => $host->name]);
+        return Url::fromPath('icingadb/host/comments', ['name' => $host->name]);
     }
 
     public static function downtimes(Host $host)
     {
-        return Url::fromPath('eagle/host/downtimes', ['name' => $host->name]);
+        return Url::fromPath('icingadb/host/downtimes', ['name' => $host->name]);
     }
 
     public static function history(Host $host)
     {
-        return Url::fromPath('eagle/host/history', ['name' => $host->name]);
+        return Url::fromPath('icingadb/host/history', ['name' => $host->name]);
     }
 
     public static function removeAcknowledgement(Host $host)
     {
-        return Url::fromPath('eagle/host/remove-acknowledgement', ['name' => $host->name]);
+        return Url::fromPath('icingadb/host/remove-acknowledgement', ['name' => $host->name]);
     }
 
     public static function removeComment(Host $host)
     {
-        return Url::fromPath('eagle/host/delete-comment', ['name' => $host->name]);
+        return Url::fromPath('icingadb/host/delete-comment', ['name' => $host->name]);
     }
 
     public static function scheduleDowntime(Host $host)
     {
-        return Url::fromPath('eagle/host/schedule-downtime', ['name' => $host->name]);
+        return Url::fromPath('icingadb/host/schedule-downtime', ['name' => $host->name]);
     }
 
     public static function sendCustomNotification(Host $host)
     {
-        return Url::fromPath('eagle/host/send-custom-notification', ['name' => $host->name]);
+        return Url::fromPath('icingadb/host/send-custom-notification', ['name' => $host->name]);
     }
 
     public static function services(Host $host)
     {
-        return Url::fromPath('eagle/host/services', ['name' => $host->name]);
+        return Url::fromPath('icingadb/host/services', ['name' => $host->name]);
     }
 }
diff --git a/library/Icingadb/Common/HostStates.php b/library/Icingadb/Common/HostStates.php
index 9fef8e94..5202e0d6 100644
--- a/library/Icingadb/Common/HostStates.php
+++ b/library/Icingadb/Common/HostStates.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Common;
+namespace Icinga\Module\Icingadb\Common;
 
 /**
  * Collection of possible host states.
@@ -59,16 +59,16 @@ class HostStates
     {
         switch ((int) $state) {
             case self::UP:
-                $text = mt('eagle', 'up');
+                $text = mt('icingadb', 'up');
                 break;
             case self::DOWN:
-                $text = mt('eagle', 'down');
+                $text = mt('icingadb', 'down');
                 break;
             case self::UNREACHABLE:
-                $text = mt('eagle', 'unreachable');
+                $text = mt('icingadb', 'unreachable');
                 break;
             case self::PENDING:
-                $text = mt('eagle', 'pending');
+                $text = mt('icingadb', 'pending');
                 break;
             default:
                 throw new \InvalidArgumentException(sprintf('Invalid host state %d', $state));
diff --git a/library/Icingadb/Common/Icons.php b/library/Icingadb/Common/Icons.php
index 17408100..bea02586 100644
--- a/library/Icingadb/Common/Icons.php
+++ b/library/Icingadb/Common/Icons.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Common;
+namespace Icinga\Module\Icingadb\Common;
 
 class Icons
 {
diff --git a/library/Icingadb/Common/Links.php b/library/Icingadb/Common/Links.php
index 6e3453a7..5853ba0a 100644
--- a/library/Icingadb/Common/Links.php
+++ b/library/Icingadb/Common/Links.php
@@ -1,55 +1,55 @@
 <?php
 
-namespace Icinga\Module\Eagle\Common;
+namespace Icinga\Module\Icingadb\Common;
 
-use Icinga\Module\Eagle\Model\Comment;
-use Icinga\Module\Eagle\Model\Host;
-use Icinga\Module\Eagle\Model\Hostgroup;
-use Icinga\Module\Eagle\Model\Service;
-use Icinga\Module\Eagle\Model\Servicegroup;
-use Icinga\Module\Eagle\Model\User;
-use Icinga\Module\Eagle\Model\Usergroup;
+use Icinga\Module\Icingadb\Model\Comment;
+use Icinga\Module\Icingadb\Model\Host;
+use Icinga\Module\Icingadb\Model\Hostgroup;
+use Icinga\Module\Icingadb\Model\Service;
+use Icinga\Module\Icingadb\Model\Servicegroup;
+use Icinga\Module\Icingadb\Model\User;
+use Icinga\Module\Icingadb\Model\Usergroup;
 use ipl\Web\Url;
 
 abstract class Links
 {
     public static function comment(Comment $comment)
     {
-        return Url::fromPath('eagle/comment', ['name' => $comment->name]);
+        return Url::fromPath('icingadb/comment', ['name' => $comment->name]);
     }
 
     public static function comments()
     {
-        return Url::fromPath('eagle/comments');
+        return Url::fromPath('icingadb/comments');
     }
 
     public static function host(Host $host)
     {
-        return Url::fromPath('eagle/host', ['name' => $host->name]);
+        return Url::fromPath('icingadb/host', ['name' => $host->name]);
     }
 
     public static function hostgroup($hostgroup)
     {
-        return Url::fromPath('eagle/hostgroup', ['name' => $hostgroup->name]);
+        return Url::fromPath('icingadb/hostgroup', ['name' => $hostgroup->name]);
     }
 
     public static function service(Service $service, Host $host)
     {
-        return Url::fromPath('eagle/service', ['name' => $service->name, 'host.name' => $host->name]);
+        return Url::fromPath('icingadb/service', ['name' => $service->name, 'host.name' => $host->name]);
     }
 
     public static function servicegroup($servicegroup)
     {
-        return Url::fromPath('eagle/servicegroup', ['name' => $servicegroup->name]);
+        return Url::fromPath('icingadb/servicegroup', ['name' => $servicegroup->name]);
     }
 
     public static function user(User $user)
     {
-        return Url::fromPath('eagle/user', ['name' => $user->name]);
+        return Url::fromPath('icingadb/user', ['name' => $user->name]);
     }
 
     public static function usergroup(Usergroup $usergroup)
     {
-        return Url::fromPath('eagle/usergroup', ['name' => $usergroup->name]);
+        return Url::fromPath('icingadb/usergroup', ['name' => $usergroup->name]);
     }
 }
diff --git a/library/Icingadb/Common/ListItemCommonLayout.php b/library/Icingadb/Common/ListItemCommonLayout.php
index 8ad5d46d..aba9cbfc 100644
--- a/library/Icingadb/Common/ListItemCommonLayout.php
+++ b/library/Icingadb/Common/ListItemCommonLayout.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Common;
+namespace Icinga\Module\Icingadb\Common;
 
 use ipl\Html\BaseHtmlElement;
 
diff --git a/library/Icingadb/Common/ListItemCompactLayout.php b/library/Icingadb/Common/ListItemCompactLayout.php
index bf1f4cfa..f11ee131 100644
--- a/library/Icingadb/Common/ListItemCompactLayout.php
+++ b/library/Icingadb/Common/ListItemCompactLayout.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Common;
+namespace Icinga\Module\Icingadb\Common;
 
 use ipl\Html\BaseHtmlElement;
 
diff --git a/library/Icingadb/Common/ServiceLink.php b/library/Icingadb/Common/ServiceLink.php
index b0be552e..fc038155 100644
--- a/library/Icingadb/Common/ServiceLink.php
+++ b/library/Icingadb/Common/ServiceLink.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Icinga\Module\Eagle\Common;
+namespace Icinga\Module\Icingadb\Common;
 
-use Icinga\Module\Eagle\Model\Host;
-use Icinga\Module\Eagle\Model\Service;
+use Icinga\Module\Icingadb\Model\Host;
+use Icinga\Module\Icingadb\Model\Service;
 use ipl\Html\Html;
 use ipl\Web\Widget\StateBall;
 
diff --git a/library/Icingadb/Common/ServiceLinks.php b/library/Icingadb/Common/ServiceLinks.php
index 48fd2e94..6ed5e1a8 100644
--- a/library/Icingadb/Common/ServiceLinks.php
+++ b/library/Icingadb/Common/ServiceLinks.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Icinga\Module\Eagle\Common;
+namespace Icinga\Module\Icingadb\Common;
 
-use Icinga\Module\Eagle\Model\Host;
-use Icinga\Module\Eagle\Model\Service;
+use Icinga\Module\Icingadb\Model\Host;
+use Icinga\Module\Icingadb\Model\Service;
 use ipl\Web\Url;
 
 abstract class ServiceLinks
@@ -11,70 +11,70 @@ abstract class ServiceLinks
     public static function acknowledge(Service $service, Host $host)
     {
         return Url::fromPath(
-            'eagle/service/acknowledge', ['name' => $service->name, 'host.name' => $host->name]
+            'icingadb/service/acknowledge', ['name' => $service->name, 'host.name' => $host->name]
         );
     }
 
     public static function addComment(Service $service, Host $host)
     {
         return Url::fromPath(
-            'eagle/service/add-comment', ['name' => $service->name, 'host.name' => $host->name]
+            'icingadb/service/add-comment', ['name' => $service->name, 'host.name' => $host->name]
         );
     }
 
     public static function checkNow(Service $service, Host $host)
     {
         return Url::fromPath(
-            'eagle/service/check-now', ['name' => $service->name, 'host.name' => $host->name]
+            'icingadb/service/check-now', ['name' => $service->name, 'host.name' => $host->name]
         );
     }
 
     public static function comments(Service $service, Host $host)
     {
         return Url::fromPath(
-            'eagle/service/comments', ['name' => $service->name, 'host.name' => $host->name]
+            'icingadb/service/comments', ['name' => $service->name, 'host.name' => $host->name]
         );
     }
 
     public static function downtimes(Service $service, Host $host)
     {
         return Url::fromPath(
-            'eagle/service/downtimes', ['name' => $service->name, 'host.name' => $host->name]
+            'icingadb/service/downtimes', ['name' => $service->name, 'host.name' => $host->name]
         );
     }
 
     public static function history(Service $service, Host $host)
     {
         return Url::fromPath(
-            'eagle/service/history', ['name' => $service->name, 'host.name' => $host->name]
+            'icingadb/service/history', ['name' => $service->name, 'host.name' => $host->name]
         );
     }
 
     public static function removeAcknowledgement(Service $service, Host $host)
     {
         return Url::fromPath(
-            'eagle/service/remove-acknowledgement', ['name' => $service->name, 'host.name' => $host->name]
+            'icingadb/service/remove-acknowledgement', ['name' => $service->name, 'host.name' => $host->name]
         );
     }
 
     public static function removeComment(Service $service, Host $host)
     {
         return Url::fromPath(
-            'eagle/service/delete-comment', ['name' => $service->name, 'host.name' => $host->name]
+            'icingadb/service/delete-comment', ['name' => $service->name, 'host.name' => $host->name]
         );
     }
 
     public static function scheduleDowntime(Service $service, Host $host)
     {
         return Url::fromPath(
-            'eagle/service/schedule-downtime', ['name' => $service->name, 'host.name' => $host->name]
+            'icingadb/service/schedule-downtime', ['name' => $service->name, 'host.name' => $host->name]
         );
     }
 
     public static function sendCustomNotification(Service $service, Host $host)
     {
         return Url::fromPath(
-            'eagle/service/send-custom-notification', ['name' => $service->name, 'host.name' => $host->name]
+            'icingadb/service/send-custom-notification', ['name' => $service->name, 'host.name' => $host->name]
         );
     }
 }
diff --git a/library/Icingadb/Common/ServiceStates.php b/library/Icingadb/Common/ServiceStates.php
index 5e5aded2..7dabd34c 100644
--- a/library/Icingadb/Common/ServiceStates.php
+++ b/library/Icingadb/Common/ServiceStates.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Common;
+namespace Icinga\Module\Icingadb\Common;
 
 /**
  * Collection of possible service states.
@@ -64,19 +64,19 @@ class ServiceStates
     {
         switch ((int) $state) {
             case self::OK:
-                $text = mt('eagle', 'ok');
+                $text = mt('icingadb', 'ok');
                 break;
             case self::WARNING:
-                $text = mt('eagle', 'warning');
+                $text = mt('icingadb', 'warning');
                 break;
             case self::CRITICAL:
-                $text = mt('eagle', 'critical');
+                $text = mt('icingadb', 'critical');
                 break;
             case self::UNKNOWN:
-                $text = mt('eagle', 'unknown');
+                $text = mt('icingadb', 'unknown');
                 break;
             case self::PENDING:
-                $text = mt('eagle', 'pending');
+                $text = mt('icingadb', 'pending');
                 break;
             default:
                 throw new \InvalidArgumentException(sprintf('Invalid service state %d', $state));
@@ -84,4 +84,4 @@ class ServiceStates
 
         return $text;
     }
-}
\ No newline at end of file
+}
diff --git a/library/Icingadb/Common/StateBadges.php b/library/Icingadb/Common/StateBadges.php
index 1300970d..64a6c089 100644
--- a/library/Icingadb/Common/StateBadges.php
+++ b/library/Icingadb/Common/StateBadges.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Icinga\Module\Eagle\Common;
+namespace Icinga\Module\Icingadb\Common;
 
-use Icinga\Module\Eagle\Widget\StateBadge;
+use Icinga\Module\Icingadb\Widget\StateBadge;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
 
diff --git a/library/Icingadb/Common/ViewMode.php b/library/Icingadb/Common/ViewMode.php
index a5b88efd..0da5bb30 100644
--- a/library/Icingadb/Common/ViewMode.php
+++ b/library/Icingadb/Common/ViewMode.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Common;
+namespace Icinga\Module\Icingadb\Common;
 
 trait ViewMode
 {
diff --git a/library/Icingadb/Compat/CompatBackend.php b/library/Icingadb/Compat/CompatBackend.php
index dd8fc997..b285ff4e 100644
--- a/library/Icingadb/Compat/CompatBackend.php
+++ b/library/Icingadb/Compat/CompatBackend.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Icinga\Module\Eagle\Compat;
+namespace Icinga\Module\Icingadb\Compat;
 
 use Icinga\Module\Monitoring\Backend\MonitoringBackend;
 
 /**
  * Class CompatBackend
- * @package Icinga\Module\Eagle\Compat
+ * @package Icinga\Module\Icingadb\Compat
  */
 class CompatBackend extends MonitoringBackend
 {
diff --git a/library/Icingadb/Compat/CompatHost.php b/library/Icingadb/Compat/CompatHost.php
index 758c9d72..0c369c66 100644
--- a/library/Icingadb/Compat/CompatHost.php
+++ b/library/Icingadb/Compat/CompatHost.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Icinga\Module\Eagle\Compat;
+namespace Icinga\Module\Icingadb\Compat;
 
 /**
  * Class CompatHost
- * @package Icinga\Module\Eagle\Compat
+ * @package Icinga\Module\Icingadb\Compat
  */
 class CompatHost extends CompatObject
 {
diff --git a/library/Icingadb/Compat/CompatObject.php b/library/Icingadb/Compat/CompatObject.php
index 1f953daf..092c0f6f 100644
--- a/library/Icingadb/Compat/CompatObject.php
+++ b/library/Icingadb/Compat/CompatObject.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Compat;
+namespace Icinga\Module\Icingadb\Compat;
 
 use Icinga\Exception\NotImplementedError;
 use Icinga\Module\Monitoring\Object\MonitoredObject;
@@ -8,7 +8,7 @@ use ipl\Orm\Model;
 
 /**
  * Class CompatObject
- * @package Icinga\Module\Eagle\Compat
+ * @package Icinga\Module\Icingadb\Compat
  */
 class CompatObject extends MonitoredObject
 {
diff --git a/library/Icingadb/Compat/CompatObjects.php b/library/Icingadb/Compat/CompatObjects.php
index c506c15a..cc6be9fa 100644
--- a/library/Icingadb/Compat/CompatObjects.php
+++ b/library/Icingadb/Compat/CompatObjects.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Compat;
+namespace Icinga\Module\Icingadb\Compat;
 
 use Countable;
 use IteratorAggregate;
diff --git a/library/Icingadb/Compat/CompatService.php b/library/Icingadb/Compat/CompatService.php
index e1dcee5c..b1698ec9 100644
--- a/library/Icingadb/Compat/CompatService.php
+++ b/library/Icingadb/Compat/CompatService.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Icinga\Module\Eagle\Compat;
+namespace Icinga\Module\Icingadb\Compat;
 
 /**
  * Class CompatService
- * @package Icinga\Module\Eagle\Compat
+ * @package Icinga\Module\Icingadb\Compat
  */
 class CompatService extends CompatObject
 {
diff --git a/library/Icingadb/Date/DateFormatter.php b/library/Icingadb/Date/DateFormatter.php
index 6a6d8a13..7e51c7cf 100644
--- a/library/Icingadb/Date/DateFormatter.php
+++ b/library/Icingadb/Date/DateFormatter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Date;
+namespace Icinga\Module\Icingadb\Date;
 
 class DateFormatter
 {
diff --git a/library/Icingadb/Model/ActionUrl.php b/library/Icingadb/Model/ActionUrl.php
index ca2f706a..81817198 100644
--- a/library/Icingadb/Model/ActionUrl.php
+++ b/library/Icingadb/Model/ActionUrl.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/Behavior/BoolCast.php b/library/Icingadb/Model/Behavior/BoolCast.php
index 2eca8640..f2a3ecd3 100644
--- a/library/Icingadb/Model/Behavior/BoolCast.php
+++ b/library/Icingadb/Model/Behavior/BoolCast.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model\Behavior;
+namespace Icinga\Module\Icingadb\Model\Behavior;
 
 use ipl\Orm\Contract\PropertyBehavior;
 
diff --git a/library/Icingadb/Model/Behavior/FlattenedObjectVars.php b/library/Icingadb/Model/Behavior/FlattenedObjectVars.php
index 8f994813..7409cc78 100644
--- a/library/Icingadb/Model/Behavior/FlattenedObjectVars.php
+++ b/library/Icingadb/Model/Behavior/FlattenedObjectVars.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model\Behavior;
+namespace Icinga\Module\Icingadb\Model\Behavior;
 
 use Icinga\Data\Filter\Filter;
 use Icinga\Data\Filter\FilterExpression;
diff --git a/library/Icingadb/Model/Behavior/Timestamp.php b/library/Icingadb/Model/Behavior/Timestamp.php
index 0074fbbd..b2a3a2ba 100644
--- a/library/Icingadb/Model/Behavior/Timestamp.php
+++ b/library/Icingadb/Model/Behavior/Timestamp.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model\Behavior;
+namespace Icinga\Module\Icingadb\Model\Behavior;
 
 use ipl\Orm\Contract\PropertyBehavior;
 
diff --git a/library/Icingadb/Model/Behavior/VolatileState.php b/library/Icingadb/Model/Behavior/VolatileState.php
index ab5425e1..2bf4ead9 100644
--- a/library/Icingadb/Model/Behavior/VolatileState.php
+++ b/library/Icingadb/Model/Behavior/VolatileState.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model\Behavior;
+namespace Icinga\Module\Icingadb\Model\Behavior;
 
 use Icinga\Application\Config;
-use Icinga\Module\Eagle\Redis\VolatileState as RedisState;
+use Icinga\Module\Icingadb\Redis\VolatileState as RedisState;
 use ipl\Orm\Contract\RetrieveBehavior;
 use ipl\Orm\Model;
 use Redis;
@@ -16,7 +16,7 @@ class VolatileState implements RetrieveBehavior
     {
         if ($this->state === null) {
             // TODO(jmeyer): Use a service provider here. (Or something similar)
-            $config = Config::module('eagle')->getSection('redis');
+            $config = Config::module('icingadb')->getSection('redis');
             $redis = new Redis();
             $redis->connect(
                 $config->get('host', 'redis'),
diff --git a/library/Icingadb/Model/Checkcommand.php b/library/Icingadb/Model/Checkcommand.php
index 13dd1712..fc678c1a 100644
--- a/library/Icingadb/Model/Checkcommand.php
+++ b/library/Icingadb/Model/Checkcommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/CheckcommandArgument.php b/library/Icingadb/Model/CheckcommandArgument.php
index 13a87339..301c45c6 100644
--- a/library/Icingadb/Model/CheckcommandArgument.php
+++ b/library/Icingadb/Model/CheckcommandArgument.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/CheckcommandCustomvar.php b/library/Icingadb/Model/CheckcommandCustomvar.php
index b8816c10..2e4e6c41 100644
--- a/library/Icingadb/Model/CheckcommandCustomvar.php
+++ b/library/Icingadb/Model/CheckcommandCustomvar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/CheckcommandEnvvar.php b/library/Icingadb/Model/CheckcommandEnvvar.php
index dfb8c4e0..d5261dfa 100644
--- a/library/Icingadb/Model/CheckcommandEnvvar.php
+++ b/library/Icingadb/Model/CheckcommandEnvvar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/Comment.php b/library/Icingadb/Model/Comment.php
index 6eaf16c0..71282f15 100644
--- a/library/Icingadb/Model/Comment.php
+++ b/library/Icingadb/Model/Comment.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
-use Icinga\Module\Eagle\Model\Behavior\BoolCast;
-use Icinga\Module\Eagle\Model\Behavior\Timestamp;
+use Icinga\Module\Icingadb\Model\Behavior\BoolCast;
+use Icinga\Module\Icingadb\Model\Behavior\Timestamp;
 use ipl\Orm\Behaviors;
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/CommentHistory.php b/library/Icingadb/Model/CommentHistory.php
index 518c7011..11c74baf 100644
--- a/library/Icingadb/Model/CommentHistory.php
+++ b/library/Icingadb/Model/CommentHistory.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
-use Icinga\Module\Eagle\Model\Behavior\BoolCast;
-use Icinga\Module\Eagle\Model\Behavior\Timestamp;
+use Icinga\Module\Icingadb\Model\Behavior\BoolCast;
+use Icinga\Module\Icingadb\Model\Behavior\Timestamp;
 use ipl\Orm\Behaviors;
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/Customvar.php b/library/Icingadb/Model/Customvar.php
index b5be4d98..dc88edb5 100644
--- a/library/Icingadb/Model/Customvar.php
+++ b/library/Icingadb/Model/Customvar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/CustomvarFlat.php b/library/Icingadb/Model/CustomvarFlat.php
index 72206ac1..3d7f47af 100644
--- a/library/Icingadb/Model/CustomvarFlat.php
+++ b/library/Icingadb/Model/CustomvarFlat.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
-use Icinga\Module\Eagle\Model\Behavior\FlattenedObjectVars;
+use Icinga\Module\Icingadb\Model\Behavior\FlattenedObjectVars;
 use ipl\Orm\Behaviors;
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/Downtime.php b/library/Icingadb/Model/Downtime.php
index 242d47ed..10f577a7 100644
--- a/library/Icingadb/Model/Downtime.php
+++ b/library/Icingadb/Model/Downtime.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
-use Icinga\Module\Eagle\Model\Behavior\BoolCast;
-use Icinga\Module\Eagle\Model\Behavior\Timestamp;
+use Icinga\Module\Icingadb\Model\Behavior\BoolCast;
+use Icinga\Module\Icingadb\Model\Behavior\Timestamp;
 use ipl\Orm\Behaviors;
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/DowntimeHistory.php b/library/Icingadb/Model/DowntimeHistory.php
index 239a3ccc..fc65707f 100644
--- a/library/Icingadb/Model/DowntimeHistory.php
+++ b/library/Icingadb/Model/DowntimeHistory.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
-use Icinga\Module\Eagle\Model\Behavior\BoolCast;
-use Icinga\Module\Eagle\Model\Behavior\Timestamp;
+use Icinga\Module\Icingadb\Model\Behavior\BoolCast;
+use Icinga\Module\Icingadb\Model\Behavior\Timestamp;
 use ipl\Orm\Behaviors;
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/Endpoint.php b/library/Icingadb/Model/Endpoint.php
index 0535d5c1..66ed1683 100644
--- a/library/Icingadb/Model/Endpoint.php
+++ b/library/Icingadb/Model/Endpoint.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/Environment.php b/library/Icingadb/Model/Environment.php
index ee867b95..c02688dc 100644
--- a/library/Icingadb/Model/Environment.php
+++ b/library/Icingadb/Model/Environment.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/Eventcommand.php b/library/Icingadb/Model/Eventcommand.php
index b6e83748..1a701ea7 100644
--- a/library/Icingadb/Model/Eventcommand.php
+++ b/library/Icingadb/Model/Eventcommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/EventcommandArgument.php b/library/Icingadb/Model/EventcommandArgument.php
index ebf1ebf2..26f95e1b 100644
--- a/library/Icingadb/Model/EventcommandArgument.php
+++ b/library/Icingadb/Model/EventcommandArgument.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/EventcommandCustomvar.php b/library/Icingadb/Model/EventcommandCustomvar.php
index 37975a14..debe165a 100644
--- a/library/Icingadb/Model/EventcommandCustomvar.php
+++ b/library/Icingadb/Model/EventcommandCustomvar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/EventcommandEnvvar.php b/library/Icingadb/Model/EventcommandEnvvar.php
index c3c785f6..e360011d 100644
--- a/library/Icingadb/Model/EventcommandEnvvar.php
+++ b/library/Icingadb/Model/EventcommandEnvvar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/History.php b/library/Icingadb/Model/History.php
index 8606a795..d5e93616 100644
--- a/library/Icingadb/Model/History.php
+++ b/library/Icingadb/Model/History.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
-use Icinga\Module\Eagle\Model\Behavior\Timestamp;
+use Icinga\Module\Icingadb\Model\Behavior\Timestamp;
 use ipl\Orm\Behaviors;
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/Host.php b/library/Icingadb/Model/Host.php
index e6abb780..92496cc2 100644
--- a/library/Icingadb/Model/Host.php
+++ b/library/Icingadb/Model/Host.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
-use Icinga\Module\Eagle\Model\Behavior\BoolCast;
+use Icinga\Module\Icingadb\Model\Behavior\BoolCast;
 use ipl\Orm\Behaviors;
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/HostComment.php b/library/Icingadb/Model/HostComment.php
index b82463ac..d2616255 100644
--- a/library/Icingadb/Model/HostComment.php
+++ b/library/Icingadb/Model/HostComment.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/HostCustomvar.php b/library/Icingadb/Model/HostCustomvar.php
index f787d9f9..ec604fcf 100644
--- a/library/Icingadb/Model/HostCustomvar.php
+++ b/library/Icingadb/Model/HostCustomvar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/HostDowntime.php b/library/Icingadb/Model/HostDowntime.php
index 5573c1b5..9b0d6af8 100644
--- a/library/Icingadb/Model/HostDowntime.php
+++ b/library/Icingadb/Model/HostDowntime.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/HostState.php b/library/Icingadb/Model/HostState.php
index e5e40c77..7f2dc295 100644
--- a/library/Icingadb/Model/HostState.php
+++ b/library/Icingadb/Model/HostState.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
-use Icinga\Module\Eagle\Common\HostStates;
+use Icinga\Module\Icingadb\Common\HostStates;
 use ipl\Orm\Relations;
 
 /**
diff --git a/library/Icingadb/Model/Hostgroup.php b/library/Icingadb/Model/Hostgroup.php
index 4e416b7e..11b8c6f2 100644
--- a/library/Icingadb/Model/Hostgroup.php
+++ b/library/Icingadb/Model/Hostgroup.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/HostgroupCustomvar.php b/library/Icingadb/Model/HostgroupCustomvar.php
index 6f28dab6..47f02d18 100644
--- a/library/Icingadb/Model/HostgroupCustomvar.php
+++ b/library/Icingadb/Model/HostgroupCustomvar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/HostgroupMember.php b/library/Icingadb/Model/HostgroupMember.php
index 5c0f7244..f95052e7 100644
--- a/library/Icingadb/Model/HostgroupMember.php
+++ b/library/Icingadb/Model/HostgroupMember.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/Hostgroupsummary.php b/library/Icingadb/Model/Hostgroupsummary.php
index a253006e..687e9ee6 100644
--- a/library/Icingadb/Model/Hostgroupsummary.php
+++ b/library/Icingadb/Model/Hostgroupsummary.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\UnionModel;
 use ipl\Sql\Expression;
diff --git a/library/Icingadb/Model/IconImage.php b/library/Icingadb/Model/IconImage.php
index c2e734bc..5514827c 100644
--- a/library/Icingadb/Model/IconImage.php
+++ b/library/Icingadb/Model/IconImage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/NotesUrl.php b/library/Icingadb/Model/NotesUrl.php
index 5430e7e2..754c5cab 100644
--- a/library/Icingadb/Model/NotesUrl.php
+++ b/library/Icingadb/Model/NotesUrl.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/Notification.php b/library/Icingadb/Model/Notification.php
index 3c1619a7..bcc2913c 100644
--- a/library/Icingadb/Model/Notification.php
+++ b/library/Icingadb/Model/Notification.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/NotificationCustomvar.php b/library/Icingadb/Model/NotificationCustomvar.php
index b64143b8..54c2178d 100644
--- a/library/Icingadb/Model/NotificationCustomvar.php
+++ b/library/Icingadb/Model/NotificationCustomvar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/NotificationHistory.php b/library/Icingadb/Model/NotificationHistory.php
index 6318a569..c2b85d74 100644
--- a/library/Icingadb/Model/NotificationHistory.php
+++ b/library/Icingadb/Model/NotificationHistory.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
-use Icinga\Module\Eagle\Model\Behavior\Timestamp;
+use Icinga\Module\Icingadb\Model\Behavior\Timestamp;
 use ipl\Orm\Behaviors;
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/NotificationUser.php b/library/Icingadb/Model/NotificationUser.php
index f5b61f13..ca0941a1 100644
--- a/library/Icingadb/Model/NotificationUser.php
+++ b/library/Icingadb/Model/NotificationUser.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/NotificationUsergroup.php b/library/Icingadb/Model/NotificationUsergroup.php
index b79efa8d..9f7c42d1 100644
--- a/library/Icingadb/Model/NotificationUsergroup.php
+++ b/library/Icingadb/Model/NotificationUsergroup.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/Notificationcommand.php b/library/Icingadb/Model/Notificationcommand.php
index e9b6771e..7e415a5e 100644
--- a/library/Icingadb/Model/Notificationcommand.php
+++ b/library/Icingadb/Model/Notificationcommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/NotificationcommandArgument.php b/library/Icingadb/Model/NotificationcommandArgument.php
index 53fc7861..f6c291ad 100644
--- a/library/Icingadb/Model/NotificationcommandArgument.php
+++ b/library/Icingadb/Model/NotificationcommandArgument.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/NotificationcommandCustomvar.php b/library/Icingadb/Model/NotificationcommandCustomvar.php
index 000d46d6..368848f3 100644
--- a/library/Icingadb/Model/NotificationcommandCustomvar.php
+++ b/library/Icingadb/Model/NotificationcommandCustomvar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/NotificationcommandEnvvar.php b/library/Icingadb/Model/NotificationcommandEnvvar.php
index d26ae67e..c43e8731 100644
--- a/library/Icingadb/Model/NotificationcommandEnvvar.php
+++ b/library/Icingadb/Model/NotificationcommandEnvvar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/Service.php b/library/Icingadb/Model/Service.php
index 097aa157..f7a6a928 100644
--- a/library/Icingadb/Model/Service.php
+++ b/library/Icingadb/Model/Service.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
-use Icinga\Module\Eagle\Model\Behavior\BoolCast;
+use Icinga\Module\Icingadb\Model\Behavior\BoolCast;
 use ipl\Orm\Behaviors;
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/ServiceComment.php b/library/Icingadb/Model/ServiceComment.php
index 3c25db67..39c13c1f 100644
--- a/library/Icingadb/Model/ServiceComment.php
+++ b/library/Icingadb/Model/ServiceComment.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/ServiceCustomvar.php b/library/Icingadb/Model/ServiceCustomvar.php
index 3bf783f8..53e34b07 100644
--- a/library/Icingadb/Model/ServiceCustomvar.php
+++ b/library/Icingadb/Model/ServiceCustomvar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/ServiceDowntime.php b/library/Icingadb/Model/ServiceDowntime.php
index 4b1605e3..d44b6227 100644
--- a/library/Icingadb/Model/ServiceDowntime.php
+++ b/library/Icingadb/Model/ServiceDowntime.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/ServiceState.php b/library/Icingadb/Model/ServiceState.php
index 27f60b39..52210341 100644
--- a/library/Icingadb/Model/ServiceState.php
+++ b/library/Icingadb/Model/ServiceState.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
-use Icinga\Module\Eagle\Common\ServiceStates;
+use Icinga\Module\Icingadb\Common\ServiceStates;
 use ipl\Orm\Relations;
 
 class ServiceState extends State
diff --git a/library/Icingadb/Model/Servicegroup.php b/library/Icingadb/Model/Servicegroup.php
index 9c1a629f..3c000687 100644
--- a/library/Icingadb/Model/Servicegroup.php
+++ b/library/Icingadb/Model/Servicegroup.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/ServicegroupCustomvar.php b/library/Icingadb/Model/ServicegroupCustomvar.php
index 5309bdf9..4003c546 100644
--- a/library/Icingadb/Model/ServicegroupCustomvar.php
+++ b/library/Icingadb/Model/ServicegroupCustomvar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/ServicegroupMember.php b/library/Icingadb/Model/ServicegroupMember.php
index 3d5d6d98..e52f2526 100644
--- a/library/Icingadb/Model/ServicegroupMember.php
+++ b/library/Icingadb/Model/ServicegroupMember.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/ServicegroupSummary.php b/library/Icingadb/Model/ServicegroupSummary.php
index dcbe321e..af468cad 100644
--- a/library/Icingadb/Model/ServicegroupSummary.php
+++ b/library/Icingadb/Model/ServicegroupSummary.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\UnionModel;
 use ipl\Sql\Expression;
diff --git a/library/Icingadb/Model/State.php b/library/Icingadb/Model/State.php
index 41d0733d..aa759b69 100644
--- a/library/Icingadb/Model/State.php
+++ b/library/Icingadb/Model/State.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
-use Icinga\Module\Eagle\Model\Behavior\BoolCast;
-use Icinga\Module\Eagle\Model\Behavior\Timestamp;
-use Icinga\Module\Eagle\Model\Behavior\VolatileState;
+use Icinga\Module\Icingadb\Model\Behavior\BoolCast;
+use Icinga\Module\Icingadb\Model\Behavior\Timestamp;
+use Icinga\Module\Icingadb\Model\Behavior\VolatileState;
 use ipl\Orm\Behaviors;
 use ipl\Orm\Model;
 
diff --git a/library/Icingadb/Model/StateHistory.php b/library/Icingadb/Model/StateHistory.php
index dfaf3663..5fb409be 100644
--- a/library/Icingadb/Model/StateHistory.php
+++ b/library/Icingadb/Model/StateHistory.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
-use Icinga\Module\Eagle\Model\Behavior\Timestamp;
+use Icinga\Module\Icingadb\Model\Behavior\Timestamp;
 use ipl\Orm\Behaviors;
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/Timeperiod.php b/library/Icingadb/Model/Timeperiod.php
index ba6ce772..42bd086b 100644
--- a/library/Icingadb/Model/Timeperiod.php
+++ b/library/Icingadb/Model/Timeperiod.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/TimeperiodCustomvar.php b/library/Icingadb/Model/TimeperiodCustomvar.php
index 33c18ce1..6678ed19 100644
--- a/library/Icingadb/Model/TimeperiodCustomvar.php
+++ b/library/Icingadb/Model/TimeperiodCustomvar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/TimeperiodOverrideExclude.php b/library/Icingadb/Model/TimeperiodOverrideExclude.php
index 8584b644..098fab8d 100644
--- a/library/Icingadb/Model/TimeperiodOverrideExclude.php
+++ b/library/Icingadb/Model/TimeperiodOverrideExclude.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/TimeperiodOverrideInclude.php b/library/Icingadb/Model/TimeperiodOverrideInclude.php
index a9fc857a..9527a7f6 100644
--- a/library/Icingadb/Model/TimeperiodOverrideInclude.php
+++ b/library/Icingadb/Model/TimeperiodOverrideInclude.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/TimeperiodRange.php b/library/Icingadb/Model/TimeperiodRange.php
index 10af39ed..6f3b2c94 100644
--- a/library/Icingadb/Model/TimeperiodRange.php
+++ b/library/Icingadb/Model/TimeperiodRange.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/User.php b/library/Icingadb/Model/User.php
index 77a054dd..4da8985d 100644
--- a/library/Icingadb/Model/User.php
+++ b/library/Icingadb/Model/User.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/UserCustomvar.php b/library/Icingadb/Model/UserCustomvar.php
index ec987322..4aec6f81 100644
--- a/library/Icingadb/Model/UserCustomvar.php
+++ b/library/Icingadb/Model/UserCustomvar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/Usergroup.php b/library/Icingadb/Model/Usergroup.php
index c8355401..7aa1b6d0 100644
--- a/library/Icingadb/Model/Usergroup.php
+++ b/library/Icingadb/Model/Usergroup.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/UsergroupCustomvar.php b/library/Icingadb/Model/UsergroupCustomvar.php
index 2a89a527..4647e43f 100644
--- a/library/Icingadb/Model/UsergroupCustomvar.php
+++ b/library/Icingadb/Model/UsergroupCustomvar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/UsergroupMember.php b/library/Icingadb/Model/UsergroupMember.php
index f598e4cf..4dcbc2b3 100644
--- a/library/Icingadb/Model/UsergroupMember.php
+++ b/library/Icingadb/Model/UsergroupMember.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Model/Zone.php b/library/Icingadb/Model/Zone.php
index f5e710a3..2657eb24 100644
--- a/library/Icingadb/Model/Zone.php
+++ b/library/Icingadb/Model/Zone.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Model;
+namespace Icinga\Module\Icingadb\Model;
 
 use ipl\Orm\Model;
 use ipl\Orm\Relations;
diff --git a/library/Icingadb/Redis/VolatileState.php b/library/Icingadb/Redis/VolatileState.php
index c295db03..7aa42977 100644
--- a/library/Icingadb/Redis/VolatileState.php
+++ b/library/Icingadb/Redis/VolatileState.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Icinga\Module\Eagle\Redis;
+namespace Icinga\Module\Icingadb\Redis;
 
-use Icinga\Module\Eagle\Model\State;
+use Icinga\Module\Icingadb\Model\State;
 
 /**
  * Fetch volatile host or service states from redis.
diff --git a/library/Icingadb/Web/Controller.php b/library/Icingadb/Web/Controller.php
index a11da950..336f83ea 100644
--- a/library/Icingadb/Web/Controller.php
+++ b/library/Icingadb/Web/Controller.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Icinga\Module\Eagle\Web;
+namespace Icinga\Module\Icingadb\Web;
 
 use Generator;
 use Icinga\Data\Filter\Filter;
 use Icinga\Data\ResourceFactory;
-use Icinga\Module\Eagle\Widget\FilterControl;
-use Icinga\Module\Eagle\Widget\ViewModeSwitcher;
+use Icinga\Module\Icingadb\Widget\FilterControl;
+use Icinga\Module\Icingadb\Widget\ViewModeSwitcher;
 use ipl\Html\Html;
 use ipl\Orm\Compat\FilterProcessor;
 use ipl\Orm\Query;
diff --git a/library/Icingadb/Widget/AttemptBall.php b/library/Icingadb/Widget/AttemptBall.php
index a92dfa18..252cd8ae 100644
--- a/library/Icingadb/Widget/AttemptBall.php
+++ b/library/Icingadb/Widget/AttemptBall.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget;
+namespace Icinga\Module\Icingadb\Widget;
 
 use ipl\Html\BaseHtmlElement;
 
diff --git a/library/Icingadb/Widget/BaseHostListItem.php b/library/Icingadb/Widget/BaseHostListItem.php
index 0c295ca9..6253ebb2 100644
--- a/library/Icingadb/Widget/BaseHostListItem.php
+++ b/library/Icingadb/Widget/BaseHostListItem.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget;
+namespace Icinga\Module\Icingadb\Widget;
 
-use Icinga\Module\Eagle\Common\Links;
+use Icinga\Module\Icingadb\Common\Links;
 use ipl\Html\Html;
 
 /**
diff --git a/library/Icingadb/Widget/BaseItemList.php b/library/Icingadb/Widget/BaseItemList.php
index 542918a2..a7cc9fb0 100644
--- a/library/Icingadb/Widget/BaseItemList.php
+++ b/library/Icingadb/Widget/BaseItemList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget;
+namespace Icinga\Module\Icingadb\Widget;
 
 use InvalidArgumentException;
 use ipl\Html\BaseHtmlElement;
diff --git a/library/Icingadb/Widget/BaseListItem.php b/library/Icingadb/Widget/BaseListItem.php
index c090b401..b2280ebe 100644
--- a/library/Icingadb/Widget/BaseListItem.php
+++ b/library/Icingadb/Widget/BaseListItem.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget;
+namespace Icinga\Module\Icingadb\Widget;
 
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
diff --git a/library/Icingadb/Widget/BaseServiceListItem.php b/library/Icingadb/Widget/BaseServiceListItem.php
index ec6f96fd..8fb61c56 100644
--- a/library/Icingadb/Widget/BaseServiceListItem.php
+++ b/library/Icingadb/Widget/BaseServiceListItem.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget;
+namespace Icinga\Module\Icingadb\Widget;
 
-use Icinga\Module\Eagle\Common\Links;
+use Icinga\Module\Icingadb\Common\Links;
 use ipl\Html\Html;
 use ipl\Web\Widget\StateBall;
 
diff --git a/library/Icingadb/Widget/CheckAttempt.php b/library/Icingadb/Widget/CheckAttempt.php
index 06b1e21a..c50cd2b9 100644
--- a/library/Icingadb/Widget/CheckAttempt.php
+++ b/library/Icingadb/Widget/CheckAttempt.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget;
+namespace Icinga\Module\Icingadb\Widget;
 
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\FormattedString;
diff --git a/library/Icingadb/Widget/CommonListItem.php b/library/Icingadb/Widget/CommonListItem.php
index 2e98459d..3aaf257c 100644
--- a/library/Icingadb/Widget/CommonListItem.php
+++ b/library/Icingadb/Widget/CommonListItem.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget;
+namespace Icinga\Module\Icingadb\Widget;
 
-use Icinga\Module\Eagle\Common\ListItemCommonLayout;
+use Icinga\Module\Icingadb\Common\ListItemCommonLayout;
 
 abstract class CommonListItem extends BaseListItem
 {
diff --git a/library/Icingadb/Widget/Detail/CommentDetail.php b/library/Icingadb/Widget/Detail/CommentDetail.php
index 195435e2..f94b4a4a 100644
--- a/library/Icingadb/Widget/Detail/CommentDetail.php
+++ b/library/Icingadb/Widget/Detail/CommentDetail.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget\Detail;
+namespace Icinga\Module\Icingadb\Widget\Detail;
 
-use Icinga\Module\Eagle\Common\HostLink;
-use Icinga\Module\Eagle\Common\HostLinks;
-use Icinga\Module\Eagle\Common\Icons;
-use Icinga\Module\Eagle\Common\ServiceLink;
-use Icinga\Module\Eagle\Common\ServiceLinks;
-use Icinga\Module\Eagle\Widget\TimeAgo;
-use Icinga\Module\Eagle\Widget\TimeUntil;
+use Icinga\Module\Icingadb\Common\HostLink;
+use Icinga\Module\Icingadb\Common\HostLinks;
+use Icinga\Module\Icingadb\Common\Icons;
+use Icinga\Module\Icingadb\Common\ServiceLink;
+use Icinga\Module\Icingadb\Common\ServiceLinks;
+use Icinga\Module\Icingadb\Widget\TimeAgo;
+use Icinga\Module\Icingadb\Widget\TimeUntil;
 use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
diff --git a/library/Icingadb/Widget/Detail/CustomVarTable.php b/library/Icingadb/Widget/Detail/CustomVarTable.php
index 61e46ecd..8c158528 100644
--- a/library/Icingadb/Widget/Detail/CustomVarTable.php
+++ b/library/Icingadb/Widget/Detail/CustomVarTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget\Detail;
+namespace Icinga\Module\Icingadb\Widget\Detail;
 
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
diff --git a/library/Icingadb/Widget/Detail/EventBox.php b/library/Icingadb/Widget/Detail/EventBox.php
index 529f7f61..f5beb82a 100644
--- a/library/Icingadb/Widget/Detail/EventBox.php
+++ b/library/Icingadb/Widget/Detail/EventBox.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget\Detail;
+namespace Icinga\Module\Icingadb\Widget\Detail;
 
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
diff --git a/library/Icingadb/Widget/Detail/ObjectDetail.php b/library/Icingadb/Widget/Detail/ObjectDetail.php
index 60640002..db38a4c6 100644
--- a/library/Icingadb/Widget/Detail/ObjectDetail.php
+++ b/library/Icingadb/Widget/Detail/ObjectDetail.php
@@ -1,19 +1,19 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget\Detail;
+namespace Icinga\Module\Icingadb\Widget\Detail;
 
-use Icinga\Module\Eagle\Common\HostLinks;
-use Icinga\Module\Eagle\Common\HostStates;
-use Icinga\Module\Eagle\Common\Icons;
-use Icinga\Module\Eagle\Common\Links;
-use Icinga\Module\Eagle\Common\ServiceLinks;
-use Icinga\Module\Eagle\Common\ServiceStates;
-use Icinga\Module\Eagle\Model\Host;
-use Icinga\Module\Eagle\Widget\DowntimeList;
-use Icinga\Module\Eagle\Widget\HorizontalKeyValue;
-use Icinga\Module\Eagle\Widget\ItemList\CommentList;
-use Icinga\Module\Eagle\Widget\ShowMore;
-use Icinga\Module\Eagle\Widget\TagList;
+use Icinga\Module\Icingadb\Common\HostLinks;
+use Icinga\Module\Icingadb\Common\HostStates;
+use Icinga\Module\Icingadb\Common\Icons;
+use Icinga\Module\Icingadb\Common\Links;
+use Icinga\Module\Icingadb\Common\ServiceLinks;
+use Icinga\Module\Icingadb\Common\ServiceStates;
+use Icinga\Module\Icingadb\Model\Host;
+use Icinga\Module\Icingadb\Widget\DowntimeList;
+use Icinga\Module\Icingadb\Widget\HorizontalKeyValue;
+use Icinga\Module\Icingadb\Widget\ItemList\CommentList;
+use Icinga\Module\Icingadb\Widget\ShowMore;
+use Icinga\Module\Icingadb\Widget\TagList;
 use Icinga\Module\Monitoring\Plugin\PerfdataSet;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
diff --git a/library/Icingadb/Widget/Detail/QuickActions.php b/library/Icingadb/Widget/Detail/QuickActions.php
index 3259449a..fca329a0 100644
--- a/library/Icingadb/Widget/Detail/QuickActions.php
+++ b/library/Icingadb/Widget/Detail/QuickActions.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget\Detail;
+namespace Icinga\Module\Icingadb\Widget\Detail;
 
-use Icinga\Module\Eagle\Common\HostLinks;
-use Icinga\Module\Eagle\Common\ServiceLinks;
-use Icinga\Module\Eagle\Model\Host;
-use Icinga\Module\Eagle\Model\Service;
+use Icinga\Module\Icingadb\Common\HostLinks;
+use Icinga\Module\Icingadb\Common\ServiceLinks;
+use Icinga\Module\Icingadb\Model\Host;
+use Icinga\Module\Icingadb\Model\Service;
 use Icinga\Module\Monitoring\Forms\Command\Object\CheckNowCommandForm;
 use Icinga\Module\Monitoring\Forms\Command\Object\RemoveAcknowledgementCommandForm;
 use ipl\Html\BaseHtmlElement;
diff --git a/library/Icingadb/Widget/DowntimeList.php b/library/Icingadb/Widget/DowntimeList.php
index db8e1a67..6db4da55 100644
--- a/library/Icingadb/Widget/DowntimeList.php
+++ b/library/Icingadb/Widget/DowntimeList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget;
+namespace Icinga\Module\Icingadb\Widget;
 
 class DowntimeList extends BaseItemList
 {
diff --git a/library/Icingadb/Widget/DowntimeListItem.php b/library/Icingadb/Widget/DowntimeListItem.php
index f0c96827..4ed718b6 100644
--- a/library/Icingadb/Widget/DowntimeListItem.php
+++ b/library/Icingadb/Widget/DowntimeListItem.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget;
+namespace Icinga\Module\Icingadb\Widget;
 
 use Icinga\Date\DateFormatter as WebDateFormatter;
-use Icinga\Module\Eagle\Common\HostLink;
-use Icinga\Module\Eagle\Common\Icons;
-use Icinga\Module\Eagle\Common\ServiceLink;
-use Icinga\Module\Eagle\Date\DateFormatter;
+use Icinga\Module\Icingadb\Common\HostLink;
+use Icinga\Module\Icingadb\Common\Icons;
+use Icinga\Module\Icingadb\Common\ServiceLink;
+use Icinga\Module\Icingadb\Date\DateFormatter;
 use Icinga\Web\Helper\Markdown;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
diff --git a/library/Icingadb/Widget/FilterControl.php b/library/Icingadb/Widget/FilterControl.php
index ea4edb6e..43659fe5 100644
--- a/library/Icingadb/Widget/FilterControl.php
+++ b/library/Icingadb/Widget/FilterControl.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget;
+namespace Icinga\Module\Icingadb\Widget;
 
 use Icinga\Web\Request;
 use Icinga\Web\Widget\FilterEditor;
diff --git a/library/Icingadb/Widget/HorizontalKeyValue.php b/library/Icingadb/Widget/HorizontalKeyValue.php
index 6565102e..a8bf1284 100644
--- a/library/Icingadb/Widget/HorizontalKeyValue.php
+++ b/library/Icingadb/Widget/HorizontalKeyValue.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget;
+namespace Icinga\Module\Icingadb\Widget;
 
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
diff --git a/library/Icingadb/Widget/HostList.php b/library/Icingadb/Widget/HostList.php
index ad11cf58..8447879e 100644
--- a/library/Icingadb/Widget/HostList.php
+++ b/library/Icingadb/Widget/HostList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget;
+namespace Icinga\Module\Icingadb\Widget;
 
 /**
  * Host list
diff --git a/library/Icingadb/Widget/HostListItem.php b/library/Icingadb/Widget/HostListItem.php
index 5e238c1e..02d73ceb 100644
--- a/library/Icingadb/Widget/HostListItem.php
+++ b/library/Icingadb/Widget/HostListItem.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget;
+namespace Icinga\Module\Icingadb\Widget;
 
-use Icinga\Module\Eagle\Common\ListItemCommonLayout;
+use Icinga\Module\Icingadb\Common\ListItemCommonLayout;
 use ipl\Web\Widget\StateBall;
 
 class HostListItem extends BaseHostListItem
diff --git a/library/Icingadb/Widget/HostListItemCompact.php b/library/Icingadb/Widget/HostListItemCompact.php
index aed2de63..fc90a99d 100644
--- a/library/Icingadb/Widget/HostListItemCompact.php
+++ b/library/Icingadb/Widget/HostListItemCompact.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget;
+namespace Icinga\Module\Icingadb\Widget;
 
-use Icinga\Module\Eagle\Common\ListItemCompactLayout;
+use Icinga\Module\Icingadb\Common\ListItemCompactLayout;
 use ipl\Web\Widget\StateBall;
 
 class HostListItemCompact extends BaseHostListItem
diff --git a/library/Icingadb/Widget/HostStateBadges.php b/library/Icingadb/Widget/HostStateBadges.php
index e8cc78eb..75ec41a6 100644
--- a/library/Icingadb/Widget/HostStateBadges.php
+++ b/library/Icingadb/Widget/HostStateBadges.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget;
+namespace Icinga\Module\Icingadb\Widget;
 
-use Icinga\Module\Eagle\Common\StateBadges;
+use Icinga\Module\Icingadb\Common\StateBadges;
 
 class HostStateBadges extends StateBadges
 {
diff --git a/library/Icingadb/Widget/ItemList/CommentList.php b/library/Icingadb/Widget/ItemList/CommentList.php
index 2f53989e..26f050b7 100644
--- a/library/Icingadb/Widget/ItemList/CommentList.php
+++ b/library/Icingadb/Widget/ItemList/CommentList.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget\ItemList;
+namespace Icinga\Module\Icingadb\Widget\ItemList;
 
-use Icinga\Module\Eagle\Widget\BaseItemList;
+use Icinga\Module\Icingadb\Widget\BaseItemList;
 
 class CommentList extends BaseItemList
 {
diff --git a/library/Icingadb/Widget/ItemList/CommentListItem.php b/library/Icingadb/Widget/ItemList/CommentListItem.php
index 87903b40..faf43753 100644
--- a/library/Icingadb/Widget/ItemList/CommentListItem.php
+++ b/library/Icingadb/Widget/ItemList/CommentListItem.php
@@ -1,14 +1,14 @@
 <?php
 
 
-namespace Icinga\Module\Eagle\Widget\ItemList;
+namespace Icinga\Module\Icingadb\Widget\ItemList;
 
 use Icinga\Date\DateFormatter;
-use Icinga\Module\Eagle\Common\HostLink;
-use Icinga\Module\Eagle\Common\Icons;
-use Icinga\Module\Eagle\Common\Links;
-use Icinga\Module\Eagle\Common\ServiceLink;
-use Icinga\Module\Eagle\Widget\CommonListItem;
+use Icinga\Module\Icingadb\Common\HostLink;
+use Icinga\Module\Icingadb\Common\Icons;
+use Icinga\Module\Icingadb\Common\Links;
+use Icinga\Module\Icingadb\Common\ServiceLink;
+use Icinga\Module\Icingadb\Widget\CommonListItem;
 use Icinga\Web\Helper\Markdown;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
diff --git a/library/Icingadb/Widget/ItemList/HistoryList.php b/library/Icingadb/Widget/ItemList/HistoryList.php
index 48c5a4d8..efc9c738 100644
--- a/library/Icingadb/Widget/ItemList/HistoryList.php
+++ b/library/Icingadb/Widget/ItemList/HistoryList.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget\ItemList;
+namespace Icinga\Module\Icingadb\Widget\ItemList;
 
-use Icinga\Module\Eagle\Widget\BaseItemList;
+use Icinga\Module\Icingadb\Widget\BaseItemList;
 
 class HistoryList extends BaseItemList
 {
diff --git a/library/Icingadb/Widget/ItemList/HistoryListItem.php b/library/Icingadb/Widget/ItemList/HistoryListItem.php
index 614624f6..9ceb2b0c 100644
--- a/library/Icingadb/Widget/ItemList/HistoryListItem.php
+++ b/library/Icingadb/Widget/ItemList/HistoryListItem.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget\ItemList;
+namespace Icinga\Module\Icingadb\Widget\ItemList;
 
-use Icinga\Module\Eagle\Common\HostLink;
-use Icinga\Module\Eagle\Common\HostStates;
-use Icinga\Module\Eagle\Common\Icons;
-use Icinga\Module\Eagle\Common\ServiceLink;
-use Icinga\Module\Eagle\Common\ServiceStates;
-use Icinga\Module\Eagle\Widget\CheckAttempt;
-use Icinga\Module\Eagle\Widget\CommonListItem;
-use Icinga\Module\Eagle\Widget\StateChange;
-use Icinga\Module\Eagle\Widget\TimeAgo;
+use Icinga\Module\Icingadb\Common\HostLink;
+use Icinga\Module\Icingadb\Common\HostStates;
+use Icinga\Module\Icingadb\Common\Icons;
+use Icinga\Module\Icingadb\Common\ServiceLink;
+use Icinga\Module\Icingadb\Common\ServiceStates;
+use Icinga\Module\Icingadb\Widget\CheckAttempt;
+use Icinga\Module\Icingadb\Widget\CommonListItem;
+use Icinga\Module\Icingadb\Widget\StateChange;
+use Icinga\Module\Icingadb\Widget\TimeAgo;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
 use ipl\Web\Widget\Icon;
diff --git a/library/Icingadb/Widget/ItemList/HostgroupList.php b/library/Icingadb/Widget/ItemList/HostgroupList.php
index 25a668f3..fa780b88 100644
--- a/library/Icingadb/Widget/ItemList/HostgroupList.php
+++ b/library/Icingadb/Widget/ItemList/HostgroupList.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget\ItemList;
+namespace Icinga\Module\Icingadb\Widget\ItemList;
 
-use Icinga\Module\Eagle\Widget\BaseItemList;
+use Icinga\Module\Icingadb\Widget\BaseItemList;
 
 class HostgroupList extends BaseItemList
 {
diff --git a/library/Icingadb/Widget/ItemList/HostgroupListItem.php b/library/Icingadb/Widget/ItemList/HostgroupListItem.php
index 009290e9..9052ba7d 100644
--- a/library/Icingadb/Widget/ItemList/HostgroupListItem.php
+++ b/library/Icingadb/Widget/ItemList/HostgroupListItem.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget\ItemList;
+namespace Icinga\Module\Icingadb\Widget\ItemList;
 
 use Icinga\Chart\Donut;
-use Icinga\Module\Eagle\Common\BaseTableRowItem;
-use Icinga\Module\Eagle\Common\Links;
-use Icinga\Module\Eagle\Widget\HostStateBadges;
-use Icinga\Module\Eagle\Widget\ServiceStateBadges;
-use Icinga\Module\Eagle\Widget\VerticalKeyValue;
+use Icinga\Module\Icingadb\Common\BaseTableRowItem;
+use Icinga\Module\Icingadb\Common\Links;
+use Icinga\Module\Icingadb\Widget\HostStateBadges;
+use Icinga\Module\Icingadb\Widget\ServiceStateBadges;
+use Icinga\Module\Icingadb\Widget\VerticalKeyValue;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
 use ipl\Html\HtmlDocument;
diff --git a/library/Icingadb/Widget/ItemList/NotificationList.php b/library/Icingadb/Widget/ItemList/NotificationList.php
index bc94222a..a8e94b2b 100644
--- a/library/Icingadb/Widget/ItemList/NotificationList.php
+++ b/library/Icingadb/Widget/ItemList/NotificationList.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget\ItemList;
+namespace Icinga\Module\Icingadb\Widget\ItemList;
 
-use Icinga\Module\Eagle\Widget\BaseItemList;
+use Icinga\Module\Icingadb\Widget\BaseItemList;
 
 class NotificationList extends BaseItemList
 {
diff --git a/library/Icingadb/Widget/ItemList/NotificationListItem.php b/library/Icingadb/Widget/ItemList/NotificationListItem.php
index 96598b33..0ed84a6a 100644
--- a/library/Icingadb/Widget/ItemList/NotificationListItem.php
+++ b/library/Icingadb/Widget/ItemList/NotificationListItem.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget\ItemList;
+namespace Icinga\Module\Icingadb\Widget\ItemList;
 
-use Icinga\Module\Eagle\Common\HostLink;
-use Icinga\Module\Eagle\Common\HostStates;
-use Icinga\Module\Eagle\Common\Icons;
-use Icinga\Module\Eagle\Common\ServiceLink;
-use Icinga\Module\Eagle\Common\ServiceStates;
-use Icinga\Module\Eagle\Widget\CommonListItem;
-use Icinga\Module\Eagle\Widget\TimeAgo;
+use Icinga\Module\Icingadb\Common\HostLink;
+use Icinga\Module\Icingadb\Common\HostStates;
+use Icinga\Module\Icingadb\Common\Icons;
+use Icinga\Module\Icingadb\Common\ServiceLink;
+use Icinga\Module\Icingadb\Common\ServiceStates;
+use Icinga\Module\Icingadb\Widget\CommonListItem;
+use Icinga\Module\Icingadb\Widget\TimeAgo;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
 use ipl\Web\Widget\Icon;
diff --git a/library/Icingadb/Widget/ItemList/ServicegroupList.php b/library/Icingadb/Widget/ItemList/ServicegroupList.php
index c8a181fe..6ba87b35 100644
--- a/library/Icingadb/Widget/ItemList/ServicegroupList.php
+++ b/library/Icingadb/Widget/ItemList/ServicegroupList.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget\ItemList;
+namespace Icinga\Module\Icingadb\Widget\ItemList;
 
-use Icinga\Module\Eagle\Widget\BaseItemList;
+use Icinga\Module\Icingadb\Widget\BaseItemList;
 
 class ServicegroupList extends BaseItemList
 {
diff --git a/library/Icingadb/Widget/ItemList/ServicegroupListItem.php b/library/Icingadb/Widget/ItemList/ServicegroupListItem.php
index 71e7fb89..0d001fb0 100644
--- a/library/Icingadb/Widget/ItemList/ServicegroupListItem.php
+++ b/library/Icingadb/Widget/ItemList/ServicegroupListItem.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget\ItemList;
+namespace Icinga\Module\Icingadb\Widget\ItemList;
 
 use Icinga\Chart\Donut;
-use Icinga\Module\Eagle\Common\BaseTableRowItem;
-use Icinga\Module\Eagle\Common\Links;
-use Icinga\Module\Eagle\Widget\ServiceStateBadges;
-use Icinga\Module\Eagle\Widget\VerticalKeyValue;
+use Icinga\Module\Icingadb\Common\BaseTableRowItem;
+use Icinga\Module\Icingadb\Common\Links;
+use Icinga\Module\Icingadb\Widget\ServiceStateBadges;
+use Icinga\Module\Icingadb\Widget\VerticalKeyValue;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
 use ipl\Html\HtmlDocument;
diff --git a/library/Icingadb/Widget/ItemList/UserList.php b/library/Icingadb/Widget/ItemList/UserList.php
index f7f84f0c..e1dc1863 100644
--- a/library/Icingadb/Widget/ItemList/UserList.php
+++ b/library/Icingadb/Widget/ItemList/UserList.php
@@ -1,9 +1,9 @@
 <?php
 
 
-namespace Icinga\Module\Eagle\Widget\ItemList;
+namespace Icinga\Module\Icingadb\Widget\ItemList;
 
-use Icinga\Module\Eagle\Widget\BaseItemList;
+use Icinga\Module\Icingadb\Widget\BaseItemList;
 
 class UserList extends BaseItemList
 {
diff --git a/library/Icingadb/Widget/ItemList/UserListItem.php b/library/Icingadb/Widget/ItemList/UserListItem.php
index c10b04ec..a9bd901c 100644
--- a/library/Icingadb/Widget/ItemList/UserListItem.php
+++ b/library/Icingadb/Widget/ItemList/UserListItem.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget\ItemList;
+namespace Icinga\Module\Icingadb\Widget\ItemList;
 
-use Icinga\Module\Eagle\Common\Links;
+use Icinga\Module\Icingadb\Common\Links;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
 use ipl\Web\Widget\Link;
diff --git a/library/Icingadb/Widget/ItemList/UsergroupList.php b/library/Icingadb/Widget/ItemList/UsergroupList.php
index 11f066a0..cb487f61 100644
--- a/library/Icingadb/Widget/ItemList/UsergroupList.php
+++ b/library/Icingadb/Widget/ItemList/UsergroupList.php
@@ -1,9 +1,9 @@
 <?php
 
 
-namespace Icinga\Module\Eagle\Widget\ItemList;
+namespace Icinga\Module\Icingadb\Widget\ItemList;
 
-use Icinga\Module\Eagle\Widget\BaseItemList;
+use Icinga\Module\Icingadb\Widget\BaseItemList;
 
 class UsergroupList extends BaseItemList
 {
diff --git a/library/Icingadb/Widget/ItemList/UsergroupListItem.php b/library/Icingadb/Widget/ItemList/UsergroupListItem.php
index d674f82a..fa54e9da 100644
--- a/library/Icingadb/Widget/ItemList/UsergroupListItem.php
+++ b/library/Icingadb/Widget/ItemList/UsergroupListItem.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget\ItemList;
+namespace Icinga\Module\Icingadb\Widget\ItemList;
 
-use Icinga\Module\Eagle\Common\Links;
+use Icinga\Module\Icingadb\Common\Links;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
 use ipl\Web\Widget\Link;
diff --git a/library/Icingadb/Widget/ServiceList.php b/library/Icingadb/Widget/ServiceList.php
index 0b59618f..0e985c50 100644
--- a/library/Icingadb/Widget/ServiceList.php
+++ b/library/Icingadb/Widget/ServiceList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget;
+namespace Icinga\Module\Icingadb\Widget;
 
 class ServiceList extends StateList
 {
diff --git a/library/Icingadb/Widget/ServiceListItem.php b/library/Icingadb/Widget/ServiceListItem.php
index d34ce874..bc84ff7a 100644
--- a/library/Icingadb/Widget/ServiceListItem.php
+++ b/library/Icingadb/Widget/ServiceListItem.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget;
+namespace Icinga\Module\Icingadb\Widget;
 
-use Icinga\Module\Eagle\Common\ListItemCommonLayout;
+use Icinga\Module\Icingadb\Common\ListItemCommonLayout;
 use ipl\Web\Widget\StateBall;
 
 class ServiceListItem extends BaseServiceListItem
diff --git a/library/Icingadb/Widget/ServiceListItemCompact.php b/library/Icingadb/Widget/ServiceListItemCompact.php
index e3ae1c8e..70b5ff7a 100644
--- a/library/Icingadb/Widget/ServiceListItemCompact.php
+++ b/library/Icingadb/Widget/ServiceListItemCompact.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget;
+namespace Icinga\Module\Icingadb\Widget;
 
-use Icinga\Module\Eagle\Common\ListItemCompactLayout;
+use Icinga\Module\Icingadb\Common\ListItemCompactLayout;
 use ipl\Web\Widget\StateBall;
 
 class ServiceListItemCompact extends BaseServiceListItem
diff --git a/library/Icingadb/Widget/ServiceStateBadges.php b/library/Icingadb/Widget/ServiceStateBadges.php
index d5859e8e..f0f2761f 100644
--- a/library/Icingadb/Widget/ServiceStateBadges.php
+++ b/library/Icingadb/Widget/ServiceStateBadges.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget;
+namespace Icinga\Module\Icingadb\Widget;
 
-use Icinga\Module\Eagle\Common\StateBadges;
+use Icinga\Module\Icingadb\Common\StateBadges;
 
 class ServiceStateBadges extends StateBadges
 {
diff --git a/library/Icingadb/Widget/ShowMore.php b/library/Icingadb/Widget/ShowMore.php
index 5b80d4a4..a1fee5ee 100644
--- a/library/Icingadb/Widget/ShowMore.php
+++ b/library/Icingadb/Widget/ShowMore.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget;
+namespace Icinga\Module\Icingadb\Widget;
 
 use ipl\Html\ValidHtml;
 use ipl\Orm\ResultSet;
diff --git a/library/Icingadb/Widget/StateBadge.php b/library/Icingadb/Widget/StateBadge.php
index 70e39d1c..4a735b06 100644
--- a/library/Icingadb/Widget/StateBadge.php
+++ b/library/Icingadb/Widget/StateBadge.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget;
+namespace Icinga\Module\Icingadb\Widget;
 
 use ipl\Html\BaseHtmlElement;
 
diff --git a/library/Icingadb/Widget/StateChange.php b/library/Icingadb/Widget/StateChange.php
index 02c47708..256227da 100644
--- a/library/Icingadb/Widget/StateChange.php
+++ b/library/Icingadb/Widget/StateChange.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget;
+namespace Icinga\Module\Icingadb\Widget;
 
 use ipl\Html\BaseHtmlElement;
 use ipl\Web\Widget\StateBall;
diff --git a/library/Icingadb/Widget/StateList.php b/library/Icingadb/Widget/StateList.php
index 4fc674a6..9e21aa10 100644
--- a/library/Icingadb/Widget/StateList.php
+++ b/library/Icingadb/Widget/StateList.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget;
+namespace Icinga\Module\Icingadb\Widget;
 
-use Icinga\Module\Eagle\Common\ViewMode;
+use Icinga\Module\Icingadb\Common\ViewMode;
 
 abstract class StateList extends BaseItemList
 {
diff --git a/library/Icingadb/Widget/StateListItem.php b/library/Icingadb/Widget/StateListItem.php
index d563e6cd..15e4bc5f 100644
--- a/library/Icingadb/Widget/StateListItem.php
+++ b/library/Icingadb/Widget/StateListItem.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget;
+namespace Icinga\Module\Icingadb\Widget;
 
-use Icinga\Module\Eagle\Common\Icons;
-use Icinga\Module\Eagle\Model\State;
+use Icinga\Module\Icingadb\Common\Icons;
+use Icinga\Module\Icingadb\Model\State;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
 use ipl\Web\Widget\Icon;
diff --git a/library/Icingadb/Widget/TagList.php b/library/Icingadb/Widget/TagList.php
index 0a3203d8..95cba902 100644
--- a/library/Icingadb/Widget/TagList.php
+++ b/library/Icingadb/Widget/TagList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget;
+namespace Icinga\Module\Icingadb\Widget;
 
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
diff --git a/library/Icingadb/Widget/TimeAgo.php b/library/Icingadb/Widget/TimeAgo.php
index db3df728..3d68bea2 100644
--- a/library/Icingadb/Widget/TimeAgo.php
+++ b/library/Icingadb/Widget/TimeAgo.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget;
+namespace Icinga\Module\Icingadb\Widget;
 
 use Icinga\Date\DateFormatter;
 use ipl\Html\BaseHtmlElement;
diff --git a/library/Icingadb/Widget/TimeSince.php b/library/Icingadb/Widget/TimeSince.php
index 4d806a7f..829674e3 100644
--- a/library/Icingadb/Widget/TimeSince.php
+++ b/library/Icingadb/Widget/TimeSince.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget;
+namespace Icinga\Module\Icingadb\Widget;
 
 use Icinga\Date\DateFormatter;
 use ipl\Html\BaseHtmlElement;
diff --git a/library/Icingadb/Widget/TimeUntil.php b/library/Icingadb/Widget/TimeUntil.php
index aaecece2..904cb660 100644
--- a/library/Icingadb/Widget/TimeUntil.php
+++ b/library/Icingadb/Widget/TimeUntil.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget;
+namespace Icinga\Module\Icingadb\Widget;
 
 use Icinga\Date\DateFormatter;
 use ipl\Html\BaseHtmlElement;
diff --git a/library/Icingadb/Widget/VerticalKeyValue.php b/library/Icingadb/Widget/VerticalKeyValue.php
index 449bc6dd..468498a5 100644
--- a/library/Icingadb/Widget/VerticalKeyValue.php
+++ b/library/Icingadb/Widget/VerticalKeyValue.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget;
+namespace Icinga\Module\Icingadb\Widget;
 
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
diff --git a/library/Icingadb/Widget/ViewModeSwitcher.php b/library/Icingadb/Widget/ViewModeSwitcher.php
index ed68435f..c446a043 100644
--- a/library/Icingadb/Widget/ViewModeSwitcher.php
+++ b/library/Icingadb/Widget/ViewModeSwitcher.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Module\Eagle\Widget;
+namespace Icinga\Module\Icingadb\Widget;
 
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;