diff --git a/application/controllers/ModulesController.php b/application/controllers/ModulesController.php
index 1a5dec426..9c6fc856a 100755
--- a/application/controllers/ModulesController.php
+++ b/application/controllers/ModulesController.php
@@ -36,7 +36,7 @@ class ModulesController extends ActionController
 
     public function init()
     {
-        $this->manager = Icinga::app()->moduleManager();
+        $this->manager = Icinga::app()->getModuleManager();
     }
 
     public function indexAction()
diff --git a/application/controllers/StaticController.php b/application/controllers/StaticController.php
index dd9bfc7c9..c39249594 100644
--- a/application/controllers/StaticController.php
+++ b/application/controllers/StaticController.php
@@ -17,7 +17,7 @@ class StaticController extends ActionController
 
     private function getModuleList()
     {
-        $modules = Icinga::app()->moduleManager()->getLoadedModules();
+        $modules = Icinga::app()->getModuleManager()->getLoadedModules();
 
         // preliminary static definition
         $result = array();
diff --git a/library/Icinga/Web/ActionController.php b/library/Icinga/Web/ActionController.php
index 629e2b03e..3767182c2 100755
--- a/library/Icinga/Web/ActionController.php
+++ b/library/Icinga/Web/ActionController.php
@@ -299,7 +299,7 @@ class ActionController extends ZfController
 
             $css = $less->compileFile($cssdir . '/pdfprint.less');
 /*
-            foreach (\Icinga\Application\Icinga::app()->moduleManager()->getLoadedModules() as $name => $module) {
+            foreach (\Icinga\Application\Icinga::app()->getModuleManager()->getLoadedModules() as $name => $module) {
                 if ($module->hasCss()) {
                     $css .= $less->compile(
                         '.icinga-module.module-'
diff --git a/library/Icinga/Web/Widget/Form.php b/library/Icinga/Web/Widget/Form.php
index 0c89f0135..533e1010f 100644
--- a/library/Icinga/Web/Widget/Form.php
+++ b/library/Icinga/Web/Widget/Form.php
@@ -46,7 +46,7 @@ class Form extends AbstractWidget
             $module_name = null;
         }
         if ($module_name !== null) {
-            $fname = $app->moduleManager()->getModule($module_name)->getBaseDir()
+            $fname = $app->getModuleManager()->getModule($module_name)->getBaseDir()
                    . '/application/forms/'
                    . implode('/', $fparts)
                    . 'Form.php';