diff --git a/lib/Doctrine/ORM/Configuration.php b/lib/Doctrine/ORM/Configuration.php
index eaa4df562..7a7b1792d 100644
--- a/lib/Doctrine/ORM/Configuration.php
+++ b/lib/Doctrine/ORM/Configuration.php
@@ -501,7 +501,7 @@ class Configuration extends \Doctrine\DBAL\Configuration
      * 
      * @since 2.2
      * @param string $className
-     * @throws ORMException If not is a Doctrine\ORM\EntityRepository
+     * @throws ORMException If not is a \Doctrine\ORM\EntityRepository
      */
     public function setDefaultRepositoryClassName($className)
     {
diff --git a/lib/Doctrine/ORM/Event/EntityEventDelegator.php b/lib/Doctrine/ORM/Event/EntityEventDelegator.php
index 09532bc4b..247c08239 100644
--- a/lib/Doctrine/ORM/Event/EntityEventDelegator.php
+++ b/lib/Doctrine/ORM/Event/EntityEventDelegator.php
@@ -80,7 +80,7 @@ class EntityEventDelegator implements EventSubscriber
      * Adds an EventSubscriber. The subscriber is asked for all the events he is
      * interested in and added as a listener for these events.
      *
-     * @param Doctrine\Common\EventSubscriber $subscriber The subscriber.
+     * @param \Doctrine\Common\EventSubscriber $subscriber The subscriber.
      * @param array $entities
      */
     public function addEventSubscriber(EventSubscriber $subscriber, $entities)
diff --git a/lib/Doctrine/ORM/Event/LifecycleEventArgs.php b/lib/Doctrine/ORM/Event/LifecycleEventArgs.php
index 0c91d8475..320b03572 100644
--- a/lib/Doctrine/ORM/Event/LifecycleEventArgs.php
+++ b/lib/Doctrine/ORM/Event/LifecycleEventArgs.php
@@ -34,7 +34,7 @@ use Doctrine\ORM\EntityManager;
 class LifecycleEventArgs extends EventArgs
 {
     /**
-     * @var Doctrine\ORM\EntityManager
+     * @var \Doctrine\ORM\EntityManager
      */
     private $em;
 
@@ -47,7 +47,7 @@ class LifecycleEventArgs extends EventArgs
      * Constructor
      * 
      * @param object $entity
-     * @param Doctrine\ORM\EntityManager $em 
+     * @param \Doctrine\ORM\EntityManager $em
      */
     public function __construct($entity, EntityManager $em)
     {
@@ -68,7 +68,7 @@ class LifecycleEventArgs extends EventArgs
     /**
      * Retrieve associated EntityManager.
      * 
-     * @return Doctrine\ORM\EntityManager
+     * @return \Doctrine\ORM\EntityManager
      */
     public function getEntityManager()
     {
diff --git a/lib/Doctrine/ORM/Event/LoadClassMetadataEventArgs.php b/lib/Doctrine/ORM/Event/LoadClassMetadataEventArgs.php
index a87f45cc3..2cd25933b 100644
--- a/lib/Doctrine/ORM/Event/LoadClassMetadataEventArgs.php
+++ b/lib/Doctrine/ORM/Event/LoadClassMetadataEventArgs.php
@@ -32,20 +32,20 @@ use Doctrine\ORM\EntityManager;
 class LoadClassMetadataEventArgs extends EventArgs
 {
     /**
-     * @var Doctrine\ORM\Mapping\ClassMetadata
+     * @var \Doctrine\ORM\Mapping\ClassMetadata
      */
     private $classMetadata;
 
     /**
-     * @var Doctrine\ORM\EntityManager
+     * @var \Doctrine\ORM\EntityManager
      */
     private $em;
 
     /**
      * Constructor.
      * 
-     * @param Doctrine\ORM\Mapping\ClassMetadataInfo $classMetadata
-     * @param Doctrine\ORM\EntityManager $em
+     * @param \Doctrine\ORM\Mapping\ClassMetadataInfo $classMetadata
+     * @param \Doctrine\ORM\EntityManager $em
      */
     public function __construct(ClassMetadataInfo $classMetadata, EntityManager $em)
     {
@@ -56,7 +56,7 @@ class LoadClassMetadataEventArgs extends EventArgs
     /**
      * Retrieve associated ClassMetadata.
      *  
-     * @return Doctrine\ORM\Mapping\ClassMetadataInfo
+     * @return \Doctrine\ORM\Mapping\ClassMetadataInfo
      */
     public function getClassMetadata()
     {
@@ -66,7 +66,7 @@ class LoadClassMetadataEventArgs extends EventArgs
     /**
      * Retrieve associated EntityManager.
      * 
-     * @return Doctrine\ORM\EntityManager
+     * @return \Doctrine\ORM\EntityManager
      */
     public function getEntityManager()
     {
diff --git a/lib/Doctrine/ORM/Event/OnClearEventArgs.php b/lib/Doctrine/ORM/Event/OnClearEventArgs.php
index 49b5e8695..07f5c4711 100644
--- a/lib/Doctrine/ORM/Event/OnClearEventArgs.php
+++ b/lib/Doctrine/ORM/Event/OnClearEventArgs.php
@@ -31,7 +31,7 @@ namespace Doctrine\ORM\Event;
 class OnClearEventArgs extends \Doctrine\Common\EventArgs
 {
     /**
-     * @var Doctrine\ORM\EntityManager
+     * @var \Doctrine\ORM\EntityManager
      */
     private $em;
 
@@ -43,7 +43,7 @@ class OnClearEventArgs extends \Doctrine\Common\EventArgs
     /**
      * Constructor.
      * 
-     * @param Doctrine\ORM\EntityManager $em
+     * @param \Doctrine\ORM\EntityManager $em
      * @param string $entityClass Optional entity class
      */
     public function __construct($em, $entityClass = null)
@@ -55,7 +55,7 @@ class OnClearEventArgs extends \Doctrine\Common\EventArgs
     /**
      * Retrieve associated EntityManager.
      * 
-     * @return Doctrine\ORM\EntityManager
+     * @return \Doctrine\ORM\EntityManager
      */
     public function getEntityManager()
     {
diff --git a/lib/Doctrine/ORM/Event/OnFlushEventArgs.php b/lib/Doctrine/ORM/Event/OnFlushEventArgs.php
index 5e6e839fe..fd8545b21 100644
--- a/lib/Doctrine/ORM/Event/OnFlushEventArgs.php
+++ b/lib/Doctrine/ORM/Event/OnFlushEventArgs.php
@@ -45,7 +45,7 @@ class OnFlushEventArgs extends \Doctrine\Common\EventArgs
     /**
      * Constructor.
      * 
-     * @param Doctrine\ORM\EntityManager $em 
+     * @param \Doctrine\ORM\EntityManager $em
      */
     public function __construct(EntityManager $em)
     {
@@ -55,7 +55,7 @@ class OnFlushEventArgs extends \Doctrine\Common\EventArgs
     /**
      * Retrieve associated EntityManager.
      * 
-     * @return Doctrine\ORM\EntityManager
+     * @return \Doctrine\ORM\EntityManager
      */
     public function getEntityManager()
     {
diff --git a/lib/Doctrine/ORM/Event/PostFlushEventArgs.php b/lib/Doctrine/ORM/Event/PostFlushEventArgs.php
index f500ad92f..e10d600df 100644
--- a/lib/Doctrine/ORM/Event/PostFlushEventArgs.php
+++ b/lib/Doctrine/ORM/Event/PostFlushEventArgs.php
@@ -35,14 +35,14 @@ use Doctrine\Common\EventArgs;
 class PostFlushEventArgs extends EventArgs
 {
     /**
-     * @var Doctrine\ORM\EntityManager
+     * @var \Doctrine\ORM\EntityManager
      */
     private $em;
 
     /**
      * Constructor.
      * 
-     * @param Doctrine\ORM\EntityManager $em
+     * @param \Doctrine\ORM\EntityManager $em
      */
     public function __construct(EntityManager $em)
     {
@@ -52,7 +52,7 @@ class PostFlushEventArgs extends EventArgs
     /**
      * Retrieve associated EntityManager.
      * 
-     * @return Doctrine\ORM\EntityManager
+     * @return \Doctrine\ORM\EntityManager
      */
     public function getEntityManager()
     {
diff --git a/lib/Doctrine/ORM/Event/PreUpdateEventArgs.php b/lib/Doctrine/ORM/Event/PreUpdateEventArgs.php
index 35539591a..4d7e3ef38 100644
--- a/lib/Doctrine/ORM/Event/PreUpdateEventArgs.php
+++ b/lib/Doctrine/ORM/Event/PreUpdateEventArgs.php
@@ -43,7 +43,7 @@ class PreUpdateEventArgs extends LifecycleEventArgs
      * Constructor.
      * 
      * @param object $entity
-     * @param Doctrine\ORM\EntityManager $em
+     * @param \Doctrine\ORM\EntityManager $em
      * @param array $changeSet
      */
     public function __construct($entity, EntityManager $em, array &$changeSet)
diff --git a/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
index fdb52953c..0a6ab8657 100644
--- a/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
+++ b/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
@@ -344,7 +344,7 @@ abstract class AbstractHydrator
     /**
      * Register entity as managed in UnitOfWork.
      *
-     * @param Doctrine\ORM\Mapping\ClassMetadata $class
+     * @param \Doctrine\ORM\Mapping\ClassMetadata $class
      * @param object $entity
      * @param array $data
      *
diff --git a/lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php
index f2869baa2..20c2b5785 100644
--- a/lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php
+++ b/lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php
@@ -276,7 +276,7 @@ class ArrayHydrator extends AbstractHydrator
      *
      * @param string $className
      *
-     * @return Doctrine\ORM\Mapping\ClassMetadata
+     * @return \Doctrine\ORM\Mapping\ClassMetadata
      */
     private function getClassMetadata($className)
     {
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
index 9fdd1eb06..82ff14531 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -437,8 +437,8 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
      * Adds inherited named queries to the subclass mapping.
      * 
      * @since 2.2
-     * @param Doctrine\ORM\Mapping\ClassMetadata $subClass
-     * @param Doctrine\ORM\Mapping\ClassMetadata $parentClass
+     * @param \Doctrine\ORM\Mapping\ClassMetadata $subClass
+     * @param \Doctrine\ORM\Mapping\ClassMetadata $parentClass
      */
     private function addInheritedNamedQueries(ClassMetadata $subClass, ClassMetadata $parentClass)
     {
diff --git a/lib/Doctrine/ORM/Mapping/JoinColumns.php b/lib/Doctrine/ORM/Mapping/JoinColumns.php
index 7cf663bc7..525105fab 100644
--- a/lib/Doctrine/ORM/Mapping/JoinColumns.php
+++ b/lib/Doctrine/ORM/Mapping/JoinColumns.php
@@ -25,6 +25,6 @@ namespace Doctrine\ORM\Mapping;
  */
 final class JoinColumns implements Annotation
 {
-    /** @var array<Doctrine\ORM\Mapping\JoinColumn> */
+    /** @var array<\Doctrine\ORM\Mapping\JoinColumn> */
     public $value;
 }
diff --git a/lib/Doctrine/ORM/Mapping/JoinTable.php b/lib/Doctrine/ORM/Mapping/JoinTable.php
index 75f8e271b..9ff9d4511 100644
--- a/lib/Doctrine/ORM/Mapping/JoinTable.php
+++ b/lib/Doctrine/ORM/Mapping/JoinTable.php
@@ -29,8 +29,8 @@ final class JoinTable implements Annotation
     public $name;
     /** @var string */
     public $schema;
-    /** @var array<Doctrine\ORM\Mapping\JoinColumn> */
+    /** @var array<\Doctrine\ORM\Mapping\JoinColumn> */
     public $joinColumns = array();
-    /** @var array<Doctrine\ORM\Mapping\JoinColumn> */
+    /** @var array<\Doctrine\ORM\Mapping\JoinColumn> */
     public $inverseJoinColumns = array();
 }
diff --git a/lib/Doctrine/ORM/Mapping/NamedQueries.php b/lib/Doctrine/ORM/Mapping/NamedQueries.php
index 04e0ebfaa..1ab2bf233 100644
--- a/lib/Doctrine/ORM/Mapping/NamedQueries.php
+++ b/lib/Doctrine/ORM/Mapping/NamedQueries.php
@@ -25,6 +25,6 @@ namespace Doctrine\ORM\Mapping;
  */
 final class NamedQueries implements Annotation
 {
-    /** @var array<Doctrine\ORM\Mapping\NamedQuery> */
+    /** @var array<\Doctrine\ORM\Mapping\NamedQuery> */
     public $value;
 }
diff --git a/lib/Doctrine/ORM/Mapping/Table.php b/lib/Doctrine/ORM/Mapping/Table.php
index a68e3673b..41db294de 100644
--- a/lib/Doctrine/ORM/Mapping/Table.php
+++ b/lib/Doctrine/ORM/Mapping/Table.php
@@ -29,8 +29,8 @@ final class Table implements Annotation
     public $name;
     /** @var string */
     public $schema;
-    /** @var array<Doctrine\ORM\Mapping\Index> */
+    /** @var array<\Doctrine\ORM\Mapping\Index> */
     public $indexes;
-    /** @var array<Doctrine\ORM\Mapping\UniqueConstraint> */
+    /** @var array<\Doctrine\ORM\Mapping\UniqueConstraint> */
     public $uniqueConstraints;
 }
diff --git a/lib/Doctrine/ORM/PersistentCollection.php b/lib/Doctrine/ORM/PersistentCollection.php
index bca07fdf0..66dca2bbd 100644
--- a/lib/Doctrine/ORM/PersistentCollection.php
+++ b/lib/Doctrine/ORM/PersistentCollection.php
@@ -728,7 +728,7 @@ final class PersistentCollection implements Collection
     /**
      * Retrieves the wrapped Collection instance.
      *
-     * @return Doctrine\Common\Collections\Collection
+     * @return \Doctrine\Common\Collections\Collection
      */
     public function unwrap()
     {
diff --git a/lib/Doctrine/ORM/Persisters/ManyToManyPersister.php b/lib/Doctrine/ORM/Persisters/ManyToManyPersister.php
index e94cb3443..bd147343f 100644
--- a/lib/Doctrine/ORM/Persisters/ManyToManyPersister.php
+++ b/lib/Doctrine/ORM/Persisters/ManyToManyPersister.php
@@ -279,7 +279,7 @@ class ManyToManyPersister extends AbstractCollectionPersister
     }
     
     /**
-     * @param Doctrine\ORM\PersistentCollection $coll
+     * @param \Doctrine\ORM\PersistentCollection $coll
      * @param object $element
      * @return array
      */
diff --git a/lib/Doctrine/ORM/Query/Expr.php b/lib/Doctrine/ORM/Query/Expr.php
index 6ba6a5d73..dce4c6044 100644
--- a/lib/Doctrine/ORM/Query/Expr.php
+++ b/lib/Doctrine/ORM/Query/Expr.php
@@ -42,9 +42,9 @@ class Expr
      *     // (u.type = ?1) AND (u.role = ?2)
      *     $expr->andX($expr->eq('u.type', ':1'), $expr->eq('u.role', ':2'));
      *
-     * @param Doctrine\ORM\Query\Expr\Comparison | 
-     *          Doctrine\ORM\Query\Expr\Func |
-     *          Doctrine\ORM\Query\Expr\Orx 
+     * @param \Doctrine\ORM\Query\Expr\Comparison |
+     *          \Doctrine\ORM\Query\Expr\Func |
+     *          \Doctrine\ORM\Query\Expr\Orx
     *               $x Optional clause. Defaults = null, but requires at least one defined when converting to string.
      * @return Expr\Andx
      */
diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php
index e46f85b6c..4c1bd50e1 100644
--- a/lib/Doctrine/ORM/Query/Parser.php
+++ b/lib/Doctrine/ORM/Query/Parser.php
@@ -1781,7 +1781,7 @@ class Parser
     /**
      * GeneralCaseExpression ::= "CASE" WhenClause {WhenClause}* "ELSE" ScalarExpression "END"
      *
-     * @return Doctrine\ORM\Query\AST\GeneralExpression
+     * @return \Doctrine\ORM\Query\AST\GeneralExpression
      */
     public function GeneralCaseExpression()
     {
@@ -1827,7 +1827,7 @@ class Parser
     /**
      * WhenClause ::= "WHEN" ConditionalExpression "THEN" ScalarExpression
      *
-     * @return Doctrine\ORM\Query\AST\WhenExpression
+     * @return \Doctrine\ORM\Query\AST\WhenExpression
      */
     public function WhenClause()
     {
@@ -1841,7 +1841,7 @@ class Parser
     /**
      * SimpleWhenClause ::= "WHEN" ScalarExpression "THEN" ScalarExpression
      *
-     * @return Doctrine\ORM\Query\AST\SimpleWhenExpression
+     * @return \Doctrine\ORM\Query\AST\SimpleWhenExpression
      */
     public function SimpleWhenClause()
     {