diff --git a/application/controllers/ListController.php b/application/controllers/ListController.php
index ba513fa0..ef428314 100644
--- a/application/controllers/ListController.php
+++ b/application/controllers/ListController.php
@@ -22,7 +22,7 @@ class Director_ListController extends ActionController
             'director/object/hostgroup'
         );
         $this->view->title = $this->translate('Icinga Hostgroups');
-        $this->view->table = $this->loadTable('icingaHostgroup')->setConnection($this->db());
+        $this->view->table = $this->loadTable('icingaHostGroup')->setConnection($this->db());
         $this->render('table');
     }
 
@@ -33,7 +33,7 @@ class Director_ListController extends ActionController
             'director/object/hostgroupmember'
         );
         $this->view->title = $this->translate('Icinga Hostgroup Members');
-        $this->view->table = $this->loadTable('icingaHostgroupMember')->setConnection($this->db());
+        $this->view->table = $this->loadTable('icingaHostGroupMember')->setConnection($this->db());
         $this->render('table');
     }
 
diff --git a/application/controllers/ObjectController.php b/application/controllers/ObjectController.php
index d9123aa9..cd42e57d 100644
--- a/application/controllers/ObjectController.php
+++ b/application/controllers/ObjectController.php
@@ -22,7 +22,7 @@ class Director_ObjectController extends ActionController
 
     public function hostgroupAction()
     {
-        $this->view->form = $this->loadForm('icingaHostgroup')
+        $this->view->form = $this->loadForm('icingaHostGroup')
             ->setDb($this->db())
             ->setSuccessUrl('director/list/hostgroups');
 
@@ -58,7 +58,7 @@ class Director_ObjectController extends ActionController
 
     public function hostgroupmemberAction()
     {
-        $this->view->form = $this->loadForm('icingaHostgroupMember')
+        $this->view->form = $this->loadForm('icingaHostGroupMember')
             ->setDb($this->db())
             ->setSuccessUrl('director/list/hostgroupmembers');
 
diff --git a/application/forms/IcingaHostgroupForm.php b/application/forms/IcingaHostGroupForm.php
similarity index 96%
rename from application/forms/IcingaHostgroupForm.php
rename to application/forms/IcingaHostGroupForm.php
index e3c612ac..adacbfc6 100644
--- a/application/forms/IcingaHostgroupForm.php
+++ b/application/forms/IcingaHostGroupForm.php
@@ -4,7 +4,7 @@ namespace Icinga\Module\Director\Forms;
 
 use Icinga\Module\Director\Web\Form\DirectorObjectForm;
 
-class IcingaHostgroupForm extends DirectorObjectForm
+class IcingaHostGroupForm extends DirectorObjectForm
 {
     public function setup()
     {
diff --git a/application/forms/IcingaHostgroupMemberForm.php b/application/forms/IcingaHostGroupMemberForm.php
similarity index 91%
rename from application/forms/IcingaHostgroupMemberForm.php
rename to application/forms/IcingaHostGroupMemberForm.php
index db9ce1fd..b3641747 100644
--- a/application/forms/IcingaHostgroupMemberForm.php
+++ b/application/forms/IcingaHostGroupMemberForm.php
@@ -4,7 +4,7 @@ namespace Icinga\Module\Director\Forms;
 
 use Icinga\Module\Director\Web\Form\DirectorObjectForm;
 
-class IcingaHostgroupMemberForm extends DirectorObjectForm
+class IcingaHostGroupMemberForm extends DirectorObjectForm
 {
     public function setup()
     {
diff --git a/application/tables/IcingaHostgroupMemberTable.php b/application/tables/IcingaHostGroupMemberTable.php
similarity index 96%
rename from application/tables/IcingaHostgroupMemberTable.php
rename to application/tables/IcingaHostGroupMemberTable.php
index 2f73ffa2..cbeb9f11 100644
--- a/application/tables/IcingaHostgroupMemberTable.php
+++ b/application/tables/IcingaHostGroupMemberTable.php
@@ -4,7 +4,7 @@ namespace Icinga\Module\Director\Tables;
 
 use Icinga\Module\Director\Web\Table\QuickTable;
 
-class IcingaHostgroupMemberTable extends QuickTable
+class IcingaHostGroupMemberTable extends QuickTable
 {
     public function getColumns()
     {
diff --git a/application/tables/IcingaHostgroupTable.php b/application/tables/IcingaHostGroupTable.php
similarity index 95%
rename from application/tables/IcingaHostgroupTable.php
rename to application/tables/IcingaHostGroupTable.php
index a1e705a9..9b3d4e36 100644
--- a/application/tables/IcingaHostgroupTable.php
+++ b/application/tables/IcingaHostGroupTable.php
@@ -4,7 +4,7 @@ namespace Icinga\Module\Director\Tables;
 
 use Icinga\Module\Director\Web\Table\QuickTable;
 
-class IcingaHostgroupTable extends QuickTable
+class IcingaHostGroupTable extends QuickTable
 {
     public function getColumns()
     {
diff --git a/library/Director/Objects/IcingaHostgroup.php b/library/Director/Objects/IcingaHostGroup.php
similarity index 87%
rename from library/Director/Objects/IcingaHostgroup.php
rename to library/Director/Objects/IcingaHostGroup.php
index b09e4fcf..8996ec40 100644
--- a/library/Director/Objects/IcingaHostgroup.php
+++ b/library/Director/Objects/IcingaHostGroup.php
@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Director\Objects;
 
-class IcingaHostgroup extends IcingaObject
+class IcingaHostGroup extends IcingaObject
 {
     protected $table = 'icinga_hostgroup';