diff --git a/library/Icinga/Application/Loader.php b/library/Icinga/Application/Loader.php
index a0564667b..d3cd0ef40 100644
--- a/library/Icinga/Application/Loader.php
+++ b/library/Icinga/Application/Loader.php
@@ -24,7 +24,7 @@ class Loader
      */
     public function __destruct()
     {
-        $this->unRegister();
+        $this->unregister();
     }
 
     /**
@@ -134,7 +134,7 @@ class Loader
     /**
      * Detach autoloader from spl registration
      */
-    public function unRegister()
+    public function unregister()
     {
         spl_autoload_unregister(array(&$this, 'loadClass'));
     }
diff --git a/test/php/library/Icinga/Application/LoaderTest.php b/test/php/library/Icinga/Application/LoaderTest.php
index 3ae94f8d3..2b6fdd977 100644
--- a/test/php/library/Icinga/Application/LoaderTest.php
+++ b/test/php/library/Icinga/Application/LoaderTest.php
@@ -56,7 +56,7 @@ EOD;
         }
         $this->assertTrue($check);
 
-        $loader->unRegister();
+        $loader->unregister();
 
         $check = true;
         foreach (spl_autoload_functions() as $functions) {