diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
index bc9ae5074d08c..4e527eb05db12 100644
--- a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
+++ b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -176,7 +176,7 @@ private function extractFromMutator($class, $property)
             if (!$reflectionType = $reflectionParameter->getType()) {
                 return;
             }
-            $type = $this->extractFromReflectionType($reflectionType);
+            $type = $this->extractFromReflectionType($reflectionType, $reflectionMethod);
 
             // HHVM reports variadics with "array" but not builtin type hints
             if (!$reflectionType->isBuiltin() && Type::BUILTIN_TYPE_ARRAY === $type->getBuiltinType()) {
@@ -188,7 +188,7 @@ private function extractFromMutator($class, $property)
             } elseif (Type::BUILTIN_TYPE_CALLABLE === $info[1]) {
                 $type = new Type(Type::BUILTIN_TYPE_CALLABLE, $reflectionParameter->allowsNull());
             } else {
-                $type = new Type(Type::BUILTIN_TYPE_OBJECT, $reflectionParameter->allowsNull(), $info[1]);
+                $type = new Type(Type::BUILTIN_TYPE_OBJECT, $reflectionParameter->allowsNull(), $this->resolveTypeName($info[1], $reflectionMethod));
             }
         } else {
             return;
@@ -217,7 +217,7 @@ private function extractFromAccessor($class, $property)
         }
 
         if ($this->supportsParameterType && $reflectionType = $reflectionMethod->getReturnType()) {
-            return array($this->extractFromReflectionType($reflectionType));
+            return array($this->extractFromReflectionType($reflectionType, $reflectionMethod));
         }
 
         if (\in_array($prefix, array('is', 'can'))) {
@@ -228,11 +228,9 @@ private function extractFromAccessor($class, $property)
     /**
      * Extracts data from the PHP 7 reflection type.
      *
-     * @param \ReflectionType $reflectionType
-     *
      * @return Type
      */
-    private function extractFromReflectionType(\ReflectionType $reflectionType)
+    private function extractFromReflectionType(\ReflectionType $reflectionType, \ReflectionMethod $reflectionMethod)
     {
         $phpTypeOrClass = $reflectionType instanceof \ReflectionNamedType ? $reflectionType->getName() : $reflectionType->__toString();
         $nullable = $reflectionType->allowsNull();
@@ -244,12 +242,24 @@ private function extractFromReflectionType(\ReflectionType $reflectionType)
         } elseif ($reflectionType->isBuiltin()) {
             $type = new Type($phpTypeOrClass, $nullable);
         } else {
-            $type = new Type(Type::BUILTIN_TYPE_OBJECT, $nullable, $phpTypeOrClass);
+            $type = new Type(Type::BUILTIN_TYPE_OBJECT, $nullable, $this->resolveTypeName($phpTypeOrClass, $reflectionMethod));
         }
 
         return $type;
     }
 
+    private function resolveTypeName($name, \ReflectionMethod $reflectionMethod)
+    {
+        if ('self' === $lcName = strtolower($name)) {
+            return $reflectionMethod->getDeclaringClass()->name;
+        }
+        if ('parent' === $lcName && $parent = $reflectionMethod->getDeclaringClass()->getParentClass()) {
+            return $parent->name;
+        }
+
+        return $name;
+    }
+
     /**
      * Does the class have the given public property?
      *
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractors/PhpDocExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php
similarity index 99%
rename from src/Symfony/Component/PropertyInfo/Tests/Extractors/PhpDocExtractorTest.php
rename to src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php
index dab463f7e5105..647d4c1072e64 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/Extractors/PhpDocExtractorTest.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\PropertyInfo\Tests\PhpDocExtractors;
+namespace Symfony\Component\PropertyInfo\Tests\PhpDocExtractor;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor;
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractors/ReflectionExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
similarity index 93%
rename from src/Symfony/Component/PropertyInfo/Tests/Extractors/ReflectionExtractorTest.php
rename to src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
index 176e1511f8c22..f8c61dd48aa36 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/Extractors/ReflectionExtractorTest.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
@@ -52,6 +52,8 @@ public function testGetProperties()
                 'DOB',
                 'Id',
                 '123',
+                'self',
+                'realParent',
                 'c',
                 'd',
                 'e',
@@ -135,6 +137,8 @@ public function typesProvider()
             array('donotexist', null),
             array('staticGetter', null),
             array('staticSetter', null),
+            array('self', array(new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy'))),
+            array('realParent', array(new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Component\PropertyInfo\Tests\Fixtures\ParentDummy'))),
         );
     }
 
@@ -153,6 +157,8 @@ public function php7TypesProvider()
             array('foo', array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true))),
             array('bar', array(new Type(Type::BUILTIN_TYPE_INT))),
             array('baz', array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_STRING)))),
+            array('buz', array(new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Component\PropertyInfo\Tests\Fixtures\Php7Dummy'))),
+            array('biz', array(new Type(Type::BUILTIN_TYPE_OBJECT, false, 'stdClass'))),
             array('donotexist', null),
         );
     }
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractors/SerializerExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/SerializerExtractorTest.php
similarity index 95%
rename from src/Symfony/Component/PropertyInfo/Tests/Extractors/SerializerExtractorTest.php
rename to src/Symfony/Component/PropertyInfo/Tests/Extractor/SerializerExtractorTest.php
index b1be5ee11821e..91cdf80f8d608 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/Extractors/SerializerExtractorTest.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/Extractor/SerializerExtractorTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\PropertyInfo\Tests\Extractors;
+namespace Symfony\Component\PropertyInfo\Tests\Extractor;
 
 use Doctrine\Common\Annotations\AnnotationReader;
 use PHPUnit\Framework\TestCase;
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php
index 4e558eca014e5..5993d6e1d47e8 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php
@@ -127,4 +127,18 @@ public function getId()
     public function get123()
     {
     }
+
+    /**
+     * @param self $self
+     */
+    public function setSelf(self $self)
+    {
+    }
+
+    /**
+     * @param parent $realParent
+     */
+    public function setRealParent(parent $realParent)
+    {
+    }
 }
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php7Dummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php7Dummy.php
index cd5ba380d9d53..5dcb4c565e768 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php7Dummy.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php7Dummy.php
@@ -14,7 +14,7 @@
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
-class Php7Dummy
+class Php7Dummy extends \stdClass
 {
     public function getFoo(): array
     {
@@ -27,4 +27,12 @@ public function setBar(int $bar)
     public function addBaz(string $baz)
     {
     }
+
+    public function getBuz(): self
+    {
+    }
+
+    public function getBiz(): parent
+    {
+    }
 }