diff --git a/packages/better-php-doc-parser/src/PhpDocNode/Gedmo/BlameableTagValueNode.php b/packages/better-php-doc-parser/src/PhpDocNode/Gedmo/BlameableTagValueNode.php
index 244dfc81c534..513a0a64c428 100644
--- a/packages/better-php-doc-parser/src/PhpDocNode/Gedmo/BlameableTagValueNode.php
+++ b/packages/better-php-doc-parser/src/PhpDocNode/Gedmo/BlameableTagValueNode.php
@@ -5,15 +5,11 @@
 namespace Rector\BetterPhpDocParser\PhpDocNode\Gedmo;
 
 use Gedmo\Mapping\Annotation\Blameable;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\ShortNameAwareTagInterface;
 use Rector\BetterPhpDocParser\PhpDocNode\AbstractTagValueNode;
 
-final class BlameableTagValueNode extends AbstractTagValueNode
+final class BlameableTagValueNode extends AbstractTagValueNode implements ShortNameAwareTagInterface
 {
-    /**
-     * @var string
-     */
-    public const SHORT_NAME = '@Gedmo\Blameable';
-
     /**
      * @var string
      */
@@ -64,4 +60,9 @@ public function __toString(): string
 
         return $this->printContentItems($contentItems);
     }
+
+    public function getShortName(): string
+    {
+        return '@Gedmo\Blameable';
+    }
 }
diff --git a/packages/better-php-doc-parser/src/PhpDocNode/Gedmo/LoggableTagValueNode.php b/packages/better-php-doc-parser/src/PhpDocNode/Gedmo/LoggableTagValueNode.php
index 9e7db6b3fda8..997139876cf8 100644
--- a/packages/better-php-doc-parser/src/PhpDocNode/Gedmo/LoggableTagValueNode.php
+++ b/packages/better-php-doc-parser/src/PhpDocNode/Gedmo/LoggableTagValueNode.php
@@ -5,15 +5,11 @@
 namespace Rector\BetterPhpDocParser\PhpDocNode\Gedmo;
 
 use Gedmo\Mapping\Annotation\Loggable;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\ShortNameAwareTagInterface;
 use Rector\BetterPhpDocParser\PhpDocNode\AbstractTagValueNode;
 
-final class LoggableTagValueNode extends AbstractTagValueNode
+final class LoggableTagValueNode extends AbstractTagValueNode implements ShortNameAwareTagInterface
 {
-    /**
-     * @var string
-     */
-    public const SHORT_NAME = '@Gedmo\Loggable';
-
     /**
      * @var string
      */
@@ -39,4 +35,9 @@ public function __toString(): string
 
         return $this->printContentItems($contentItems);
     }
+
+    public function getShortName(): string
+    {
+        return '@Gedmo\Loggable';
+    }
 }
diff --git a/packages/better-php-doc-parser/src/PhpDocNode/Gedmo/SlugTagValueNode.php b/packages/better-php-doc-parser/src/PhpDocNode/Gedmo/SlugTagValueNode.php
index 6b57be9f60b8..c66ecaf50612 100644
--- a/packages/better-php-doc-parser/src/PhpDocNode/Gedmo/SlugTagValueNode.php
+++ b/packages/better-php-doc-parser/src/PhpDocNode/Gedmo/SlugTagValueNode.php
@@ -5,15 +5,11 @@
 namespace Rector\BetterPhpDocParser\PhpDocNode\Gedmo;
 
 use Gedmo\Mapping\Annotation\Slug;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\ShortNameAwareTagInterface;
 use Rector\BetterPhpDocParser\PhpDocNode\AbstractTagValueNode;
 
-final class SlugTagValueNode extends AbstractTagValueNode
+final class SlugTagValueNode extends AbstractTagValueNode implements ShortNameAwareTagInterface
 {
-    /**
-     * @var string
-     */
-    public const SHORT_NAME = '@Gedmo\Slug';
-
     /**
      * @var string
      */
@@ -38,4 +34,9 @@ public function getFields(): array
     {
         return $this->fields;
     }
+
+    public function getShortName(): string
+    {
+        return '@Gedmo\Slug';
+    }
 }
