diff --git a/lib/Doctrine/ORM/Configuration.php b/lib/Doctrine/ORM/Configuration.php
index 3f37f479f..67dcc5ba7 100644
--- a/lib/Doctrine/ORM/Configuration.php
+++ b/lib/Doctrine/ORM/Configuration.php
@@ -638,7 +638,7 @@ class Configuration extends \Doctrine\DBAL\Configuration
      */
     public function setQuoteStrategyClassName($className)
     {
-        $quoteStrategy = 'Doctrine\ORM\Mapping\AbstractQuoteStrategy';
+        $quoteStrategy = 'Doctrine\ORM\Mapping\QuoteStrategy';
 
         if ($className !== $quoteStrategy && ! is_subclass_of($className, $quoteStrategy)) {
             throw new \InvalidArgumentException("Invalid quote strategy class");
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
index 8434e49b2..d93d86214 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -2646,6 +2646,8 @@ class ClassMetadataInfo implements ClassMetadata
     /**
      * Gets the (possibly quoted) identifier column names for safe use in an SQL statement.
      *
+     * @deprecated Deprecated since version 2.3 in favor of \Doctrine\ORM\Mapping\QuoteStrategy
+     *
      * @param AbstractPlatform $platform
      * @return array
      */
@@ -2680,8 +2682,9 @@ class ClassMetadataInfo implements ClassMetadata
     }
 
     /**
-     * Gets the (possibly quoted) column name of a mapped field for safe use
-     * in an SQL statement.
+     * Gets the (possibly quoted) column name of a mapped field for safe use  in an SQL statement.
+     * 
+     * @deprecated Deprecated since version 2.3 in favor of \Doctrine\ORM\Mapping\QuoteStrategy
      *
      * @param string $field
      * @param AbstractPlatform $platform
@@ -2695,8 +2698,9 @@ class ClassMetadataInfo implements ClassMetadata
     }
 
     /**
-     * Gets the (possibly quoted) primary table name of this class for safe use
-     * in an SQL statement.
+     * Gets the (possibly quoted) primary table name of this class for safe use in an SQL statement.
+     *
+     * @deprecated Deprecated since version 2.3 in favor of \Doctrine\ORM\Mapping\QuoteStrategy
      *
      * @param AbstractPlatform $platform
      * @return string
@@ -2709,6 +2713,8 @@ class ClassMetadataInfo implements ClassMetadata
     /**
      * Gets the (possibly quoted) name of the join table.
      *
+     * @deprecated Deprecated since version 2.3 in favor of \Doctrine\ORM\Mapping\QuoteStrategy
+     *
      * @param AbstractPlatform $platform
      * @return string
      */