diff --git a/lib/Doctrine/Connection/UnitOfWork.php b/lib/Doctrine/Connection/UnitOfWork.php
index 094fc444c..c8d0c9557 100644
--- a/lib/Doctrine/Connection/UnitOfWork.php
+++ b/lib/Doctrine/Connection/UnitOfWork.php
@@ -124,7 +124,7 @@ class Doctrine_Connection_UnitOfWork
     {
         $this->_em = $em;
         //TODO: any benefit with lazy init?
-        $this->_commitOrderCalculator = new Doctrine_Internal_CommitOrderCalculator();
+        $this->_commitOrderCalculator = new Doctrine_ORM_Internal_CommitOrderCalculator();
     }
 
     /**
diff --git a/lib/Doctrine/Internal/CommitOrderCalculator.php b/lib/Doctrine/ORM/Internal/CommitOrderCalculator.php
similarity index 96%
rename from lib/Doctrine/Internal/CommitOrderCalculator.php
rename to lib/Doctrine/ORM/Internal/CommitOrderCalculator.php
index 3ce50b557..ab6c9fa0e 100644
--- a/lib/Doctrine/Internal/CommitOrderCalculator.php
+++ b/lib/Doctrine/ORM/Internal/CommitOrderCalculator.php
@@ -29,7 +29,7 @@
  * @todo Rename to: CommitOrderCalculator
  * @author Roman Borschel <roman@code-factory.org> 
  */
-class Doctrine_Internal_CommitOrderCalculator
+class Doctrine_ORM_Internal_CommitOrderCalculator
 {
     private $_currentTime;
     
@@ -95,7 +95,7 @@ class Doctrine_Internal_CommitOrderCalculator
     
     public function addNodeWithItem($key, $item)
     {
-        $this->_nodes[$key] = new Doctrine_Internal_CommitOrderNode($item, $this);
+        $this->_nodes[$key] = new Doctrine_ORM_Internal_CommitOrderNode($item, $this);
     }
     
     public function getNodeForKey($key)
diff --git a/lib/Doctrine/Internal/CommitOrderNode.php b/lib/Doctrine/ORM/Internal/CommitOrderNode.php
similarity index 94%
rename from lib/Doctrine/Internal/CommitOrderNode.php
rename to lib/Doctrine/ORM/Internal/CommitOrderNode.php
index 42a343a07..90e32f580 100644
--- a/lib/Doctrine/Internal/CommitOrderNode.php
+++ b/lib/Doctrine/ORM/Internal/CommitOrderNode.php
@@ -28,7 +28,7 @@
  * @since 2.0
  * @author Roman Borschel <roman@code-factory.org>
  */
-class Doctrine_Internal_CommitOrderNode
+class Doctrine_ORM_Internal_CommitOrderNode
 {
     const NOT_VISITED = 1;
     const IN_PROGRESS = 2;
@@ -47,7 +47,7 @@ class Doctrine_Internal_CommitOrderNode
     private $_relationEdges = array();
     
     
-    public function __construct($wrappedObj, Doctrine_Internal_CommitOrderCalculator $calc)
+    public function __construct($wrappedObj, Doctrine_ORM_Internal_CommitOrderCalculator $calc)
     {
         $this->_wrappedObj = $wrappedObj;
         $this->_calculator = $calc;
@@ -144,7 +144,7 @@ class Doctrine_Internal_CommitOrderNode
      *
      * @param Doctrine_Internal_CommitOrderNode $node
      */
-    public function before(Doctrine_Internal_CommitOrderNode $node)
+    public function before(Doctrine_ORM_Internal_CommitOrderNode $node)
     {
         $this->_relatedNodes[] = $node;
     }