diff --git a/src/bundle/Controller/LanguageController.php b/src/bundle/Controller/LanguageController.php
index 6f8043fd37..76d1ce4757 100644
--- a/src/bundle/Controller/LanguageController.php
+++ b/src/bundle/Controller/LanguageController.php
@@ -43,7 +43,7 @@ class LanguageController extends Controller
     /** @var LanguageCreateMapper */
     private $languageCreateMapper;
 
-    /** @var SubmitHandler $submitHandler */
+    /** @var SubmitHandler */
     private $submitHandler;
 
     /** @var FormFactory */
diff --git a/src/bundle/Controller/NotificationController.php b/src/bundle/Controller/NotificationController.php
index 52fac101b8..09b384f5ac 100644
--- a/src/bundle/Controller/NotificationController.php
+++ b/src/bundle/Controller/NotificationController.php
@@ -21,7 +21,7 @@
 
 class NotificationController extends Controller
 {
-    /** @var \eZ\Publish\API\Repository\NotificationService $notificationService */
+    /** @var \eZ\Publish\API\Repository\NotificationService */
     protected $notificationService;
 
     /** @var \eZ\Publish\Core\Notification\Renderer\Registry */
diff --git a/src/lib/Behat/PageObject/LanguagePage.php b/src/lib/Behat/PageObject/LanguagePage.php
index d51079aa6f..25feacd8fe 100644
--- a/src/lib/Behat/PageObject/LanguagePage.php
+++ b/src/lib/Behat/PageObject/LanguagePage.php
@@ -16,7 +16,7 @@ class LanguagePage extends Page
 {
     /** @var string Name by which Page is recognised */
     public const PAGE_NAME = 'Language';
-    /** @var string $languageName */
+    /** @var string */
     private $languageName;
 
     /**
diff --git a/src/lib/Behat/PageObject/ObjectStatePage.php b/src/lib/Behat/PageObject/ObjectStatePage.php
index f5fb45656b..14a9606696 100644
--- a/src/lib/Behat/PageObject/ObjectStatePage.php
+++ b/src/lib/Behat/PageObject/ObjectStatePage.php
@@ -16,7 +16,7 @@ class ObjectStatePage extends Page
 {
     /** @var string Name by which Page is recognised */
     public const PAGE_NAME = 'Object State';
-    /** @var string $languageName */
+    /** @var string */
     private $objectStateName;
 
     /**
diff --git a/src/lib/Tests/RepositoryForms/Form/Processor/PreviewFormProcessorTest.php b/src/lib/Tests/RepositoryForms/Form/Processor/PreviewFormProcessorTest.php
index 57abfd1a31..18a664a1f6 100644
--- a/src/lib/Tests/RepositoryForms/Form/Processor/PreviewFormProcessorTest.php
+++ b/src/lib/Tests/RepositoryForms/Form/Processor/PreviewFormProcessorTest.php
@@ -32,19 +32,19 @@
 
 class PreviewFormProcessorTest extends TestCase
 {
-    /** @var ContentService $contentService */
+    /** @var ContentService */
     private $contentService;
 
-    /** @var UrlGeneratorInterface $urlGenerator */
+    /** @var UrlGeneratorInterface */
     private $urlGenerator;
 
-    /** @var NotificationHandlerInterface $notificationHandler */
+    /** @var NotificationHandlerInterface */
     private $notificationHandler;
 
-    /** @var TranslatorInterface $translator */
+    /** @var TranslatorInterface */
     private $translator;
 
-    /** @var LocationService $locationService */
+    /** @var LocationService */
     private $locationService;
 
     public function setUp()