diff --git a/tests/AutoloadTest.php b/tests/AutoloadTest.php
index c8e53e4..f71f150 100644
--- a/tests/AutoloadTest.php
+++ b/tests/AutoloadTest.php
@@ -89,6 +89,7 @@ class AutoloadTest extends \PHPUnit_Framework_TestCase
      **/
     public function testAddClassMapTemplateOrderBis()
     {
+        $nb = count(Autoload::getClassMap());
         $this->assertFalse(class_exists('Foo\\Bar'));
         require __DIR__.'/fixtures/Foo2/classmap2.php';
         require __DIR__.'/fixtures/Foo/classmap.php';
@@ -98,7 +99,7 @@ class AutoloadTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('three', \Foo\Bar::order);
 
         $classmap = Autoload::getClassMap();
-        $this->assertEquals(2, count($classmap));
+        $this->assertEquals($nb+2, count($classmap));
         $this->assertArrayHasKey(__DIR__.'/fixtures/Foo', $classmap);
         $this->assertArrayHasKey(__DIR__.'/fixtures/Foo2', $classmap);
     }
diff --git a/src/Autoload.php b/src/Autoload.php
index 5d08c84..9f85edd 100644
--- a/src/Autoload.php
+++ b/src/Autoload.php
@@ -209,7 +209,7 @@ class Autoload
      */
     public static function loadClass($class)
     {
-        if ($file = static::findFile($class)) {
+        if ($file = static::findFileForClass($class)) {
             includeFile($file);
         }
     }
@@ -219,7 +219,7 @@ class Autoload
      *
      * Checks for a classmap and then loops through PSR-4 mappings.
      */
-    public static function findFile($class)
+    public static function findFileForClass($class)
     {
         $class = ltrim($class, '\\');
         $lower = strtolower($class);