diff --git a/packages/better-php-doc-parser/src/PhpDocNode/Gedmo/SoftDeleteableTagValueNode.php b/packages/better-php-doc-parser/src/PhpDocNode/Gedmo/SoftDeleteableTagValueNode.php
index 366bb0050829..54de14849fd4 100644
--- a/packages/better-php-doc-parser/src/PhpDocNode/Gedmo/SoftDeleteableTagValueNode.php
+++ b/packages/better-php-doc-parser/src/PhpDocNode/Gedmo/SoftDeleteableTagValueNode.php
@@ -5,15 +5,11 @@
 namespace Rector\BetterPhpDocParser\PhpDocNode\Gedmo;
 
 use Gedmo\Mapping\Annotation\SoftDeleteable;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\ShortNameAwareTagInterface;
 use Rector\BetterPhpDocParser\PhpDocNode\AbstractTagValueNode;
 
-final class SoftDeleteableTagValueNode extends AbstractTagValueNode
+final class SoftDeleteableTagValueNode extends AbstractTagValueNode implements ShortNameAwareTagInterface
 {
-    /**
-     * @var string
-     */
-    public const SHORT_NAME = '@Gedmo\SoftDeleteable';
-
     /**
      * @var string
      */
@@ -64,4 +60,9 @@ public function getFieldName(): string
     {
         return $this->fieldName;
     }
+
+    public function getShortName(): string
+    {
+        return '@Gedmo\SoftDeleteable';
+    }
 }
diff --git a/packages/better-php-doc-parser/src/PhpDocNode/Gedmo/VersionedTagValueNode.php b/packages/better-php-doc-parser/src/PhpDocNode/Gedmo/VersionedTagValueNode.php
index c01bc74e0ca0..aa9ad48d227d 100644
--- a/packages/better-php-doc-parser/src/PhpDocNode/Gedmo/VersionedTagValueNode.php
+++ b/packages/better-php-doc-parser/src/PhpDocNode/Gedmo/VersionedTagValueNode.php
@@ -5,15 +5,11 @@
 namespace Rector\BetterPhpDocParser\PhpDocNode\Gedmo;
 
 use Gedmo\Mapping\Annotation\Versioned;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\ShortNameAwareTagInterface;
 use Rector\BetterPhpDocParser\PhpDocNode\AbstractTagValueNode;
 
-final class VersionedTagValueNode extends AbstractTagValueNode
+final class VersionedTagValueNode extends AbstractTagValueNode implements ShortNameAwareTagInterface
 {
-    /**
-     * @var string
-     */
-    public const SHORT_NAME = '@Gedmo\Versioned';
-
     /**
      * @var string
      */
@@ -23,4 +19,9 @@ public function __toString(): string
     {
         return '';
     }
+
+    public function getShortName(): string
+    {
+        return '@Gedmo\Versioned';
+    }
 }
diff --git a/packages/better-php-doc-parser/src/PhpDocNode/JMS/JMSInjectTagValueNode.php b/packages/better-php-doc-parser/src/PhpDocNode/JMS/JMSInjectTagValueNode.php
index 0b3193994789..b5904ad3b2e4 100644
--- a/packages/better-php-doc-parser/src/PhpDocNode/JMS/JMSInjectTagValueNode.php
+++ b/packages/better-php-doc-parser/src/PhpDocNode/JMS/JMSInjectTagValueNode.php
@@ -5,15 +5,11 @@
 namespace Rector\BetterPhpDocParser\PhpDocNode\JMS;
 
 use JMS\DiExtraBundle\Annotation\Inject;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\ShortNameAwareTagInterface;
 use Rector\BetterPhpDocParser\PhpDocNode\AbstractTagValueNode;
 
-final class JMSInjectTagValueNode extends AbstractTagValueNode
+final class JMSInjectTagValueNode extends AbstractTagValueNode implements ShortNameAwareTagInterface
 {
-    /**
-     * @var string
-     */
-    public const SHORT_NAME = '@DI\Inject';
-
     /**
      * @var string
      */
@@ -69,4 +65,9 @@ public function getServiceName(): ?string
     {
         return $this->serviceName;
     }
+
+    public function getShortName(): string
+    {
+        return '@DI\Inject';
+    }
 }
