diff --git a/composer/Plugin/VendorHardening/Config.php b/composer/Plugin/VendorHardening/Config.php
index 62371eb6cda0af29198b97ef1bf6d19e1910c03b..ab15475ec674005d5ad7428752544c531215fa9e 100644
--- a/composer/Plugin/VendorHardening/Config.php
+++ b/composer/Plugin/VendorHardening/Config.php
@@ -85,7 +85,7 @@ class Config {
/**
* The root package.
*
- * @var Composer\Package\RootPackageInterface
+ * @var \Composer\Package\RootPackageInterface
*/
protected $rootPackage;
diff --git a/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscoveryDecorator.php b/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscoveryDecorator.php
index d14c8796def722740bb7aec57530592fa241a906..d9277db770da425717c92613d60cc38cfac7db34 100644
--- a/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscoveryDecorator.php
+++ b/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscoveryDecorator.php
@@ -17,7 +17,7 @@ class StaticDiscoveryDecorator extends StaticDiscovery {
/**
* A callback or closure used for registering additional definitions.
*
- * @var \Callable
+ * @var callable
*/
protected $registerDefinitions;
diff --git a/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php b/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php
index 172f13ff62c545b293104b1f3875e950549e4f3f..538831490d62003bd1f9f1ac813296ca8766cf84 100644
--- a/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php
+++ b/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php
@@ -22,7 +22,7 @@ class MimeTypeGuesser implements MimeTypeGuesserInterface {
*
* If this is NULL a rebuild will be triggered.
*
- * @var \Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface[]
+ * @var \Symfony\Component\Mime\MimeTypeGuesserInterface[]
*
* @see \Drupal\Core\File\MimeType\MimeTypeGuesser::addGuesser()
* @see \Drupal\Core\File\MimeType\MimeTypeGuesser::sortGuessers()
diff --git a/core/lib/Drupal/Core/Routing/LazyRouteCollection.php b/core/lib/Drupal/Core/Routing/LazyRouteCollection.php
index c78cd7010c541ce88881a74c1397e223b63e5abc..f19f4f4d65f678056b43d8bcf05624de944b5455 100644
--- a/core/lib/Drupal/Core/Routing/LazyRouteCollection.php
+++ b/core/lib/Drupal/Core/Routing/LazyRouteCollection.php
@@ -10,7 +10,7 @@ class LazyRouteCollection extends RouteCollection {
/**
* The route provider for this generator.
*
- * @var \Symfony\Component\Routing\RouteProviderInterface
+ * @var \Drupal\Core\Routing\RouteProviderInterface
*/
protected $provider;
diff --git a/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php b/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php
index 57e68e2ad3f3939e4e258d89982785641f11679a..5d37d5c8adbb202b1393af7dc6912e4fc8c8b969 100644
--- a/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php
+++ b/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php
@@ -42,7 +42,7 @@ trait FunctionalTestSetupTrait {
/**
* The class loader to use for installation and initialization of setup.
*
- * @var \Symfony\Component\Classloader\Classloader
+ * @var \Composer\Autoload\ClassLoader
*/
protected $classLoader;
diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Language.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Language.php
index 9f74c4f4592b572ee7cc7dedbec895778dc2b5ec..98a429fbbfcb62b9dbeb22794af838375fd697cd 100644
--- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Language.php
+++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Language.php
@@ -27,7 +27,7 @@ class Language extends TypedData {
protected $id;
/**
- * @var \Drupal\Core\Language
+ * @var \Drupal\Core\Language\Language
*/
protected $language;
diff --git a/core/modules/block/tests/src/Kernel/BlockViewBuilderTest.php b/core/modules/block/tests/src/Kernel/BlockViewBuilderTest.php
index 03b728da7f986594350e9a57ad179fd465cac513..d14e9021a18b70eb99c705345e65d894e1d4340b 100644
--- a/core/modules/block/tests/src/Kernel/BlockViewBuilderTest.php
+++ b/core/modules/block/tests/src/Kernel/BlockViewBuilderTest.php
@@ -25,7 +25,7 @@ class BlockViewBuilderTest extends KernelTestBase {
/**
* The block being tested.
*
- * @var \Drupal\block\Entity\BlockInterface
+ * @var \Drupal\block\BlockInterface
*/
protected $block;
diff --git a/core/modules/block_content/tests/src/Functional/Rest/BlockContentTypeResourceTestBase.php b/core/modules/block_content/tests/src/Functional/Rest/BlockContentTypeResourceTestBase.php
index f41577634d251f5303f42f21fd711e1c4b7ed011..8c28e3584f2d6462a0b8862b34546358500b04ea 100644
--- a/core/modules/block_content/tests/src/Functional/Rest/BlockContentTypeResourceTestBase.php
+++ b/core/modules/block_content/tests/src/Functional/Rest/BlockContentTypeResourceTestBase.php
@@ -18,7 +18,7 @@ abstract class BlockContentTypeResourceTestBase extends ConfigEntityResourceTest
protected static $entityTypeId = 'block_content_type';
/**
- * @var \Drupal\block_content\Entity\BlockContentTypeInterface
+ * @var \Drupal\block_content\BlockContentTypeInterface
*/
protected $entity;
diff --git a/core/modules/comment/src/Controller/CommentController.php b/core/modules/comment/src/Controller/CommentController.php
index 9304e20009e15352651a06256d62982798033104..8c3a9c74b09ccc60a4efbe1bf38fc32d592f3639 100644
--- a/core/modules/comment/src/Controller/CommentController.php
+++ b/core/modules/comment/src/Controller/CommentController.php
@@ -52,7 +52,7 @@ class CommentController extends ControllerBase {
/**
* The entity repository.
*
- * @var Drupal\Core\Entity\EntityRepositoryInterface
+ * @var \Drupal\Core\Entity\EntityRepositoryInterface
*/
protected $entityRepository;
diff --git a/core/modules/comment/tests/src/Functional/Views/DefaultViewRecentCommentsTest.php b/core/modules/comment/tests/src/Functional/Views/DefaultViewRecentCommentsTest.php
index 8065871932e01653b1d851f36f1de2f1bcd1d241..5e584b15fd438048b0e4f363e17d0f2b61be1c0e 100644
--- a/core/modules/comment/tests/src/Functional/Views/DefaultViewRecentCommentsTest.php
+++ b/core/modules/comment/tests/src/Functional/Views/DefaultViewRecentCommentsTest.php
@@ -61,7 +61,7 @@ class DefaultViewRecentCommentsTest extends ViewTestBase {
/**
* Contains the node object used for comments of this test.
*
- * @var \Drupal\node\Node
+ * @var \Drupal\node\NodeInterface
*/
public $node;
diff --git a/core/modules/comment/tests/src/Unit/CommentStatisticsUnitTest.php b/core/modules/comment/tests/src/Unit/CommentStatisticsUnitTest.php
index 76e44401dcbf3cbddefa9df325ebb69e5b9fbeb7..a0dd40abc222a42fb87aae2b29a25e42fdfd05ee 100644
--- a/core/modules/comment/tests/src/Unit/CommentStatisticsUnitTest.php
+++ b/core/modules/comment/tests/src/Unit/CommentStatisticsUnitTest.php
@@ -15,7 +15,7 @@ class CommentStatisticsUnitTest extends UnitTestCase {
/**
* Mock statement.
*
- * @var \Drupal\Core\Database\Statement
+ * @var \Drupal\Core\Database\StatementInterface
*/
protected $statement;
diff --git a/core/modules/field/tests/src/Kernel/Entity/Update/SqlContentEntityStorageSchemaColumnTest.php b/core/modules/field/tests/src/Kernel/Entity/Update/SqlContentEntityStorageSchemaColumnTest.php
index 7bcd0fa55e598cfa7fb7f6706b7d54e71cd9f4b8..1f3233f28de57d51bab94c9a854ac4471a1d9bb1 100644
--- a/core/modules/field/tests/src/Kernel/Entity/Update/SqlContentEntityStorageSchemaColumnTest.php
+++ b/core/modules/field/tests/src/Kernel/Entity/Update/SqlContentEntityStorageSchemaColumnTest.php
@@ -28,7 +28,7 @@ class SqlContentEntityStorageSchemaColumnTest extends KernelTestBase {
/**
* The created entity.
*
- * @var \Drupal\Core\Entity\Entity
+ * @var \Drupal\Core\Entity\EntityInterface
*/
protected $entity;
diff --git a/core/modules/node/tests/src/Functional/NodeRevisionsAllTest.php b/core/modules/node/tests/src/Functional/NodeRevisionsAllTest.php
index 67da2be2838cda7be5fa4edb117580306b15d52d..a9687f63e7b0080f2d717dfd77ba49c45a073d01 100644
--- a/core/modules/node/tests/src/Functional/NodeRevisionsAllTest.php
+++ b/core/modules/node/tests/src/Functional/NodeRevisionsAllTest.php
@@ -21,7 +21,7 @@ class NodeRevisionsAllTest extends NodeTestBase {
/**
* A list of nodes created to be used as starting point of different tests.
*
- * @var Drupal\node\NodeInterface[]
+ * @var \Drupal\node\NodeInterface[]
*/
protected $nodes;
diff --git a/core/modules/node/tests/src/Functional/Views/PathPluginTest.php b/core/modules/node/tests/src/Functional/Views/PathPluginTest.php
index 8645a6cdd317b16fce35bc7b856d0cc1b9ea8cfd..9eee667a63a8502cf157d0c1a7d60f924c3011d1 100644
--- a/core/modules/node/tests/src/Functional/Views/PathPluginTest.php
+++ b/core/modules/node/tests/src/Functional/Views/PathPluginTest.php
@@ -33,7 +33,7 @@ class PathPluginTest extends NodeTestBase {
/**
* Contains all nodes used by this test.
*
- * @var Node[]
+ * @var \Drupal\node\Entity\Node[]
*/
protected $nodes;
diff --git a/core/modules/options/tests/src/Functional/OptionsDynamicValuesTestBase.php b/core/modules/options/tests/src/Functional/OptionsDynamicValuesTestBase.php
index cc541675b53f4d78f534b6ba387ba3ac85c69df0..08d9bfbd6f5aac3ab94d47933269a6c633ca46c7 100644
--- a/core/modules/options/tests/src/Functional/OptionsDynamicValuesTestBase.php
+++ b/core/modules/options/tests/src/Functional/OptionsDynamicValuesTestBase.php
@@ -22,7 +22,7 @@ abstract class OptionsDynamicValuesTestBase extends FieldTestBase {
/**
* The created entity.
*
- * @var \Drupal\Core\Entity\Entity
+ * @var \Drupal\Core\Entity\EntityInterface
*/
protected $entity;
diff --git a/core/modules/search/src/SearchQuery.php b/core/modules/search/src/SearchQuery.php
index 6869da434f7128da7e6063deb2beb8d21319b2ff..ec858789238c70989b6e863e2cf7958d41584f9f 100644
--- a/core/modules/search/src/SearchQuery.php
+++ b/core/modules/search/src/SearchQuery.php
@@ -110,7 +110,7 @@ class SearchQuery extends SelectExtender {
* This is always used for the second step in the query, but is not part of
* the preparation step unless $this->simple is FALSE.
*
- * @var Drupal\Core\Database\Query\ConditionInterface[]
+ * @var \Drupal\Core\Database\Query\ConditionInterface[]
*/
protected $conditions;
diff --git a/core/modules/system/tests/src/Functional/Theme/EntityFilteringThemeTest.php b/core/modules/system/tests/src/Functional/Theme/EntityFilteringThemeTest.php
index c0f91f8b438492cec8855cfad85c6e13b45d25fc..112d955841159daa13fceaddf167f1b539155210 100644
--- a/core/modules/system/tests/src/Functional/Theme/EntityFilteringThemeTest.php
+++ b/core/modules/system/tests/src/Functional/Theme/EntityFilteringThemeTest.php
@@ -47,7 +47,7 @@ class EntityFilteringThemeTest extends BrowserTestBase {
/**
* A test user.
*
- * @var \Drupal\user\User
+ * @var \Drupal\user\Entity\User
*/
protected $user;
@@ -55,7 +55,7 @@ class EntityFilteringThemeTest extends BrowserTestBase {
/**
* A test node.
*
- * @var \Drupal\node\Node
+ * @var \Drupal\node\Entity\Node
*/
protected $node;
@@ -63,7 +63,7 @@ class EntityFilteringThemeTest extends BrowserTestBase {
/**
* A test taxonomy term.
*
- * @var \Drupal\taxonomy\Term
+ * @var \Drupal\taxonomy\Entity\Term
*/
protected $term;
@@ -71,7 +71,7 @@ class EntityFilteringThemeTest extends BrowserTestBase {
/**
* A test comment.
*
- * @var \Drupal\comment\Comment
+ * @var \Drupal\comment\Entity\Comment
*/
protected $comment;
diff --git a/core/modules/user/tests/src/Functional/UserPasswordResetTest.php b/core/modules/user/tests/src/Functional/UserPasswordResetTest.php
index e984c466edd0b3852373531bd157144027c83b03..6229dbb97cd9de452646e47e3baa1135ea3eb1ae 100644
--- a/core/modules/user/tests/src/Functional/UserPasswordResetTest.php
+++ b/core/modules/user/tests/src/Functional/UserPasswordResetTest.php
@@ -31,7 +31,7 @@ class UserPasswordResetTest extends BrowserTestBase {
/**
* Language manager object.
*
- * @var \Drupal\language\LanguageManagerInterface
+ * @var \Drupal\Core\Language\LanguageManagerInterface
*/
protected $languageManager;
diff --git a/core/modules/user/tests/src/Kernel/Condition/UserRoleConditionTest.php b/core/modules/user/tests/src/Kernel/Condition/UserRoleConditionTest.php
index df75a08a3d4bda666748b9563631d0079880c5fd..31298d2dc2026dc2937117649684d3725615f9f0 100644
--- a/core/modules/user/tests/src/Kernel/Condition/UserRoleConditionTest.php
+++ b/core/modules/user/tests/src/Kernel/Condition/UserRoleConditionTest.php
@@ -39,7 +39,7 @@ class UserRoleConditionTest extends KernelTestBase {
/**
* A custom role for testing purposes.
*
- * @var \Drupal\user\Entity\RoleInterface
+ * @var \Drupal\user\RoleInterface
*/
protected $role;
diff --git a/core/modules/user/tests/src/Kernel/WhosOnlineBlockTest.php b/core/modules/user/tests/src/Kernel/WhosOnlineBlockTest.php
index 90551a75c155b0114c6b2df4a8577290ea9e0cb3..d7d7856a37841f108f26c6eb1b296abc22bde7df 100644
--- a/core/modules/user/tests/src/Kernel/WhosOnlineBlockTest.php
+++ b/core/modules/user/tests/src/Kernel/WhosOnlineBlockTest.php
@@ -21,7 +21,7 @@ class WhosOnlineBlockTest extends KernelTestBase {
/**
* The block being tested.
*
- * @var \Drupal\block\Entity\BlockInterface
+ * @var \Drupal\block\BlockInterface
*/
protected $block;
diff --git a/core/modules/views/src/Plugin/views/filter/Combine.php b/core/modules/views/src/Plugin/views/filter/Combine.php
index 36dab819e57feeccfcdf0f8901e5ec5c7312b0ac..b541009c3dea4d29980db7b5d6a0ad8846f54fe6 100644
--- a/core/modules/views/src/Plugin/views/filter/Combine.php
+++ b/core/modules/views/src/Plugin/views/filter/Combine.php
@@ -14,7 +14,7 @@
class Combine extends StringFilter {
/**
- * @var views_plugin_query_default
+ * @var \Drupal\views\Plugin\views\query\QueryPluginBase
*/
public $query;
diff --git a/core/modules/views/src/Plugin/views/query/QueryPluginBase.php b/core/modules/views/src/Plugin/views/query/QueryPluginBase.php
index 582023b3ea8ffcf08e56fc3b5bc3bc27b6666997..6c49b1d011c8ec4525e3c9ef8572460106facd43 100644
--- a/core/modules/views/src/Plugin/views/query/QueryPluginBase.php
+++ b/core/modules/views/src/Plugin/views/query/QueryPluginBase.php
@@ -36,7 +36,7 @@ abstract class QueryPluginBase extends PluginBase implements CacheableDependency
/**
* A pager plugin that should be provided by the display.
*
- * @var views_plugin_pager
+ * @var \Drupal\views\Plugin\views\pager\PagerPluginBase|null
*/
public $pager = NULL;
diff --git a/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php b/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
index 16167cf27d2ffd4ebeddf068af28104e14842055..d2fa07832e60a1775c8ce746e557fdecc6869589 100644
--- a/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
+++ b/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
@@ -30,7 +30,7 @@ class RouteSubscriberTest extends UnitTestCase {
/**
* The mocked view storage.
*
- * @var \Drupal\views\ViewStorage|\PHPUnit\Framework\MockObject\MockObject
+ * @var \Drupal\Tests\views\Kernel\ViewStorageTest|\PHPUnit\Framework\MockObject\MockObject
*/
protected $viewStorage;
diff --git a/core/modules/views_ui/tests/src/Functional/ReportTest.php b/core/modules/views_ui/tests/src/Functional/ReportTest.php
index bc91ec584598317c772bbcce6a0f0834477c802a..b362b1a7e2f493caad0c20a7139ff3398f6538b8 100644
--- a/core/modules/views_ui/tests/src/Functional/ReportTest.php
+++ b/core/modules/views_ui/tests/src/Functional/ReportTest.php
@@ -24,7 +24,7 @@ class ReportTest extends UITestBase {
/**
* Stores an admin user used by the different tests.
*
- * @var \Drupal\user\User
+ * @var \Drupal\user\Entity\User
*/
protected $adminUser;
diff --git a/core/modules/views_ui/tests/src/Functional/SettingsTest.php b/core/modules/views_ui/tests/src/Functional/SettingsTest.php
index 8256af296b5c120ed55c8d68311c822298bbe67d..f926e63b95efc02d66f6888ad5abcbaa27739c96 100644
--- a/core/modules/views_ui/tests/src/Functional/SettingsTest.php
+++ b/core/modules/views_ui/tests/src/Functional/SettingsTest.php
@@ -14,7 +14,7 @@ class SettingsTest extends UITestBase {
/**
* Stores an admin user used by the different tests.
*
- * @var \Drupal\user\User
+ * @var \Drupal\user\Entity\User
*/
protected $adminUser;
diff --git a/core/tests/Drupal/TestSite/Commands/TestSiteUserLoginCommand.php b/core/tests/Drupal/TestSite/Commands/TestSiteUserLoginCommand.php
index 6ea3395ea5380633ad28a5d5d20fcf915f91c41e..82cfb91f8a2302466c55804ad8cbd60410cfb24f 100644
--- a/core/tests/Drupal/TestSite/Commands/TestSiteUserLoginCommand.php
+++ b/core/tests/Drupal/TestSite/Commands/TestSiteUserLoginCommand.php
@@ -22,7 +22,7 @@ class TestSiteUserLoginCommand extends Command {
/**
* The class loader to use for installation and initialization of setup.
*
- * @var \Symfony\Component\Classloader\Classloader
+ * @var \Composer\Autoload\ClassLoader
*/
protected $classLoader;
diff --git a/core/tests/Drupal/Tests/Core/Access/CsrfAccessCheckTest.php b/core/tests/Drupal/Tests/Core/Access/CsrfAccessCheckTest.php
index 73628aa50bb1a00372a017a16c6000dacc66cb55..ff804a2421275b648523f39ccd7499e4a0c81402 100644
--- a/core/tests/Drupal/Tests/Core/Access/CsrfAccessCheckTest.php
+++ b/core/tests/Drupal/Tests/Core/Access/CsrfAccessCheckTest.php
@@ -31,7 +31,7 @@ class CsrfAccessCheckTest extends UnitTestCase {
/**
* The mock route match.
*
- * @var \Drupal\Core\RouteMatch\RouteMatchInterface|\PHPUnit\Framework\MockObject\MockObject
+ * @var \Drupal\Core\Routing\RouteMatchInterface|\PHPUnit\Framework\MockObject\MockObject
*/
protected $routeMatch;
diff --git a/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php b/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php
index 579f7da70baa768463c40e0670e41ca6a0abee68..2c4992841629c9966015414241a935ec5d9a4fcb 100644
--- a/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php
@@ -28,7 +28,7 @@ class CssOptimizerUnitTest extends UnitTestCase {
/**
* The file URL generator mock.
*
- * @var \Drupal\Core\File\FileUrlGeneratorInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Drupal\Core\File\FileUrlGeneratorInterface|\PHPUnit\Framework\MockObject\MockObject
*/
protected $fileUrlGenerator;
diff --git a/core/tests/Drupal/Tests/Core/DependencyInjection/Fixture/BarClass.php b/core/tests/Drupal/Tests/Core/DependencyInjection/Fixture/BarClass.php
index 35c236b2d11ec2c75cea09adf3750ede8f44405f..4fc0a6487f4a4411669d6cdfdc97e05f79b5c536 100644
--- a/core/tests/Drupal/Tests/Core/DependencyInjection/Fixture/BarClass.php
+++ b/core/tests/Drupal/Tests/Core/DependencyInjection/Fixture/BarClass.php
@@ -13,7 +13,7 @@ class BarClass {
/**
* Storage for a protected BazClass object.
*
- * @var Drupal\Tests\Core\DependencyInjection\Fixture\BazClass
+ * @var \Drupal\Tests\Core\DependencyInjection\Fixture\BazClass
*/
protected $baz;
diff --git a/core/tests/Drupal/Tests/Core/Enhancer/EntityRevisionRouteEnhancerTest.php b/core/tests/Drupal/Tests/Core/Enhancer/EntityRevisionRouteEnhancerTest.php
index a250594ee23197d1ef6ca1ea9dc8c3e5621c2b6f..029f9f12ca90ab7d9eaa4c1b3b180b1e2b1764aa 100644
--- a/core/tests/Drupal/Tests/Core/Enhancer/EntityRevisionRouteEnhancerTest.php
+++ b/core/tests/Drupal/Tests/Core/Enhancer/EntityRevisionRouteEnhancerTest.php
@@ -16,7 +16,7 @@
class EntityRevisionRouteEnhancerTest extends UnitTestCase {
/**
- * @var \Drupal\Core\Routing\RouteEnhancer\EntityRevisionRouteEnhancer
+ * @var \Drupal\Core\Routing\Enhancer\EntityRevisionRouteEnhancer
*/
protected $routeEnhancer;
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php
index 90896144b2169075824c12b15337c7093f59b649..825a10b4600e9439eef19442d98cdddb777e95d6 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php
@@ -23,7 +23,7 @@ class EntityUnitTest extends UnitTestCase {
/**
* The entity under test.
*
- * @var \Drupal\Core\Entity\Entity|\PHPUnit\Framework\MockObject\MockObject
+ * @var \Drupal\Core\Entity\EntityInterface|\PHPUnit\Framework\MockObject\MockObject
*/
protected $entity;
diff --git a/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php b/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php
index 964220206cc4c9fefb975a01d92f5d94dceb879b..26df85f66c9dc83b78c3fa059162530f6dbe5db3 100644
--- a/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php
+++ b/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php
@@ -54,7 +54,7 @@ class CustomPageExceptionHtmlSubscriberTest extends UnitTestCase {
/**
* The tested custom page exception subscriber.
*
- * @var \Drupal\Core\EventSubscriber\CustomPageExceptionHtmlSubscriber|\Drupal\Tests\Core\EventSubscriber\TestCustomPageExceptionHtmlSubscriber
+ * @var \Drupal\Core\EventSubscriber\CustomPageExceptionHtmlSubscriber|\Drupal\Tests\Core\EventSubscriber\CustomPageExceptionHtmlSubscriberTest
*/
protected $customPageSubscriber;
diff --git a/core/tests/Drupal/Tests/Core/EventSubscriber/ModuleRouteSubscriberTest.php b/core/tests/Drupal/Tests/Core/EventSubscriber/ModuleRouteSubscriberTest.php
index ce791139044aaec6c051deffb3ee9da0ed820170..56a22f62b87b557b343aa257f1e2bf1acc939618 100644
--- a/core/tests/Drupal/Tests/Core/EventSubscriber/ModuleRouteSubscriberTest.php
+++ b/core/tests/Drupal/Tests/Core/EventSubscriber/ModuleRouteSubscriberTest.php
@@ -17,7 +17,7 @@ class ModuleRouteSubscriberTest extends UnitTestCase {
/**
* The mock module handler.
*
- * @var Drupal\Core\Extension\ModuleHandlerInterface|\PHPUnit\Framework\MockObject\MockObject
+ * @var \Drupal\Core\Extension\ModuleHandlerInterface|\PHPUnit\Framework\MockObject\MockObject
*/
protected $moduleHandler;
diff --git a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php
index d1b93b6f4d8d2676f85be7060489e8247853375b..6a043397d2ada26219e083c611318820059acc73 100644
--- a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php
+++ b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php
@@ -66,7 +66,7 @@ class TwigExtensionTest extends UnitTestCase {
/**
* The file URL generator mock.
*
- * @var \Drupal\Core\File\FileUrlGeneratorInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Drupal\Core\File\FileUrlGeneratorInterface|\PHPUnit\Framework\MockObject\MockObject
*/
protected $fileUrlGenerator;
diff --git a/core/tests/Drupal/Tests/Core/Theme/RegistryTest.php b/core/tests/Drupal/Tests/Core/Theme/RegistryTest.php
index 7f2f2dc082734caa9abbeb2c0aef9fefa91006f3..a394a12f9ac2b22fe77c8dfa2ca2e23edf98fb14 100644
--- a/core/tests/Drupal/Tests/Core/Theme/RegistryTest.php
+++ b/core/tests/Drupal/Tests/Core/Theme/RegistryTest.php
@@ -16,7 +16,7 @@ class RegistryTest extends UnitTestCase {
/**
* The mocked theme registry.
*
- * @var \Drupal\Core\Theme\Registry|PHPUnit\Framework\MockObject\MockObject
+ * @var \Drupal\Core\Theme\Registry|\PHPUnit\Framework\MockObject\MockObject
*/
protected $registry;