diff --git a/packages/better-php-doc-parser/src/Contract/ClassAwarePhpDocNodeFactoryInterface.php b/packages/better-php-doc-parser/src/Contract/ClassAwarePhpDocNodeFactoryInterface.php
deleted file mode 100644
index ac91ed67884..00000000000
--- a/packages/better-php-doc-parser/src/Contract/ClassAwarePhpDocNodeFactoryInterface.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Rector\BetterPhpDocParser\Contract;
-
-interface ClassAwarePhpDocNodeFactoryInterface extends PhpDocNodeFactoryInterface
-{
-    public function getClass(): string;
-}
diff --git a/packages/better-php-doc-parser/src/Contract/PhpDocNodeFactoryInterface.php b/packages/better-php-doc-parser/src/Contract/PhpDocNodeFactoryInterface.php
index f2caab18212..9d0c78a2a76 100644
--- a/packages/better-php-doc-parser/src/Contract/PhpDocNodeFactoryInterface.php
+++ b/packages/better-php-doc-parser/src/Contract/PhpDocNodeFactoryInterface.php
@@ -11,4 +11,6 @@ use PHPStan\PhpDocParser\Parser\TokenIterator;
 interface PhpDocNodeFactoryInterface
 {
     public function createFromNodeAndTokens(Node $node, TokenIterator $tokenIterator): ?PhpDocTagValueNode;
+
+    public function getClass(): string;
 }
diff --git a/packages/better-php-doc-parser/src/PhpDocNodeFactory/AbstractPhpDocNodeFactory.php b/packages/better-php-doc-parser/src/PhpDocNodeFactory/AbstractPhpDocNodeFactory.php
index 2077e14aaf3..722de2395bd 100644
--- a/packages/better-php-doc-parser/src/PhpDocNodeFactory/AbstractPhpDocNodeFactory.php
+++ b/packages/better-php-doc-parser/src/PhpDocNodeFactory/AbstractPhpDocNodeFactory.php
@@ -8,11 +8,11 @@ use Nette\Utils\Strings;
 use PhpParser\Node;
 use PHPStan\PhpDocParser\Parser\TokenIterator;
 use Rector\BetterPhpDocParser\AnnotationReader\NodeAnnotationReader;
-use Rector\BetterPhpDocParser\Contract\ClassAwarePhpDocNodeFactoryInterface;
+use Rector\BetterPhpDocParser\Contract\PhpDocNodeFactoryInterface;
 use Rector\BetterPhpDocParser\PhpDocParser\AnnotationContentResolver;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 
-abstract class AbstractPhpDocNodeFactory implements ClassAwarePhpDocNodeFactoryInterface
+abstract class AbstractPhpDocNodeFactory implements PhpDocNodeFactoryInterface
 {
     /**
      * @var NodeAnnotationReader
diff --git a/packages/better-php-doc-parser/src/PhpDocNodeFactory/ParamPhpDocNodeFactory.php b/packages/better-php-doc-parser/src/PhpDocNodeFactory/ParamPhpDocNodeFactory.php
index b1eaf0e4442..a3aa46839f7 100644
--- a/packages/better-php-doc-parser/src/PhpDocNodeFactory/ParamPhpDocNodeFactory.php
+++ b/packages/better-php-doc-parser/src/PhpDocNodeFactory/ParamPhpDocNodeFactory.php
@@ -59,11 +59,6 @@ final class ParamPhpDocNodeFactory
         $this->annotationContentResolver = $annotationContentResolver;
     }
 
-    public function getName(): string
-    {
-        return 'param';
-    }
-
     public function createFromTokens(TokenIterator $tokenIterator): ?PhpDocTagValueNode
     {
         try {
diff --git a/packages/better-php-doc-parser/src/PhpDocParser/BetterPhpDocParser.php b/packages/better-php-doc-parser/src/PhpDocParser/BetterPhpDocParser.php
index 7dada50c521..11b8e8485e1 100644
--- a/packages/better-php-doc-parser/src/PhpDocParser/BetterPhpDocParser.php
+++ b/packages/better-php-doc-parser/src/PhpDocParser/BetterPhpDocParser.php
@@ -19,7 +19,6 @@ use PHPStan\PhpDocParser\Parser\TypeParser;
 use Rector\AttributeAwarePhpDoc\Ast\PhpDoc\AttributeAwarePhpDocNode;
 use Rector\BetterPhpDocParser\Attributes\Ast\AttributeAwareNodeFactory;
 use Rector\BetterPhpDocParser\Attributes\Attribute\Attribute;
-use Rector\BetterPhpDocParser\Contract\ClassAwarePhpDocNodeFactoryInterface;
 use Rector\BetterPhpDocParser\Contract\PhpDocNodeFactoryInterface;
 use Rector\BetterPhpDocParser\PhpDocNodeFactory\ParamPhpDocNodeFactory;
 use Rector\BetterPhpDocParser\Printer\MultilineSpaceFormatPreserver;
@@ -288,15 +287,11 @@ final class BetterPhpDocParser extends PhpDocParser
         // normalize
         $tag = ltrim($tag, '@');
 
-        if ($phpDocNodeFactory instanceof ClassAwarePhpDocNodeFactoryInterface) {
-            return $this->classAnnotationMatcher->isTagMatchToNodeAndClass(
-                $tag,
-                $phpNode,
-                $phpDocNodeFactory->getClass()
-            );
-        }
-
-        return false;
+        return $this->classAnnotationMatcher->isTagMatchToNodeAndClass(
+            $tag,
+            $phpNode,
+            $phpDocNodeFactory->getClass()
+        );
     }
 
     private function getTokenIteratorIndex(TokenIterator $tokenIterator): int