diff --git a/packages/NodeTypeResolver/src/PerNodeTypeResolver/PropertyFetchTypeResolver.php b/packages/NodeTypeResolver/src/PerNodeTypeResolver/PropertyFetchTypeResolver.php
index 31f5c2958b0..91756f27c6e 100644
--- a/packages/NodeTypeResolver/src/PerNodeTypeResolver/PropertyFetchTypeResolver.php
+++ b/packages/NodeTypeResolver/src/PerNodeTypeResolver/PropertyFetchTypeResolver.php
@@ -51,7 +51,7 @@ final class PropertyFetchTypeResolver implements PerNodeTypeResolverInterface, N
         }
 
         if ($propertyFetchNode->var->name !== 'this') {
-            return null;
+            return [];
         }
 
         $propertyName = $this->resolvePropertyName($propertyFetchNode);
diff --git a/src/NodeAnalyzer/PropertyFetchAnalyzer.php b/src/NodeAnalyzer/PropertyFetchAnalyzer.php
index 79fa13072b4..b3e11ad5c98 100644
--- a/src/NodeAnalyzer/PropertyFetchAnalyzer.php
+++ b/src/NodeAnalyzer/PropertyFetchAnalyzer.php
@@ -102,18 +102,20 @@ final class PropertyFetchAnalyzer
             return false;
         }
 
-        $variableNodeType = $node->var->getAttribute(Attribute::TYPES);
 
-        return in_array($variableNodeType, $types, true);
+        $variableNodeTypes = $node->var->getAttribute(Attribute::TYPES);
+
+        return (bool) array_intersect($variableNodeTypes, $types);
     }
 
     /**
      * @param string[] $types
+     * @return string[]
      */
-    public function matchTypes(Node $node, array $types): ?string
+    public function matchTypes(Node $node, array $types): array
     {
         if (! $this->isTypes($node, $types)) {
-            return null;
+            return [];
         }
 
         return $node->var->getAttribute(Attribute::TYPES);
diff --git a/src/Rector/Dynamic/PropertyNameReplacerRector.php b/src/Rector/Dynamic/PropertyNameReplacerRector.php
index c2b64871682..9aa54939064 100644
--- a/src/Rector/Dynamic/PropertyNameReplacerRector.php
+++ b/src/Rector/Dynamic/PropertyNameReplacerRector.php
@@ -16,12 +16,12 @@ final class PropertyNameReplacerRector extends AbstractRector
      *
      * @var string[][]
      */
-    private $oldToNewPropertyByClass = [];
+    private $perClassOldToNewProperties = [];
 
     /**
-     * @var string|null
+     * @var string[]
      */
-    private $activeType;
+    private $activeTypes = [];
 
     /**
      * @var PropertyFetchAnalyzer
@@ -31,19 +31,19 @@ final class PropertyNameReplacerRector extends AbstractRector
     /**
      * @param string[][]
      */
-    public function __construct(array $oldToNewPropertyByClass, PropertyFetchAnalyzer $propertyFetchAnalyzer)
+    public function __construct(array $perClassOldToNewProperties, PropertyFetchAnalyzer $propertyFetchAnalyzer)
     {
-        $this->oldToNewPropertyByClass = $oldToNewPropertyByClass;
+        $this->perClassOldToNewProperties = $perClassOldToNewProperties;
         $this->propertyFetchAnalyzer = $propertyFetchAnalyzer;
     }
 
     public function isCandidate(Node $node): bool
     {
-        $this->activeType = null;
+        $this->activeTypes = null;
 
-        $matchedType = $this->propertyFetchAnalyzer->matchTypes($node, $this->getClasses());
-        if ($matchedType) {
-            $this->activeType = $matchedType;
+        $matchedTypes = $this->propertyFetchAnalyzer->matchTypes($node, $this->getClasses());
+        if ($matchedTypes) {
+            $this->activeTypes = $matchedTypes;
 
             return true;
         }
@@ -56,7 +56,7 @@ final class PropertyNameReplacerRector extends AbstractRector
      */
     public function refactor(Node $propertyFetchNode): ?Node
     {
-        $oldToNewProperties = $this->oldToNewPropertyByClass[$this->activeType];
+        $oldToNewProperties = $this->matchOldToNewProperties();
 
         $propertyName = $propertyFetchNode->name->name;
 
@@ -80,6 +80,20 @@ final class PropertyNameReplacerRector extends AbstractRector
      */
     private function getClasses(): array
     {
-        return array_keys($this->oldToNewPropertyByClass);
+        return array_keys($this->perClassOldToNewProperties);
+    }
+
+    /**
+     * @return string[]
+     */
+    private function matchOldToNewProperties(): array
+    {
+        foreach ($this->activeTypes as $activeType) {
+            if ($this->perClassOldToNewProperties[$activeType]) {
+                return $this->perClassOldToNewProperties[$activeType];
+            }
+        }
+
+        return [];
     }
 }