diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerAwareCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerAwareCommand.php
index 3712ccb7c80e..de617c27df33 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerAwareCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerAwareCommand.php
@@ -28,10 +28,13 @@
 abstract class ContainerAwareCommand extends Command implements ContainerAwareInterface
 {
     /**
-     * @var ContainerInterface
+     * @var \Symfony\Component\DependencyInjection\ContainerInterface
      */
     private $container;
 
+    /**
+     * @return \Symfony\Component\DependencyInjection\ContainerInterface
+     */
     protected function getContainer()
     {
         if (null === $this->container) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
index f9e27d25b28c..6bbb7481e41b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
@@ -51,7 +51,7 @@ public function generateUrl($route, $parameters = array(), $absolute = false)
      * @param  array   $path       An array of path parameters
      * @param  array   $query      An array of query parameters
      *
-     * @return Response A Response instance
+     * @return \Symfony\Component\HttpFoundation\Response A Response instance
      */
     public function forward($controller, array $path = array(), array $query = array())
     {
@@ -64,7 +64,7 @@ public function forward($controller, array $path = array(), array $query = array
      * @param string  $url The URL to redirect to
      * @param integer $status The status code to use for the Response
      *
-     * @return RedirectResponse
+     * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
     public function redirect($url, $status = 302)
     {
@@ -89,9 +89,9 @@ public function renderView($view, array $parameters = array())
      *
      * @param string   $view The view name
      * @param array    $parameters An array of parameters to pass to the view
-     * @param Response $response A response instance
+     * @param \Symfony\Component\HttpFoundation\Response $response A response instance
      *
-     * @return Response A Response instance
+     * @return \Symfony\Component\HttpFoundation\Response A Response instance
      */
     public function render($view, array $parameters = array(), Response $response = null)
     {
@@ -105,6 +105,8 @@ public function render($view, array $parameters = array(), Response $response =
      *
      *     throw $this->createNotFoundException('Page not found!');
      *
+     * @param string $message
+     * @param \Exception|null $previous
      * @return NotFoundHttpException
      */
     public function createNotFoundException($message = 'Not Found', \Exception $previous = null)
@@ -119,7 +121,7 @@ public function createNotFoundException($message = 'Not Found', \Exception $prev
      * @param mixed $data                       The initial data for the form
      * @param array $options                    Options for the form
      *
-     * @return Form
+     * @return \Symfony\Component\Form\Form
      */
     public function createForm($type, $data = null, array $options = array())
     {
@@ -132,7 +134,7 @@ public function createForm($type, $data = null, array $options = array())
      * @param mixed $data               The initial data for the form
      * @param array $options            Options for the form
      *
-     * @return FormBuilder
+     * @return \Symfony\Component\Form\FormBuilder
      */
     public function createFormBuilder($data = null, array $options = array())
     {
@@ -142,7 +144,7 @@ public function createFormBuilder($data = null, array $options = array())
     /**
      * Shortcut to return the request service.
      *
-     * @return Request
+     * @return \Symfony\Component\HttpFoundation\Request
      */
     public function getRequest()
     {
@@ -152,7 +154,7 @@ public function getRequest()
     /**
      * Shortcut to return the Doctrine Registry service.
      *
-     * @return Registry
+     * @return \Symfony\Bundle\DoctrineBundle\Registry
      *
      * @throws \LogicException If DoctrineBundle is not available
      */
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
index 2d073351906a..db702ab944df 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
@@ -32,7 +32,7 @@ abstract class WebTestCase extends \PHPUnit_Framework_TestCase
      * @param array   $options An array of options to pass to the createKernel class
      * @param array   $server  An array of server parameters
      *
-     * @return Client A Client instance
+     * @return \Symfony\Bundle\FrameworkBundle\Client A Client instance
      */
     static protected function createClient(array $options = array(), array $server = array())
     {
diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
index 6ad9165ff124..a67077726e8e 100644
--- a/src/Symfony/Component/Console/Command/Command.php
+++ b/src/Symfony/Component/Console/Command/Command.php
@@ -107,7 +107,7 @@ public function getHelperSet()
     /**
      * Gets the application instance for this command.
      *
-     * @return Application An Application instance
+     * @return \Symfony\Component\Console\Application An Application instance
      *
      * @api
      */
diff --git a/src/Symfony/Component/HttpKernel/Event/KernelEvent.php b/src/Symfony/Component/HttpKernel/Event/KernelEvent.php
index 4dcfd11819ed..a948eec460a0 100644
--- a/src/Symfony/Component/HttpKernel/Event/KernelEvent.php
+++ b/src/Symfony/Component/HttpKernel/Event/KernelEvent.php
@@ -65,7 +65,7 @@ public function getKernel()
     /**
      * Returns the request the kernel is currently processing
      *
-     * @return Symfony\Component\HttpFoundation\Request
+     * @return \Symfony\Component\HttpFoundation\Request
      *
      * @api
      */
diff --git a/src/Symfony/Component/Routing/Router.php b/src/Symfony/Component/Routing/Router.php
index a1e0c89c4a90..15257b606793 100644
--- a/src/Symfony/Component/Routing/Router.php
+++ b/src/Symfony/Component/Routing/Router.php
@@ -198,7 +198,7 @@ public function match($url)
     /**
      * Gets the UrlMatcher instance associated with this Router.
      *
-     * @return UrlMatcherInterface A UrlMatcherInterface instance
+     * @return \Symfony\Component\Routing\Matcher\UrlMatcherInterface A UrlMatcherInterface instance
      */
     public function getMatcher()
     {
diff --git a/src/Symfony/Component/Security/Acl/Model/AclProviderInterface.php b/src/Symfony/Component/Security/Acl/Model/AclProviderInterface.php
index 12f55e0a7081..ab2c431da1be 100644
--- a/src/Symfony/Component/Security/Acl/Model/AclProviderInterface.php
+++ b/src/Symfony/Component/Security/Acl/Model/AclProviderInterface.php
@@ -33,7 +33,7 @@ function findChildren(ObjectIdentityInterface $parentOid, $directChildrenOnly =
      * @throws AclNotFoundException when there is no ACL
      * @param ObjectIdentityInterface $oid
      * @param array $sids
-     * @return AclInterface
+     * @return \Symfony\Component\Security\Acl\Model\AclInterface
      */
     function findAcl(ObjectIdentityInterface $oid, array $sids = array());
 
diff --git a/src/Symfony/Component/Security/Acl/Model/EntryInterface.php b/src/Symfony/Component/Security/Acl/Model/EntryInterface.php
index 6fe0dc8a11e0..0a3811a2e3fe 100644
--- a/src/Symfony/Component/Security/Acl/Model/EntryInterface.php
+++ b/src/Symfony/Component/Security/Acl/Model/EntryInterface.php
@@ -24,7 +24,7 @@ interface EntryInterface extends \Serializable
     /**
      * The ACL this ACE is associated with.
      *
-     * @return AclInterface
+     * @return \Symfony\Component\Security\Acl\Model\AclInterface
      */
     function getAcl();
 
@@ -45,7 +45,7 @@ function getMask();
     /**
      * The security identity associated with this ACE
      *
-     * @return SecurityIdentityInterface
+     * @return \Symfony\Component\Security\Acl\Model\SecurityIdentityInterface
      */
     function getSecurityIdentity();
 
diff --git a/src/Symfony/Component/Security/Acl/Model/MutableAclProviderInterface.php b/src/Symfony/Component/Security/Acl/Model/MutableAclProviderInterface.php
index c04eb312c0d3..9d3e5e52ec3b 100644
--- a/src/Symfony/Component/Security/Acl/Model/MutableAclProviderInterface.php
+++ b/src/Symfony/Component/Security/Acl/Model/MutableAclProviderInterface.php
@@ -23,8 +23,8 @@ interface MutableAclProviderInterface extends AclProviderInterface
      *
      * @throws AclAlreadyExistsException when there already is an ACL for the given
      *                                   object identity
-     * @param ObjectIdentityInterface $oid
-     * @return AclInterface
+     * @param \Symfony\Component\Security\Acl\Model\ObjectIdentityInterface $oid
+     * @return \Symfony\Component\Security\Acl\Model\AclInterface
      */
     function createAcl(ObjectIdentityInterface $oid);