diff --git a/lib/Doctrine/DBAL/Driver/IbmDb2/Db2Connection.php b/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Connection.php
similarity index 88%
rename from lib/Doctrine/DBAL/Driver/IbmDb2/Db2Connection.php
rename to lib/Doctrine/DBAL/Driver/IBMDB2/DB2Connection.php
index 2d13ce03f..5d706de7b 100644
--- a/lib/Doctrine/DBAL/Driver/IbmDb2/Db2Connection.php
+++ b/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Connection.php
@@ -19,9 +19,9 @@
  * <http://www.doctrine-project.org>.
 */
 
-namespace Doctrine\DBAL\Driver\IbmDb2;
+namespace Doctrine\DBAL\Driver\IBMDB2;
 
-class Db2Connection implements \Doctrine\DBAL\Driver\Connection
+class DB2Connection implements \Doctrine\DBAL\Driver\Connection
 {
     private $_conn = null;
 
@@ -35,7 +35,7 @@ class Db2Connection implements \Doctrine\DBAL\Driver\Connection
             $this->_conn = db2_connect($params['dbname'], $username, $password, $driverOptions);
         }
         if (!$this->_conn) {
-            throw new Db2Exception(db2_conn_errormsg());
+            throw new DB2Exception(db2_conn_errormsg());
         }
     }
 
@@ -43,9 +43,9 @@ class Db2Connection implements \Doctrine\DBAL\Driver\Connection
     {
         $stmt = @db2_prepare($this->_conn, $sql);
         if (!$stmt) {
-            throw new Db2Exception(db2_stmt_errormsg());
+            throw new DB2Exception(db2_stmt_errormsg());
         }
-        return new Db2Statement($stmt);
+        return new DB2Statement($stmt);
     }
     
     function query()
@@ -87,7 +87,7 @@ class Db2Connection implements \Doctrine\DBAL\Driver\Connection
     function commit()
     {
         if (!db2_commit($this->_conn)) {
-            throw new Db2Exception(db2_conn_errormsg($this->_conn));
+            throw new DB2Exception(db2_conn_errormsg($this->_conn));
         }
         db2_autocommit($this->_conn, DB2_AUTOCOMMIT_ON);
     }
@@ -95,7 +95,7 @@ class Db2Connection implements \Doctrine\DBAL\Driver\Connection
     function rollBack()
     {
         if (!db2_rollback($this->_conn)) {
-            throw new Db2Exception(db2_conn_errormsg($this->_conn));
+            throw new DB2Exception(db2_conn_errormsg($this->_conn));
         }
         db2_autocommit($this->_conn, DB2_AUTOCOMMIT_ON);
     }
diff --git a/lib/Doctrine/DBAL/Driver/IbmDb2/Db2Driver.php b/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Driver.php
similarity index 93%
rename from lib/Doctrine/DBAL/Driver/IbmDb2/Db2Driver.php
rename to lib/Doctrine/DBAL/Driver/IBMDB2/DB2Driver.php
index 3522d0e37..6209d5ffd 100644
--- a/lib/Doctrine/DBAL/Driver/IbmDb2/Db2Driver.php
+++ b/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Driver.php
@@ -19,7 +19,7 @@
  * <http://www.doctrine-project.org>.
 */
 
-namespace Doctrine\DBAL\Driver\IbmDb2;
+namespace Doctrine\DBAL\Driver\IBMDB2;
 
 use Doctrine\DBAL\Driver,
     Doctrine\DBAL\Connection;
@@ -33,7 +33,7 @@ use Doctrine\DBAL\Driver,
  * @version     $Revision$
  * @author      Benjamin Eberlei <kontakt@beberlei.de>
  */
-class Db2Driver implements Driver
+class DB2Driver implements Driver
 {
     /**
      * Attempts to create a connection with the database.
@@ -63,7 +63,7 @@ class Db2Driver implements Driver
             $password = null;
         }
 
-        return new Db2Connection($params, $username, $password, $driverOptions);
+        return new DB2Connection($params, $username, $password, $driverOptions);
     }
 
     /**
@@ -74,7 +74,7 @@ class Db2Driver implements Driver
      */
     public function getDatabasePlatform()
     {
-        return new \Doctrine\DBAL\Platforms\Db2Platform;
+        return new \Doctrine\DBAL\Platforms\DB2Platform;
     }
 
     /**
@@ -86,7 +86,7 @@ class Db2Driver implements Driver
      */
     public function getSchemaManager(Connection $conn)
     {
-        return new \Doctrine\DBAL\Schema\Db2SchemaManager($conn);
+        return new \Doctrine\DBAL\Schema\DB2SchemaManager($conn);
     }
 
     /**
diff --git a/lib/Doctrine/DBAL/Driver/IbmDb2/Db2Exception.php b/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Exception.php
similarity index 92%
rename from lib/Doctrine/DBAL/Driver/IbmDb2/Db2Exception.php
rename to lib/Doctrine/DBAL/Driver/IBMDB2/DB2Exception.php
index 76d992b50..b2a8de63a 100644
--- a/lib/Doctrine/DBAL/Driver/IbmDb2/Db2Exception.php
+++ b/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Exception.php
@@ -19,9 +19,9 @@
  * <http://www.doctrine-project.org>.
 */
 
-namespace Doctrine\DBAL\Driver\IbmDb2;
+namespace Doctrine\DBAL\Driver\IBMDB2;
 
-class Db2Exception extends \Exception
+class DB2Exception extends \Exception
 {
     
 }
\ No newline at end of file
diff --git a/lib/Doctrine/DBAL/Driver/IbmDb2/Db2Statement.php b/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Statement.php
similarity index 97%
rename from lib/Doctrine/DBAL/Driver/IbmDb2/Db2Statement.php
rename to lib/Doctrine/DBAL/Driver/IBMDB2/DB2Statement.php
index d25269cc3..41bff920e 100644
--- a/lib/Doctrine/DBAL/Driver/IbmDb2/Db2Statement.php
+++ b/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Statement.php
@@ -19,9 +19,9 @@
  * <http://www.doctrine-project.org>.
 */
 
-namespace Doctrine\DBAL\Driver\IbmDb2;
+namespace Doctrine\DBAL\Driver\IBMDB2;
 
-class Db2Statement implements \Doctrine\DBAL\Driver\Statement
+class DB2Statement implements \Doctrine\DBAL\Driver\Statement
 {
     private $_stmt = null;
 
@@ -92,7 +92,7 @@ class Db2Statement implements \Doctrine\DBAL\Driver\Statement
         }
 
         if (!db2_bind_param($this->_stmt, $column, "variable", DB2_PARAM_IN, $type)) {
-            throw new Db2Exception(db2_stmt_errormsg());
+            throw new DB2Exception(db2_stmt_errormsg());
         }
         return true;
     }
