diff --git a/src/Maker/MakeValidator.php b/src/Maker/MakeValidator.php
index 3bf75108c..811c359de 100644
--- a/src/Maker/MakeValidator.php
+++ b/src/Maker/MakeValidator.php
@@ -59,7 +59,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
             $validatorClassNameDetails->getFullName(),
             'validator/Validator.tpl.php',
             [
-                'constraint_class_name' => $constraintFullClassName,
+                'constraint_class_name' => Str::getShortClassName($constraintFullClassName),
             ]
         );
 
diff --git a/src/Resources/skeleton/validator/Validator.tpl.php b/src/Resources/skeleton/validator/Validator.tpl.php
index b32219ef4..0656d4cb4 100644
--- a/src/Resources/skeleton/validator/Validator.tpl.php
+++ b/src/Resources/skeleton/validator/Validator.tpl.php
@@ -9,7 +9,7 @@ class <?= $class_name ?> extends ConstraintValidator
 {
     public function validate($value, Constraint $constraint)
     {
-        /* @var <?= $constraint_class_name ?> $constraint */
+        /** @var <?= $constraint_class_name ?> $constraint */
 
         if (null === $value || '' === $value) {
             return;