diff --git a/lib/Doctrine/ClassMetadata.php b/lib/Doctrine/ClassMetadata.php
index 6e5eb1581..a8dfe200f 100644
--- a/lib/Doctrine/ClassMetadata.php
+++ b/lib/Doctrine/ClassMetadata.php
@@ -792,13 +792,13 @@ class Doctrine_ClassMetadata implements Doctrine_Configurable, Serializable
     protected function _createIdGenerator()
     {
         if ($this->_generatorType == self::GENERATOR_TYPE_IDENTITY) {
-            $this->_idGenerator = new Doctrine_Id_IdentityGenerator($this->_em);
+            $this->_idGenerator = new Doctrine_ORM_Id_IdentityGenerator($this->_em);
         } else if ($this->_generatorType == self::GENERATOR_TYPE_SEQUENCE) {
-            $this->_idGenerator = new Doctrine_Id_SequenceGenerator($this->_em);
+            $this->_idGenerator = new Doctrine_ORM_Id_SequenceGenerator($this->_em);
         } else if ($this->_generatorType == self::GENERATOR_TYPE_TABLE) {
-            $this->_idGenerator = new Doctrine_Id_TableGenerator($this->_em);
+            $this->_idGenerator = new Doctrine_ORM_Id_TableGenerator($this->_em);
         } else {
-            $this->_idGenerator = new Doctrine_Id_Assigned($this->_em);
+            $this->_idGenerator = new Doctrine_ORM_Id_Assigned($this->_em);
         }
     }
     
diff --git a/lib/Doctrine/Connection/UnitOfWork.php b/lib/Doctrine/Connection/UnitOfWork.php
index 0b8c0e640..094fc444c 100644
--- a/lib/Doctrine/Connection/UnitOfWork.php
+++ b/lib/Doctrine/Connection/UnitOfWork.php
@@ -638,7 +638,7 @@ class Doctrine_Connection_UnitOfWork
                 break;
             case Doctrine_Entity::STATE_NEW:
                 $result = $class->getIdGenerator()->generate($entity);
