diff --git a/modules/monitoring/library/Monitoring/View/MonitoringView.php b/modules/monitoring/library/Monitoring/View/AbstractView.php
similarity index 96%
rename from modules/monitoring/library/Monitoring/View/MonitoringView.php
rename to modules/monitoring/library/Monitoring/View/AbstractView.php
index 7709390d1..9fb536df6 100644
--- a/modules/monitoring/library/Monitoring/View/MonitoringView.php
+++ b/modules/monitoring/library/Monitoring/View/AbstractView.php
@@ -6,7 +6,7 @@ use Icinga\Data\AbstractQuery;
 use Icinga\Data\Filter;
 
 /**
- * MonitoringView provides consistent views to our Icinga Backends
+ * AbstractView provides consistent views to our Icinga Backends
  *
  * TODO: * This could be renamed to AbstractView
  *       * We might need more complex filters (let's do the simple ones first)
@@ -32,7 +32,7 @@ use Icinga\Data\Filter;
  * * you can (and should) use a defined set of columns when issueing a query
  * * you can use proper alias names to have an influence on column names
  *   in the result set
- * * the MonitoringView behaves like any Query object and provides useful
+ * * the AbstractView behaves like any Query object and provides useful
  *   methods such as fetchAll, count, fetchPairs and so on
  *
  * If you want to fill a dropdown form element with all your hostgroups
@@ -48,11 +48,11 @@ use Icinga\Data\Filter;
  * $formElement->setMultiOptions($pairs);
  * </code>
  *
- * MonitoringView is a proxy to your Backend Query. While both are Query objects
+ * AbstractView is a proxy to your Backend Query. While both are Query objects
  * providing partially the same interface, they are not directly related to
  * each other.
  */
