diff --git a/library/Icinga/Web/Hook/Grapher.php b/library/Icinga/Web/Hook/GrapherHook.php
similarity index 99%
rename from library/Icinga/Web/Hook/Grapher.php
rename to library/Icinga/Web/Hook/GrapherHook.php
index 28de49604..e2fea304a 100644
--- a/library/Icinga/Web/Hook/Grapher.php
+++ b/library/Icinga/Web/Hook/GrapherHook.php
@@ -14,7 +14,7 @@ namespace Icinga\Web\Hook;
  * @author     Icinga-Web Team <info@icinga.org>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU General Public License
  */
-class Grapher
+class GrapherHook
 {
     /**
      * Whether this grapher provides preview images
diff --git a/library/Icinga/Web/Hook/Ticket.php b/library/Icinga/Web/Hook/TicketHook.php
similarity index 97%
rename from library/Icinga/Web/Hook/Ticket.php
rename to library/Icinga/Web/Hook/TicketHook.php
index f9c1b495e..bb9a129b4 100644
--- a/library/Icinga/Web/Hook/Ticket.php
+++ b/library/Icinga/Web/Hook/TicketHook.php
@@ -14,7 +14,7 @@ namespace Icinga\Web\Hook;
  * @author     Icinga-Web Team <info@icinga.org>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU General Public License
  */
-abstract class Ticket
+abstract class TicketHook
 {
     /**
      * Constructor must live without arguments right now
diff --git a/library/Icinga/Web/Hook/TopBar.php b/library/Icinga/Web/Hook/TopBarHook.php
similarity index 81%
rename from library/Icinga/Web/Hook/TopBar.php
rename to library/Icinga/Web/Hook/TopBarHook.php
index d32f6d1fd..695d81109 100644
--- a/library/Icinga/Web/Hook/TopBar.php
+++ b/library/Icinga/Web/Hook/TopBarHook.php
@@ -10,7 +10,7 @@ use \Zend_View;
 /**
  * Hook to extend topbar items
  */
-interface TopBar
+abstract class TopBarHook
 {
     /**
      * Function to generate top bar content
@@ -20,5 +20,5 @@ interface TopBar
      *
      * @return  string
      */
-    public function getHtml($request, $view);
+    abstract public function getHtml($request, $view);
 }
diff --git a/modules/monitoring/library/Monitoring/Web/Hook/TimelineProvider.php b/modules/monitoring/library/Monitoring/Web/Hook/TimelineProviderHook.php
similarity index 96%
rename from modules/monitoring/library/Monitoring/Web/Hook/TimelineProvider.php
rename to modules/monitoring/library/Monitoring/Web/Hook/TimelineProviderHook.php
index cafe68c17..e265086ab 100644
--- a/modules/monitoring/library/Monitoring/Web/Hook/TimelineProvider.php
+++ b/modules/monitoring/library/Monitoring/Web/Hook/TimelineProviderHook.php
@@ -9,7 +9,7 @@ use Icinga\Module\Monitoring\Timeline\TimeRange;
 /**
  * Base class for TimeLine providers
  */
-abstract class TimelineProvider
+abstract class TimelineProviderHook
 {
     /**
      * Return the names by which to group entries
diff --git a/modules/monitoring/library/Monitoring/Web/Hook/TopBar.php b/modules/monitoring/library/Monitoring/Web/Hook/TopBar.php
index 32efaca9a..9433bf805 100644
--- a/modules/monitoring/library/Monitoring/Web/Hook/TopBar.php
+++ b/modules/monitoring/library/Monitoring/Web/Hook/TopBar.php
@@ -4,7 +4,7 @@
 
 namespace Icinga\Module\Monitoring\Web\Hook;
 
-use Icinga\Web\Hook\TopBar as IcingaTopBar;
+use Icinga\Web\Hook\TopBarHook;
 use Icinga\Module\Monitoring\DataView\StatusSummary as StatusSummaryView;
 use Icinga\Web\Request;
 use Zend_View;
@@ -12,7 +12,7 @@ use Zend_View;
 /**
  * Render status summary into the topbar of icinga
  */
-class TopBar implements IcingaTopBar
+class TopBar extends TopBarHook
 {
     /**
      * Function to generate top bar content