diff --git a/lib/Doctrine/Common/DataFixtures/Sorter/TopologicalSorter.php b/lib/Doctrine/Common/DataFixtures/Sorter/TopologicalSorter.php
index 947235e8..c8644b53 100644
--- a/lib/Doctrine/Common/DataFixtures/Sorter/TopologicalSorter.php
+++ b/lib/Doctrine/Common/DataFixtures/Sorter/TopologicalSorter.php
@@ -20,7 +20,7 @@
 namespace Doctrine\Common\DataFixtures\Sorter;
 
 use Doctrine\Common\DataFixtures\Exception\CircularReferenceException;
-use Doctrine\ORM\Mapping\ClassMetadataInfo;
+use Doctrine\ORM\Mapping\ClassMetadata;
 
 /**
  * TopologicalSorter is an ordering algorithm for directed graphs (DG) and/or
@@ -56,11 +56,11 @@ class TopologicalSorter
      * Adds a new node (vertex) to the graph, assigning its hash and value.
      *
      * @param string        $hash
-     * @param ClassMetadataInfo $node
+     * @param ClassMetadata $node
      *
      * @return void
      */
-    public function addNode($hash, ClassMetadataInfo $node)
+    public function addNode($hash, ClassMetadata $node)
     {
         $this->nodeList[$hash] = new Vertex($node);
     }
diff --git a/lib/Doctrine/Common/DataFixtures/Sorter/Vertex.php b/lib/Doctrine/Common/DataFixtures/Sorter/Vertex.php
index 34340771..0316d1d3 100644
--- a/lib/Doctrine/Common/DataFixtures/Sorter/Vertex.php
+++ b/lib/Doctrine/Common/DataFixtures/Sorter/Vertex.php
@@ -19,7 +19,7 @@
 
 namespace Doctrine\Common\DataFixtures\Sorter;
 
-use Doctrine\ORM\Mapping\ClassMetadataInfo;
+use Doctrine\ORM\Mapping\ClassMetadata;
 
 /**
  * @author Marco Pivetta <ocramius@gmail.com>
@@ -41,7 +41,7 @@ class Vertex
     public $state = self::NOT_VISITED;
 
     /**
-     * @var ClassMetadataInfo Actual node value
+     * @var ClassMetadata Actual node value
      */
     public $value;
 
@@ -51,9 +51,9 @@ class Vertex
     public $dependencyList = [];
 
     /**
-     * @param ClassMetadataInfo $value
+     * @param ClassMetadata $value
      */
-    public function __construct(ClassMetadataInfo $value)
+    public function __construct(ClassMetadata $value)
     {
         $this->value = $value;
     }
diff --git a/tests/Doctrine/Tests/Common/DataFixtures/Sorter/TopologicalSorterTest.php b/tests/Doctrine/Tests/Common/DataFixtures/Sorter/TopologicalSorterTest.php
index 6a8441c1..8e744650 100644
--- a/tests/Doctrine/Tests/Common/DataFixtures/Sorter/TopologicalSorterTest.php
+++ b/tests/Doctrine/Tests/Common/DataFixtures/Sorter/TopologicalSorterTest.php
@@ -22,7 +22,7 @@
 
 use Doctrine\Common\DataFixtures\Exception\CircularReferenceException;
 use Doctrine\Common\DataFixtures\Sorter\TopologicalSorter;