diff --git a/packages/better-php-doc-parser/src/PhpDocNode/JMS/SerializerTypeTagValueNode.php b/packages/better-php-doc-parser/src/PhpDocNode/JMS/SerializerTypeTagValueNode.php
index 0356da7927d2..f1dbf2ddaf22 100644
--- a/packages/better-php-doc-parser/src/PhpDocNode/JMS/SerializerTypeTagValueNode.php
+++ b/packages/better-php-doc-parser/src/PhpDocNode/JMS/SerializerTypeTagValueNode.php
@@ -6,16 +6,12 @@
 
 use JMS\Serializer\Annotation\Type;
 use Nette\Utils\Strings;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\ShortNameAwareTagInterface;
 use Rector\BetterPhpDocParser\Contract\PhpDocNode\TypeAwareTagValueNodeInterface;
 use Rector\BetterPhpDocParser\PhpDocNode\AbstractTagValueNode;
 
-final class SerializerTypeTagValueNode extends AbstractTagValueNode implements TypeAwareTagValueNodeInterface
+final class SerializerTypeTagValueNode extends AbstractTagValueNode implements TypeAwareTagValueNodeInterface, ShortNameAwareTagInterface
 {
-    /**
-     * @var string
-     */
-    public const SHORT_NAME = '@Serializer\Type';
-
     /**
      * @var string
      */
@@ -59,4 +55,9 @@ public function replaceName(string $oldName, string $newName): bool
 
         return false;
     }
+
+    public function getShortName(): string
+    {
+        return '@Serializer\Type';
+    }
 }
diff --git a/packages/better-php-doc-parser/src/PhpDocNode/PHPDI/PHPDIInjectTagValueNode.php b/packages/better-php-doc-parser/src/PhpDocNode/PHPDI/PHPDIInjectTagValueNode.php
index 171c1d2a1dc1..a4bc89c9e55e 100644
--- a/packages/better-php-doc-parser/src/PhpDocNode/PHPDI/PHPDIInjectTagValueNode.php
+++ b/packages/better-php-doc-parser/src/PhpDocNode/PHPDI/PHPDIInjectTagValueNode.php
@@ -5,15 +5,11 @@
 namespace Rector\BetterPhpDocParser\PhpDocNode\PHPDI;
 
 use DI\Annotation\Inject;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\ShortNameAwareTagInterface;
 use Rector\BetterPhpDocParser\PhpDocNode\AbstractTagValueNode;
 
-final class PHPDIInjectTagValueNode extends AbstractTagValueNode
+final class PHPDIInjectTagValueNode extends AbstractTagValueNode implements ShortNameAwareTagInterface
 {
-    /**
-     * @var string
-     */
-    public const SHORT_NAME = '@Inject';
-
     /**
      * @var string
      */
@@ -37,4 +33,9 @@ public function __toString(): string
 
         return '(' . $this->value . ')';
     }
+
+    public function getShortName(): string
+    {
+        return '@Inject';
+    }
 }
diff --git a/packages/better-php-doc-parser/src/PhpDocNode/Sensio/SensioMethodTagValueNode.php b/packages/better-php-doc-parser/src/PhpDocNode/Sensio/SensioMethodTagValueNode.php
index 87d61ad133f0..745aae8a9c2f 100644
--- a/packages/better-php-doc-parser/src/PhpDocNode/Sensio/SensioMethodTagValueNode.php
+++ b/packages/better-php-doc-parser/src/PhpDocNode/Sensio/SensioMethodTagValueNode.php
@@ -4,16 +4,12 @@
 
 namespace Rector\BetterPhpDocParser\PhpDocNode\Sensio;
 
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\ShortNameAwareTagInterface;
 use Rector\BetterPhpDocParser\PhpDocNode\AbstractTagValueNode;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 
-final class SensioMethodTagValueNode extends AbstractTagValueNode
+final class SensioMethodTagValueNode extends AbstractTagValueNode implements ShortNameAwareTagInterface
 {
-    /**
-     * @var string
-     */
-    public const SHORT_NAME = '@Method';
-
     /**
      * @var string
      */
@@ -44,4 +40,9 @@ public function getMethods(): array
     {
         return $this->methods;
     }
+
+    public function getShortName(): string
+    {
+        return '@Method';
+    }
 }
