diff --git a/core/core.api.php b/core/core.api.php
index 7c4ebf4..f5c0aa0 100644
--- a/core/core.api.php
+++ b/core/core.api.php
@@ -1955,7 +1955,7 @@ function hook_cron() {
   // Queue news feeds for updates once their refresh interval has elapsed.
   $queue = \Drupal::queue('aggregator_feeds');
   $ids = \Drupal::entityManager()->getStorage('aggregator_feed')->getFeedIdsToRefresh();
-  foreach (Feed::loadMultiple($ids) as $feed) {
+  foreach (\Drupal\aggregator\Entity\Feed::loadMultiple($ids) as $feed) {
     if ($queue->createItem($feed)) {
       // Add timestamp to avoid queueing item more than once.
       $feed->setQueuedTime(REQUEST_TIME);
@@ -1966,7 +1966,7 @@ function hook_cron() {
     ->condition('queued', REQUEST_TIME - (3600 * 6), '<')
     ->execute();
   if ($ids) {
-    $feeds = Feed::loadMultiple($ids);
+    $feeds = \Drupal\aggregator\Entity\Feed::loadMultiple($ids);
     foreach ($feeds as $feed) {
       $feed->setQueuedTime(0);
       $feed->save();
@@ -2109,7 +2109,7 @@ function hook_mail($key, &$message, $params) {
   ];
   if ($context['hook'] == 'taxonomy') {
     $entity = $params['entity'];
-    $vocabulary = Vocabulary::load($entity->id());
+    $vocabulary = \Drupal\taxonomy\Entity\Vocabulary::load($entity->id());
     $variables += [
       '%term_name' => $entity->name,
       '%term_description' => $entity->description,
@@ -2136,7 +2136,7 @@ function hook_mail($key, &$message, $params) {
   $subject = strtr($context['subject'], $variables);
   $body = strtr($context['message'], $variables);
   $message['subject'] .= str_replace(["\r", "\n"], '', $subject);
-  $message['body'][] = MailFormatHelper::htmlToText($body);
+  $message['body'][] = \Drupal\Core\Mail\MailFormatHelper::htmlToText($body);
 }
 
 /**
diff --git a/core/includes/update.inc b/core/includes/update.inc
index 6e0707f..ae3187c 100644
--- a/core/includes/update.inc
+++ b/core/includes/update.inc
@@ -9,6 +9,8 @@
  */
 
 use Drupal\Component\Graph\Graph;
+use Drupal\Core\Language\Language;
+use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Utility\Error;
 
 /**
diff --git a/core/lib/Drupal/Component/Gettext/PoHeader.php b/core/lib/Drupal/Component/Gettext/PoHeader.php
index 5dd13a5..96793b5 100644
--- a/core/lib/Drupal/Component/Gettext/PoHeader.php
+++ b/core/lib/Drupal/Component/Gettext/PoHeader.php
@@ -188,7 +188,7 @@ public function __toString() {
    *   - 'nplurals': The number of plural forms defined by the plural formula.
    *   - 'plurals': Array of plural positions keyed by plural value.
    *
-   * @throws Exception
+   * @throws \Exception
    */
   public function parsePluralForms($pluralforms) {
     $plurals = [];
@@ -473,7 +473,7 @@ private function tokenizeFormula($formula) {
    *   Number of the plural string to be used for the given plural value.
    *
    * @see parseArithmetic()
-   * @throws Exception
+   * @throws \Exception
    */
   protected function evaluatePlural($element_stack, $n) {
     $count = count($element_stack);
diff --git a/core/lib/Drupal/Component/Gettext/PoItem.php b/core/lib/Drupal/Component/Gettext/PoItem.php
index 1f05bbd..c1c3877 100644
--- a/core/lib/Drupal/Component/Gettext/PoItem.php
+++ b/core/lib/Drupal/Component/Gettext/PoItem.php
@@ -104,7 +104,7 @@ public function getSource() {
    * Set the source string or the array of strings if the translation has
    * plurals.
    *
-   * @param string or array $source
+   * @param string|array $source
    */
   public function setSource($source) {
     $this->_source = $source;
@@ -124,7 +124,7 @@ public function getTranslation() {
    * Set the translation string or the array of strings if the translation has
    * plurals.
    *
-   * @param string or array $translation
+   * @param string|array $translation
    */
   public function setTranslation($translation) {
     $this->_translation = $translation;
diff --git a/core/lib/Drupal/Component/Gettext/PoStreamReader.php b/core/lib/Drupal/Component/Gettext/PoStreamReader.php
index f84d251..e5972a2 100644
--- a/core/lib/Drupal/Component/Gettext/PoStreamReader.php
+++ b/core/lib/Drupal/Component/Gettext/PoStreamReader.php
@@ -146,7 +146,7 @@ public function setURI($uri) {
    * Opens the stream and reads the header. The stream is ready for reading
    * items after.
    *
-   * @throws Exception
+   * @throws \Exception
    *   If the URI is not yet set.
    */
   public function open() {
@@ -162,7 +162,7 @@ public function open() {
   /**
    * Implements Drupal\Component\Gettext\PoStreamInterface::close().
    *
-   * @throws Exception
+   * @throws \Exception
    *   If the stream is not open.
    */
   public function close() {
diff --git a/core/lib/Drupal/Component/Gettext/PoStreamWriter.php b/core/lib/Drupal/Component/Gettext/PoStreamWriter.php
index f5ffc85..d12c831 100644
--- a/core/lib/Drupal/Component/Gettext/PoStreamWriter.php
+++ b/core/lib/Drupal/Component/Gettext/PoStreamWriter.php
@@ -81,7 +81,7 @@ public function open() {
   /**
    * Implements Drupal\Component\Gettext\PoStreamInterface::close().
    *
-   * @throws Exception
+   * @throws \Exception
    *   If the stream is not open.
    */
   public function close() {
@@ -89,7 +89,7 @@ public function close() {
       fclose($this->_fd);
     }
     else {
-      throw new Exception('Cannot close stream that is not open.');
+      throw new \Exception('Cannot close stream that is not open.');
     }
   }
 
@@ -100,13 +100,13 @@ public function close() {
    *   Piece of string to write to the stream. If the value is not directly a
    *   string, casting will happen in writing.
    *
-   * @throws Exception
+   * @throws \Exception
    *   If writing the data is not possible.
    */
   private function write($data) {
     $result = fputs($this->_fd, $data);
     if ($result === FALSE) {
-      throw new Exception('Unable to write data: ' . substr($data, 0, 20));
+      throw new \Exception('Unable to write data: ' . substr($data, 0, 20));
     }
   }
 
@@ -137,12 +137,12 @@ public function writeItems(PoReaderInterface $reader, $count = -1) {
   /**
    * Implements Drupal\Component\Gettext\PoStreamInterface::getURI().
    *
-   * @throws Exception
+   * @throws \Exception
    *   If the URI is not set.
    */
   public function getURI() {
     if (empty($this->_uri)) {
-      throw new Exception('No URI set.');
+      throw new \Exception('No URI set.');
     }
     return $this->_uri;
   }
diff --git a/core/lib/Drupal/Core/Archiver/ArchiveTar.php b/core/lib/Drupal/Core/Archiver/ArchiveTar.php
index 24085ce..a20ca74 100644
--- a/core/lib/Drupal/Core/Archiver/ArchiveTar.php
+++ b/core/lib/Drupal/Core/Archiver/ArchiveTar.php
@@ -632,7 +632,8 @@ public function extractModify($p_path, $p_remove_path, $p_preserve = false)
      *
      * @param string $p_filename The path of the file to extract in a string.
      *
-     * @return a string with the file content or NULL.
+     * @return string|null $v_result
+     *   A string with the file content or NULL.
      */
     public function extractInString($p_filename)
     {
@@ -1856,7 +1857,8 @@ public function _readLongHeader(&$v_header)
      *
      * @param string $p_filename The path of the file to extract in a string.
      *
-     * @return a string with the file content or null.
+     * @return string|null $v_result_str
+     *   A string with the file content or null.
      */
     private function _extractInString($p_filename)
     {
diff --git a/core/lib/Drupal/Core/Archiver/Tar.php b/core/lib/Drupal/Core/Archiver/Tar.php
index 3b33ddd..8aa870c 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 \Archive_Tar
    *   The Archive_Tar object used by this object.
    */
   public function getArchive() {
diff --git a/core/lib/Drupal/Core/Config/DatabaseStorage.php b/core/lib/Drupal/Core/Config/DatabaseStorage.php
index 1368dff..a3725a4 100644
--- a/core/lib/Drupal/Core/Config/DatabaseStorage.php
+++ b/core/lib/Drupal/Core/Config/DatabaseStorage.php
@@ -214,7 +214,7 @@ protected static function schemaDefinition() {
   /**
    * Implements Drupal\Core\Config\StorageInterface::delete().
    *
-   * @throws PDOException
+   * @throws \PDOException
    *
    * @todo Ignore replica targets for data manipulation operations.
    */
@@ -230,7 +230,7 @@ public function delete($name) {
   /**
    * Implements Drupal\Core\Config\StorageInterface::rename().
    *
-   * @throws PDOException
+   * @throws \PDOException
    */
   public function rename($name, $new_name) {
     $options = ['return' => Database::RETURN_AFFECTED] + $this->options;
@@ -251,7 +251,7 @@ public function encode($data) {
   /**
    * Implements Drupal\Core\Config\StorageInterface::decode().
    *
-   * @throws ErrorException
+   * @throws \ErrorException
    *   The unserialize() call will trigger E_NOTICE if the string cannot
    *   be unserialized.
    */
diff --git a/core/lib/Drupal/Core/Database/StatementPrefetch.php b/core/lib/Drupal/Core/Database/StatementPrefetch.php
index 8025220..af9790c 100644
--- a/core/lib/Drupal/Core/Database/StatementPrefetch.php
+++ b/core/lib/Drupal/Core/Database/StatementPrefetch.php
@@ -20,7 +20,7 @@ class StatementPrefetch implements \Iterator, StatementInterface {
   /**
    * Driver-specific options. Can be used by child classes.
    *
-   * @var Array
+   * @var array
    */
   protected $driverOptions;
 
@@ -41,14 +41,14 @@ class StatementPrefetch implements \Iterator, StatementInterface {
   /**
    * Main data store.
    *
-   * @var Array
+   * @var array
    */
   protected $data = [];
 
   /**
    * The current row, retrieved in \PDO::FETCH_ASSOC format.
    *
-   * @var Array
+   * @var array
    */
   protected $currentRow = NULL;
 
@@ -62,7 +62,7 @@ class StatementPrefetch implements \Iterator, StatementInterface {
   /**
    * The list of column names in this result set.
    *
-   * @var Array
+   * @var array
    */
   protected $columnNames = NULL;
 
@@ -91,7 +91,7 @@ class StatementPrefetch implements \Iterator, StatementInterface {
   /**
    * Holds supplementary current fetch options (which will be used by the next fetch).
    *
-   * @var Array
+   * @var array
    */
   protected $fetchOptions = [
     'class' => 'stdClass',
@@ -110,7 +110,7 @@ class StatementPrefetch implements \Iterator, StatementInterface {
   /**
    * Holds supplementary default fetch options.
    *
-   * @var Array
+   * @var array
    */
   protected $defaultFetchOptions = [
     'class' => 'stdClass',
diff --git a/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php b/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
index e45cb88..e4c2a8a 100644
--- a/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
+++ b/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
@@ -6,6 +6,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder as SymfonyContainerBuilder;
 use Symfony\Component\DependencyInjection\Container as SymfonyContainer;
 use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Exception\InactiveScopeException;
 use Symfony\Component\DependencyInjection\LazyProxy\Instantiator\RealServiceInstantiator;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 
@@ -34,7 +35,7 @@ public function __construct(ParameterBagInterface $parameterBag = NULL) {
   /**
    * Retrieves the currently set proxy instantiator or instantiates one.
    *
-   * @return InstantiatorInterface
+   * @return \Symfony\Component\DependencyInjection\LazyProxy\Instantiator\RealServiceInstantiator
    */
   private function getProxyInstantiator()
   {
diff --git a/core/lib/Drupal/Core/Entity/entity.api.php b/core/lib/Drupal/Core/Entity/entity.api.php
index f9f4271..d6ea0b8 100644
--- a/core/lib/Drupal/Core/Entity/entity.api.php
+++ b/core/lib/Drupal/Core/Entity/entity.api.php
@@ -10,6 +10,7 @@
 use Drupal\Core\Entity\DynamicallyFieldableEntityStorageInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Render\Element;
+use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\language\Entity\ContentLanguageSettings;
 use Drupal\node\Entity\NodeType;
 
diff --git a/core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php
index 81dd1ef..45af796 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\PostResponseEvent $event
+   * @param \Symfony\Component\HttpKernel\Event\PostResponseEvent $event
    *   The Event to process.
    */
   public function onTerminate(PostResponseEvent $event) {
diff --git a/core/lib/Drupal/Core/Menu/menu.api.php b/core/lib/Drupal/Core/Menu/menu.api.php
index 12e85ee..8eaf396 100644
--- a/core/lib/Drupal/Core/Menu/menu.api.php
+++ b/core/lib/Drupal/Core/Menu/menu.api.php
@@ -312,7 +312,7 @@ function hook_menu_local_tasks_alter(&$data, $route_name) {
       '#theme' => 'menu_local_task',
       '#link' => [
           'title' => t('Example tab'),
-          'url' => Url::fromRoute('node.add_page'),
+          'url' => \Drupal\core\Url::fromRoute('node.add_page'),
           'localized_options' => [
               'attributes' => [
                   'title' => t('Add content'),
diff --git a/core/lib/Drupal/Core/Session/SessionManager.php b/core/lib/Drupal/Core/Session/SessionManager.php
index 95495cf..15bfb5c 100644
--- a/core/lib/Drupal/Core/Session/SessionManager.php
+++ b/core/lib/Drupal/Core/Session/SessionManager.php
@@ -78,7 +78,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\NativeSessionHandler|\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/TypedData/Plugin/DataType/Language.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Language.php
index 9f74c4f..a1ef639 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\LanguageInterface
    */
   protected $language;
 
diff --git a/core/modules/block/tests/src/Kernel/BlockViewBuilderTest.php b/core/modules/block/tests/src/Kernel/BlockViewBuilderTest.php
index 71c4f55..c284661 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\Entity\Block
    */
   protected $block;
 
diff --git a/core/modules/comment/src/Tests/Views/DefaultViewRecentCommentsTest.php b/core/modules/comment/src/Tests/Views/DefaultViewRecentCommentsTest.php
index 3e5f26b..080b427 100644
--- a/core/modules/comment/src/Tests/Views/DefaultViewRecentCommentsTest.php
+++ b/core/modules/comment/src/Tests/Views/DefaultViewRecentCommentsTest.php
@@ -55,7 +55,7 @@ class DefaultViewRecentCommentsTest extends ViewTestBase {
   /**
    * Contains the node object used for comments of this test.
    *
-   * @var \Drupal\node\Node
+   * @var \Drupal\node\Entity\Node
    */
   public $node;
 
diff --git a/core/modules/config/tests/config_override_test/src/ConfigOverrider.php b/core/modules/config/tests/config_override_test/src/ConfigOverrider.php
index c8ffc69..8ec572e 100644
--- a/core/modules/config/tests/config_override_test/src/ConfigOverrider.php
+++ b/core/modules/config/tests/config_override_test/src/ConfigOverrider.php
@@ -4,6 +4,7 @@
 
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Config\ConfigFactoryOverrideInterface;
+use Drupal\Core\Config\StorageInterface;
 
 /**
  * Tests module overrides for configuration.
diff --git a/core/modules/config/tests/config_test/src/ConfigTestController.php b/core/modules/config/tests/config_test/src/ConfigTestController.php
index d352eca..6e80353 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/config_translation/config_translation.api.php b/core/modules/config_translation/config_translation.api.php
index f97e259..b7d2b98 100644
--- a/core/modules/config_translation/config_translation.api.php
+++ b/core/modules/config_translation/config_translation.api.php
@@ -44,7 +44,7 @@ function hook_config_translation_info(&$info) {
       try {
         $base_route = $route_provider->getRouteByName('entity.field_config.' . $entity_type_id . '_field_edit_form');
       }
-      catch (RouteNotFoundException $e) {
+      catch (\Symfony\Component\Routing\Exception\RouteNotFoundException $e) {
         // Ignore non-existent routes.
       }
 
diff --git a/core/modules/field/field.purge.inc b/core/modules/field/field.purge.inc
index 519c6af..9a033c8 100644
--- a/core/modules/field/field.purge.inc
+++ b/core/modules/field/field.purge.inc
@@ -156,7 +156,7 @@ function field_purge_field(FieldConfigInterface $field) {
  * @param \Drupal\field\FieldStorageConfigInterface $field_storage
  *   The field storage to purge.
  *
- * @throws Drupal\field\FieldException
+ * @throws \Drupal\Core\Field\FieldException
  */
 function field_purge_field_storage(FieldStorageConfigInterface $field_storage) {
   $fields = entity_load_multiple_by_properties('field_config', ['field_storage_uuid' => $field_storage->uuid(), 'include_deleted' => TRUE]);
diff --git a/core/modules/field/src/FieldStorageConfigStorage.php b/core/modules/field/src/FieldStorageConfigStorage.php
index 7a793f6..04e1531 100644
--- a/core/modules/field/src/FieldStorageConfigStorage.php
+++ b/core/modules/field/src/FieldStorageConfigStorage.php
@@ -64,7 +64,7 @@ class FieldStorageConfigStorage extends ConfigEntityStorage {
    *   The module handler.
    * @param \Drupal\Core\State\StateInterface $state
    *   The state key value store.
-   * @param \Drupal\Component\Plugin\PluginManagerInterface\FieldTypePluginManagerInterface $field_type_manager
+   * @param \Drupal\Core\Field\FieldTypePluginManagerInterface $field_type_manager
    *   The field type plugin manager.
    */
   public function __construct(EntityTypeInterface $entity_type, ConfigFactoryInterface $config_factory, UuidInterface $uuid_service, LanguageManagerInterface $language_manager, EntityManagerInterface $entity_manager, ModuleHandlerInterface $module_handler, StateInterface $state, FieldTypePluginManagerInterface $field_type_manager) {
diff --git a/core/modules/filter/tests/src/Kernel/FilterKernelTest.php b/core/modules/filter/tests/src/Kernel/FilterKernelTest.php
index cf72bbe..1d0b4d5 100644
--- a/core/modules/filter/tests/src/Kernel/FilterKernelTest.php
+++ b/core/modules/filter/tests/src/Kernel/FilterKernelTest.php
@@ -855,7 +855,7 @@ public function testUrlFilter() {
   /**
    * Asserts multiple filter output expectations for multiple input strings.
    *
-   * @param FilterInterface $filter
+   * @param \Drupal\filter\Plugin\FilterInterface $filter
    *   A input filter object.
    * @param array $tests
    *   An associative array, whereas each key is an arbitrary input string and
diff --git a/core/modules/hal/src/LinkManager/TypeLinkManager.php b/core/modules/hal/src/LinkManager/TypeLinkManager.php
index c3a948f..a66b347 100644
--- a/core/modules/hal/src/LinkManager/TypeLinkManager.php
+++ b/core/modules/hal/src/LinkManager/TypeLinkManager.php
@@ -5,6 +5,7 @@
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Config\Entity\ConfigEntityInterface;
 use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
diff --git a/core/modules/history/src/Controller/HistoryController.php b/core/modules/history/src/Controller/HistoryController.php
index 6a4e80a..b4625a4 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/language/src/Entity/ConfigurableLanguage.php b/core/modules/language/src/Entity/ConfigurableLanguage.php
index c277a85..dc5eab4 100644
--- a/core/modules/language/src/Entity/ConfigurableLanguage.php
+++ b/core/modules/language/src/Entity/ConfigurableLanguage.php
@@ -144,7 +144,7 @@ public function postSave(EntityStorageInterface $storage, $update = TRUE) {
   /**
    * {@inheritdoc}
    *
-   * @throws \DeleteDefaultLanguageException
+   * @throws \Drupal\language\Exception\DeleteDefaultLanguageException
    *   Exception thrown if we're trying to delete the default language entity.
    *   This is not allowed as a site must have a default language.
    */
diff --git a/core/modules/locale/src/PoDatabaseReader.php b/core/modules/locale/src/PoDatabaseReader.php
index 55c2b69..4ed7663 100644
--- a/core/modules/locale/src/PoDatabaseReader.php
+++ b/core/modules/locale/src/PoDatabaseReader.php
@@ -91,7 +91,7 @@ public function getHeader() {
   /**
    * Implements Drupal\Component\Gettext\PoMetadataInterface::setHeader().
    *
-   * @throws Exception
+   * @throws \Exception
    *   Always, because you cannot set the PO header of a reader.
    */
   public function setHeader(PoHeader $header) {
diff --git a/core/modules/locale/src/PoDatabaseWriter.php b/core/modules/locale/src/PoDatabaseWriter.php
index 988f7f3..b68ba05 100644
--- a/core/modules/locale/src/PoDatabaseWriter.php
+++ b/core/modules/locale/src/PoDatabaseWriter.php
@@ -144,7 +144,7 @@ public function getHeader() {
    * @param \Drupal\Component\Gettext\PoHeader $header
    *   Header metadata.
    *
-   * @throws Exception
+   * @throws \Exception
    */
   public function setHeader(PoHeader $header) {
     $this->header = $header;
diff --git a/core/modules/migrate/tests/src/Unit/process/IteratorTest.php b/core/modules/migrate/tests/src/Unit/process/IteratorTest.php
index 993fb92..1c33687 100644
--- a/core/modules/migrate/tests/src/Unit/process/IteratorTest.php
+++ b/core/modules/migrate/tests/src/Unit/process/IteratorTest.php
@@ -18,7 +18,7 @@ class IteratorTest extends MigrateTestCase {
   /**
    * The iterator plugin being tested.
    *
-   * @var \Drupal\migrate\Plugin\migrate\process\TestIterator
+   * @var \Drupal\migrate\Plugin\migrate\process\Iterator
    */
   protected $plugin;
 
diff --git a/core/modules/migrate_drupal/tests/src/Kernel/d6/EntityContentBaseTest.php b/core/modules/migrate_drupal/tests/src/Kernel/d6/EntityContentBaseTest.php
index 9c5ee58..d7f35e0 100644
--- a/core/modules/migrate_drupal/tests/src/Kernel/d6/EntityContentBaseTest.php
+++ b/core/modules/migrate_drupal/tests/src/Kernel/d6/EntityContentBaseTest.php
@@ -95,7 +95,7 @@ public function testUntranslatable() {
     $this->enableModules(['language_test']);
     $this->installEntitySchema('no_language_entity_test');
 
-    /** @var MigrationInterface $migration */
+    /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
     $migration = \Drupal::service('plugin.manager.migration')->createStubMigration([
       'source' => [
         'plugin' => 'embedded_data',
diff --git a/core/modules/node/node.api.php b/core/modules/node/node.api.php
index 6041874..a1b8d58 100644
--- a/core/modules/node/node.api.php
+++ b/core/modules/node/node.api.php
@@ -492,7 +492,7 @@ function hook_node_links_alter(array &$links, NodeInterface $entity, array &$con
     '#links' => [
       'node-report' => [
         'title' => t('Report'),
-        'url' => Url::fromRoute('node_test.report', ['node' => $entity->id()], ['query' => ['token' => \Drupal::getContainer()->get('csrf_token')->get("node/{$entity->id()}/report")]]),
+        'url' => \Drupal\core\Url::fromRoute('node_test.report', ['node' => $entity->id()], ['query' => ['token' => \Drupal::getContainer()->get('csrf_token')->get("node/{$entity->id()}/report")]]),
       ],
     ],
   ];
diff --git a/core/modules/node/node.views_execution.inc b/core/modules/node/node.views_execution.inc
index 4d834a1..6132e50 100644
--- a/core/modules/node/node.views_execution.inc
+++ b/core/modules/node/node.views_execution.inc
@@ -6,6 +6,7 @@
  */
 
 use Drupal\user\RoleInterface;
+use Drupal\views\Analyzer;
 use Drupal\views\ViewExecutable;
 use Drupal\user\Entity\Role;
 
diff --git a/core/modules/node/src/Plugin/views/argument/Vid.php b/core/modules/node/src/Plugin/views/argument/Vid.php
index 1cad35c..5c0784e 100644
--- a/core/modules/node/src/Plugin/views/argument/Vid.php
+++ b/core/modules/node/src/Plugin/views/argument/Vid.php
@@ -68,7 +68,7 @@ public static function create(ContainerInterface $container, array $configuratio
   public function titleQuery() {
     $titles = [];
 
-    $results = $this->database->query('SELECT nr.vid, nr.nid, npr.title FROM {node_revision} nr WHERE nr.vid IN ( :vids[] )', [':vids[]' => $this->value])->fetchAllAssoc('vid', PDO::FETCH_ASSOC);
+    $results = $this->database->query('SELECT nr.vid, nr.nid, npr.title FROM {node_revision} nr WHERE nr.vid IN ( :vids[] )', [':vids[]' => $this->value])->fetchAllAssoc('vid', \PDO::FETCH_ASSOC);
     $nids = [];
     foreach ($results as $result) {
       $nids[] = $result['nid'];
diff --git a/core/modules/node/src/Tests/Views/PathPluginTest.php b/core/modules/node/src/Tests/Views/PathPluginTest.php
index 6558f00..a3895a6 100644
--- a/core/modules/node/src/Tests/Views/PathPluginTest.php
+++ b/core/modules/node/src/Tests/Views/PathPluginTest.php
@@ -28,7 +28,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/search/src/SearchQuery.php b/core/modules/search/src/SearchQuery.php
index dbd0534..a6a5a85 100644
--- a/core/modules/search/src/SearchQuery.php
+++ b/core/modules/search/src/SearchQuery.php
@@ -112,7 +112,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 DatabaseCondition
+   * @var \Drupal\Core\Database\Query\Condition
    */
   protected $conditions;
 
diff --git a/core/modules/simpletest/src/TestBase.php b/core/modules/simpletest/src/TestBase.php
index 1491cc2..d45077e 100644
--- a/core/modules/simpletest/src/TestBase.php
+++ b/core/modules/simpletest/src/TestBase.php
@@ -48,7 +48,7 @@
   /**
    * Current results of this test case.
    *
-   * @var Array
+   * @var array
    */
   public $results = [
     '#pass' => 0,
@@ -60,7 +60,7 @@
   /**
    * Assertions thrown in that test case.
    *
-   * @var Array
+   * @var array
    */
   protected $assertions = [];
 
diff --git a/core/modules/simpletest/src/Tests/SimpleTestTest.php b/core/modules/simpletest/src/Tests/SimpleTestTest.php
index a32c142..5f412c9 100644
--- a/core/modules/simpletest/src/Tests/SimpleTestTest.php
+++ b/core/modules/simpletest/src/Tests/SimpleTestTest.php
@@ -297,7 +297,8 @@ public function getTestIdFromResults() {
    * @param string $function
    *   Function where the assertion originated.
    *
-   * @return Assertion result.
+   * @return bool
+   *   Assertion result.
    */
   public function assertAssertion($message, $type, $status, $file, $function) {
     $message = trim(strip_tags($message));
diff --git a/core/modules/simpletest/src/WebTestBase.php b/core/modules/simpletest/src/WebTestBase.php
index 986410d..079f9ba 100644
--- a/core/modules/simpletest/src/WebTestBase.php
+++ b/core/modules/simpletest/src/WebTestBase.php
@@ -91,7 +91,7 @@
   /**
    * The headers of the page currently loaded in the internal browser.
    *
-   * @var Array
+   * @var array
    */
   protected $headers;
 
diff --git a/core/modules/statistics/src/StatisticsStorageInterface.php b/core/modules/statistics/src/StatisticsStorageInterface.php
index ccb51e4..2abb6a3 100644
--- a/core/modules/statistics/src/StatisticsStorageInterface.php
+++ b/core/modules/statistics/src/StatisticsStorageInterface.php
@@ -27,7 +27,7 @@ public function recordView($id);
    * @param array $ids
    *   An array of IDs of entities to fetch the views for.
    *
-   * @return array \Drupal\statistics\StatisticsViewsResult
+   * @return \Drupal\statistics\StatisticsViewsResult[]
    */
   public function fetchViews($ids);
 
diff --git a/core/modules/statistics/statistics.module b/core/modules/statistics/statistics.module
index a7f1e10..7798a6a 100644
--- a/core/modules/statistics/statistics.module
+++ b/core/modules/statistics/statistics.module
@@ -87,7 +87,7 @@ function statistics_cron() {
  * @param int $dbrows
  *   The number of rows to be returned.
  *
- * @return SelectQuery|false
+ * @return \Drupal\Core\Database\Query\SelectInterface|false
  *   A query result containing the node ID, title, user ID that owns the node,
  *   and the username for the selected node(s), or FALSE if the query could not
  *   be executed correctly.
diff --git a/core/modules/system/src/Tests/Common/SimpleTestErrorCollectorTest.php b/core/modules/system/src/Tests/Common/SimpleTestErrorCollectorTest.php
index 9af773b..433103e 100644
--- a/core/modules/system/src/Tests/Common/SimpleTestErrorCollectorTest.php
+++ b/core/modules/system/src/Tests/Common/SimpleTestErrorCollectorTest.php
@@ -24,7 +24,7 @@ class SimpleTestErrorCollectorTest extends WebTestBase {
    * Errors are intercepted by the overridden implementation
    * of Drupal\simpletest\WebTestBase::error() below.
    *
-   * @var Array
+   * @var array
    */
   protected $collectedErrors = [];
 
diff --git a/core/modules/system/src/Tests/Session/SessionTest.php b/core/modules/system/src/Tests/Session/SessionTest.php
index fcadd42..56d3689 100644
--- a/core/modules/system/src/Tests/Session/SessionTest.php
+++ b/core/modules/system/src/Tests/Session/SessionTest.php
@@ -282,7 +282,8 @@ public function testEmptySessionID() {
   /**
    * Reset the cookie file so that it refers to the specified user.
    *
-   * @param $uid User id to set as the active session.
+   * @param int $uid
+   *   User id to set as the active session.
    */
   public function sessionReset($uid = 0) {
     // Close the internal browser.
diff --git a/core/modules/system/src/Tests/Theme/EntityFilteringThemeTest.php b/core/modules/system/src/Tests/Theme/EntityFilteringThemeTest.php
index 10eda61..35cf59c 100644
--- a/core/modules/system/src/Tests/Theme/EntityFilteringThemeTest.php
+++ b/core/modules/system/src/Tests/Theme/EntityFilteringThemeTest.php
@@ -41,7 +41,7 @@ class EntityFilteringThemeTest extends WebTestBase {
   /**
    * A test user.
    *
-   * @var \Drupal\user\User
+   * @var \Drupal\user\UserInterface
    */
   protected $user;
 
@@ -49,7 +49,7 @@ class EntityFilteringThemeTest extends WebTestBase {
   /**
    * A test node.
    *
-   * @var \Drupal\node\Node
+   * @var \Drupal\node\Entity\Node
    */
   protected $node;
 
@@ -57,7 +57,7 @@ class EntityFilteringThemeTest extends WebTestBase {
   /**
    * A test taxonomy term.
    *
-   * @var \Drupal\taxonomy\Term
+   * @var \Drupal\taxonomy\Entity\Term
    */
   protected $term;
 
@@ -65,7 +65,7 @@ class EntityFilteringThemeTest extends WebTestBase {
   /**
    * A test comment.
    *
-   * @var \Drupal\comment\Comment
+   * @var \Drupal\comment\Entity\Comment
    */
   protected $comment;
 
diff --git a/core/modules/system/tests/modules/form_test/src/Form/FormTestVerticalTabsForm.php b/core/modules/system/tests/modules/form_test/src/Form/FormTestVerticalTabsForm.php
index b89636a..042fe5b 100644
--- a/core/modules/system/tests/modules/form_test/src/Form/FormTestVerticalTabsForm.php
+++ b/core/modules/system/tests/modules/form_test/src/Form/FormTestVerticalTabsForm.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\form_test\Form;
 
+use Drupal\Component\Serialization\Json;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 
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 fe6566c..258f5f7 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/system/tests/src/Functional/FileTransfer/FileTransferTest.php b/core/modules/system/tests/src/Functional/FileTransfer/FileTransferTest.php
index 76d8be8..8280cfc 100644
--- a/core/modules/system/tests/src/Functional/FileTransfer/FileTransferTest.php
+++ b/core/modules/system/tests/src/Functional/FileTransfer/FileTransferTest.php
@@ -44,7 +44,7 @@ public function _buildFakeModule() {
       $output = [];
       exec('rm -Rf ' . escapeshellarg($location), $output, $ret);
       if ($ret != 0) {
-        throw new Exception('Error removing fake module directory.');
+        throw new \Exception('Error removing fake module directory.');
       }
     }
 
diff --git a/core/modules/taxonomy/src/Plugin/migrate/D7TaxonomyTermDeriver.php b/core/modules/taxonomy/src/Plugin/migrate/D7TaxonomyTermDeriver.php
index b66a5cf..bb57a73 100644
--- a/core/modules/taxonomy/src/Plugin/migrate/D7TaxonomyTermDeriver.php
+++ b/core/modules/taxonomy/src/Plugin/migrate/D7TaxonomyTermDeriver.php
@@ -106,7 +106,7 @@ public function getDerivativeDefinitions($base_plugin_definition) {
         $values['source']['bundle'] = $bundle;
         $values['destination']['default_bundle'] = $bundle;
 
-        /** @var Migration $migration */
+        /** @var \Drupal\migrate\Plugin\Migration $migration */
         $migration = \Drupal::service('plugin.manager.migration')->createStubMigration($values);
         if (isset($fields[$bundle])) {
           foreach ($fields[$bundle] as $field_name => $info) {
diff --git a/core/modules/update/update.authorize.inc b/core/modules/update/update.authorize.inc
index 1c2cc60..d79fdc7 100644
--- a/core/modules/update/update.authorize.inc
+++ b/core/modules/update/update.authorize.inc
@@ -10,6 +10,7 @@
  * the Update Manager module.
  */
 
+use Drupal\Core\FileTransfer\FileTransfer;
 use Drupal\Core\Updater\UpdaterException;
 use Drupal\Core\Url;
 
diff --git a/core/modules/update/update.manager.inc b/core/modules/update/update.manager.inc
index e796007..4b6ee37 100644
--- a/core/modules/update/update.manager.inc
+++ b/core/modules/update/update.manager.inc
@@ -142,7 +142,7 @@ function _update_manager_check_backends(&$form, $operation) {
  * @param string $directory
  *   The directory you wish to extract the archive into.
  *
- * @return Archiver
+ * @return \Drupal\Core\Archiver\Annotation\Archiver
  *   The Archiver object used to extract the archive.
  *
  * @throws Exception
diff --git a/core/modules/user/src/Tests/UserRegistrationTest.php b/core/modules/user/src/Tests/UserRegistrationTest.php
index ca7a4f0..8f02991 100644
--- a/core/modules/user/src/Tests/UserRegistrationTest.php
+++ b/core/modules/user/src/Tests/UserRegistrationTest.php
@@ -41,7 +41,7 @@ public function testRegistrationWithEmailVerification() {
     $this->drupalPostForm('user/register', $edit, t('Create new account'));
     $this->assertText(t('A welcome message with further instructions has been sent to your email address.'), 'User registered successfully.');
 
-    /** @var EntityStorageInterface $storage */
+    /** @var \Drupal\Core\Entity\EntityStorageInterface $storage */
     $storage = $this->container->get('entity_type.manager')->getStorage('user');
     $accounts = $storage->loadByProperties(['name' => $name, 'mail' => $mail]);
     $new_user = reset($accounts);
diff --git a/core/modules/user/tests/src/Kernel/Condition/UserRoleConditionTest.php b/core/modules/user/tests/src/Kernel/Condition/UserRoleConditionTest.php
index 075b04c..63af895 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\Entity\Role
    */
   protected $role;
 
diff --git a/core/modules/views/src/Plugin/views/filter/Combine.php b/core/modules/views/src/Plugin/views/filter/Combine.php
index f8ea624..b4189e2 100644
--- a/core/modules/views/src/Plugin/views/filter/Combine.php
+++ b/core/modules/views/src/Plugin/views/filter/Combine.php
@@ -15,7 +15,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 a2c2e10..483eb10 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 @@
   /**
    * A pager plugin that should be provided by the display.
    *
-   * @var views_plugin_pager
+   * @var \Drupal\views\Plugin\views\pager\PagerPluginBase
    */
   public $pager = NULL;
 
@@ -59,7 +59,7 @@ public function query($get_count = FALSE) { }
   /**
    * Let modules modify the query just prior to finalizing it.
    *
-   * @param view $view
+   * @param \Drupal\views\ViewExecutable $view
    *   The view which is executed.
    */
   public function alter(ViewExecutable $view) {  }
@@ -67,7 +67,7 @@ public function alter(ViewExecutable $view) {  }
   /**
    * Builds the necessary info to execute the query.
    *
-   * @param view $view
+   * @param \Drupal\views\ViewExecutable $view
    *   The view which is executed.
    */
   public function build(ViewExecutable $view) { }
@@ -82,7 +82,7 @@ public function build(ViewExecutable $view) { }
    * $view->result should contain an array of objects. The array must use a
    * numeric index starting at 0.
    *
-   * @param view $view
+   * @param \Drupal\views\ViewExecutable $view
    *   The view which is executed.
    */
   public function execute(ViewExecutable $view) {  }
@@ -93,7 +93,7 @@ public function execute(ViewExecutable $view) {  }
    * This signature is something that can be used when perusing query logs to
    * discern where particular queries might be coming from.
    *
-   * @param view $view
+   * @param \Drupal\views\ViewExecutable $view
    *   The view which is executed.
    */
   public function addSignature(ViewExecutable $view) { }
diff --git a/core/modules/views/tests/src/Kernel/Handler/FilterStringTest.php b/core/modules/views/tests/src/Kernel/Handler/FilterStringTest.php
index c24cc6f..0619dcf 100644
--- a/core/modules/views/tests/src/Kernel/Handler/FilterStringTest.php
+++ b/core/modules/views/tests/src/Kernel/Handler/FilterStringTest.php
@@ -68,7 +68,7 @@ protected function dataSet() {
   /**
    * Build and return a Page view of the views_test_data table.
    *
-   * @return view
+   * @return \Drupal\views\ViewExecutable $view
    */
   protected function getBasicPageView() {
     $view = Views::getView('test_view');
diff --git a/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php b/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
index c89554a..444b7a6 100644
--- a/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
+++ b/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
@@ -29,7 +29,7 @@ class RouteSubscriberTest extends UnitTestCase {
   /**
    * The mocked view storage.
    *
-   * @var \Drupal\views\ViewStorage|\PHPUnit_Framework_MockObject_MockObject
+   * @var \Drupal\Core\Config\Entity\ConfigEntityStorage|\PHPUnit_Framework_MockObject_MockObject
    */
   protected $viewStorage;
 
@@ -139,7 +139,7 @@ public function testOnAlterRoutes() {
   /**
    * Sets up mocks of Views objects needed for testing.
    *
-   * @return array \Drupal\views\Plugin\views\display\DisplayRouterInterface[]|\PHPUnit_Framework_MockObject_MockObject[]
+   * @return \Drupal\views\Plugin\views\display\DisplayRouterInterface[]|\PHPUnit_Framework_MockObject_MockObject[]
    *   An array of two mocked view displays
    */
   protected function setupMocks() {
diff --git a/core/modules/views/views.api.php b/core/modules/views/views.api.php
index c21b9c5..ef3994d 100644
--- a/core/modules/views/views.api.php
+++ b/core/modules/views/views.api.php
@@ -8,6 +8,7 @@
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\views\Plugin\views\cache\CachePluginBase;
 use Drupal\views\Plugin\views\PluginBase;
+use Drupal\views\Plugin\views\query\QueryPluginBase;
 use Drupal\views\ViewExecutable;
 
 /**
@@ -865,7 +866,7 @@ function hook_views_post_render(ViewExecutable $view, &$output, CachePluginBase
  *
  * @param \Drupal\views\ViewExecutable $view
  *   The view object about to be processed.
- * @param QueryPluginBase $query
+ * @param \Drupal\views\Plugin\views\query\QueryPluginBase $query
  *   The query plugin object for the query.
  *
  * @see hook_views_query_substitutions()
diff --git a/core/modules/views_ui/src/Tests/ReportTest.php b/core/modules/views_ui/src/Tests/ReportTest.php
index 0162519..90492bb 100644
--- a/core/modules/views_ui/src/Tests/ReportTest.php
+++ b/core/modules/views_ui/src/Tests/ReportTest.php
@@ -20,7 +20,7 @@ class ReportTest extends WebTestBase {
   /**
    * Stores an admin user used by the different tests.
    *
-   * @var \Drupal\user\User
+   * @var \Drupal\user\UserInterface
    */
   protected $adminUser;
 
diff --git a/core/modules/views_ui/src/Tests/SettingsTest.php b/core/modules/views_ui/src/Tests/SettingsTest.php
index f583185..c49cc3d 100644
--- a/core/modules/views_ui/src/Tests/SettingsTest.php
+++ b/core/modules/views_ui/src/Tests/SettingsTest.php
@@ -12,7 +12,7 @@ class SettingsTest extends UITestBase {
   /**
    * Stores an admin user used by the different tests.
    *
-   * @var \Drupal\user\User
+   * @var \Drupal\user\UserInterface
    */
   protected $adminUser;
 
diff --git a/core/modules/views_ui/src/ViewUI.php b/core/modules/views_ui/src/ViewUI.php
index b6841a8..02e4029 100644
--- a/core/modules/views_ui/src/ViewUI.php
+++ b/core/modules/views_ui/src/ViewUI.php
@@ -52,7 +52,7 @@ class ViewUI implements ViewEntityInterface {
    * \Drupal\user\SharedTempStore::getMetadata(). Which can be a stdClass or
    * NULL.
    *
-   * @var stdClass
+   * @var \stdClass|null
    */
   public $lock;
 
diff --git a/core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php b/core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php
index ba30da9..1dd4605 100644
--- a/core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php
+++ b/core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php
@@ -71,10 +71,10 @@ protected function setUp() {
    * Tests the correct user input mapping on complex fields.
    */
   public function testCorrectUserInputMappingOnComplexFields() {
-    /** @var ContentEntityStorageInterface $storage */
+    /** @var \Drupal\Core\Entity\ContentEntityStorageInterface $storage */
     $storage = $this->container->get('entity_type.manager')->getStorage($this->entityTypeId);
 
-    /** @var ContentEntityInterface $entity */
+    /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
     $entity = $storage->create([$this->fieldName => [
       ['shape' => 'rectangle', 'color' => 'green'],
       ['shape' => 'circle', 'color' => 'blue'],
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryAggregateTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryAggregateTest.php
index b6362fb..74ce072 100644
--- a/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryAggregateTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryAggregateTest.php
@@ -23,7 +23,7 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
   /**
    * The entity_test storage to create the test entities.
    *
-   * @var \Drupal\entity_test\EntityTestStorage
+   * @var \Drupal\Core\Entity\Sql\SqlContentEntityStorage
    */
   protected $entityStorage;
 
diff --git a/core/tests/Drupal/Tests/BrowserTestBase.php b/core/tests/Drupal/Tests/BrowserTestBase.php
index 754f9d9..fc8ac8f 100644
--- a/core/tests/Drupal/Tests/BrowserTestBase.php
+++ b/core/tests/Drupal/Tests/BrowserTestBase.php
@@ -296,7 +296,7 @@ protected function initMink() {
   /**
    * 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/Component/Utility/CryptTest.php b/core/tests/Drupal/Tests/Component/Utility/CryptTest.php
index f709171..f82bd8e 100644
--- a/core/tests/Drupal/Tests/Component/Utility/CryptTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/CryptTest.php
@@ -69,7 +69,7 @@ public function testHmacBase64($data, $key, $expected_hmac) {
    * Tests the hmacBase64 method with invalid parameters.
    *
    * @dataProvider providerTestHmacBase64Invalid
-   * @expectedException InvalidArgumentException
+   * @expectedException \InvalidArgumentException
    * @covers ::hmacBase64
    *
    * @param string $data
diff --git a/core/tests/Drupal/Tests/Component/Utility/NumberTest.php b/core/tests/Drupal/Tests/Component/Utility/NumberTest.php
index 8d415de..750fd8c 100644
--- a/core/tests/Drupal/Tests/Component/Utility/NumberTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/NumberTest.php
@@ -22,9 +22,9 @@ class NumberTest extends UnitTestCase {
    * @dataProvider providerTestValidStep
    * @covers ::validStep
    *
-   * @param numeric $value
+   * @param float $value
    *   The value argument for Number::validStep().
-   * @param numeric $step
+   * @param float $step
    *   The step argument for Number::validStep().
    * @param bool $expected
    *   Expected return value from Number::validStep().
@@ -40,11 +40,11 @@ public function testValidStep($value, $step, $expected) {
    * @dataProvider providerTestValidStepOffset
    * @covers ::validStep
    *
-   * @param numeric $value
+   * @param float $value
    *   The value argument for Number::validStep().
-   * @param numeric $step
+   * @param float $step
    *   The step argument for Number::validStep().
-   * @param numeric $offset
+   * @param float $offset
    *   The offset argument for Number::validStep().
    * @param bool $expected
    *   Expected return value from Number::validStep().
diff --git a/core/tests/Drupal/Tests/Core/Access/CsrfAccessCheckTest.php b/core/tests/Drupal/Tests/Core/Access/CsrfAccessCheckTest.php
index edbbfba..85fd9c8 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/Access/CsrfTokenGeneratorTest.php b/core/tests/Drupal/Tests/Core/Access/CsrfTokenGeneratorTest.php
index cc4691d..f76ec38 100644
--- a/core/tests/Drupal/Tests/Core/Access/CsrfTokenGeneratorTest.php
+++ b/core/tests/Drupal/Tests/Core/Access/CsrfTokenGeneratorTest.php
@@ -171,7 +171,7 @@ public function providerTestValidateParameterTypes() {
    *
    * @covers ::validate
    * @dataProvider providerTestInvalidParameterTypes
-   * @expectedException InvalidArgumentException
+   * @expectedException \InvalidArgumentException
    */
   public function testInvalidParameterTypes($token, $value = '') {
     $this->setupDefaultExpectations();
diff --git a/core/tests/Drupal/Tests/Core/Assert/AssertLegacyTraitTest.php b/core/tests/Drupal/Tests/Core/Assert/AssertLegacyTraitTest.php
index 00dbdf5..44e0b54 100644
--- a/core/tests/Drupal/Tests/Core/Assert/AssertLegacyTraitTest.php
+++ b/core/tests/Drupal/Tests/Core/Assert/AssertLegacyTraitTest.php
@@ -29,7 +29,7 @@ class AssertLegacyTraitTest extends UnitTestCase {
   /**
    * The mocked page element used for testing.
    *
-   * @var Behat\Mink\Element\DocumentElement|\Prophecy\Prophecy\ObjectProphecy
+   * @var \Behat\Mink\Element\DocumentElement|\Prophecy\Prophecy\ObjectProphecy
    */
   protected $page;
 
diff --git a/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php b/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php
index c7f1f3d..71876e3 100644
--- a/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php
@@ -15,7 +15,7 @@ class CssCollectionRendererUnitTest extends UnitTestCase {
   /**
    * A CSS asset renderer.
    *
-   * @var \Drupal\Core\Asset\CssRenderer object.
+   * @var \Drupal\Core\Asset\CssCollectionRenderer
    */
   protected $renderer;
 
diff --git a/core/tests/Drupal/Tests/Core/Config/ConfigTest.php b/core/tests/Drupal/Tests/Core/Config/ConfigTest.php
index ef1db21..c41485c 100644
--- a/core/tests/Drupal/Tests/Core/Config/ConfigTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/ConfigTest.php
@@ -238,7 +238,7 @@ public function testSetValidation() {
 
   /**
    * @covers ::set
-   * @expectedException PHPUnit_Framework_Error_Warning
+   * @expectedException \PHPUnit_Framework_Error_Warning
    */
   public function testSetIllegalOffsetValue() {
     // Set a single value.
diff --git a/core/tests/Drupal/Tests/Core/DependencyInjection/Fixture/BarClass.php b/core/tests/Drupal/Tests/Core/DependencyInjection/Fixture/BarClass.php
index 35c236b..4fc0a64 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 aa0897b..3b11b79 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\entity\RouteEnhancer\EntityRevisionRouteEnhancer
+   * @var \Drupal\Core\Routing\Enhancer\EntityRevisionRouteEnhancer
    */
   protected $routeEnhancer;
 
diff --git a/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php b/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php
index 38cc28c..0487e28 100644
--- a/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php
+++ b/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php
@@ -53,7 +53,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
    */
   protected $customPageSubscriber;
 
diff --git a/core/tests/Drupal/Tests/Core/EventSubscriber/ModuleRouteSubscriberTest.php b/core/tests/Drupal/Tests/Core/EventSubscriber/ModuleRouteSubscriberTest.php
index 6528d73..8a263e0 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/ParamConverter/EntityRevisionParamConverterTest.php b/core/tests/Drupal/Tests/Core/ParamConverter/EntityRevisionParamConverterTest.php
index 23ac69f..de66724 100644
--- a/core/tests/Drupal/Tests/Core/ParamConverter/EntityRevisionParamConverterTest.php
+++ b/core/tests/Drupal/Tests/Core/ParamConverter/EntityRevisionParamConverterTest.php
@@ -19,7 +19,7 @@ class EntityRevisionParamConverterTest extends UnitTestCase {
   /**
    * The tested entity revision param converter.
    *
-   * @var \Drupal\entity\ParamConverter\EntityRevisionParamConverter
+   * @var \Drupal\Core\ParamConverter\EntityRevisionParamConverter
    */
   protected $converter;