-use Doctrine\ORM\Mapping\ClassMetadataInfo;
+use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\Tests\Mock;
 
 /**
@@ -53,11 +53,11 @@ public function setUp()
 
     public function testSuccessSortLinearDependency()
     {
-        $node1 = new ClassMetadataInfo(1);
-        $node2 = new ClassMetadataInfo(2);
-        $node3 = new ClassMetadataInfo(3);
-        $node4 = new ClassMetadataInfo(4);
-        $node5 = new ClassMetadataInfo(5);
+        $node1 = new ClassMetadata(1);
+        $node2 = new ClassMetadata(2);
+        $node3 = new ClassMetadata(3);
+        $node4 = new ClassMetadata(4);
+        $node5 = new ClassMetadata(5);
 
         $this->sorter->addNode('1', $node1);
         $this->sorter->addNode('2', $node2);
@@ -78,11 +78,11 @@ public function testSuccessSortLinearDependency()
 
     public function testSuccessSortMultiDependency()
     {
-        $node1 = new ClassMetadataInfo(1);
-        $node2 = new ClassMetadataInfo(2);
-        $node3 = new ClassMetadataInfo(3);
-        $node4 = new ClassMetadataInfo(4);
-        $node5 = new ClassMetadataInfo(5);
+        $node1 = new ClassMetadata(1);
+        $node2 = new ClassMetadata(2);
+        $node3 = new ClassMetadata(3);
+        $node4 = new ClassMetadata(4);
+        $node5 = new ClassMetadata(5);
 
         $this->sorter->addNode('1', $node1);
         $this->sorter->addNode('2', $node2);
@@ -104,9 +104,9 @@ public function testSuccessSortMultiDependency()
 
     public function testFailureSortCyclicDependency()
     {
-        $node1 = new ClassMetadataInfo(1);
-        $node2 = new ClassMetadataInfo(2);
-        $node3 = new ClassMetadataInfo(3);
+        $node1 = new ClassMetadata(1);
+        $node2 = new ClassMetadata(2);
+        $node3 = new ClassMetadata(3);
 
         $this->sorter->addNode('1', $node1);
         $this->sorter->addNode('2', $node2);
@@ -123,11 +123,11 @@ public function testFailureSortCyclicDependency()
 
     public function testNoFailureOnSelfReferencingDependency()
     {
-        $node1 = new ClassMetadataInfo(1);
-        $node2 = new ClassMetadataInfo(2);
-        $node3 = new ClassMetadataInfo(3);
-        $node4 = new ClassMetadataInfo(4);
-        $node5 = new ClassMetadataInfo(5);
+        $node1 = new ClassMetadata(1);
+        $node2 = new ClassMetadata(2);
+        $node3 = new ClassMetadata(3);
+        $node4 = new ClassMetadata(4);
+        $node5 = new ClassMetadata(5);
 
         $this->sorter->addNode('1', $node1);
         $this->sorter->addNode('2', $node2);
@@ -149,7 +149,7 @@ public function testNoFailureOnSelfReferencingDependency()
 
     public function testFailureSortMissingDependency()
     {
-        $node1 = new ClassMetadataInfo(1);
+        $node1 = new ClassMetadata(1);
 
         $this->sorter->addNode('1', $node1);
 
diff --git a/tests/Doctrine/Tests/Common/DataFixtures/Sorter/VertexTest.php b/tests/Doctrine/Tests/Common/DataFixtures/Sorter/VertexTest.php
index 600a979e..de2e9f84 100644
--- a/tests/Doctrine/Tests/Common/DataFixtures/Sorter/VertexTest.php
+++ b/tests/Doctrine/Tests/Common/DataFixtures/Sorter/VertexTest.php
@@ -21,7 +21,7 @@
 namespace Doctrine\Test\DataFixtures\Sorter;
 
 use Doctrine\Common\DataFixtures\Sorter\Vertex;
-use Doctrine\ORM\Mapping\ClassMetadataInfo;
+use Doctrine\ORM\Mapping\ClassMetadata;
 
 /**
  * @author Marco Pivetta <ocramius@gmail.com>
@@ -32,7 +32,7 @@ class VertexTest extends \PHPUnit_Framework_TestCase
 {
     public function testNode()
     {
-        $value = new ClassMetadataInfo('\Sample\Entity');
+        $value = new ClassMetadata('\Sample\Entity');
         $node  = new Vertex($value);
 
         self::assertSame($value, $node->value);