diff --git a/packages/better-php-doc-parser/src/PhpDocNode/Sensio/SensioTemplateTagValueNode.php b/packages/better-php-doc-parser/src/PhpDocNode/Sensio/SensioTemplateTagValueNode.php
index ad96c47c651a..5dc7622ead5b 100644
--- a/packages/better-php-doc-parser/src/PhpDocNode/Sensio/SensioTemplateTagValueNode.php
+++ b/packages/better-php-doc-parser/src/PhpDocNode/Sensio/SensioTemplateTagValueNode.php
@@ -4,16 +4,12 @@
 
 namespace Rector\BetterPhpDocParser\PhpDocNode\Sensio;
 
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\ShortNameAwareTagInterface;
 use Rector\BetterPhpDocParser\PhpDocNode\AbstractTagValueNode;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 
-final class SensioTemplateTagValueNode extends AbstractTagValueNode
+final class SensioTemplateTagValueNode extends AbstractTagValueNode implements ShortNameAwareTagInterface
 {
-    /**
-     * @var string
-     */
-    public const SHORT_NAME = '@Template';
-
     /**
      * @var string
      */
@@ -72,4 +68,9 @@ public function getTemplate(): ?string
     {
         return $this->template;
     }
+
+    public function getShortName(): string
+    {
+        return '@Template';
+    }
 }
diff --git a/packages/better-php-doc-parser/src/PhpDocNode/Symfony/Validator/Constraints/AssertChoiceTagValueNode.php b/packages/better-php-doc-parser/src/PhpDocNode/Symfony/Validator/Constraints/AssertChoiceTagValueNode.php
index fba03e1cd292..54e81da1dd53 100644
--- a/packages/better-php-doc-parser/src/PhpDocNode/Symfony/Validator/Constraints/AssertChoiceTagValueNode.php
+++ b/packages/better-php-doc-parser/src/PhpDocNode/Symfony/Validator/Constraints/AssertChoiceTagValueNode.php
@@ -4,17 +4,13 @@
 
 namespace Rector\BetterPhpDocParser\PhpDocNode\Symfony\Validator\Constraints;
 
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\ShortNameAwareTagInterface;
 use Rector\BetterPhpDocParser\Contract\PhpDocNode\TypeAwareTagValueNodeInterface;
 use Rector\Symfony\PhpDocParser\Ast\PhpDoc\AbstractConstraintTagValueNode;
 use Symfony\Component\Validator\Constraints\Choice;
 
-final class AssertChoiceTagValueNode extends AbstractConstraintTagValueNode implements TypeAwareTagValueNodeInterface
+final class AssertChoiceTagValueNode extends AbstractConstraintTagValueNode implements TypeAwareTagValueNodeInterface, ShortNameAwareTagInterface
 {
-    /**
-     * @var string
-     */
-    public const SHORT_NAME = '@Assert\Choice';
-
     /**
      * @var string
      */
@@ -76,4 +72,9 @@ public function changeCallbackClass(string $newClass): void
     {
         $this->callback[0] = $newClass;
     }
+
+    public function getShortName(): string
+    {
+        return '@Assert\Choice';
+    }
 }
diff --git a/packages/better-php-doc-parser/src/PhpDocNode/Symfony/Validator/Constraints/AssertTypeTagValueNode.php b/packages/better-php-doc-parser/src/PhpDocNode/Symfony/Validator/Constraints/AssertTypeTagValueNode.php
index 6f92017e42fe..d0b6c3e0805a 100644
--- a/packages/better-php-doc-parser/src/PhpDocNode/Symfony/Validator/Constraints/AssertTypeTagValueNode.php
+++ b/packages/better-php-doc-parser/src/PhpDocNode/Symfony/Validator/Constraints/AssertTypeTagValueNode.php
@@ -4,16 +4,12 @@
 
 namespace Rector\BetterPhpDocParser\PhpDocNode\Symfony\Validator\Constraints;
 
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\ShortNameAwareTagInterface;
 use Rector\Symfony\PhpDocParser\Ast\PhpDoc\AbstractConstraintTagValueNode;
 use Symfony\Component\Validator\Constraints\Type;
 
-final class AssertTypeTagValueNode extends AbstractConstraintTagValueNode
+final class AssertTypeTagValueNode extends AbstractConstraintTagValueNode implements ShortNameAwareTagInterface
 {
-    /**
-     * @var string
-     */
-    public const SHORT_NAME = '@Assert\Type';
-
     /**
      * @var string
      */
@@ -33,4 +29,9 @@ public function __toString(): string
     {
         return '("' . $this->type . '")';
     }
+
+    public function getShortName(): string
+    {
+        return '@Assert\Type';
+    }
 }