diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php
index a8d185023..ab18e35a5 100644
--- a/library/Icinga/Application/ApplicationBootstrap.php
+++ b/library/Icinga/Application/ApplicationBootstrap.php
@@ -80,7 +80,7 @@ abstract class ApplicationBootstrap
     /**
      * Icinga auto loader
      *
-     * @var Loader
+     * @var ClassLoader
      */
     private $loader;
 
@@ -183,7 +183,7 @@ abstract class ApplicationBootstrap
     /**
      * Getter for class loader
      *
-     * @return Loader
+     * @return ClassLoader
      */
     public function getLoader()
     {
@@ -345,9 +345,9 @@ abstract class ApplicationBootstrap
      */
     public function setupAutoloader()
     {
-        require $this->libDir . '/Icinga/Application/Loader.php';
+        require $this->libDir . '/Icinga/Application/ClassLoader.php';
 
-        $this->loader = new Loader();
+        $this->loader = new ClassLoader();
         $this->loader->registerNamespace('Icinga', $this->libDir. '/Icinga');
         $this->loader->register();
 
diff --git a/library/Icinga/Application/Loader.php b/library/Icinga/Application/ClassLoader.php
similarity index 99%
rename from library/Icinga/Application/Loader.php
rename to library/Icinga/Application/ClassLoader.php
index 70f2877ed..051c2ae12 100644
--- a/library/Icinga/Application/Loader.php
+++ b/library/Icinga/Application/ClassLoader.php
@@ -5,7 +5,7 @@ namespace Icinga\Application;
 
 use Icinga\Exception\ProgrammingError;
 
-class Loader
+class ClassLoader
 {
     /**
      * Namespace separator
diff --git a/test/php/bootstrap.php b/test/php/bootstrap.php
index 6a41e7eab..4757c5018 100644
--- a/test/php/bootstrap.php
+++ b/test/php/bootstrap.php
@@ -22,9 +22,9 @@ require_once 'Mockery/Loader.php';
 $mockeryLoader = new \Mockery\Loader;
 $mockeryLoader->register();
 
-require_once($libraryPath . '/Icinga/Application/Loader.php');
+require_once($libraryPath . '/Icinga/Application/ClassLoader.php');
 
-$loader = new Icinga\Application\Loader();
+$loader = new Icinga\Application\ClassLoader();
 $loader->registerNamespace('Tests', $testLibraryPath);
 $loader->registerNamespace('Icinga', $libraryPath . '/Icinga');
 $loader->registerNamespace('Icinga\\Forms', $applicationPath . '/forms');
diff --git a/test/php/library/Icinga/Application/LoaderTest.php b/test/php/library/Icinga/Application/LoaderTest.php
index 2b6fdd977..ec62a5975 100644
--- a/test/php/library/Icinga/Application/LoaderTest.php
+++ b/test/php/library/Icinga/Application/LoaderTest.php
@@ -4,7 +4,7 @@
 namespace Tests\Icinga\Application;
 
 use Icinga\Test\BaseTestCase;
-use Icinga\Application\Loader;
+use Icinga\Application\ClassLoader;
 
 class LoaderTest extends BaseTestCase
 {
@@ -43,7 +43,7 @@ EOD;
 
     public function testObjectCreation1()
     {
-        $loader = new Loader();
+        $loader = new ClassLoader();
         $loader->register();
 
         $check = false;
@@ -71,7 +71,7 @@ EOD;
 
     public function testNamespaces()
     {
-        $loader = new Loader();
+        $loader = new ClassLoader();
         $loader->registerNamespace('Test\\Laola', '/tmp');
         $loader->registerNamespace('Dings\\Var', '/var/tmp');
 
@@ -89,7 +89,7 @@ EOD;
         $classFile = $this->baseDir. self::$classFile;
         $this->assertFileExists($classFile);
 
-        $loader = new Loader();
+        $loader = new ClassLoader();
         $loader->registerNamespace('My\\Library', dirname($classFile));
         $this->assertFalse($loader->loadClass('DOES\\NOT\\EXISTS'));
         $this->assertTrue($loader->loadClass('My\\Library\\TestStruct'));
@@ -100,7 +100,7 @@ EOD;
         $classFile = $this->baseDir. self::$classFile;
         $this->assertFileExists($classFile);
 
-        $loader = new Loader();
+        $loader = new ClassLoader();
         $loader->registerNamespace('My\\Library', dirname($classFile));
         $loader->register();
 
@@ -113,7 +113,7 @@ EOD;
      */
     public function testNonexistingDirectory()
     {
-        $loader = new Loader();
+        $loader = new ClassLoader();
         $loader->registerNamespace('My\\Library', '/trullalla/123');
     }
 }