diff --git a/composer/Plugin/Scaffold/Operations/OperationFactory.php b/composer/Plugin/Scaffold/Operations/OperationFactory.php
index 9b10f89fbf..6346923b71 100644
--- a/composer/Plugin/Scaffold/Operations/OperationFactory.php
+++ b/composer/Plugin/Scaffold/Operations/OperationFactory.php
@@ -122,7 +122,7 @@ protected function createAppendOp(PackageInterface $package, OperationData $oper
   /**
    * Checks to see if the specified scaffold file exists and has content.
    *
-   * @param Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath $file
+   * @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath $file
    *   Scaffold file to check.
    *
    * @return bool
diff --git a/composer/Plugin/Scaffold/Operations/ScaffoldFileCollection.php b/composer/Plugin/Scaffold/Operations/ScaffoldFileCollection.php
index 098c63c42f..a1bacf597d 100644
--- a/composer/Plugin/Scaffold/Operations/ScaffoldFileCollection.php
+++ b/composer/Plugin/Scaffold/Operations/ScaffoldFileCollection.php
@@ -96,7 +96,7 @@ public function filterFiles(array $files_to_filter) {
   /**
    * Scans through a list of scaffold files and determines if any has contents.
    *
-   * @param Drupal\Composer\Plugin\Scaffold\ScaffoldFileInfo[] $scaffold_files
+   * @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFileInfo[] $scaffold_files
    *   List of scaffold files, path: ScaffoldFileInfo
    *
    * @return bool
diff --git a/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscoveryDecorator.php b/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscoveryDecorator.php
index d14c8796de..f7e5f13b06 100644
--- a/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscoveryDecorator.php
+++ b/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscoveryDecorator.php
@@ -26,7 +26,7 @@ class StaticDiscoveryDecorator extends StaticDiscovery {
    *
    * @param \Drupal\Component\Plugin\Discovery\DiscoveryInterface $decorated
    *   The discovery object that is being decorated.
-   * @param \Callable $registerDefinitions
+   * @param \Callable|null $registerDefinitions
    *   (optional) A callback or closure used for registering additional
    *   definitions.
    */
diff --git a/core/lib/Drupal/Core/Archiver/Tar.php b/core/lib/Drupal/Core/Archiver/Tar.php
index 00dd4fdf1f..a7338964ee 100644
--- a/core/lib/Drupal/Core/Archiver/Tar.php
+++ b/core/lib/Drupal/Core/Archiver/Tar.php
@@ -81,7 +81,7 @@ public function listContents() {
    * Archive_Tar object for implementation-specific logic. This is for advanced
    * use only as it is not shared by other implementations of ArchiveInterface.
    *
-   * @return Archive_Tar
+   * @return ArchiveTar
    *   The Archive_Tar object used by this object.
    */
   public function getArchive() {
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
index d631a66f97..dc6bca9539 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
@@ -406,7 +406,7 @@ public function createFromStorageRecord(array $values) {
    * @param bool $is_syncing
    *   Is the configuration entity being created as part of a config sync.
    *
-   * @return \Drupal\Core\Config\ConfigEntityInterface
+   * @return \Drupal\Core\Entity\EntityInterface
    *   The configuration entity.
    *
    * @see \Drupal\Core\Config\Entity\ConfigEntityStorageInterface::createFromStorageRecord()
diff --git a/core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php
index bfde31939b..f397bf25e9 100644
--- a/core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php
@@ -35,7 +35,7 @@ public function __construct(ModuleHandlerInterface $module_handler) {
    *   removed/changed. Also, if possible, do more light-weight shutdowns on
    *   AJAX requests.
    *
-   * @param Symfony\Component\HttpKernel\Event\TerminateEvent $event
+   * @param \Symfony\Component\HttpKernel\Event\TerminateEvent $event
    *   The Event to process.
    */
   public function onTerminate(TerminateEvent $event) {
diff --git a/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php b/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php
index 172f13ff62..52adc60e14 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()
@@ -103,7 +103,7 @@ public function isGuesserSupported(): bool {
   /**
    * Sorts guessers according to priority.
    *
-   * @return \Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface[]
+   * @return \Symfony\Component\Mime\MimeTypeGuesserInterface[]
    *   A sorted array of MIME type guesser objects.
    */
   protected function sortGuessers() {
diff --git a/core/lib/Drupal/Core/Plugin/CategorizingPluginManagerTrait.php b/core/lib/Drupal/Core/Plugin/CategorizingPluginManagerTrait.php
index 2d6ed8bb75..3724e9dff6 100644
--- a/core/lib/Drupal/Core/Plugin/CategorizingPluginManagerTrait.php
+++ b/core/lib/Drupal/Core/Plugin/CategorizingPluginManagerTrait.php
@@ -74,7 +74,7 @@ public function getModuleHandler() {
    * {@inheritdoc}
    */
   public function getCategories() {
-    /** @var \Drupal\Core\Plugin\CategorizingPluginManagerTrait|\Drupal\Component\Plugin\PluginManagerInterface $this */
+    /** @var \Drupal\Component\Plugin\PluginManagerInterface $this */
     // Fetch all categories from definitions and remove duplicates.
     $categories = array_unique(array_values(array_map(function ($definition) {
       return $definition['category'];
@@ -88,7 +88,7 @@ public function getCategories() {
    */
   public function getSortedDefinitions(array $definitions = NULL, $label_key = 'label') {
     // Sort the plugins first by category, then by label.
-    /** @var \Drupal\Core\Plugin\CategorizingPluginManagerTrait|\Drupal\Component\Plugin\PluginManagerInterface $this */
+    /** @var \Drupal\Component\Plugin\PluginManagerInterface $this */
     $definitions = $definitions ?? $this->getDefinitions();
     uasort($definitions, function ($a, $b) use ($label_key) {
       if ((string) $a['category'] != (string) $b['category']) {
@@ -103,7 +103,7 @@ public function getSortedDefinitions(array $definitions = NULL, $label_key = 'la
    * {@inheritdoc}
    */
   public function getGroupedDefinitions(array $definitions = NULL, $label_key = 'label') {
-    /** @var \Drupal\Core\Plugin\CategorizingPluginManagerTrait|\Drupal\Component\Plugin\PluginManagerInterface $this */
+    /** @var \Drupal\Component\Plugin\PluginManagerInterface $this */
     $definitions = $this->getSortedDefinitions($definitions ?? $this->getDefinitions(), $label_key);
     $grouped_definitions = [];
     foreach ($definitions as $id => $definition) {
diff --git a/core/lib/Drupal/Core/Plugin/ContextAwarePluginTrait.php b/core/lib/Drupal/Core/Plugin/ContextAwarePluginTrait.php
index 133c9caf48..5200255782 100644
--- a/core/lib/Drupal/Core/Plugin/ContextAwarePluginTrait.php
+++ b/core/lib/Drupal/Core/Plugin/ContextAwarePluginTrait.php
@@ -15,7 +15,7 @@
 /**
  * Provides a trait to add context-aware functionality to plugins.
  *
- * @see \Drupal\Core\Plugin\ContextAwarePluginInterface
+ * @see \Drupal\KernelTests\Core\Plugin\Context\TestContextAwarePlugin
  *
  * @ingroup plugin_api
  */
diff --git a/core/lib/Drupal/Core/Routing/Enhancer/FormRouteEnhancer.php b/core/lib/Drupal/Core/Routing/Enhancer/FormRouteEnhancer.php
index 9e9df9f71d..6ddb85cb9e 100644
--- a/core/lib/Drupal/Core/Routing/Enhancer/FormRouteEnhancer.php
+++ b/core/lib/Drupal/Core/Routing/Enhancer/FormRouteEnhancer.php
@@ -15,7 +15,7 @@ class FormRouteEnhancer implements EnhancerInterface {
   /**
    * Returns whether the enhancer runs on the current route.
    *
-   * @param \Drupal\Core\Routing\Enhancer\Route $route
+   * @param \Symfony\Component\Routing\Route $route
    *   The current route.
    *
    * @return bool
diff --git a/core/lib/Drupal/Core/Session/SessionManager.php b/core/lib/Drupal/Core/Session/SessionManager.php
index c3288da08e..5591444020 100644
--- a/core/lib/Drupal/Core/Session/SessionManager.php
+++ b/core/lib/Drupal/Core/Session/SessionManager.php
@@ -77,7 +77,7 @@ class SessionManager extends NativeSessionStorage implements SessionManagerInter
    *   The session metadata bag.
    * @param \Drupal\Core\Session\SessionConfigurationInterface $session_configuration
    *   The session configuration interface.
-   * @param \Symfony\Component\HttpFoundation\Session\Storage\Proxy\AbstractProxy|Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeSessionHandler|\SessionHandlerInterface|null $handler
+   * @param \Symfony\Component\HttpFoundation\Session\Storage\Proxy\AbstractProxy|\Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeFileSessionHandler|\SessionHandlerInterface|null $handler
    *   The object to register as a PHP session handler.
    *   @see \Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage::setSaveHandler()
    */
diff --git a/core/lib/Drupal/Core/Utility/LinkGenerator.php b/core/lib/Drupal/Core/Utility/LinkGenerator.php
index 50bc3089a2..b7a72b6811 100644
--- a/core/lib/Drupal/Core/Utility/LinkGenerator.php
+++ b/core/lib/Drupal/Core/Utility/LinkGenerator.php
@@ -190,14 +190,14 @@ public function generate($text, Url $url) {
   /**
    * Generates the link.
    *
-   * @param Drupal\Core\GeneratedLink $generated_link
+   * @param \Drupal\Core\GeneratedLink $generated_link
    *   The generated link, along with its associated cacheability metadata.
    * @param array $attributes
    *   The attributes of the generated link.
    * @param array $variables
    *   The link text, url, and other options.
    *
-   * @return Drupal\Core\GeneratedLink
+   * @return \Drupal\Core\GeneratedLink
    *   The generated link, along with its associated cacheability metadata.
    */
   protected function doGenerate($generated_link, $attributes, $variables) {
diff --git a/core/modules/ckeditor5/tests/src/FunctionalJavascript/CKEditorStylesheetsWarningTest.php b/core/modules/ckeditor5/tests/src/FunctionalJavascript/CKEditorStylesheetsWarningTest.php
index 0d32076798..a83ff5f26e 100644
--- a/core/modules/ckeditor5/tests/src/FunctionalJavascript/CKEditorStylesheetsWarningTest.php
+++ b/core/modules/ckeditor5/tests/src/FunctionalJavascript/CKEditorStylesheetsWarningTest.php
@@ -54,7 +54,7 @@ public function testWarningFilterUi($theme, $expected_warning) {
   /**
    * Data provider for testWarningFilterUI().
    *
-   * @return \string[][]
+   * @return string[][]
    *   An array with the theme to enable and the warning message to check.
    */
   public function providerTestWarningFilterUi() {
diff --git a/core/modules/ckeditor5/tests/src/FunctionalJavascript/ImageTestBase.php b/core/modules/ckeditor5/tests/src/FunctionalJavascript/ImageTestBase.php
index 0f8e8071a3..8690f00578 100644
--- a/core/modules/ckeditor5/tests/src/FunctionalJavascript/ImageTestBase.php
+++ b/core/modules/ckeditor5/tests/src/FunctionalJavascript/ImageTestBase.php
@@ -595,7 +595,7 @@ public function testImageCaption() {
   /**
    * Data provider for ::testWidth().
    *
-   * @return \string[][]
+   * @return string[][]
    */
   public function providerWidth(): array {
     return [
diff --git a/core/modules/ckeditor5/tests/src/FunctionalJavascript/LanguageTest.php b/core/modules/ckeditor5/tests/src/FunctionalJavascript/LanguageTest.php
index 3482643af3..3bc40cd178 100644
--- a/core/modules/ckeditor5/tests/src/FunctionalJavascript/LanguageTest.php
+++ b/core/modules/ckeditor5/tests/src/FunctionalJavascript/LanguageTest.php
@@ -80,7 +80,7 @@ public function test(string $langcode, string $toolbar_item_name, string $toolba
   /**
    * Data provider for ensuring CKEditor 5 UI translations are loaded.
    *
-   * @return \string[][]
+   * @return string[][]
    */
   public function provider(): array {
     return [
diff --git a/core/modules/ckeditor5/tests/src/Kernel/LanguageTest.php b/core/modules/ckeditor5/tests/src/Kernel/LanguageTest.php
index c5bfa506ac..0b3ddc59ff 100644
--- a/core/modules/ckeditor5/tests/src/Kernel/LanguageTest.php
+++ b/core/modules/ckeditor5/tests/src/Kernel/LanguageTest.php
@@ -94,7 +94,7 @@ public function test(string $drupal_langcode, string $cke5_langcode, bool $is_mi
   /**
    * Provides a list of language code pairs.
    *
-   * @return \string[][]
+   * @return string[][]
    */
   public function provider(): array {
     $random_langcode = $this->randomMachineName();
diff --git a/core/modules/config/tests/config_test/src/ConfigTestController.php b/core/modules/config/tests/config_test/src/ConfigTestController.php
index 3a1b5f53e1..63d03f1478 100644
--- a/core/modules/config/tests/config_test/src/ConfigTestController.php
+++ b/core/modules/config/tests/config_test/src/ConfigTestController.php
@@ -27,7 +27,7 @@ public function editTitle(ConfigTest $config_test) {
   /**
    * Enables a ConfigTest object.
    *
-   * @param \Drupal\config_test\ConfigTest $config_test
+   * @param \Drupal\config_test\Entity\ConfigTest $config_test
    *   The ConfigTest object to enable.
    *
    * @return \Symfony\Component\HttpFoundation\RedirectResponse
@@ -41,7 +41,7 @@ public function enable(ConfigTest $config_test) {
   /**
    * Disables a ConfigTest object.
    *
-   * @param \Drupal\config_test\ConfigTest $config_test
+   * @param \Drupal\config_test\Entity\ConfigTest $config_test
    *   The ConfigTest object to disable.
    *
    * @return \Symfony\Component\HttpFoundation\RedirectResponse
diff --git a/core/modules/content_translation/tests/src/Functional/ContentTranslationWorkflowsTest.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationWorkflowsTest.php
index de500b19fb..c8b740e047 100644
--- a/core/modules/content_translation/tests/src/Functional/ContentTranslationWorkflowsTest.php
+++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationWorkflowsTest.php
@@ -151,7 +151,7 @@ protected function getEditorPermissions() {
   /**
    * Creates a test entity and translate it.
    *
-   * @param Drupal\User\UserInterface|null $user
+   * @param \Drupal\User\UserInterface|null $user
    *   (optional) The entity owner.
    */
   protected function setupEntity(UserInterface $user = NULL) {
diff --git a/core/modules/field/src/Entity/FieldConfig.php b/core/modules/field/src/Entity/FieldConfig.php
index 8067f5be5d..e538897371 100644
--- a/core/modules/field/src/Entity/FieldConfig.php
+++ b/core/modules/field/src/Entity/FieldConfig.php
@@ -374,7 +374,7 @@ public function getUniqueIdentifier() {
    * @param string $field_name
    *   Name of the field.
    *
-   * @return Drupal\field\FieldConfigInterface|null
+   * @return \Drupal\field\FieldConfigInterface|null
    *   The field config entity if one exists for the provided field
    *   name, otherwise NULL.
    */
diff --git a/core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php b/core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php
index 6ea4373422..9305beeb7a 100644
--- a/core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php
+++ b/core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php
@@ -330,7 +330,7 @@ protected function assertFieldSelectOptions(string $name, array $expected_option
   /**
    * Extracts all options from a select element.
    *
-   * @param Behat\Mink\Element\NodeElement $element
+   * @param \Behat\Mink\Element\NodeElement $element
    *   The select element field information.
    *
    * @return array
diff --git a/core/modules/history/src/Controller/HistoryController.php b/core/modules/history/src/Controller/HistoryController.php
index ca3498ead8..2763b15270 100644
--- a/core/modules/history/src/Controller/HistoryController.php
+++ b/core/modules/history/src/Controller/HistoryController.php
@@ -20,7 +20,7 @@ class HistoryController extends ControllerBase {
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   The request of the page.
    *
-   * @return Symfony\Component\HttpFoundation\JsonResponse
+   * @return \Symfony\Component\HttpFoundation\JsonResponse
    *   The JSON response.
    */
   public function getNodeReadTimestamps(Request $request) {
diff --git a/core/modules/jsonapi/src/Normalizer/FieldNormalizer.php b/core/modules/jsonapi/src/Normalizer/FieldNormalizer.php
index 4a0acae15d..e1baf5f78a 100644
--- a/core/modules/jsonapi/src/Normalizer/FieldNormalizer.php
+++ b/core/modules/jsonapi/src/Normalizer/FieldNormalizer.php
@@ -83,7 +83,7 @@ public function denormalize($data, $class, $format = NULL, array $context = []):
    * @param array $context
    *   The context array.
    *
-   * @return \Drupal\jsonapi\Normalizer\Value\FieldItemNormalizerValue[]
+   * @return array
    *   The array of normalized field items.
    */
   protected function normalizeFieldItems(FieldItemListInterface $field, $format, array $context) {
diff --git a/core/modules/menu_ui/tests/src/Functional/MenuUiTest.php b/core/modules/menu_ui/tests/src/Functional/MenuUiTest.php
index bd848ee390..96411404b5 100644
--- a/core/modules/menu_ui/tests/src/Functional/MenuUiTest.php
+++ b/core/modules/menu_ui/tests/src/Functional/MenuUiTest.php
@@ -823,7 +823,7 @@ public function verifyMenuLink(MenuLinkContent $item, $item_node, MenuLinkConten
   /**
    * Changes the parent of a menu link using the UI.
    *
-   * @param \Drupal\menu_link_content\MenuLinkContent $item
+   * @param \Drupal\menu_link_content\Entity\MenuLinkContent $item
    *   The menu link item to move.
    * @param int $parent
    *   The id of the new parent.
diff --git a/core/modules/migrate/src/Plugin/Discovery/ProviderFilterDecorator.php b/core/modules/migrate/src/Plugin/Discovery/ProviderFilterDecorator.php
index 6f5df50959..ef65237711 100644
--- a/core/modules/migrate/src/Plugin/Discovery/ProviderFilterDecorator.php
+++ b/core/modules/migrate/src/Plugin/Discovery/ProviderFilterDecorator.php
@@ -55,7 +55,7 @@ public function __construct(DiscoveryInterface $decorated, callable $provider_ex
    *   A callable, gets passed a provider name, should return TRUE if the
    *   provider exists and FALSE if not.
    *
-   * @return array|\mixed[]
+   * @return array|mixed[]
    *   An array of plugin definitions. If a definition is an array and has a
    *   provider key that provider is guaranteed to exist.
    */
diff --git a/core/modules/migrate/tests/src/Unit/process/LogTest.php b/core/modules/migrate/tests/src/Unit/process/LogTest.php
index 56c6817d52..ea8b31e6cb 100644
--- a/core/modules/migrate/tests/src/Unit/process/LogTest.php
+++ b/core/modules/migrate/tests/src/Unit/process/LogTest.php
@@ -32,7 +32,7 @@ public function testLog($value, $expected_message) {
   /**
    * Provides data for testLog.
    *
-   * @return \string[][]
+   * @return string[][]
    *   An array of test data arrays.
    */
   public function providerTestLog() {
diff --git a/core/modules/system/src/Form/ModulesEnabledTrait.php b/core/modules/system/src/Form/ModulesEnabledTrait.php
index 881d8b3b3d..469ecdd957 100644
--- a/core/modules/system/src/Form/ModulesEnabledTrait.php
+++ b/core/modules/system/src/Form/ModulesEnabledTrait.php
@@ -63,7 +63,7 @@ protected function modulesEnabledConfirmationMessage(array $modules): PluralTran
    *
    * @param string[] $modules
    *   Enabled module names, keyed by machine names.
-   * @param Drupal\Core\Config\PreExistingConfigException $exception
+   * @param \Drupal\Core\Config\PreExistingConfigException $exception
    *   Exception thrown if configuration with the same name already exists.
    *
    * @return \Drupal\Core\StringTranslation\PluralTranslatableMarkup
diff --git a/core/modules/system/tests/modules/menu_test/src/Controller/MenuTestController.php b/core/modules/system/tests/modules/menu_test/src/Controller/MenuTestController.php
index 8472b99a18..de7b7c6590 100644
--- a/core/modules/system/tests/modules/menu_test/src/Controller/MenuTestController.php
+++ b/core/modules/system/tests/modules/menu_test/src/Controller/MenuTestController.php
@@ -37,11 +37,11 @@ class MenuTestController extends ControllerBase {
   /**
    * Constructs the MenuTestController object.
    *
-   * @param \Drupal\menu_test\Controller\ThemeManagerInterface $theme_manager
+   * @param \Drupal\Core\Theme\ThemeManagerInterface $theme_manager
    *   The theme manager.
-   * @param \Drupal\menu_test\Controller\ThemeNegotiatorInterface $theme_negotiator
+   * @param \Drupal\Core\Theme\ThemeNegotiatorInterface $theme_negotiator
    *   The theme negotiator.
-   * @param \Drupal\menu_test\Controller\RouteMatchInterface $route_match
+   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
    *   The current route match.
    */
   public function __construct(ThemeManagerInterface $theme_manager, ThemeNegotiatorInterface $theme_negotiator, RouteMatchInterface $route_match) {
diff --git a/core/modules/user/src/Form/EntityPermissionsForm.php b/core/modules/user/src/Form/EntityPermissionsForm.php
index a787fe3239..d1a49cf456 100644
--- a/core/modules/user/src/Form/EntityPermissionsForm.php
+++ b/core/modules/user/src/Form/EntityPermissionsForm.php
@@ -54,7 +54,7 @@ class EntityPermissionsForm extends UserPermissionsForm {
    *   The role storage.
    * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
    *   The module handler.
-   * @param Drupal\Core\Config\ConfigManagerInterface $config_manager
+   * @param \Drupal\Core\Config\ConfigManagerInterface $config_manager
    *   The configuration entity manager.
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   The entity type manager service.
@@ -116,7 +116,7 @@ function ($dependent_config) {
    *   The current state of the form.
    * @param string $bundle_entity_type
    *   (optional) The entity type ID.
-   * @param string|Drupal\Core\Entity\EntityInterface $bundle
+   * @param string|\Drupal\Core\Entity\EntityInterface $bundle
    *   (optional) Either the bundle name or the bundle object.
    */
   public function buildForm(array $form, FormStateInterface $form_state, string $bundle_entity_type = NULL, $bundle = NULL): array {
diff --git a/core/modules/user/tests/src/Functional/UserAdminTest.php b/core/modules/user/tests/src/Functional/UserAdminTest.php
index 32f9673b72..046a4095c1 100644
--- a/core/modules/user/tests/src/Functional/UserAdminTest.php
+++ b/core/modules/user/tests/src/Functional/UserAdminTest.php
@@ -33,7 +33,7 @@ class UserAdminTest extends BrowserTestBase {
   /**
    * Gets the xpath selector for a user account.
    *
-   * @param \Drupal\user\Entity\UserInterface $user
+   * @param \Drupal\user\UserInterface $user
    *   The user to get the link for.
    *
    * @return string
diff --git a/core/modules/views/tests/src/Kernel/Handler/FilterStringTest.php b/core/modules/views/tests/src/Kernel/Handler/FilterStringTest.php
index 291e658599..98e058763f 100644
--- a/core/modules/views/tests/src/Kernel/Handler/FilterStringTest.php
+++ b/core/modules/views/tests/src/Kernel/Handler/FilterStringTest.php
@@ -71,7 +71,7 @@ protected function dataSet() {
   /**
    * Build and return a Page view of the views_test_data table.
    *
-   * @return view
+   * @return \Drupal\views\ViewExecutable
    */
   protected function getBasicPageView() {
     $view = Views::getView('test_view');
diff --git a/core/tests/Drupal/KernelTests/Core/Plugin/Context/ContextAwarePluginTraitTest.php b/core/tests/Drupal/KernelTests/Core/Plugin/Context/ContextAwarePluginTraitTest.php
index 1cd9e4ada8..6126e0992e 100644
--- a/core/tests/Drupal/KernelTests/Core/Plugin/Context/ContextAwarePluginTraitTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Plugin/Context/ContextAwarePluginTraitTest.php
@@ -28,14 +28,14 @@ class ContextAwarePluginTraitTest extends KernelTestBase {
   /**
    * The plugin instance under test.
    *
-   * @var \Drupal\Core\Plugin\ContextAwarePluginTrait
+   * @var \Drupal\KernelTests\Core\Plugin\Context\TestContextAwarePlugin
    */
   private $plugin;
 
   /**
    * The configurable plugin instance under test.
    *
-   * @var \Drupal\Core\Plugin\ContextAwarePluginTrait
+   * @var \Drupal\KernelTests\Core\Plugin\Context\TestConfigurableContextAwarePlugin
    */
   private $configurablePlugin;
 
diff --git a/core/tests/Drupal/Tests/BrowserTestBase.php b/core/tests/Drupal/Tests/BrowserTestBase.php
index cd75578c4e..06f7a074e3 100644
--- a/core/tests/Drupal/Tests/BrowserTestBase.php
+++ b/core/tests/Drupal/Tests/BrowserTestBase.php
@@ -281,7 +281,7 @@ protected function initFrontPage() {
   /**
    * Gets an instance of the default Mink driver.
    *
-   * @return Behat\Mink\Driver\DriverInterface
+   * @return \Behat\Mink\Driver\DriverInterface
    *   Instance of default Mink driver.
    *
    * @throws \InvalidArgumentException
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php
index d3e148c4cd..2a3126b64d 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php
@@ -415,7 +415,7 @@ public function testUriRelationships() {
    * Returns a mock entity for testing.
    *
    * @param string $class
-   *   The class name to mock. Should be \Drupal\Core\Entity\Entity or a
+   *   The class name to mock. Should be \Drupal\Tests\Core\Entity\UrlTestEntity or a
    *   subclass.
    * @param array $values
    *   An array of entity values to construct the mock entity with.
@@ -423,7 +423,7 @@ public function testUriRelationships() {
    *   (optional) An array of additional methods to mock on the entity object.
    *   The getEntityType() and entityTypeBundleInfo() methods are always mocked.
    *
-   * @return \Drupal\Core\Entity\Entity|\PHPUnit\Framework\MockObject\MockObject
+   * @return \Drupal\Tests\Core\Entity\UrlTestEntity|\PHPUnit\Framework\MockObject\MockObject
    */
   protected function getEntity($class, array $values, array $methods = []) {
     $methods = array_merge($methods, ['getEntityType', 'entityTypeBundleInfo']);
@@ -454,7 +454,7 @@ protected function getEntity($class, array $values, array $methods = []) {
    *   The expected route name of the generated URL.
    * @param array $expected_route_parameters
    *   The expected route parameters of the generated URL.
-   * @param \Drupal\Core\Entity\Entity|\PHPUnit\Framework\MockObject\MockObject $entity
+   * @param \Drupal\Tests\Core\Entity\UrlTestEntity|\PHPUnit\Framework\MockObject\MockObject $entity
    *   The entity that is expected to be set as a URL option.
    * @param bool $has_language
    *   Whether or not the URL is expected to have a language option.
diff --git a/core/tests/Drupal/Tests/Core/Image/ImageTest.php b/core/tests/Drupal/Tests/Core/Image/ImageTest.php
index 4f892fa3a0..0a3c42cd50 100644
--- a/core/tests/Drupal/Tests/Core/Image/ImageTest.php
+++ b/core/tests/Drupal/Tests/Core/Image/ImageTest.php
@@ -73,7 +73,7 @@ protected function getToolkitMock(array $stubs = []) {
    *
    * @param string $class_name
    *   The name of the GD toolkit operation class to be mocked.
-   * @param \Drupal\Core\Image\ImageToolkitInterface $toolkit
+   * @param \Drupal\Core\ImageToolkit\ImageToolkitInterface $toolkit
    *   The image toolkit object.
    *
    * @return \PHPUnit\Framework\MockObject\MockObject