@@ -191,7 +191,7 @@ class Db2Statement implements \Doctrine\DBAL\Driver\Statement
         $retval = @db2_execute($this->_stmt, $params);
 
         if ($retval === false) {
-            throw new Db2Exception(db2_stmt_errormsg());
+            throw new DB2Exception(db2_stmt_errormsg());
         }
         return $retval;
     }
@@ -233,7 +233,7 @@ class Db2Statement implements \Doctrine\DBAL\Driver\Statement
             case \PDO::FETCH_NUM:
                 return db2_fetch_array($this->_stmt);
             default:
-                throw new Db2Exception("Given Fetch-Style " . $fetchStyle . " is not supported.");
+                throw new DB2Exception("Given Fetch-Style " . $fetchStyle . " is not supported.");
         }
     }
 
diff --git a/lib/Doctrine/DBAL/Driver/PDOIbm/Driver.php b/lib/Doctrine/DBAL/Driver/PDOIbm/Driver.php
index 3f05f5c75..844f2ab3f 100644
--- a/lib/Doctrine/DBAL/Driver/PDOIbm/Driver.php
+++ b/lib/Doctrine/DBAL/Driver/PDOIbm/Driver.php
@@ -87,7 +87,7 @@ class Driver implements \Doctrine\DBAL\Driver
      */
     public function getDatabasePlatform()
     {
-        return new \Doctrine\DBAL\Platforms\Db2Platform;
+        return new \Doctrine\DBAL\Platforms\DB2Platform;
     }
 
     /**
@@ -99,7 +99,7 @@ class Driver implements \Doctrine\DBAL\Driver
      */
     public function getSchemaManager(Connection $conn)
     {
-        return new \Doctrine\DBAL\Schema\Db2SchemaManager($conn);
+        return new \Doctrine\DBAL\Schema\DB2SchemaManager($conn);
     }
 
     /**
diff --git a/lib/Doctrine/DBAL/DriverManager.php b/lib/Doctrine/DBAL/DriverManager.php
index 21a5c09d4..39c88f1b8 100644
--- a/lib/Doctrine/DBAL/DriverManager.php
+++ b/lib/Doctrine/DBAL/DriverManager.php
@@ -44,7 +44,7 @@ final class DriverManager
             'pdo_oci' => 'Doctrine\DBAL\Driver\PDOOracle\Driver',
             'pdo_mssql'  => 'Doctrine\DBAL\Driver\PDOMsSql\Driver',
             'oci8' => 'Doctrine\DBAL\Driver\OCI8\Driver',
-            'ibm_db2' => 'Doctrine\DBAL\Driver\IbmDb2\Db2Driver',
+            'ibm_db2' => 'Doctrine\DBAL\Driver\IBMDB2\DB2Driver',
             'pdo_ibm' => 'Doctrine\DBAL\Driver\PDOIbm\Driver',
             );
 
diff --git a/lib/Doctrine/DBAL/Platforms/Db2Platform.php b/lib/Doctrine/DBAL/Platforms/DB2Platform.php
similarity index 100%
rename from lib/Doctrine/DBAL/Platforms/Db2Platform.php
rename to lib/Doctrine/DBAL/Platforms/DB2Platform.php
diff --git a/lib/Doctrine/DBAL/Schema/Db2SchemaManager.php b/lib/Doctrine/DBAL/Schema/DB2SchemaManager.php
similarity index 99%
rename from lib/Doctrine/DBAL/Schema/Db2SchemaManager.php
rename to lib/Doctrine/DBAL/Schema/DB2SchemaManager.php
index 656c9c00b..9c1466715 100644
--- a/lib/Doctrine/DBAL/Schema/Db2SchemaManager.php
+++ b/lib/Doctrine/DBAL/Schema/DB2SchemaManager.php
@@ -30,7 +30,7 @@ namespace Doctrine\DBAL\Schema;
  * @version     $Revision$
  * @author      Benjamin Eberlei <kontakt@beberlei.de>
  */
-class Db2SchemaManager extends AbstractSchemaManager
+class DB2SchemaManager extends AbstractSchemaManager
 {
     /**
      * Return a list of all tables in the current database