diff --git a/lib/Doctrine/ORM/Mapping/Driver/PhpDriver.php b/lib/Doctrine/ORM/Mapping/Driver/PHPDriver.php
similarity index 95%
rename from lib/Doctrine/ORM/Mapping/Driver/PhpDriver.php
rename to lib/Doctrine/ORM/Mapping/Driver/PHPDriver.php
index 6b6954b83..99b8a145a 100644
--- a/lib/Doctrine/ORM/Mapping/Driver/PhpDriver.php
+++ b/lib/Doctrine/ORM/Mapping/Driver/PHPDriver.php
@@ -30,7 +30,7 @@ use Doctrine\Common\Cache\ArrayCache,
     Doctrine\ORM\Mapping\Driver\AbstractFileDriver;
 
 /**
- * The PhpDriver includes php files which just populate ClassMetadataInfo
+ * The PHPDriver includes php files which just populate ClassMetadataInfo
  * instances with plain php code
  *
  * @license 	http://www.opensource.org/licenses/lgpl-license.php LGPL
@@ -43,7 +43,7 @@ use Doctrine\Common\Cache\ArrayCache,
  * @author      Roman Borschel <roman@code-factory.org>
  * @todo Rename: PHPDriver
  */
-class PhpDriver extends AbstractFileDriver
+class PHPDriver extends AbstractFileDriver
 {
     /**
      * {@inheritdoc}
diff --git a/tests/Doctrine/Tests/ORM/Mapping/PhpMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/PHPMappingDriverTest.php
similarity index 91%
rename from tests/Doctrine/Tests/ORM/Mapping/PhpMappingDriverTest.php
rename to tests/Doctrine/Tests/ORM/Mapping/PHPMappingDriverTest.php
index 50bfcb819..08ec30bcf 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/PhpMappingDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/PHPMappingDriverTest.php
@@ -3,7 +3,7 @@
 namespace Doctrine\Tests\ORM\Mapping;
 
 use Doctrine\ORM\Mapping\ClassMetadata,
-    Doctrine\ORM\Mapping\Driver\PhpDriver,
+    Doctrine\ORM\Mapping\Driver\PHPDriver,
     Doctrine\ORM\Tools\Export\ClassMetadataExporter;
 
 require_once __DIR__ . '/../../TestInit.php';
@@ -26,6 +26,6 @@ class PhpMappingDriverTest extends AbstractMappingDriverTest
         $exporter->export();
         */
 
-        return new PhpDriver($path);
+        return new PHPDriver($path);
     }
 }
\ No newline at end of file