diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index ce4ca715e..7ef920214 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -29,7 +29,6 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 
 use Icinga\Application\Benchmark;
-use Icinga\Data\Db\Query;
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Web\Hook;
 use Icinga\Web\Widget\Tabextension\DashboardAction;
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
index bec90c6b7..6071bb3a0 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
@@ -30,7 +30,7 @@
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
 use Icinga\Logger\Logger;
-use Icinga\Data\Db\Query;
+use Icinga\Data\Db\DbQuery;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Application\Icinga;
 use Icinga\Web\Session;
diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
index 7c89bc838..70bd67bda 100644
--- a/modules/monitoring/library/Monitoring/Object/Host.php
+++ b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -3,14 +3,14 @@
 namespace Icinga\Module\Monitoring\Object;
 
 use Icinga\Module\Monitoring\DataView\HostStatus;
-use Icinga\Data\Db\Query;
+use Icinga\Data\Db\DbQuery;
 
 class Host extends AbstractObject
 {
     public $type   = 'host';
     public $prefix = 'host_';
 
-    protected function applyObjectFilter(Query $query)
+    protected function applyObjectFilter(DbQuery $query)
     {
         return $query->where('host_name', $this->host_name);
     }
diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
index ab7209a85..62ddca771 100644
--- a/modules/monitoring/library/Monitoring/Object/Service.php
+++ b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -3,14 +3,14 @@
 namespace Icinga\Module\Monitoring\Object;
 
 use Icinga\Module\Monitoring\DataView\ServiceStatus;
-use Icinga\Data\Db\Query;
+use Icinga\Data\Db\DbQuery;
 
 class Service extends AbstractObject
 {
     public $type   = 'service';
     public $prefix = 'service_';
 
-    protected function applyObjectFilter(Query $query)
+    protected function applyObjectFilter(DbQuery $query)
     {
         return $query->where('service_host_name', $this->host_name)
                      ->where('service_description', $this->service_description);