diff --git a/lib/Doctrine/Configuration.php b/lib/Doctrine/Common/Configuration.php
similarity index 99%
rename from lib/Doctrine/Configuration.php
rename to lib/Doctrine/Common/Configuration.php
index 72957a32f..d2132f170 100644
--- a/lib/Doctrine/Configuration.php
+++ b/lib/Doctrine/Common/Configuration.php
@@ -33,7 +33,7 @@
  * @author Roman Borschel <roman@code-factory.org>
  * @since 2.0
  */
-class Doctrine_Configuration
+class Doctrine_Common_Configuration
 {
     private $_nullObject;
     
diff --git a/lib/Doctrine/Connection.php b/lib/Doctrine/Connection.php
index f6d91fe88..ee28076e2 100644
--- a/lib/Doctrine/Connection.php
+++ b/lib/Doctrine/Connection.php
@@ -172,7 +172,7 @@ class Doctrine_Connection
         
         // Create default config and event manager if none given
         if ( ! $config) {
-            $this->_config = new Doctrine_Configuration();
+            $this->_config = new Doctrine_Common_Configuration();
         }
         if ( ! $eventManager) {
             $this->_eventManager = new Doctrine_Common_EventManager();
diff --git a/lib/Doctrine/ConnectionFactory.php b/lib/Doctrine/ConnectionFactory.php
index a5c2241e3..ab6f36ccc 100644
--- a/lib/Doctrine/ConnectionFactory.php
+++ b/lib/Doctrine/ConnectionFactory.php
@@ -58,12 +58,12 @@ class Doctrine_ConnectionFactory
      * @param array $params
      * @return Connection
      */
-    public function createConnection(array $params, Doctrine_Configuration $config = null,
+    public function createConnection(array $params, Doctrine_Common_Configuration $config = null,
             Doctrine_Common_EventManager $eventManager = null)
     {
         // create default config and event manager, if not set
         if ( ! $config) {
-            $config = new Doctrine_Configuration();
+            $config = new Doctrine_Common_Configuration();
         }
         if ( ! $eventManager) {
             $eventManager = new Doctrine_Common_EventManager();
diff --git a/lib/Doctrine/EntityManager.php b/lib/Doctrine/EntityManager.php
index 9681b505a..8136ccca7 100644
--- a/lib/Doctrine/EntityManager.php
+++ b/lib/Doctrine/EntityManager.php
@@ -148,7 +148,7 @@ class Doctrine_EntityManager
      * @param Doctrine_Connection $conn
      * @param string $name
      */
-    protected function __construct(Doctrine_Connection $conn, $name, Doctrine_Configuration $config,
+    protected function __construct(Doctrine_Connection $conn, $name, Doctrine_Common_Configuration $config,
             Doctrine_Common_EventManager $eventManager)
     {
         $this->_conn = $conn;
diff --git a/tests/lib/Doctrine_OrmTestSuite.php b/tests/lib/Doctrine_OrmTestSuite.php
index 8dd4694ff..15ae17e05 100644
--- a/tests/lib/Doctrine_OrmTestSuite.php
+++ b/tests/lib/Doctrine_OrmTestSuite.php
@@ -10,7 +10,7 @@ class Doctrine_OrmTestSuite extends Doctrine_TestSuite
 {
     protected function setUp()
     {
-        $config = new Doctrine_Configuration();
+        $config = new Doctrine_Common_Configuration();
         $eventManager = new Doctrine_Common_EventManager();
         $connectionOptions = array(
             'driverClass' => 'Doctrine_ConnectionMock',
diff --git a/tests/lib/mocks/Doctrine_EntityManagerMock.php b/tests/lib/mocks/Doctrine_EntityManagerMock.php
index b5cd28181..f91c1a95a 100644
--- a/tests/lib/mocks/Doctrine_EntityManagerMock.php
+++ b/tests/lib/mocks/Doctrine_EntityManagerMock.php
@@ -33,11 +33,11 @@ class Doctrine_EntityManagerMock extends Doctrine_EntityManager
      * @param Doctrine_EventManager $eventManager
      * @return unknown
      */
-    public static function create($conn, $name, Doctrine_Configuration $config = null,
+    public static function create($conn, $name, Doctrine_Common_Configuration $config = null,
             Doctrine_Common_EventManager $eventManager = null)
     {
         if (is_null($config)) {
-            $config = new Doctrine_Configuration();
+            $config = new Doctrine_Common_Configuration();
         }
         if (is_null($eventManager)) {
             $eventManager = new Doctrine_Common_EventManager();