-                if ($result == Doctrine_Id_AbstractIdGenerator::POST_INSERT_INDICATOR) {
+                if ($result == Doctrine_ORM_Id_AbstractIdGenerator::POST_INSERT_INDICATOR) {
                     $insertNow[$entity->getOid()] = $entity;
                 } else {
                     $entity->_assignIdentifier($result);
diff --git a/lib/Doctrine/Id/AbstractIdGenerator.php b/lib/Doctrine/ORM/Id/AbstractIdGenerator.php
similarity index 88%
rename from lib/Doctrine/Id/AbstractIdGenerator.php
rename to lib/Doctrine/ORM/Id/AbstractIdGenerator.php
index 3e12147c6..6fea0e962 100644
--- a/lib/Doctrine/Id/AbstractIdGenerator.php
+++ b/lib/Doctrine/ORM/Id/AbstractIdGenerator.php
@@ -7,7 +7,7 @@
  *
  * @todo Rename to AbstractIdGenerator
  */
-abstract class Doctrine_Id_AbstractIdGenerator
+abstract class Doctrine_ORM_Id_AbstractIdGenerator
 {
     const POST_INSERT_INDICATOR = 'POST_INSERT_INDICATOR';
     
diff --git a/lib/Doctrine/Id/Assigned.php b/lib/Doctrine/ORM/Id/Assigned.php
similarity index 85%
rename from lib/Doctrine/Id/Assigned.php
rename to lib/Doctrine/ORM/Id/Assigned.php
index 62c5a07d9..013e85e42 100644
--- a/lib/Doctrine/Id/Assigned.php
+++ b/lib/Doctrine/ORM/Id/Assigned.php
@@ -5,7 +5,7 @@
  *
  * @since 2.0
  */
-class Doctrine_Id_Assigned extends Doctrine_Id_AbstractIdGenerator
+class Doctrine_ORM_Id_Assigned extends Doctrine_ORM_Id_AbstractIdGenerator
 {
     /**
      * Enter description here...
diff --git a/lib/Doctrine/Id/IdentityGenerator.php b/lib/Doctrine/ORM/Id/IdentityGenerator.php
similarity index 81%
rename from lib/Doctrine/Id/IdentityGenerator.php
rename to lib/Doctrine/ORM/Id/IdentityGenerator.php
index 93dc6c413..3b2e62583 100644
--- a/lib/Doctrine/Id/IdentityGenerator.php
+++ b/lib/Doctrine/ORM/Id/IdentityGenerator.php
@@ -1,6 +1,6 @@
 <?php
 
-class Doctrine_Id_IdentityGenerator extends Doctrine_Id_AbstractIdGenerator
+class Doctrine_ORM_Id_IdentityGenerator extends Doctrine_ORM_Id_AbstractIdGenerator
 {
     /**
      * Enter description here...
diff --git a/lib/Doctrine/Id/SequenceGenerator.php b/lib/Doctrine/ORM/Id/SequenceGenerator.php
similarity index 85%
rename from lib/Doctrine/Id/SequenceGenerator.php
rename to lib/Doctrine/ORM/Id/SequenceGenerator.php
index 06645cc0f..9bf00ad6f 100644
--- a/lib/Doctrine/Id/SequenceGenerator.php
+++ b/lib/Doctrine/ORM/Id/SequenceGenerator.php
@@ -1,6 +1,6 @@
 <?php
 
-class Doctrine_Id_SequenceGenerator extends Doctrine_Id_AbstractIdGenerator
+class Doctrine_ORM_Id_SequenceGenerator extends Doctrine_ORM_Id_AbstractIdGenerator
 {
     private $_sequenceName;
     
diff --git a/lib/Doctrine/Id/SequenceIdentityGenerator.php b/lib/Doctrine/ORM/Id/SequenceIdentityGenerator.php
similarity index 81%
rename from lib/Doctrine/Id/SequenceIdentityGenerator.php
rename to lib/Doctrine/ORM/Id/SequenceIdentityGenerator.php
index b08feab73..f5643d155 100644
--- a/lib/Doctrine/Id/SequenceIdentityGenerator.php
+++ b/lib/Doctrine/ORM/Id/SequenceIdentityGenerator.php
@@ -1,6 +1,6 @@
 <?php
 
-class Doctrine_Id_SequenceIdentityGenerator extends Doctrine_Id_IdentityGenerator
+class Doctrine_ORM_Id_SequenceIdentityGenerator extends Doctrine_ORM_Id_IdentityGenerator
 {
     private $_sequenceName;
     
diff --git a/lib/Doctrine/Id/TableGenerator.php b/lib/Doctrine/ORM/Id/TableGenerator.php
similarity index 74%
rename from lib/Doctrine/Id/TableGenerator.php
rename to lib/Doctrine/ORM/Id/TableGenerator.php
index 30fdd406d..0a5bb544e 100644
--- a/lib/Doctrine/Id/TableGenerator.php
+++ b/lib/Doctrine/ORM/Id/TableGenerator.php
@@ -5,7 +5,7 @@
  *
  * @since 2.0
  */
-class Doctrine_Id_TableGenerator extends Doctrine_Id_AbstractIdGenerator
+class Doctrine_ORM_Id_TableGenerator extends Doctrine_ORM_Id_AbstractIdGenerator
 {
     
     public function generate(Doctrine_Entity $entity)
diff --git a/tests/lib/mocks/Doctrine_ClassMetadataMock.php b/tests/lib/mocks/Doctrine_ClassMetadataMock.php
index 1c2491290..1569a2ad9 100644
--- a/tests/lib/mocks/Doctrine_ClassMetadataMock.php
+++ b/tests/lib/mocks/Doctrine_ClassMetadataMock.php
@@ -6,7 +6,7 @@ class Doctrine_ClassMetadataMock extends Doctrine_ClassMetadata
     
     /* Mock API */
     
-    public function setIdGenerator(Doctrine_Id_AbstractIdGenerator $g) {
+    public function setIdGenerator(Doctrine_ORM_Id_AbstractIdGenerator $g) {
         $this->_idGenerator = $g;
     }
     
diff --git a/tests/lib/mocks/Doctrine_SequenceMock.php b/tests/lib/mocks/Doctrine_SequenceMock.php
index 019459861..28da384c5 100644
--- a/tests/lib/mocks/Doctrine_SequenceMock.php
+++ b/tests/lib/mocks/Doctrine_SequenceMock.php
@@ -1,6 +1,6 @@
 <?php
 
-class Doctrine_SequenceMock extends Doctrine_Id_SequenceGenerator
+class Doctrine_SequenceMock extends Doctrine_ORM_Id_SequenceGenerator
 {
     private $_sequenceNumber = 0;