diff --git a/src/Symfony/Bundle/DebugBundle/DependencyInjection/Compiler/DumpDataCollectorPass.php b/src/Symfony/Bundle/DebugBundle/DependencyInjection/Compiler/DumpDataCollectorPass.php
index 6491f57b89..7562e7d44b 100644
--- a/src/Symfony/Bundle/DebugBundle/DependencyInjection/Compiler/DumpDataCollectorPass.php
+++ b/src/Symfony/Bundle/DebugBundle/DependencyInjection/Compiler/DumpDataCollectorPass.php
@@ -15,7 +15,7 @@ use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
- * Registers the file link format for the {@link DumpDataCollector}.
+ * Registers the file link format for the {@link \Symfony\Component\HttpKernel\DataCollector\DumpDataCollector\DumpDataCollector}.
  *
  * @author Christian Flothmann <christian.flothmann@xabbuh.de>
  */
diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
index 752a3d066f..ddfb3400cb 100644
--- a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
+++ b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
@@ -18,7 +18,7 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\DataCollector\DataCollector;
 
 /**
- * Data collector for {@link \Symfony\Component\Form\FormInterface} instances.
+ * Data collector for {@link FormInterface} instances.
  *
  * @since  2.4
  * @author Robert Schönthal <robert.schoenthal@gmail.com>
diff --git a/src/Symfony/Component/OptionsResolver/Exception/AccessException.php b/src/Symfony/Component/OptionsResolver/Exception/AccessException.php
index 6a28b0ae64..c12b680645 100644
--- a/src/Symfony/Component/OptionsResolver/Exception/AccessException.php
+++ b/src/Symfony/Component/OptionsResolver/Exception/AccessException.php
@@ -13,7 +13,7 @@ namespace Symfony\Component\OptionsResolver\Exception;
 
 /**
  * Thrown when trying to read an option outside of or write it inside of
- * {@link Options::resolve()}.
+ * {@link \Symfony\Component\OptionsResolver\Options::resolve()}.
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
diff --git a/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php b/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
index b6ef076bd8..208dfceeb6 100644
--- a/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
+++ b/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
@@ -14,6 +14,8 @@ namespace Symfony\Component\Validator\Mapping\Factory;
 use Symfony\Component\Validator\Exception\NoSuchMetadataException;
 use Symfony\Component\Validator\Mapping\Cache\CacheInterface;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
+use Symfony\Component\Validator\Mapping\ClassMetadataInterface;
+use Symfony\Component\Validator\Mapping\Loader\LoaderChain;
 use Symfony\Component\Validator\Mapping\Loader\LoaderInterface;
 
 /**
@@ -28,7 +30,7 @@ use Symfony\Component\Validator\Mapping\Loader\LoaderInterface;
  * Whenever a new metadata instance is created, it is passed to the loader,
  * which can configure the metadata based on configuration loaded from the
  * filesystem or a database. If you want to use multiple loaders, wrap them in a
- * {@link Loader\LoaderChain}.
+ * {@link LoaderChain}.
  *
  * You can also optionally pass a {@link CacheInterface} instance to the
  * constructor. This cache will be used for persisting the generated metadata
diff --git a/src/Symfony/Component/Validator/Mapping/Factory/MetadataFactoryInterface.php b/src/Symfony/Component/Validator/Mapping/Factory/MetadataFactoryInterface.php
index ef25174d0e..58736e2511 100644
--- a/src/Symfony/Component/Validator/Mapping/Factory/MetadataFactoryInterface.php
+++ b/src/Symfony/Component/Validator/Mapping/Factory/MetadataFactoryInterface.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\Validator\Mapping\Factory;
 use Symfony\Component\Validator\MetadataFactoryInterface as LegacyMetadataFactoryInterface;
 
 /**
- * Returns {@link MetadataInterface} instances for values.
+ * Returns {@link \Symfony\Component\Validator\Mapping\MetadataInterface} instances for values.
  *
  * @since  2.5
  * @author Bernhard Schussek <bschussek@gmail.com>
diff --git a/src/Symfony/Component/Validator/ValidatorInterface.php b/src/Symfony/Component/Validator/ValidatorInterface.php
index 03c8921bb2..1f79052b61 100644
--- a/src/Symfony/Component/Validator/ValidatorInterface.php
+++ b/src/Symfony/Component/Validator/ValidatorInterface.php
@@ -19,7 +19,7 @@ namespace Symfony\Component\Validator;
  * @api
  *
  * @deprecated Deprecated since version 2.5, to be removed in Symfony 3.0.
- *             Use {@link Validator\ValidatorInterface} instead.
+ *             Use {@link \Symfony\Component\Validator\ValidatorInterface} instead.
  */
 interface ValidatorInterface
 {