-class MonitoringView extends AbstractQuery
+class AbstractView extends AbstractQuery
 {
     /**
      * Stores the backend-specific Query Object
@@ -177,7 +177,7 @@ class MonitoringView extends AbstractQuery
     }
 
     // TODO: applyAuthFilters(Auth $auth = null)
-    //       MonitoringView will enforce restrictions as provided by the Auth
+    //       AbstractView will enforce restrictions as provided by the Auth
     //       backend
 
     /**
diff --git a/modules/monitoring/library/Monitoring/View/CommentView.php b/modules/monitoring/library/Monitoring/View/CommentView.php
index ecc0f75eb..3a87c6a76 100644
--- a/modules/monitoring/library/Monitoring/View/CommentView.php
+++ b/modules/monitoring/library/Monitoring/View/CommentView.php
@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Monitoring\View;
 
-class CommentView extends MonitoringView
+class CommentView extends AbstractView
 {
     protected $query;
 
diff --git a/modules/monitoring/library/Monitoring/View/ContactView.php b/modules/monitoring/library/Monitoring/View/ContactView.php
index 4bd43719b..706388102 100644
--- a/modules/monitoring/library/Monitoring/View/ContactView.php
+++ b/modules/monitoring/library/Monitoring/View/ContactView.php
@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Monitoring\View;
 
-class ContactView extends MonitoringView
+class ContactView extends AbstractView
 {
     protected $query;
 
diff --git a/modules/monitoring/library/Monitoring/View/ContactgroupView.php b/modules/monitoring/library/Monitoring/View/ContactgroupView.php
index d52f6e8ef..1e52c74e2 100644
--- a/modules/monitoring/library/Monitoring/View/ContactgroupView.php
+++ b/modules/monitoring/library/Monitoring/View/ContactgroupView.php
@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Monitoring\View;
 
-class ContactgroupView extends MonitoringView
+class ContactgroupView extends AbstractView
 {
     protected $query;
 
diff --git a/modules/monitoring/library/Monitoring/View/CustomvarView.php b/modules/monitoring/library/Monitoring/View/CustomvarView.php
index e50fbcb75..0a4d9dec7 100644
--- a/modules/monitoring/library/Monitoring/View/CustomvarView.php
+++ b/modules/monitoring/library/Monitoring/View/CustomvarView.php
@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Monitoring\View;
 
-class CustomvarView extends MonitoringView
+class CustomvarView extends AbstractView
 {
     protected $query;
 
diff --git a/modules/monitoring/library/Monitoring/View/DowntimeView.php b/modules/monitoring/library/Monitoring/View/DowntimeView.php
index 7c3b74dc1..0c2ab809a 100644
--- a/modules/monitoring/library/Monitoring/View/DowntimeView.php
+++ b/modules/monitoring/library/Monitoring/View/DowntimeView.php
@@ -27,7 +27,7 @@ namespace Icinga\Module\Monitoring\View;
 /**
  * Class DowntimeView
  */
-class DowntimeView extends MonitoringView
+class DowntimeView extends AbstractView
 {
     /**
      * Query object
diff --git a/modules/monitoring/library/Monitoring/View/EventHistoryView.php b/modules/monitoring/library/Monitoring/View/EventHistoryView.php
index 0feac0e17..60d5fb5ff 100644
--- a/modules/monitoring/library/Monitoring/View/EventHistoryView.php
+++ b/modules/monitoring/library/Monitoring/View/EventHistoryView.php
@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Monitoring\View;
 
-class EventHistoryView extends MonitoringView
+class EventHistoryView extends AbstractView
 {
     protected $query;
 
diff --git a/modules/monitoring/library/Monitoring/View/HostgroupView.php b/modules/monitoring/library/Monitoring/View/HostgroupView.php
index c1b53bac3..950ad1a59 100644
--- a/modules/monitoring/library/Monitoring/View/HostgroupView.php
+++ b/modules/monitoring/library/Monitoring/View/HostgroupView.php
@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Monitoring\View;
 
-class HostgroupView extends MonitoringView
+class HostgroupView extends AbstractView
 {
     protected $query;
 
diff --git a/modules/monitoring/library/Monitoring/View/HoststatusView.php b/modules/monitoring/library/Monitoring/View/HoststatusView.php
index 91930e6b6..6941e4d7e 100644
--- a/modules/monitoring/library/Monitoring/View/HoststatusView.php
+++ b/modules/monitoring/library/Monitoring/View/HoststatusView.php
@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Monitoring\View;
 
-class HoststatusView extends MonitoringView
+class HoststatusView extends AbstractView
 {
     protected $query;
     protected $searchColumn = 'host';
diff --git a/modules/monitoring/library/Monitoring/View/NotificationView.php b/modules/monitoring/library/Monitoring/View/NotificationView.php
index b0372f6a9..cd4fb0de6 100644
--- a/modules/monitoring/library/Monitoring/View/NotificationView.php
+++ b/modules/monitoring/library/Monitoring/View/NotificationView.php
@@ -28,7 +28,7 @@ namespace Icinga\Module\Monitoring\View;
 /**
  * NotificationView
  */
-class NotificationView extends MonitoringView
+class NotificationView extends AbstractView
 {
     /**
      * Available columns provided by this view
diff --git a/modules/monitoring/library/Monitoring/View/ServicegroupView.php b/modules/monitoring/library/Monitoring/View/ServicegroupView.php
index 73fd1efa7..09d475919 100644
--- a/modules/monitoring/library/Monitoring/View/ServicegroupView.php
+++ b/modules/monitoring/library/Monitoring/View/ServicegroupView.php
@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Monitoring\View;
 
-class ServicegroupView extends MonitoringView
+class ServicegroupView extends AbstractView
 {
     protected $query;
 
diff --git a/modules/monitoring/library/Monitoring/View/StatusView.php b/modules/monitoring/library/Monitoring/View/StatusView.php
index 9af1bb3a8..79cea59bd 100644
--- a/modules/monitoring/library/Monitoring/View/StatusView.php
+++ b/modules/monitoring/library/Monitoring/View/StatusView.php
@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Monitoring\View;
 
-class StatusView extends MonitoringView
+class StatusView extends AbstractView
 {
     protected $query;
     // protected $searchColumn = 'host'; -> besser in der Query, 'search' mitgeben
diff --git a/modules/monitoring/test/php/testlib/MonitoringControllerTest.php b/modules/monitoring/test/php/testlib/MonitoringControllerTest.php
index f3351d88d..b801e7e7f 100644
--- a/modules/monitoring/test/php/testlib/MonitoringControllerTest.php
+++ b/modules/monitoring/test/php/testlib/MonitoringControllerTest.php
@@ -170,7 +170,7 @@ abstract class MonitoringControllerTest extends Zend_Test_PHPUnit_ControllerTest
     private function requireViews()
     {
         $module = $this->moduleDir;
-        require_once($module.'library/Monitoring/View/MonitoringView.php');
+        require_once($module.'library/Monitoring/View/AbstractView.php');
         $this->requireFolder('library/Monitoring/View/');
     }
 
diff --git a/test/php/library/Icinga/Web/Paginator/Adapter/QueryAdapterTest.php b/test/php/library/Icinga/Web/Paginator/Adapter/QueryAdapterTest.php
index b0e3b85d4..54e86ea1c 100644
--- a/test/php/library/Icinga/Web/Paginator/Adapter/QueryAdapterTest.php
+++ b/test/php/library/Icinga/Web/Paginator/Adapter/QueryAdapterTest.php
@@ -20,7 +20,7 @@ require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/Quer
 require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat.php';
 require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusQuery.php';
 require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/HostStatusView.php';
-require_once '../../modules/monitoring/library/Monitoring/View/MonitoringView.php';
+require_once '../../modules/monitoring/library/Monitoring/View/AbstractView.php';
 require_once '../../modules/monitoring/library/Monitoring/View/StatusView.php';
 
 require_once '../../library/Icinga/Protocol/AbstractQuery.php';
diff --git a/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php b/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php
index 42915a66f..855458339 100755
--- a/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php
+++ b/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php
@@ -24,7 +24,7 @@ require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/Quer
 require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat.php';
 require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusQuery.php';
 require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/HostStatusView.php';
-require_once '../../modules/monitoring/library/Monitoring/View/MonitoringView.php';
+require_once '../../modules/monitoring/library/Monitoring/View/AbstractView.php';
 require_once '../../modules/monitoring/library/Monitoring/View/StatusView.php';
 require_once '../../library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php';