diff --git a/core/lib/Drupal.php b/core/lib/Drupal.php
index ef3fdeecbc90bc25418fd916b4ba94f183e244a1..0c4305bfaa69fd590672e9bb0d0bc4ef349a764f 100644
--- a/core/lib/Drupal.php
+++ b/core/lib/Drupal.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal.
+ * Contains \Drupal.
  */
 
 use Drupal\Core\DependencyInjection\ContainerNotInitializedException;
diff --git a/core/lib/Drupal/Component/Annotation/AnnotationInterface.php b/core/lib/Drupal/Component/Annotation/AnnotationInterface.php
index 6c8d2ed6716c447c9f8673f993a075000bc07c19..db27e7f4657f3f7d5c0dae539521716b4043cec9 100644
--- a/core/lib/Drupal/Component/Annotation/AnnotationInterface.php
+++ b/core/lib/Drupal/Component/Annotation/AnnotationInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Component\Annotation\AnnotationInterface.
+ * Contains \Drupal\Component\Annotation\AnnotationInterface.
  */
 
 namespace Drupal\Component\Annotation;
diff --git a/core/lib/Drupal/Component/Annotation/Plugin.php b/core/lib/Drupal/Component/Annotation/Plugin.php
index 8eaa626873cab3b98e6503fdf46f8b761fbe286c..b3699bfa115a7d8e6a4cc409c9b319bc2e78882e 100644
--- a/core/lib/Drupal/Component/Annotation/Plugin.php
+++ b/core/lib/Drupal/Component/Annotation/Plugin.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Component\Annotation\Plugin.
+ * Contains \Drupal\Component\Annotation\Plugin.
  */
 
 namespace Drupal\Component\Annotation;
diff --git a/core/lib/Drupal/Component/Annotation/PluginID.php b/core/lib/Drupal/Component/Annotation/PluginID.php
index ab5e1938178650efeb28b82fbc0f91c35cd171f3..2bdcb4338750db9c1eb84728dad97f28e13b7089 100644
--- a/core/lib/Drupal/Component/Annotation/PluginID.php
+++ b/core/lib/Drupal/Component/Annotation/PluginID.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Component\Annotation\PluginID.
+ * Contains \Drupal\Component\Annotation\PluginID.
  */
 
 namespace Drupal\Component\Annotation;
diff --git a/core/lib/Drupal/Component/Bridge/ZfExtensionManagerSfContainer.php b/core/lib/Drupal/Component/Bridge/ZfExtensionManagerSfContainer.php
index 4a52c70221fee4a5ee65b717b10a92bef892cec0..1bd0a7347711ed424350dec77915132532ed04da 100644
--- a/core/lib/Drupal/Component/Bridge/ZfExtensionManagerSfContainer.php
+++ b/core/lib/Drupal/Component/Bridge/ZfExtensionManagerSfContainer.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Component\Bridge\ZfExtensionManagerSfContainer
+ * Contains \Drupal\Component\Bridge\ZfExtensionManagerSfContainer.
  */
 namespace Drupal\Component\Bridge;
 
diff --git a/core/lib/Drupal/Component/Datetime/DateTimePlus.php b/core/lib/Drupal/Component/Datetime/DateTimePlus.php
index 308cbb2d6ab09b6a33348764b2bc9687581cc8fe..cae00215f3352d0930bfc678a0b891dcd356ec6d 100644
--- a/core/lib/Drupal/Component/Datetime/DateTimePlus.php
+++ b/core/lib/Drupal/Component/Datetime/DateTimePlus.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Component\Datetime\DateTimePlus
+ * Contains \Drupal\Component\Datetime\DateTimePlus.
  */
 namespace Drupal\Component\Datetime;
 
diff --git a/core/lib/Drupal/Component/Diff/Diff.php b/core/lib/Drupal/Component/Diff/Diff.php
index 637eca9ea07c112541b38330ff9ee60553350888..1e02ec11062a8b64567fdcfcdfe4682d014e243e 100644
--- a/core/lib/Drupal/Component/Diff/Diff.php
+++ b/core/lib/Drupal/Component/Diff/Diff.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\Component\Diff\Diff.
+ */
+
 namespace Drupal\Component\Diff;
 
 use Drupal\Component\Diff\Engine\DiffEngine;
diff --git a/core/lib/Drupal/Component/Diff/DiffFormatter.php b/core/lib/Drupal/Component/Diff/DiffFormatter.php
index 5dc9e1b15bf70addedb1e2c5be74e1d147939720..1789810d16c0f17758f8cba8e59e5eba7bea993e 100644
--- a/core/lib/Drupal/Component/Diff/DiffFormatter.php
+++ b/core/lib/Drupal/Component/Diff/DiffFormatter.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\Component\Diff\DiffFormatter.
+ */
+
 namespace Drupal\Component\Diff;
 
 use Drupal\Component\Diff\Engine\DiffOpCopy;
diff --git a/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php b/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php
index 9fe90ce8a4e209350b4851e457cb2760141f7b85..387c40119ce9226e38d08ebdcae94c4d39e55ef0 100644
--- a/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php
+++ b/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\Component\Diff\Engine\DiffEngine.
+ */
+
 namespace Drupal\Component\Diff\Engine;
 
 use Drupal\Component\Utility\Unicode;
diff --git a/core/lib/Drupal/Component/Diff/Engine/DiffOp.php b/core/lib/Drupal/Component/Diff/Engine/DiffOp.php
index 120ac9ecdfb50ffa413db56077fdcb6e94fd7793..0082a9f100b61fae59278fb0d17c5ba58815333f 100644
--- a/core/lib/Drupal/Component/Diff/Engine/DiffOp.php
+++ b/core/lib/Drupal/Component/Diff/Engine/DiffOp.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\Component\Diff\Engine\DiffOp.
+ */
+
 namespace Drupal\Component\Diff\Engine;
 
 /**
diff --git a/core/lib/Drupal/Component/Diff/Engine/DiffOpAdd.php b/core/lib/Drupal/Component/Diff/Engine/DiffOpAdd.php
index 2def622d4cfe5b97d3fcda93f9c69fd5e61e69a2..f96c746ba6eac2ed50e2fe6162d99444309c4bea 100644
--- a/core/lib/Drupal/Component/Diff/Engine/DiffOpAdd.php
+++ b/core/lib/Drupal/Component/Diff/Engine/DiffOpAdd.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\Component\Diff\Engine\DiffOpAdd.
+ */
+
 namespace Drupal\Component\Diff\Engine;
 
 /**
diff --git a/core/lib/Drupal/Component/Diff/Engine/DiffOpChange.php b/core/lib/Drupal/Component/Diff/Engine/DiffOpChange.php
index 404b9964cbb1fc0785a6a0e0e4fcdde93b7d8e10..767be59c9c4a5d903940eec7223359fb5ee83374 100644
--- a/core/lib/Drupal/Component/Diff/Engine/DiffOpChange.php
+++ b/core/lib/Drupal/Component/Diff/Engine/DiffOpChange.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\Component\Diff\Engine\DiffOpChange.
+ */
+
 namespace Drupal\Component\Diff\Engine;
 
 /**
diff --git a/core/lib/Drupal/Component/Diff/Engine/DiffOpCopy.php b/core/lib/Drupal/Component/Diff/Engine/DiffOpCopy.php
index 9792fb0ce84df3a7792b4e7a917040854f528e29..be524de9115b9f084adf2d598aac46bc22eccb73 100644
--- a/core/lib/Drupal/Component/Diff/Engine/DiffOpCopy.php
+++ b/core/lib/Drupal/Component/Diff/Engine/DiffOpCopy.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\Component\Diff\Engine\DiffOpCopy.
+ */
+
 namespace Drupal\Component\Diff\Engine;
 
 /**
diff --git a/core/lib/Drupal/Component/Diff/Engine/DiffOpDelete.php b/core/lib/Drupal/Component/Diff/Engine/DiffOpDelete.php
index 3b3b5672d08aded5f5c3bfbd33de5813d1970ae4..db6841443c5d44b1887b9dd38a862f5e316c1982 100644
--- a/core/lib/Drupal/Component/Diff/Engine/DiffOpDelete.php
+++ b/core/lib/Drupal/Component/Diff/Engine/DiffOpDelete.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\Component\Diff\Engine\DiffOpDelete.
+ */
+
 namespace Drupal\Component\Diff\Engine;
 
 /**
diff --git a/core/lib/Drupal/Component/Diff/Engine/HWLDFWordAccumulator.php b/core/lib/Drupal/Component/Diff/Engine/HWLDFWordAccumulator.php
index a3534f5db5f6dbb1f7316f566e5a052f305df5bb..a67e8ca8f1dd15d67c63859e1de8cec259f2ae84 100644
--- a/core/lib/Drupal/Component/Diff/Engine/HWLDFWordAccumulator.php
+++ b/core/lib/Drupal/Component/Diff/Engine/HWLDFWordAccumulator.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\Component\Diff\Engine\HWLDFWordAccumulator.
+ */
+
 namespace Drupal\Component\Diff\Engine;
 
 use Drupal\Component\Utility\Unicode;
diff --git a/core/lib/Drupal/Component/Diff/MappedDiff.php b/core/lib/Drupal/Component/Diff/MappedDiff.php
index 5350a6949bb970fe160fcdd37ba595e1462c5a12..cba1df92306f5b0e2a4645d0e17f669cdca23103 100644
--- a/core/lib/Drupal/Component/Diff/MappedDiff.php
+++ b/core/lib/Drupal/Component/Diff/MappedDiff.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\Component\Diff\MappedDiff.
+ */
+
 namespace Drupal\Component\Diff;
 
 /**
diff --git a/core/lib/Drupal/Component/Diff/WordLevelDiff.php b/core/lib/Drupal/Component/Diff/WordLevelDiff.php
index c9114bcb8af5fc03973efe42132f859fbf2f9a45..29939bed7e9e38deda917ecb98ba0ab6d952ef72 100644
--- a/core/lib/Drupal/Component/Diff/WordLevelDiff.php
+++ b/core/lib/Drupal/Component/Diff/WordLevelDiff.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\Component\Diff\WordLevelDiff.
+ */
+
 namespace Drupal\Component\Diff;
 
 use Drupal\Component\Diff\Engine\HWLDFWordAccumulator;
diff --git a/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php b/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php
index 76016b7dac261ac52f6dfe7dfae7e22b8617bfe1..42c9b5d6750c2f2fb5c4f50d3361b970d3d0ef56 100644
--- a/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php
+++ b/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher
+ * Contains \Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher.
  */
 
 namespace Drupal\Component\EventDispatcher;
diff --git a/core/lib/Drupal/Component/FileCache/FileCacheFactory.php b/core/lib/Drupal/Component/FileCache/FileCacheFactory.php
index df391c0183ff9937e6f43520903350204b611a1b..2397d1b935e7c5d6a0e554177f08fb2979221797 100644
--- a/core/lib/Drupal/Component/FileCache/FileCacheFactory.php
+++ b/core/lib/Drupal/Component/FileCache/FileCacheFactory.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Component\FileCache\FileCacheFactory.
+ * Contains \Drupal\Component\FileCache\FileCacheFactory.
  */
 
 namespace Drupal\Component\FileCache;
diff --git a/core/lib/Drupal/Component/Gettext/PoHeader.php b/core/lib/Drupal/Component/Gettext/PoHeader.php
index 6f4e6f53956b93a4c3e76f36609029fc8c65c59a..aa8ea201e0b5407cade260aa3d5bf771e403bc5d 100644
--- a/core/lib/Drupal/Component/Gettext/PoHeader.php
+++ b/core/lib/Drupal/Component/Gettext/PoHeader.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Component\Gettext\PoHeader
+ * Contains \Drupal\Component\Gettext\PoHeader.
  */
 
 namespace Drupal\Component\Gettext;
diff --git a/core/lib/Drupal/Component/Gettext/PoItem.php b/core/lib/Drupal/Component/Gettext/PoItem.php
index 754f440ea0dbdccddb546ad8c6de0014a21f392d..cefeee7abd30f1e3dba76cd7aea8ff4861590e96 100644
--- a/core/lib/Drupal/Component/Gettext/PoItem.php
+++ b/core/lib/Drupal/Component/Gettext/PoItem.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Component\Gettext\PoItem.
+ * Contains \Drupal\Component\Gettext\PoItem.
  */
 
 namespace Drupal\Component\Gettext;
diff --git a/core/lib/Drupal/Component/Gettext/PoMemoryWriter.php b/core/lib/Drupal/Component/Gettext/PoMemoryWriter.php
index 11c53613546b9efe941123282c4bd44dd4ef8213..d44f18d6995fb8f44192e106db070cdcfed5817a 100644
--- a/core/lib/Drupal/Component/Gettext/PoMemoryWriter.php
+++ b/core/lib/Drupal/Component/Gettext/PoMemoryWriter.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Component\Gettext\PoMemoryWriter.
+ * Contains \Drupal\Component\Gettext\PoMemoryWriter.
  */
 
 namespace Drupal\Component\Gettext;
diff --git a/core/lib/Drupal/Component/Gettext/PoMetadataInterface.php b/core/lib/Drupal/Component/Gettext/PoMetadataInterface.php
index fe22e5f3ee35bec9b1ec7dc15d27714b76461b5e..5801daa2d971508f6d4f634cda5186a1ee0685b6 100644
--- a/core/lib/Drupal/Component/Gettext/PoMetadataInterface.php
+++ b/core/lib/Drupal/Component/Gettext/PoMetadataInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Component\Gettext\PoMetadataInterface.
+ * Contains \Drupal\Component\Gettext\PoMetadataInterface.
  */
 
 namespace Drupal\Component\Gettext;
diff --git a/core/lib/Drupal/Component/Gettext/PoReaderInterface.php b/core/lib/Drupal/Component/Gettext/PoReaderInterface.php
index 71358189ea01b3f42919bccb49fec303ba6c124e..49b73dffd51e0bd37f932aa46cb31ddb0335e5a5 100644
--- a/core/lib/Drupal/Component/Gettext/PoReaderInterface.php
+++ b/core/lib/Drupal/Component/Gettext/PoReaderInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Component\Gettext\PoReaderInterface.
+ * Contains \Drupal\Component\Gettext\PoReaderInterface.
  */
 
 namespace Drupal\Component\Gettext;
diff --git a/core/lib/Drupal/Component/Gettext/PoStreamInterface.php b/core/lib/Drupal/Component/Gettext/PoStreamInterface.php
index fc40c502f0fc0934d4c306c05fefff9bf2e31bf1..3beecdc3a5b4ca4cb7d196133dd6a3db6faae81d 100644
--- a/core/lib/Drupal/Component/Gettext/PoStreamInterface.php
+++ b/core/lib/Drupal/Component/Gettext/PoStreamInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Component\Gettext\PoStreamInterface.
+ * Contains \Drupal\Component\Gettext\PoStreamInterface.
  */
 
 namespace Drupal\Component\Gettext;
diff --git a/core/lib/Drupal/Component/Gettext/PoStreamWriter.php b/core/lib/Drupal/Component/Gettext/PoStreamWriter.php
index 85cc9b362528e12bf31e1362acd162ac7596bcbb..848171b94f630485c8d4bd29c14e50288cea1770 100644
--- a/core/lib/Drupal/Component/Gettext/PoStreamWriter.php
+++ b/core/lib/Drupal/Component/Gettext/PoStreamWriter.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Component\Gettext\PoStreamWriter.
+ * Contains \Drupal\Component\Gettext\PoStreamWriter.
  */
 
 namespace Drupal\Component\Gettext;
diff --git a/core/lib/Drupal/Component/Gettext/PoWriterInterface.php b/core/lib/Drupal/Component/Gettext/PoWriterInterface.php
index 08c6836d60daa91b5c594d665dfdcafdd251135d..18206d9ea33a5c81e892efcf258c139959735328 100644
--- a/core/lib/Drupal/Component/Gettext/PoWriterInterface.php
+++ b/core/lib/Drupal/Component/Gettext/PoWriterInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Component\Gettext\PoWriterInterface.
+ * Contains \Drupal\Component\Gettext\PoWriterInterface.
  */
 
 namespace Drupal\Component\Gettext;
diff --git a/core/lib/Drupal/Component/Graph/Graph.php b/core/lib/Drupal/Component/Graph/Graph.php
index 726c72334f39e9fca2c49af643870e3810cd1829..b2824c3164c72c6e709436892d67d0d767cc5b69 100644
--- a/core/lib/Drupal/Component/Graph/Graph.php
+++ b/core/lib/Drupal/Component/Graph/Graph.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Component\Graph\Graph.
+ * Contains \Drupal\Component\Graph\Graph.
  */
 
 namespace Drupal\Component\Graph;
diff --git a/core/lib/Drupal/Component/PhpStorage/FileReadOnlyStorage.php b/core/lib/Drupal/Component/PhpStorage/FileReadOnlyStorage.php
index 1a460ad71bccb50d61a99325374a74309c4ef844..d4665c9f6e6de03a22f58a49b00979115a2373d6 100644
--- a/core/lib/Drupal/Component/PhpStorage/FileReadOnlyStorage.php
+++ b/core/lib/Drupal/Component/PhpStorage/FileReadOnlyStorage.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Component\PhpStorage\FileStorage.
+ * Contains \Drupal\Component\PhpStorage\FileReadOnlyStorage.
  */
 
 namespace Drupal\Component\PhpStorage;
diff --git a/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFileStorage.php b/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFileStorage.php
index 573e23cb7852b801e2a55b636f2646221ebd82c1..26d8200c83e00ad15e7aa15d32c084137859c19c 100644
--- a/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFileStorage.php
+++ b/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFileStorage.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Component\PhpStorage\MTimeProtectedFileStorage.
+ * Contains \Drupal\Component\PhpStorage\MTimeProtectedFileStorage.
  */
 namespace Drupal\Component\PhpStorage;
 
diff --git a/core/lib/Drupal/Component/PhpStorage/PhpStorageInterface.php b/core/lib/Drupal/Component/PhpStorage/PhpStorageInterface.php
index 1f6a682543f395069ea6b13fdc9bc70701ab1fee..417908abf3fab642ec8705fe32878317fbe35ba6 100644
--- a/core/lib/Drupal/Component/PhpStorage/PhpStorageInterface.php
+++ b/core/lib/Drupal/Component/PhpStorage/PhpStorageInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Component\PhpStorage\PhpStorageInterface.
+ * Contains \Drupal\Component\PhpStorage\PhpStorageInterface.
  */
 
 namespace Drupal\Component\PhpStorage;
diff --git a/core/lib/Drupal/Component/Plugin/ContextAwarePluginBase.php b/core/lib/Drupal/Component/Plugin/ContextAwarePluginBase.php
index b6846305fdab5e401f8e521907463a9603ba0357..e9254073c44972e3ef9ea58bad37e3963613972a 100644
--- a/core/lib/Drupal/Component/Plugin/ContextAwarePluginBase.php
+++ b/core/lib/Drupal/Component/Plugin/ContextAwarePluginBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Component\Plugin\ContextAwarePluginBase
+ * Contains \Drupal\Component\Plugin\ContextAwarePluginBase.
  */
 
 namespace Drupal\Component\Plugin;
diff --git a/core/lib/Drupal/Component/Plugin/DerivativeInspectionInterface.php b/core/lib/Drupal/Component/Plugin/DerivativeInspectionInterface.php
index cba0b7a6ae4e6be77dcff8b11565d9a056276876..2d24a12e377d5b71840f650e27e67e03ea13826a 100644
--- a/core/lib/Drupal/Component/Plugin/DerivativeInspectionInterface.php
+++ b/core/lib/Drupal/Component/Plugin/DerivativeInspectionInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Component\Plugin\DerivativeInspectionInterface.
+ * Contains \Drupal\Component\Plugin\DerivativeInspectionInterface.
  */
 
 namespace Drupal\Component\Plugin;
diff --git a/core/lib/Drupal/Component/Plugin/Discovery/DiscoveryInterface.php b/core/lib/Drupal/Component/Plugin/Discovery/DiscoveryInterface.php
index adaaa9c3048ec8e694064022bf8d26b7327518f8..75e692f11c5c37ae9f7ad8c9e013351931ddc8bf 100644
--- a/core/lib/Drupal/Component/Plugin/Discovery/DiscoveryInterface.php
+++ b/core/lib/Drupal/Component/Plugin/Discovery/DiscoveryInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Component\Plugin\Discovery\DiscoveryInterface.
+ * Contains \Drupal\Component\Plugin\Discovery\DiscoveryInterface.
  */
 
 namespace Drupal\Component\Plugin\Discovery;
diff --git a/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscovery.php b/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscovery.php
index 0a28bbc69cbb226d8857aec0e5504ce8d9a70f75..0837bbbb4a4f75a2e15a1659bce321be8bca8b05 100644
--- a/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscovery.php
+++ b/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscovery.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Component\Plugin\Discovery\StaticDiscovery.
+ * Contains \Drupal\Component\Plugin\Discovery\StaticDiscovery.
  */
 
 namespace Drupal\Component\Plugin\Discovery;
diff --git a/core/lib/Drupal/Component/Plugin/Exception/ExceptionInterface.php b/core/lib/Drupal/Component/Plugin/Exception/ExceptionInterface.php
index 57fb25bfc528702ab6eb18dff414bfbfde19b721..7efea04b06d9bb77459b28ca870bd30495bcf40c 100644
--- a/core/lib/Drupal/Component/Plugin/Exception/ExceptionInterface.php
+++ b/core/lib/Drupal/Component/Plugin/Exception/ExceptionInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Definition of Drupal\Component\Plugin\Exception\ExceptionInterface.
+ * Contains \Drupal\Component\Plugin\Exception\ExceptionInterface.
  */
 
 namespace Drupal\Component\Plugin\Exception;
diff --git a/core/lib/Drupal/Component/Plugin/Exception/InvalidDeriverException.php b/core/lib/Drupal/Component/Plugin/Exception/InvalidDeriverException.php
index 4aab38095de97c3bc434f1c4a0782f78c5e7f6f9..b94a9a8e80b8135766f9a70db904ef47f0262b2e 100644
--- a/core/lib/Drupal/Component/Plugin/Exception/InvalidDeriverException.php
+++ b/core/lib/Drupal/Component/Plugin/Exception/InvalidDeriverException.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Definition of \Drupal\Component\Plugin\Exception\InvalidDeriverClassException.
+ * Contains \Drupal\Component\Plugin\Exception\InvalidDeriverException.
  */
 
 namespace Drupal\Component\Plugin\Exception;
diff --git a/core/lib/Drupal/Component/Plugin/Exception/MapperExceptionInterface.php b/core/lib/Drupal/Component/Plugin/Exception/MapperExceptionInterface.php
index 222b5473d0aaee0ea9cd1780ea66bbcb86853ee9..54faef98e2b203c226593262bd17375b37563e18 100644
--- a/core/lib/Drupal/Component/Plugin/Exception/MapperExceptionInterface.php
+++ b/core/lib/Drupal/Component/Plugin/Exception/MapperExceptionInterface.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @file
+ * Contains \Drupal\Component\Plugin\Exception\MapperExceptionInterface.
+ *
  * Base exception interface for grouping mapper exceptions.
  */
 
diff --git a/core/lib/Drupal/Component/Plugin/Exception/PluginException.php b/core/lib/Drupal/Component/Plugin/Exception/PluginException.php
index 707955e4a91d93eeca50d7fe8c71fbeee30ad4b4..0d75de5687ce5031bb37e1febe2d82e465dbd438 100644
--- a/core/lib/Drupal/Component/Plugin/Exception/PluginException.php
+++ b/core/lib/Drupal/Component/Plugin/Exception/PluginException.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Definition of Drupal\Component\Plugin\Exception\PluginException.
+ * Contains \Drupal\Component\Plugin\Exception\PluginException.
  */
 
 namespace Drupal\Component\Plugin\Exception;
diff --git a/core/lib/Drupal/Component/Plugin/Factory/DefaultFactory.php b/core/lib/Drupal/Component/Plugin/Factory/DefaultFactory.php
index 3362654ba1a690332aec2672c03d4ccc44c6f595..1902b568f0c7b2b14b65f4dc4f40fb71f7876d82 100644
--- a/core/lib/Drupal/Component/Plugin/Factory/DefaultFactory.php
+++ b/core/lib/Drupal/Component/Plugin/Factory/DefaultFactory.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Definition of Drupal\Component\Plugin\Factory\DefaultFactory.
+ * Contains \Drupal\Component\Plugin\Factory\DefaultFactory.
  */
 
 namespace Drupal\Component\Plugin\Factory;
diff --git a/core/lib/Drupal/Component/Plugin/Factory/ReflectionFactory.php b/core/lib/Drupal/Component/Plugin/Factory/ReflectionFactory.php
index ae9dfe1336237da431430e78105e080d37110b9d..2dc2bf33df06342412dba171c6e00a05f437cd62 100644
--- a/core/lib/Drupal/Component/Plugin/Factory/ReflectionFactory.php
+++ b/core/lib/Drupal/Component/Plugin/Factory/ReflectionFactory.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Definition of Drupal\Component\Plugin\Factory\ReflectionFactory.
+ * Contains \Drupal\Component\Plugin\Factory\ReflectionFactory.
  */
 
 namespace Drupal\Component\Plugin\Factory;
diff --git a/core/lib/Drupal/Component/Plugin/FallbackPluginManagerInterface.php b/core/lib/Drupal/Component/Plugin/FallbackPluginManagerInterface.php
index f1b6812254bb5743e2e1faa89deaeda70d314bc4..b54646e80f367cad51c5086da21dc4860c340e9a 100644
--- a/core/lib/Drupal/Component/Plugin/FallbackPluginManagerInterface.php
+++ b/core/lib/Drupal/Component/Plugin/FallbackPluginManagerInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains FallbackPluginManagerInterface.php.
+ * Contains \Drupal\Component\Plugin\FallbackPluginManagerInterface.
  */
 
 namespace Drupal\Component\Plugin;
diff --git a/core/lib/Drupal/Component/Plugin/PluginBase.php b/core/lib/Drupal/Component/Plugin/PluginBase.php
index aeff1575f9b3c5e79209bf9ce04a43dc928af26d..8e4f1d68f2bbeee1b3651f5449eaae984c57156e 100644
--- a/core/lib/Drupal/Component/Plugin/PluginBase.php
+++ b/core/lib/Drupal/Component/Plugin/PluginBase.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains \Drupal\Component\Plugin\PluginBase
+ * Contains \Drupal\Component\Plugin\PluginBase.
  */
 
 namespace Drupal\Component\Plugin;
diff --git a/core/lib/Drupal/Component/Plugin/PluginManagerBase.php b/core/lib/Drupal/Component/Plugin/PluginManagerBase.php
index 0dfe9e7a315a07eec1f571639d6d590c1bb648c2..e617ac1356dc2391da9046acf5992ab4c391a0b6 100644
--- a/core/lib/Drupal/Component/Plugin/PluginManagerBase.php
+++ b/core/lib/Drupal/Component/Plugin/PluginManagerBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Component\Plugin\PluginManagerBase
+ * Contains \Drupal\Component\Plugin\PluginManagerBase.
  */
 
 namespace Drupal\Component\Plugin;
diff --git a/core/lib/Drupal/Component/Plugin/PluginManagerInterface.php b/core/lib/Drupal/Component/Plugin/PluginManagerInterface.php
index 803682a321e677ee5f2505314bbf4af791df49b2..06118867cc01aab219344b0051c12288ee4a0e39 100644
--- a/core/lib/Drupal/Component/Plugin/PluginManagerInterface.php
+++ b/core/lib/Drupal/Component/Plugin/PluginManagerInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains \Drupal\Component\Plugin\PluginManagerInterface
+ * Contains \Drupal\Component\Plugin\PluginManagerInterface.
  */
 
 namespace Drupal\Component\Plugin;
diff --git a/core/lib/Drupal/Component/Transliteration/PhpTransliteration.php b/core/lib/Drupal/Component/Transliteration/PhpTransliteration.php
index 01e98057699faf644aa54eb83d59b2af45452ed2..ab09cebccbab21a4e08fb3c4074f606724c98ec3 100644
--- a/core/lib/Drupal/Component/Transliteration/PhpTransliteration.php
+++ b/core/lib/Drupal/Component/Transliteration/PhpTransliteration.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of \Drupal\Component\Transliteration\PhpTransliteration.
+ * Contains \Drupal\Component\Transliteration\PhpTransliteration.
  *
  * Some parts of this code were derived from the MediaWiki project's UtfNormal
  * class, Copyright © 2004 Brion Vibber <brion@pobox.com>,
diff --git a/core/lib/Drupal/Component/Transliteration/TransliterationInterface.php b/core/lib/Drupal/Component/Transliteration/TransliterationInterface.php
index 60ac07bf5932bb398fbf72baa97e22f5d237b83e..87bd0cfecc3818e2061a62a2abc5e08819f299bc 100644
--- a/core/lib/Drupal/Component/Transliteration/TransliterationInterface.php
+++ b/core/lib/Drupal/Component/Transliteration/TransliterationInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of \Drupal\Component\Transliteration\TransliterationInterface.
+ * Contains \Drupal\Component\Transliteration\TransliterationInterface.
  */
 
 namespace Drupal\Component\Transliteration;
diff --git a/core/lib/Drupal/Component/Utility/Color.php b/core/lib/Drupal/Component/Utility/Color.php
index 4b09a282225d2a11872c23b426bf99ec3f318313..004a4fb3bb41e58a8a8aef6f132ae205828fecac 100644
--- a/core/lib/Drupal/Component/Utility/Color.php
+++ b/core/lib/Drupal/Component/Utility/Color.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Component\Utility\Color.
+ * Contains \Drupal\Component\Utility\Color.
  */
 
 namespace Drupal\Component\Utility;
diff --git a/core/lib/Drupal/Component/Utility/DiffArray.php b/core/lib/Drupal/Component/Utility/DiffArray.php
index bd1ef5214c7afbf91601087caa19b6e75f2dcc1d..6ecd9a54318cd6d164d0f735c2e9e1dc77b1df41 100644
--- a/core/lib/Drupal/Component/Utility/DiffArray.php
+++ b/core/lib/Drupal/Component/Utility/DiffArray.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Component\Utility\DiffArray.
+ * Contains \Drupal\Component\Utility\DiffArray.
  */
 
 namespace Drupal\Component\Utility;
diff --git a/core/lib/Drupal/Component/Utility/NestedArray.php b/core/lib/Drupal/Component/Utility/NestedArray.php
index 8829fc802112ea37e9b19c7bf1d3687bfc8eb029..74e631cdd0678f36f1be7339741265f98d4e0299 100644
--- a/core/lib/Drupal/Component/Utility/NestedArray.php
+++ b/core/lib/Drupal/Component/Utility/NestedArray.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Component\Utility\NestedArray.
+ * Contains \Drupal\Component\Utility\NestedArray.
  */
 
 namespace Drupal\Component\Utility;
diff --git a/core/lib/Drupal/Component/Utility/Variable.php b/core/lib/Drupal/Component/Utility/Variable.php
index 2da908b3f2fafcaeea8d65f9b4321ab9763ca298..7653a1813acd90f72f7269c3e78b6b77107797eb 100644
--- a/core/lib/Drupal/Component/Utility/Variable.php
+++ b/core/lib/Drupal/Component/Utility/Variable.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Component\Utility\Export.
+ * Contains \Drupal\Component\Utility\Variable.
  */
 
 namespace Drupal\Component\Utility;
diff --git a/core/lib/Drupal/Component/Uuid/UuidInterface.php b/core/lib/Drupal/Component/Uuid/UuidInterface.php
index ce1bd596b884bdf6eb57bf141a6885066e5de267..a1bfc3c5308b2939e85e1616bb5836945b543bb6 100644
--- a/core/lib/Drupal/Component/Uuid/UuidInterface.php
+++ b/core/lib/Drupal/Component/Uuid/UuidInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Component\Uuid\UuidInterface.
+ * Contains \Drupal\Component\Uuid\UuidInterface.
  */
 
 namespace Drupal\Component\Uuid;
diff --git a/core/lib/Drupal/Core/Access/AccessCheckInterface.php b/core/lib/Drupal/Core/Access/AccessCheckInterface.php
index c5970275abf8fadf682808bf29ec3adf61f71b7e..c14babe7e50ef5b4d947ac6dad1b7e8d760c345d 100644
--- a/core/lib/Drupal/Core/Access/AccessCheckInterface.php
+++ b/core/lib/Drupal/Core/Access/AccessCheckInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Access\AccessCheckInterface.
+ * Contains \Drupal\Core\Access\AccessCheckInterface.
  */
 
 namespace Drupal\Core\Access;
diff --git a/core/lib/Drupal/Core/Access/DefaultAccessCheck.php b/core/lib/Drupal/Core/Access/DefaultAccessCheck.php
index 6f5b1c6c43de28fb480ab18d9a8aa5ca1318d75c..c155006e43b0b6297ae1698f5d3785aa2eef035b 100644
--- a/core/lib/Drupal/Core/Access/DefaultAccessCheck.php
+++ b/core/lib/Drupal/Core/Access/DefaultAccessCheck.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Access\DefaultAccessCheck.
+ * Contains \Drupal\Core\Access\DefaultAccessCheck.
  */
 
 namespace Drupal\Core\Access;
diff --git a/core/lib/Drupal/Core/Ajax/AddCssCommand.php b/core/lib/Drupal/Core/Ajax/AddCssCommand.php
index ccd6312b546f9e4fac6d264b75a8f25b3d68edad..c5a0208a10433059be4d90a7602b3fd16fcadf9a 100644
--- a/core/lib/Drupal/Core/Ajax/AddCssCommand.php
+++ b/core/lib/Drupal/Core/Ajax/AddCssCommand.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Ajax\AddCssCommand.
+ * Contains \Drupal\Core\Ajax\AddCssCommand.
  */
 
 namespace Drupal\Core\Ajax;
diff --git a/core/lib/Drupal/Core/Ajax/AfterCommand.php b/core/lib/Drupal/Core/Ajax/AfterCommand.php
index 95227830031f2ea34d9917475675107cdbdd4f20..ae270302d322addc26d04c3848383901e7e56dfe 100644
--- a/core/lib/Drupal/Core/Ajax/AfterCommand.php
+++ b/core/lib/Drupal/Core/Ajax/AfterCommand.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Ajax\AfterCommand.
+ * Contains \Drupal\Core\Ajax\AfterCommand.
  */
 
 namespace Drupal\Core\Ajax;
diff --git a/core/lib/Drupal/Core/Ajax/AjaxResponse.php b/core/lib/Drupal/Core/Ajax/AjaxResponse.php
index a2218e664f0d91f7d35aa859d596370c76077815..c2e8967e2dbf846ae5e65532521ea5cc3f4f2acf 100644
--- a/core/lib/Drupal/Core/Ajax/AjaxResponse.php
+++ b/core/lib/Drupal/Core/Ajax/AjaxResponse.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Ajax\AjaxResponse.
+ * Contains \Drupal\Core\Ajax\AjaxResponse.
  */
 
 namespace Drupal\Core\Ajax;
diff --git a/core/lib/Drupal/Core/Ajax/AlertCommand.php b/core/lib/Drupal/Core/Ajax/AlertCommand.php
index 325c9c280c97135945f8b715d72f4eacbb178688..65a9f4604d736794fe39410eaff70581317b0ce7 100644
--- a/core/lib/Drupal/Core/Ajax/AlertCommand.php
+++ b/core/lib/Drupal/Core/Ajax/AlertCommand.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Ajax\AlertCommand.
+ * Contains \Drupal\Core\Ajax\AlertCommand.
  */
 
 namespace Drupal\Core\Ajax;
diff --git a/core/lib/Drupal/Core/Ajax/AppendCommand.php b/core/lib/Drupal/Core/Ajax/AppendCommand.php
index bf5636263e38b8aa3c33e666d66beda5f19b372f..041f7943000c201fe316e50b1224a85b065cb2d4 100644
--- a/core/lib/Drupal/Core/Ajax/AppendCommand.php
+++ b/core/lib/Drupal/Core/Ajax/AppendCommand.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Ajax\AppendCommand.
+ * Contains \Drupal\Core\Ajax\AppendCommand.
  */
 
 namespace Drupal\Core\Ajax;
diff --git a/core/lib/Drupal/Core/Ajax/BeforeCommand.php b/core/lib/Drupal/Core/Ajax/BeforeCommand.php
index 8a97a88bdf251774f9ff02ccc15e66d9e476d495..8d526286b8d93bfc2eb20eeecdebd4595af93fcf 100644
--- a/core/lib/Drupal/Core/Ajax/BeforeCommand.php
+++ b/core/lib/Drupal/Core/Ajax/BeforeCommand.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Ajax\InsertCommand.
+ * Contains \Drupal\Core\Ajax\BeforeCommand.
  */
 
 namespace Drupal\Core\Ajax;
diff --git a/core/lib/Drupal/Core/Ajax/ChangedCommand.php b/core/lib/Drupal/Core/Ajax/ChangedCommand.php
index 2832d58edcd134c8ac2b36e8957a9d3f8c703b02..7f30972b1ef5d0fe6a294dc8f44a2ec7419cf8e1 100644
--- a/core/lib/Drupal/Core/Ajax/ChangedCommand.php
+++ b/core/lib/Drupal/Core/Ajax/ChangedCommand.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Ajax\ChangedCommand.
+ * Contains \Drupal\Core\Ajax\ChangedCommand.
  */
 
 namespace Drupal\Core\Ajax;
diff --git a/core/lib/Drupal/Core/Ajax/CommandInterface.php b/core/lib/Drupal/Core/Ajax/CommandInterface.php
index 14566cf41dc861099e4f832d38b2c82afc01938d..d68de29dcc5e05003dd24963891747d6d7d71f36 100644
--- a/core/lib/Drupal/Core/Ajax/CommandInterface.php
+++ b/core/lib/Drupal/Core/Ajax/CommandInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Ajax\CommandInterface.
+ * Contains \Drupal\Core\Ajax\CommandInterface.
  */
 
 namespace Drupal\Core\Ajax;
diff --git a/core/lib/Drupal/Core/Ajax/CssCommand.php b/core/lib/Drupal/Core/Ajax/CssCommand.php
index aba95d7ed812fd12185e30b058e7b1def67da284..1a14a40576438224695fdc7776d83f395a2b9295 100644
--- a/core/lib/Drupal/Core/Ajax/CssCommand.php
+++ b/core/lib/Drupal/Core/Ajax/CssCommand.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Ajax\CssCommand.
+ * Contains \Drupal\Core\Ajax\CssCommand.
  */
 
 namespace Drupal\Core\Ajax;
diff --git a/core/lib/Drupal/Core/Ajax/DataCommand.php b/core/lib/Drupal/Core/Ajax/DataCommand.php
index 5b40e30ecb542bad8ebe6cf919eed386c73ee084..a495f71a7412b48f0ff405c997c0ebecfee1c2c6 100644
--- a/core/lib/Drupal/Core/Ajax/DataCommand.php
+++ b/core/lib/Drupal/Core/Ajax/DataCommand.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Ajax\DataCommand.
+ * Contains \Drupal\Core\Ajax\DataCommand.
  */
 
 namespace Drupal\Core\Ajax;
diff --git a/core/lib/Drupal/Core/Ajax/HtmlCommand.php b/core/lib/Drupal/Core/Ajax/HtmlCommand.php
index 82de657f3b843f2e17683a36a81228c1795f6c87..cbae08e9d271698caccf9c7036f4c147b3243010 100644
--- a/core/lib/Drupal/Core/Ajax/HtmlCommand.php
+++ b/core/lib/Drupal/Core/Ajax/HtmlCommand.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Ajax\HtmlCommand.
+ * Contains \Drupal\Core\Ajax\HtmlCommand.
  */
 
 namespace Drupal\Core\Ajax;
diff --git a/core/lib/Drupal/Core/Ajax/InsertCommand.php b/core/lib/Drupal/Core/Ajax/InsertCommand.php
index a0b10dbf0aec057765f98dc36375f2cb654014c2..05a7fd188b4170ebf5349a08a529f7fe1d127521 100644
--- a/core/lib/Drupal/Core/Ajax/InsertCommand.php
+++ b/core/lib/Drupal/Core/Ajax/InsertCommand.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Ajax\InsertCommand.
+ * Contains \Drupal\Core\Ajax\InsertCommand.
  */
 
 namespace Drupal\Core\Ajax;
diff --git a/core/lib/Drupal/Core/Ajax/InvokeCommand.php b/core/lib/Drupal/Core/Ajax/InvokeCommand.php
index 4aa1ea1802c98360be0bc640b7fd9620071c3e86..8c032106f6b0f6687f8437f5b44b9747190995af 100644
--- a/core/lib/Drupal/Core/Ajax/InvokeCommand.php
+++ b/core/lib/Drupal/Core/Ajax/InvokeCommand.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Ajax\InvokeCommand.
+ * Contains \Drupal\Core\Ajax\InvokeCommand.
  */
 
 namespace Drupal\Core\Ajax;
diff --git a/core/lib/Drupal/Core/Ajax/PrependCommand.php b/core/lib/Drupal/Core/Ajax/PrependCommand.php
index 6409a6a8dc5fd008f8bc8e2ca5f417aa491153f7..c6cc0361cf5e8136868ebe96ce901ddc4261588a 100644
--- a/core/lib/Drupal/Core/Ajax/PrependCommand.php
+++ b/core/lib/Drupal/Core/Ajax/PrependCommand.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Ajax\PrependCommand.
+ * Contains \Drupal\Core\Ajax\PrependCommand.
  */
 
 namespace Drupal\Core\Ajax;
diff --git a/core/lib/Drupal/Core/Ajax/RemoveCommand.php b/core/lib/Drupal/Core/Ajax/RemoveCommand.php
index f0e5aabe1fe667b4e2de1cf1430d0b644e10610f..f4e6bbe35bdc7c796eb893f8fbf96684b283dbdf 100644
--- a/core/lib/Drupal/Core/Ajax/RemoveCommand.php
+++ b/core/lib/Drupal/Core/Ajax/RemoveCommand.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Ajax\RemoveCommand.
+ * Contains \Drupal\Core\Ajax\RemoveCommand.
  */
 
 namespace Drupal\Core\Ajax;
diff --git a/core/lib/Drupal/Core/Ajax/ReplaceCommand.php b/core/lib/Drupal/Core/Ajax/ReplaceCommand.php
index 91514a314c0e70344f0c9d0c136d4a537c8781f0..b8cc881a4453bf3bdea13e7b4179916129e8bbc1 100644
--- a/core/lib/Drupal/Core/Ajax/ReplaceCommand.php
+++ b/core/lib/Drupal/Core/Ajax/ReplaceCommand.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Ajax\ReplaceCommand.
+ * Contains \Drupal\Core\Ajax\ReplaceCommand.
  */
 
 namespace Drupal\Core\Ajax;
diff --git a/core/lib/Drupal/Core/Ajax/RestripeCommand.php b/core/lib/Drupal/Core/Ajax/RestripeCommand.php
index 708344c4620df08d1d5c068dcf855da5c861f212..834e555b560065e27376d59e77dfbc289b735572 100644
--- a/core/lib/Drupal/Core/Ajax/RestripeCommand.php
+++ b/core/lib/Drupal/Core/Ajax/RestripeCommand.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Ajax\RestripeCommand.
+ * Contains \Drupal\Core\Ajax\RestripeCommand.
  */
 
 namespace Drupal\Core\Ajax;
diff --git a/core/lib/Drupal/Core/Ajax/SettingsCommand.php b/core/lib/Drupal/Core/Ajax/SettingsCommand.php
index 216ad46875908cce04936008fa001a61cccd4f39..e3347701604c8719c5dfb858da77b0158a2d7aad 100644
--- a/core/lib/Drupal/Core/Ajax/SettingsCommand.php
+++ b/core/lib/Drupal/Core/Ajax/SettingsCommand.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Ajax\SettingsCommand.
+ * Contains \Drupal\Core\Ajax\SettingsCommand.
  */
 
 namespace Drupal\Core\Ajax;
diff --git a/core/lib/Drupal/Core/Ajax/UpdateBuildIdCommand.php b/core/lib/Drupal/Core/Ajax/UpdateBuildIdCommand.php
index 2ce74db33c06b8cdc9e078119ac86b1d418c7197..ce906e74c91e0156221545e71a444186d34006df 100644
--- a/core/lib/Drupal/Core/Ajax/UpdateBuildIdCommand.php
+++ b/core/lib/Drupal/Core/Ajax/UpdateBuildIdCommand.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Ajax\UpdateBuildIdCommand.
+ * Contains \Drupal\Core\Ajax\UpdateBuildIdCommand.
  */
 
 namespace Drupal\Core\Ajax;
diff --git a/core/lib/Drupal/Core/Annotation/Translation.php b/core/lib/Drupal/Core/Annotation/Translation.php
index dfa6574e3e585cab459f1e9ee35de53667a6263e..e1cc845c4584b3493306803d2e30848bdff50f23 100644
--- a/core/lib/Drupal/Core/Annotation/Translation.php
+++ b/core/lib/Drupal/Core/Annotation/Translation.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Annotation\Translation.
+ * Contains \Drupal\Core\Annotation\Translation.
  */
 
 namespace Drupal\Core\Annotation;
diff --git a/core/lib/Drupal/Core/Archiver/ArchiverException.php b/core/lib/Drupal/Core/Archiver/ArchiverException.php
index af10ca24a1fd51c57572fff91efe3df93993f573..205c0ac02b83f5628bb61f00227be4aefaf1ec5c 100644
--- a/core/lib/Drupal/Core/Archiver/ArchiverException.php
+++ b/core/lib/Drupal/Core/Archiver/ArchiverException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Archiver\ArchiverException.
+ * Contains \Drupal\Core\Archiver\ArchiverException.
  */
 
 namespace Drupal\Core\Archiver;
diff --git a/core/lib/Drupal/Core/Archiver/ArchiverInterface.php b/core/lib/Drupal/Core/Archiver/ArchiverInterface.php
index 7d65487b80a8e98ba1e64f389d44158519a3babd..93bcf5b49c827b089bbf4ddc57932bc4c501c203 100644
--- a/core/lib/Drupal/Core/Archiver/ArchiverInterface.php
+++ b/core/lib/Drupal/Core/Archiver/ArchiverInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Archiver\ArchiverInterface.
+ * Contains \Drupal\Core\Archiver\ArchiverInterface.
  */
 
 namespace Drupal\Core\Archiver;
diff --git a/core/lib/Drupal/Core/Archiver/Tar.php b/core/lib/Drupal/Core/Archiver/Tar.php
index 600d991f46a76f88628f6966c26c5888f9f7f724..16d441e186e2b281b162cb11a4f9a111450e644f 100644
--- a/core/lib/Drupal/Core/Archiver/Tar.php
+++ b/core/lib/Drupal/Core/Archiver/Tar.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Archiver\Tar.
+ * Contains \Drupal\Core\Archiver\Tar.
  */
 
 namespace Drupal\Core\Archiver;
diff --git a/core/lib/Drupal/Core/Archiver/Zip.php b/core/lib/Drupal/Core/Archiver/Zip.php
index 389f9f1eeddae5f486252279aba8fe76e7a48ed7..15500f70563e3eae9ef5d568ac654dc17fa29c00 100644
--- a/core/lib/Drupal/Core/Archiver/Zip.php
+++ b/core/lib/Drupal/Core/Archiver/Zip.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Archiver\Zip.
+ * Contains \Drupal\Core\Archiver\Zip.
  */
 
 namespace Drupal\Core\Archiver;
diff --git a/core/lib/Drupal/Core/Asset/AssetDumper.php b/core/lib/Drupal/Core/Asset/AssetDumper.php
index d5283bfc9239f41e6bea9b6491996f222caca3e4..cc5c97a81b63c7656c22aa9bcfe2c8fbd114c843 100644
--- a/core/lib/Drupal/Core/Asset/AssetDumper.php
+++ b/core/lib/Drupal/Core/Asset/AssetDumper.php
@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @file
  * Contains \Drupal\Core\Asset\AssetDumper.
  */
 
diff --git a/core/lib/Drupal/Core/Asset/AssetOptimizerInterface.php b/core/lib/Drupal/Core/Asset/AssetOptimizerInterface.php
index 171583dc9f73e197ef72f084d1319de27ebfb237..5eaa9db678a45343c5d0e4571553906dee834825 100644
--- a/core/lib/Drupal/Core/Asset/AssetOptimizerInterface.php
+++ b/core/lib/Drupal/Core/Asset/AssetOptimizerInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains \Drupal\Core\Asset\AssetCollectionOptimizerInterface.
+ * Contains \Drupal\Core\Asset\AssetOptimizerInterface.
  */
 
 namespace Drupal\Core\Asset;
diff --git a/core/lib/Drupal/Core/Asset/CssCollectionGrouper.php b/core/lib/Drupal/Core/Asset/CssCollectionGrouper.php
index 2f727e6f3cd01b4cadacfeb712bb5741718ce705..075246d5325f9023c6f05db0b8ebff20ee924d62 100644
--- a/core/lib/Drupal/Core/Asset/CssCollectionGrouper.php
+++ b/core/lib/Drupal/Core/Asset/CssCollectionGrouper.php
@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @file
  * Contains \Drupal\Core\Asset\CssCollectionGrouper.
  */
 
diff --git a/core/lib/Drupal/Core/Asset/CssCollectionOptimizer.php b/core/lib/Drupal/Core/Asset/CssCollectionOptimizer.php
index b02bb46b9bf1fb262beec1492eb369563bd62ccf..f2523adaa2aa798c79978817c9c6c9d599afd6e7 100644
--- a/core/lib/Drupal/Core/Asset/CssCollectionOptimizer.php
+++ b/core/lib/Drupal/Core/Asset/CssCollectionOptimizer.php
@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @file
  * Contains \Drupal\Core\Asset\CssCollectionOptimizer.
  */
 
diff --git a/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php b/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php
index 1dc817899b4074e00ee82b3a03e9b7b61812cba3..6ef6be3d9646118ab36747caa0f13a9d1abcb650 100644
--- a/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php
+++ b/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php
@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @file
  * Contains \Drupal\Core\Asset\CssCollectionRenderer.
  */
 
diff --git a/core/lib/Drupal/Core/Asset/CssOptimizer.php b/core/lib/Drupal/Core/Asset/CssOptimizer.php
index 6e32fbd86e1eb432ea177bc1b16cf9f015619cf0..c85caafe8abccf15d9f92880c331868ef82b9ea0 100644
--- a/core/lib/Drupal/Core/Asset/CssOptimizer.php
+++ b/core/lib/Drupal/Core/Asset/CssOptimizer.php
@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @file
  * Contains \Drupal\Core\Asset\CssOptimizer.
  */
 
diff --git a/core/lib/Drupal/Core/Asset/JsCollectionGrouper.php b/core/lib/Drupal/Core/Asset/JsCollectionGrouper.php
index 33d27be23df36dd00b7688837699b72db5a2d461..41e0dac40940e475526e82a4dbe87c8bd7cbc1a3 100644
--- a/core/lib/Drupal/Core/Asset/JsCollectionGrouper.php
+++ b/core/lib/Drupal/Core/Asset/JsCollectionGrouper.php
@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @file
  * Contains \Drupal\Core\Asset\JsCollectionGrouper.
  */
 
diff --git a/core/lib/Drupal/Core/Asset/JsCollectionOptimizer.php b/core/lib/Drupal/Core/Asset/JsCollectionOptimizer.php
index a21725dedb9961a011f0706b92fbafc15b5e73ec..782478202658d34dec3caec9ccf656d4e8d1d824 100644
--- a/core/lib/Drupal/Core/Asset/JsCollectionOptimizer.php
+++ b/core/lib/Drupal/Core/Asset/JsCollectionOptimizer.php
@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @file
  * Contains \Drupal\Core\Asset\JsCollectionOptimizer.
  */
 
diff --git a/core/lib/Drupal/Core/Asset/JsCollectionRenderer.php b/core/lib/Drupal/Core/Asset/JsCollectionRenderer.php
index 7db84abe3a86ec891ed2b6a6f84e000316fd78ac..01f75ac887558e7b4d45f12ea4653e3089c97567 100644
--- a/core/lib/Drupal/Core/Asset/JsCollectionRenderer.php
+++ b/core/lib/Drupal/Core/Asset/JsCollectionRenderer.php
@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @file
  * Contains \Drupal\Core\Asset\JsCollectionRenderer.
  */
 
diff --git a/core/lib/Drupal/Core/Asset/JsOptimizer.php b/core/lib/Drupal/Core/Asset/JsOptimizer.php
index 33aca695d8b9026bd5287ae3b26f2e661ea501f5..546733ce5159dd7ef612dde908d5ea4af3ed016e 100644
--- a/core/lib/Drupal/Core/Asset/JsOptimizer.php
+++ b/core/lib/Drupal/Core/Asset/JsOptimizer.php
@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @file
  * Contains \Drupal\Core\Asset\JsOptimizer.
  */
 
diff --git a/core/lib/Drupal/Core/Authentication/AuthenticationManagerInterface.php b/core/lib/Drupal/Core/Authentication/AuthenticationManagerInterface.php
index 8477fc35cfabc510f876790cff0f52fdbfe89e5c..2b8317b632f4be01511afbe7be5fcc533b0683d5 100644
--- a/core/lib/Drupal/Core/Authentication/AuthenticationManagerInterface.php
+++ b/core/lib/Drupal/Core/Authentication/AuthenticationManagerInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Authentication\AuthenticationManagerInterface
+ * Contains \Drupal\Core\Authentication\AuthenticationManagerInterface.
  */
 
 namespace Drupal\Core\Authentication;
diff --git a/core/lib/Drupal/Core/Authentication/AuthenticationProviderChallengeInterface.php b/core/lib/Drupal/Core/Authentication/AuthenticationProviderChallengeInterface.php
index 506a4ae09e007f7fefd496e8b7b5de00def92061..1a839479055cb839eb594551361cbe480acd391d 100644
--- a/core/lib/Drupal/Core/Authentication/AuthenticationProviderChallengeInterface.php
+++ b/core/lib/Drupal/Core/Authentication/AuthenticationProviderChallengeInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Authentication\AuthenticationProviderChallengeInterface
+ * Contains \Drupal\Core\Authentication\AuthenticationProviderChallengeInterface.
  */
 
 namespace Drupal\Core\Authentication;
diff --git a/core/lib/Drupal/Core/Authentication/AuthenticationProviderFilterInterface.php b/core/lib/Drupal/Core/Authentication/AuthenticationProviderFilterInterface.php
index 604a02b81c4a81b8a45968ca409fcdf4315fbc7e..99f8e105090e8df08e700a12fb57d2dd989051b7 100644
--- a/core/lib/Drupal/Core/Authentication/AuthenticationProviderFilterInterface.php
+++ b/core/lib/Drupal/Core/Authentication/AuthenticationProviderFilterInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Authentication\AuthenticationProviderFilterInterface
+ * Contains \Drupal\Core\Authentication\AuthenticationProviderFilterInterface.
  */
 
 namespace Drupal\Core\Authentication;
diff --git a/core/lib/Drupal/Core/Batch/BatchStorageInterface.php b/core/lib/Drupal/Core/Batch/BatchStorageInterface.php
index 52665725c433bba49b8f8dad65ebe93957e25c1a..5e282e90f56606712c4637505832a2e0231a41d8 100644
--- a/core/lib/Drupal/Core/Batch/BatchStorageInterface.php
+++ b/core/lib/Drupal/Core/Batch/BatchStorageInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of \Drupal\Core\Batch\BatchStorageInterface.
+ * Contains \Drupal\Core\Batch\BatchStorageInterface.
  */
 
 namespace Drupal\Core\Batch;
diff --git a/core/lib/Drupal/Core/Cache/BackendChain.php b/core/lib/Drupal/Core/Cache/BackendChain.php
index f7681d9d09014b6b1fbd93e88aaebc43138695e2..c861b74d5f4cfc1a7c201596fcc6738c6777d9e7 100644
--- a/core/lib/Drupal/Core/Cache/BackendChain.php
+++ b/core/lib/Drupal/Core/Cache/BackendChain.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Cache\BackendChain.
+ * Contains \Drupal\Core\Cache\BackendChain.
  */
 
 namespace Drupal\Core\Cache;
diff --git a/core/lib/Drupal/Core/Cache/CacheBackendInterface.php b/core/lib/Drupal/Core/Cache/CacheBackendInterface.php
index faf245931975990ef4eefa0377dd4f8340ffe28c..87b0a1b02a629f99af79fd599ee040bf841b81b0 100644
--- a/core/lib/Drupal/Core/Cache/CacheBackendInterface.php
+++ b/core/lib/Drupal/Core/Cache/CacheBackendInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Cache\CacheBackendInterface.
+ * Contains \Drupal\Core\Cache\CacheBackendInterface.
  */
 
 namespace Drupal\Core\Cache;
diff --git a/core/lib/Drupal/Core/Cache/CacheTagsInvalidatorInterface.php b/core/lib/Drupal/Core/Cache/CacheTagsInvalidatorInterface.php
index bf630411ebcf1935f1c90854a073ac6d71b9f393..833921ab5bc8032e7b22d0e52dc77aa47d29f8f7 100644
--- a/core/lib/Drupal/Core/Cache/CacheTagsInvalidatorInterface.php
+++ b/core/lib/Drupal/Core/Cache/CacheTagsInvalidatorInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Cache\CacheTagsInvalidatorInterface
+ * Contains \Drupal\Core\Cache\CacheTagsInvalidatorInterface.
  */
 
 namespace Drupal\Core\Cache;
diff --git a/core/lib/Drupal/Core/Cache/CacheableDependencyInterface.php b/core/lib/Drupal/Core/Cache/CacheableDependencyInterface.php
index ee1241ba0c5f7b1406ac1049a531cb248b5bb3f9..b746b83009782f47ef714f0df342df88c790f465 100644
--- a/core/lib/Drupal/Core/Cache/CacheableDependencyInterface.php
+++ b/core/lib/Drupal/Core/Cache/CacheableDependencyInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains \Drupal\Core\CacheableDependencyInterface
+ * Contains \Drupal\Core\Cache\CacheableDependencyInterface.
  */
 
 namespace Drupal\Core\Cache;
diff --git a/core/lib/Drupal/Core/Cache/CacheableMetadata.php b/core/lib/Drupal/Core/Cache/CacheableMetadata.php
index 1bd01a584cab4bf974f9e1b4ce3421826b4b82bf..a0c1ba8907c20c882cd607c9ce2ebbe41ee40bca 100644
--- a/core/lib/Drupal/Core/Cache/CacheableMetadata.php
+++ b/core/lib/Drupal/Core/Cache/CacheableMetadata.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains \Drupal\Core\CacheableMetadata
+ * Contains \Drupal\Core\Cache\CacheableMetadata.
  */
 
 namespace Drupal\Core\Cache;
diff --git a/core/lib/Drupal/Core/Cache/CacheableResponseTrait.php b/core/lib/Drupal/Core/Cache/CacheableResponseTrait.php
index 2940c1309736486cfd0205823098872172a28dff..1749c3f790f5ab4e34bdc6bfc8ef2fdaf71a786f 100644
--- a/core/lib/Drupal/Core/Cache/CacheableResponseTrait.php
+++ b/core/lib/Drupal/Core/Cache/CacheableResponseTrait.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\Core\Cache\CacheableResponseTrait.
+ */
+
 namespace Drupal\Core\Cache;
 
 /**
diff --git a/core/lib/Drupal/Core/Cache/Context/AccountPermissionsCacheContext.php b/core/lib/Drupal/Core/Cache/Context/AccountPermissionsCacheContext.php
index 7afce732b3a34eb6370fd368faf4775f79a397fe..5993424ae9a4a49e4863e11d97fbff312c91a44f 100644
--- a/core/lib/Drupal/Core/Cache/Context/AccountPermissionsCacheContext.php
+++ b/core/lib/Drupal/Core/Cache/Context/AccountPermissionsCacheContext.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Cache\Context\UserRolesCacheContext.
+ * Contains \Drupal\Core\Cache\Context\AccountPermissionsCacheContext.
  */
 
 namespace Drupal\Core\Cache\Context;
diff --git a/core/lib/Drupal/Core/Cache/Context/CalculatedCacheContextInterface.php b/core/lib/Drupal/Core/Cache/Context/CalculatedCacheContextInterface.php
index 4242109227ee76f286235c4a12156a0aafdcff7a..bb2f291f90d3567ae3b6e825db2d85cd12d03b4f 100644
--- a/core/lib/Drupal/Core/Cache/Context/CalculatedCacheContextInterface.php
+++ b/core/lib/Drupal/Core/Cache/Context/CalculatedCacheContextInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Cache\Context\CacheContextInterface.
+ * Contains \Drupal\Core\Cache\Context\CalculatedCacheContextInterface.
  */
 
 namespace Drupal\Core\Cache\Context;
diff --git a/core/lib/Drupal/Core/Cache/Context/ThemeCacheContext.php b/core/lib/Drupal/Core/Cache/Context/ThemeCacheContext.php
index 5f478ec7049bd6741acd0b2966308ddc4e05f890..85ba1a78975b0fd958b0ac73fd84e4896296a020 100644
--- a/core/lib/Drupal/Core/Cache/Context/ThemeCacheContext.php
+++ b/core/lib/Drupal/Core/Cache/Context/ThemeCacheContext.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Cache\Context\LanguageCacheContext.
+ * Contains \Drupal\Core\Cache\Context\ThemeCacheContext.
  */
 
 namespace Drupal\Core\Cache\Context;
diff --git a/core/lib/Drupal/Core/Cache/DatabaseBackend.php b/core/lib/Drupal/Core/Cache/DatabaseBackend.php
index ff12845a78a106a2f45f898aacd53fd4ef44c542..49e830b8633a52004083104f5a90bfc54da9ae6d 100644
--- a/core/lib/Drupal/Core/Cache/DatabaseBackend.php
+++ b/core/lib/Drupal/Core/Cache/DatabaseBackend.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Cache\DatabaseBackend.
+ * Contains \Drupal\Core\Cache\DatabaseBackend.
  */
 
 namespace Drupal\Core\Cache;
diff --git a/core/lib/Drupal/Core/Cache/MemoryBackend.php b/core/lib/Drupal/Core/Cache/MemoryBackend.php
index 63b56c2f217cc546800a0d950e43fb6016f7416f..d9bad8d6676f4cb93d36778cc3e7258178fcd9c0 100644
--- a/core/lib/Drupal/Core/Cache/MemoryBackend.php
+++ b/core/lib/Drupal/Core/Cache/MemoryBackend.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Cache\ArrayBackend.
+ * Contains \Drupal\Core\Cache\MemoryBackend.
  */
 
 namespace Drupal\Core\Cache;
diff --git a/core/lib/Drupal/Core/Cache/NullBackend.php b/core/lib/Drupal/Core/Cache/NullBackend.php
index 852da7b9ed12974e91e2e5e0db555bfa0dbf389d..57ed5da4bef6be3f42eee27b79fc7b1dbfccebe3 100644
--- a/core/lib/Drupal/Core/Cache/NullBackend.php
+++ b/core/lib/Drupal/Core/Cache/NullBackend.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Cache\NullBackend.
+ * Contains \Drupal\Core\Cache\NullBackend.
  */
 
 namespace Drupal\Core\Cache;
diff --git a/core/lib/Drupal/Core/CacheDecorator/CacheDecoratorInterface.php b/core/lib/Drupal/Core/CacheDecorator/CacheDecoratorInterface.php
index 574d81ab26672ce1cd9900fde44803739c7386df..5e939a2d55a21a41a6ffbabb50b1c6600c1f64a6 100644
--- a/core/lib/Drupal/Core/CacheDecorator/CacheDecoratorInterface.php
+++ b/core/lib/Drupal/Core/CacheDecorator/CacheDecoratorInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\CacheDecorator\CacheDecoratorInterface.
+ * Contains \Drupal\Core\CacheDecorator\CacheDecoratorInterface.
  */
 
 namespace Drupal\Core\CacheDecorator;
diff --git a/core/lib/Drupal/Core/Config/BootstrapConfigStorageFactory.php b/core/lib/Drupal/Core/Config/BootstrapConfigStorageFactory.php
index c2abc3ba86a29ef3361165a565265795c57a9b8d..afc801211e474a8f266f8f17f9973a75f1b4aa74 100644
--- a/core/lib/Drupal/Core/Config/BootstrapConfigStorageFactory.php
+++ b/core/lib/Drupal/Core/Config/BootstrapConfigStorageFactory.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Config\BootstrapConfigStorageFactory.
+ * Contains \Drupal\Core\Config\BootstrapConfigStorageFactory.
  */
 
 namespace Drupal\Core\Config;
diff --git a/core/lib/Drupal/Core/Config/CachedStorage.php b/core/lib/Drupal/Core/Config/CachedStorage.php
index a21f13769570a17052cc41ef464030f4d6f2de26..590d857eccacf8030872daf83a5bf38a065badeb 100644
--- a/core/lib/Drupal/Core/Config/CachedStorage.php
+++ b/core/lib/Drupal/Core/Config/CachedStorage.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Config\CachedStorage.
+ * Contains \Drupal\Core\Config\CachedStorage.
  */
 
 namespace Drupal\Core\Config;
diff --git a/core/lib/Drupal/Core/Config/ConfigEvents.php b/core/lib/Drupal/Core/Config/ConfigEvents.php
index 507216d374a5d8d3ba8adea047d55719ce86dd97..794fbc597d5d6fd7a86cfd9a81f0a364864888b1 100644
--- a/core/lib/Drupal/Core/Config/ConfigEvents.php
+++ b/core/lib/Drupal/Core/Config/ConfigEvents.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Config\Config\ConfigEvents.
+ * Contains \Drupal\Core\Config\ConfigEvents.
  */
 
 namespace Drupal\Core\Config;
diff --git a/core/lib/Drupal/Core/Config/ConfigException.php b/core/lib/Drupal/Core/Config/ConfigException.php
index 012fcfab1aa770da6867507fdf88d1584626374b..ed31d9025b8a7a0d4d7a0dc37cf3b630e54dea07 100644
--- a/core/lib/Drupal/Core/Config/ConfigException.php
+++ b/core/lib/Drupal/Core/Config/ConfigException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Config\ConfigException.
+ * Contains \Drupal\Core\Config\ConfigException.
  */
 
 namespace Drupal\Core\Config;
diff --git a/core/lib/Drupal/Core/Config/ConfigInstaller.php b/core/lib/Drupal/Core/Config/ConfigInstaller.php
index 929731b84726d5a9bdaba836f9a3cbcd0e5ee037..8906eba7e71b303824fdac287270aa3af7c833f8 100644
--- a/core/lib/Drupal/Core/Config/ConfigInstaller.php
+++ b/core/lib/Drupal/Core/Config/ConfigInstaller.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Config\ConfigInstaller.
+ * Contains \Drupal\Core\Config\ConfigInstaller.
  */
 
 namespace Drupal\Core\Config;
diff --git a/core/lib/Drupal/Core/Config/ConfigInstallerInterface.php b/core/lib/Drupal/Core/Config/ConfigInstallerInterface.php
index 3e99bce8ed4f4668877af422d7ab9f7e89aa5953..ac7ca0946cd6fe373dec7fcb7b04c440e04ee047 100644
--- a/core/lib/Drupal/Core/Config/ConfigInstallerInterface.php
+++ b/core/lib/Drupal/Core/Config/ConfigInstallerInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Config\ConfigInstallerInterface.
+ * Contains \Drupal\Core\Config\ConfigInstallerInterface.
  */
 
 namespace Drupal\Core\Config;
diff --git a/core/lib/Drupal/Core/Config/ConfigPrefixLengthException.php b/core/lib/Drupal/Core/Config/ConfigPrefixLengthException.php
index d91523845b359701ad104cbf3ddfea9fef6d8410..dae3b5bc403dd859b86190464b75ab93189af8c3 100644
--- a/core/lib/Drupal/Core/Config/ConfigPrefixLengthException.php
+++ b/core/lib/Drupal/Core/Config/ConfigPrefixLengthException.php
@@ -1,9 +1,9 @@
 <?php
 
 /**
-* @file
-* Contains \Drupal\Core\Config\ConfigPrefixLengthException.
-*/
+ * @file
+ * Contains \Drupal\Core\Config\ConfigPrefixLengthException.
+ */
 
 namespace Drupal\Core\Config;
 
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigDependencyDeleteFormTrait.php b/core/lib/Drupal/Core/Config/Entity/ConfigDependencyDeleteFormTrait.php
index ada9ac3d742888000380ccf2910deb3c3c454dc8..cd28d1989ab57d4817ca4e2ce6082d9112e462af 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigDependencyDeleteFormTrait.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigDependencyDeleteFormTrait.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Config\Entity\ConfigDependencyDeleteFormTrait;
+ * Contains \Drupal\Core\Config\Entity\ConfigDependencyDeleteFormTrait.
  */
 
 
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
index 68be0029368b60c3c9b1c85e21f90759dd12fffc..a810dbdc104a0237b06b0fd74730f9e41e8e46de 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Config\Entity\ConfigEntityBase.
+ * Contains \Drupal\Core\Config\Entity\ConfigEntityBase.
  */
 
 namespace Drupal\Core\Config\Entity;
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBundleBase.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBundleBase.php
index 915b19d9583b01cc7857b125faa7ea570edeedae..b2fd1719e343ebd4797d8097e2023ad19efffcaf 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBundleBase.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBundleBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Config\Entity\ConfigEntityBundleBase.
+ * Contains \Drupal\Core\Config\Entity\ConfigEntityBundleBase.
  */
 
 namespace Drupal\Core\Config\Entity;
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php
index 76809ed8b4a8fde4948a8ce7493d807599be74fc..bd8c48c87df68a2bb9559a54e85d40389a4f02f4 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Config\Entity\ConfigEntityInterface.
+ * Contains \Drupal\Core\Config\Entity\ConfigEntityInterface.
  */
 
 namespace Drupal\Core\Config\Entity;
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
index 48021733f911a2d349373e2f2084f51d2fa89273..59776aaef93fc30d21ee45938029c0a4b41b24a6 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Config\Entity\ConfigEntityStorage.
+ * Contains \Drupal\Core\Config\Entity\ConfigEntityStorage.
  */
 
 namespace Drupal\Core\Config\Entity;
diff --git a/core/lib/Drupal/Core/Config/FileStorage.php b/core/lib/Drupal/Core/Config/FileStorage.php
index de3ac80b686bc79e5f7bb6d064b192e6b51dad51..ec199e75b5f928e6f887186dd7757d30f4b6cb0c 100644
--- a/core/lib/Drupal/Core/Config/FileStorage.php
+++ b/core/lib/Drupal/Core/Config/FileStorage.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Config\FileStorage.
+ * Contains \Drupal\Core\Config\FileStorage.
  */
 
 namespace Drupal\Core\Config;
diff --git a/core/lib/Drupal/Core/Config/FileStorageFactory.php b/core/lib/Drupal/Core/Config/FileStorageFactory.php
index 1768df47b088d3f849d7034c362ef7d0a7af34ea..3da4ecf7420a968b789ad0491a08c6df665cb27c 100644
--- a/core/lib/Drupal/Core/Config/FileStorageFactory.php
+++ b/core/lib/Drupal/Core/Config/FileStorageFactory.php
@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @file
  * Contains \Drupal\Core\Config\FileStorageFactory.
  */
 
diff --git a/core/lib/Drupal/Core/Config/Importer/MissingContentEvent.php b/core/lib/Drupal/Core/Config/Importer/MissingContentEvent.php
index e7cef8dd5f77ea4d1745319ab7a5cbf338278a46..33ea64ab054a2b833d6b79427bf8233fdae9a4ae 100644
--- a/core/lib/Drupal/Core/Config/Importer/MissingContentEvent.php
+++ b/core/lib/Drupal/Core/Config/Importer/MissingContentEvent.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Config\MissingContentEvent.
+ * Contains \Drupal\Core\Config\Importer\MissingContentEvent.
  */
 
 namespace Drupal\Core\Config\Importer;
diff --git a/core/lib/Drupal/Core/Config/InstallStorage.php b/core/lib/Drupal/Core/Config/InstallStorage.php
index 6a97b310884fbdccb6c3a066a9d479fe1d5742b9..f3a329808a4e1c60a203c833e2c5b555aa1f9265 100644
--- a/core/lib/Drupal/Core/Config/InstallStorage.php
+++ b/core/lib/Drupal/Core/Config/InstallStorage.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Config\InstallStorage.
+ * Contains \Drupal\Core\Config\InstallStorage.
  */
 
 namespace Drupal\Core\Config;
diff --git a/core/lib/Drupal/Core/Config/NullStorage.php b/core/lib/Drupal/Core/Config/NullStorage.php
index 5995da75fbeef09ac53546dfc4428ac6824fbb9a..270aa8b1051c3a9fe2590230ff3ab90c6a4d052e 100644
--- a/core/lib/Drupal/Core/Config/NullStorage.php
+++ b/core/lib/Drupal/Core/Config/NullStorage.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Config\NullStorage.
+ * Contains \Drupal\Core\Config\NullStorage.
  */
 
 namespace Drupal\Core\Config;
diff --git a/core/lib/Drupal/Core/Config/StorageException.php b/core/lib/Drupal/Core/Config/StorageException.php
index a317d8b0672b27f81dc59c545a4a5ebc280d1a28..f75609dc8cab54959ddd8c58a75e7e48a5c7d012 100644
--- a/core/lib/Drupal/Core/Config/StorageException.php
+++ b/core/lib/Drupal/Core/Config/StorageException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Config\StorageException.
+ * Contains \Drupal\Core\Config\StorageException.
  */
 
 namespace Drupal\Core\Config;
diff --git a/core/lib/Drupal/Core/Config/StorageInterface.php b/core/lib/Drupal/Core/Config/StorageInterface.php
index f6145b89bb16aa70437c7473ac1f140bada1f45d..bf22864d80f2053ac6963ba8f3d4f813ab3b3cf1 100644
--- a/core/lib/Drupal/Core/Config/StorageInterface.php
+++ b/core/lib/Drupal/Core/Config/StorageInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Config\StorageInterface.
+ * Contains \Drupal\Core\Config\StorageInterface.
  */
 
 namespace Drupal\Core\Config;
diff --git a/core/lib/Drupal/Core/ContentNegotiation.php b/core/lib/Drupal/Core/ContentNegotiation.php
index 1074b816e03c278199237339d8eb88ca95c3699a..8aa7e484815016c97df1a2fcb1aae59ddb5f00c1 100644
--- a/core/lib/Drupal/Core/ContentNegotiation.php
+++ b/core/lib/Drupal/Core/ContentNegotiation.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\ContentNegotiation.
+ * Contains \Drupal\Core\ContentNegotiation.
  */
 
 namespace Drupal\Core;
diff --git a/core/lib/Drupal/Core/Controller/TitleResolverInterface.php b/core/lib/Drupal/Core/Controller/TitleResolverInterface.php
index 3bea7e0ef3be50cc598613b2b0c75bc3f616a28e..bedfd1781de0226b13bd9d5fcf95da3c72eaf76a 100644
--- a/core/lib/Drupal/Core/Controller/TitleResolverInterface.php
+++ b/core/lib/Drupal/Core/Controller/TitleResolverInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Controller\TitleResolverInterface
+ * Contains \Drupal\Core\Controller\TitleResolverInterface.
  */
 namespace Drupal\Core\Controller;
 
diff --git a/core/lib/Drupal/Core/CoreServiceProvider.php b/core/lib/Drupal/Core/CoreServiceProvider.php
index 64a9aee1bc6b390900293f9af60047159ca1815f..bce1603b306cd90149ad30ecfb78f91739173c0b 100644
--- a/core/lib/Drupal/Core/CoreServiceProvider.php
+++ b/core/lib/Drupal/Core/CoreServiceProvider.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\CoreServiceProvider.
+ * Contains \Drupal\Core\CoreServiceProvider.
  */
 
 namespace Drupal\Core;
diff --git a/core/lib/Drupal/Core/CronInterface.php b/core/lib/Drupal/Core/CronInterface.php
index be3ce679be0e4271cfa49df36ed9b1eb5da3966c..ed4828afe8a148a8f480b9d672ea1884fc50559c 100644
--- a/core/lib/Drupal/Core/CronInterface.php
+++ b/core/lib/Drupal/Core/CronInterface.php
@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @file
  * Contains \Drupal\Core\CronInterface.
  */
 
diff --git a/core/lib/Drupal/Core/Database/Connection.php b/core/lib/Drupal/Core/Database/Connection.php
index af91674d1496cf1b4793147001261382c5d6854c..7c4240202da68e6c74f39042d1c3655e3273caf9 100644
--- a/core/lib/Drupal/Core/Database/Connection.php
+++ b/core/lib/Drupal/Core/Database/Connection.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Connection
+ * Contains \Drupal\Core\Database\Connection.
  */
 
 namespace Drupal\Core\Database;
diff --git a/core/lib/Drupal/Core/Database/ConnectionNotDefinedException.php b/core/lib/Drupal/Core/Database/ConnectionNotDefinedException.php
index a172d7ef352dda7e242cf40a849dcc951ac71bee..493e471be9c592db10a87617d9f4e640ee7b4df3 100644
--- a/core/lib/Drupal/Core/Database/ConnectionNotDefinedException.php
+++ b/core/lib/Drupal/Core/Database/ConnectionNotDefinedException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\ConnectionNotDefinedException
+ * Contains \Drupal\Core\Database\ConnectionNotDefinedException.
  */
 
 namespace Drupal\Core\Database;
diff --git a/core/lib/Drupal/Core/Database/Database.php b/core/lib/Drupal/Core/Database/Database.php
index 718e008b7d0df1243d8d018cd41d9607be82f6cc..d48c6f2b579cb8d3197e14aecdbe12cc0ca003e9 100644
--- a/core/lib/Drupal/Core/Database/Database.php
+++ b/core/lib/Drupal/Core/Database/Database.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Database
+ * Contains \Drupal\Core\Database\Database.
  */
 
 namespace Drupal\Core\Database;
diff --git a/core/lib/Drupal/Core/Database/DatabaseException.php b/core/lib/Drupal/Core/Database/DatabaseException.php
index 019d656166664d5731f735e16f346a8a6c500b64..f28d58eab10317de02e5de550fdf79fa46d98d4f 100644
--- a/core/lib/Drupal/Core/Database/DatabaseException.php
+++ b/core/lib/Drupal/Core/Database/DatabaseException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\DatabaseException
+ * Contains \Drupal\Core\Database\DatabaseException.
  */
 
 namespace Drupal\Core\Database;
diff --git a/core/lib/Drupal/Core/Database/DatabaseExceptionWrapper.php b/core/lib/Drupal/Core/Database/DatabaseExceptionWrapper.php
index f9527d4da91c2a45ccba4dcf908cc92be904a286..c28e1f215ad6c058fb20aac7261111e5fd7a3454 100644
--- a/core/lib/Drupal/Core/Database/DatabaseExceptionWrapper.php
+++ b/core/lib/Drupal/Core/Database/DatabaseExceptionWrapper.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\DatabaseExceptionWrapper.
+ * Contains \Drupal\Core\Database\DatabaseExceptionWrapper.
  */
 
 namespace Drupal\Core\Database;
diff --git a/core/lib/Drupal/Core/Database/DatabaseNotFoundException.php b/core/lib/Drupal/Core/Database/DatabaseNotFoundException.php
index fa1327f59ca9d712d37fced53d8444bbaaa8a3d5..65d1104334b10cb259dcffa0aa6435a170a468df 100644
--- a/core/lib/Drupal/Core/Database/DatabaseNotFoundException.php
+++ b/core/lib/Drupal/Core/Database/DatabaseNotFoundException.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains Drupal\Core\Database\DatabaseNotFoundException.
+ * Contains \Drupal\Core\Database\DatabaseNotFoundException.
  */
 
 namespace Drupal\Core\Database;
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php b/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php
index 7c654e2125a52404c524d6ea3b71aa060fe3f1d8..e6c16bb4e83083b985ded1b30f5a9762317884e5 100644
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\mysql\Connection
+ * Contains \Drupal\Core\Database\Driver\mysql\Connection.
  */
 
 namespace Drupal\Core\Database\Driver\mysql;
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Delete.php b/core/lib/Drupal/Core/Database/Driver/mysql/Delete.php
index de0db11ae586767b302769eba5969d5094baffb7..4e594da3e5fb8dd08d311d8217f4f9ec97db2d20 100644
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Delete.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Delete.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\mysql\Delete
+ * Contains \Drupal\Core\Database\Driver\mysql\Delete.
  */
 
 namespace Drupal\Core\Database\Driver\mysql;
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Insert.php b/core/lib/Drupal/Core/Database/Driver/mysql/Insert.php
index c41fdf3db173b34ca6dff0e52c26a0e5d7adb1ef..8501b14b266b0a612a5ca6ec137ed6dc2ae4bc0f 100644
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Insert.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Insert.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\mysql\Insert
+ * Contains \Drupal\Core\Database\Driver\mysql\Insert.
  */
 
 namespace Drupal\Core\Database\Driver\mysql;
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Install/Tasks.php b/core/lib/Drupal/Core/Database/Driver/mysql/Install/Tasks.php
index 202d0561ab2c08e0c8436afd565fd6cf1bf5d310..19fbe5f2384782c1aea2bb3ed98de2919baeb038 100644
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Install/Tasks.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Install/Tasks.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\mysql\Install\Tasks
+ * Contains \Drupal\Core\Database\Driver\mysql\Install\Tasks.
  */
 
 namespace Drupal\Core\Database\Driver\mysql\Install;
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Merge.php b/core/lib/Drupal/Core/Database/Driver/mysql/Merge.php
index c48b830a566592a6bc4f5e2898a13d18630d5616..b98d8688801ef17739396a300a0dc1b43243db14 100644
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Merge.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Merge.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\mysql\Merge
+ * Contains \Drupal\Core\Database\Driver\mysql\Merge.
  */
 
 namespace Drupal\Core\Database\Driver\mysql;
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php b/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
index a5e89a836e80afd9ae5696f4be671d42bebe7941..8f5b71082d112f3e7547f99180ca0fd04f6135c8 100644
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\mysql\Schema
+ * Contains \Drupal\Core\Database\Driver\mysql\Schema.
  */
 
 namespace Drupal\Core\Database\Driver\mysql;
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Select.php b/core/lib/Drupal/Core/Database/Driver/mysql/Select.php
index aecae55a2fbaa017be7289c1c328af52c1c3a0aa..caa2dbf06eaf46a75324d002ea9561c7530a91c1 100644
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Select.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Select.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\mysql\Select
+ * Contains \Drupal\Core\Database\Driver\mysql\Select.
  */
 
 namespace Drupal\Core\Database\Driver\mysql;
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Transaction.php b/core/lib/Drupal/Core/Database/Driver/mysql/Transaction.php
index 570a1300f3b0a9ef096124b488eedcdda0e70f9f..a04d7a03a08e467ee9ee52d94be29cf799c2b503 100644
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Transaction.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Transaction.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\mysql\Transaction
+ * Contains \Drupal\Core\Database\Driver\mysql\Transaction.
  */
 
 namespace Drupal\Core\Database\Driver\mysql;
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Truncate.php b/core/lib/Drupal/Core/Database/Driver/mysql/Truncate.php
index c7d7a36ca0eef250afc7d70da8bd8eea63b10ffc..00cf10c5f85984aa2183093a6196a4a8508a0912 100644
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Truncate.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Truncate.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\mysql\Truncate
+ * Contains \Drupal\Core\Database\Driver\mysql\Truncate.
  */
 
 namespace Drupal\Core\Database\Driver\mysql;
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Update.php b/core/lib/Drupal/Core/Database/Driver/mysql/Update.php
index 5b3bda68b74e3d46c5050d4c2e4412b5a2e037ae..7d96e5577e51432f2cff9f02e880c6a5b78a7bec 100644
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Update.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Update.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\mysql\Update
+ * Contains \Drupal\Core\Database\Driver\mysql\Update.
  */
 
 namespace Drupal\Core\Database\Driver\mysql;
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
index 118974c140cec0002c0a2ddc3ad435ee0f7f3605..d5a5d2a077700f241bbf3b222631dd870f6c6a93 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\pgsql\Connection
+ * Contains \Drupal\Core\Database\Driver\pgsql\Connection.
  */
 
 namespace Drupal\Core\Database\Driver\pgsql;
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Delete.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Delete.php
index 85c5003f238100d4f7abfd4901fec3adfcf91874..f8940adc0f534a3c2d935e19c8a5e93b7f32a557 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Delete.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Delete.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\pgsql\Delete
+ * Contains \Drupal\Core\Database\Driver\pgsql\Delete.
  */
 
 namespace Drupal\Core\Database\Driver\pgsql;
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php
index fba74da2f60b06e80a18f88e18c7419a1441647c..f21aa7e955b5c9f660e5893b7e20b9e9a57bfd7d 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\pgsql\Insert
+ * Contains \Drupal\Core\Database\Driver\pgsql\Insert.
  */
 
 namespace Drupal\Core\Database\Driver\pgsql;
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php
index e4e8d7ee3cf5de53555d34e4f51f54f172644c7d..83e03666545c3df3ba946efc74834668afa855e7 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\pgsql\Install\Tasks
+ * Contains \Drupal\Core\Database\Driver\pgsql\Install\Tasks.
  */
 
 namespace Drupal\Core\Database\Driver\pgsql\Install;
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Merge.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Merge.php
index c3a2ae0938b837400df9f3e123ea9aa5a12f3593..ad74c13a69cdf96b08fe9c62e88ea9563c33f434 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Merge.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Merge.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\pgsql\Merge
+ * Contains \Drupal\Core\Database\Driver\pgsql\Merge.
  */
 
 namespace Drupal\Core\Database\Driver\pgsql;
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
index 862e2df6c92f348df2505274443deb6096aca5e5..561abee0b830cf8413ba7b8f6d11fef0be4ffb37 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\pgsql\Schema
+ * Contains \Drupal\Core\Database\Driver\pgsql\Schema.
  */
 
 namespace Drupal\Core\Database\Driver\pgsql;
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Select.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Select.php
index 90ca65f47c8df34e5ab0bf21ebb552a95f8766bf..0b58c677980c077c3dadc29b060d92fc2bec132e 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Select.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Select.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\pgsql\Select
+ * Contains \Drupal\Core\Database\Driver\pgsql\Select.
  */
 
 namespace Drupal\Core\Database\Driver\pgsql;
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Transaction.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Transaction.php
index 8c3f7016ed47309bfa6cccef1eeb0fd520a32214..682c53c0880753c4a721ab9539bb50ea634b42c5 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Transaction.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Transaction.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\pgsql\Transaction
+ * Contains \Drupal\Core\Database\Driver\pgsql\Transaction.
  */
 
 namespace Drupal\Core\Database\Driver\pgsql;
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Truncate.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Truncate.php
index 5357e6b31bce2d1a434c9cdcc5f40dc04d2814e4..c0ad989462e7570cff60666acae99e5c115ad46d 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Truncate.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Truncate.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\pgsql\Truncate
+ * Contains \Drupal\Core\Database\Driver\pgsql\Truncate.
  */
 
 namespace Drupal\Core\Database\Driver\pgsql;
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Update.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Update.php
index 1bee32d394c472a799bc1f0d2612cdb072af560c..5d4171dd5d02343d4332e08e377679c89a3f5f5a 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Update.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Update.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\pgsql\Update
+ * Contains \Drupal\Core\Database\Driver\pgsql\Update.
  */
 
 namespace Drupal\Core\Database\Driver\pgsql;
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php
index 92f74f3ffc032e7bd35f89095eeb8447771bfec5..c0f6c102eae1d4da37c4ceed3b8de0abe11cffe2 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\sqlite\Connection
+ * Contains \Drupal\Core\Database\Driver\sqlite\Connection.
  */
 
 namespace Drupal\Core\Database\Driver\sqlite;
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Delete.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Delete.php
index e75090e98210c20b014a9c186f7dced5ddf23b05..a6a07ce5b5b64785c9c530c888dcbf53d5232894 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Delete.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Delete.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\sqlite\Delete
+ * Contains \Drupal\Core\Database\Driver\sqlite\Delete.
  */
 
 namespace Drupal\Core\Database\Driver\sqlite;
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Insert.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Insert.php
index 8882fcdd76aa1f7564a46c25ad0185f6fcc4d864..0e940e7e89b7ea18995d75d964a01981a21728a2 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Insert.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Insert.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\sqlite\Insert
+ * Contains \Drupal\Core\Database\Driver\sqlite\Insert.
  */
 
 namespace Drupal\Core\Database\Driver\sqlite;
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Install/Tasks.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Install/Tasks.php
index 68324b264db276897bb2fe56c273fdcf05ade73e..6f18a8f8bb83311bc25405e254f4bfacd28a11fb 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Install/Tasks.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Install/Tasks.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\sqlite\Install\Tasks
+ * Contains \Drupal\Core\Database\Driver\sqlite\Install\Tasks.
  */
 
 namespace Drupal\Core\Database\Driver\sqlite\Install;
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Merge.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Merge.php
index 3bbc3de8c176ac1d11dd43dfcfccb3f10a9aa266..2acea077f0f2dddc05261080e6373d8c07f02335 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Merge.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Merge.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\sqlite\Merge
+ * Contains \Drupal\Core\Database\Driver\sqlite\Merge.
  */
 
 namespace Drupal\Core\Database\Driver\sqlite;
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
index d3c1762d8ec800abe5a0a8e7cb0bc5ae44df6211..3ac3811b197867e73742c73b6b2d3405d2fc0a4e 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\sqlite\Schema
+ * Contains \Drupal\Core\Database\Driver\sqlite\Schema.
  */
 
 namespace Drupal\Core\Database\Driver\sqlite;
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Select.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Select.php
index 5403611003c94908fd8d866717b0caea9e47ff59..8f2fdb749e657819e0fa397d24eef8610449a020 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Select.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Select.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\sqlite\Select
+ * Contains \Drupal\Core\Database\Driver\sqlite\Select.
  */
 
 namespace Drupal\Core\Database\Driver\sqlite;
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Statement.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Statement.php
index d8c52bbb0daf3751fb11c24c5237a18e6318effd..54e978d01e79cc59aa153570bafa18afdb6a6b8c 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Statement.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Statement.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\sqlite\Statement
+ * Contains \Drupal\Core\Database\Driver\sqlite\Statement.
  */
 
 namespace Drupal\Core\Database\Driver\sqlite;
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Transaction.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Transaction.php
index ae73ed8c98799984a4878bd53d56ef770f17fcda..736dbccf39da07eb93142ed795c963981086eb37 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Transaction.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Transaction.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\sqlite\Transaction
+ * Contains \Drupal\Core\Database\Driver\sqlite\Transaction.
  */
 
 namespace Drupal\Core\Database\Driver\sqlite;
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Truncate.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Truncate.php
index d06d27ebb7055746ce602992acc5b04ed345c64f..a0171c4cc18829f5be7bb4845b81ac635d25b5ae 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Truncate.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Truncate.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\sqlite\Truncate
+ * Contains \Drupal\Core\Database\Driver\sqlite\Truncate.
  */
 
 namespace Drupal\Core\Database\Driver\sqlite;
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Update.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Update.php
index fa7d54b810e4afba68f99300ac1b7a2b8160c51e..aca3c95198c221fd374baa46ed408a2d32e9ae6f 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Update.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Update.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Driver\sqlite\Update
+ * Contains \Drupal\Core\Database\Driver\sqlite\Update.
  */
 
 namespace Drupal\Core\Database\Driver\sqlite;
diff --git a/core/lib/Drupal/Core/Database/DriverNotSpecifiedException.php b/core/lib/Drupal/Core/Database/DriverNotSpecifiedException.php
index bd5935a445f7a234b12280220d407e7a60fb803e..10ed88adce2442f8bf2691e30a54a64faf1c9467 100644
--- a/core/lib/Drupal/Core/Database/DriverNotSpecifiedException.php
+++ b/core/lib/Drupal/Core/Database/DriverNotSpecifiedException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\DriverNotSpecifiedException
+ * Contains \Drupal\Core\Database\DriverNotSpecifiedException.
  */
 
 namespace Drupal\Core\Database;
diff --git a/core/lib/Drupal/Core/Database/Install/TaskException.php b/core/lib/Drupal/Core/Database/Install/TaskException.php
index 2cf1c189cf4523bc807c8b48b9378c2c0dbf9601..cbf5c1a3326ed753bb99bcf835f0ed751e4631ba 100644
--- a/core/lib/Drupal/Core/Database/Install/TaskException.php
+++ b/core/lib/Drupal/Core/Database/Install/TaskException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Install\TaskException
+ * Contains \Drupal\Core\Database\Install\TaskException.
  */
 
 namespace Drupal\Core\Database\Install;
diff --git a/core/lib/Drupal/Core/Database/Install/Tasks.php b/core/lib/Drupal/Core/Database/Install/Tasks.php
index 80363220b9a74f4cb8ae0dbec41897dd05311f4b..ee9c23eca2dfadeb54239f40e9e2aa751309be85 100644
--- a/core/lib/Drupal/Core/Database/Install/Tasks.php
+++ b/core/lib/Drupal/Core/Database/Install/Tasks.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Install\Tasks
+ * Contains \Drupal\Core\Database\Install\Tasks.
  */
 
 namespace Drupal\Core\Database\Install;
diff --git a/core/lib/Drupal/Core/Database/IntegrityConstraintViolationException.php b/core/lib/Drupal/Core/Database/IntegrityConstraintViolationException.php
index b9208ee854d13a42ee89be297c9e15d4199259f8..6ca76da6924db3e90d3d25c504049cf76934689f 100644
--- a/core/lib/Drupal/Core/Database/IntegrityConstraintViolationException.php
+++ b/core/lib/Drupal/Core/Database/IntegrityConstraintViolationException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\IntegrityConstraintViolationException
+ * Contains \Drupal\Core\Database\IntegrityConstraintViolationException.
  */
 
 namespace Drupal\Core\Database;
diff --git a/core/lib/Drupal/Core/Database/InvalidQueryException.php b/core/lib/Drupal/Core/Database/InvalidQueryException.php
index 412c5dfb5586f262ca4a3fc6bc64635b2bd0be9d..da61b1b121e4a79b4d4c958a1caa4b4add0978a1 100644
--- a/core/lib/Drupal/Core/Database/InvalidQueryException.php
+++ b/core/lib/Drupal/Core/Database/InvalidQueryException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\IntegrityConstraintViolationException
+ * Contains \Drupal\Core\Database\InvalidQueryException.
  */
 
 namespace Drupal\Core\Database;
diff --git a/core/lib/Drupal/Core/Database/Log.php b/core/lib/Drupal/Core/Database/Log.php
index 14f5a382d3146ab2f8c2ad635eae3e8b221c052c..e45a3be214e070dc9d25bacf34ae9fd7415a4a43 100644
--- a/core/lib/Drupal/Core/Database/Log.php
+++ b/core/lib/Drupal/Core/Database/Log.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Log
+ * Contains \Drupal\Core\Database\Log.
  */
 
 namespace Drupal\Core\Database;
diff --git a/core/lib/Drupal/Core/Database/Query/AlterableInterface.php b/core/lib/Drupal/Core/Database/Query/AlterableInterface.php
index 80b6ac834644f48e2b609b342263bbd96b6bb035..36992f037474daa91336ed8a59dc057bcff51742 100644
--- a/core/lib/Drupal/Core/Database/Query/AlterableInterface.php
+++ b/core/lib/Drupal/Core/Database/Query/AlterableInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Query\AlterableInterface
+ * Contains \Drupal\Core\Database\Query\AlterableInterface.
  */
 
 namespace Drupal\Core\Database\Query;
diff --git a/core/lib/Drupal/Core/Database/Query/Condition.php b/core/lib/Drupal/Core/Database/Query/Condition.php
index feb111b5c038179624f333b345247a1f4080bf97..4bb1d09ae23f34efc79a87a4c3f5a1ebd39a0c1c 100644
--- a/core/lib/Drupal/Core/Database/Query/Condition.php
+++ b/core/lib/Drupal/Core/Database/Query/Condition.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Query\Condition
+ * Contains \Drupal\Core\Database\Query\Condition.
  */
 
 namespace Drupal\Core\Database\Query;
diff --git a/core/lib/Drupal/Core/Database/Query/ConditionInterface.php b/core/lib/Drupal/Core/Database/Query/ConditionInterface.php
index 944d39c767e39bd5b7d84127675109be152f3a26..3ecfcea246b91fe9d36e81f6f6a462ebe278bc9c 100644
--- a/core/lib/Drupal/Core/Database/Query/ConditionInterface.php
+++ b/core/lib/Drupal/Core/Database/Query/ConditionInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Query\ConditionInterface
+ * Contains \Drupal\Core\Database\Query\ConditionInterface.
  */
 
 namespace Drupal\Core\Database\Query;
diff --git a/core/lib/Drupal/Core/Database/Query/Delete.php b/core/lib/Drupal/Core/Database/Query/Delete.php
index 88483917ff6c8c246c5aaa9eb113c81609b388b4..08e7af1204b015842f32561a3d5ef6155b606efe 100644
--- a/core/lib/Drupal/Core/Database/Query/Delete.php
+++ b/core/lib/Drupal/Core/Database/Query/Delete.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Query\Delete
+ * Contains \Drupal\Core\Database\Query\Delete.
  */
 
 namespace Drupal\Core\Database\Query;
diff --git a/core/lib/Drupal/Core/Database/Query/ExtendableInterface.php b/core/lib/Drupal/Core/Database/Query/ExtendableInterface.php
index e776a520325ac5186f730880429468b8c0122895..c8e600e30d9c7d661b820e14e28148e48dc30f4e 100644
--- a/core/lib/Drupal/Core/Database/Query/ExtendableInterface.php
+++ b/core/lib/Drupal/Core/Database/Query/ExtendableInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Query\ExtendableInterface
+ * Contains \Drupal\Core\Database\Query\ExtendableInterface.
  */
 
 namespace Drupal\Core\Database\Query;
diff --git a/core/lib/Drupal/Core/Database/Query/FieldsOverlapException.php b/core/lib/Drupal/Core/Database/Query/FieldsOverlapException.php
index f7d3af9d898e1f51b0de2fd030cceef1c177084f..b59f69af73eabd38801bd0059e201aa57830cabd 100644
--- a/core/lib/Drupal/Core/Database/Query/FieldsOverlapException.php
+++ b/core/lib/Drupal/Core/Database/Query/FieldsOverlapException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Query\FieldsOverlapException
+ * Contains \Drupal\Core\Database\Query\FieldsOverlapException.
  */
 
 namespace Drupal\Core\Database\Query;
diff --git a/core/lib/Drupal/Core/Database/Query/Insert.php b/core/lib/Drupal/Core/Database/Query/Insert.php
index d9ddbc053e9dde31395cbd5e750deeca4ad0e7be..453fbe329311678231506e9b2494161adf715b73 100644
--- a/core/lib/Drupal/Core/Database/Query/Insert.php
+++ b/core/lib/Drupal/Core/Database/Query/Insert.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Query\Insert
+ * Contains \Drupal\Core\Database\Query\Insert.
  */
 
 namespace Drupal\Core\Database\Query;
diff --git a/core/lib/Drupal/Core/Database/Query/InvalidMergeQueryException.php b/core/lib/Drupal/Core/Database/Query/InvalidMergeQueryException.php
index 1fd52f2111d40b6339594da31a4af7fa054cf1dd..7e21d73192077c61d6efb9b977954ac9fbf55a7a 100644
--- a/core/lib/Drupal/Core/Database/Query/InvalidMergeQueryException.php
+++ b/core/lib/Drupal/Core/Database/Query/InvalidMergeQueryException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Query\InvalidMergeQueryException
+ * Contains \Drupal\Core\Database\Query\InvalidMergeQueryException.
  */
 
 namespace Drupal\Core\Database\Query;
diff --git a/core/lib/Drupal/Core/Database/Query/Merge.php b/core/lib/Drupal/Core/Database/Query/Merge.php
index dfa50e3d2b699497d1030ad54768f306fdd30465..34f83788df6201899fec587ae06ecd381ff69b65 100644
--- a/core/lib/Drupal/Core/Database/Query/Merge.php
+++ b/core/lib/Drupal/Core/Database/Query/Merge.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Query\Merge
+ * Contains \Drupal\Core\Database\Query\Merge.
  */
 
 namespace Drupal\Core\Database\Query;
diff --git a/core/lib/Drupal/Core/Database/Query/NoFieldsException.php b/core/lib/Drupal/Core/Database/Query/NoFieldsException.php
index 805543f91e4ebce3966fe557f0784cb0ed5cfbc5..0e9e7eca81f4717f792bfbc00eab989cb263ac9c 100644
--- a/core/lib/Drupal/Core/Database/Query/NoFieldsException.php
+++ b/core/lib/Drupal/Core/Database/Query/NoFieldsException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Query\NoFieldsException
+ * Contains \Drupal\Core\Database\Query\NoFieldsException.
  */
 
 namespace Drupal\Core\Database\Query;
diff --git a/core/lib/Drupal/Core/Database/Query/PagerSelectExtender.php b/core/lib/Drupal/Core/Database/Query/PagerSelectExtender.php
index a4114cd55cf2ed636af43376a1332be4ba730cc2..bc5c5335ab27016daa8fbeafe3f0f62590f6f974 100644
--- a/core/lib/Drupal/Core/Database/Query/PagerSelectExtender.php
+++ b/core/lib/Drupal/Core/Database/Query/PagerSelectExtender.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Query\PagerSelectExtender
+ * Contains \Drupal\Core\Database\Query\PagerSelectExtender.
  */
 
 namespace Drupal\Core\Database\Query;
diff --git a/core/lib/Drupal/Core/Database/Query/PlaceholderInterface.php b/core/lib/Drupal/Core/Database/Query/PlaceholderInterface.php
index 68b802e676cb9fdf5d0c9886bbeac492393f16dd..9323fd3370e801ec22228ec35a8a9c7f8debb416 100644
--- a/core/lib/Drupal/Core/Database/Query/PlaceholderInterface.php
+++ b/core/lib/Drupal/Core/Database/Query/PlaceholderInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Query\PlaceholderInterface
+ * Contains \Drupal\Core\Database\Query\PlaceholderInterface.
  */
 
 namespace Drupal\Core\Database\Query;
diff --git a/core/lib/Drupal/Core/Database/Query/SelectExtender.php b/core/lib/Drupal/Core/Database/Query/SelectExtender.php
index f16838d3fb046bab79a2f0ec644fdc2467ce77e4..f85aac4ba63604ccb2b3a28308ed3d768b303c6b 100644
--- a/core/lib/Drupal/Core/Database/Query/SelectExtender.php
+++ b/core/lib/Drupal/Core/Database/Query/SelectExtender.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Query\SelectExtender
+ * Contains \Drupal\Core\Database\Query\SelectExtender.
  */
 
 namespace Drupal\Core\Database\Query;
diff --git a/core/lib/Drupal/Core/Database/Query/SelectInterface.php b/core/lib/Drupal/Core/Database/Query/SelectInterface.php
index c779fef39a1c33ec969cafe8d7d125dd522b749f..bfb7db609b7d933b2354308269eccd4bfae6625d 100644
--- a/core/lib/Drupal/Core/Database/Query/SelectInterface.php
+++ b/core/lib/Drupal/Core/Database/Query/SelectInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Query\SelectInterface
+ * Contains \Drupal\Core\Database\Query\SelectInterface.
  */
 
 namespace Drupal\Core\Database\Query;
diff --git a/core/lib/Drupal/Core/Database/Query/TableSortExtender.php b/core/lib/Drupal/Core/Database/Query/TableSortExtender.php
index 56cfc2c625131595216f1f99333ae82a1de31985..d3d08b9687806a0600dd6d0bbcf1c6c0ec68d723 100644
--- a/core/lib/Drupal/Core/Database/Query/TableSortExtender.php
+++ b/core/lib/Drupal/Core/Database/Query/TableSortExtender.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Query\TableSortExtender.
+ * Contains \Drupal\Core\Database\Query\TableSortExtender.
  */
 
 namespace Drupal\Core\Database\Query;
diff --git a/core/lib/Drupal/Core/Database/Query/Truncate.php b/core/lib/Drupal/Core/Database/Query/Truncate.php
index 857e199595d8eb7d6dc6ad878143347019a2ee23..f36dfac6f534d0d19fe8ad466910fcb0ecb4e330 100644
--- a/core/lib/Drupal/Core/Database/Query/Truncate.php
+++ b/core/lib/Drupal/Core/Database/Query/Truncate.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Query\Truncate
+ * Contains \Drupal\Core\Database\Query\Truncate.
  */
 
 namespace Drupal\Core\Database\Query;
diff --git a/core/lib/Drupal/Core/Database/Query/Update.php b/core/lib/Drupal/Core/Database/Query/Update.php
index 4461ba082ccca0df3ad481ac873a95cb330d7a21..28330b7076e2731772520a4e0265e59083fbe4ee 100644
--- a/core/lib/Drupal/Core/Database/Query/Update.php
+++ b/core/lib/Drupal/Core/Database/Query/Update.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Query\Update
+ * Contains \Drupal\Core\Database\Query\Update.
  */
 
 namespace Drupal\Core\Database\Query;
diff --git a/core/lib/Drupal/Core/Database/RowCountException.php b/core/lib/Drupal/Core/Database/RowCountException.php
index f5d27f18b23291ad8b93de0727fcbb1d35db196d..b06404660ea5a27be4ba9fab84147b8d64a8dc0c 100644
--- a/core/lib/Drupal/Core/Database/RowCountException.php
+++ b/core/lib/Drupal/Core/Database/RowCountException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Database\RowCountException
+ * Contains \Drupal\Core\Database\RowCountException.
  */
 
 namespace Drupal\Core\Database;
diff --git a/core/lib/Drupal/Core/Database/SchemaException.php b/core/lib/Drupal/Core/Database/SchemaException.php
index a73e7eb663e1b620f5aab3591606cbb2c28d19bd..182e271b792022338a836a55a34e879f286f21cd 100644
--- a/core/lib/Drupal/Core/Database/SchemaException.php
+++ b/core/lib/Drupal/Core/Database/SchemaException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\SchemaException
+ * Contains \Drupal\Core\Database\SchemaException.
  */
 
 namespace Drupal\Core\Database;
diff --git a/core/lib/Drupal/Core/Database/SchemaObjectDoesNotExistException.php b/core/lib/Drupal/Core/Database/SchemaObjectDoesNotExistException.php
index ac5a1f8828b958164bd34b901e1f7981e680e5fc..c63ec7bcd8aad043febb9bc023a141f364d1ccc4 100644
--- a/core/lib/Drupal/Core/Database/SchemaObjectDoesNotExistException.php
+++ b/core/lib/Drupal/Core/Database/SchemaObjectDoesNotExistException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\SchemaObjectDoesNotExistException
+ * Contains \Drupal\Core\Database\SchemaObjectDoesNotExistException.
  */
 
 namespace Drupal\Core\Database;
diff --git a/core/lib/Drupal/Core/Database/SchemaObjectExistsException.php b/core/lib/Drupal/Core/Database/SchemaObjectExistsException.php
index e8221b5267c2f6e41e93e24a328d4746d964d1ea..855f57773394d394273965c935946404dd695547 100644
--- a/core/lib/Drupal/Core/Database/SchemaObjectExistsException.php
+++ b/core/lib/Drupal/Core/Database/SchemaObjectExistsException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\SchemaObjectExistsException
+ * Contains \Drupal\Core\Database\SchemaObjectExistsException.
  */
 
 namespace Drupal\Core\Database;
diff --git a/core/lib/Drupal/Core/Database/Statement.php b/core/lib/Drupal/Core/Database/Statement.php
index ca70c4c9284763f3d9da697b643ef38302dc728e..5246b21d931bb2553f459118029fbb8a53f02275 100644
--- a/core/lib/Drupal/Core/Database/Statement.php
+++ b/core/lib/Drupal/Core/Database/Statement.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\StatementBase
+ * Contains \Drupal\Core\Database\Statement.
  */
 
 namespace Drupal\Core\Database;
diff --git a/core/lib/Drupal/Core/Database/StatementEmpty.php b/core/lib/Drupal/Core/Database/StatementEmpty.php
index e6cd08dc5fed3ad0d3b781f32c460002e1450662..42d7f1528ae70c4d9188290e48234476d53a1bab 100644
--- a/core/lib/Drupal/Core/Database/StatementEmpty.php
+++ b/core/lib/Drupal/Core/Database/StatementEmpty.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\StatementEmpty
+ * Contains \Drupal\Core\Database\StatementEmpty.
  */
 
 namespace Drupal\Core\Database;
diff --git a/core/lib/Drupal/Core/Database/StatementInterface.php b/core/lib/Drupal/Core/Database/StatementInterface.php
index c6ea3ab01ffaef63de2fdf881655b1bb7e11ab34..4e87be6f4cdc5372f93df9ee53d79ecc3cf61f21 100644
--- a/core/lib/Drupal/Core/Database/StatementInterface.php
+++ b/core/lib/Drupal/Core/Database/StatementInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\StatementInterface
+ * Contains \Drupal\Core\Database\StatementInterface.
  */
 
 namespace Drupal\Core\Database;
diff --git a/core/lib/Drupal/Core/Database/StatementPrefetch.php b/core/lib/Drupal/Core/Database/StatementPrefetch.php
index af87d0d29b1cf6a5842ad5f7b82bfad7edb22ab3..d322c0504367b76cf65eedc1920763400a8c2d40 100644
--- a/core/lib/Drupal/Core/Database/StatementPrefetch.php
+++ b/core/lib/Drupal/Core/Database/StatementPrefetch.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\StatementPrefetch
+ * Contains \Drupal\Core\Database\StatementPrefetch.
  */
 
 namespace Drupal\Core\Database;
diff --git a/core/lib/Drupal/Core/Database/Transaction.php b/core/lib/Drupal/Core/Database/Transaction.php
index 52286e00f6bf660fe89b1b1e6b8ae282d1974a6d..eb4e182386de881997a049607b18c367c37587ba 100644
--- a/core/lib/Drupal/Core/Database/Transaction.php
+++ b/core/lib/Drupal/Core/Database/Transaction.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Transaction
+ * Contains \Drupal\Core\Database\Transaction.
  */
 
 namespace Drupal\Core\Database;
diff --git a/core/lib/Drupal/Core/Database/TransactionCommitFailedException.php b/core/lib/Drupal/Core/Database/TransactionCommitFailedException.php
index 6a5309ea823746aacf5f11f275bb3e286e06cd40..bbce797eb2b54e0d556b01a1423e0ab5d85e3955 100644
--- a/core/lib/Drupal/Core/Database/TransactionCommitFailedException.php
+++ b/core/lib/Drupal/Core/Database/TransactionCommitFailedException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\TransactionCommitFailedException
+ * Contains \Drupal\Core\Database\TransactionCommitFailedException.
  */
 
 namespace Drupal\Core\Database;
diff --git a/core/lib/Drupal/Core/Database/TransactionException.php b/core/lib/Drupal/Core/Database/TransactionException.php
index 79e2f1ad629acbe30e838da7a529faae35ba7706..1045387f963f6a702065907873fed76051d4ec76 100644
--- a/core/lib/Drupal/Core/Database/TransactionException.php
+++ b/core/lib/Drupal/Core/Database/TransactionException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\TransactionException
+ * Contains \Drupal\Core\Database\TransactionException.
  */
 
 namespace Drupal\Core\Database;
diff --git a/core/lib/Drupal/Core/Database/TransactionExplicitCommitNotAllowedException.php b/core/lib/Drupal/Core/Database/TransactionExplicitCommitNotAllowedException.php
index fd4bf23438048fe161abb8af018e835c4b4337a7..6d0f26c26facf52feb0765a5807f02125bccf1cd 100644
--- a/core/lib/Drupal/Core/Database/TransactionExplicitCommitNotAllowedException.php
+++ b/core/lib/Drupal/Core/Database/TransactionExplicitCommitNotAllowedException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\TransactionExplicitCommitNotAllowedException
+ * Contains \Drupal\Core\Database\TransactionExplicitCommitNotAllowedException.
  */
 
 namespace Drupal\Core\Database;
diff --git a/core/lib/Drupal/Core/Database/TransactionNameNonUniqueException.php b/core/lib/Drupal/Core/Database/TransactionNameNonUniqueException.php
index aef40cb81deb522dac38c5b7df82e5ac79859fe6..9634a6de6928742b0fd864e0f117c70481ef153d 100644
--- a/core/lib/Drupal/Core/Database/TransactionNameNonUniqueException.php
+++ b/core/lib/Drupal/Core/Database/TransactionNameNonUniqueException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\TransactionNameNonUniqueException
+ * Contains \Drupal\Core\Database\TransactionNameNonUniqueException.
  */
 
 namespace Drupal\Core\Database;
diff --git a/core/lib/Drupal/Core/Database/TransactionNoActiveException.php b/core/lib/Drupal/Core/Database/TransactionNoActiveException.php
index 44acede1d55fe2d0c3231583cafcde25fc58736b..6223c044ec7dcb63d4fb7667e86416bbd82dc31b 100644
--- a/core/lib/Drupal/Core/Database/TransactionNoActiveException.php
+++ b/core/lib/Drupal/Core/Database/TransactionNoActiveException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\TransactionNoActiveException
+ * Contains \Drupal\Core\Database\TransactionNoActiveException.
  */
 
 namespace Drupal\Core\Database;
diff --git a/core/lib/Drupal/Core/Database/TransactionOutOfOrderException.php b/core/lib/Drupal/Core/Database/TransactionOutOfOrderException.php
index 2e2fe7a90d45760951c75726197a7ee3a3a278a0..e12730715e06444cdb0f189e36bf83825253adfc 100644
--- a/core/lib/Drupal/Core/Database/TransactionOutOfOrderException.php
+++ b/core/lib/Drupal/Core/Database/TransactionOutOfOrderException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\TransactionOutOfOrderException
+ * Contains \Drupal\Core\Database\TransactionOutOfOrderException.
  */
 
 namespace Drupal\Core\Database;
diff --git a/core/lib/Drupal/Core/Datetime/DrupalDateTime.php b/core/lib/Drupal/Core/Datetime/DrupalDateTime.php
index 98e8fb9a608358abe1c7066237b52034a239dd8a..e7c71f15621bcf651a9a4b6331d68cb27e12b092 100644
--- a/core/lib/Drupal/Core/Datetime/DrupalDateTime.php
+++ b/core/lib/Drupal/Core/Datetime/DrupalDateTime.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Datetime\DrupalDateTime.
+ * Contains \Drupal\Core\Datetime\DrupalDateTime.
  */
 namespace Drupal\Core\Datetime;
 
diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/ModifyServiceDefinitionsPass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/ModifyServiceDefinitionsPass.php
index 8ecded9ba98fc0f2b2fbc32a34a53117fdd25483..748bf44ec76d9869c5f4c10367b57d85a9e21665 100644
--- a/core/lib/Drupal/Core/DependencyInjection/Compiler/ModifyServiceDefinitionsPass.php
+++ b/core/lib/Drupal/Core/DependencyInjection/Compiler/ModifyServiceDefinitionsPass.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\DependencyInjection\Compiler\ModifyServiceDefinitionsPass.
+ * Contains \Drupal\Core\DependencyInjection\Compiler\ModifyServiceDefinitionsPass.
  */
 
 namespace Drupal\Core\DependencyInjection\Compiler;
diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterAccessChecksPass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterAccessChecksPass.php
index 81b425233d599109d0e0fc6c945044a723277ca0..a9ec3b66b4eb9d37ea34f7eeb366a79ffbf8b31f 100644
--- a/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterAccessChecksPass.php
+++ b/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterAccessChecksPass.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\DependencyInjection\Compiler\RegisterAccessChecksPass.
+ * Contains \Drupal\Core\DependencyInjection\Compiler\RegisterAccessChecksPass.
  */
 
 namespace Drupal\Core\DependencyInjection\Compiler;
diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterKernelListenersPass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterKernelListenersPass.php
index 33b2683b6ab739e4ea459cb5bfbd1184c55e22cb..cb48a5f74eec58b649c4692bf60218d42d583de3 100644
--- a/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterKernelListenersPass.php
+++ b/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterKernelListenersPass.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\DependencyInjection\Compiler\RegisterKernelListenersPass.
+ * Contains \Drupal\Core\DependencyInjection\Compiler\RegisterKernelListenersPass.
  */
 
 namespace Drupal\Core\DependencyInjection\Compiler;
diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterStreamWrappersPass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterStreamWrappersPass.php
index 01193d3d802bb34b81cebef721332a3a8ff6bf1c..4659cb04fff2ea1d0d54f0c91a42ca6ab9b0439d 100644
--- a/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterStreamWrappersPass.php
+++ b/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterStreamWrappersPass.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\DependencyInjection\Compiler\RegisterStreamWrappersPass.
+ * Contains \Drupal\Core\DependencyInjection\Compiler\RegisterStreamWrappersPass.
  */
 
 namespace Drupal\Core\DependencyInjection\Compiler;
diff --git a/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php b/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
index d6b1cd62867619fd6eef12e25b100d9a2629154f..ce692b53445388331c55a2b0512f9d04d8b3724b 100644
--- a/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
+++ b/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\DependencyInjection\Container.
+ * Contains \Drupal\Core\DependencyInjection\ContainerBuilder.
  */
 
 namespace Drupal\Core\DependencyInjection;
diff --git a/core/lib/Drupal/Core/DependencyInjection/ServiceModifierInterface.php b/core/lib/Drupal/Core/DependencyInjection/ServiceModifierInterface.php
index 08c881e46a0751d432f2df8d88d5bd32bda4cebb..09b34b347f83f09fdce4b5e94b61eab976787096 100644
--- a/core/lib/Drupal/Core/DependencyInjection/ServiceModifierInterface.php
+++ b/core/lib/Drupal/Core/DependencyInjection/ServiceModifierInterface.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\Core\DependencyInjection\ServiceModifierInterface.
+ */
+
 namespace Drupal\Core\DependencyInjection;
 
 /**
diff --git a/core/lib/Drupal/Core/DependencyInjection/ServiceProviderInterface.php b/core/lib/Drupal/Core/DependencyInjection/ServiceProviderInterface.php
index f8cb491c8b9b4ede05a242bcddd8145a21bad152..ed1f23dd6228cc89b419b1c505062c530cfe3354 100644
--- a/core/lib/Drupal/Core/DependencyInjection/ServiceProviderInterface.php
+++ b/core/lib/Drupal/Core/DependencyInjection/ServiceProviderInterface.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\Core\DependencyInjection\ServiceProviderInterface.
+ */
+
 namespace Drupal\Core\DependencyInjection;
 
 /**
diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php
index 82afbaaea8a09618dc92d460798d34b27f438deb..5823c8269e71c23f9fc653783aa00826cfad4ae0 100644
--- a/core/lib/Drupal/Core/DrupalKernel.php
+++ b/core/lib/Drupal/Core/DrupalKernel.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\DrupalKernel.
+ * Contains \Drupal\Core\DrupalKernel.
  */
 
 namespace Drupal\Core;
diff --git a/core/lib/Drupal/Core/DrupalKernelInterface.php b/core/lib/Drupal/Core/DrupalKernelInterface.php
index c7eb93f9d342d090241364d783aeb09dad1f5aaf..b17ed8065236dd37540e18c31cbabcb011913a41 100644
--- a/core/lib/Drupal/Core/DrupalKernelInterface.php
+++ b/core/lib/Drupal/Core/DrupalKernelInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\DrupalKernelInterface.
+ * Contains \Drupal\Core\DrupalKernelInterface.
  */
 
 namespace Drupal\Core;
diff --git a/core/lib/Drupal/Core/Entity/ContentUninstallValidator.php b/core/lib/Drupal/Core/Entity/ContentUninstallValidator.php
index e791d8a270efd62172fb3178cc014393ae099a81..a818cd7dc4efb752cd1dd998a665cbbf93dc1ce1 100644
--- a/core/lib/Drupal/Core/Entity/ContentUninstallValidator.php
+++ b/core/lib/Drupal/Core/Entity/ContentUninstallValidator.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Entity\ContentUninstallValidator.
+ * Contains \Drupal\Core\Entity\ContentUninstallValidator.
  */
 
 namespace Drupal\Core\Entity;
diff --git a/core/lib/Drupal/Core/Entity/EntityDeleteForm.php b/core/lib/Drupal/Core/Entity/EntityDeleteForm.php
index dc2bad022e99eadd2c39ad6973330760498ea398..6d0ef798ff2a913e51d0d6efc1cea273c631e40e 100644
--- a/core/lib/Drupal/Core/Entity/EntityDeleteForm.php
+++ b/core/lib/Drupal/Core/Entity/EntityDeleteForm.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Entity\EntityConfirmFormBase.
+ * Contains \Drupal\Core\Entity\EntityDeleteForm.
  */
 
 namespace Drupal\Core\Entity;
diff --git a/core/lib/Drupal/Core/Entity/EntityDisplayPluginCollection.php b/core/lib/Drupal/Core/Entity/EntityDisplayPluginCollection.php
index d58e841f999f6a17b267e8e3c91a609b93a1f89e..d11d927180712f8d162f415c8b3249509afb5ca0 100644
--- a/core/lib/Drupal/Core/Entity/EntityDisplayPluginCollection.php
+++ b/core/lib/Drupal/Core/Entity/EntityDisplayPluginCollection.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\filter\EntityDisplayPluginCollection.
+ * Contains \Drupal\Core\Entity\EntityDisplayPluginCollection.
  */
 
 namespace Drupal\Core\Entity;
diff --git a/core/lib/Drupal/Core/Entity/Event/BundleConfigImportValidate.php b/core/lib/Drupal/Core/Entity/Event/BundleConfigImportValidate.php
index 58ca1a2c53e403e19a471fe9dcf4daeaff95ab62..346d0a54788c62cfe6214372a9c4f204059f7338 100644
--- a/core/lib/Drupal/Core/Entity/Event/BundleConfigImportValidate.php
+++ b/core/lib/Drupal/Core/Entity/Event/BundleConfigImportValidate.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Entity\Event\BundleConfigImportValidate
+ * Contains \Drupal\Core\Entity\Event\BundleConfigImportValidate.
  */
 
 namespace Drupal\Core\Entity\Event;
diff --git a/core/lib/Drupal/Core/Entity/Exception/FieldStorageDefinitionUpdateForbiddenException.php b/core/lib/Drupal/Core/Entity/Exception/FieldStorageDefinitionUpdateForbiddenException.php
index 0149ec35b869c0f1dabce9c8e85b9093d4103d2c..9f89a72254ee0680915424d06be354a0412c69c0 100644
--- a/core/lib/Drupal/Core/Entity/Exception/FieldStorageDefinitionUpdateForbiddenException.php
+++ b/core/lib/Drupal/Core/Entity/Exception/FieldStorageDefinitionUpdateForbiddenException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Entity\Exception\StorageDefinitionUpdateForbiddenException.
+ * Contains \Drupal\Core\Entity\Exception\FieldStorageDefinitionUpdateForbiddenException.
  */
 
 namespace Drupal\Core\Entity\Exception;
diff --git a/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/Broken.php b/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/Broken.php
index aae79bbcd53b658fea2d3ad0f7f62410c8388844..f5fbf1291062c7c7a66235f762c174dda428dadc 100644
--- a/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/Broken.php
+++ b/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/Broken.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Entity\Plugin\EntityReferenceSelection\SelectionBroken.
+ * Contains \Drupal\Core\Entity\Plugin\EntityReferenceSelection\Broken.
  */
 
 namespace Drupal\Core\Entity\Plugin\EntityReferenceSelection;
diff --git a/core/lib/Drupal/Core/Entity/Query/ConditionInterface.php b/core/lib/Drupal/Core/Entity/Query/ConditionInterface.php
index 056a795028207071c7fee7a0aa207bc0f0abf716..c90e7ee303930d1adeb2ecf37d3203fabe1960a3 100644
--- a/core/lib/Drupal/Core/Entity/Query/ConditionInterface.php
+++ b/core/lib/Drupal/Core/Entity/Query/ConditionInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Entity\ConditionInterface.
+ * Contains \Drupal\Core\Entity\Query\ConditionInterface.
  */
 
 namespace Drupal\Core\Entity\Query;
diff --git a/core/lib/Drupal/Core/Entity/Query/QueryException.php b/core/lib/Drupal/Core/Entity/Query/QueryException.php
index c7be45cd46882957d816c481133d92328021669f..074bf276809e0ae3ef2b008bce8d22766d64868a 100644
--- a/core/lib/Drupal/Core/Entity/Query/QueryException.php
+++ b/core/lib/Drupal/Core/Entity/Query/QueryException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Entity\QueryException.
+ * Contains \Drupal\Core\Entity\Query\QueryException.
  */
 
 namespace Drupal\Core\Entity\Query;
diff --git a/core/lib/Drupal/Core/Entity/Query/QueryInterface.php b/core/lib/Drupal/Core/Entity/Query/QueryInterface.php
index 2ddbd5dbf3357a4adb400ff2405f5da1c1edca6a..e0beb78f68178d3cc4e3163b22e176134680f43a 100644
--- a/core/lib/Drupal/Core/Entity/Query/QueryInterface.php
+++ b/core/lib/Drupal/Core/Entity/Query/QueryInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Entity\QueryInterface.
+ * Contains \Drupal\Core\Entity\Query\QueryInterface.
  */
 
 namespace Drupal\Core\Entity\Query;
diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageException.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageException.php
index 61f610e407ce0c7ee247aea67b5773d37a62da43..2508a25da719bd0ed3b0f4eb6bcfb2293f65387f 100644
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageException.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Entity\Sql\SqlContentEntityStorageSchemaException.
+ * Contains \Drupal\Core\Entity\Sql\SqlContentEntityStorageException.
  */
 
 namespace Drupal\Core\Entity\Sql;
diff --git a/core/lib/Drupal/Core/EventSubscriber/ClientErrorResponseSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/ClientErrorResponseSubscriber.php
index 5b4f0bdc6d1422396500a3cb1596e895e100c217..041ffe3dfdcf58ac175dc70e43ea2941abfb97e1 100644
--- a/core/lib/Drupal/Core/EventSubscriber/ClientErrorResponseSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/ClientErrorResponseSubscriber.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\EventSubscriber\CacheableResponseSubscriber.
+ * Contains \Drupal\Core\EventSubscriber\ClientErrorResponseSubscriber.
  */
 
 namespace Drupal\Core\EventSubscriber;
diff --git a/core/lib/Drupal/Core/EventSubscriber/CustomPageExceptionHtmlSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/CustomPageExceptionHtmlSubscriber.php
index 377f26bccfe1d1853f0faf63a18a30ba0b17801a..ae92b085a1037a5a1b47d366ca23ec210ea01026 100644
--- a/core/lib/Drupal/Core/EventSubscriber/CustomPageExceptionHtmlSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/CustomPageExceptionHtmlSubscriber.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\EventSubscriber\DefaultExceptionHtmlSubscriber.
+ * Contains \Drupal\Core\EventSubscriber\CustomPageExceptionHtmlSubscriber.
  */
 
 namespace Drupal\Core\EventSubscriber;
diff --git a/core/lib/Drupal/Core/EventSubscriber/EntityRouteAlterSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/EntityRouteAlterSubscriber.php
index 20c2faf37e4ab3f4866f9ff1d07683abb535b61e..1099686f56ceff8fc4e2602adbc39f74e6d62da8 100644
--- a/core/lib/Drupal/Core/EventSubscriber/EntityRouteAlterSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/EntityRouteAlterSubscriber.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\EventSubscriber\EntityRouteAlterSubscriber.
+ * Contains \Drupal\Core\EventSubscriber\EntityRouteAlterSubscriber.
  */
 
 namespace Drupal\Core\EventSubscriber;
diff --git a/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
index 944653a389a7dd2ecfd2409c9f517058d4493ed3..1f9f28b98b80196b2aebf615c2bc60d8d8e591d8 100644
--- a/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\EventSubscriber\FinishResponseSubscriber.
+ * Contains \Drupal\Core\EventSubscriber\FinishResponseSubscriber.
  */
 
 namespace Drupal\Core\EventSubscriber;
diff --git a/core/lib/Drupal/Core/EventSubscriber/ParamConverterSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/ParamConverterSubscriber.php
index eaa248a732d3d887246d4d9f2d15db7155500cfe..e40882273ed562ddc3b0d95110ea4fe755ff39ac 100644
--- a/core/lib/Drupal/Core/EventSubscriber/ParamConverterSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/ParamConverterSubscriber.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\EventSubscriber\ParamConverterSubscriber.
+ * Contains \Drupal\Core\EventSubscriber\ParamConverterSubscriber.
  */
 
 namespace Drupal\Core\EventSubscriber;
diff --git a/core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php
index 9b377b6e5362df5d86bd73c148ca0608eab3ca4f..00908d5daca2dec6cf70d86cfa6e4469ac82d779 100644
--- a/core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\EventSubscriber\RequestCloseSubscriber.
+ * Contains \Drupal\Core\EventSubscriber\RequestCloseSubscriber.
  */
 
 namespace Drupal\Core\EventSubscriber;
diff --git a/core/lib/Drupal/Core/EventSubscriber/RouteAccessResponseSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/RouteAccessResponseSubscriber.php
index 76784e742fef17ef6fdbf062eca3686ef0b246c2..16bc9054defaa0a76bf2dbe004096791c58a110d 100644
--- a/core/lib/Drupal/Core/EventSubscriber/RouteAccessResponseSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/RouteAccessResponseSubscriber.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\EventSubscriber\CacheableResponseSubscriber.
+ * Contains \Drupal\Core\EventSubscriber\RouteAccessResponseSubscriber.
  */
 
 namespace Drupal\Core\EventSubscriber;
diff --git a/core/lib/Drupal/Core/Executable/ExecutableException.php b/core/lib/Drupal/Core/Executable/ExecutableException.php
index 8defc8a9fbc637f04dd6cdaf9ef04a82278b5a7d..ebfc32254dc03bc63e36e466a1b91fe6fc3ab934 100644
--- a/core/lib/Drupal/Core/Executable/ExecutableException.php
+++ b/core/lib/Drupal/Core/Executable/ExecutableException.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Definition of \Drupal\Core\Executable\ExecutableException.
+ * Contains \Drupal\Core\Executable\ExecutableException.
  */
 
 namespace Drupal\Core\Executable;
diff --git a/core/lib/Drupal/Core/Extension/InfoParser.php b/core/lib/Drupal/Core/Extension/InfoParser.php
index cb178fb5a045937079ae5f666dd921364e400ffa..0bc9676f978183e6985a8343a0f68a1286feb065 100644
--- a/core/lib/Drupal/Core/Extension/InfoParser.php
+++ b/core/lib/Drupal/Core/Extension/InfoParser.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Extension\InfoParser.
+ * Contains \Drupal\Core\Extension\InfoParser.
  */
 
 namespace Drupal\Core\Extension;
diff --git a/core/lib/Drupal/Core/Extension/InfoParserException.php b/core/lib/Drupal/Core/Extension/InfoParserException.php
index df8071f35eab4274301b7980e19ec418ce46d86e..152aa98b3550520e13df3b88707ebfeb0af88522 100644
--- a/core/lib/Drupal/Core/Extension/InfoParserException.php
+++ b/core/lib/Drupal/Core/Extension/InfoParserException.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains Drupal\Core\Extension\InfoParserException.
+ * Contains \Drupal\Core\Extension\InfoParserException.
  */
 
 namespace Drupal\Core\Extension;
diff --git a/core/lib/Drupal/Core/Extension/ModuleHandler.php b/core/lib/Drupal/Core/Extension/ModuleHandler.php
index 93ca06684a52642bdd7c426722dc0d3643275758..ce5af4f63c13df0f6cce8484313bf1c79287871d 100644
--- a/core/lib/Drupal/Core/Extension/ModuleHandler.php
+++ b/core/lib/Drupal/Core/Extension/ModuleHandler.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Extension\ModuleHandler.
+ * Contains \Drupal\Core\Extension\ModuleHandler.
  */
 
 namespace Drupal\Core\Extension;
diff --git a/core/lib/Drupal/Core/Extension/ModuleHandlerInterface.php b/core/lib/Drupal/Core/Extension/ModuleHandlerInterface.php
index 43e3b5e5c672767f81dc4891fdb19a2c252cde37..d614fdbcdcdf53b82725cbab776e0e37fa3afd5b 100644
--- a/core/lib/Drupal/Core/Extension/ModuleHandlerInterface.php
+++ b/core/lib/Drupal/Core/Extension/ModuleHandlerInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Extension\ModuleHandlerInterface.
+ * Contains \Drupal\Core\Extension\ModuleHandlerInterface.
  */
 
 namespace Drupal\Core\Extension;
diff --git a/core/lib/Drupal/Core/Extension/ModuleUninstallValidatorInterface.php b/core/lib/Drupal/Core/Extension/ModuleUninstallValidatorInterface.php
index eeabca51ce1a39cb70a40b9ddf8e1acd7bcd4976..8eb5906462acca51dabac518c159b426bd20c06f 100644
--- a/core/lib/Drupal/Core/Extension/ModuleUninstallValidatorInterface.php
+++ b/core/lib/Drupal/Core/Extension/ModuleUninstallValidatorInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Extension\ModuleUninstallValidatorInterface.
+ * Contains \Drupal\Core\Extension\ModuleUninstallValidatorInterface.
  */
 
 namespace Drupal\Core\Extension;
diff --git a/core/lib/Drupal/Core/Field/Annotation/FieldType.php b/core/lib/Drupal/Core/Field/Annotation/FieldType.php
index 880a2221d22772f8799b8044e6882185086bd919..cdb9fa1e495b03a9cd7b6192f51383216e79ce5c 100644
--- a/core/lib/Drupal/Core/Field/Annotation/FieldType.php
+++ b/core/lib/Drupal/Core/Field/Annotation/FieldType.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Entity\Annotation\FieldType.
+ * Contains \Drupal\Core\Field\Annotation\FieldType.
  */
 
 namespace Drupal\Core\Field\Annotation;
diff --git a/core/lib/Drupal/Core/Field/FieldException.php b/core/lib/Drupal/Core/Field/FieldException.php
index cd1ecda3a8896029fc918a081f993e04b83e5860..27d6a528e568edcc1877517a7c38d1c792ce6a75 100644
--- a/core/lib/Drupal/Core/Field/FieldException.php
+++ b/core/lib/Drupal/Core/Field/FieldException.php
@@ -1,6 +1,6 @@
 <?php
 
-/*
+/**
  * @file
  * Contains \Drupal\Core\Field\FieldException.
  */
diff --git a/core/lib/Drupal/Core/Field/FieldModuleUninstallValidator.php b/core/lib/Drupal/Core/Field/FieldModuleUninstallValidator.php
index b2e474d082410bf3d5d235a1749993c47ea6689b..0d0fb47dcb4d78346a019a0c2c7f6d21514844af 100644
--- a/core/lib/Drupal/Core/Field/FieldModuleUninstallValidator.php
+++ b/core/lib/Drupal/Core/Field/FieldModuleUninstallValidator.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Field\FieldModuleUninstallValidator.
+ * Contains \Drupal\Core\Field\FieldModuleUninstallValidator.
  */
 
 namespace Drupal\Core\Field;
diff --git a/core/lib/Drupal/Core/Field/FieldStorageDefinitionEvents.php b/core/lib/Drupal/Core/Field/FieldStorageDefinitionEvents.php
index 9707635b775598ccfe432fc9249c64f811d93075..6f2127f86bcf32d1c18562ba0d37e95aadd6c848 100644
--- a/core/lib/Drupal/Core/Field/FieldStorageDefinitionEvents.php
+++ b/core/lib/Drupal/Core/Field/FieldStorageDefinitionEvents.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Field\FieldStorageDefinitionEvent.
+ * Contains \Drupal\Core\Field\FieldStorageDefinitionEvents.
  */
 
 namespace Drupal\Core\Field;
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/BooleanItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/BooleanItem.php
index 563da20a87fd101e5516483378bbbfc384e47a9d..7107436196f85ea26dca10e58ba8fec732b4863b 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/BooleanItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/BooleanItem.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Entity\Plugin\Field\FieldType\BooleanItem.
+ * Contains \Drupal\Core\Field\Plugin\Field\FieldType\BooleanItem.
  */
 
 namespace Drupal\Core\Field\Plugin\Field\FieldType;
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/ChangedItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/ChangedItem.php
index 1a120f8f871b28a85b1236cdc5f376b653974630..544390d726ab39f503226fe558d637b90c043862 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/ChangedItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/ChangedItem.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Entity\Plugin\Field\FieldType\ChangedItem.
+ * Contains \Drupal\Core\Field\Plugin\Field\FieldType\ChangedItem.
  */
 
 namespace Drupal\Core\Field\Plugin\Field\FieldType;
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/CreatedItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/CreatedItem.php
index 367a1bc5555983d9835a712bc296cf5de228c6f0..fc04f574465dcec7998c0bb5fa954ea0fb315fd4 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/CreatedItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/CreatedItem.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Entity\Plugin\Field\FieldType\CreatedItem.
+ * Contains \Drupal\Core\Field\Plugin\Field\FieldType\CreatedItem.
  */
 
 namespace Drupal\Core\Field\Plugin\Field\FieldType;
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php
index 48bef3af9ccf55df21c13e420608d291cc0090fc..7ed68fbd3a8b554f35692fff53348335418485b2 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Entity\Plugin\Field\FieldType\EmailItem.
+ * Contains \Drupal\Core\Field\Plugin\Field\FieldType\EmailItem.
  */
 
 namespace Drupal\Core\Field\Plugin\Field\FieldType;
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/TimestampItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/TimestampItem.php
index 2dafed5788929789fd83922710c0e58f61f2863b..b8d9500c9e9086013df1c1b2b98a43d097315498 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/TimestampItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/TimestampItem.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Entity\Plugin\Field\FieldType\TimestampItem.
+ * Contains \Drupal\Core\Field\Plugin\Field\FieldType\TimestampItem.
  */
 
 namespace Drupal\Core\Field\Plugin\Field\FieldType;
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UriItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UriItem.php
index 1afd100ad3b64c720bf379c49b2760086dcbff16..794d4b27f8b4b417ee46e9d0d5afdfb7aab0abbf 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UriItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UriItem.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Entity\Plugin\Field\FieldType\UriItem.
+ * Contains \Drupal\Core\Field\Plugin\Field\FieldType\UriItem.
  */
 
 namespace Drupal\Core\Field\Plugin\Field\FieldType;
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UuidItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UuidItem.php
index 1bdd10e76abc3a42f63434a2dd4ce0c6a18a0d49..19264ca5ad6dd556506ff917ce7796f9b61bd775 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UuidItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UuidItem.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Entity\Plugin\Field\FieldType\UuidItem.
+ * Contains \Drupal\Core\Field\Plugin\Field\FieldType\UuidItem.
  */
 
 namespace Drupal\Core\Field\Plugin\Field\FieldType;
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/BooleanCheckboxWidget.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/BooleanCheckboxWidget.php
index 3069af389bac464b02c87e661842386ba477475c..d45e2d7dddbce6d9940f53fbf2161146719e6283 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/BooleanCheckboxWidget.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/BooleanCheckboxWidget.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Field\Plugin\Field\FieldWidget\CheckboxWidget.
+ * Contains \Drupal\Core\Field\Plugin\Field\FieldWidget\BooleanCheckboxWidget.
  */
 
 namespace Drupal\Core\Field\Plugin\Field\FieldWidget;
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteTagsWidget.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteTagsWidget.php
index 64b46c2f2ec2f60afabe6ea60401cb26c32b300c..6ff20fd2586ca775311c12eff2826cc6900a7aca 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteTagsWidget.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteTagsWidget.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Field\Plugin\Field\FieldWidget\AutocompleteTagsWidget.
+ * Contains \Drupal\Core\Field\Plugin\Field\FieldWidget\EntityReferenceAutocompleteTagsWidget.
  */
 
 namespace Drupal\Core\Field\Plugin\Field\FieldWidget;
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteWidget.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteWidget.php
index 2d99619adfce04ddec999498141f51c13a2d1437..6201c529bec91f02cf81a26ea8f2bb1cb3da9c9b 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteWidget.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteWidget.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Field\Plugin\Field\FieldWidget\AutocompleteWidget.
+ * Contains \Drupal\Core\Field\Plugin\Field\FieldWidget\EntityReferenceAutocompleteWidget.
  */
 
 namespace Drupal\Core\Field\Plugin\Field\FieldWidget;
diff --git a/core/lib/Drupal/Core/Field/PluginSettingsBase.php b/core/lib/Drupal/Core/Field/PluginSettingsBase.php
index 9459dd144c7585cccabaa5098c24a0867906ed43..1baf31de73112b6261e190accf43ba3c3f057925 100644
--- a/core/lib/Drupal/Core/Field/PluginSettingsBase.php
+++ b/core/lib/Drupal/Core/Field/PluginSettingsBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\field\Plugin\PluginSettingsBase.
+ * Contains \Drupal\Core\Field\PluginSettingsBase.
  */
 
 namespace Drupal\Core\Field;
diff --git a/core/lib/Drupal/Core/Field/PluginSettingsInterface.php b/core/lib/Drupal/Core/Field/PluginSettingsInterface.php
index cc64850a0794a05fccad3742b718332bac4e6c77..969061f3e5bc3e3cc8b9e027ef831175fa00ee72 100644
--- a/core/lib/Drupal/Core/Field/PluginSettingsInterface.php
+++ b/core/lib/Drupal/Core/Field/PluginSettingsInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\field\Plugin\PluginSettingsInterface.
+ * Contains \Drupal\Core\Field\PluginSettingsInterface.
  */
 
 namespace Drupal\Core\Field;
diff --git a/core/lib/Drupal/Core/File/MimeType/ExtensionMimeTypeGuesser.php b/core/lib/Drupal/Core/File/MimeType/ExtensionMimeTypeGuesser.php
index 53712cae10085d35dcf4f0adc87a422040886f13..3cfd379f8ba94321c4e5c978aabea67df0449670 100644
--- a/core/lib/Drupal/Core/File/MimeType/ExtensionMimeTypeGuesser.php
+++ b/core/lib/Drupal/Core/File/MimeType/ExtensionMimeTypeGuesser.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\File\MimeType\ExtensionMimeTypeGuesser
+ * Contains \Drupal\Core\File\MimeType\ExtensionMimeTypeGuesser.
  */
 
 namespace Drupal\Core\File\MimeType;
diff --git a/core/lib/Drupal/Core/FileTransfer/ChmodInterface.php b/core/lib/Drupal/Core/FileTransfer/ChmodInterface.php
index 1d716f4c295e61e0585a6cefe52e8aab6027f69b..ff62dda66047b058d9bea12b7d0eec24538ad22e 100644
--- a/core/lib/Drupal/Core/FileTransfer/ChmodInterface.php
+++ b/core/lib/Drupal/Core/FileTransfer/ChmodInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\FileTransfer\ChmodInterface.
+ * Contains \Drupal\Core\FileTransfer\ChmodInterface.
  */
 
 namespace Drupal\Core\FileTransfer;
diff --git a/core/lib/Drupal/Core/FileTransfer/FTP.php b/core/lib/Drupal/Core/FileTransfer/FTP.php
index 342660ab85616bdbcf26fd6ae172aa5c7fe4cb51..9c28e46fb6bd7128cd80784da3adc50b6332de50 100644
--- a/core/lib/Drupal/Core/FileTransfer/FTP.php
+++ b/core/lib/Drupal/Core/FileTransfer/FTP.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\FileTransfer\FTP.
+ * Contains \Drupal\Core\FileTransfer\FTP.
  */
 
 namespace Drupal\Core\FileTransfer;
diff --git a/core/lib/Drupal/Core/FileTransfer/FTPExtension.php b/core/lib/Drupal/Core/FileTransfer/FTPExtension.php
index f87293b6d6f8f0624ecca3836f6b88489b339998..a40e6c1bee3a1103b0c36d1bcbc0f621840e85bb 100644
--- a/core/lib/Drupal/Core/FileTransfer/FTPExtension.php
+++ b/core/lib/Drupal/Core/FileTransfer/FTPExtension.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\FileTransfer\FTPExtension.
+ * Contains \Drupal\Core\FileTransfer\FTPExtension.
  */
 
 namespace Drupal\Core\FileTransfer;
diff --git a/core/lib/Drupal/Core/FileTransfer/FileTransfer.php b/core/lib/Drupal/Core/FileTransfer/FileTransfer.php
index d64624b421ca0c3d2124cdd5d9e12343571c550f..d8a090262402ffb88e4f8ad98c2d6f492e67d3fa 100644
--- a/core/lib/Drupal/Core/FileTransfer/FileTransfer.php
+++ b/core/lib/Drupal/Core/FileTransfer/FileTransfer.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\FileTransfer\FileTransfer.
+ * Contains \Drupal\Core\FileTransfer\FileTransfer.
  */
 
 namespace Drupal\Core\FileTransfer;
diff --git a/core/lib/Drupal/Core/FileTransfer/FileTransferException.php b/core/lib/Drupal/Core/FileTransfer/FileTransferException.php
index a9ac919aa3c782e9fd1dd3fa3a36a9685ca89b8e..87ac0ce16fadb5110bb9b01958c4175ae9a07bf3 100644
--- a/core/lib/Drupal/Core/FileTransfer/FileTransferException.php
+++ b/core/lib/Drupal/Core/FileTransfer/FileTransferException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\FileTransfer\FileTransferException.
+ * Contains \Drupal\Core\FileTransfer\FileTransferException.
  */
 
 namespace Drupal\Core\FileTransfer;
diff --git a/core/lib/Drupal/Core/FileTransfer/Local.php b/core/lib/Drupal/Core/FileTransfer/Local.php
index ef79a4218a1eb162d7311e1869473536c810f5d6..5853369f265d6b37a0ca0112653fc40996d700b8 100644
--- a/core/lib/Drupal/Core/FileTransfer/Local.php
+++ b/core/lib/Drupal/Core/FileTransfer/Local.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\FileTransfer\Local.
+ * Contains \Drupal\Core\FileTransfer\Local.
  */
 
 namespace Drupal\Core\FileTransfer;
diff --git a/core/lib/Drupal/Core/FileTransfer/SSH.php b/core/lib/Drupal/Core/FileTransfer/SSH.php
index 91e6e5f70ddb6c4dae9ee0aae3ea7289cbd82cb6..b678ddb5de8e9914760ca1a9ad7934bed7f36c36 100644
--- a/core/lib/Drupal/Core/FileTransfer/SSH.php
+++ b/core/lib/Drupal/Core/FileTransfer/SSH.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\FileTransfer\SSH.
+ * Contains \Drupal\Core\FileTransfer\SSH.
  */
 
 namespace Drupal\Core\FileTransfer;
diff --git a/core/lib/Drupal/Core/Flood/DatabaseBackend.php b/core/lib/Drupal/Core/Flood/DatabaseBackend.php
index 2f59e0dfb34e6c3ba09678d70d678b68471a9ce7..3a4aa0811c1a35e4ab4b79adc0e1860143a5bced 100644
--- a/core/lib/Drupal/Core/Flood/DatabaseBackend.php
+++ b/core/lib/Drupal/Core/Flood/DatabaseBackend.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Flood\DatabaseBackend.
+ * Contains \Drupal\Core\Flood\DatabaseBackend.
  */
 
 namespace Drupal\Core\Flood;
diff --git a/core/lib/Drupal/Core/Flood/FloodInterface.php b/core/lib/Drupal/Core/Flood/FloodInterface.php
index 8fd36db20e6f4766d310dabfb3ef2693a691a4e7..6011364d1cb3c8551c55698a0bee2a17aca629e8 100644
--- a/core/lib/Drupal/Core/Flood/FloodInterface.php
+++ b/core/lib/Drupal/Core/Flood/FloodInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Flood\FloodInterface.
+ * Contains \Drupal\Core\Flood\FloodInterface.
  */
 
 namespace Drupal\Core\Flood;
diff --git a/core/lib/Drupal/Core/Flood/MemoryBackend.php b/core/lib/Drupal/Core/Flood/MemoryBackend.php
index e05e64f10ccd9cf0e1d7d53adb13deca9d1186f6..b822949e8cacab97c73959f350e40e1da6cb094a 100644
--- a/core/lib/Drupal/Core/Flood/MemoryBackend.php
+++ b/core/lib/Drupal/Core/Flood/MemoryBackend.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Flood\MemoryBackend.
+ * Contains \Drupal\Core\Flood\MemoryBackend.
  */
 
 namespace Drupal\Core\Flood;
diff --git a/core/lib/Drupal/Core/Form/Exception/BrokenPostRequestException.php b/core/lib/Drupal/Core/Form/Exception/BrokenPostRequestException.php
index c6cbba87bf6a9a6cf8fbb77c897fb6b63bad6d0a..ea8a1f7b6e8f879ce2120e28f071d5dcc65d3f56 100644
--- a/core/lib/Drupal/Core/Form/Exception/BrokenPostRequestException.php
+++ b/core/lib/Drupal/Core/Form/Exception/BrokenPostRequestException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Form\BrokenPostRequestException.
+ * Contains \Drupal\Core\Form\Exception\BrokenPostRequestException.
  */
 
 namespace Drupal\Core\Form\Exception;
diff --git a/core/lib/Drupal/Core/Http/TrustedHostsRequestFactory.php b/core/lib/Drupal/Core/Http/TrustedHostsRequestFactory.php
index bc518d7a07df5984c7e13dc8a123ea6d0a384bca..e77e871cfc14f33ff42e8ec293ac0e0aeb1fb952 100644
--- a/core/lib/Drupal/Core/Http/TrustedHostsRequestFactory.php
+++ b/core/lib/Drupal/Core/Http/TrustedHostsRequestFactory.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Http\TrustedHostsRequestFactory.
+ * Contains \Drupal\Core\Http\TrustedHostsRequestFactory.
  */
 
 namespace Drupal\Core\Http;
diff --git a/core/lib/Drupal/Core/Image/ImageFactory.php b/core/lib/Drupal/Core/Image/ImageFactory.php
index efcf3d984fd6a5bb7f6a9b410f7dafa06ebc9a1b..51adfed4872524f95ce3926197e04ad7576de5d8 100644
--- a/core/lib/Drupal/Core/Image/ImageFactory.php
+++ b/core/lib/Drupal/Core/Image/ImageFactory.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Image\ImageFactory.
+ * Contains \Drupal\Core\Image\ImageFactory.
  */
 
 namespace Drupal\Core\Image;
diff --git a/core/lib/Drupal/Core/KeyValueStore/DatabaseStorage.php b/core/lib/Drupal/Core/KeyValueStore/DatabaseStorage.php
index abbd0d10a89287b299d394186e1ee3aa020819ec..fb440f372dc03fe479039556c64feb0211ccc026 100644
--- a/core/lib/Drupal/Core/KeyValueStore/DatabaseStorage.php
+++ b/core/lib/Drupal/Core/KeyValueStore/DatabaseStorage.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\KeyValueStore\DatabaseStorage.
+ * Contains \Drupal\Core\KeyValueStore\DatabaseStorage.
  */
 
 namespace Drupal\Core\KeyValueStore;
diff --git a/core/lib/Drupal/Core/KeyValueStore/DatabaseStorageExpirable.php b/core/lib/Drupal/Core/KeyValueStore/DatabaseStorageExpirable.php
index 99e34c826a3aab6574737f36e2af5d06f9a68615..1a20dbc558489f6c5fe373dc59dc09de07f484cf 100644
--- a/core/lib/Drupal/Core/KeyValueStore/DatabaseStorageExpirable.php
+++ b/core/lib/Drupal/Core/KeyValueStore/DatabaseStorageExpirable.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\KeyValueStore\DatabaseStorageExpirable.
+ * Contains \Drupal\Core\KeyValueStore\DatabaseStorageExpirable.
  */
 
 namespace Drupal\Core\KeyValueStore;
diff --git a/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseExpirableFactory.php b/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseExpirableFactory.php
index d18eaec9b75b7d2e369b8a025d45f28b9112721b..ff9fb14c7d710ee493b6a3f0358428dce4a85352 100644
--- a/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseExpirableFactory.php
+++ b/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseExpirableFactory.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\KeyValueStore\KeyValueDatabaseExpirableFactory.
+ * Contains \Drupal\Core\KeyValueStore\KeyValueDatabaseExpirableFactory.
  */
 
 namespace Drupal\Core\KeyValueStore;
diff --git a/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseFactory.php b/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseFactory.php
index 391b08edd4a1631c9d1b57948cd636c6054ae609..fda143dc568e6055d1fcd221caa017a7124bf7e9 100644
--- a/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseFactory.php
+++ b/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseFactory.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\KeyValueStore\KeyValueDatabaseFactory.
+ * Contains \Drupal\Core\KeyValueStore\KeyValueDatabaseFactory.
  */
 
 namespace Drupal\Core\KeyValueStore;
diff --git a/core/lib/Drupal/Core/KeyValueStore/KeyValueExpirableFactory.php b/core/lib/Drupal/Core/KeyValueStore/KeyValueExpirableFactory.php
index b1efbf023394c8f50627b11c22eddeb37e2febfa..0c7b0a5508545bd10e93efdeaaa26be44d36209f 100644
--- a/core/lib/Drupal/Core/KeyValueStore/KeyValueExpirableFactory.php
+++ b/core/lib/Drupal/Core/KeyValueStore/KeyValueExpirableFactory.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\KeyValueStore\KeyValueExpirableFactory.
+ * Contains \Drupal\Core\KeyValueStore\KeyValueExpirableFactory.
  */
 
 namespace Drupal\Core\KeyValueStore;
diff --git a/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php b/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php
index 40851923440db513b2c16959dc889cc3b83f7cff..0ddcf59b35292aace22aea942f98ef9245823119 100644
--- a/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php
+++ b/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\KeyValueStore\KeyValueFactory.
+ * Contains \Drupal\Core\KeyValueStore\KeyValueFactory.
  */
 
 namespace Drupal\Core\KeyValueStore;
diff --git a/core/lib/Drupal/Core/KeyValueStore/KeyValueMemoryFactory.php b/core/lib/Drupal/Core/KeyValueStore/KeyValueMemoryFactory.php
index a964042c0f95dae09496eb8a026b31dd8a9e8d31..335b49c53e8445592c677a2aed69b1b9995363f3 100644
--- a/core/lib/Drupal/Core/KeyValueStore/KeyValueMemoryFactory.php
+++ b/core/lib/Drupal/Core/KeyValueStore/KeyValueMemoryFactory.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\KeyValueStore\KeyValueMemoryFactory.
+ * Contains \Drupal\Core\KeyValueStore\KeyValueMemoryFactory.
  */
 
 namespace Drupal\Core\KeyValueStore;
diff --git a/core/lib/Drupal/Core/KeyValueStore/KeyValueStoreExpirableInterface.php b/core/lib/Drupal/Core/KeyValueStore/KeyValueStoreExpirableInterface.php
index 2ccc4aa2a83f369f6034b1b6036e91ebf2063772..67e1d50fdbcaa3c087753bf6603d94fdd922eb4a 100644
--- a/core/lib/Drupal/Core/KeyValueStore/KeyValueStoreExpirableInterface.php
+++ b/core/lib/Drupal/Core/KeyValueStore/KeyValueStoreExpirableInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface.
+ * Contains \Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface.
  */
 
 namespace Drupal\Core\KeyValueStore;
diff --git a/core/lib/Drupal/Core/KeyValueStore/KeyValueStoreInterface.php b/core/lib/Drupal/Core/KeyValueStore/KeyValueStoreInterface.php
index 4f44bbacb3acd0ca5e092ccd7001810fb108458e..5578c3618de95bfa72424d4de7f059a20fce9880 100644
--- a/core/lib/Drupal/Core/KeyValueStore/KeyValueStoreInterface.php
+++ b/core/lib/Drupal/Core/KeyValueStore/KeyValueStoreInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\KeyValueStore\KeyValueStoreInterface.
+ * Contains \Drupal\Core\KeyValueStore\KeyValueStoreInterface.
  */
 
 namespace Drupal\Core\KeyValueStore;
diff --git a/core/lib/Drupal/Core/KeyValueStore/MemoryStorage.php b/core/lib/Drupal/Core/KeyValueStore/MemoryStorage.php
index ab89a6f1aaefff2bacb9d80fa82ca4a6ab817762..a1ecc9a211bf6bc1e011c6a2b969157fd90c50bb 100644
--- a/core/lib/Drupal/Core/KeyValueStore/MemoryStorage.php
+++ b/core/lib/Drupal/Core/KeyValueStore/MemoryStorage.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\KeyValueStore\MemoryStorage.
+ * Contains \Drupal\Core\KeyValueStore\MemoryStorage.
  */
 
 namespace Drupal\Core\KeyValueStore;
diff --git a/core/lib/Drupal/Core/KeyValueStore/StorageBase.php b/core/lib/Drupal/Core/KeyValueStore/StorageBase.php
index 4c54271f0a3ea64c36a204ca758bb52fb8dd4d42..1ca8f38da9acb113879faa35a2c4ec61d375f36a 100644
--- a/core/lib/Drupal/Core/KeyValueStore/StorageBase.php
+++ b/core/lib/Drupal/Core/KeyValueStore/StorageBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\KeyValueStore\StorageBase.
+ * Contains \Drupal\Core\KeyValueStore\StorageBase.
  */
 
 namespace Drupal\Core\KeyValueStore;
diff --git a/core/lib/Drupal/Core/Language/Language.php b/core/lib/Drupal/Core/Language/Language.php
index fa64cad7aad574731140792fbf6229949ad40555..46fb892f8a597af55699ed6fb8f052a53fa0fc3a 100644
--- a/core/lib/Drupal/Core/Language/Language.php
+++ b/core/lib/Drupal/Core/Language/Language.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Language\Language.
+ * Contains \Drupal\Core\Language\Language.
  */
 
 namespace Drupal\Core\Language;
diff --git a/core/lib/Drupal/Core/Locale/CountryManager.php b/core/lib/Drupal/Core/Locale/CountryManager.php
index 492b42eb7b1ac666f2b39de5ca4b28e58b1a6695..ac4c6a7684620b20cb7878dbc223ffacbbb8512b 100644
--- a/core/lib/Drupal/Core/Locale/CountryManager.php
+++ b/core/lib/Drupal/Core/Locale/CountryManager.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of \Drupal\Core\Locale\CountryManager.
+ * Contains \Drupal\Core\Locale\CountryManager.
  */
 
 namespace Drupal\Core\Locale;
diff --git a/core/lib/Drupal/Core/Locale/CountryManagerInterface.php b/core/lib/Drupal/Core/Locale/CountryManagerInterface.php
index 11ba90ee381970db8937d6f8de942a3f4239102d..e0f9573f352d3d6a342d06240b95d7700f598597 100644
--- a/core/lib/Drupal/Core/Locale/CountryManagerInterface.php
+++ b/core/lib/Drupal/Core/Locale/CountryManagerInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of \Drupal\Core\Locale\CountryManagerInterface.
+ * Contains \Drupal\Core\Locale\CountryManagerInterface.
  */
 
 namespace Drupal\Core\Locale;
diff --git a/core/lib/Drupal/Core/Lock/DatabaseLockBackend.php b/core/lib/Drupal/Core/Lock/DatabaseLockBackend.php
index 2024272264b4e0fb7c9f1234466b58631142da41..65c1f1282d991ff180a351768056eab19c7a791f 100644
--- a/core/lib/Drupal/Core/Lock/DatabaseLockBackend.php
+++ b/core/lib/Drupal/Core/Lock/DatabaseLockBackend.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Lock\DatabaseLockBackend.
+ * Contains \Drupal\Core\Lock\DatabaseLockBackend.
  */
 
 namespace Drupal\Core\Lock;
diff --git a/core/lib/Drupal/Core/Lock/LockBackendAbstract.php b/core/lib/Drupal/Core/Lock/LockBackendAbstract.php
index 1b9e19405aefad4f6354fd39ee1558d4233684be..e575e22f355d1a7370cd44d7ea1759f46143a7fa 100644
--- a/core/lib/Drupal/Core/Lock/LockBackendAbstract.php
+++ b/core/lib/Drupal/Core/Lock/LockBackendAbstract.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Lock\LockBackendAbstract.
+ * Contains \Drupal\Core\Lock\LockBackendAbstract.
  */
 
 namespace Drupal\Core\Lock;
diff --git a/core/lib/Drupal/Core/Lock/NullLockBackend.php b/core/lib/Drupal/Core/Lock/NullLockBackend.php
index 7a37cd45fdb6b4623eed1edb36ee07da35a73316..5ea2b7f8f9a74b3730bf7a78755c80cbc1d0ba81 100644
--- a/core/lib/Drupal/Core/Lock/NullLockBackend.php
+++ b/core/lib/Drupal/Core/Lock/NullLockBackend.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Lock\NullLockBackend.
+ * Contains \Drupal\Core\Lock\NullLockBackend.
  */
 
 namespace Drupal\Core\Lock;
diff --git a/core/lib/Drupal/Core/Mail/MailInterface.php b/core/lib/Drupal/Core/Mail/MailInterface.php
index fb94a7e4d2c6ec1d1f6077fab8d946863b0b90de..3042a4d192ab3c6d08154c28b054ea03fcb26642 100644
--- a/core/lib/Drupal/Core/Mail/MailInterface.php
+++ b/core/lib/Drupal/Core/Mail/MailInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Mail\MailInterface.
+ * Contains \Drupal\Core\Mail\MailInterface.
  */
 
 namespace Drupal\Core\Mail;
diff --git a/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php b/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php
index c7922e8a26d8757374610c56bb7acdeca777aadd..c9410bf9a069eb56f2a99519e6fd9f52c2c8f158 100644
--- a/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php
+++ b/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Mail\Plugin\Mail\PhpMail.
+ * Contains \Drupal\Core\Mail\Plugin\Mail\PhpMail.
  */
 
 namespace Drupal\Core\Mail\Plugin\Mail;
diff --git a/core/lib/Drupal/Core/Menu/LocalTaskInterface.php b/core/lib/Drupal/Core/Menu/LocalTaskInterface.php
index 6330d2274abe68b94c40d7130e9fe490c3f38271..4a2b351e88c50865e37445e1b2c7ddca7300e727 100644
--- a/core/lib/Drupal/Core/Menu/LocalTaskInterface.php
+++ b/core/lib/Drupal/Core/Menu/LocalTaskInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \DrupalCore\Menu\LocalTaskInterface.
+ * Contains \Drupal\Core\Menu\LocalTaskInterface.
  */
 
 namespace Drupal\Core\Menu;
diff --git a/core/lib/Drupal/Core/PageCache/ResponsePolicy/DenyNoCacheRoutes.php b/core/lib/Drupal/Core/PageCache/ResponsePolicy/DenyNoCacheRoutes.php
index cbe4dc7052502c594aeb60e39739a09fda41a0d1..76cf89c035a0c57558ccb3c38b032918fb0ab5af 100644
--- a/core/lib/Drupal/Core/PageCache/ResponsePolicy/DenyNoCacheRoutes.php
+++ b/core/lib/Drupal/Core/PageCache/ResponsePolicy/DenyNoCacheRoutes.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\node\PageCache\DenyNoCacheRoutes.
+ * Contains \Drupal\Core\PageCache\ResponsePolicy\DenyNoCacheRoutes.
  */
 
 namespace Drupal\Core\PageCache\ResponsePolicy;
diff --git a/core/lib/Drupal/Core/ParamConverter/EntityConverter.php b/core/lib/Drupal/Core/ParamConverter/EntityConverter.php
index d64ff1964d4b3a08bac445fe19e9bb481c6f7cb7..172b27b18d7f40b79242c7fd3e4d4bd31f39c51e 100644
--- a/core/lib/Drupal/Core/ParamConverter/EntityConverter.php
+++ b/core/lib/Drupal/Core/ParamConverter/EntityConverter.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\ParamConverter\EntityConverter.
+ * Contains \Drupal\Core\ParamConverter\EntityConverter.
  */
 
 namespace Drupal\Core\ParamConverter;
diff --git a/core/lib/Drupal/Core/ParamConverter/ParamConverterInterface.php b/core/lib/Drupal/Core/ParamConverter/ParamConverterInterface.php
index 219423946551bbf7b0e1d2601fb13fe81b874044..d2819f1ebaec5641d7dabebd5ca071b9f420e329 100644
--- a/core/lib/Drupal/Core/ParamConverter/ParamConverterInterface.php
+++ b/core/lib/Drupal/Core/ParamConverter/ParamConverterInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\ParamConverter\ParamConverterInterface.
+ * Contains \Drupal\Core\ParamConverter\ParamConverterInterface.
  */
 
 namespace Drupal\Core\ParamConverter;
diff --git a/core/lib/Drupal/Core/ParamConverter/ParamConverterManager.php b/core/lib/Drupal/Core/ParamConverter/ParamConverterManager.php
index 8719cd9a79f9a31499fcce8bf7921669a9dbd92a..997749f5c4813bf4b3f3a1a257577151f0d6687d 100644
--- a/core/lib/Drupal/Core/ParamConverter/ParamConverterManager.php
+++ b/core/lib/Drupal/Core/ParamConverter/ParamConverterManager.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\ParamConverter\ParamConverterManager.
+ * Contains \Drupal\Core\ParamConverter\ParamConverterManager.
  */
 
 namespace Drupal\Core\ParamConverter;
diff --git a/core/lib/Drupal/Core/Path/AliasManager.php b/core/lib/Drupal/Core/Path/AliasManager.php
index 12929343e60fcdd2a63dca88a46e33178b7b0693..1eac0f8ea6751b0f186a2d7d35441e05d0337261 100644
--- a/core/lib/Drupal/Core/Path/AliasManager.php
+++ b/core/lib/Drupal/Core/Path/AliasManager.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Path\AliasManager.
+ * Contains \Drupal\Core\Path\AliasManager.
  */
 
 namespace Drupal\Core\Path;
diff --git a/core/lib/Drupal/Core/Path/AliasManagerInterface.php b/core/lib/Drupal/Core/Path/AliasManagerInterface.php
index 28d28f824585a9d87f9fa1e1173b44b47c42b700..e87edaa12589c4636b6b6292c24c32a8c22b4839 100644
--- a/core/lib/Drupal/Core/Path/AliasManagerInterface.php
+++ b/core/lib/Drupal/Core/Path/AliasManagerInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Path\AliasManagerInterface.
+ * Contains \Drupal\Core\Path\AliasManagerInterface.
  */
 
 namespace Drupal\Core\Path;
diff --git a/core/lib/Drupal/Core/Path/PathMatcherInterface.php b/core/lib/Drupal/Core/Path/PathMatcherInterface.php
index 114d0781fb07ee4c4512dc291131763010963871..24768d804a89b8a7700b858db4806eb42c89aba6 100644
--- a/core/lib/Drupal/Core/Path/PathMatcherInterface.php
+++ b/core/lib/Drupal/Core/Path/PathMatcherInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Path\PathMatcherInterface
+ * Contains \Drupal\Core\Path\PathMatcherInterface.
  */
 
 namespace Drupal\Core\Path;
diff --git a/core/lib/Drupal/Core/Path/PathValidator.php b/core/lib/Drupal/Core/Path/PathValidator.php
index fcf096871c52fe9926e4194cd43c44e0caeb9241..f6132d0720364e0b5e005e399149d9bb7961fd1a 100644
--- a/core/lib/Drupal/Core/Path/PathValidator.php
+++ b/core/lib/Drupal/Core/Path/PathValidator.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Path\PathValidator
+ * Contains \Drupal\Core\Path\PathValidator.
  */
 
 namespace Drupal\Core\Path;
diff --git a/core/lib/Drupal/Core/Path/PathValidatorInterface.php b/core/lib/Drupal/Core/Path/PathValidatorInterface.php
index a600207cc4d6198a1356b30c40e39418802b7c4a..836b0a4c54c6719b57c2c3cbf68b29bc8d80df48 100644
--- a/core/lib/Drupal/Core/Path/PathValidatorInterface.php
+++ b/core/lib/Drupal/Core/Path/PathValidatorInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Path\PathValidatorInterface
+ * Contains \Drupal\Core\Path\PathValidatorInterface.
  */
 
 namespace Drupal\Core\Path;
diff --git a/core/lib/Drupal/Core/PathProcessor/InboundPathProcessorInterface.php b/core/lib/Drupal/Core/PathProcessor/InboundPathProcessorInterface.php
index 7bc22a854d44e0f592f0ec1be61a935133bb3bde..a02da881a3a70f2874e43043d1ddd9f2d488fcc5 100644
--- a/core/lib/Drupal/Core/PathProcessor/InboundPathProcessorInterface.php
+++ b/core/lib/Drupal/Core/PathProcessor/InboundPathProcessorInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\PathProcessor\InboundPathProcessorInterface.
+ * Contains \Drupal\Core\PathProcessor\InboundPathProcessorInterface.
  */
 
 namespace Drupal\Core\PathProcessor;
diff --git a/core/lib/Drupal/Core/PathProcessor/OutboundPathProcessorInterface.php b/core/lib/Drupal/Core/PathProcessor/OutboundPathProcessorInterface.php
index a1fb57aad270758184d119855f7bdec04db6e301..774f385b0fe3539b2d344372a41a49f844ea6e0e 100644
--- a/core/lib/Drupal/Core/PathProcessor/OutboundPathProcessorInterface.php
+++ b/core/lib/Drupal/Core/PathProcessor/OutboundPathProcessorInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\PathProcessor\OutboundPathProcessorInterface.
+ * Contains \Drupal\Core\PathProcessor\OutboundPathProcessorInterface.
  */
 
 namespace Drupal\Core\PathProcessor;
diff --git a/core/lib/Drupal/Core/PathProcessor/PathProcessorDecode.php b/core/lib/Drupal/Core/PathProcessor/PathProcessorDecode.php
index a45c24eb1f03336b3dca64aca087a66e6d879e5e..b7c99ef3d6caeff5fe6100de58353bd2e8d3015f 100644
--- a/core/lib/Drupal/Core/PathProcessor/PathProcessorDecode.php
+++ b/core/lib/Drupal/Core/PathProcessor/PathProcessorDecode.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\PathProcessor\PathProcessorDecode.
+ * Contains \Drupal\Core\PathProcessor\PathProcessorDecode.
  */
 
 namespace Drupal\Core\PathProcessor;
diff --git a/core/lib/Drupal/Core/PathProcessor/PathProcessorFront.php b/core/lib/Drupal/Core/PathProcessor/PathProcessorFront.php
index 9b6048f7145613d014a1505d9f42b6bf08fc957d..87e7e755e2603f90c91ac6f063d93ebe2b388598 100644
--- a/core/lib/Drupal/Core/PathProcessor/PathProcessorFront.php
+++ b/core/lib/Drupal/Core/PathProcessor/PathProcessorFront.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\PathProcessor\PathProcessorFront.
+ * Contains \Drupal\Core\PathProcessor\PathProcessorFront.
  */
 
 namespace Drupal\Core\PathProcessor;
diff --git a/core/lib/Drupal/Core/PathProcessor/PathProcessorManager.php b/core/lib/Drupal/Core/PathProcessor/PathProcessorManager.php
index 1bedad8e262c12429dfaba0222a31f7d92780fbf..9974bc94861c351a44cb65cdbd06631fb72c0f7c 100644
--- a/core/lib/Drupal/Core/PathProcessor/PathProcessorManager.php
+++ b/core/lib/Drupal/Core/PathProcessor/PathProcessorManager.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\PathProcessor\PathProcessorManager.
+ * Contains \Drupal\Core\PathProcessor\PathProcessorManager.
  */
 
 namespace Drupal\Core\PathProcessor;
diff --git a/core/lib/Drupal/Core/PhpStorage/PhpStorageFactory.php b/core/lib/Drupal/Core/PhpStorage/PhpStorageFactory.php
index 3386bba760772c6be5091a969dfaadd0c4cb4180..69598e1b12908a7271ecf1933ad88959ab69e555 100644
--- a/core/lib/Drupal/Core/PhpStorage/PhpStorageFactory.php
+++ b/core/lib/Drupal/Core/PhpStorage/PhpStorageFactory.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Component\PhpStorage\PhpStorageFactory.
+ * Contains \Drupal\Core\PhpStorage\PhpStorageFactory.
  */
 
 namespace Drupal\Core\PhpStorage;
diff --git a/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php b/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php
index df86cf0ff9c6699592ae01438e6423ec83283528..e58e39e942c3b8583b8fdfb4534acde8a04d696d 100644
--- a/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php
+++ b/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Plugin\ContextAwarePluginBase
+ * Contains \Drupal\Core\Plugin\ContextAwarePluginBase.
  */
 
 namespace Drupal\Core\Plugin;
diff --git a/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php b/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php
index 3d1c34fad90a99b64105d688128108f391715a1b..ceabcd995c77c74f7a7b104e82fdddfa006753e8 100644
--- a/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php
+++ b/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Plugin\DefaultPluginManager
+ * Contains \Drupal\Core\Plugin\DefaultPluginManager.
  */
 
 namespace Drupal\Core\Plugin;
diff --git a/core/lib/Drupal/Core/Plugin/Discovery/HookDiscovery.php b/core/lib/Drupal/Core/Plugin/Discovery/HookDiscovery.php
index 3331e97b151e702d20b7efdae501487389e3cd9a..4bab897184df5b431b1d1989f27e16ea011c4128 100644
--- a/core/lib/Drupal/Core/Plugin/Discovery/HookDiscovery.php
+++ b/core/lib/Drupal/Core/Plugin/Discovery/HookDiscovery.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Plugin\Discovery\HookDiscovery.
+ * Contains \Drupal\Core\Plugin\Discovery\HookDiscovery.
  */
 
 namespace Drupal\Core\Plugin\Discovery;
diff --git a/core/lib/Drupal/Core/Plugin/Discovery/InfoHookDecorator.php b/core/lib/Drupal/Core/Plugin/Discovery/InfoHookDecorator.php
index e546ebfb9a64febbfa1276c8c1475e61b5c174f1..fb6c95b5a1073cf981df57193fb676c14870274f 100644
--- a/core/lib/Drupal/Core/Plugin/Discovery/InfoHookDecorator.php
+++ b/core/lib/Drupal/Core/Plugin/Discovery/InfoHookDecorator.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Plugin\Discovery\InfoHookDecorator.
+ * Contains \Drupal\Core\Plugin\Discovery\InfoHookDecorator.
  */
 
 namespace Drupal\Core\Plugin\Discovery;
diff --git a/core/lib/Drupal/Core/Plugin/PluginBase.php b/core/lib/Drupal/Core/Plugin/PluginBase.php
index 1af9b82394ae7cdfc7f704065ccbfc636e895237..513d2aaadbfccb33235c4a569cd0372925d9b391 100644
--- a/core/lib/Drupal/Core/Plugin/PluginBase.php
+++ b/core/lib/Drupal/Core/Plugin/PluginBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Plugin\PluginBase
+ * Contains \Drupal\Core\Plugin\PluginBase.
  */
 
 namespace Drupal\Core\Plugin;
diff --git a/core/lib/Drupal/Core/Queue/Batch.php b/core/lib/Drupal/Core/Queue/Batch.php
index 9715d9d5ca115cbe377c2131fde69d005e5867fc..2d172d9e1699543fe13bef8ac0a1e3a18b28a229 100644
--- a/core/lib/Drupal/Core/Queue/Batch.php
+++ b/core/lib/Drupal/Core/Queue/Batch.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Queue\Batch.
+ * Contains \Drupal\Core\Queue\Batch.
  */
 
 namespace Drupal\Core\Queue;
diff --git a/core/lib/Drupal/Core/Queue/BatchMemory.php b/core/lib/Drupal/Core/Queue/BatchMemory.php
index 20c2f9a444716486c24da92bdc38e8b834781b9b..e18b6555318386fbffcd9687d008616810e50106 100644
--- a/core/lib/Drupal/Core/Queue/BatchMemory.php
+++ b/core/lib/Drupal/Core/Queue/BatchMemory.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Queue\BatchMemory.
+ * Contains \Drupal\Core\Queue\BatchMemory.
  */
 
 namespace Drupal\Core\Queue;
diff --git a/core/lib/Drupal/Core/Queue/Memory.php b/core/lib/Drupal/Core/Queue/Memory.php
index a565450fcfb5a5773944f7ca247889bd7093e7ce..49fd031a822a86b0d60c5a00471b71949ad7018d 100644
--- a/core/lib/Drupal/Core/Queue/Memory.php
+++ b/core/lib/Drupal/Core/Queue/Memory.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Queue\Memory.
+ * Contains \Drupal\Core\Queue\Memory.
  */
 
 namespace Drupal\Core\Queue;
diff --git a/core/lib/Drupal/Core/Queue/QueueInterface.php b/core/lib/Drupal/Core/Queue/QueueInterface.php
index b0d9e4dde7d7a10e48cdc8b03a76890ac5508898..e798376cf732f2be094a4ac0568dd11459bc4468 100644
--- a/core/lib/Drupal/Core/Queue/QueueInterface.php
+++ b/core/lib/Drupal/Core/Queue/QueueInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Queue\QueueInterface.
+ * Contains \Drupal\Core\Queue\QueueInterface.
  */
 
 namespace Drupal\Core\Queue;
diff --git a/core/lib/Drupal/Core/Queue/ReliableQueueInterface.php b/core/lib/Drupal/Core/Queue/ReliableQueueInterface.php
index f36c23dc84a5cac669f07e31770d92ae2065b984..ace519126b5a80779d33aee1ca19b15b1324dc2e 100644
--- a/core/lib/Drupal/Core/Queue/ReliableQueueInterface.php
+++ b/core/lib/Drupal/Core/Queue/ReliableQueueInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Queue\ReliableQueueInterface.
+ * Contains \Drupal\Core\Queue\ReliableQueueInterface.
  */
 
 namespace Drupal\Core\Queue;
diff --git a/core/lib/Drupal/Core/Queue/SuspendQueueException.php b/core/lib/Drupal/Core/Queue/SuspendQueueException.php
index 410fa7bfb75ae69165bdcab3be6d93907dee5dd2..117d68a48905aeec5e7d200732e2f6684aae5244 100644
--- a/core/lib/Drupal/Core/Queue/SuspendQueueException.php
+++ b/core/lib/Drupal/Core/Queue/SuspendQueueException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Queue\SuspendQueueException.
+ * Contains \Drupal\Core\Queue\SuspendQueueException.
  */
 
 namespace Drupal\Core\Queue;
diff --git a/core/lib/Drupal/Core/Render/AttachmentsTrait.php b/core/lib/Drupal/Core/Render/AttachmentsTrait.php
index 9616e70479dca68e0e754179720acfdf689f5e22..dd5a1f23cd568408e1549099e4b54efe269098e1 100644
--- a/core/lib/Drupal/Core/Render/AttachmentsTrait.php
+++ b/core/lib/Drupal/Core/Render/AttachmentsTrait.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\Core\Render\AttachmentsTrait.
+ */
+
 namespace Drupal\Core\Render;
 
 /**
diff --git a/core/lib/Drupal/Core/RouteProcessor/RouteProcessorManager.php b/core/lib/Drupal/Core/RouteProcessor/RouteProcessorManager.php
index 589af5aad5b648265fd310aa31dfcdda74093b9b..c19b17740f6fc712198dbbc47cb58fc1bced5f5d 100644
--- a/core/lib/Drupal/Core/RouteProcessor/RouteProcessorManager.php
+++ b/core/lib/Drupal/Core/RouteProcessor/RouteProcessorManager.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\Core\RouteProcessor\RouteProcessorManager.
+ * Contains \Drupal\Core\RouteProcessor\RouteProcessorManager.
  */
 
 namespace Drupal\Core\RouteProcessor;
diff --git a/core/lib/Drupal/Core/Routing/AccessAwareRouter.php b/core/lib/Drupal/Core/Routing/AccessAwareRouter.php
index 20b0ecf02af297fd35c8fc39bb74b9f8a0de8688..8a115b2a52bbacfe847331d73e82d5a7b95df0f7 100644
--- a/core/lib/Drupal/Core/Routing/AccessAwareRouter.php
+++ b/core/lib/Drupal/Core/Routing/AccessAwareRouter.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Routing\Router.
+ * Contains \Drupal\Core\Routing\AccessAwareRouter.
  */
 
 namespace Drupal\Core\Routing;
diff --git a/core/lib/Drupal/Core/Routing/AccessAwareRouterInterface.php b/core/lib/Drupal/Core/Routing/AccessAwareRouterInterface.php
index b6cfe4ae3416db092598ff2ce6d0a1b7e4075fd4..0fc82b8ed0c5a18d7248db83595131e32021dd15 100644
--- a/core/lib/Drupal/Core/Routing/AccessAwareRouterInterface.php
+++ b/core/lib/Drupal/Core/Routing/AccessAwareRouterInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains
+ * Contains \Drupal\Core\Routing\AccessAwareRouterInterface.
  */
 
 namespace Drupal\Core\Routing;
diff --git a/core/lib/Drupal/Core/Routing/CompiledRoute.php b/core/lib/Drupal/Core/Routing/CompiledRoute.php
index 05eede7e0e483ae183dfe44b6a60f84f3961d6d1..2e2ff6ba05fd6a4a5ee7bdc3cc17fb30db6bd449 100644
--- a/core/lib/Drupal/Core/Routing/CompiledRoute.php
+++ b/core/lib/Drupal/Core/Routing/CompiledRoute.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Routing\CompiledRoute.
+ * Contains \Drupal\Core\Routing\CompiledRoute.
  */
 
 namespace Drupal\Core\Routing;
diff --git a/core/lib/Drupal/Core/Routing/ContentTypeHeaderMatcher.php b/core/lib/Drupal/Core/Routing/ContentTypeHeaderMatcher.php
index 69875d8b5d8ffb73a05eedc248bef56a7cd3453b..0bfb69978d2776e9d498239f25f0c293e2c909b9 100644
--- a/core/lib/Drupal/Core/Routing/ContentTypeHeaderMatcher.php
+++ b/core/lib/Drupal/Core/Routing/ContentTypeHeaderMatcher.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Routing\ContentTypeHeaderMatcher.
+ * Contains \Drupal\Core\Routing\ContentTypeHeaderMatcher.
  */
 
 namespace Drupal\Core\Routing;
diff --git a/core/lib/Drupal/Core/Routing/CurrentRouteMatch.php b/core/lib/Drupal/Core/Routing/CurrentRouteMatch.php
index 979c1891d0fb105e0aa921e5a8944f89d1f49202..2a6082c29c643ef7c0b88dece3bcc5b991a44c2e 100644
--- a/core/lib/Drupal/Core/Routing/CurrentRouteMatch.php
+++ b/core/lib/Drupal/Core/Routing/CurrentRouteMatch.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Routing\CurrentRouteMatch.
+ * Contains \Drupal\Core\Routing\CurrentRouteMatch.
  */
 
 namespace Drupal\Core\Routing;
diff --git a/core/lib/Drupal/Core/Routing/GeneratorNotInitializedException.php b/core/lib/Drupal/Core/Routing/GeneratorNotInitializedException.php
index 194e57789fd264884a73d9510bdeac4dacc55f4f..71225f5d2c472428c1d4709590ae9140e7c54d8f 100644
--- a/core/lib/Drupal/Core/Routing/GeneratorNotInitializedException.php
+++ b/core/lib/Drupal/Core/Routing/GeneratorNotInitializedException.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Definition of Drupal\Core\Routing\GeneratorNotInitializedException.
+ * Contains \Drupal\Core\Routing\GeneratorNotInitializedException.
  */
 
 namespace Drupal\Core\Routing;
diff --git a/core/lib/Drupal/Core/Routing/LinkGeneratorTrait.php b/core/lib/Drupal/Core/Routing/LinkGeneratorTrait.php
index ff84971c5d074a1e8329f5fb90f1aaa28d283e14..35170d138cbf41426e8280156468a5452cfac6d5 100644
--- a/core/lib/Drupal/Core/Routing/LinkGeneratorTrait.php
+++ b/core/lib/Drupal/Core/Routing/LinkGeneratorTrait.php
@@ -1,7 +1,8 @@
 <?php
 
 /**
- * @file Contains Drupal\Core\Routing\LinkGeneratorTrait.
+ * @file
+ * Contains \Drupal\Core\Routing\LinkGeneratorTrait.
  */
 
 namespace Drupal\Core\Routing;
diff --git a/core/lib/Drupal/Core/Routing/MatcherDumper.php b/core/lib/Drupal/Core/Routing/MatcherDumper.php
index 43e3219c2a579d72b088d7aace07c3031f3ea3c9..4c1ac575ec5db64c09df21a3ec6a62a066447447 100644
--- a/core/lib/Drupal/Core/Routing/MatcherDumper.php
+++ b/core/lib/Drupal/Core/Routing/MatcherDumper.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Routing\MatcherDumper.
+ * Contains \Drupal\Core\Routing\MatcherDumper.
  */
 
 namespace Drupal\Core\Routing;
diff --git a/core/lib/Drupal/Core/Routing/NullGenerator.php b/core/lib/Drupal/Core/Routing/NullGenerator.php
index 986523ffd1ae41886b6335dd0972c46c31eb367a..e095b5cc1c3b638c480f76b2018cb4e31f5a2849 100644
--- a/core/lib/Drupal/Core/Routing/NullGenerator.php
+++ b/core/lib/Drupal/Core/Routing/NullGenerator.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Routing\NullGenerator.
+ * Contains \Drupal\Core\Routing\NullGenerator.
  */
 
 namespace Drupal\Core\Routing;
diff --git a/core/lib/Drupal/Core/Routing/NullRouteMatch.php b/core/lib/Drupal/Core/Routing/NullRouteMatch.php
index 0ef2c3b300dfa722d0960bcdd16f54e33abb547f..2e0b55363435dc00b958ea8d50f00ed65be39fe6 100644
--- a/core/lib/Drupal/Core/Routing/NullRouteMatch.php
+++ b/core/lib/Drupal/Core/Routing/NullRouteMatch.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Routing\NullRouteMatch.
+ * Contains \Drupal\Core\Routing\NullRouteMatch.
  */
 
 namespace Drupal\Core\Routing;
diff --git a/core/lib/Drupal/Core/Routing/RedirectDestinationTrait.php b/core/lib/Drupal/Core/Routing/RedirectDestinationTrait.php
index db4696eea581106002eeb414c6f586e6816c509f..a5fbf74622fe289d30267d7503c50bc31db840d8 100644
--- a/core/lib/Drupal/Core/Routing/RedirectDestinationTrait.php
+++ b/core/lib/Drupal/Core/Routing/RedirectDestinationTrait.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Routing\RedirectDestinationTrait.
+ * Contains \Drupal\Core\Routing\RedirectDestinationTrait.
  */
 
 namespace Drupal\Core\Routing;
diff --git a/core/lib/Drupal/Core/Routing/RouteBuildEvent.php b/core/lib/Drupal/Core/Routing/RouteBuildEvent.php
index c3f36ee2f229d4530a5b15e557faaee50a7a8695..df88540c4140c558a75fb7a2d496fddf27ff1069 100644
--- a/core/lib/Drupal/Core/Routing/RouteBuildEvent.php
+++ b/core/lib/Drupal/Core/Routing/RouteBuildEvent.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Routing\RouteBuildEvent.
+ * Contains \Drupal\Core\Routing\RouteBuildEvent.
  */
 
 namespace Drupal\Core\Routing;
diff --git a/core/lib/Drupal/Core/Routing/RouteBuilderInterface.php b/core/lib/Drupal/Core/Routing/RouteBuilderInterface.php
index 29a4bfe7e5ef4673924f35bf8e501c3b77079ad0..b10e8d586c4644c4873f38e9775a5600517efeb4 100644
--- a/core/lib/Drupal/Core/Routing/RouteBuilderInterface.php
+++ b/core/lib/Drupal/Core/Routing/RouteBuilderInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Routing\RouteBuilderInterface.
+ * Contains \Drupal\Core\Routing\RouteBuilderInterface.
  */
 
 namespace Drupal\Core\Routing;
diff --git a/core/lib/Drupal/Core/Routing/RouteCompiler.php b/core/lib/Drupal/Core/Routing/RouteCompiler.php
index 5c129cc34bd4a3026d5ec7bfcc3c9a6391f46163..1d223ff8d6cc2d18221f1e3bbb901bc5626fcb16 100644
--- a/core/lib/Drupal/Core/Routing/RouteCompiler.php
+++ b/core/lib/Drupal/Core/Routing/RouteCompiler.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Routing\RouteCompiler.
+ * Contains \Drupal\Core\Routing\RouteCompiler.
  */
 
 namespace Drupal\Core\Routing;
diff --git a/core/lib/Drupal/Core/Routing/RouteMatch.php b/core/lib/Drupal/Core/Routing/RouteMatch.php
index eafb1842959f2734737d5acbe655ece5bf023e82..c3bbb78b20ca1b929b7946477912273cf2eedd96 100644
--- a/core/lib/Drupal/Core/Routing/RouteMatch.php
+++ b/core/lib/Drupal/Core/Routing/RouteMatch.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Routing\RouteMatch.
+ * Contains \Drupal\Core\Routing\RouteMatch.
  */
 
 namespace Drupal\Core\Routing;
diff --git a/core/lib/Drupal/Core/Routing/RouteMatchInterface.php b/core/lib/Drupal/Core/Routing/RouteMatchInterface.php
index 2937ec0cf09fcf1e0652fae7490cffbda7baba8b..e649f1a21ed90dced3bdc46b22b2875eaeb40603 100644
--- a/core/lib/Drupal/Core/Routing/RouteMatchInterface.php
+++ b/core/lib/Drupal/Core/Routing/RouteMatchInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Routing\RouteMatchInterface.
+ * Contains \Drupal\Core\Routing\RouteMatchInterface.
  */
 
 namespace Drupal\Core\Routing;
diff --git a/core/lib/Drupal/Core/Routing/RouteProvider.php b/core/lib/Drupal/Core/Routing/RouteProvider.php
index 170c10c348a446f0a3d67a484008137566dc1a57..54aeef2a65b3017ec7fb01832a1844dc0b46ebb1 100644
--- a/core/lib/Drupal/Core/Routing/RouteProvider.php
+++ b/core/lib/Drupal/Core/Routing/RouteProvider.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Routing\RouteProvider.
+ * Contains \Drupal\Core\Routing\RouteProvider.
  */
 
 namespace Drupal\Core\Routing;
diff --git a/core/lib/Drupal/Core/Routing/RouteSubscriberBase.php b/core/lib/Drupal/Core/Routing/RouteSubscriberBase.php
index c935fa534ac23e0f6dcec62efb813e05853411ae..757c8c118dd7b658f957f6222c5ac813568091b2 100644
--- a/core/lib/Drupal/Core/Routing/RouteSubscriberBase.php
+++ b/core/lib/Drupal/Core/Routing/RouteSubscriberBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Routing\RouteSubscriberBase
+ * Contains \Drupal\Core\Routing\RouteSubscriberBase.
  */
 
 namespace Drupal\Core\Routing;
diff --git a/core/lib/Drupal/Core/Routing/RoutingEvents.php b/core/lib/Drupal/Core/Routing/RoutingEvents.php
index 87247ae776ad043bb18e2db1eb3fd8f1f93f6dc3..3bb9e2993eba4875e4d1d66b225d83eacd4747f4 100644
--- a/core/lib/Drupal/Core/Routing/RoutingEvents.php
+++ b/core/lib/Drupal/Core/Routing/RoutingEvents.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of \Drupal\Core\Routing\RoutingEvents.
+ * Contains \Drupal\Core\Routing\RoutingEvents.
  */
 
 namespace Drupal\Core\Routing;
diff --git a/core/lib/Drupal/Core/Routing/UrlGenerator.php b/core/lib/Drupal/Core/Routing/UrlGenerator.php
index 2f09779185faef7307c3d995b854e1c6ca5e0076..e30a2036a6be8d49ba313b989f1cc20d9830b570 100644
--- a/core/lib/Drupal/Core/Routing/UrlGenerator.php
+++ b/core/lib/Drupal/Core/Routing/UrlGenerator.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Routing\UrlGenerator.
+ * Contains \Drupal\Core\Routing\UrlGenerator.
  */
 
 namespace Drupal\Core\Routing;
diff --git a/core/lib/Drupal/Core/Routing/UrlMatcher.php b/core/lib/Drupal/Core/Routing/UrlMatcher.php
index dbd95d35f532c9da85f9f42905bcc77561686a00..49bff8fb17c5c41922469f1426c8472225361c16 100644
--- a/core/lib/Drupal/Core/Routing/UrlMatcher.php
+++ b/core/lib/Drupal/Core/Routing/UrlMatcher.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Routing\UrlMatcher.
+ * Contains \Drupal\Core\Routing\UrlMatcher.
  */
 
 namespace Drupal\Core\Routing;
diff --git a/core/lib/Drupal/Core/Session/PermissionsHashGeneratorInterface.php b/core/lib/Drupal/Core/Session/PermissionsHashGeneratorInterface.php
index 8b062ab0154b9e21d1abd193bc39e0f6de3b8053..129e9adab2ac38eed168274f4cf3d317f374a538 100644
--- a/core/lib/Drupal/Core/Session/PermissionsHashGeneratorInterface.php
+++ b/core/lib/Drupal/Core/Session/PermissionsHashGeneratorInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Session\PermissionsHashGeneratorInterface.
+ * Contains \Drupal\Core\Session\PermissionsHashGeneratorInterface.
  */
 
 namespace Drupal\Core\Session;
diff --git a/core/lib/Drupal/Core/Session/SessionConfiguration.php b/core/lib/Drupal/Core/Session/SessionConfiguration.php
index 9de1603196fd8ad102b8a5eb410fccb8017a5266..994b4b9249f35ea0e1a37dd9af633f0b605b8a3a 100644
--- a/core/lib/Drupal/Core/Session/SessionConfiguration.php
+++ b/core/lib/Drupal/Core/Session/SessionConfiguration.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Session\SessionConfiguration
+ * Contains \Drupal\Core\Session\SessionConfiguration.
  */
 
 namespace Drupal\Core\Session;
diff --git a/core/lib/Drupal/Core/Session/SessionConfigurationInterface.php b/core/lib/Drupal/Core/Session/SessionConfigurationInterface.php
index 413b8f80e4adcb9af846e4463b2d251cfe9fa54c..12c6e1f016915ea050f473ee1f12b87fd8701239 100644
--- a/core/lib/Drupal/Core/Session/SessionConfigurationInterface.php
+++ b/core/lib/Drupal/Core/Session/SessionConfigurationInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Session\SessionConfigurationInterface
+ * Contains \Drupal\Core\Session\SessionConfigurationInterface.
  */
 
 namespace Drupal\Core\Session;
diff --git a/core/lib/Drupal/Core/StackMiddleware/KernelPreHandle.php b/core/lib/Drupal/Core/StackMiddleware/KernelPreHandle.php
index 1ccdea11f78fd872422ac3b57f636e4fa5ef7b87..46f78334322772f79c362b8c55ca0cc131a789a0 100644
--- a/core/lib/Drupal/Core/StackMiddleware/KernelPreHandle.php
+++ b/core/lib/Drupal/Core/StackMiddleware/KernelPreHandle.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\StackMiddleware\KernelBoot.
+ * Contains \Drupal\Core\StackMiddleware\KernelPreHandle.
  */
 
 namespace Drupal\Core\StackMiddleware;
diff --git a/core/lib/Drupal/Core/StackMiddleware/NegotiationMiddleware.php b/core/lib/Drupal/Core/StackMiddleware/NegotiationMiddleware.php
index 3b0bf76270526665db84636c96c063a5a0a46848..57d905432d5ff6a76012d6be926bc64ab9643686 100644
--- a/core/lib/Drupal/Core/StackMiddleware/NegotiationMiddleware.php
+++ b/core/lib/Drupal/Core/StackMiddleware/NegotiationMiddleware.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\StackMiddleware\NegotationMiddleware.
+ * Contains \Drupal\Core\StackMiddleware\NegotiationMiddleware.
  */
 
 namespace Drupal\Core\StackMiddleware;
diff --git a/core/lib/Drupal/Core/StackMiddleware/ReverseProxyMiddleware.php b/core/lib/Drupal/Core/StackMiddleware/ReverseProxyMiddleware.php
index 344364d088fab02795649d2773686db4a895408a..c6b49ab27410370652ea9d2b9951f15ebcf0d4f9 100644
--- a/core/lib/Drupal/Core/StackMiddleware/ReverseProxyMiddleware.php
+++ b/core/lib/Drupal/Core/StackMiddleware/ReverseProxyMiddleware.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains \Drupal\Core\StackMiddleware\ReverseProxyMiddleware
+ * Contains \Drupal\Core\StackMiddleware\ReverseProxyMiddleware.
  */
 
 namespace Drupal\Core\StackMiddleware;
diff --git a/core/lib/Drupal/Core/StreamWrapper/LocalReadOnlyStream.php b/core/lib/Drupal/Core/StreamWrapper/LocalReadOnlyStream.php
index f55591b523a58b4b12b9ec88b7d1616364b082cb..4013d0f068bcf1107895162f574547850ba37535 100644
--- a/core/lib/Drupal/Core/StreamWrapper/LocalReadOnlyStream.php
+++ b/core/lib/Drupal/Core/StreamWrapper/LocalReadOnlyStream.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\StreamWrapper\LocalReadOnlyStream.
+ * Contains \Drupal\Core\StreamWrapper\LocalReadOnlyStream.
  */
 
 namespace Drupal\Core\StreamWrapper;
diff --git a/core/lib/Drupal/Core/StreamWrapper/LocalStream.php b/core/lib/Drupal/Core/StreamWrapper/LocalStream.php
index 7720655549748047c9769d3b44818f188a173032..5c6094200428a0b487f3c62bcf3be295c19e541f 100644
--- a/core/lib/Drupal/Core/StreamWrapper/LocalStream.php
+++ b/core/lib/Drupal/Core/StreamWrapper/LocalStream.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\StreamWrapper\LocalStream.
+ * Contains \Drupal\Core\StreamWrapper\LocalStream.
  */
 
 namespace Drupal\Core\StreamWrapper;
diff --git a/core/lib/Drupal/Core/StreamWrapper/PhpStreamWrapperInterface.php b/core/lib/Drupal/Core/StreamWrapper/PhpStreamWrapperInterface.php
index b96b3ae86f494f6a2f4dd77d0529793ae06cbfc7..de6d66e3b06d2e7d0a16e1ee60777a2c187fa898 100644
--- a/core/lib/Drupal/Core/StreamWrapper/PhpStreamWrapperInterface.php
+++ b/core/lib/Drupal/Core/StreamWrapper/PhpStreamWrapperInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\StreamWrapper\PhpStreamWrapperInterface.
+ * Contains \Drupal\Core\StreamWrapper\PhpStreamWrapperInterface.
  */
 
 namespace Drupal\Core\StreamWrapper;
diff --git a/core/lib/Drupal/Core/StreamWrapper/PrivateStream.php b/core/lib/Drupal/Core/StreamWrapper/PrivateStream.php
index f85820dd6e13bbff8247b3b9e198c4e102d1f081..1332a97fd6a7e61f92160bd4f2e26affa24c92c8 100644
--- a/core/lib/Drupal/Core/StreamWrapper/PrivateStream.php
+++ b/core/lib/Drupal/Core/StreamWrapper/PrivateStream.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\StreamWrapper\PrivateStream.
+ * Contains \Drupal\Core\StreamWrapper\PrivateStream.
  */
 
 namespace Drupal\Core\StreamWrapper;
diff --git a/core/lib/Drupal/Core/StreamWrapper/PublicStream.php b/core/lib/Drupal/Core/StreamWrapper/PublicStream.php
index ea7d1e6bebdf609ef16de4ecf4515c877720e84d..acfa7f45a2159182d513e9c659e2fa74b287c3e7 100644
--- a/core/lib/Drupal/Core/StreamWrapper/PublicStream.php
+++ b/core/lib/Drupal/Core/StreamWrapper/PublicStream.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\StreamWrapper\PublicStream.
+ * Contains \Drupal\Core\StreamWrapper\PublicStream.
  */
 
 namespace Drupal\Core\StreamWrapper;
diff --git a/core/lib/Drupal/Core/StreamWrapper/ReadOnlyStream.php b/core/lib/Drupal/Core/StreamWrapper/ReadOnlyStream.php
index c8414445f18833e0c4bfa4123b455546f76138f7..67e64306682f6987d753959a0915c63a252f2d0f 100644
--- a/core/lib/Drupal/Core/StreamWrapper/ReadOnlyStream.php
+++ b/core/lib/Drupal/Core/StreamWrapper/ReadOnlyStream.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\StreamWrapper\ReadOnlyStream.
+ * Contains \Drupal\Core\StreamWrapper\ReadOnlyStream.
  */
 
 namespace Drupal\Core\StreamWrapper;
diff --git a/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php b/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php
index ac95452b9feb7fb68b6e52183ddf5d33c5b33e55..34dc3331fa2ccb13af6e0078e7e91f6dd71d15f7 100644
--- a/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php
+++ b/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\StreamWrapper\StreamWrapperInterface.
+ * Contains \Drupal\Core\StreamWrapper\StreamWrapperInterface.
  *
  * Provides a Drupal interface and classes to implement PHP stream wrappers for
  * public, private, and temporary files.
diff --git a/core/lib/Drupal/Core/StreamWrapper/TemporaryStream.php b/core/lib/Drupal/Core/StreamWrapper/TemporaryStream.php
index c5cf26ad9a2ad34ed8842f405e6cd53784288ded..e01086791df2a030d934cecb490e02994c61b7a5 100644
--- a/core/lib/Drupal/Core/StreamWrapper/TemporaryStream.php
+++ b/core/lib/Drupal/Core/StreamWrapper/TemporaryStream.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\StreamWrapper\TemporaryStream.
+ * Contains \Drupal\Core\StreamWrapper\TemporaryStream.
  */
 
 namespace Drupal\Core\StreamWrapper;
diff --git a/core/lib/Drupal/Core/StringTranslation/Translator/TranslatorInterface.php b/core/lib/Drupal/Core/StringTranslation/Translator/TranslatorInterface.php
index 550b68e096fe374a88d4f953b56ea9ab66cfe678..7d2a8d7f66b15495b7966c3ba95d7ba78c052257 100644
--- a/core/lib/Drupal/Core/StringTranslation/Translator/TranslatorInterface.php
+++ b/core/lib/Drupal/Core/StringTranslation/Translator/TranslatorInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\StringTranslation\Translator\TranslationInterface.
+ * Contains \Drupal\Core\StringTranslation\Translator\TranslatorInterface.
  */
 
 namespace Drupal\Core\StringTranslation\Translator;
diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/TimeSpan.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/TimeSpan.php
index 66a8d277d8d1aa461a9c061900df6c01cba477c6..28348211bb4e8b469ce15595ab92af9b9a295909 100644
--- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/TimeSpan.php
+++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/TimeSpan.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\TypedData\Type\TimeSpan.
+ * Contains \Drupal\Core\TypedData\Plugin\DataType\TimeSpan.
  */
 
 namespace Drupal\Core\TypedData\Plugin\DataType;
diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Timestamp.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Timestamp.php
index 512c90d1a92d95f08666a606cdf0cf99c3c9420d..e4608e4a870fe525ed2b9d6751db1715d42c4455 100644
--- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Timestamp.php
+++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Timestamp.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\TypedData\Type\Timestamp.
+ * Contains \Drupal\Core\TypedData\Plugin\DataType\Timestamp.
  */
 
 namespace Drupal\Core\TypedData\Plugin\DataType;
diff --git a/core/lib/Drupal/Core/TypedData/Validation/ConstraintViolationBuilder.php b/core/lib/Drupal/Core/TypedData/Validation/ConstraintViolationBuilder.php
index eb785e5a664ca3098db6ed64659f7ad08850b5b5..0372a0ec37cb877bc364a3dc0f21c4bc7f0b06b2 100644
--- a/core/lib/Drupal/Core/TypedData/Validation/ConstraintViolationBuilder.php
+++ b/core/lib/Drupal/Core/TypedData/Validation/ConstraintViolationBuilder.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\Core\TypedData\Validation\ConstraintViolationBuilder.
+ */
+
 namespace Drupal\Core\TypedData\Validation;
 
 use Symfony\Component\Translation\TranslatorInterface;
diff --git a/core/lib/Drupal/Core/TypedData/Validation/ContextualValidatorInterface.php b/core/lib/Drupal/Core/TypedData/Validation/ContextualValidatorInterface.php
index 53f9acf9e5c47968930de8c2c1d76c496dc15964..1276e32aec80a3d6dbcd058dda96c0d45b41276b 100644
--- a/core/lib/Drupal/Core/TypedData/Validation/ContextualValidatorInterface.php
+++ b/core/lib/Drupal/Core/TypedData/Validation/ContextualValidatorInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\TypedData\Validation\RecursiveContextualValidatorInterface.
+ * Contains \Drupal\Core\TypedData\Validation\ContextualValidatorInterface.
  */
 
 namespace Drupal\Core\TypedData\Validation;
diff --git a/core/lib/Drupal/Core/TypedData/Validation/RecursiveContextualValidator.php b/core/lib/Drupal/Core/TypedData/Validation/RecursiveContextualValidator.php
index 44943e2420affd70cd58f220f0cc106ed2b1f76a..81b8eeba856093f5bca852b1dbce9ffd9776d6c7 100644
--- a/core/lib/Drupal/Core/TypedData/Validation/RecursiveContextualValidator.php
+++ b/core/lib/Drupal/Core/TypedData/Validation/RecursiveContextualValidator.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\TypedData\Validation\PropertyContainerPropertyMetadata.
+ * Contains \Drupal\Core\TypedData\Validation\RecursiveContextualValidator.
  */
 
 namespace Drupal\Core\TypedData\Validation;
diff --git a/core/lib/Drupal/Core/TypedData/Validation/TypedDataMetadata.php b/core/lib/Drupal/Core/TypedData/Validation/TypedDataMetadata.php
index 5b043bbc9893b95080e28ad07dfbe277b9a6db5b..2bdde224ff4175a03b083ee0cde66bbb2d6d6b67 100644
--- a/core/lib/Drupal/Core/TypedData/Validation/TypedDataMetadata.php
+++ b/core/lib/Drupal/Core/TypedData/Validation/TypedDataMetadata.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\TypedData\Validation\MetadataBase.
+ * Contains \Drupal\Core\TypedData\Validation\TypedDataMetadata.
  */
 
 namespace Drupal\Core\TypedData\Validation;
diff --git a/core/lib/Drupal/Core/Updater/Module.php b/core/lib/Drupal/Core/Updater/Module.php
index a28768db650b97d28cac779821850a0a90a9fc9f..25c03f96124db305366996b024659bf894f24be0 100644
--- a/core/lib/Drupal/Core/Updater/Module.php
+++ b/core/lib/Drupal/Core/Updater/Module.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Updater\Module.
+ * Contains \Drupal\Core\Updater\Module.
  */
 
 namespace Drupal\Core\Updater;
diff --git a/core/lib/Drupal/Core/Updater/Theme.php b/core/lib/Drupal/Core/Updater/Theme.php
index cb4addb74d0f406127dbf92e4536ce5d072c9006..8ad55f0d520d9255f02e2366c828f8722827fbf2 100644
--- a/core/lib/Drupal/Core/Updater/Theme.php
+++ b/core/lib/Drupal/Core/Updater/Theme.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Updater\Theme.
+ * Contains \Drupal\Core\Updater\Theme.
  */
 
 namespace Drupal\Core\Updater;
diff --git a/core/lib/Drupal/Core/Updater/Updater.php b/core/lib/Drupal/Core/Updater/Updater.php
index 00f94b9b78fdd9d50314079ed1d7d2c86f5b394b..177b11d102a657d4d94d0c9982acd2d60cf93153 100644
--- a/core/lib/Drupal/Core/Updater/Updater.php
+++ b/core/lib/Drupal/Core/Updater/Updater.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Updater\Updater.
+ * Contains \Drupal\Core\Updater\Updater.
  */
 
 namespace Drupal\Core\Updater;
diff --git a/core/lib/Drupal/Core/Updater/UpdaterException.php b/core/lib/Drupal/Core/Updater/UpdaterException.php
index 577620eed25851a80919dedca5a73654de60d45c..fd30536102fcbb171346eff22da25b6e946ac36d 100644
--- a/core/lib/Drupal/Core/Updater/UpdaterException.php
+++ b/core/lib/Drupal/Core/Updater/UpdaterException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Updater\UpdaterException.
+ * Contains \Drupal\Core\Updater\UpdaterException.
  */
 
 namespace Drupal\Core\Updater;
diff --git a/core/lib/Drupal/Core/Updater/UpdaterFileTransferException.php b/core/lib/Drupal/Core/Updater/UpdaterFileTransferException.php
index 812c3549f821f2e0e90bd895ca3fc9f9b40d6df3..e34e0f6958d786f46d048999c00d1586eb246b73 100644
--- a/core/lib/Drupal/Core/Updater/UpdaterFileTransferException.php
+++ b/core/lib/Drupal/Core/Updater/UpdaterFileTransferException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Updater\UpdaterFileTransferException.
+ * Contains \Drupal\Core\Updater\UpdaterFileTransferException.
  */
 
 namespace Drupal\Core\Updater;
diff --git a/core/lib/Drupal/Core/Updater/UpdaterInterface.php b/core/lib/Drupal/Core/Updater/UpdaterInterface.php
index 66e2302754eacc594f436961b00e92c4b3bfac14..7cd7512c6d12220486b7db2fc18915ed8b4f0f50 100644
--- a/core/lib/Drupal/Core/Updater/UpdaterInterface.php
+++ b/core/lib/Drupal/Core/Updater/UpdaterInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Updater\UpdaterInterface.
+ * Contains \Drupal\Core\Updater\UpdaterInterface.
  */
 
 namespace Drupal\Core\Updater;
diff --git a/core/lib/Drupal/Core/Utility/ThemeRegistry.php b/core/lib/Drupal/Core/Utility/ThemeRegistry.php
index edc0089c59100624cdb5015f7439067737bb01fb..c5e6055133de37333dbdb742daae65d4cbba42d5 100644
--- a/core/lib/Drupal/Core/Utility/ThemeRegistry.php
+++ b/core/lib/Drupal/Core/Utility/ThemeRegistry.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Utility\ThemeRegistry
+ * Contains \Drupal\Core\Utility\ThemeRegistry.
  */
 
 namespace Drupal\Core\Utility;
diff --git a/core/lib/Drupal/Core/Utility/Token.php b/core/lib/Drupal/Core/Utility/Token.php
index 11427bafd817854e2c746aaaac2f6089bf056cef..075abb58da450292b53661a6be291bc91fbcb1d9 100644
--- a/core/lib/Drupal/Core/Utility/Token.php
+++ b/core/lib/Drupal/Core/Utility/Token.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Utility\Token.
+ * Contains \Drupal\Core\Utility\Token.
  */
 
 namespace Drupal\Core\Utility;
diff --git a/core/lib/Drupal/Core/Utility/UnroutedUrlAssembler.php b/core/lib/Drupal/Core/Utility/UnroutedUrlAssembler.php
index d86615ae762d94eef6da57aa1279692383965306..955680864e5f06ccaf350f299b8b0abcae4907df 100644
--- a/core/lib/Drupal/Core/Utility/UnroutedUrlAssembler.php
+++ b/core/lib/Drupal/Core/Utility/UnroutedUrlAssembler.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Core\Utility\UnroutedUrlAssembler.
+ * Contains \Drupal\Core\Utility\UnroutedUrlAssembler.
  */
 
 namespace Drupal\Core\Utility;
diff --git a/core/lib/Drupal/Core/Utility/UnroutedUrlAssemblerInterface.php b/core/lib/Drupal/Core/Utility/UnroutedUrlAssemblerInterface.php
index f4472585f3f05287716d9026c024749112e9b3bf..9e8ca9071784d284d7cbd319e17326efdbcba12a 100644
--- a/core/lib/Drupal/Core/Utility/UnroutedUrlAssemblerInterface.php
+++ b/core/lib/Drupal/Core/Utility/UnroutedUrlAssemblerInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains Drupal\Core\Utility\UnroutedUrlAssemblerInterface.
+ * Contains \Drupal\Core\Utility\UnroutedUrlAssemblerInterface.
  */
 
 namespace Drupal\Core\Utility;
diff --git a/core/lib/Drupal/Core/Utility/UpdateException.php b/core/lib/Drupal/Core/Utility/UpdateException.php
index 358aa01d5edd828201d97a59436f6b9df7158461..889baa1e5bfd4026ab32a55af68bbacf5cc8b2d0 100644
--- a/core/lib/Drupal/Core/Utility/UpdateException.php
+++ b/core/lib/Drupal/Core/Utility/UpdateException.php
@@ -1,8 +1,8 @@
 <?php
 
-/*
+/**
  * @file
- * Definition of Drupal\Core\Utility\UpdateException.
+ * Contains \Drupal\Core\Utility\UpdateException.
  */
 
 namespace Drupal\Core\Utility;
diff --git a/core/modules/action/src/ActionEditForm.php b/core/modules/action/src/ActionEditForm.php
index d8d9bb29cdfc94c0a0ffefe571a501a684027c07..bcde9162807a9b6699febb07800cbab66a3db0c3 100644
--- a/core/modules/action/src/ActionEditForm.php
+++ b/core/modules/action/src/ActionEditForm.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\action\ActionEditForm.
+ * Contains \Drupal\action\ActionEditForm.
  */
 
 namespace Drupal\action;
diff --git a/core/modules/action/src/ActionFormBase.php b/core/modules/action/src/ActionFormBase.php
index 96bb63d0636078eb66268f497d99ff8f00f6cbad..bdddc9818e6742939a5a20a28cbe997b422e2c02 100644
--- a/core/modules/action/src/ActionFormBase.php
+++ b/core/modules/action/src/ActionFormBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\action\ActionEditForm.
+ * Contains \Drupal\action\ActionFormBase.
  */
 
 namespace Drupal\action;
diff --git a/core/modules/action/src/Tests/ConfigurationTest.php b/core/modules/action/src/Tests/ConfigurationTest.php
index 57b2525aae4d5721e12394ac470455da9a5f8271..bff2023c441bedcbd628174489393d028bb980da 100644
--- a/core/modules/action/src/Tests/ConfigurationTest.php
+++ b/core/modules/action/src/Tests/ConfigurationTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\action\Tests\ConfigurationTest.
+ * Contains \Drupal\action\Tests\ConfigurationTest.
  */
 
 namespace Drupal\action\Tests;
diff --git a/core/modules/aggregator/src/FeedInterface.php b/core/modules/aggregator/src/FeedInterface.php
index e678c90e4c88a0fdbe50baf145cd66884ca38165..c5c70141fb783cbbb15370571d5ec91fb63d7970 100644
--- a/core/modules/aggregator/src/FeedInterface.php
+++ b/core/modules/aggregator/src/FeedInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\aggregator\Entity\FeedInterface.
+ * Contains \Drupal\aggregator\FeedInterface.
  */
 
 namespace Drupal\aggregator;
diff --git a/core/modules/aggregator/src/ItemInterface.php b/core/modules/aggregator/src/ItemInterface.php
index 1926d9e18f344cd68aae6da5d2cb9400bcd67697..8211d355d955cdcb92f8e6bf174e145938bf5384 100644
--- a/core/modules/aggregator/src/ItemInterface.php
+++ b/core/modules/aggregator/src/ItemInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\aggregator\Entity\ItemInterface.
+ * Contains \Drupal\aggregator\ItemInterface.
  */
 
 namespace Drupal\aggregator;
diff --git a/core/modules/aggregator/src/ItemStorageInterface.php b/core/modules/aggregator/src/ItemStorageInterface.php
index e0c7600412e32e11dd5d37d2342b2c3ccf7617e1..f5012bd64404792d442dbc230e3a4c1c60ccb250 100644
--- a/core/modules/aggregator/src/ItemStorageInterface.php
+++ b/core/modules/aggregator/src/ItemStorageInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\aggregator\ItemStorageInterface.
+ * Contains \Drupal\aggregator\ItemStorageInterface.
  */
 
 namespace Drupal\aggregator;
diff --git a/core/modules/aggregator/src/ItemsImporter.php b/core/modules/aggregator/src/ItemsImporter.php
index 3098f085749db0c8dd7d02073bb8af6aafed61e4..b3ac8e41236842911a4d513a6f03fa4ec33035dc 100644
--- a/core/modules/aggregator/src/ItemsImporter.php
+++ b/core/modules/aggregator/src/ItemsImporter.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\aggregator\Entity\ItemsImporter.
+ * Contains \Drupal\aggregator\ItemsImporter.
  */
 
 namespace Drupal\aggregator;
diff --git a/core/modules/aggregator/src/Tests/AddFeedTest.php b/core/modules/aggregator/src/Tests/AddFeedTest.php
index 5e5993b80f8420037231a2d966591de1d39f75d2..2a7f037de8f155d386319d41d7f4463e20b8ddd1 100644
--- a/core/modules/aggregator/src/Tests/AddFeedTest.php
+++ b/core/modules/aggregator/src/Tests/AddFeedTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\aggregator\Tests\AddFeedTest.
+ * Contains \Drupal\aggregator\Tests\AddFeedTest.
  */
 
 namespace Drupal\aggregator\Tests;
diff --git a/core/modules/aggregator/src/Tests/AggregatorCronTest.php b/core/modules/aggregator/src/Tests/AggregatorCronTest.php
index 59b6386108876663ba7c3a18fe0fb4fa3c208ec5..28fe2692bef90a1ab9bd5b10a56908ed51908e0c 100644
--- a/core/modules/aggregator/src/Tests/AggregatorCronTest.php
+++ b/core/modules/aggregator/src/Tests/AggregatorCronTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\aggregator\Tests\AggregatorCronTest.
+ * Contains \Drupal\aggregator\Tests\AggregatorCronTest.
  */
 
 namespace Drupal\aggregator\Tests;
diff --git a/core/modules/aggregator/src/Tests/AggregatorRenderingTest.php b/core/modules/aggregator/src/Tests/AggregatorRenderingTest.php
index d5c30ce8fab0ab397e3b4119c4a7cf190592cd80..351f48c177e6d7d52724c582107aace3c7504c8d 100644
--- a/core/modules/aggregator/src/Tests/AggregatorRenderingTest.php
+++ b/core/modules/aggregator/src/Tests/AggregatorRenderingTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\aggregator\Tests\AggregatorRenderingTest.
+ * Contains \Drupal\aggregator\Tests\AggregatorRenderingTest.
  */
 
 namespace Drupal\aggregator\Tests;
diff --git a/core/modules/aggregator/src/Tests/AggregatorTestBase.php b/core/modules/aggregator/src/Tests/AggregatorTestBase.php
index 3c5a45211bd069fd4c116733ae668fb4a7ac7ac8..3bee7f43a98dc44413923c8314999af95d633a8d 100644
--- a/core/modules/aggregator/src/Tests/AggregatorTestBase.php
+++ b/core/modules/aggregator/src/Tests/AggregatorTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\aggregator\Tests\AggregatorTestBase.
+ * Contains \Drupal\aggregator\Tests\AggregatorTestBase.
  */
 
 namespace Drupal\aggregator\Tests;
diff --git a/core/modules/aggregator/src/Tests/DeleteFeedItemTest.php b/core/modules/aggregator/src/Tests/DeleteFeedItemTest.php
index df18fb3b107226a00dcaecedd67c6f9860f6094f..ba053270d5ccaa32051f306c60b0366662e411c6 100644
--- a/core/modules/aggregator/src/Tests/DeleteFeedItemTest.php
+++ b/core/modules/aggregator/src/Tests/DeleteFeedItemTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\aggregator\Tests\DeleteFeedItemTest.
+ * Contains \Drupal\aggregator\Tests\DeleteFeedItemTest.
  */
 
 namespace Drupal\aggregator\Tests;
diff --git a/core/modules/aggregator/src/Tests/DeleteFeedTest.php b/core/modules/aggregator/src/Tests/DeleteFeedTest.php
index 5663da661645344a0f64cfdfc7f904e60b062de4..3020982bee777e5d3a315ba6ba2e0bdb0f840533 100644
--- a/core/modules/aggregator/src/Tests/DeleteFeedTest.php
+++ b/core/modules/aggregator/src/Tests/DeleteFeedTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\aggregator\Tests\DeleteFeedTest.
+ * Contains \Drupal\aggregator\Tests\DeleteFeedTest.
  */
 
 namespace Drupal\aggregator\Tests;
diff --git a/core/modules/aggregator/src/Tests/FeedParserTest.php b/core/modules/aggregator/src/Tests/FeedParserTest.php
index 371b10fd42d1bc6a552fffe66e08f23415f34e6e..df8c9bf7cb1a2198b69a9ffd10d3164f71a990b1 100644
--- a/core/modules/aggregator/src/Tests/FeedParserTest.php
+++ b/core/modules/aggregator/src/Tests/FeedParserTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\aggregator\Tests\FeedParserTest.
+ * Contains \Drupal\aggregator\Tests\FeedParserTest.
  */
 
 namespace Drupal\aggregator\Tests;
diff --git a/core/modules/aggregator/src/Tests/ImportOpmlTest.php b/core/modules/aggregator/src/Tests/ImportOpmlTest.php
index f351cbc3f94cf993329b877c88c006a97a7d647d..9e95af295e30e0f068fa72dc647d208d520e813d 100644
--- a/core/modules/aggregator/src/Tests/ImportOpmlTest.php
+++ b/core/modules/aggregator/src/Tests/ImportOpmlTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\aggregator\Tests\ImportOpmlTest.
+ * Contains \Drupal\aggregator\Tests\ImportOpmlTest.
  */
 
 namespace Drupal\aggregator\Tests;
diff --git a/core/modules/aggregator/src/Tests/UpdateFeedItemTest.php b/core/modules/aggregator/src/Tests/UpdateFeedItemTest.php
index e100d6490b7a1f7dce371bf0e5b403c1a85abebf..0e944256460cd872e70a0853f29daf60f3928501 100644
--- a/core/modules/aggregator/src/Tests/UpdateFeedItemTest.php
+++ b/core/modules/aggregator/src/Tests/UpdateFeedItemTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\aggregator\Tests\UpdateFeedItemTest.
+ * Contains \Drupal\aggregator\Tests\UpdateFeedItemTest.
  */
 
 namespace Drupal\aggregator\Tests;
diff --git a/core/modules/aggregator/src/Tests/UpdateFeedTest.php b/core/modules/aggregator/src/Tests/UpdateFeedTest.php
index 71ca7de3b2de941cb9fb30836c633b62e5ab9e53..c660756bab76976bd2c39004440226a81a685ab0 100644
--- a/core/modules/aggregator/src/Tests/UpdateFeedTest.php
+++ b/core/modules/aggregator/src/Tests/UpdateFeedTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\aggregator\Tests\UpdateFeedTest.
+ * Contains \Drupal\aggregator\Tests\UpdateFeedTest.
  */
 
 namespace Drupal\aggregator\Tests;
diff --git a/core/modules/ban/src/BanIpManager.php b/core/modules/ban/src/BanIpManager.php
index 3e6028cde3eec0b92c3d475d26e6c1772098289c..29244676ad29150999375ee4601d362dba50ac0b 100644
--- a/core/modules/ban/src/BanIpManager.php
+++ b/core/modules/ban/src/BanIpManager.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\ban\BanIpManager.
+ * Contains \Drupal\ban\BanIpManager.
  */
 
 namespace Drupal\ban;
diff --git a/core/modules/ban/src/Tests/IpAddressBlockingTest.php b/core/modules/ban/src/Tests/IpAddressBlockingTest.php
index 16ec458bb5ccf96fbdf0c5a10a1e1943f85f47f3..d2f9b674cff3be62f79466ff2748504a99a08b20 100644
--- a/core/modules/ban/src/Tests/IpAddressBlockingTest.php
+++ b/core/modules/ban/src/Tests/IpAddressBlockingTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\ban\Tests\IpAddressBlockingTest.
+ * Contains \Drupal\ban\Tests\IpAddressBlockingTest.
  */
 
 namespace Drupal\ban\Tests;
diff --git a/core/modules/block/src/BlockInterface.php b/core/modules/block/src/BlockInterface.php
index 909621120edadddb4c5f1a7b54ec42cb779e9bef..39ad9a9bf99af9395c6d156daeb4623fc7fbc096 100644
--- a/core/modules/block/src/BlockInterface.php
+++ b/core/modules/block/src/BlockInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\block\Entity\BlockInterface.
+ * Contains \Drupal\block\BlockInterface.
  */
 
 namespace Drupal\block;
diff --git a/core/modules/block/src/EventSubscriber/CurrentUserContext.php b/core/modules/block/src/EventSubscriber/CurrentUserContext.php
index cb70f3d5f7761f840cdfa16469d39d4e0ed2ffa6..dcf95c9006bf6bb0a915543db437ed86e146f390 100644
--- a/core/modules/block/src/EventSubscriber/CurrentUserContext.php
+++ b/core/modules/block/src/EventSubscriber/CurrentUserContext.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\block\Event\CurrentUserContext.
+ * Contains \Drupal\block\EventSubscriber\CurrentUserContext.
  */
 
 namespace Drupal\block\EventSubscriber;
diff --git a/core/modules/block/src/Plugin/Derivative/ThemeLocalTask.php b/core/modules/block/src/Plugin/Derivative/ThemeLocalTask.php
index 849df45cdfe0879b5f2020e7df80b26086e9d432..cbc0a73df672b64aa95651992fac07db44213f84 100644
--- a/core/modules/block/src/Plugin/Derivative/ThemeLocalTask.php
+++ b/core/modules/block/src/Plugin/Derivative/ThemeLocalTask.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Plugin\Derivative\ThemeLocalTask.
+ * Contains \Drupal\block\Plugin\Derivative\ThemeLocalTask.
  */
 
 namespace Drupal\block\Plugin\Derivative;
diff --git a/core/modules/block/src/Tests/BlockAdminThemeTest.php b/core/modules/block/src/Tests/BlockAdminThemeTest.php
index 073f64f0d0c4483f4b4a2f3fa687a1f53c70ad73..52a51da97d9a30eaf7c63fc2056c7e1c70c22204 100644
--- a/core/modules/block/src/Tests/BlockAdminThemeTest.php
+++ b/core/modules/block/src/Tests/BlockAdminThemeTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\block\Tests\BlockAdminThemeTest.
+ * Contains \Drupal\block\Tests\BlockAdminThemeTest.
  */
 
 namespace Drupal\block\Tests;
diff --git a/core/modules/block/src/Tests/BlockCacheTest.php b/core/modules/block/src/Tests/BlockCacheTest.php
index 51651499fda4c8c92482bb0f726ca2377fe9cf6c..78ccd04b02b96bfbede67d3b9613f54742781382 100644
--- a/core/modules/block/src/Tests/BlockCacheTest.php
+++ b/core/modules/block/src/Tests/BlockCacheTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\block\Tests\BlockCacheTest.
+ * Contains \Drupal\block\Tests\BlockCacheTest.
  */
 
 namespace Drupal\block\Tests;
diff --git a/core/modules/block/src/Tests/BlockHiddenRegionTest.php b/core/modules/block/src/Tests/BlockHiddenRegionTest.php
index b5abe7c87bb8996b7114d8283cd83faa45678a00..347cdaf41bb23c9fc6298e50e67b7a2e01b97c9a 100644
--- a/core/modules/block/src/Tests/BlockHiddenRegionTest.php
+++ b/core/modules/block/src/Tests/BlockHiddenRegionTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\block\Tests\BlockHiddenRegionTest.
+ * Contains \Drupal\block\Tests\BlockHiddenRegionTest.
  */
 
 namespace Drupal\block\Tests;
diff --git a/core/modules/block/src/Tests/BlockHookOperationTest.php b/core/modules/block/src/Tests/BlockHookOperationTest.php
index 0b955eaac25cce630711e11da687e29e01ff81b3..c83882c81f380b38d4ef2104546530b703ca8362 100644
--- a/core/modules/block/src/Tests/BlockHookOperationTest.php
+++ b/core/modules/block/src/Tests/BlockHookOperationTest.php
@@ -2,6 +2,8 @@
 
 /**
  * @file
+ * Contains \Drupal\block\Tests\BlockHookOperationTest.
+ *
  * Tests for Block module regarding hook_entity_operations_alter().
  */
 
diff --git a/core/modules/block/src/Tests/BlockHtmlTest.php b/core/modules/block/src/Tests/BlockHtmlTest.php
index fe6cce719262a2a7d5d7a4394de8d1f0faaf72db..1f344c6c9277191a3d8d1b702a9a13634a346a43 100644
--- a/core/modules/block/src/Tests/BlockHtmlTest.php
+++ b/core/modules/block/src/Tests/BlockHtmlTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\block\Tests\BlockHtmlTest.
+ * Contains \Drupal\block\Tests\BlockHtmlTest.
  */
 
 namespace Drupal\block\Tests;
diff --git a/core/modules/block/src/Tests/BlockInvalidRegionTest.php b/core/modules/block/src/Tests/BlockInvalidRegionTest.php
index 722b6eb50bb28a610275df54632aade16efa7037..6162d20faf73bc3894af7944758a422db7413d66 100644
--- a/core/modules/block/src/Tests/BlockInvalidRegionTest.php
+++ b/core/modules/block/src/Tests/BlockInvalidRegionTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\block\Tests\BlockInvalidRegionTest.
+ * Contains \Drupal\block\Tests\BlockInvalidRegionTest.
  */
 
 namespace Drupal\block\Tests;
diff --git a/core/modules/block/src/Tests/BlockLanguageTest.php b/core/modules/block/src/Tests/BlockLanguageTest.php
index 57ac06e3357134824653a372405ae61746a307e8..db908b0d0cebc974f20c947b1cd594561834e7f5 100644
--- a/core/modules/block/src/Tests/BlockLanguageTest.php
+++ b/core/modules/block/src/Tests/BlockLanguageTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\block\Tests\BlockLanguageTest.
+ * Contains \Drupal\block\Tests\BlockLanguageTest.
  */
 
 namespace Drupal\block\Tests;
diff --git a/core/modules/block/src/Tests/BlockRenderOrderTest.php b/core/modules/block/src/Tests/BlockRenderOrderTest.php
index 45bcf540b6855b0230ccc96bed87dd3eb8b2f3f2..fa2913c10e18191f785172de1e9416e63b4a67a5 100644
--- a/core/modules/block/src/Tests/BlockRenderOrderTest.php
+++ b/core/modules/block/src/Tests/BlockRenderOrderTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\block\Tests\BlockRenderOrderTest.
+ * Contains \Drupal\block\Tests\BlockRenderOrderTest.
  */
 
 namespace Drupal\block\Tests;
diff --git a/core/modules/block/src/Tests/NewDefaultThemeBlocksTest.php b/core/modules/block/src/Tests/NewDefaultThemeBlocksTest.php
index 42bbf5d7da7d78207ce3a1e3ed26cea8b474bbb2..68592c84fb202e22064b2b5ebe4245d73378b44c 100644
--- a/core/modules/block/src/Tests/NewDefaultThemeBlocksTest.php
+++ b/core/modules/block/src/Tests/NewDefaultThemeBlocksTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\block\Tests\NewDefaultThemeBlocksTest.
+ * Contains \Drupal\block\Tests\NewDefaultThemeBlocksTest.
  */
 
 namespace Drupal\block\Tests;
diff --git a/core/modules/block/src/Tests/NonDefaultBlockAdminTest.php b/core/modules/block/src/Tests/NonDefaultBlockAdminTest.php
index 563d12dc31fd751354a1d32a25a9f807651d1fdf..bc55ab2c2653da7f07c6bf86773d333921821fa1 100644
--- a/core/modules/block/src/Tests/NonDefaultBlockAdminTest.php
+++ b/core/modules/block/src/Tests/NonDefaultBlockAdminTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\block\Tests\NonDefaultBlockAdminTest.
+ * Contains \Drupal\block\Tests\NonDefaultBlockAdminTest.
  */
 
 namespace Drupal\block\Tests;
diff --git a/core/modules/block_content/src/BlockContentInterface.php b/core/modules/block_content/src/BlockContentInterface.php
index eb234030ff3d4547c2b8983567625b73903b4eae..50f4d35b17e4c3460237fadbc1d4fb0e21832008 100644
--- a/core/modules/block_content/src/BlockContentInterface.php
+++ b/core/modules/block_content/src/BlockContentInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\block_content\Entity\BlockContentInterface.
+ * Contains \Drupal\block_content\BlockContentInterface.
  */
 
 namespace Drupal\block_content;
diff --git a/core/modules/block_content/src/BlockContentTypeInterface.php b/core/modules/block_content/src/BlockContentTypeInterface.php
index 32035a6f94a5bd1994444de6bae716669c01cb1a..854f413a613f4cd6c0f13170461d3825ee1d0a7b 100644
--- a/core/modules/block_content/src/BlockContentTypeInterface.php
+++ b/core/modules/block_content/src/BlockContentTypeInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\block_content\Entity\BlockContentTypeInterface.
+ * Contains \Drupal\block_content\BlockContentTypeInterface.
  */
 
 namespace Drupal\block_content;
diff --git a/core/modules/block_content/src/Controller/BlockContentController.php b/core/modules/block_content/src/Controller/BlockContentController.php
index a8d2c058e7adae260e0b1bc26bf974cc8afcfb0d..f7123671a07ad525ed4a8745b066eab101642e45 100644
--- a/core/modules/block_content/src/Controller/BlockContentController.php
+++ b/core/modules/block_content/src/Controller/BlockContentController.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\block_content\Controller\BlockContentController
+ * Contains \Drupal\block_content\Controller\BlockContentController.
  */
 
 namespace Drupal\block_content\Controller;
diff --git a/core/modules/block_content/src/Form/BlockContentDeleteForm.php b/core/modules/block_content/src/Form/BlockContentDeleteForm.php
index f834ae6d25b9921d7363d9a5155b12f0a5e978da..a610ce10064a554a64b176ea4e9a0ea488beb2c2 100644
--- a/core/modules/block_content/src/Form/BlockContentDeleteForm.php
+++ b/core/modules/block_content/src/Form/BlockContentDeleteForm.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\block\Form\BlockContentDeleteForm.
+ * Contains \Drupal\block_content\Form\BlockContentDeleteForm.
  */
 
 namespace Drupal\block_content\Form;
diff --git a/core/modules/book/src/Access/BookNodeIsRemovableAccessCheck.php b/core/modules/book/src/Access/BookNodeIsRemovableAccessCheck.php
index ee17c707a84860cb1f2818ff4b826a96338075d7..53207b78fa111ad86fe7aa3e600684413fd9b846 100644
--- a/core/modules/book/src/Access/BookNodeIsRemovableAccessCheck.php
+++ b/core/modules/book/src/Access/BookNodeIsRemovableAccessCheck.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\book\Access\BookNodeIsRemovableAccessCheck.
+ * Contains \Drupal\book\Access\BookNodeIsRemovableAccessCheck.
  */
 
 namespace Drupal\book\Access;
diff --git a/core/modules/book/src/BookOutlineStorage.php b/core/modules/book/src/BookOutlineStorage.php
index 66b6a9fad6f5502d427c372930b9d234f215c4b1..c050cd064f37bf1c0e7909114d6c6e6f8358d37f 100644
--- a/core/modules/book/src/BookOutlineStorage.php
+++ b/core/modules/book/src/BookOutlineStorage.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\book\BookOutlineStorage.
+ * Contains \Drupal\book\BookOutlineStorage.
  */
 
 namespace Drupal\book;
diff --git a/core/modules/book/src/Tests/BookTest.php b/core/modules/book/src/Tests/BookTest.php
index dd7e373522228f742f02f2f5cb5c8390856965c0..bfd3ae31b5d9b6b4969d34b06ee8cf3a9a9394e4 100644
--- a/core/modules/book/src/Tests/BookTest.php
+++ b/core/modules/book/src/Tests/BookTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\book\Tests\BookTest.
+ * Contains \Drupal\book\Tests\BookTest.
  */
 
 namespace Drupal\book\Tests;
diff --git a/core/modules/book/src/Tests/BookUninstallTest.php b/core/modules/book/src/Tests/BookUninstallTest.php
index bafaab7ee7ced82053910106841cb72484d6a377..c3739d8c4b7b855c333bdff070517386943eb66a 100644
--- a/core/modules/book/src/Tests/BookUninstallTest.php
+++ b/core/modules/book/src/Tests/BookUninstallTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\book\Tests\BookUninstallTest.
+ * Contains \Drupal\book\Tests\BookUninstallTest.
  */
 
 namespace Drupal\book\Tests;
diff --git a/core/modules/breakpoint/src/Tests/BreakpointDiscoveryTest.php b/core/modules/breakpoint/src/Tests/BreakpointDiscoveryTest.php
index e21723a257c660700352bf85ba174cde036befa7..b39c2a81429f40505dada9e50b307765485273c2 100644
--- a/core/modules/breakpoint/src/Tests/BreakpointDiscoveryTest.php
+++ b/core/modules/breakpoint/src/Tests/BreakpointDiscoveryTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Definition of Drupal\breakpoint\Tests\BreakpointDiscoveryTest.
+ * Contains \Drupal\breakpoint\Tests\BreakpointDiscoveryTest.
  */
 
 namespace Drupal\breakpoint\Tests;
diff --git a/core/modules/ckeditor/src/Annotation/CKEditorPlugin.php b/core/modules/ckeditor/src/Annotation/CKEditorPlugin.php
index 078bf7636da5644f996d9a92cbd50a6ac7feaf57..197cf95da09c4f41f5299d0924c2de5399d157b2 100644
--- a/core/modules/ckeditor/src/Annotation/CKEditorPlugin.php
+++ b/core/modules/ckeditor/src/Annotation/CKEditorPlugin.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\ckeditor\Annotation\CKEditorPlugin.
+ * Contains \Drupal\ckeditor\Annotation\CKEditorPlugin.
  */
 
 namespace Drupal\ckeditor\Annotation;
diff --git a/core/modules/ckeditor/src/CKEditorPluginBase.php b/core/modules/ckeditor/src/CKEditorPluginBase.php
index 1d5cb43582042a727368990548e9d92b84cc89dd..9342b0e906889980d631aae6f42bb5e72b1a5f19 100644
--- a/core/modules/ckeditor/src/CKEditorPluginBase.php
+++ b/core/modules/ckeditor/src/CKEditorPluginBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\ckeditor\Plugin\CKEditorPluginBase.
+ * Contains \Drupal\ckeditor\CKEditorPluginBase.
  */
 
 namespace Drupal\ckeditor;
diff --git a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImage.php b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImage.php
index b0c88bf3485237f40dd0f5f52d7e8e3a0d6195ec..080c017232ddb967ccafc4c7671882cb7f78727a 100644
--- a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImage.php
+++ b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImage.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\ckeditor\Plugin\ckeditor\plugin\DrupalImage.
+ * Contains \Drupal\ckeditor\Plugin\CKEditorPlugin\DrupalImage.
  */
 
 namespace Drupal\ckeditor\Plugin\CKEditorPlugin;
diff --git a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImageCaption.php b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImageCaption.php
index 7ca296e323cc18bba1b1271c4b5503c847228a1e..f78869bc1cef2c98e13618dd73fc757ce8e07722 100644
--- a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImageCaption.php
+++ b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImageCaption.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\ckeditor\Plugin\CKEditorPlugin\DrupalImageWidget.
+ * Contains \Drupal\ckeditor\Plugin\CKEditorPlugin\DrupalImageCaption.
  */
 
 namespace Drupal\ckeditor\Plugin\CKEditorPlugin;
diff --git a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalLink.php b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalLink.php
index 8ce0c7a91aff7400a8350eb6e34a11728dbce6a2..dbfc07f68beb95dd996ce7fa9d26de577cd2e936 100644
--- a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalLink.php
+++ b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalLink.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\ckeditor\Plugin\ckeditor\plugin\DrupalLink.
+ * Contains \Drupal\ckeditor\Plugin\CKEditorPlugin\DrupalLink.
  */
 
 namespace Drupal\ckeditor\Plugin\CKEditorPlugin;
diff --git a/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php b/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php
index 68497577470fc64c18480873eb218ca9e01a4ccf..d113a7609719e35f60c18c7ede92aac362534a0f 100644
--- a/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php
+++ b/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of \Drupal\ckeditor\Tests\CKEditorAdminTest.
+ * Contains \Drupal\ckeditor\Tests\CKEditorAdminTest.
  */
 
 namespace Drupal\ckeditor\Tests;
diff --git a/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php b/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php
index 24ec2191c8994f9c42f987ff33f0cab1cb22d93a..01b90819a97bc3b81ae74920cddaebf628218f13 100644
--- a/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php
+++ b/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of \Drupal\ckeditor\Tests\CKEditorLoadingTest.
+ * Contains \Drupal\ckeditor\Tests\CKEditorLoadingTest.
  */
 
 namespace Drupal\ckeditor\Tests;
diff --git a/core/modules/ckeditor/src/Tests/CKEditorPluginManagerTest.php b/core/modules/ckeditor/src/Tests/CKEditorPluginManagerTest.php
index 02815ef08085c59c9bb1b2341cf3dc4874ef50a0..96cf56f546b2831f9e7d44e04a113bdf7158cd7d 100644
--- a/core/modules/ckeditor/src/Tests/CKEditorPluginManagerTest.php
+++ b/core/modules/ckeditor/src/Tests/CKEditorPluginManagerTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of \Drupal\ckeditor\Tests\CKEditorPluginManagerTest.
+ * Contains \Drupal\ckeditor\Tests\CKEditorPluginManagerTest.
  */
 
 namespace Drupal\ckeditor\Tests;
diff --git a/core/modules/ckeditor/src/Tests/CKEditorTest.php b/core/modules/ckeditor/src/Tests/CKEditorTest.php
index 7d42dc54d8deb1d5c5d0c6f05204bb9107ab1922..cbefd0d9b8c906cd183f4be535118aa8b40453e5 100644
--- a/core/modules/ckeditor/src/Tests/CKEditorTest.php
+++ b/core/modules/ckeditor/src/Tests/CKEditorTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of \Drupal\ckeditor\Tests\CKEditorTest.
+ * Contains \Drupal\ckeditor\Tests\CKEditorTest.
  */
 
 namespace Drupal\ckeditor\Tests;
diff --git a/core/modules/comment/src/CommentForm.php b/core/modules/comment/src/CommentForm.php
index 11fca800ab0d2c2b0941a9c12a2e1054cd883f30..0bcacee9eda2d6b91cf238d5242374bdff031d75 100644
--- a/core/modules/comment/src/CommentForm.php
+++ b/core/modules/comment/src/CommentForm.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\comment\CommentForm.
+ * Contains \Drupal\comment\CommentForm.
  */
 
 namespace Drupal\comment;
diff --git a/core/modules/comment/src/CommentStorage.php b/core/modules/comment/src/CommentStorage.php
index b4977fa7038dd26be063a3b7bd865cc025ddfbf1..7737d445609d16595cfc08d0b20bd9b2fb6b00ab 100644
--- a/core/modules/comment/src/CommentStorage.php
+++ b/core/modules/comment/src/CommentStorage.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\comment\CommentStorage.
+ * Contains \Drupal\comment\CommentStorage.
  */
 
 namespace Drupal\comment;
diff --git a/core/modules/comment/src/CommentTypeInterface.php b/core/modules/comment/src/CommentTypeInterface.php
index 2ccc0c163c0e082fd56115f70d324930478af836..a1f826ef4f66a3440c45727871d1d3f28df248c8 100644
--- a/core/modules/comment/src/CommentTypeInterface.php
+++ b/core/modules/comment/src/CommentTypeInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\comment\Entity\CommentTypeInterface.
+ * Contains \Drupal\comment\CommentTypeInterface.
  */
 
 namespace Drupal\comment;
diff --git a/core/modules/comment/src/CommentViewBuilder.php b/core/modules/comment/src/CommentViewBuilder.php
index b6a5c04686b5411be1322889c27c8e981a02bb87..692322046eb58891659bf4f50c2534c83c333958 100644
--- a/core/modules/comment/src/CommentViewBuilder.php
+++ b/core/modules/comment/src/CommentViewBuilder.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contents Drupal\comment\CommentViewBuilder.
+ * Contains \Drupal\comment\CommentViewBuilder.
  */
 
 namespace Drupal\comment;
diff --git a/core/modules/comment/src/Plugin/views/argument/UserUid.php b/core/modules/comment/src/Plugin/views/argument/UserUid.php
index f6558e6593b9daa639e59acdb753c8c28b661e44..5195a7a0a80343984430a0e65b6005257a5dbaef 100644
--- a/core/modules/comment/src/Plugin/views/argument/UserUid.php
+++ b/core/modules/comment/src/Plugin/views/argument/UserUid.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\comment\Plugin\views\argument\UserUid.
+ * Contains \Drupal\comment\Plugin\views\argument\UserUid.
  */
 
 namespace Drupal\comment\Plugin\views\argument;
diff --git a/core/modules/comment/src/Plugin/views/field/Depth.php b/core/modules/comment/src/Plugin/views/field/Depth.php
index b79abcc0d5a73a2c5ead9aa1e5e542473617862f..09f65250125c08ca54a9246e71d489c8727ebe81 100644
--- a/core/modules/comment/src/Plugin/views/field/Depth.php
+++ b/core/modules/comment/src/Plugin/views/field/Depth.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\comment\Plugin\views\field\Depth.
+ * Contains \Drupal\comment\Plugin\views\field\Depth.
  */
 
 namespace Drupal\comment\Plugin\views\field;
diff --git a/core/modules/comment/src/Plugin/views/field/LastTimestamp.php b/core/modules/comment/src/Plugin/views/field/LastTimestamp.php
index 62aabf0b044296255774b0c0a28dbf3ea2e2e153..1733123f314c9136427ac1887c40d85960610af6 100644
--- a/core/modules/comment/src/Plugin/views/field/LastTimestamp.php
+++ b/core/modules/comment/src/Plugin/views/field/LastTimestamp.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\comment\Plugin\views\field\LastTimestamp.
+ * Contains \Drupal\comment\Plugin\views\field\LastTimestamp.
  */
 
 namespace Drupal\comment\Plugin\views\field;
diff --git a/core/modules/comment/src/Plugin/views/field/LinkApprove.php b/core/modules/comment/src/Plugin/views/field/LinkApprove.php
index 6aa7259c8a7864979399894dab5b38e46b88b303..80d1948860f011278b6fcc03f3e893e753b96c85 100644
--- a/core/modules/comment/src/Plugin/views/field/LinkApprove.php
+++ b/core/modules/comment/src/Plugin/views/field/LinkApprove.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\comment\Plugin\views\field\LinkApprove.
+ * Contains \Drupal\comment\Plugin\views\field\LinkApprove.
  */
 
 namespace Drupal\comment\Plugin\views\field;
diff --git a/core/modules/comment/src/Plugin/views/field/NodeNewComments.php b/core/modules/comment/src/Plugin/views/field/NodeNewComments.php
index 695bd91b2c4dc27fbd96a89a0d2b572c11088bc2..4ed2ba809b3eecd277166b89b18decad9aeef26f 100644
--- a/core/modules/comment/src/Plugin/views/field/NodeNewComments.php
+++ b/core/modules/comment/src/Plugin/views/field/NodeNewComments.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\comment\Plugin\views\field\NodeNewComments.
+ * Contains \Drupal\comment\Plugin\views\field\NodeNewComments.
  */
 
 namespace Drupal\comment\Plugin\views\field;
diff --git a/core/modules/comment/src/Plugin/views/filter/NodeComment.php b/core/modules/comment/src/Plugin/views/filter/NodeComment.php
index 958d6dfde074d8c6139741e328b7dddb7944e9ce..a83ec3930fd61440929629182aa09b53626a6058 100644
--- a/core/modules/comment/src/Plugin/views/filter/NodeComment.php
+++ b/core/modules/comment/src/Plugin/views/filter/NodeComment.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\comment\Plugin\views\filter\NodeComment.
+ * Contains \Drupal\comment\Plugin\views\filter\NodeComment.
  */
 
 namespace Drupal\comment\Plugin\views\filter;
diff --git a/core/modules/comment/src/Plugin/views/filter/UserUid.php b/core/modules/comment/src/Plugin/views/filter/UserUid.php
index 16d4fb0303216410e14804110641dcfb181359a4..29d8656e41d6b5c8607c753ff7a18ea0444c2a0f 100644
--- a/core/modules/comment/src/Plugin/views/filter/UserUid.php
+++ b/core/modules/comment/src/Plugin/views/filter/UserUid.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\comment\Plugin\views\filter\UserUid.
+ * Contains \Drupal\comment\Plugin\views\filter\UserUid.
  */
 
 namespace Drupal\comment\Plugin\views\filter;
diff --git a/core/modules/comment/src/Plugin/views/row/Rss.php b/core/modules/comment/src/Plugin/views/row/Rss.php
index 30027659db34be97c8703f91f1c95376df2ced20..85eacaa38c6db8e24a34ab6ed5d8a76a9864f479 100644
--- a/core/modules/comment/src/Plugin/views/row/Rss.php
+++ b/core/modules/comment/src/Plugin/views/row/Rss.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\comment\Plugin\views\row\Rss.
+ * Contains \Drupal\comment\Plugin\views\row\Rss.
  */
 
 namespace Drupal\comment\Plugin\views\row;
diff --git a/core/modules/comment/src/Plugin/views/sort/Thread.php b/core/modules/comment/src/Plugin/views/sort/Thread.php
index a8bcad5cccf211cef41965778cf5d33fc0c88680..bef074709da8ea9ca5cebb8ce9273b6d92328083 100644
--- a/core/modules/comment/src/Plugin/views/sort/Thread.php
+++ b/core/modules/comment/src/Plugin/views/sort/Thread.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\comment\Plugin\views\sort\Thread.
+ * Contains \Drupal\comment\Plugin\views\sort\Thread.
  */
 
 namespace Drupal\comment\Plugin\views\sort;
diff --git a/core/modules/comment/src/Plugin/views/wizard/Comment.php b/core/modules/comment/src/Plugin/views/wizard/Comment.php
index 35c3167864fcde5580f8f378761e6d79008a51e9..366e2565e76aaa78aa4fceb5933ed953020f074d 100644
--- a/core/modules/comment/src/Plugin/views/wizard/Comment.php
+++ b/core/modules/comment/src/Plugin/views/wizard/Comment.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Plugin\views\wizard\Comment.
+ * Contains \Drupal\comment\Plugin\views\wizard\Comment.
  */
 
 namespace Drupal\comment\Plugin\views\wizard;
diff --git a/core/modules/comment/src/Tests/CommentActionsTest.php b/core/modules/comment/src/Tests/CommentActionsTest.php
index 483889642ae3f4998db0a93a96a75fb26639e0d8..5cf7ead2ad5a4b039bc9d170b5d35940ebcaea1d 100644
--- a/core/modules/comment/src/Tests/CommentActionsTest.php
+++ b/core/modules/comment/src/Tests/CommentActionsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\comment\Tests\CommentActionsTest.
+ * Contains \Drupal\comment\Tests\CommentActionsTest.
  */
 
 namespace Drupal\comment\Tests;
diff --git a/core/modules/comment/src/Tests/CommentAnonymousTest.php b/core/modules/comment/src/Tests/CommentAnonymousTest.php
index ca12dde0e9a3b3f073c45c264dfdb9b4476b9b7f..fd813f73d5b1f64a4e196acfab39dedbcdd43b48 100644
--- a/core/modules/comment/src/Tests/CommentAnonymousTest.php
+++ b/core/modules/comment/src/Tests/CommentAnonymousTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\comment\Tests\CommentAnonymousTest.
+ * Contains \Drupal\comment\Tests\CommentAnonymousTest.
  */
 
 namespace Drupal\comment\Tests;
diff --git a/core/modules/comment/src/Tests/CommentBlockTest.php b/core/modules/comment/src/Tests/CommentBlockTest.php
index ae68ff0b7f18199574bb2ed878c054682bc75862..e6eee695d9cdbe562f289311699db9bb497f3f01 100644
--- a/core/modules/comment/src/Tests/CommentBlockTest.php
+++ b/core/modules/comment/src/Tests/CommentBlockTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\comment\Tests\CommentBlockTest.
+ * Contains \Drupal\comment\Tests\CommentBlockTest.
  */
 
 namespace Drupal\comment\Tests;
diff --git a/core/modules/comment/src/Tests/CommentCSSTest.php b/core/modules/comment/src/Tests/CommentCSSTest.php
index 0b3a18be2789daf639825bf2b3170a97da82609f..47a31cc50cc5d70f2e14e4dc682bcc718c78a6f5 100644
--- a/core/modules/comment/src/Tests/CommentCSSTest.php
+++ b/core/modules/comment/src/Tests/CommentCSSTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\comment\Tests\CommentCSSTest.
+ * Contains \Drupal\comment\Tests\CommentCSSTest.
  */
 
 namespace Drupal\comment\Tests;
diff --git a/core/modules/comment/src/Tests/CommentFieldsTest.php b/core/modules/comment/src/Tests/CommentFieldsTest.php
index c66f08ae42b28272dee8da259529c1d9f82755e6..a5efac081f2657a24449729f4428866a15789c3b 100644
--- a/core/modules/comment/src/Tests/CommentFieldsTest.php
+++ b/core/modules/comment/src/Tests/CommentFieldsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\comment\Tests\CommentFieldsTest.
+ * Contains \Drupal\comment\Tests\CommentFieldsTest.
  */
 
 namespace Drupal\comment\Tests;
diff --git a/core/modules/comment/src/Tests/CommentInterfaceTest.php b/core/modules/comment/src/Tests/CommentInterfaceTest.php
index 6e97e6efb7a8f11ca1e428d5962969b7b0f83598..113681167fa78119684b0d8a146da6eaf0bb7d23 100644
--- a/core/modules/comment/src/Tests/CommentInterfaceTest.php
+++ b/core/modules/comment/src/Tests/CommentInterfaceTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\comment\Tests\CommentInterfaceTest.
+ * Contains \Drupal\comment\Tests\CommentInterfaceTest.
  */
 
 namespace Drupal\comment\Tests;
diff --git a/core/modules/comment/src/Tests/CommentLanguageTest.php b/core/modules/comment/src/Tests/CommentLanguageTest.php
index 883eb1724377da74759ff3a4dd2929eec411a258..8db195d5ce84490c31154f0920464573ef814623 100644
--- a/core/modules/comment/src/Tests/CommentLanguageTest.php
+++ b/core/modules/comment/src/Tests/CommentLanguageTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\comment\Tests\CommentLanguageTest.
+ * Contains \Drupal\comment\Tests\CommentLanguageTest.
  */
 
 namespace Drupal\comment\Tests;
diff --git a/core/modules/comment/src/Tests/CommentLinksAlterTest.php b/core/modules/comment/src/Tests/CommentLinksAlterTest.php
index 3ad189511b6c0f99fc963fcd6494472c9613687f..bea49c2d7027501d8818955be48c2a39ae867ae3 100644
--- a/core/modules/comment/src/Tests/CommentLinksAlterTest.php
+++ b/core/modules/comment/src/Tests/CommentLinksAlterTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\comment\Tests\CommentLinksAlterTest.
+ * Contains \Drupal\comment\Tests\CommentLinksAlterTest.
  */
 
 namespace Drupal\comment\Tests;
diff --git a/core/modules/comment/src/Tests/CommentLinksTest.php b/core/modules/comment/src/Tests/CommentLinksTest.php
index 8dc3b5b2426f87d8aa0ef2982e007190c4132968..68f9f0eb766705577adbf2d07ce8b1e5867abf2b 100644
--- a/core/modules/comment/src/Tests/CommentLinksTest.php
+++ b/core/modules/comment/src/Tests/CommentLinksTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\comment\Tests\CommentLinksTest.
+ * Contains \Drupal\comment\Tests\CommentLinksTest.
  */
 
 namespace Drupal\comment\Tests;
diff --git a/core/modules/comment/src/Tests/CommentNewIndicatorTest.php b/core/modules/comment/src/Tests/CommentNewIndicatorTest.php
index b605f949634d8e548829b582c52942a9fb00e14b..46e2795b0e752f1a697f1a9fa878d868acbbef6f 100644
--- a/core/modules/comment/src/Tests/CommentNewIndicatorTest.php
+++ b/core/modules/comment/src/Tests/CommentNewIndicatorTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\comment\Tests\CommentNewIndicatorTest.
+ * Contains \Drupal\comment\Tests\CommentNewIndicatorTest.
  */
 
 namespace Drupal\comment\Tests;
diff --git a/core/modules/comment/src/Tests/CommentNodeAccessTest.php b/core/modules/comment/src/Tests/CommentNodeAccessTest.php
index 175feba169fd7484a2988106ddd23cad34740429..7789991db04e6cdfe20e44cfa1479a54107f373f 100644
--- a/core/modules/comment/src/Tests/CommentNodeAccessTest.php
+++ b/core/modules/comment/src/Tests/CommentNodeAccessTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\comment\Tests\CommentNodeAccessTest.
+ * Contains \Drupal\comment\Tests\CommentNodeAccessTest.
  */
 
 namespace Drupal\comment\Tests;
diff --git a/core/modules/comment/src/Tests/CommentNodeChangesTest.php b/core/modules/comment/src/Tests/CommentNodeChangesTest.php
index c2959e3c067cb6ce7cfb9bf5a276f4fbc6d2a719..4f942ef309064634c75a7b47259a7e61593bf9f8 100644
--- a/core/modules/comment/src/Tests/CommentNodeChangesTest.php
+++ b/core/modules/comment/src/Tests/CommentNodeChangesTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\comment\Tests\CommentNodeChangesTest.
+ * Contains \Drupal\comment\Tests\CommentNodeChangesTest.
  */
 
 namespace Drupal\comment\Tests;
diff --git a/core/modules/comment/src/Tests/CommentPreviewTest.php b/core/modules/comment/src/Tests/CommentPreviewTest.php
index 75aca4d0655563c9e33ee9c5328b84e315572215..a1d0804eac39f25a916551eee0be0644c9a3317c 100644
--- a/core/modules/comment/src/Tests/CommentPreviewTest.php
+++ b/core/modules/comment/src/Tests/CommentPreviewTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\comment\Tests\CommentPreviewTest.
+ * Contains \Drupal\comment\Tests\CommentPreviewTest.
  */
 
 namespace Drupal\comment\Tests;
diff --git a/core/modules/comment/src/Tests/CommentRssTest.php b/core/modules/comment/src/Tests/CommentRssTest.php
index e7072fabcdadfcbb20a9ff88c41a66eea39247f2..b82da48778510d04f527cdd10579ffb613fda62b 100644
--- a/core/modules/comment/src/Tests/CommentRssTest.php
+++ b/core/modules/comment/src/Tests/CommentRssTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\comment\Tests\CommentRssTest.
+ * Contains \Drupal\comment\Tests\CommentRssTest.
  */
 
 namespace Drupal\comment\Tests;
diff --git a/core/modules/comment/src/Tests/CommentStatisticsTest.php b/core/modules/comment/src/Tests/CommentStatisticsTest.php
index 99c2955b4dd9e122fd5b6965aefd524e1b487297..d87205dd8b58895d353d5a8df4b1c95e53c29720 100644
--- a/core/modules/comment/src/Tests/CommentStatisticsTest.php
+++ b/core/modules/comment/src/Tests/CommentStatisticsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\comment\Tests\CommentStatisticsTest.
+ * Contains \Drupal\comment\Tests\CommentStatisticsTest.
  */
 
 namespace Drupal\comment\Tests;
diff --git a/core/modules/comment/src/Tests/CommentThreadingTest.php b/core/modules/comment/src/Tests/CommentThreadingTest.php
index 96ba7d6de249dd5ea21ec1047d6a203ddca46f1e..14db3cc28a74370183e62b886bd738e8c496f535 100644
--- a/core/modules/comment/src/Tests/CommentThreadingTest.php
+++ b/core/modules/comment/src/Tests/CommentThreadingTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\comment\Tests\CommentThreadingTest.
+ * Contains \Drupal\comment\Tests\CommentThreadingTest.
  */
 
 namespace Drupal\comment\Tests;
diff --git a/core/modules/comment/src/Tests/CommentTokenReplaceTest.php b/core/modules/comment/src/Tests/CommentTokenReplaceTest.php
index c3808e692b4bff4cb9f3394b3e537955881238fd..3c6b48a3db5c675b62ed35dcbd6f1f67b41978be 100644
--- a/core/modules/comment/src/Tests/CommentTokenReplaceTest.php
+++ b/core/modules/comment/src/Tests/CommentTokenReplaceTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\comment\Tests\CommentTokenReplaceTest.
+ * Contains \Drupal\comment\Tests\CommentTokenReplaceTest.
  */
 
 namespace Drupal\comment\Tests;
diff --git a/core/modules/comment/src/Tests/CommentTranslationUITest.php b/core/modules/comment/src/Tests/CommentTranslationUITest.php
index 3d070248f068bda006b556d4f2eeec44e6db0d0a..cfb63c86ea13bb5ed66bf5ba583f3ccf6b095c4c 100644
--- a/core/modules/comment/src/Tests/CommentTranslationUITest.php
+++ b/core/modules/comment/src/Tests/CommentTranslationUITest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\comment\Tests\CommentTranslationUITest.
+ * Contains \Drupal\comment\Tests\CommentTranslationUITest.
  */
 
 namespace Drupal\comment\Tests;
diff --git a/core/modules/comment/src/Tests/CommentUninstallTest.php b/core/modules/comment/src/Tests/CommentUninstallTest.php
index fa97f740d5b56f3dbc58d71b3b18aa0d7dd85f28..ad98d6887931f585ad607b3070f7a81e06ba4223 100644
--- a/core/modules/comment/src/Tests/CommentUninstallTest.php
+++ b/core/modules/comment/src/Tests/CommentUninstallTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\comment\Tests\CommentUninstallTest.
+ * Contains \Drupal\comment\Tests\CommentUninstallTest.
  */
 
 namespace Drupal\comment\Tests;
diff --git a/core/modules/comment/tests/src/Unit/CommentStatisticsUnitTest.php b/core/modules/comment/tests/src/Unit/CommentStatisticsUnitTest.php
index e2e21ece433651fbac739fb1cd74ddd851eaa859..c6f897a89214aa302545d761251ed3b304312d44 100644
--- a/core/modules/comment/tests/src/Unit/CommentStatisticsUnitTest.php
+++ b/core/modules/comment/tests/src/Unit/CommentStatisticsUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\comment\Unit\CommentStatisticsTest.
+ * Contains \Drupal\Tests\comment\Unit\CommentStatisticsUnitTest.
  */
 
 namespace Drupal\Tests\comment\Unit;
diff --git a/core/modules/comment/tests/src/Unit/Entity/CommentLockTest.php b/core/modules/comment/tests/src/Unit/Entity/CommentLockTest.php
index e02934dbe4cf5bb22514fcf6ff60016060ce21b3..446981208b9319ee252ad0e77aa2da316d78bcb8 100644
--- a/core/modules/comment/tests/src/Unit/Entity/CommentLockTest.php
+++ b/core/modules/comment/tests/src/Unit/Entity/CommentLockTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains \Drupal\Tests\comment\Unit\Entity\CommentTest
+ * Contains \Drupal\Tests\comment\Unit\Entity\CommentLockTest.
  */
 
 namespace Drupal\Tests\comment\Unit\Entity;
diff --git a/core/modules/config/src/Controller/ConfigController.php b/core/modules/config/src/Controller/ConfigController.php
index dc569100e92202c25cdb2309bca129de38e47fd2..b6ee57ae2c3f142097622d5bfcf07be7231908fc 100644
--- a/core/modules/config/src/Controller/ConfigController.php
+++ b/core/modules/config/src/Controller/ConfigController.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\config\Controller\ConfigController
+ * Contains \Drupal\config\Controller\ConfigController.
  */
 
 namespace Drupal\config\Controller;
diff --git a/core/modules/config/src/Tests/ConfigCRUDTest.php b/core/modules/config/src/Tests/ConfigCRUDTest.php
index 158e4a7fbc03a8b710906854c99640fc882f431a..70b8919750312eebf102bd8fc3e08148f9bcac12 100644
--- a/core/modules/config/src/Tests/ConfigCRUDTest.php
+++ b/core/modules/config/src/Tests/ConfigCRUDTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\config\Tests\ConfigCRUDTest.
+ * Contains \Drupal\config\Tests\ConfigCRUDTest.
  */
 
 namespace Drupal\config\Tests;
diff --git a/core/modules/config/src/Tests/ConfigEntityListTest.php b/core/modules/config/src/Tests/ConfigEntityListTest.php
index 73571ce00554e3a5f09e862cd1f245a317381c6f..ee58be5d2134b48cbb7e6964bff47d777cd27a7f 100644
--- a/core/modules/config/src/Tests/ConfigEntityListTest.php
+++ b/core/modules/config/src/Tests/ConfigEntityListTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\config\Tests\ConfigEntityListTest.
+ * Contains \Drupal\config\Tests\ConfigEntityListTest.
  */
 
 namespace Drupal\config\Tests;
diff --git a/core/modules/config/src/Tests/ConfigEntityNormalizeTest.php b/core/modules/config/src/Tests/ConfigEntityNormalizeTest.php
index 6cde087ceab1fdb9828c17830f747ebdde06cb09..7e0acef95465addcd15ac46b8d20f68f389c7077 100644
--- a/core/modules/config/src/Tests/ConfigEntityNormalizeTest.php
+++ b/core/modules/config/src/Tests/ConfigEntityNormalizeTest.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\config\Tests\ConfigEntityNormalizeTest.
+ */
+
 namespace Drupal\config\Tests;
 
 use Drupal\simpletest\KernelTestBase;
diff --git a/core/modules/config/src/Tests/ConfigEntityTest.php b/core/modules/config/src/Tests/ConfigEntityTest.php
index 2ad94aaa5e8cbc1d1cd7525c725ebdb1fb5fe86e..13ab72109111b6fdf567aed6e8b1cfbd81269944 100644
--- a/core/modules/config/src/Tests/ConfigEntityTest.php
+++ b/core/modules/config/src/Tests/ConfigEntityTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\config\Tests\ConfigEntityTest.
+ * Contains \Drupal\config\Tests\ConfigEntityTest.
  */
 
 namespace Drupal\config\Tests;
diff --git a/core/modules/config/src/Tests/ConfigEntityUnitTest.php b/core/modules/config/src/Tests/ConfigEntityUnitTest.php
index f96a57646b0a51bdd6f68df8a735c090c4f5171c..b7249a3dbca718aa788ac32df81ba730f37a3a7a 100644
--- a/core/modules/config/src/Tests/ConfigEntityUnitTest.php
+++ b/core/modules/config/src/Tests/ConfigEntityUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\config\Tests\ConfigEntityUnitTest.
+ * Contains \Drupal\config\Tests\ConfigEntityUnitTest.
  */
 
 namespace Drupal\config\Tests;
diff --git a/core/modules/config/src/Tests/ConfigFileContentTest.php b/core/modules/config/src/Tests/ConfigFileContentTest.php
index 3a62f8505f40384749e3be64450663134fb85c5b..1347db588a968a3ea8af1e8640ddd21b6ee8e917 100644
--- a/core/modules/config/src/Tests/ConfigFileContentTest.php
+++ b/core/modules/config/src/Tests/ConfigFileContentTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\config\Tests\ConfigFileContentTest.
+ * Contains \Drupal\config\Tests\ConfigFileContentTest.
  */
 
 namespace Drupal\config\Tests;
diff --git a/core/modules/config/src/Tests/ConfigImportUITest.php b/core/modules/config/src/Tests/ConfigImportUITest.php
index cc36e36cf468a65d63b936112aba7468009c7cae..dd00edf47abda05234c7abdd267c161d8d4cc24c 100644
--- a/core/modules/config/src/Tests/ConfigImportUITest.php
+++ b/core/modules/config/src/Tests/ConfigImportUITest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\config\Tests\ConfigImportUITest.
+ * Contains \Drupal\config\Tests\ConfigImportUITest.
  */
 
 namespace Drupal\config\Tests;
diff --git a/core/modules/config/src/Tests/ConfigImportUploadTest.php b/core/modules/config/src/Tests/ConfigImportUploadTest.php
index d848afd8ca2b857541c8a437979f5a5eca4c33d5..33f6171ed7a0e033f308d6ae67dfcd687a09ceda 100644
--- a/core/modules/config/src/Tests/ConfigImportUploadTest.php
+++ b/core/modules/config/src/Tests/ConfigImportUploadTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\config\Tests\ConfigImportUploadTest.
+ * Contains \Drupal\config\Tests\ConfigImportUploadTest.
  */
 
 namespace Drupal\config\Tests;
diff --git a/core/modules/config/src/Tests/ConfigModuleOverridesTest.php b/core/modules/config/src/Tests/ConfigModuleOverridesTest.php
index c95a13e46d38c449261a4991c43b8b357e0d0e71..169a7ba1591ff495f01dd1a97b345e2c20b80e50 100644
--- a/core/modules/config/src/Tests/ConfigModuleOverridesTest.php
+++ b/core/modules/config/src/Tests/ConfigModuleOverridesTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\config\Tests\ConfigModuleOverridesTest.
+ * Contains \Drupal\config\Tests\ConfigModuleOverridesTest.
  */
 
 namespace Drupal\config\Tests;
diff --git a/core/modules/config/src/Tests/ConfigOtherModuleTest.php b/core/modules/config/src/Tests/ConfigOtherModuleTest.php
index df5e51065d91d51cd2bd0eee5e48ea9155ccb1da..085ea312f7ccefa799998e22381ad341db7be28b 100644
--- a/core/modules/config/src/Tests/ConfigOtherModuleTest.php
+++ b/core/modules/config/src/Tests/ConfigOtherModuleTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\config\Tests\ConfigOtherModuleTest.
+ * Contains \Drupal\config\Tests\ConfigOtherModuleTest.
  */
 
 namespace Drupal\config\Tests;
diff --git a/core/modules/config/src/Tests/ConfigOverrideTest.php b/core/modules/config/src/Tests/ConfigOverrideTest.php
index c2061ca88a33b177b0bea1760c6f1a1b7a6c8bd2..065d6fa5a9f9ce81429068a230e462888429e50b 100644
--- a/core/modules/config/src/Tests/ConfigOverrideTest.php
+++ b/core/modules/config/src/Tests/ConfigOverrideTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\config\Tests\ConfigOverrideTest.
+ * Contains \Drupal\config\Tests\ConfigOverrideTest.
  */
 
 namespace Drupal\config\Tests;
diff --git a/core/modules/config/src/Tests/ConfigOverridesPriorityTest.php b/core/modules/config/src/Tests/ConfigOverridesPriorityTest.php
index e45702367d68ae5f9d1ac5630176ea907154024f..e42545d22eaed5fabee768002377a3471b1169d0 100644
--- a/core/modules/config/src/Tests/ConfigOverridesPriorityTest.php
+++ b/core/modules/config/src/Tests/ConfigOverridesPriorityTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\config\Tests\ConfigOverridesPriorityTest.
+ * Contains \Drupal\config\Tests\ConfigOverridesPriorityTest.
  */
 
 namespace Drupal\config\Tests;
diff --git a/core/modules/config/src/Tests/DefaultConfigTest.php b/core/modules/config/src/Tests/DefaultConfigTest.php
index 9e32a45056fee332daccabfdee3f7cae0590d2a6..330cfb25e27bc09b585149a108e3b285183dd93d 100644
--- a/core/modules/config/src/Tests/DefaultConfigTest.php
+++ b/core/modules/config/src/Tests/DefaultConfigTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\config\Tests\DefaultConfigTest.
+ * Contains \Drupal\config\Tests\DefaultConfigTest.
  */
 
 namespace Drupal\config\Tests;
diff --git a/core/modules/config/src/Tests/SchemaCheckTestTrait.php b/core/modules/config/src/Tests/SchemaCheckTestTrait.php
index df1a5f09e42d5dc1eeeb1239127f10fb8ebd839c..c7dffe6e209137a54160399506e25f18f1529586 100644
--- a/core/modules/config/src/Tests/SchemaCheckTestTrait.php
+++ b/core/modules/config/src/Tests/SchemaCheckTestTrait.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\config\Tests\SchemaCheckTestTrait.
+ * Contains \Drupal\config\Tests\SchemaCheckTestTrait.
  */
 
 namespace Drupal\config\Tests;
diff --git a/core/modules/config/src/Tests/Storage/CachedStorageTest.php b/core/modules/config/src/Tests/Storage/CachedStorageTest.php
index a88b344058a5e4964e9fa42f3db091e26864c6b2..2dd99ad1071041ea70a75d533a578968bbb9b14d 100644
--- a/core/modules/config/src/Tests/Storage/CachedStorageTest.php
+++ b/core/modules/config/src/Tests/Storage/CachedStorageTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\config\Tests\Storage\CachedStorageTest.
+ * Contains \Drupal\config\Tests\Storage\CachedStorageTest.
  */
 
 namespace Drupal\config\Tests\Storage;
diff --git a/core/modules/config/src/Tests/Storage/ConfigStorageTestBase.php b/core/modules/config/src/Tests/Storage/ConfigStorageTestBase.php
index cd39f6d820c48235a123e5da626c2971790ba496..412c7722028f006ef64edd5dc47fcbe8575a4aec 100644
--- a/core/modules/config/src/Tests/Storage/ConfigStorageTestBase.php
+++ b/core/modules/config/src/Tests/Storage/ConfigStorageTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\config\Tests\Storage\ConfigStorageTestBase.
+ * Contains \Drupal\config\Tests\Storage\ConfigStorageTestBase.
  */
 
 namespace Drupal\config\Tests\Storage;
diff --git a/core/modules/config/src/Tests/Storage/FileStorageTest.php b/core/modules/config/src/Tests/Storage/FileStorageTest.php
index dae726615feceface3f0476b0b0c93ba660079da..2407c67eba548a2af3171c3764d01e7729d45697 100644
--- a/core/modules/config/src/Tests/Storage/FileStorageTest.php
+++ b/core/modules/config/src/Tests/Storage/FileStorageTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\config\Tests\Storage\FileStorageTest.
+ * Contains \Drupal\config\Tests\Storage\FileStorageTest.
  */
 
 namespace Drupal\config\Tests\Storage;
diff --git a/core/modules/config/tests/config_test/src/ConfigTestForm.php b/core/modules/config/tests/config_test/src/ConfigTestForm.php
index 56195e234968043e30e7eadfc0aa4cb26c617c1c..0967206c3015e1363d29b07cf27c2ca94d00dce2 100644
--- a/core/modules/config/tests/config_test/src/ConfigTestForm.php
+++ b/core/modules/config/tests/config_test/src/ConfigTestForm.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\config_test\ConfigTestForm.
+ * Contains \Drupal\config_test\ConfigTestForm.
  */
 
 namespace Drupal\config_test;
diff --git a/core/modules/config/tests/config_test/src/ConfigTestInterface.php b/core/modules/config/tests/config_test/src/ConfigTestInterface.php
index 87e558be948ad28f159e6edd397d8055352d28ee..76cb2e315cd6a0dcb73734ad61e4a7cbb46aedde 100644
--- a/core/modules/config/tests/config_test/src/ConfigTestInterface.php
+++ b/core/modules/config/tests/config_test/src/ConfigTestInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\config_test\Entity\ConfigTestInterface.
+ * Contains \Drupal\config_test\ConfigTestInterface.
  */
 
 namespace Drupal\config_test;
diff --git a/core/modules/config/tests/config_test/src/Entity/ConfigTest.php b/core/modules/config/tests/config_test/src/Entity/ConfigTest.php
index 0cc207e48ea120139faf9b574a2c110000d981e3..7d98c9064d9539a8b4cbf8161f1ecd697348ecaf 100644
--- a/core/modules/config/tests/config_test/src/Entity/ConfigTest.php
+++ b/core/modules/config/tests/config_test/src/Entity/ConfigTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\config_test\Entity\ConfigTest.
+ * Contains \Drupal\config_test\Entity\ConfigTest.
  */
 
 namespace Drupal\config_test\Entity;
diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationFormTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationFormTest.php
index e747bd210fd1eff51bf1468db19d4d028f14e913..b162b867138f1c9856aa3310443ea2ecf2e44aa2 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationFormTest.php
+++ b/core/modules/config_translation/src/Tests/ConfigTranslationFormTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\config_translation\Tests\ConfigTranslationUiTest.
+ * Contains \Drupal\config_translation\Tests\ConfigTranslationFormTest.
  */
 
 namespace Drupal\config_translation\Tests;
diff --git a/core/modules/contact/src/ContactFormInterface.php b/core/modules/contact/src/ContactFormInterface.php
index abaea8780e80eb86eb0a44cbc3e1a348d242bfdb..0397bc4e9684fd7c32f151ebd5d125bfb3da07d3 100644
--- a/core/modules/contact/src/ContactFormInterface.php
+++ b/core/modules/contact/src/ContactFormInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\contact\Entity\ContactFormInterface.
+ * Contains \Drupal\contact\ContactFormInterface.
  */
 
 namespace Drupal\contact;
diff --git a/core/modules/contact/src/Entity/Message.php b/core/modules/contact/src/Entity/Message.php
index c7df0981d1674c0e2a2e4844a09827ec6aae1434..158e5762a6fe6de4cc9584ec3206567f26c73081 100644
--- a/core/modules/contact/src/Entity/Message.php
+++ b/core/modules/contact/src/Entity/Message.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\contact\Entity\Message.
+ * Contains \Drupal\contact\Entity\Message.
  */
 
 namespace Drupal\contact\Entity;
diff --git a/core/modules/contact/src/MessageViewBuilder.php b/core/modules/contact/src/MessageViewBuilder.php
index a086f7aa0f0b7989dbd0b014cafc4b1f60c5fe00..24f58f566bb8e4b4b507095556a76db729fca23e 100644
--- a/core/modules/contact/src/MessageViewBuilder.php
+++ b/core/modules/contact/src/MessageViewBuilder.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\contact\MessageViewBuilder.
+ * Contains \Drupal\contact\MessageViewBuilder.
  */
 
 namespace Drupal\contact;
diff --git a/core/modules/contact/src/Tests/ContactAuthenticatedUserTest.php b/core/modules/contact/src/Tests/ContactAuthenticatedUserTest.php
index d88ba5a474d2d5b2cc18e9c3b40e5994d37b1e0c..2adc4c29434874649a95b05397241a64ae301fe7 100644
--- a/core/modules/contact/src/Tests/ContactAuthenticatedUserTest.php
+++ b/core/modules/contact/src/Tests/ContactAuthenticatedUserTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\contact\ContactAuthenticatedUserTest.
+ * Contains \Drupal\contact\Tests\ContactAuthenticatedUserTest.
  */
 
 namespace Drupal\contact\Tests;
diff --git a/core/modules/contact/tests/src/Unit/MailHandlerTest.php b/core/modules/contact/tests/src/Unit/MailHandlerTest.php
index 97d22b9b6b300f6050fbbad85decc4d80739603d..61634f9d997918a530a4ed6665ad0ec5af94d76e 100644
--- a/core/modules/contact/tests/src/Unit/MailHandlerTest.php
+++ b/core/modules/contact/tests/src/Unit/MailHandlerTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\contact\Tests\Unit\MailHandlerTest.
+ * Contains \Drupal\Tests\contact\Unit\MailHandlerTest.
  */
 
 namespace Drupal\Tests\contact\Unit;
diff --git a/core/modules/content_translation/src/Access/ContentTranslationManageAccessCheck.php b/core/modules/content_translation/src/Access/ContentTranslationManageAccessCheck.php
index 9d2e66472f889e5f876304d6e5f8841b073ac712..54c61fcf6defb134e5c697e193d643a3daea2770 100644
--- a/core/modules/content_translation/src/Access/ContentTranslationManageAccessCheck.php
+++ b/core/modules/content_translation/src/Access/ContentTranslationManageAccessCheck.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\content_translation\Access\ContentTranslationManageAccessCheck.
+ * Contains \Drupal\content_translation\Access\ContentTranslationManageAccessCheck.
  */
 
 namespace Drupal\content_translation\Access;
diff --git a/core/modules/content_translation/src/ContentTranslationMetadataWrapper.php b/core/modules/content_translation/src/ContentTranslationMetadataWrapper.php
index 7dd958d2893a3f866fcd72a13ea88977941c9e6c..33e24db586819aa00fe56bb4021f47e5391e1952 100644
--- a/core/modules/content_translation/src/ContentTranslationMetadataWrapper.php
+++ b/core/modules/content_translation/src/ContentTranslationMetadataWrapper.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\content_translation\ContentTranslationMetadata.
+ * Contains \Drupal\content_translation\ContentTranslationMetadataWrapper.
  */
 
 namespace Drupal\content_translation;
diff --git a/core/modules/content_translation/src/ContentTranslationMetadataWrapperInterface.php b/core/modules/content_translation/src/ContentTranslationMetadataWrapperInterface.php
index 1089b99e98696808285802aa407ad5a06b793e70..78dd2027c92d8625df3a78c6a9a847329f4eeca8 100644
--- a/core/modules/content_translation/src/ContentTranslationMetadataWrapperInterface.php
+++ b/core/modules/content_translation/src/ContentTranslationMetadataWrapperInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\content_translation\ContentTranslationMetadataInterface.
+ * Contains \Drupal\content_translation\ContentTranslationMetadataWrapperInterface.
  */
 
 namespace Drupal\content_translation;
diff --git a/core/modules/content_translation/src/ContentTranslationUpdatesManager.php b/core/modules/content_translation/src/ContentTranslationUpdatesManager.php
index 8ebfa2700dcdfe684591f6d4f3d0382eaaef693e..a786a0ec46fb0a8e36dc5ca6462973cccc932d6a 100644
--- a/core/modules/content_translation/src/ContentTranslationUpdatesManager.php
+++ b/core/modules/content_translation/src/ContentTranslationUpdatesManager.php
@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @file
  * Contains \Drupal\content_translation\ContentTranslationUpdatesManager.
  */
 
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationSettingsApiTest.php b/core/modules/content_translation/src/Tests/ContentTranslationSettingsApiTest.php
index 36f0a392216d8469e44ef3fb9e563e057d2f6014..397288a26bb04bf01d26bde84ba25dad858921da 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationSettingsApiTest.php
+++ b/core/modules/content_translation/src/Tests/ContentTranslationSettingsApiTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\content_translation\Tests\ContentTranslationSettingsApiTest.
+ * Contains \Drupal\content_translation\Tests\ContentTranslationSettingsApiTest.
  */
 
 namespace Drupal\content_translation\Tests;
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php b/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php
index c979c5b7464ca64b3726f87f06a8971d3c9c23f5..4d51eb5c8dbc7315327215a80640ea868ebc3322 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php
+++ b/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\content_translation\Tests\ContentTranslationSettingsTest.
+ * Contains \Drupal\content_translation\Tests\ContentTranslationSettingsTest.
  */
 
 namespace Drupal\content_translation\Tests;
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationUISkipTest.php b/core/modules/content_translation/src/Tests/ContentTranslationUISkipTest.php
index d04be44fa80e56238fa93b738036dacf7b9b3ffa..901fdbbc9e641763e50c2b90b125fae1de2f252b 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationUISkipTest.php
+++ b/core/modules/content_translation/src/Tests/ContentTranslationUISkipTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\content_translation\Tests\ContentTranslationUISkipTest.
+ * Contains \Drupal\content_translation\Tests\ContentTranslationUISkipTest.
  */
 
 namespace Drupal\content_translation\Tests;
diff --git a/core/modules/content_translation/tests/modules/content_translation_test/src/Entity/EntityTestTranslatableNoUISkip.php b/core/modules/content_translation/tests/modules/content_translation_test/src/Entity/EntityTestTranslatableNoUISkip.php
index 0c093229e6e012e3739b08422fe951587b548e12..51eb8469c2a85e352b111bd2e9a27a7646ddb8f8 100644
--- a/core/modules/content_translation/tests/modules/content_translation_test/src/Entity/EntityTestTranslatableNoUISkip.php
+++ b/core/modules/content_translation/tests/modules/content_translation_test/src/Entity/EntityTestTranslatableNoUISkip.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\content_translation_test\Entity\EntityTestTranslatableNoUISkip.
+ * Contains \Drupal\content_translation_test\Entity\EntityTestTranslatableNoUISkip.
  */
 
 namespace Drupal\content_translation_test\Entity;
diff --git a/core/modules/content_translation/tests/modules/content_translation_test/src/Entity/EntityTestTranslatableUISkip.php b/core/modules/content_translation/tests/modules/content_translation_test/src/Entity/EntityTestTranslatableUISkip.php
index e8ba75183d4b5c33d80e9f2990be43a69e4c8e32..10eb3c33c2ce52f8a04846b7d3b435f6938f6fff 100644
--- a/core/modules/content_translation/tests/modules/content_translation_test/src/Entity/EntityTestTranslatableUISkip.php
+++ b/core/modules/content_translation/tests/modules/content_translation_test/src/Entity/EntityTestTranslatableUISkip.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\content_translation_test\Entity\EntityTestTranslatableUISkip.
+ * Contains \Drupal\content_translation_test\Entity\EntityTestTranslatableUISkip.
  */
 
 namespace Drupal\content_translation_test\Entity;
diff --git a/core/modules/content_translation/tests/src/Unit/Menu/ContentTranslationLocalTasksTest.php b/core/modules/content_translation/tests/src/Unit/Menu/ContentTranslationLocalTasksTest.php
index 91534464a4ee3cfbdc5a448e122ce11e8cc4ae77..f11f78385eca3df34cc05d77196e650e21169b55 100644
--- a/core/modules/content_translation/tests/src/Unit/Menu/ContentTranslationLocalTasksTest.php
+++ b/core/modules/content_translation/tests/src/Unit/Menu/ContentTranslationLocalTasksTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\block\Unit\Menu\BlockLocalTasksTest.
+ * Contains \Drupal\Tests\content_translation\Unit\Menu\ContentTranslationLocalTasksTest.
  */
 
 namespace Drupal\Tests\content_translation\Unit\Menu;
diff --git a/core/modules/contextual/src/Plugin/views/field/ContextualLinks.php b/core/modules/contextual/src/Plugin/views/field/ContextualLinks.php
index 68929d1e2f058345ebb1d735a4a4259f2d8cf455..12261b42004f37ca0a5a46a46a440945ee7f7f0a 100644
--- a/core/modules/contextual/src/Plugin/views/field/ContextualLinks.php
+++ b/core/modules/contextual/src/Plugin/views/field/ContextualLinks.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\contextual\Plugin\views\field\ContextualLinks.
+ * Contains \Drupal\contextual\Plugin\views\field\ContextualLinks.
  */
 
 namespace Drupal\contextual\Plugin\views\field;
diff --git a/core/modules/datetime/src/DateTimeComputed.php b/core/modules/datetime/src/DateTimeComputed.php
index 271cba94cc309b426028754abd47d6c8d67b99fa..184a490de06344d1344a2c9af7d9f79a1ee50d28 100644
--- a/core/modules/datetime/src/DateTimeComputed.php
+++ b/core/modules/datetime/src/DateTimeComputed.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\datetime\DateTimeComputed.
+ * Contains \Drupal\datetime\DateTimeComputed.
  */
 
 namespace Drupal\datetime;
diff --git a/core/modules/dblog/src/Plugin/rest/resource/DBLogResource.php b/core/modules/dblog/src/Plugin/rest/resource/DBLogResource.php
index 62510e2dd26e705bb26cca010f09653d34078605..56740ca53c86db0a2956d30930fd8ed56669e080 100644
--- a/core/modules/dblog/src/Plugin/rest/resource/DBLogResource.php
+++ b/core/modules/dblog/src/Plugin/rest/resource/DBLogResource.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\rest\Plugin\rest\resource\DBLogResource.
+ * Contains \Drupal\dblog\Plugin\rest\resource\DBLogResource.
  */
 
 namespace Drupal\dblog\Plugin\rest\resource;
diff --git a/core/modules/dblog/src/Tests/ConnectionFailureTest.php b/core/modules/dblog/src/Tests/ConnectionFailureTest.php
index 9d7cec9495d5d3e643305be626636c14426c30ec..3f0c3e8d663787a0c288f2523d77cbc80b3148fc 100644
--- a/core/modules/dblog/src/Tests/ConnectionFailureTest.php
+++ b/core/modules/dblog/src/Tests/ConnectionFailureTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of \Drupal\dblog\Tests\ConnectionFailureTest.
+ * Contains \Drupal\dblog\Tests\ConnectionFailureTest.
  */
 
 namespace Drupal\dblog\Tests;
diff --git a/core/modules/dblog/src/Tests/DbLogFormInjectionTest.php b/core/modules/dblog/src/Tests/DbLogFormInjectionTest.php
index e622fe27a68f5edfeabf12c9e695db081596d9c6..6957f517dc74f330ddfc984bb14868931be75418 100644
--- a/core/modules/dblog/src/Tests/DbLogFormInjectionTest.php
+++ b/core/modules/dblog/src/Tests/DbLogFormInjectionTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains \Drupal\dblog\Tests\DbLogFormInjectionTest
+ * Contains \Drupal\dblog\Tests\DbLogFormInjectionTest.
  */
 
 namespace Drupal\dblog\Tests;
diff --git a/core/modules/dblog/src/Tests/Rest/DbLogResourceTest.php b/core/modules/dblog/src/Tests/Rest/DbLogResourceTest.php
index 91097757369e353390511b1a5eec639b54792824..fa42ad8668a2ea1d61dc3573f80a09d3bbecc3aa 100644
--- a/core/modules/dblog/src/Tests/Rest/DbLogResourceTest.php
+++ b/core/modules/dblog/src/Tests/Rest/DbLogResourceTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\rest\test\DBLogTest.
+ * Contains \Drupal\dblog\Tests\Rest\DbLogResourceTest.
  */
 
 namespace Drupal\dblog\Tests\Rest;
diff --git a/core/modules/editor/src/Tests/EditorSecurityTest.php b/core/modules/editor/src/Tests/EditorSecurityTest.php
index 703c65bdbbd4b7a8adfc6e0ecbf5ecdccb22dd80..271014590121c095b1266095aded68b2cecd839d 100644
--- a/core/modules/editor/src/Tests/EditorSecurityTest.php
+++ b/core/modules/editor/src/Tests/EditorSecurityTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of \Drupal\editor\Tests\EditorSecurityTest.
+ * Contains \Drupal\editor\Tests\EditorSecurityTest.
  */
 
 namespace Drupal\editor\Tests;
diff --git a/core/modules/field/src/Tests/BulkDeleteTest.php b/core/modules/field/src/Tests/BulkDeleteTest.php
index 85fcdb827a606c8220ddf21818c2de3af3587672..d7e1aca32896c1c068d27c59b77a08ea6dbd7c84 100644
--- a/core/modules/field/src/Tests/BulkDeleteTest.php
+++ b/core/modules/field/src/Tests/BulkDeleteTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\field\Tests\BulkDeleteTest.
+ * Contains \Drupal\field\Tests\BulkDeleteTest.
  */
 
 namespace Drupal\field\Tests;
diff --git a/core/modules/field/src/Tests/DisplayApiTest.php b/core/modules/field/src/Tests/DisplayApiTest.php
index a8ff4c0ecdd749b8d042b21a3c2735a0d2f79eee..6fc81748fcdf9637dc928f8739b05e927157734d 100644
--- a/core/modules/field/src/Tests/DisplayApiTest.php
+++ b/core/modules/field/src/Tests/DisplayApiTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\field\Tests\DisplayApiTest.
+ * Contains \Drupal\field\Tests\DisplayApiTest.
  */
 
 namespace Drupal\field\Tests;
diff --git a/core/modules/field/src/Tests/FieldAccessTest.php b/core/modules/field/src/Tests/FieldAccessTest.php
index a633fac0bf6b660c646e7835290da84345e1f1bf..3617364dd72b0035c27d0eb33e7726a868e359b9 100644
--- a/core/modules/field/src/Tests/FieldAccessTest.php
+++ b/core/modules/field/src/Tests/FieldAccessTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\field\Tests\FieldAccessTest.
+ * Contains \Drupal\field\Tests\FieldAccessTest.
  */
 
 namespace Drupal\field\Tests;
diff --git a/core/modules/field/src/Tests/FieldAttachOtherTest.php b/core/modules/field/src/Tests/FieldAttachOtherTest.php
index e13c39e3aa5959f6efcd7fe7ba158cd1d5a79e14..9441f679c146768095d9125e2220f52b8e7e3b44 100644
--- a/core/modules/field/src/Tests/FieldAttachOtherTest.php
+++ b/core/modules/field/src/Tests/FieldAttachOtherTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\field\Tests\FieldAttachOtherTest.
+ * Contains \Drupal\field\Tests\FieldAttachOtherTest.
  */
 
 namespace Drupal\field\Tests;
diff --git a/core/modules/field/src/Tests/FieldHelpTest.php b/core/modules/field/src/Tests/FieldHelpTest.php
index 3f646f0bbd0688e929c863b06042c50843744154..0fe0906890c88fd22ebbcbde1f8f57edcaa171e4 100644
--- a/core/modules/field/src/Tests/FieldHelpTest.php
+++ b/core/modules/field/src/Tests/FieldHelpTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\field\Tests\FieldHelpTest.
+ * Contains \Drupal\field\Tests\FieldHelpTest.
  */
 
 namespace Drupal\field\Tests;
diff --git a/core/modules/field/src/Tests/FieldTestBase.php b/core/modules/field/src/Tests/FieldTestBase.php
index d71f1529bf6df23e3fdaa4355921c880fd47cac7..db91a88f86ba5a112ba6773a01e707045cd8cca8 100644
--- a/core/modules/field/src/Tests/FieldTestBase.php
+++ b/core/modules/field/src/Tests/FieldTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\field\Tests\FieldTestBase.
+ * Contains \Drupal\field\Tests\FieldTestBase.
  */
 
 namespace Drupal\field\Tests;
diff --git a/core/modules/field/src/Tests/FormTest.php b/core/modules/field/src/Tests/FormTest.php
index afa2987b2fe0093c7bb1e2909feb5f3feb805a5c..1e256803b7e9888cbcb76b3ef2c60b2511ea2fb8 100644
--- a/core/modules/field/src/Tests/FormTest.php
+++ b/core/modules/field/src/Tests/FormTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\field\Tests\FormTest.
+ * Contains \Drupal\field\Tests\FormTest.
  */
 
 namespace Drupal\field\Tests;
diff --git a/core/modules/field/src/Tests/String/StringFieldTest.php b/core/modules/field/src/Tests/String/StringFieldTest.php
index 4eedca854b5c665da6e3fc449c3dd9de020834c6..40cf424302d8fcdd471d772843ebfecf7bc9163b 100644
--- a/core/modules/field/src/Tests/String/StringFieldTest.php
+++ b/core/modules/field/src/Tests/String/StringFieldTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of \Drupal\field\Tests\String\StringFieldTest.
+ * Contains \Drupal\field\Tests\String\StringFieldTest.
  */
 
 namespace Drupal\field\Tests\String;
diff --git a/core/modules/field/src/Tests/TranslationTest.php b/core/modules/field/src/Tests/TranslationTest.php
index 2b9e30c91259874fe18bd8a2e42e81060011407a..8dd07eef4b4c91fa74891ef4765f91f26ae343fa 100644
--- a/core/modules/field/src/Tests/TranslationTest.php
+++ b/core/modules/field/src/Tests/TranslationTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\field\Tests\TranslationTest.
+ * Contains \Drupal\field\Tests\TranslationTest.
  */
 
 namespace Drupal\field\Tests;
diff --git a/core/modules/field/src/Tests/TranslationWebTest.php b/core/modules/field/src/Tests/TranslationWebTest.php
index 6fd241abd0a1bbaceffb110cd737c8857ed2c7e8..326692d46f92bf52d1f6bf84dcb6248e4ea84918 100644
--- a/core/modules/field/src/Tests/TranslationWebTest.php
+++ b/core/modules/field/src/Tests/TranslationWebTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\field\Tests\TranslationWebTest.
+ * Contains \Drupal\field\Tests\TranslationWebTest.
  */
 
 namespace Drupal\field\Tests;
diff --git a/core/modules/field/src/Tests/reEnableModuleFieldTest.php b/core/modules/field/src/Tests/reEnableModuleFieldTest.php
index 42fcc2b8e7611130b119977241e25014c391e02e..3a72c678a0e1ab0754231e091cff8e5a38cf03c2 100644
--- a/core/modules/field/src/Tests/reEnableModuleFieldTest.php
+++ b/core/modules/field/src/Tests/reEnableModuleFieldTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\field\reEnableModuleFieldTest.
+ * Contains \Drupal\field\Tests\reEnableModuleFieldTest.
  */
 
 namespace Drupal\field\Tests;
diff --git a/core/modules/field/tests/modules/field_plugins_test/src/Plugin/Field/FieldFormatter/TestTextTrimmedFormatter.php b/core/modules/field/tests/modules/field_plugins_test/src/Plugin/Field/FieldFormatter/TestTextTrimmedFormatter.php
index b8550f00b1d7aa8cb0e52cad52c3fbdae5603e11..7e072daa2de207bbe305f8c9f96821ff35846a73 100644
--- a/core/modules/field/tests/modules/field_plugins_test/src/Plugin/Field/FieldFormatter/TestTextTrimmedFormatter.php
+++ b/core/modules/field/tests/modules/field_plugins_test/src/Plugin/Field/FieldFormatter/TestTextTrimmedFormatter.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\field_plugins_test\Plugin\Field\FieldFormatter\TextTrimmedFormatter.
+ * Contains \Drupal\field_plugins_test\Plugin\Field\FieldFormatter\TestTextTrimmedFormatter.
  */
 
 namespace Drupal\field_plugins_test\Plugin\Field\FieldFormatter;
diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldDefaultFormatter.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldDefaultFormatter.php
index 824e18cd79752d80cf337b2ae19bed44e88b4e89..1bf2260eba08333bad29c902acf378cf24d72a00 100644
--- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldDefaultFormatter.php
+++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldDefaultFormatter.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\field_test\Plugin\field\formatter\TestFieldDefaultFormatter.
+ * Contains \Drupal\field_test\Plugin\Field\FieldFormatter\TestFieldDefaultFormatter.
  */
 
 namespace Drupal\field_test\Plugin\Field\FieldFormatter;
diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptyFormatter.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptyFormatter.php
index 4b9bb4b738827b0d82d816455c52bf28c0c39dc5..bee7d50b2d271152b3e3973870e7c90d48d3863d 100644
--- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptyFormatter.php
+++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptyFormatter.php
@@ -2,8 +2,7 @@
 
 /**
  * @file
- *
- * Contains \Drupal\field_test\Plugin\field\formatter\TestFieldEmptyFormatter.
+ * Contains \Drupal\field_test\Plugin\Field\FieldFormatter\TestFieldEmptyFormatter.
  */
 namespace Drupal\field_test\Plugin\Field\FieldFormatter;
 
diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptySettingFormatter.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptySettingFormatter.php
index 84938ece0285679f0c30956f14f47e72bdb1e4a0..1f076f7074d67dd4c9b61ac3b9af49f65b561ddc 100644
--- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptySettingFormatter.php
+++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptySettingFormatter.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\field_test\Plugin\field\formatter\TestFieldEmptySettingFormatter
+ * Contains \Drupal\field_test\Plugin\Field\FieldFormatter\TestFieldEmptySettingFormatter.
  */
 
 namespace Drupal\field_test\Plugin\Field\FieldFormatter;
diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldMultipleFormatter.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldMultipleFormatter.php
index f33b258b9ac6aed3cd741f570c09e2633f73b1b5..20f77968c46c7fafcabbf5f1b42c3293e873adae 100644
--- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldMultipleFormatter.php
+++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldMultipleFormatter.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\field_test\Plugin\field\formatter\TestFieldMultipleFormatter.
+ * Contains \Drupal\field_test\Plugin\Field\FieldFormatter\TestFieldMultipleFormatter.
  */
 
 namespace Drupal\field_test\Plugin\Field\FieldFormatter;
diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldPrepareViewFormatter.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldPrepareViewFormatter.php
index 211c1cdf1b7ab7def3b665a9f8b99ce3f564400d..aaf2bf28900f0249be137b2842eb3d30fba75612 100644
--- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldPrepareViewFormatter.php
+++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldPrepareViewFormatter.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\field_test\Plugin\field\formatter\TestFieldPrepareViewFormatter.
+ * Contains \Drupal\field_test\Plugin\Field\FieldFormatter\TestFieldPrepareViewFormatter.
  */
 
 namespace Drupal\field_test\Plugin\Field\FieldFormatter;
diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidget.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidget.php
index 670184adeab3f8fc34645ebcbad7765098522a13..b90008a8edc42313081eb85819a10190d1682ba8 100644
--- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidget.php
+++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidget.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\field_test\Plugin\Field\FieldWidget\TestFieldWidget.
+ * Contains \Drupal\field_test\Plugin\Field\FieldWidget\TestFieldWidget.
  */
 
 namespace Drupal\field_test\Plugin\Field\FieldWidget;
diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidgetMultiple.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidgetMultiple.php
index b8a0dd2e21e263af3f1c3522a0b6c93ef75c5148..ed4378215602a39750cc89240683145ac771d433 100644
--- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidgetMultiple.php
+++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidgetMultiple.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\field_test\Plugin\Field\FieldWidget\TestFieldWidgetMultiple.
+ * Contains \Drupal\field_test\Plugin\Field\FieldWidget\TestFieldWidgetMultiple.
  */
 
 namespace Drupal\field_test\Plugin\Field\FieldWidget;
diff --git a/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalAction.php b/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalAction.php
index 4ce3597385b3874783840b61398087e8be8759c8..71df411e60d7fae08aad21de92ff2dab0552f881 100644
--- a/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalAction.php
+++ b/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalAction.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @fie
+ * @file
  * Contains \Drupal\field_ui\Plugin\Derivative\FieldUiLocalAction.
  */
 
diff --git a/core/modules/file/src/Controller/FileWidgetAjaxController.php b/core/modules/file/src/Controller/FileWidgetAjaxController.php
index ff0c5370212c2b1751a95372535855528cb674dc..1c1b7e3a7857589044e38476eb9cd7baa1fc3c6d 100644
--- a/core/modules/file/src/Controller/FileWidgetAjaxController.php
+++ b/core/modules/file/src/Controller/FileWidgetAjaxController.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\file\FileWidgetAjaxController.
+ * Contains \Drupal\file\Controller\FileWidgetAjaxController.
  */
 
 namespace Drupal\file\Controller;
diff --git a/core/modules/file/src/Entity/File.php b/core/modules/file/src/Entity/File.php
index 511c5d594036692a03f3bb488c5a5689acfd2a95..1a38c16132a136563dc18b8852874038fa281a90 100644
--- a/core/modules/file/src/Entity/File.php
+++ b/core/modules/file/src/Entity/File.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\Entity\File.
+ * Contains \Drupal\file\Entity\File.
  */
 
 namespace Drupal\file\Entity;
diff --git a/core/modules/file/src/FileInterface.php b/core/modules/file/src/FileInterface.php
index 1bc76dcdef76c3e16c069cf3dcc643fbb80e7565..8dd131b021ab72ca313dd285f6550fa8bd6039f4 100644
--- a/core/modules/file/src/FileInterface.php
+++ b/core/modules/file/src/FileInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\file\Entity\FileInterface.
+ * Contains \Drupal\file\FileInterface.
  */
 
 namespace Drupal\file;
diff --git a/core/modules/file/src/FileStorage.php b/core/modules/file/src/FileStorage.php
index 872435f5031b66f942452868bfa6d7d2a85a4042..700b8810188fa894f1ee0cea4a5371c917faeed9 100644
--- a/core/modules/file/src/FileStorage.php
+++ b/core/modules/file/src/FileStorage.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\FileStorage.
+ * Contains \Drupal\file\FileStorage.
  */
 
 namespace Drupal\file;
diff --git a/core/modules/file/src/FileUsage/DatabaseFileUsageBackend.php b/core/modules/file/src/FileUsage/DatabaseFileUsageBackend.php
index ecd62ef487a6f83208d8c1c078c806b2056d04a8..e28c94b613a89814e8a650cfdddefc32e4e5c07e 100644
--- a/core/modules/file/src/FileUsage/DatabaseFileUsageBackend.php
+++ b/core/modules/file/src/FileUsage/DatabaseFileUsageBackend.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\FileUsage\DatabaseFileUsageBackend.
+ * Contains \Drupal\file\FileUsage\DatabaseFileUsageBackend.
  */
 
 namespace Drupal\file\FileUsage;
diff --git a/core/modules/file/src/FileUsage/FileUsageBase.php b/core/modules/file/src/FileUsage/FileUsageBase.php
index c3dea70696d99137f92a1294380e00322d5dd8a0..41d49ed69075ae27f4d0075869bfc7d49b1aff57 100644
--- a/core/modules/file/src/FileUsage/FileUsageBase.php
+++ b/core/modules/file/src/FileUsage/FileUsageBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\FileUsage\FileUsageBase.
+ * Contains \Drupal\file\FileUsage\FileUsageBase.
  */
 
 namespace Drupal\file\FileUsage;
diff --git a/core/modules/file/src/FileUsage/FileUsageInterface.php b/core/modules/file/src/FileUsage/FileUsageInterface.php
index 63600b5e1803ee33f21a90121039203174f14b61..4fc7c887540395264d21a3fd0496d4644c3f479f 100644
--- a/core/modules/file/src/FileUsage/FileUsageInterface.php
+++ b/core/modules/file/src/FileUsage/FileUsageInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\FileUsage\FileUsageInterface.
+ * Contains \Drupal\file\FileUsage\FileUsageInterface.
  */
 
 namespace Drupal\file\FileUsage;
diff --git a/core/modules/file/src/Plugin/views/argument/Fid.php b/core/modules/file/src/Plugin/views/argument/Fid.php
index b21e96eff9218fd32a54bd14bf15fd101727b21e..d935386cbce5f8615c821bf6bf46e0af3eec9398 100644
--- a/core/modules/file/src/Plugin/views/argument/Fid.php
+++ b/core/modules/file/src/Plugin/views/argument/Fid.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\Plugin\views\argument\Fid.
+ * Contains \Drupal\file\Plugin\views\argument\Fid.
  */
 
 namespace Drupal\file\Plugin\views\argument;
diff --git a/core/modules/file/src/Plugin/views/field/File.php b/core/modules/file/src/Plugin/views/field/File.php
index ede2512c8756c3c108ddf38e25aeaa6fbacafd61..77237e82aa9174e817ef4ebde9e62c9e30ab072f 100644
--- a/core/modules/file/src/Plugin/views/field/File.php
+++ b/core/modules/file/src/Plugin/views/field/File.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\Plugin\views\field\File.
+ * Contains \Drupal\file\Plugin\views\field\File.
  */
 
 namespace Drupal\file\Plugin\views\field;
diff --git a/core/modules/file/src/Plugin/views/filter/Status.php b/core/modules/file/src/Plugin/views/filter/Status.php
index d28cf94086d351891b51542e2ebc3fcd4758f590..5d73454dd66f12a6003c5c69bffb03646df9a88b 100644
--- a/core/modules/file/src/Plugin/views/filter/Status.php
+++ b/core/modules/file/src/Plugin/views/filter/Status.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\Plugin\views\filter\Status.
+ * Contains \Drupal\file\Plugin\views\filter\Status.
  */
 
 namespace Drupal\file\Plugin\views\filter;
diff --git a/core/modules/file/src/Plugin/views/wizard/File.php b/core/modules/file/src/Plugin/views/wizard/File.php
index 5b64f8445319f250b7a516a9261f7e62ce56c00e..31641d0a85c4b98ed190e5062ab5e515d35b48bb 100644
--- a/core/modules/file/src/Plugin/views/wizard/File.php
+++ b/core/modules/file/src/Plugin/views/wizard/File.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\Plugin\views\wizard\File.
+ * Contains \Drupal\file\Plugin\views\wizard\File.
  */
 
 namespace Drupal\file\Plugin\views\wizard;
diff --git a/core/modules/file/src/Tests/CopyTest.php b/core/modules/file/src/Tests/CopyTest.php
index 3a3a727716dfe585b71b4b1e3ab3ff90fae31860..4b944490120c8f365fba0282492e91df1e87af2f 100644
--- a/core/modules/file/src/Tests/CopyTest.php
+++ b/core/modules/file/src/Tests/CopyTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\Tests\CopyTest.
+ * Contains \Drupal\file\Tests\CopyTest.
  */
 
 namespace Drupal\file\Tests;
diff --git a/core/modules/file/src/Tests/DeleteTest.php b/core/modules/file/src/Tests/DeleteTest.php
index 5f0acc891be87ddcada977d05ad61cca4dc2acc1..f89dfbff8b24ec1cb0901b2ea571d6bf95f9e743 100644
--- a/core/modules/file/src/Tests/DeleteTest.php
+++ b/core/modules/file/src/Tests/DeleteTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\Tests\DeleteTest.
+ * Contains \Drupal\file\Tests\DeleteTest.
  */
 
 namespace Drupal\file\Tests;
diff --git a/core/modules/file/src/Tests/DownloadTest.php b/core/modules/file/src/Tests/DownloadTest.php
index 3dc83421aa9ebebd6d2bcc6de79eeb35fc81e9dd..25aab9b68dcd9b2932980978712a6b3540ae7f08 100644
--- a/core/modules/file/src/Tests/DownloadTest.php
+++ b/core/modules/file/src/Tests/DownloadTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\Tests\DownloadTest.
+ * Contains \Drupal\file\Tests\DownloadTest.
  */
 
 namespace Drupal\file\Tests;
diff --git a/core/modules/file/src/Tests/FileFieldDisplayTest.php b/core/modules/file/src/Tests/FileFieldDisplayTest.php
index 12193e3a5a16a3cf4f0fe7d19c30c38d42699401..f4db76525f0dbefe0c581bdb580704ec7f153ed3 100644
--- a/core/modules/file/src/Tests/FileFieldDisplayTest.php
+++ b/core/modules/file/src/Tests/FileFieldDisplayTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\Tests\FileFieldDisplayTest.
+ * Contains \Drupal\file\Tests\FileFieldDisplayTest.
  */
 
 namespace Drupal\file\Tests;
diff --git a/core/modules/file/src/Tests/FileFieldPathTest.php b/core/modules/file/src/Tests/FileFieldPathTest.php
index 4b3c3de88c8a79ac04d7695ee18fe9b31bb6a656..d7e034607eebe27d10017393571d71f27a3fcded 100644
--- a/core/modules/file/src/Tests/FileFieldPathTest.php
+++ b/core/modules/file/src/Tests/FileFieldPathTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\Tests\FileFieldPathTest.
+ * Contains \Drupal\file\Tests\FileFieldPathTest.
  */
 
 namespace Drupal\file\Tests;
diff --git a/core/modules/file/src/Tests/FileFieldRSSContentTest.php b/core/modules/file/src/Tests/FileFieldRSSContentTest.php
index 56400a8c85ed4e1e8efdeb3fac448baa37f0f516..7455301c6bf278e46b975ef5d125112af2e7b620 100644
--- a/core/modules/file/src/Tests/FileFieldRSSContentTest.php
+++ b/core/modules/file/src/Tests/FileFieldRSSContentTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\Tests\FileFieldDisplayTest.
+ * Contains \Drupal\file\Tests\FileFieldRSSContentTest.
  */
 
 namespace Drupal\file\Tests;
diff --git a/core/modules/file/src/Tests/FileFieldRevisionTest.php b/core/modules/file/src/Tests/FileFieldRevisionTest.php
index 3c26f59bf0dc81e81f3cfd5d0e95229542d6fd49..bb3cf8a509cd8b83b8b9a75d029f3a9d48b3cb3e 100644
--- a/core/modules/file/src/Tests/FileFieldRevisionTest.php
+++ b/core/modules/file/src/Tests/FileFieldRevisionTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\Tests\FileFieldRevisionTest.
+ * Contains \Drupal\file\Tests\FileFieldRevisionTest.
  */
 
 namespace Drupal\file\Tests;
diff --git a/core/modules/file/src/Tests/FileFieldTestBase.php b/core/modules/file/src/Tests/FileFieldTestBase.php
index d0d4cfa404a1c783c35a16b70c1365216bd5231e..4f8d9c8d8006ffe94e812ff11fc00241482fee2d 100644
--- a/core/modules/file/src/Tests/FileFieldTestBase.php
+++ b/core/modules/file/src/Tests/FileFieldTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\Tests\FileFieldTestBase.
+ * Contains \Drupal\file\Tests\FileFieldTestBase.
  */
 
 namespace Drupal\file\Tests;
diff --git a/core/modules/file/src/Tests/FileFieldValidateTest.php b/core/modules/file/src/Tests/FileFieldValidateTest.php
index 3e35a006d98989542d7663873e6e55dbe9e233b4..d98f6cd6c6d473958f29202c78a7f0e1f58f4002 100644
--- a/core/modules/file/src/Tests/FileFieldValidateTest.php
+++ b/core/modules/file/src/Tests/FileFieldValidateTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\Tests\FileFieldValidateTest.
+ * Contains \Drupal\file\Tests\FileFieldValidateTest.
  */
 
 namespace Drupal\file\Tests;
diff --git a/core/modules/file/src/Tests/FileFieldWidgetTest.php b/core/modules/file/src/Tests/FileFieldWidgetTest.php
index 10f2cadf179b4650665a08fe7187aa4a12001e93..c03e118ccb03725f660c8610d9a95158afa80a14 100644
--- a/core/modules/file/src/Tests/FileFieldWidgetTest.php
+++ b/core/modules/file/src/Tests/FileFieldWidgetTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\Tests\FileFieldWidgetTest.
+ * Contains \Drupal\file\Tests\FileFieldWidgetTest.
  */
 
 namespace Drupal\file\Tests;
diff --git a/core/modules/file/src/Tests/FileManagedFileElementTest.php b/core/modules/file/src/Tests/FileManagedFileElementTest.php
index 8368610503c39f14622684b639d6e78a2eb09a4e..c91c4947acf893d26c574c8727bbccee436f8f7e 100644
--- a/core/modules/file/src/Tests/FileManagedFileElementTest.php
+++ b/core/modules/file/src/Tests/FileManagedFileElementTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\Tests\FileManagedFileElementTest.
+ * Contains \Drupal\file\Tests\FileManagedFileElementTest.
  */
 
 namespace Drupal\file\Tests;
diff --git a/core/modules/file/src/Tests/FileManagedTestBase.php b/core/modules/file/src/Tests/FileManagedTestBase.php
index e26ccd32a9d0e22a4b4e82ddd2ad6ef0c4959387..07964f7ca27e6a854b689ad0bf55a8df81bd56e5 100644
--- a/core/modules/file/src/Tests/FileManagedTestBase.php
+++ b/core/modules/file/src/Tests/FileManagedTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\Tests\FileManagedTestBase.
+ * Contains \Drupal\file\Tests\FileManagedTestBase.
  */
 
 namespace Drupal\file\Tests;
diff --git a/core/modules/file/src/Tests/FileManagedUnitTestBase.php b/core/modules/file/src/Tests/FileManagedUnitTestBase.php
index b02e3160a9f93c7e06729acb244f9b335a84f9b8..c9f0c6ba1f8f6832e90cad1da7b20739db5c2d42 100644
--- a/core/modules/file/src/Tests/FileManagedUnitTestBase.php
+++ b/core/modules/file/src/Tests/FileManagedUnitTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\file\Tests\FileManagedUnitTestBase.
+ * Contains \Drupal\file\Tests\FileManagedUnitTestBase.
  */
 
 namespace Drupal\file\Tests;
diff --git a/core/modules/file/src/Tests/FilePrivateTest.php b/core/modules/file/src/Tests/FilePrivateTest.php
index 4a3a17d4eb72779841bfbd31c6154685fd1815df..a11c81a772cd0bde2bd7062e3aa2b1e159374aa3 100644
--- a/core/modules/file/src/Tests/FilePrivateTest.php
+++ b/core/modules/file/src/Tests/FilePrivateTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\Tests\FilePrivateTest.
+ * Contains \Drupal\file\Tests\FilePrivateTest.
  */
 
 namespace Drupal\file\Tests;
diff --git a/core/modules/file/src/Tests/FileTokenReplaceTest.php b/core/modules/file/src/Tests/FileTokenReplaceTest.php
index eaf2308d09aff08f0da42d70d291326689b988ee..1f0d733f6ef858805adc4d539c69553cc403da5c 100644
--- a/core/modules/file/src/Tests/FileTokenReplaceTest.php
+++ b/core/modules/file/src/Tests/FileTokenReplaceTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\Tests\FileTokenReplaceTest.
+ * Contains \Drupal\file\Tests\FileTokenReplaceTest.
  */
 
 namespace Drupal\file\Tests;
diff --git a/core/modules/file/src/Tests/LoadTest.php b/core/modules/file/src/Tests/LoadTest.php
index a712b9ab78682e9b508aa8d9a97abda12244e55f..a9cf13187944ddb48072bac562335fac7d385ef8 100644
--- a/core/modules/file/src/Tests/LoadTest.php
+++ b/core/modules/file/src/Tests/LoadTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\Tests\LoadTest.
+ * Contains \Drupal\file\Tests\LoadTest.
  */
 
 namespace Drupal\file\Tests;
diff --git a/core/modules/file/src/Tests/MoveTest.php b/core/modules/file/src/Tests/MoveTest.php
index 9b1bfc264c6f3cefc2c9727d0b53d21c30ed4320..f3380db06bb02492a522ec46170fb06bd9e40166 100644
--- a/core/modules/file/src/Tests/MoveTest.php
+++ b/core/modules/file/src/Tests/MoveTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\Tests\MoveTest.
+ * Contains \Drupal\file\Tests\MoveTest.
  */
 
 namespace Drupal\file\Tests;
diff --git a/core/modules/file/src/Tests/PrivateFileOnTranslatedEntityTest.php b/core/modules/file/src/Tests/PrivateFileOnTranslatedEntityTest.php
index 4841d0257613f88da3036cf189685d5a6e8022d7..03065d61e1c61bda71373194499835166e01773c 100644
--- a/core/modules/file/src/Tests/PrivateFileOnTranslatedEntityTest.php
+++ b/core/modules/file/src/Tests/PrivateFileOnTranslatedEntityTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\file\Tests\PrivateFileOnTranslatedEntityTest.
+ * Contains \Drupal\file\Tests\PrivateFileOnTranslatedEntityTest.
  */
 
 namespace Drupal\file\Tests;
diff --git a/core/modules/file/src/Tests/RemoteFileSaveUploadTest.php b/core/modules/file/src/Tests/RemoteFileSaveUploadTest.php
index 59313bc1bca52c543f732d7ac3c12d8b0db39500..4260a4733dda88091a600757ac349421fba4c71b 100644
--- a/core/modules/file/src/Tests/RemoteFileSaveUploadTest.php
+++ b/core/modules/file/src/Tests/RemoteFileSaveUploadTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\Tests\RemoteFileSaveUploadTest.
+ * Contains \Drupal\file\Tests\RemoteFileSaveUploadTest.
  */
 
 namespace Drupal\file\Tests;
diff --git a/core/modules/file/src/Tests/SaveDataTest.php b/core/modules/file/src/Tests/SaveDataTest.php
index 8368e0b33ce1497896d1a2e4591eee3f3ae73f04..24d8fb5a1233973eeeeb73384bad06c78077493f 100644
--- a/core/modules/file/src/Tests/SaveDataTest.php
+++ b/core/modules/file/src/Tests/SaveDataTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\Tests\SaveDataTest.
+ * Contains \Drupal\file\Tests\SaveDataTest.
  */
 
 namespace Drupal\file\Tests;
diff --git a/core/modules/file/src/Tests/SaveTest.php b/core/modules/file/src/Tests/SaveTest.php
index 7b4bb180c31b4985c56c012ef7d646639ac57ac4..254917747c66078d91e426dbd06134cabb2f39e5 100644
--- a/core/modules/file/src/Tests/SaveTest.php
+++ b/core/modules/file/src/Tests/SaveTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\Tests\SaveTest.
+ * Contains \Drupal\file\Tests\SaveTest.
  */
 
 namespace Drupal\file\Tests;
diff --git a/core/modules/file/src/Tests/SaveUploadTest.php b/core/modules/file/src/Tests/SaveUploadTest.php
index 5b0dbc1713fa826d1d2f576d1917dd8377eb6eb7..155a67afadb10b894a9a38d0c20deb61a43b246f 100644
--- a/core/modules/file/src/Tests/SaveUploadTest.php
+++ b/core/modules/file/src/Tests/SaveUploadTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\Tests\SaveUploadTest.
+ * Contains \Drupal\file\Tests\SaveUploadTest.
  */
 
 namespace Drupal\file\Tests;
diff --git a/core/modules/file/src/Tests/SpaceUsedTest.php b/core/modules/file/src/Tests/SpaceUsedTest.php
index b9ad13f3d08ef71d71c54924c0ffa31e6bd74601..56ed974053daa48921060d0f1f9e7ba5b2cd4493 100644
--- a/core/modules/file/src/Tests/SpaceUsedTest.php
+++ b/core/modules/file/src/Tests/SpaceUsedTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\Tests\SpaceUsedTest.
+ * Contains \Drupal\file\Tests\SpaceUsedTest.
  */
 
 namespace Drupal\file\Tests;
diff --git a/core/modules/file/src/Tests/UsageTest.php b/core/modules/file/src/Tests/UsageTest.php
index da96c471dcf76872426a49b9d532f5c321731f11..0ed00373fdff8812d5cadaaae7fbc2eb695f28b6 100644
--- a/core/modules/file/src/Tests/UsageTest.php
+++ b/core/modules/file/src/Tests/UsageTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\Tests\UsageTest.
+ * Contains \Drupal\file\Tests\UsageTest.
  */
 
 namespace Drupal\file\Tests;
diff --git a/core/modules/file/src/Tests/ValidateTest.php b/core/modules/file/src/Tests/ValidateTest.php
index 943a830ad06e2a3a9396a3fb610b55f4fc7dd8a8..25076b0e77bccc691f2b77c25c3498495df91ef8 100644
--- a/core/modules/file/src/Tests/ValidateTest.php
+++ b/core/modules/file/src/Tests/ValidateTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\Tests\ValidateTest.
+ * Contains \Drupal\file\Tests\ValidateTest.
  */
 
 namespace Drupal\file\Tests;
diff --git a/core/modules/file/src/Tests/ValidatorTest.php b/core/modules/file/src/Tests/ValidatorTest.php
index a17fa8fd5777debc108c07cf3511863f9941e9d7..8ad59396f81c2952a6b2cc84ca130b915ab90677 100644
--- a/core/modules/file/src/Tests/ValidatorTest.php
+++ b/core/modules/file/src/Tests/ValidatorTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\file\Tests\ValidatorTest.
+ * Contains \Drupal\file\Tests\ValidatorTest.
  */
 
 namespace Drupal\file\Tests;
diff --git a/core/modules/filter/src/Plugin/FilterBase.php b/core/modules/filter/src/Plugin/FilterBase.php
index 59a0bb4a2e1350e6688218dd92d3cb56b8c83bc4..47216ddef6124fa2b245b98ad473e613154da9ea 100644
--- a/core/modules/filter/src/Plugin/FilterBase.php
+++ b/core/modules/filter/src/Plugin/FilterBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\filter\Plugin\Filter\FilterBase.
+ * Contains \Drupal\filter\Plugin\FilterBase.
  */
 
 namespace Drupal\filter\Plugin;
diff --git a/core/modules/filter/src/Tests/FilterAdminTest.php b/core/modules/filter/src/Tests/FilterAdminTest.php
index 112c4862b4282565d57730b2cdafbb5ce6b38f61..7e6a2d3263aa3ee7ef4e94ac28fd012988f8f839 100644
--- a/core/modules/filter/src/Tests/FilterAdminTest.php
+++ b/core/modules/filter/src/Tests/FilterAdminTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\filter\Tests\FilterAdminTest.
+ * Contains \Drupal\filter\Tests\FilterAdminTest.
  */
 
 namespace Drupal\filter\Tests;
diff --git a/core/modules/filter/src/Tests/FilterCrudTest.php b/core/modules/filter/src/Tests/FilterCrudTest.php
index a64c28f3cee5f4818253876f871ba56d4256d3c6..d2d4d6f3e42aaaf3ccea08c2f792e02d33e142fe 100644
--- a/core/modules/filter/src/Tests/FilterCrudTest.php
+++ b/core/modules/filter/src/Tests/FilterCrudTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\filter\Tests\FilterCrudTest.
+ * Contains \Drupal\filter\Tests\FilterCrudTest.
  */
 
 namespace Drupal\filter\Tests;
diff --git a/core/modules/filter/src/Tests/FilterDefaultConfigTest.php b/core/modules/filter/src/Tests/FilterDefaultConfigTest.php
index 4a48c1154cd5cbe6e0f356da9929163b391d4652..daef17b1991cf36ecff98256b375c1645272815c 100644
--- a/core/modules/filter/src/Tests/FilterDefaultConfigTest.php
+++ b/core/modules/filter/src/Tests/FilterDefaultConfigTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\filter\Tests\FilterDefaultConfigTest.
+ * Contains \Drupal\filter\Tests\FilterDefaultConfigTest.
  */
 
 namespace Drupal\filter\Tests;
diff --git a/core/modules/filter/src/Tests/FilterDefaultFormatTest.php b/core/modules/filter/src/Tests/FilterDefaultFormatTest.php
index 2ec62aa692528fbf299f724dea323dfb5c08fd05..13f60521626da5b6cb217e906c38c1152d40c35c 100644
--- a/core/modules/filter/src/Tests/FilterDefaultFormatTest.php
+++ b/core/modules/filter/src/Tests/FilterDefaultFormatTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\filter\Tests\FilterDefaultFormatTest.
+ * Contains \Drupal\filter\Tests\FilterDefaultFormatTest.
  */
 
 namespace Drupal\filter\Tests;
diff --git a/core/modules/filter/src/Tests/FilterFormatAccessTest.php b/core/modules/filter/src/Tests/FilterFormatAccessTest.php
index 32d5d041226d4d89c0c15023c7008e6f1a7b5745..029c60b06bb3f15b3e3b5f3dc0c269efafd6defe 100644
--- a/core/modules/filter/src/Tests/FilterFormatAccessTest.php
+++ b/core/modules/filter/src/Tests/FilterFormatAccessTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\filter\Tests\FilterFormatAccessTest.
+ * Contains \Drupal\filter\Tests\FilterFormatAccessTest.
  */
 
 namespace Drupal\filter\Tests;
diff --git a/core/modules/filter/src/Tests/FilterHooksTest.php b/core/modules/filter/src/Tests/FilterHooksTest.php
index 6c46a80bdee8c740084f21d185e09c5dcfb4d45f..b068354fc181f4a790df7baba9f94a0ca34bfb43 100644
--- a/core/modules/filter/src/Tests/FilterHooksTest.php
+++ b/core/modules/filter/src/Tests/FilterHooksTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\filter\Tests\FilterHooksTest.
+ * Contains \Drupal\filter\Tests\FilterHooksTest.
  */
 
 namespace Drupal\filter\Tests;
diff --git a/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php b/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php
index df860f20784f56b1887b746fab508e99909791ec..db8f9f86f51593bf50068bf39f82fc4f597e8573 100644
--- a/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php
+++ b/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\filter\Tests\FilterHtmlImageSecureTest.
+ * Contains \Drupal\filter\Tests\FilterHtmlImageSecureTest.
  */
 
 namespace Drupal\filter\Tests;
diff --git a/core/modules/filter/src/Tests/FilterNoFormatTest.php b/core/modules/filter/src/Tests/FilterNoFormatTest.php
index b173eb1ee9ad1e3fc234398fa6e1a7790fb790a7..69d4c10c472b68f356f84ce0f3621c9958b6a8b8 100644
--- a/core/modules/filter/src/Tests/FilterNoFormatTest.php
+++ b/core/modules/filter/src/Tests/FilterNoFormatTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\filter\Tests\FilterNoFormatTest.
+ * Contains \Drupal\filter\Tests\FilterNoFormatTest.
  */
 
 namespace Drupal\filter\Tests;
diff --git a/core/modules/filter/src/Tests/FilterSecurityTest.php b/core/modules/filter/src/Tests/FilterSecurityTest.php
index 0209a94464d5ec91d0e8e95b64fefa64f93748f6..80bfc70fecd9dc137adaf1dd43a5ccb1b23d57f6 100644
--- a/core/modules/filter/src/Tests/FilterSecurityTest.php
+++ b/core/modules/filter/src/Tests/FilterSecurityTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\filter\Tests\FilterSecurityTest.
+ * Contains \Drupal\filter\Tests\FilterSecurityTest.
  */
 
 namespace Drupal\filter\Tests;
diff --git a/core/modules/filter/src/Tests/FilterSettingsTest.php b/core/modules/filter/src/Tests/FilterSettingsTest.php
index b88fcec5db552262ece4f31cc887fa0595f03c39..9b953368875693a3afe2ea4ce1b16e849c438f7c 100644
--- a/core/modules/filter/src/Tests/FilterSettingsTest.php
+++ b/core/modules/filter/src/Tests/FilterSettingsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\filter\Tests\FilterSettingsTest.
+ * Contains \Drupal\filter\Tests\FilterSettingsTest.
  */
 
 namespace Drupal\filter\Tests;
diff --git a/core/modules/filter/src/Tests/FilterUnitTest.php b/core/modules/filter/src/Tests/FilterUnitTest.php
index 5d0b1d65f3354f9a1de5dc217743a7fa9558b6c6..7fdf8f9d5577ece2ed4743382133a47e5dcc82a8 100644
--- a/core/modules/filter/src/Tests/FilterUnitTest.php
+++ b/core/modules/filter/src/Tests/FilterUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\filter\Tests\FilterUnitTest.
+ * Contains \Drupal\filter\Tests\FilterUnitTest.
  */
 
 namespace Drupal\filter\Tests;
diff --git a/core/modules/forum/src/Breadcrumb/ForumNodeBreadcrumbBuilder.php b/core/modules/forum/src/Breadcrumb/ForumNodeBreadcrumbBuilder.php
index 0e0bd04de965de6fd464ebf4b5a27b4c9ac15df1..090f0ea6b77c57aee275a7809b49ef297ddeacf7 100644
--- a/core/modules/forum/src/Breadcrumb/ForumNodeBreadcrumbBuilder.php
+++ b/core/modules/forum/src/Breadcrumb/ForumNodeBreadcrumbBuilder.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\forum\Forum\Breadcrumb\ForumNodeBreadcrumbBuilder.
+ * Contains \Drupal\forum\Breadcrumb\ForumNodeBreadcrumbBuilder.
  */
 
 namespace Drupal\forum\Breadcrumb;
diff --git a/core/modules/forum/src/ForumIndexStorageInterface.php b/core/modules/forum/src/ForumIndexStorageInterface.php
index 0df178fa93580e9f7a4644c8f8c6e6250aa75c26..4d59fb30b7708db0c9f4f4638d1b4691efe596b7 100644
--- a/core/modules/forum/src/ForumIndexStorageInterface.php
+++ b/core/modules/forum/src/ForumIndexStorageInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains
+ * Contains \Drupal\forum\ForumIndexStorageInterface.
  */
 namespace Drupal\forum;
 
diff --git a/core/modules/forum/src/Tests/ForumBlockTest.php b/core/modules/forum/src/Tests/ForumBlockTest.php
index 78e1c44850e2e073293b3db4e1514def4fc19e0e..f505bdf281c2ac8bcac785627eb15a981ddd16ef 100644
--- a/core/modules/forum/src/Tests/ForumBlockTest.php
+++ b/core/modules/forum/src/Tests/ForumBlockTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\forum\Tests\ForumBlockTest.
+ * Contains \Drupal\forum\Tests\ForumBlockTest.
  */
 
 namespace Drupal\forum\Tests;
diff --git a/core/modules/forum/src/Tests/ForumIndexTest.php b/core/modules/forum/src/Tests/ForumIndexTest.php
index d598c6f933ea025edf8534d06b8ccb8477fefc18..e84a3ebcd6f054c44971403f27c59b2d64fd626e 100644
--- a/core/modules/forum/src/Tests/ForumIndexTest.php
+++ b/core/modules/forum/src/Tests/ForumIndexTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\forum\Tests\ForumIndexTest.
+ * Contains \Drupal\forum\Tests\ForumIndexTest.
  */
 
 namespace Drupal\forum\Tests;
diff --git a/core/modules/forum/src/Tests/ForumNodeAccessTest.php b/core/modules/forum/src/Tests/ForumNodeAccessTest.php
index 1fa31b1e1d1c3ee58e85a8ad943291ca04a1e076..e660467c5c7fb542ab4fa305e32e06c428df4758 100644
--- a/core/modules/forum/src/Tests/ForumNodeAccessTest.php
+++ b/core/modules/forum/src/Tests/ForumNodeAccessTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\forum\Tests\ForumNodeAccessTest.
+ * Contains \Drupal\forum\Tests\ForumNodeAccessTest.
  */
 
 namespace Drupal\forum\Tests;
diff --git a/core/modules/forum/src/Tests/ForumTest.php b/core/modules/forum/src/Tests/ForumTest.php
index 1e9eac9885829cc1f405dcd3d9be23cd33428b32..73089e3dd62197f7fd4c0857711fe65423f81500 100644
--- a/core/modules/forum/src/Tests/ForumTest.php
+++ b/core/modules/forum/src/Tests/ForumTest.php
@@ -2,6 +2,8 @@
 
 /**
  * @file
+ * Contains \Drupal\forum\Tests\ForumTest.
+ *
  * Tests for forum.module.
  */
 
diff --git a/core/modules/forum/src/Tests/ForumUninstallTest.php b/core/modules/forum/src/Tests/ForumUninstallTest.php
index db7c0910b4c34ccb5ffbc85adf72043a59864884..d6186f05c82b43b833d7701cfd493fe26cd67949 100644
--- a/core/modules/forum/src/Tests/ForumUninstallTest.php
+++ b/core/modules/forum/src/Tests/ForumUninstallTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\forum\Tests\ForumUninstallTest.
+ * Contains \Drupal\forum\Tests\ForumUninstallTest.
  */
 
 namespace Drupal\forum\Tests;
diff --git a/core/modules/hal/src/Encoder/JsonEncoder.php b/core/modules/hal/src/Encoder/JsonEncoder.php
index 897bc4496a2dcd2b5b0b4779ec097ccb442d5902..a47cac81344c0ff2a9e7f917a274989aba4e9309 100644
--- a/core/modules/hal/src/Encoder/JsonEncoder.php
+++ b/core/modules/hal/src/Encoder/JsonEncoder.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\hal\JsonEncoder.
+ * Contains \Drupal\hal\Encoder\JsonEncoder.
  */
 
 namespace Drupal\hal\Encoder;
diff --git a/core/modules/hal/src/Tests/EntityTest.php b/core/modules/hal/src/Tests/EntityTest.php
index 9fb10147915a6656b35640c82ce712651935dc17..85d13f77628bcae1a7fff367f378d6a3a3b32292 100644
--- a/core/modules/hal/src/Tests/EntityTest.php
+++ b/core/modules/hal/src/Tests/EntityTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\hal\Tests\NormalizeTest.
+ * Contains \Drupal\hal\Tests\EntityTest.
  */
 
 namespace Drupal\hal\Tests;
diff --git a/core/modules/help/src/Tests/HelpTest.php b/core/modules/help/src/Tests/HelpTest.php
index 56690974a24eade7ded00f1d39f04de1776d45f6..2a423bae8756a66120ad2d569d1a8414f95ab98d 100644
--- a/core/modules/help/src/Tests/HelpTest.php
+++ b/core/modules/help/src/Tests/HelpTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\help\Tests\HelpTest.
+ * Contains \Drupal\help\Tests\HelpTest.
  */
 
 namespace Drupal\help\Tests;
diff --git a/core/modules/help/src/Tests/NoHelpTest.php b/core/modules/help/src/Tests/NoHelpTest.php
index 886e1382d9c7c3258e8b0636c8426f08bfbbfe36..f0213a96284f6370de50c1864f5545035fb3e935 100644
--- a/core/modules/help/src/Tests/NoHelpTest.php
+++ b/core/modules/help/src/Tests/NoHelpTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\help\Tests\NoHelpTest.
+ * Contains \Drupal\help\Tests\NoHelpTest.
  */
 
 namespace Drupal\help\Tests;
diff --git a/core/modules/history/src/Controller/HistoryController.php b/core/modules/history/src/Controller/HistoryController.php
index b605e6e6f2a10f6df6c765d7649fc57a482e6a04..9d6c3941dca15d77c2686a93e9226ac89057a80c 100644
--- a/core/modules/history/src/Controller/HistoryController.php
+++ b/core/modules/history/src/Controller/HistoryController.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\comment\Controller\HistoryController.
+ * Contains \Drupal\history\Controller\HistoryController.
  */
 
 namespace Drupal\history\Controller;
diff --git a/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php b/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php
index 294c561c9bcb0b772423942922995b3bef317bd6..5f15073c0231548479026f0ecc47b161e09a1fe7 100644
--- a/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php
+++ b/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\image\Plugin\field\formatter\ImageFormatter.
+ * Contains \Drupal\image\Plugin\Field\FieldFormatter\ImageFormatter.
  */
 
 namespace Drupal\image\Plugin\Field\FieldFormatter;
diff --git a/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatterBase.php b/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatterBase.php
index dd8348ef65259b82d0f84bdbb079eec7082da185..6a0d3ed897cb4aeda8cbe2fdc0ca91816575e809 100644
--- a/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatterBase.php
+++ b/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatterBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\image\Plugin\field\formatter\ImageFormatterBase.
+ * Contains \Drupal\image\Plugin\Field\FieldFormatter\ImageFormatterBase.
  */
 
 namespace Drupal\image\Plugin\Field\FieldFormatter;
diff --git a/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php b/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
index 179135d503954501672238c851a73542459e1507..d9c112041d8471c286e59d7c73dda825172d636c 100644
--- a/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
+++ b/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @image
+ * @file
  * Contains \Drupal\image\Plugin\Field\FieldType\ImageItem.
  */
 
diff --git a/core/modules/image/src/Routing/ImageStyleRoutes.php b/core/modules/image/src/Routing/ImageStyleRoutes.php
index 39b23792a76da3d889769f96ffd0cbfbc69f9c1a..32e8f2b26abbca3c3562e64e4b4640b0a6359c0a 100644
--- a/core/modules/image/src/Routing/ImageStyleRoutes.php
+++ b/core/modules/image/src/Routing/ImageStyleRoutes.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\image\EventSubscriber\RouteSubscriber.
+ * Contains \Drupal\image\Routing\ImageStyleRoutes.
  */
 
 namespace Drupal\image\Routing;
diff --git a/core/modules/image/src/Tests/ImageAdminStylesTest.php b/core/modules/image/src/Tests/ImageAdminStylesTest.php
index dedb9b5c52a63b7abfe8d5b54d2c8f075de0375c..5501d8024690261899e735ca847c2ba847779b0b 100644
--- a/core/modules/image/src/Tests/ImageAdminStylesTest.php
+++ b/core/modules/image/src/Tests/ImageAdminStylesTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\image\Tests\ImageAdminStylesTest.
+ * Contains \Drupal\image\Tests\ImageAdminStylesTest.
  */
 
 namespace Drupal\image\Tests;
diff --git a/core/modules/image/src/Tests/ImageDimensionsTest.php b/core/modules/image/src/Tests/ImageDimensionsTest.php
index 6d97142385042d40b017d09d638b30325c7df520..15494d0ae82706c01d9930b4ecc160375136a6ba 100644
--- a/core/modules/image/src/Tests/ImageDimensionsTest.php
+++ b/core/modules/image/src/Tests/ImageDimensionsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\image\Tests\ImageDimensionsTest.
+ * Contains \Drupal\image\Tests\ImageDimensionsTest.
  */
 
 namespace Drupal\image\Tests;
diff --git a/core/modules/image/src/Tests/ImageEffectsTest.php b/core/modules/image/src/Tests/ImageEffectsTest.php
index 0f19f8b897cc4dbeebd99642523035220c97950a..fd295373f3ef08c953b7fe73b39af86550ce67cf 100644
--- a/core/modules/image/src/Tests/ImageEffectsTest.php
+++ b/core/modules/image/src/Tests/ImageEffectsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\image\Tests\ImageEffectsTest.
+ * Contains \Drupal\image\Tests\ImageEffectsTest.
  */
 
 namespace Drupal\image\Tests;
diff --git a/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php b/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php
index 9dea3f5a9a0247a62f1b0e79c40b2183573933ba..e541c272753bde407d9fcb88acd4cf2ec2e6336f 100644
--- a/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php
+++ b/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\image\Tests\ImageFieldDefaultImagesTest.
+ * Contains \Drupal\image\Tests\ImageFieldDefaultImagesTest.
  */
 
 namespace Drupal\image\Tests;
diff --git a/core/modules/image/src/Tests/ImageFieldDisplayTest.php b/core/modules/image/src/Tests/ImageFieldDisplayTest.php
index 360dca0f2b3795416369422aef48704ba9acba13..1e1d7989401e95d526a092d4ecf05b124a5e4a5f 100644
--- a/core/modules/image/src/Tests/ImageFieldDisplayTest.php
+++ b/core/modules/image/src/Tests/ImageFieldDisplayTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\image\Tests\ImageFieldDisplayTest.
+ * Contains \Drupal\image\Tests\ImageFieldDisplayTest.
  */
 
 namespace Drupal\image\Tests;
diff --git a/core/modules/image/src/Tests/ImageFieldTestBase.php b/core/modules/image/src/Tests/ImageFieldTestBase.php
index ae3f10a16c1215a925c30ad1c2e882b64b1bf47a..271b969aea9732f70961ff2660c44503d96f0ddf 100644
--- a/core/modules/image/src/Tests/ImageFieldTestBase.php
+++ b/core/modules/image/src/Tests/ImageFieldTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\image\Tests\ImageFieldTestBase.
+ * Contains \Drupal\image\Tests\ImageFieldTestBase.
  */
 
 namespace Drupal\image\Tests;
diff --git a/core/modules/image/src/Tests/ImageFieldValidateTest.php b/core/modules/image/src/Tests/ImageFieldValidateTest.php
index 3822df67ae85155ca8f48f9b463dc4b4c5285653..2a4c0546b82a7a11d30c87fb449c405fa9570fab 100644
--- a/core/modules/image/src/Tests/ImageFieldValidateTest.php
+++ b/core/modules/image/src/Tests/ImageFieldValidateTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\image\Tests\ImageFieldValidateTest.
+ * Contains \Drupal\image\Tests\ImageFieldValidateTest.
  */
 
 namespace Drupal\image\Tests;
diff --git a/core/modules/image/src/Tests/ImageStylesPathAndUrlTest.php b/core/modules/image/src/Tests/ImageStylesPathAndUrlTest.php
index 16fc8e646d55f01982b11947ebebf3a7186f36d1..eb09e0759ab06cc566f565d070d01be7fb44265a 100644
--- a/core/modules/image/src/Tests/ImageStylesPathAndUrlTest.php
+++ b/core/modules/image/src/Tests/ImageStylesPathAndUrlTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\image\Tests\ImageStylesPathAndUrlTest.
+ * Contains \Drupal\image\Tests\ImageStylesPathAndUrlTest.
  */
 
 namespace Drupal\image\Tests;
diff --git a/core/modules/image/src/Tests/ImageThemeFunctionTest.php b/core/modules/image/src/Tests/ImageThemeFunctionTest.php
index 9a2046bf69c0c73c67442cf9d9f4477d95cdb9ee..54b471b78e39e1c2e5afaea25a124ce3b7a59ba3 100644
--- a/core/modules/image/src/Tests/ImageThemeFunctionTest.php
+++ b/core/modules/image/src/Tests/ImageThemeFunctionTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\image\Tests\ImageThemeFunctionTest.
+ * Contains \Drupal\image\Tests\ImageThemeFunctionTest.
  */
 
 namespace Drupal\image\Tests;
diff --git a/core/modules/language/src/ConfigurableLanguageManagerInterface.php b/core/modules/language/src/ConfigurableLanguageManagerInterface.php
index 0e281a826b19e1aee9f5ec2ffb6cf090f8872737..8f78de75db0e55adb5b87b6a90f3a5a9b7c1e46c 100644
--- a/core/modules/language/src/ConfigurableLanguageManagerInterface.php
+++ b/core/modules/language/src/ConfigurableLanguageManagerInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\language\ConfigurableLanguageManagerInterface
+ * Contains \Drupal\language\ConfigurableLanguageManagerInterface.
  */
 
 namespace Drupal\language;
diff --git a/core/modules/language/src/ContentLanguageSettingsException.php b/core/modules/language/src/ContentLanguageSettingsException.php
index 75592f52c6eb20b81aefdde3f2db79a1c09e2572..4729648fc706322eb8988a5825752662e7583a30 100644
--- a/core/modules/language/src/ContentLanguageSettingsException.php
+++ b/core/modules/language/src/ContentLanguageSettingsException.php
@@ -1,6 +1,6 @@
 <?php
 
-/*
+/**
  * @file
  * Contains \Drupal\language\ContentLanguageSettingsException.
  */
diff --git a/core/modules/language/src/Exception/LanguageException.php b/core/modules/language/src/Exception/LanguageException.php
index 80d2fb942104a85327defc2125d5a9e9b1fca236..395bf6d82f66d51aa86ddfeaa0bf4a4aa94310b0 100644
--- a/core/modules/language/src/Exception/LanguageException.php
+++ b/core/modules/language/src/Exception/LanguageException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\language\Exception\DeleteDefaultLanguageException.
+ * Contains \Drupal\language\Exception\LanguageException.
  */
 
 namespace Drupal\language\Exception;
diff --git a/core/modules/language/src/Form/NegotiationBrowserDeleteForm.php b/core/modules/language/src/Form/NegotiationBrowserDeleteForm.php
index 73e0246a9419a4d8684af6181b3d7cb75f52bf28..857cf32580eb83444fec4f3dc06679ee05a31ed3 100644
--- a/core/modules/language/src/Form/NegotiationBrowserDeleteForm.php
+++ b/core/modules/language/src/Form/NegotiationBrowserDeleteForm.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\language\Form\NegotiationConfigureBrowserDeleteForm.
+ * Contains \Drupal\language\Form\NegotiationBrowserDeleteForm.
  */
 
 namespace Drupal\language\Form;
diff --git a/core/modules/language/src/Form/NegotiationConfigureForm.php b/core/modules/language/src/Form/NegotiationConfigureForm.php
index 656fee0e5aee37cdaba24eca2be5adc9060c4af7..d33138b2403b022b8a472e6201a0b82adb05239d 100644
--- a/core/modules/language/src/Form/NegotiationConfigureForm.php
+++ b/core/modules/language/src/Form/NegotiationConfigureForm.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Language\Form\NegotiationConfigureForm.
+ * Contains \Drupal\language\Form\NegotiationConfigureForm.
  */
 
 namespace Drupal\language\Form;
diff --git a/core/modules/language/src/HttpKernel/PathProcessorLanguage.php b/core/modules/language/src/HttpKernel/PathProcessorLanguage.php
index 6d9bb718f9b625bfc6a26ab1480bb543714be0be..a69330994c6df57d697661c710fcd9fbe502f807 100644
--- a/core/modules/language/src/HttpKernel/PathProcessorLanguage.php
+++ b/core/modules/language/src/HttpKernel/PathProcessorLanguage.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\language\HttpKernel\PathProcessorLanguage.
+ * Contains \Drupal\language\HttpKernel\PathProcessorLanguage.
  */
 
 namespace Drupal\language\HttpKernel;
diff --git a/core/modules/language/src/LanguageListBuilder.php b/core/modules/language/src/LanguageListBuilder.php
index aa018dc47ac45e039b6fd7a23ffdde6ae226e267..77deb0147ba9c694b76dcd4f9ceb39e20889c144 100644
--- a/core/modules/language/src/LanguageListBuilder.php
+++ b/core/modules/language/src/LanguageListBuilder.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\language\Form\LanguageListBuilder.
+ * Contains \Drupal\language\LanguageListBuilder.
  */
 
 namespace Drupal\language;
diff --git a/core/modules/language/src/LanguageNegotiatorInterface.php b/core/modules/language/src/LanguageNegotiatorInterface.php
index f99dae79a14aecfc07dca1cc1a87e31e1f610f1c..fbf1d27f60b41693f62b0536befa3c5134513784 100644
--- a/core/modules/language/src/LanguageNegotiatorInterface.php
+++ b/core/modules/language/src/LanguageNegotiatorInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\language\LanguageNegotiatorInterface
+ * Contains \Drupal\language\LanguageNegotiatorInterface.
  */
 
 namespace Drupal\language;
diff --git a/core/modules/language/src/Tests/LanguageBlockSettingsVisibilityTest.php b/core/modules/language/src/Tests/LanguageBlockSettingsVisibilityTest.php
index cac5b511df282c5b948887e4206c146ff0c3d066..7a9dafd986ef0ddf23cb2bbde65bd694464926e9 100644
--- a/core/modules/language/src/Tests/LanguageBlockSettingsVisibilityTest.php
+++ b/core/modules/language/src/Tests/LanguageBlockSettingsVisibilityTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\language\src\Tests\LanguageBlockSettingsVisibilityTest.
+ * Contains \Drupal\language\Tests\LanguageBlockSettingsVisibilityTest.
  */
 
 namespace Drupal\language\Tests;
diff --git a/core/modules/language/src/Tests/LanguageConfigOverrideInstallTest.php b/core/modules/language/src/Tests/LanguageConfigOverrideInstallTest.php
index 0364079a81e272d5dfbe6c12cbf6e415b8cf0513..28d6330dd299effb55e19404b28fed588574da2d 100644
--- a/core/modules/language/src/Tests/LanguageConfigOverrideInstallTest.php
+++ b/core/modules/language/src/Tests/LanguageConfigOverrideInstallTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\language\Tests\LanguageConfigOverrideInstallTest.
+ * Contains \Drupal\language\Tests\LanguageConfigOverrideInstallTest.
  */
 namespace Drupal\language\Tests;
 
diff --git a/core/modules/language/src/Tests/LanguageConfigurationElementTest.php b/core/modules/language/src/Tests/LanguageConfigurationElementTest.php
index 1d4ee2753b8f897a3761c1afe95ec7865051d0ef..a8f33aa2d45d0c6649f501be4735161864059a62 100644
--- a/core/modules/language/src/Tests/LanguageConfigurationElementTest.php
+++ b/core/modules/language/src/Tests/LanguageConfigurationElementTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\language\Tests\LanguageConfigurationElementTest.
+ * Contains \Drupal\language\Tests\LanguageConfigurationElementTest.
  */
 
 namespace Drupal\language\Tests;
diff --git a/core/modules/language/src/Tests/LanguageConfigurationTest.php b/core/modules/language/src/Tests/LanguageConfigurationTest.php
index 8648328cc15806c61bf76e9ac35d94ae36d23fa7..868384bc7fecdf9de81a7d4ecc15bf603ac5bb62 100644
--- a/core/modules/language/src/Tests/LanguageConfigurationTest.php
+++ b/core/modules/language/src/Tests/LanguageConfigurationTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\language\Tests\LanguageConfigurationTest.
+ * Contains \Drupal\language\Tests\LanguageConfigurationTest.
  */
 
 namespace Drupal\language\Tests;
diff --git a/core/modules/language/src/Tests/LanguageCustomLanguageConfigurationTest.php b/core/modules/language/src/Tests/LanguageCustomLanguageConfigurationTest.php
index da6ddf5feec0314a240a47f640f97814f4de608a..0927c2d0791b191acb272809a3c58d6b793bdbec 100644
--- a/core/modules/language/src/Tests/LanguageCustomLanguageConfigurationTest.php
+++ b/core/modules/language/src/Tests/LanguageCustomLanguageConfigurationTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\language\Tests\LanguageCustomConfigurationTest.
+ * Contains \Drupal\language\Tests\LanguageCustomLanguageConfigurationTest.
  */
 
 namespace Drupal\language\Tests;
diff --git a/core/modules/language/src/Tests/LanguageDependencyInjectionTest.php b/core/modules/language/src/Tests/LanguageDependencyInjectionTest.php
index 46b30416fc674e66ee4a3f19c2b891a7eb16b77f..8b289abce5de606caee2763bc06cac0580914a0b 100644
--- a/core/modules/language/src/Tests/LanguageDependencyInjectionTest.php
+++ b/core/modules/language/src/Tests/LanguageDependencyInjectionTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\language\Tests\LanguageDependencyInjectionTest.
+ * Contains \Drupal\language\Tests\LanguageDependencyInjectionTest.
  */
 
 namespace Drupal\language\Tests;
diff --git a/core/modules/language/src/Tests/LanguageListTest.php b/core/modules/language/src/Tests/LanguageListTest.php
index e72a6b025e2c062fd13a5775eb2716c5dda1e149..72e2b0a8584195486d431dfebb04faff11f9e673 100644
--- a/core/modules/language/src/Tests/LanguageListTest.php
+++ b/core/modules/language/src/Tests/LanguageListTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\language\Tests\LanguageListTest.
+ * Contains \Drupal\language\Tests\LanguageListTest.
  */
 
 namespace Drupal\language\Tests;
diff --git a/core/modules/language/src/Tests/LanguageNegotiationInfoTest.php b/core/modules/language/src/Tests/LanguageNegotiationInfoTest.php
index d96e3104805a9cfaa2fa22f5e40ea117b55afa0d..8ef3c0984342a6165fa77e5eed42c4f0a56dcde4 100644
--- a/core/modules/language/src/Tests/LanguageNegotiationInfoTest.php
+++ b/core/modules/language/src/Tests/LanguageNegotiationInfoTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\language\Tests\LanguageNegotiationInfoTest.
+ * Contains \Drupal\language\Tests\LanguageNegotiationInfoTest.
  */
 
 namespace Drupal\language\Tests;
diff --git a/core/modules/language/src/Tests/LanguagePathMonolingualTest.php b/core/modules/language/src/Tests/LanguagePathMonolingualTest.php
index d3aa8141f4080b41079018b9dc2ab94e5b6f76ed..c20a57e902acae423cc46b4e344b752e04475a44 100644
--- a/core/modules/language/src/Tests/LanguagePathMonolingualTest.php
+++ b/core/modules/language/src/Tests/LanguagePathMonolingualTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\language\Tests\LanguagePathMonolingualTest.
+ * Contains \Drupal\language\Tests\LanguagePathMonolingualTest.
  */
 
 namespace Drupal\language\Tests;
diff --git a/core/modules/language/src/Tests/LanguageSwitchingTest.php b/core/modules/language/src/Tests/LanguageSwitchingTest.php
index c9ff8d066386c1f98b430be52510aaf63c1a8691..91cc517ffc31a8b455cfded123417627c578afac 100644
--- a/core/modules/language/src/Tests/LanguageSwitchingTest.php
+++ b/core/modules/language/src/Tests/LanguageSwitchingTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\language\Tests\LanguageSwitchingTest.
+ * Contains \Drupal\language\Tests\LanguageSwitchingTest.
  */
 
 namespace Drupal\language\Tests;
diff --git a/core/modules/language/src/Tests/LanguageTestBase.php b/core/modules/language/src/Tests/LanguageTestBase.php
index b07c36f1beaf63b8c4845d6a66e41bb82cf5121b..f06f20325cf29ff840a199cd709234cc4fe106de 100644
--- a/core/modules/language/src/Tests/LanguageTestBase.php
+++ b/core/modules/language/src/Tests/LanguageTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\language\Tests\LanguageTestBase.
+ * Contains \Drupal\language\Tests\LanguageTestBase.
  */
 
 namespace Drupal\language\Tests;
diff --git a/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php b/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php
index 089b3fddfb4a39b0bb3a22ccf62aca20c3187361..3f7994bd073409ff49a4cf8cc12db2c590ca7d8f 100644
--- a/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php
+++ b/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\language\Tests\LanguageUILanguageNegotiationTest.
+ * Contains \Drupal\language\Tests\LanguageUILanguageNegotiationTest.
  */
 
 namespace Drupal\language\Tests;
diff --git a/core/modules/language/src/Tests/LanguageUrlRewritingTest.php b/core/modules/language/src/Tests/LanguageUrlRewritingTest.php
index 6aab1d28e3c6e626a170f76d2da79336b9e809ca..81602d1f4bd6ea1da4821ebed0619eb344e5ce99 100644
--- a/core/modules/language/src/Tests/LanguageUrlRewritingTest.php
+++ b/core/modules/language/src/Tests/LanguageUrlRewritingTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\language\Tests\LanguageUrlRewritingTest.
+ * Contains \Drupal\language\Tests\LanguageUrlRewritingTest.
  */
 
 namespace Drupal\language\Tests;
diff --git a/core/modules/language/tests/language_test/src/Plugin/LanguageNegotiation/LanguageNegotiationTest.php b/core/modules/language/tests/language_test/src/Plugin/LanguageNegotiation/LanguageNegotiationTest.php
index ea78138f1e3a6110835797d634499e244d0ad67d..ebd4c9babd212beba1c4535cd5761dd1c451c267 100644
--- a/core/modules/language/tests/language_test/src/Plugin/LanguageNegotiation/LanguageNegotiationTest.php
+++ b/core/modules/language/tests/language_test/src/Plugin/LanguageNegotiation/LanguageNegotiationTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\language_test\\Plugin\LanguageNegotiation\LanguageNegotiationTest.
+ * Contains \Drupal\language_test\Plugin\LanguageNegotiation\LanguageNegotiationTest.
  */
 
 namespace Drupal\language_test\Plugin\LanguageNegotiation;
diff --git a/core/modules/language/tests/language_test/src/Plugin/LanguageNegotiation/LanguageNegotiationTestTs.php b/core/modules/language/tests/language_test/src/Plugin/LanguageNegotiation/LanguageNegotiationTestTs.php
index b1f463c3e07b8e4198e09b630169749dcf616c9b..c9d1e9c0836cef0116477f698695847a86204237 100644
--- a/core/modules/language/tests/language_test/src/Plugin/LanguageNegotiation/LanguageNegotiationTestTs.php
+++ b/core/modules/language/tests/language_test/src/Plugin/LanguageNegotiation/LanguageNegotiationTestTs.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\language_test\\Plugin\LanguageNegotiation\LanguageNegotiationTestTs.
+ * Contains \Drupal\language_test\Plugin\LanguageNegotiation\LanguageNegotiationTestTs.
  */
 
 namespace Drupal\language_test\Plugin\LanguageNegotiation;
diff --git a/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php b/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php
index 23f18b1a6ec9fd2453950434e19ce37168b1c672..eb3804a25fc94d44038b2e8393948a40f39b3e76 100644
--- a/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php
+++ b/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\link\Plugin\field\formatter\LinkFormatter.
+ * Contains \Drupal\link\Plugin\Field\FieldFormatter\LinkFormatter.
  */
 
 namespace Drupal\link\Plugin\Field\FieldFormatter;
diff --git a/core/modules/link/src/Plugin/Field/FieldFormatter/LinkSeparateFormatter.php b/core/modules/link/src/Plugin/Field/FieldFormatter/LinkSeparateFormatter.php
index 4260a491860b0074476a3a7d2714386899fdc933..3ea2770944b01a6684fb6bf50b973cfa811a0e09 100644
--- a/core/modules/link/src/Plugin/Field/FieldFormatter/LinkSeparateFormatter.php
+++ b/core/modules/link/src/Plugin/Field/FieldFormatter/LinkSeparateFormatter.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\link\Plugin\field\formatter\LinkSeparateFormatter.
+ * Contains \Drupal\link\Plugin\Field\FieldFormatter\LinkSeparateFormatter.
  *
  * @todo
  * Merge into 'link' formatter once there is a #type like 'item' that
diff --git a/core/modules/link/src/Plugin/Validation/Constraint/LinkExternalProtocolsConstraint.php b/core/modules/link/src/Plugin/Validation/Constraint/LinkExternalProtocolsConstraint.php
index aa98f06b22c037a256ff6842341ecb359c6afba7..e4f2aa9f8fc79c119c9b6156aeb72ae35a28a14d 100644
--- a/core/modules/link/src/Plugin/Validation/Constraint/LinkExternalProtocolsConstraint.php
+++ b/core/modules/link/src/Plugin/Validation/Constraint/LinkExternalProtocolsConstraint.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\link\Plugin\Validation\Constraint\LinkExternalProtocols.
+ * Contains \Drupal\link\Plugin\Validation\Constraint\LinkExternalProtocolsConstraint.
  */
 
 namespace Drupal\link\Plugin\Validation\Constraint;
diff --git a/core/modules/link/src/Plugin/Validation/Constraint/LinkExternalProtocolsConstraintValidator.php b/core/modules/link/src/Plugin/Validation/Constraint/LinkExternalProtocolsConstraintValidator.php
index 7aa8f753a3aab2b48efd945a9c3ee3bddf19aaac..fad7b6dd6ba6edce8d2524f891157706e7c9c8c3 100644
--- a/core/modules/link/src/Plugin/Validation/Constraint/LinkExternalProtocolsConstraintValidator.php
+++ b/core/modules/link/src/Plugin/Validation/Constraint/LinkExternalProtocolsConstraintValidator.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\link\Plugin\Validation\Constraint\LinkExternalProtocolsValidator.
+ * Contains \Drupal\link\Plugin\Validation\Constraint\LinkExternalProtocolsConstraintValidator.
  */
 
 namespace Drupal\link\Plugin\Validation\Constraint;
diff --git a/core/modules/link/src/Plugin/Validation/Constraint/LinkNotExistingInternalConstraint.php b/core/modules/link/src/Plugin/Validation/Constraint/LinkNotExistingInternalConstraint.php
index e97cd462a9234e387c1afee84363e9e26ed3aa44..067f6efa40340c6b08c8b8c3556309e9e00f3fc2 100644
--- a/core/modules/link/src/Plugin/Validation/Constraint/LinkNotExistingInternalConstraint.php
+++ b/core/modules/link/src/Plugin/Validation/Constraint/LinkNotExistingInternalConstraint.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\link\Plugin\Validation\Constraint\LinkNotExistingInternal.
+ * Contains \Drupal\link\Plugin\Validation\Constraint\LinkNotExistingInternalConstraint.
  */
 
 namespace Drupal\link\Plugin\Validation\Constraint;
diff --git a/core/modules/link/src/Tests/LinkFieldTest.php b/core/modules/link/src/Tests/LinkFieldTest.php
index 0279ed17014757bd9aff69e567a16797662447c9..d2242d80c00797634ab475c00157178eabe9252c 100644
--- a/core/modules/link/src/Tests/LinkFieldTest.php
+++ b/core/modules/link/src/Tests/LinkFieldTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\link\Tests\LinkFieldTest.
+ * Contains \Drupal\link\Tests\LinkFieldTest.
  */
 
 namespace Drupal\link\Tests;
diff --git a/core/modules/link/src/Tests/LinkFieldUITest.php b/core/modules/link/src/Tests/LinkFieldUITest.php
index d9531ceacc360378b0314cc9454532332440a6d9..c50d6fc7baf96c3d3dc379bbcad8a932100b4e23 100644
--- a/core/modules/link/src/Tests/LinkFieldUITest.php
+++ b/core/modules/link/src/Tests/LinkFieldUITest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\link\Tests\LinkFieldUITest.
+ * Contains \Drupal\link\Tests\LinkFieldUITest.
  */
 
 namespace Drupal\link\Tests;
diff --git a/core/modules/locale/src/Form/LocaleSettingsForm.php b/core/modules/locale/src/Form/LocaleSettingsForm.php
index 64460ccfc34ba58fedac961a8d70156bd21b3025..a875800882fe2490c02aa176145c8e5664e9da4e 100644
--- a/core/modules/locale/src/Form/LocaleSettingsForm.php
+++ b/core/modules/locale/src/Form/LocaleSettingsForm.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains \Drupal\user\LocaleSettingsForm.
+ * Contains \Drupal\locale\Form\LocaleSettingsForm.
  */
 
 namespace Drupal\locale\Form;
diff --git a/core/modules/locale/src/Gettext.php b/core/modules/locale/src/Gettext.php
index cd993b31436d5ddc8a800668013da7a0033cab97..dfefe906d3e25eafb453f795bcc077316739c8cd 100644
--- a/core/modules/locale/src/Gettext.php
+++ b/core/modules/locale/src/Gettext.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\locale\Gettext.
+ * Contains \Drupal\locale\Gettext.
  */
 
 namespace Drupal\locale;
diff --git a/core/modules/locale/src/LocaleProjectStorage.php b/core/modules/locale/src/LocaleProjectStorage.php
index 65c83fc85a44ea54bcff5407b7a99c36d2f03100..38a90b1d673e8e5518857a4002d54775637192ea 100644
--- a/core/modules/locale/src/LocaleProjectStorage.php
+++ b/core/modules/locale/src/LocaleProjectStorage.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\locale\LocaleProjectStorage.
+ * Contains \Drupal\locale\LocaleProjectStorage.
  */
 
 namespace Drupal\locale;
diff --git a/core/modules/locale/src/LocaleProjectStorageInterface.php b/core/modules/locale/src/LocaleProjectStorageInterface.php
index 876f05aa84fb385c4a0f60e8b2702b9cbc4417b3..604c3db701c76c20601f25fb2b7062005ab6780e 100644
--- a/core/modules/locale/src/LocaleProjectStorageInterface.php
+++ b/core/modules/locale/src/LocaleProjectStorageInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\locale\LocalProjectStorageInterface.
+ * Contains \Drupal\locale\LocaleProjectStorageInterface.
  */
 
 namespace Drupal\locale;
diff --git a/core/modules/locale/src/PoDatabaseReader.php b/core/modules/locale/src/PoDatabaseReader.php
index 6efbfc49d56179cce8627b463896fb4941f912d6..7e7519eb7994c1f4f5f89e0545b4d1359f160e5a 100644
--- a/core/modules/locale/src/PoDatabaseReader.php
+++ b/core/modules/locale/src/PoDatabaseReader.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\locale\PoDatabaseReader.
+ * Contains \Drupal\locale\PoDatabaseReader.
  */
 
 namespace Drupal\locale;
diff --git a/core/modules/locale/src/PoDatabaseWriter.php b/core/modules/locale/src/PoDatabaseWriter.php
index e151ac2f46082272f7227764684bb7259393589b..1d875ca0fee9df0c3665883f40e5d0a34d421ba2 100644
--- a/core/modules/locale/src/PoDatabaseWriter.php
+++ b/core/modules/locale/src/PoDatabaseWriter.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\locale\PoDatabaseWriter.
+ * Contains \Drupal\locale\PoDatabaseWriter.
  */
 
 namespace Drupal\locale;
diff --git a/core/modules/locale/src/SourceString.php b/core/modules/locale/src/SourceString.php
index fec6b31cdff7e7148502a8796d28067696a06bb9..36d33e0d1fd40ccba64464e3729ac79ed73aa208 100644
--- a/core/modules/locale/src/SourceString.php
+++ b/core/modules/locale/src/SourceString.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\locale\SourceString.
+ * Contains \Drupal\locale\SourceString.
  */
 
 namespace Drupal\locale;
diff --git a/core/modules/locale/src/StreamWrapper/TranslationsStream.php b/core/modules/locale/src/StreamWrapper/TranslationsStream.php
index 44c89577220d60a4da3d2884441137f8d2bd1763..eaa712236a97e6eedc6c7c5e237da1efbc7a16f7 100644
--- a/core/modules/locale/src/StreamWrapper/TranslationsStream.php
+++ b/core/modules/locale/src/StreamWrapper/TranslationsStream.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\locale\StreamWrapper\TranslationStream.
+ * Contains \Drupal\locale\StreamWrapper\TranslationsStream.
  */
 
 namespace Drupal\locale\StreamWrapper;
diff --git a/core/modules/locale/src/StringBase.php b/core/modules/locale/src/StringBase.php
index 4b18d5a373f01139b7ced21fe3ab7d855d396651..eecd5050057c14ae8ca60f56ccceb3b0607a06a2 100644
--- a/core/modules/locale/src/StringBase.php
+++ b/core/modules/locale/src/StringBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\locale\StringBase.
+ * Contains \Drupal\locale\StringBase.
  */
 
 namespace Drupal\locale;
diff --git a/core/modules/locale/src/StringDatabaseStorage.php b/core/modules/locale/src/StringDatabaseStorage.php
index da4e295801332827731900521958e8d24645abe6..06f9f97dd383e8bde2f7c54ba22f50a537d1613d 100644
--- a/core/modules/locale/src/StringDatabaseStorage.php
+++ b/core/modules/locale/src/StringDatabaseStorage.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\locale\StringDatabaseStorage.
+ * Contains \Drupal\locale\StringDatabaseStorage.
  */
 
 namespace Drupal\locale;
diff --git a/core/modules/locale/src/StringInterface.php b/core/modules/locale/src/StringInterface.php
index 0992c1de83ef1cfaaa4b308b80623c47ef532fea..9cfd26eda863bd509baff501c0e881c7629703d9 100644
--- a/core/modules/locale/src/StringInterface.php
+++ b/core/modules/locale/src/StringInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\locale\StringInterface.
+ * Contains \Drupal\locale\StringInterface.
  */
 
 namespace Drupal\locale;
diff --git a/core/modules/locale/src/StringStorageException.php b/core/modules/locale/src/StringStorageException.php
index 645fcf4554b325f797f5199ffc128c0b3f54c72b..a5b5f69fca21472a4f848616686efddc36a1ff65 100644
--- a/core/modules/locale/src/StringStorageException.php
+++ b/core/modules/locale/src/StringStorageException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Entity\StringStorageException.
+ * Contains \Drupal\locale\StringStorageException.
  */
 
 namespace Drupal\locale;
diff --git a/core/modules/locale/src/Tests/LocaleContentTest.php b/core/modules/locale/src/Tests/LocaleContentTest.php
index 93a5e77d535c6fe611bfdde582bb4434b6666e8c..020e4be4e85e7a2ae8a4cb5abd028f8963905db8 100644
--- a/core/modules/locale/src/Tests/LocaleContentTest.php
+++ b/core/modules/locale/src/Tests/LocaleContentTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\locale\Tests\LocaleContentTest.
+ * Contains \Drupal\locale\Tests\LocaleContentTest.
  */
 
 namespace Drupal\locale\Tests;
diff --git a/core/modules/locale/src/Tests/LocaleExportTest.php b/core/modules/locale/src/Tests/LocaleExportTest.php
index 29cbb633e0eaf916d848fbde91bfd90f1085296c..061c16158e65069b1971e6b2c54c5650f3eb0f19 100644
--- a/core/modules/locale/src/Tests/LocaleExportTest.php
+++ b/core/modules/locale/src/Tests/LocaleExportTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\locale\Tests\LocaleExportTest.
+ * Contains \Drupal\locale\Tests\LocaleExportTest.
  */
 
 namespace Drupal\locale\Tests;
diff --git a/core/modules/locale/src/Tests/LocaleFileSystemFormTest.php b/core/modules/locale/src/Tests/LocaleFileSystemFormTest.php
index 4a7d4029d18632b3735d4e84cf71b319792a3a82..a0e75d502a9087a630d59c12afa66fd9fcf037db 100644
--- a/core/modules/locale/src/Tests/LocaleFileSystemFormTest.php
+++ b/core/modules/locale/src/Tests/LocaleFileSystemFormTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\locale\Tests\LocaleFileSystemFormTest.
+ * Contains \Drupal\locale\Tests\LocaleFileSystemFormTest.
  */
 
 namespace Drupal\locale\Tests;
diff --git a/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php b/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php
index 35c9a661d2867fd1945472c89628c7aaa3f76b4c..05af294be1a7854ac638bfcc152252ffc4268135 100644
--- a/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php
+++ b/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\locale\Tests\LocaleImportFunctionalTest.
+ * Contains \Drupal\locale\Tests\LocaleImportFunctionalTest.
  */
 
 namespace Drupal\locale\Tests;
diff --git a/core/modules/locale/src/Tests/LocalePathTest.php b/core/modules/locale/src/Tests/LocalePathTest.php
index 851f3d6065ce587b37c48f68b542867788c2a40f..8270f9bef8f575ba644008e77bc41bd3ef11db95 100644
--- a/core/modules/locale/src/Tests/LocalePathTest.php
+++ b/core/modules/locale/src/Tests/LocalePathTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\locale\Tests\LocalePathTest.
+ * Contains \Drupal\locale\Tests\LocalePathTest.
  */
 
 namespace Drupal\locale\Tests;
diff --git a/core/modules/locale/src/Tests/LocalePluralFormatTest.php b/core/modules/locale/src/Tests/LocalePluralFormatTest.php
index bb8674a1657c6db1e30cc3d0e7cbe4b47bc40988..08cdc2d8777c5e0cb921a1b72485af21ee0dbed9 100644
--- a/core/modules/locale/src/Tests/LocalePluralFormatTest.php
+++ b/core/modules/locale/src/Tests/LocalePluralFormatTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\locale\Tests\LocalePluralFormatTest.
+ * Contains \Drupal\locale\Tests\LocalePluralFormatTest.
  */
 
 namespace Drupal\locale\Tests;
diff --git a/core/modules/locale/src/Tests/LocaleStringTest.php b/core/modules/locale/src/Tests/LocaleStringTest.php
index 430b0244220bb1050cc43d3d6041ae75d75fa18c..7b9f8dfe2c66e8e3658b756e108f7a7c17ac5675 100644
--- a/core/modules/locale/src/Tests/LocaleStringTest.php
+++ b/core/modules/locale/src/Tests/LocaleStringTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\locale\Tests\LocaleStringTest.
+ * Contains \Drupal\locale\Tests\LocaleStringTest.
  */
 
 namespace Drupal\locale\Tests;
diff --git a/core/modules/locale/src/Tests/LocaleTranslatedSchemaDefinitionTest.php b/core/modules/locale/src/Tests/LocaleTranslatedSchemaDefinitionTest.php
index a5786b135923587835df01680da803be0feba916..5422a10df92ff783996938e7f50e250a1b39df4b 100644
--- a/core/modules/locale/src/Tests/LocaleTranslatedSchemaDefinitionTest.php
+++ b/core/modules/locale/src/Tests/LocaleTranslatedSchemaDefinitionTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\locale\Tests\LocaleTranslatedSchemaDefinitionTest.
+ * Contains \Drupal\locale\Tests\LocaleTranslatedSchemaDefinitionTest.
  */
 
 namespace Drupal\locale\Tests;
diff --git a/core/modules/locale/src/Tests/LocaleTranslationUiTest.php b/core/modules/locale/src/Tests/LocaleTranslationUiTest.php
index 7a4652e6352448159671c4ae8707cb73fc054ee1..6c35b1800f24169f1100296ef429de6bbee01f66 100644
--- a/core/modules/locale/src/Tests/LocaleTranslationUiTest.php
+++ b/core/modules/locale/src/Tests/LocaleTranslationUiTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\locale\Tests\LocaleTranslationTest.
+ * Contains \Drupal\locale\Tests\LocaleTranslationUiTest.
  */
 
 namespace Drupal\locale\Tests;
diff --git a/core/modules/locale/src/Tests/LocaleUpdateBase.php b/core/modules/locale/src/Tests/LocaleUpdateBase.php
index 584e97578d482935a8c3a78992b60615286884b5..5f5408b68e61610a3fa9e41f027290f628f7c0a6 100644
--- a/core/modules/locale/src/Tests/LocaleUpdateBase.php
+++ b/core/modules/locale/src/Tests/LocaleUpdateBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\locale\Tests\LocaleUpdateBase.
+ * Contains \Drupal\locale\Tests\LocaleUpdateBase.
  */
 
 namespace Drupal\locale\Tests;
diff --git a/core/modules/locale/src/Tests/LocaleUpdateCronTest.php b/core/modules/locale/src/Tests/LocaleUpdateCronTest.php
index 74f18d3d562c6bf349f118dd55fec75130a62fc7..bfaed817714b02e16d08ffd1b25869b7511ac651 100644
--- a/core/modules/locale/src/Tests/LocaleUpdateCronTest.php
+++ b/core/modules/locale/src/Tests/LocaleUpdateCronTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\locale\Tests\LocaleUpdateCronTest.
+ * Contains \Drupal\locale\Tests\LocaleUpdateCronTest.
  */
 
 namespace Drupal\locale\Tests;
diff --git a/core/modules/locale/src/Tests/LocaleUpdateInterfaceTest.php b/core/modules/locale/src/Tests/LocaleUpdateInterfaceTest.php
index e90b6b008081a6f1c7caa246a73a968bd0153758..bda7eec4a83a9617d0957679d25314565bdb44a4 100644
--- a/core/modules/locale/src/Tests/LocaleUpdateInterfaceTest.php
+++ b/core/modules/locale/src/Tests/LocaleUpdateInterfaceTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\locale\Tests\LocaleUpdateInterfaceTest.
+ * Contains \Drupal\locale\Tests\LocaleUpdateInterfaceTest.
  */
 
 namespace Drupal\locale\Tests;
diff --git a/core/modules/locale/src/Tests/LocaleUpdateTest.php b/core/modules/locale/src/Tests/LocaleUpdateTest.php
index 0a1379689013621915c2e674b69a439a37359dc3..c4f4fe8f125a00e556ffef3d31a8e7eacb882e03 100644
--- a/core/modules/locale/src/Tests/LocaleUpdateTest.php
+++ b/core/modules/locale/src/Tests/LocaleUpdateTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\locale\Tests\LocaleUpdateTest.
+ * Contains \Drupal\locale\Tests\LocaleUpdateTest.
  */
 
 namespace Drupal\locale\Tests;
diff --git a/core/modules/locale/src/TranslationString.php b/core/modules/locale/src/TranslationString.php
index 44b344f73f2167121a58cda8fa6eeb2ebb77687d..19fe6ca0989124f5559d6d977bc9b910564a0371 100644
--- a/core/modules/locale/src/TranslationString.php
+++ b/core/modules/locale/src/TranslationString.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\locale\TranslationString.
+ * Contains \Drupal\locale\TranslationString.
  */
 
 namespace Drupal\locale;
diff --git a/core/modules/menu_ui/src/Tests/MenuLanguageTest.php b/core/modules/menu_ui/src/Tests/MenuLanguageTest.php
index fe5e65aedbde391a1a60024005b83f978853b0c2..c35c221e24c6d43b2a6c634731c46b3382d5ba5b 100644
--- a/core/modules/menu_ui/src/Tests/MenuLanguageTest.php
+++ b/core/modules/menu_ui/src/Tests/MenuLanguageTest.php
@@ -2,6 +2,8 @@
 
 /**
  * @file
+ * Contains \Drupal\menu_ui\Tests\MenuLanguageTest.
+ *
  * Tests for menu_ui language settings.
  */
 
diff --git a/core/modules/migrate/src/Annotation/MigrateSource.php b/core/modules/migrate/src/Annotation/MigrateSource.php
index 08957a3ae36e746e2c812cf96d41ad6878834bac..85a69bb94f179e50d7858a8ba1ef4570d75dc607 100644
--- a/core/modules/migrate/src/Annotation/MigrateSource.php
+++ b/core/modules/migrate/src/Annotation/MigrateSource.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Annotation\MigrateDestination.
+ * Contains \Drupal\migrate\Annotation\MigrateSource.
  */
 
 namespace Drupal\migrate\Annotation;
diff --git a/core/modules/migrate/src/MigrateExecutableInterface.php b/core/modules/migrate/src/MigrateExecutableInterface.php
index 4a362fe12a5cb26ba33f4cc39d883c36e9b492ce..b0d62ec7202c88f3af5dbe4fc92de6c8e38b163c 100644
--- a/core/modules/migrate/src/MigrateExecutableInterface.php
+++ b/core/modules/migrate/src/MigrateExecutableInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\MigrateExecutableInterface
+ * Contains \Drupal\migrate\MigrateExecutableInterface.
  */
 
 namespace Drupal\migrate;
diff --git a/core/modules/migrate/src/MigrateMessageInterface.php b/core/modules/migrate/src/MigrateMessageInterface.php
index 42d6e959b3e0c12c2a011d424aa421bc54fa5850..2a35c8d75e42bb2d88cb2ccc8f1a5ff3cabcc646 100644
--- a/core/modules/migrate/src/MigrateMessageInterface.php
+++ b/core/modules/migrate/src/MigrateMessageInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains
+ * Contains \Drupal\migrate\MigrateMessageInterface.
  */
 
 namespace Drupal\migrate;
diff --git a/core/modules/migrate/src/MigrationStorage.php b/core/modules/migrate/src/MigrationStorage.php
index 3d0454ecab3309433661d4bbbaa22a99c681e18b..6e3ceee4ba31569be1c489e92e160771430f3b00 100644
--- a/core/modules/migrate/src/MigrationStorage.php
+++ b/core/modules/migrate/src/MigrationStorage.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\MigrateStorage.
+ * Contains \Drupal\migrate\MigrationStorage.
  */
 
 namespace Drupal\migrate;
diff --git a/core/modules/migrate/src/Plugin/Derivative/MigrateEntityRevision.php b/core/modules/migrate/src/Plugin/Derivative/MigrateEntityRevision.php
index 51c98302ca7dac6f66378528c2f2a077122c8303..dd0e4184d48699641add400d404ec05a3618e73e 100644
--- a/core/modules/migrate/src/Plugin/Derivative/MigrateEntityRevision.php
+++ b/core/modules/migrate/src/Plugin/Derivative/MigrateEntityRevision.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\Derivative\MigrateEntityDerivative.
+ * Contains \Drupal\migrate\Plugin\Derivative\MigrateEntityRevision.
  */
 
 namespace Drupal\migrate\Plugin\Derivative;
diff --git a/core/modules/migrate/src/Plugin/SourceEntityInterface.php b/core/modules/migrate/src/Plugin/SourceEntityInterface.php
index 982ba3d7bef35cabc40025e19a66488286207d07..8379f6a835e2540df4d627c1e7ecdb2c3f795229 100644
--- a/core/modules/migrate/src/Plugin/SourceEntityInterface.php
+++ b/core/modules/migrate/src/Plugin/SourceEntityInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains
+ * Contains \Drupal\migrate\Plugin\SourceEntityInterface.
  */
 
 namespace Drupal\migrate\Plugin;
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/Config.php b/core/modules/migrate/src/Plugin/migrate/destination/Config.php
index dcb397bfa4779ec3409fc4756b7b1251120b64b6..ac05db422964e61ba6afbd516306184274733835 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/Config.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/Config.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @file
+ * Contains \Drupal\migrate\Plugin\migrate\destination\Config.
+ *
  * Provides Configuration Management destination plugin.
  */
 
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/EntityBaseFieldOverride.php b/core/modules/migrate/src/Plugin/migrate/destination/EntityBaseFieldOverride.php
index 449073c4383926407d4523b5ebdda17a6d04fb31..2e2de4ba46c3f235851c9fb50cb6e6f6c6ac21b8 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/EntityBaseFieldOverride.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/EntityBaseFieldOverride.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\destination\EntityBaseFieldOverride
+ * Contains \Drupal\migrate\Plugin\migrate\destination\EntityBaseFieldOverride.
  */
 
 namespace Drupal\migrate\Plugin\migrate\destination;
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php b/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php
index 5103037b06905d6f49d82010466232335e73be7e..8248c7fb7d1d3c1ae05b8c3119ed90e095c8a083 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\destination\EntityBaseContent.
+ * Contains \Drupal\migrate\Plugin\migrate\destination\EntityContentBase.
  */
 
 namespace Drupal\migrate\Plugin\migrate\destination;
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/EntityFieldStorageConfig.php b/core/modules/migrate/src/Plugin/migrate/destination/EntityFieldStorageConfig.php
index 9d1eba3f1b232f476f80527306b93bea726fa482..31f7a13bc37ec9b77fc06116727c1dad86cf6d97 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/EntityFieldStorageConfig.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/EntityFieldStorageConfig.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\destination\EntityFieldEntity.
+ * Contains \Drupal\migrate\Plugin\migrate\destination\EntityFieldStorageConfig.
  */
 
 namespace Drupal\migrate\Plugin\migrate\destination;
diff --git a/core/modules/migrate/src/Plugin/migrate/process/Get.php b/core/modules/migrate/src/Plugin/migrate/process/Get.php
index 8355ad4deb429a2f943a765ce016433701856bf7..07e4b04bbd1fa369c9b43349d0d5e562c658bfa4 100644
--- a/core/modules/migrate/src/Plugin/migrate/process/Get.php
+++ b/core/modules/migrate/src/Plugin/migrate/process/Get.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\process\CopyFromSource.
+ * Contains \Drupal\migrate\Plugin\migrate\process\Get.
  */
 
 namespace Drupal\migrate\Plugin\migrate\process;
diff --git a/core/modules/migrate/src/Plugin/migrate/process/Route.php b/core/modules/migrate/src/Plugin/migrate/process/Route.php
index d4cd813fe0dad139ff40ddf81ca3683f5f87ce40..6b994448bcbc5a7e19fd2dea0fafb4584e1e2e7f 100644
--- a/core/modules/migrate/src/Plugin/migrate/process/Route.php
+++ b/core/modules/migrate/src/Plugin/migrate/process/Route.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\Route.
+ * Contains \Drupal\migrate\Plugin\migrate\process\Route.
  */
 
 namespace Drupal\migrate\Plugin\migrate\process;
diff --git a/core/modules/migrate/src/Plugin/migrate/process/SkipOnEmpty.php b/core/modules/migrate/src/Plugin/migrate/process/SkipOnEmpty.php
index 7c15db4c42d71b8f21d00b1e3e90579fafe55d2d..334d7eb3c4de81ad8670d8d1fce0ef53fa5ea486 100644
--- a/core/modules/migrate/src/Plugin/migrate/process/SkipOnEmpty.php
+++ b/core/modules/migrate/src/Plugin/migrate/process/SkipOnEmpty.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\FlagSkippingRow.
+ * Contains \Drupal\migrate\Plugin\migrate\process\SkipOnEmpty.
  */
 
 namespace Drupal\migrate\Plugin\migrate\process;
diff --git a/core/modules/migrate/src/Plugin/migrate/process/SkipRowIfNotSet.php b/core/modules/migrate/src/Plugin/migrate/process/SkipRowIfNotSet.php
index 2fa46f24cfda923edc52361f9b149ca82424d727..cc21e7c24c696c3458cd0e54b2438b677ed96881 100644
--- a/core/modules/migrate/src/Plugin/migrate/process/SkipRowIfNotSet.php
+++ b/core/modules/migrate/src/Plugin/migrate/process/SkipRowIfNotSet.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\SkipRowIfNotSet.
+ * Contains \Drupal\migrate\Plugin\migrate\process\SkipRowIfNotSet.
  */
 
 namespace Drupal\migrate\Plugin\migrate\process;
diff --git a/core/modules/migrate/src/Plugin/migrate/process/StaticMap.php b/core/modules/migrate/src/Plugin/migrate/process/StaticMap.php
index 02c804a035d6314ac026df7f8e07a65ef996193c..6eaf757e99005ac15eae3625c296d4283f07df33 100644
--- a/core/modules/migrate/src/Plugin/migrate/process/StaticMap.php
+++ b/core/modules/migrate/src/Plugin/migrate/process/StaticMap.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\process\MultipleColumnsMap.
+ * Contains \Drupal\migrate\Plugin\migrate\process\StaticMap.
  */
 
 namespace Drupal\migrate\Plugin\migrate\process;
diff --git a/core/modules/migrate/src/Plugin/migrate/source/EmptySource.php b/core/modules/migrate/src/Plugin/migrate/source/EmptySource.php
index 32a9ab768ab9ec5af6b625f4da346a689f9b81a4..0a93cb32b97cfe45118350cb4297df9e0e426b30 100644
--- a/core/modules/migrate/src/Plugin/migrate/source/EmptySource.php
+++ b/core/modules/migrate/src/Plugin/migrate/source/EmptySource.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\source\Constants.
+ * Contains \Drupal\migrate\Plugin\migrate\source\EmptySource.
  */
 
 namespace Drupal\migrate\Plugin\migrate\source;
diff --git a/core/modules/migrate/src/ProcessPluginBase.php b/core/modules/migrate/src/ProcessPluginBase.php
index b84ae86c36afd23a4a2a88f0bc9cb7477dcd28a0..d1c1c90a21aa2c6f786c3c8f21d5f246b1121758 100644
--- a/core/modules/migrate/src/ProcessPluginBase.php
+++ b/core/modules/migrate/src/ProcessPluginBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\process\ProcessPluginBase.
+ * Contains \Drupal\migrate\ProcessPluginBase.
  */
 
 namespace Drupal\migrate;
diff --git a/core/modules/migrate/src/Tests/MigrateTestBase.php b/core/modules/migrate/src/Tests/MigrateTestBase.php
index a4e39c4dae3690275b8374a4d6b59acd3d172c17..967f7726cb19f5a9f8e240ec3292e52bd063ad47 100644
--- a/core/modules/migrate/src/Tests/MigrateTestBase.php
+++ b/core/modules/migrate/src/Tests/MigrateTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Upgrade\MigrateTestBase.
+ * Contains \Drupal\migrate\Tests\MigrateTestBase.
  */
 
 namespace Drupal\migrate\Tests;
diff --git a/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php b/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php
index 366de38e097565096bcab1cbce39deb3a970693d..d6e726a8c8c0f97c5a5316111431d741a1cfeb68 100644
--- a/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php
+++ b/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Unit\MigrateSourceTest
+ * Contains \Drupal\Tests\migrate\Unit\MigrateSourceTest.
  */
 
 namespace Drupal\Tests\migrate\Unit;
diff --git a/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php b/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php
index 7572cb8737b7ba62d0c8f08c19c225f233e3ce10..3bb2be16e9d6e20059c157954dff92a2ffcb0f97 100644
--- a/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php
+++ b/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate\Unit\MigrateSqlIdMapTestCase.
+ * Contains \Drupal\Tests\migrate\Unit\MigrateSqlIdMapTest.
  */
 
 namespace Drupal\Tests\migrate\Unit;
diff --git a/core/modules/migrate/tests/src/Unit/destination/PerComponentEntityDisplayTest.php b/core/modules/migrate/tests/src/Unit/destination/PerComponentEntityDisplayTest.php
index 7337edb9fb0a340631002a33114ee430c2370a50..c12478b8c7dec3e49c3871f91f4b053650a5fb9d 100644
--- a/core/modules/migrate/tests/src/Unit/destination/PerComponentEntityDisplayTest.php
+++ b/core/modules/migrate/tests/src/Unit/destination/PerComponentEntityDisplayTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate\Unit\destination\EntityDisplayTest.
+ * Contains \Drupal\Tests\migrate\Unit\destination\PerComponentEntityDisplayTest.
  */
 
 namespace Drupal\Tests\migrate\Unit\destination;
diff --git a/core/modules/migrate/tests/src/Unit/destination/PerComponentEntityFormDisplayTest.php b/core/modules/migrate/tests/src/Unit/destination/PerComponentEntityFormDisplayTest.php
index 8624367775437d9c1f3d5c1e0461e711c076ed02..a99af42405d5b82f7d0808add2c6edd21397c197 100644
--- a/core/modules/migrate/tests/src/Unit/destination/PerComponentEntityFormDisplayTest.php
+++ b/core/modules/migrate/tests/src/Unit/destination/PerComponentEntityFormDisplayTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate\Unit\destination\EntityFormDisplayTest.
+ * Contains \Drupal\Tests\migrate\Unit\destination\PerComponentEntityFormDisplayTest.
  */
 
 namespace Drupal\Tests\migrate\Unit\destination;
diff --git a/core/modules/migrate/tests/src/Unit/process/GetTest.php b/core/modules/migrate/tests/src/Unit/process/GetTest.php
index 2afff819aecc4cf9074f6b7d57446bdf838cc5e5..bdcf27c4364f8718ac86ab01239bade61305cac6 100644
--- a/core/modules/migrate/tests/src/Unit/process/GetTest.php
+++ b/core/modules/migrate/tests/src/Unit/process/GetTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains
+ * Contains \Drupal\Tests\migrate\Unit\process\GetTest.
  */
 
 namespace Drupal\Tests\migrate\Unit\process;
diff --git a/core/modules/migrate/tests/src/Unit/process/IteratorTest.php b/core/modules/migrate/tests/src/Unit/process/IteratorTest.php
index f2b30ddeeb4b988a404d251fb1f262bb569ff2b1..dd664e3ec4e23cb83cc808e44593b6461b6faad5 100644
--- a/core/modules/migrate/tests/src/Unit/process/IteratorTest.php
+++ b/core/modules/migrate/tests/src/Unit/process/IteratorTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains Drupal\Tests\migrate\Unit\process\IteratorTest.
+ * Contains \Drupal\Tests\migrate\Unit\process\IteratorTest.
  */
 
 namespace Drupal\Tests\migrate\Unit\process;
diff --git a/core/modules/migrate_drupal/src/Entity/MigrationInterface.php b/core/modules/migrate_drupal/src/Entity/MigrationInterface.php
index e59631efb1bf93e9a65a441b9e351472b18efe3a..4690c3c5ef42b55d7ba060700f380a92734bf58e 100644
--- a/core/modules/migrate_drupal/src/Entity/MigrationInterface.php
+++ b/core/modules/migrate_drupal/src/Entity/MigrationInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains
+ * Contains \Drupal\migrate_drupal\Entity\MigrationInterface.
  */
 
 namespace Drupal\migrate_drupal\Entity;
diff --git a/core/modules/migrate_drupal/src/MigrationStorage.php b/core/modules/migrate_drupal/src/MigrationStorage.php
index eb0349bdbd37ccf054158aa0662cfa5bb08c459c..84c69175b5f445a6c997fb8c669fc6a21c513257 100644
--- a/core/modules/migrate_drupal/src/MigrationStorage.php
+++ b/core/modules/migrate_drupal/src/MigrationStorage.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\MigrateStorage.
+ * Contains \Drupal\migrate_drupal\MigrationStorage.
  */
 
 namespace Drupal\migrate_drupal;
diff --git a/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldInterface.php b/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldInterface.php
index c762768ef7e023c6e5408107f76d0b4278c3e5d2..7f8bb5aec3d1843241fcd8f079a04c2e7a245bb5 100644
--- a/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldInterface.php
+++ b/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\migrate_drupal\Plugin\MigrateCckFieldInterface
+ * Contains \Drupal\migrate_drupal\Plugin\MigrateCckFieldInterface.
  */
 
 namespace Drupal\migrate_drupal\Plugin;
diff --git a/core/modules/migrate_drupal/src/Plugin/MigrateLoadInterface.php b/core/modules/migrate_drupal/src/Plugin/MigrateLoadInterface.php
index ce3ed834e83d07468edce1445f06c146a8e5f5f4..cdfffacfa216da3b3a4576667840cccce975bcd0 100644
--- a/core/modules/migrate_drupal/src/Plugin/MigrateLoadInterface.php
+++ b/core/modules/migrate_drupal/src/Plugin/MigrateLoadInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\migrate_drupal\Plugin\MigrateLoadInterface
+ * Contains \Drupal\migrate_drupal\Plugin\MigrateLoadInterface.
  */
 
 namespace Drupal\migrate_drupal\Plugin;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php b/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php
index 301c6bd43d739faa8f19c4a644096f7fd3dda98d..783a36fb8bdfecafa4ca4a5d6e990385535a8895 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\cckfield\MigrateCckFieldInterface.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\cckfield;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/LinkField.php b/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/LinkField.php
index 9b70f65fddd83b0829c61431e00c856b7a6e4801..62dc8fde52c75b8083802404fb50183e97c58d99 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/LinkField.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/LinkField.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\migrate_drupal\Plugin\migrate\cckfield\LinkField;
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\cckfield\LinkField.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\cckfield;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php b/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php
index c9b83db19d330d9418ee4652ced45afb4b8a0a77..2e155f142494e2da95eedf6d43156faf83305bc3 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\destination\EntityFieldEntity.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\destination\EntityFieldStorageConfig.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\destination;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/load/d6/LoadTermNode.php b/core/modules/migrate_drupal/src/Plugin/migrate/load/d6/LoadTermNode.php
index e5b3f5e1aaf66f0730b104dac3aeef5c4509c846..1a7e61a2185db9d2418db27296b81b73c9a396ab 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/load/d6/LoadTermNode.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/load/d6/LoadTermNode.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\load\d6\TermNode.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\load\d6\LoadTermNode.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\load\d6;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockPluginId.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockPluginId.php
index 966641b30074c3ca5ae8f81448b4a18311e8010e..01854bd90686b572de2c183bbbd0b761b285665d 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockPluginId.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockPluginId.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\BlockAggregator.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\BlockPluginId.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldFormatterSettingsDefaults.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldFormatterSettingsDefaults.php
index 74c3841de6fc5c49156d5600a9af93c0f3fdea1f..a1b785662f00ee774b8162efab0e02c13f6638ae 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldFormatterSettingsDefaults.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldFormatterSettingsDefaults.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\FieldSettingsDefaults.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\FieldFormatterSettingsDefaults.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceDefaults.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceDefaults.php
index 67dc9cfa1773dbd9c6f497c01cf15cf02731fac4..0ad1e6c612df3ebcc15ef67321a7a35830dde6eb 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceDefaults.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceDefaults.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains Drupal\migrate_drupal\Plugin\migrate\d6\FieldInstanceDefaults
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\FieldInstanceDefaults.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceSettings.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceSettings.php
index 0003a04b6a5bdd9df0c8a248d81ad95754485918..6911d4abf092305ccb5267ee45f8cbea8dd0cff4 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceSettings.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceSettings.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains Drupal\migrate_drupal\Plugin\migrate\d6\FieldInstanceSettings
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\FieldInstanceSettings.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php
index fa6daa1b11e549f2a57703a46cd839b945ef1e7a..828221ae924272713c12602f2d9ff4fa2d83a8df 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\FieldInstanceWidgetSettings
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\FieldInstanceWidgetSettings.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldSettings.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldSettings.php
index 9abd53b27cd7aff4d14ca0d02543b9f305d80f80..e96e351c6f0b15ad166df184fcd7d94c6f432242 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldSettings.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldSettings.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\FieldSettings
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\FieldSettings.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FilterFormatPermission.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FilterFormatPermission.php
index 42135e16bfe70788d4ae2a03273bb1b7ee4ccd7a..cb0271e5f6d643c66a6bf55cb165be094595ab34 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FilterFormatPermission.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FilterFormatPermission.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\FilterFormatRole.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\FilterFormatPermission.
  */
 
 
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/SearchConfigurationRankings.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/SearchConfigurationRankings.php
index 9044b02a9b92f5e4182e49ebbeaf860c8def31d2..a78666af36a2179891effddae72ac7a8ef0e433e 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/SearchConfigurationRankings.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/SearchConfigurationRankings.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\SearchPage.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\SearchConfigurationRankings.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/SystemUpdate7000.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/SystemUpdate7000.php
index eceed0fe7eba4c1595c4903b6910327c4fd9a9c2..8e78c8484141fda700dd02cb9fb15b7fa7c5a597 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/SystemUpdate7000.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/SystemUpdate7000.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\system_update_7000.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\SystemUpdate7000.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
index 85020fee9e30ac1724f753a972255140e03a6b80..5257d9401ab315c233f5f537f0f1536a3a8fc08e 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\Drupal6SqlBase.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/VariableMultiRow.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/VariableMultiRow.php
index 2ecea8d22ab98307af8a9d3e385c2d5d1b123504..b51ca90f9432faf7dc2553ded2287b1d23eeb390 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/VariableMultiRow.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/VariableMultiRow.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\VariableMultiRow.
+ */
+
 namespace Drupal\migrate_drupal\Plugin\migrate\source;
 
 use Drupal\migrate\Row;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/FilterFormat.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/FilterFormat.php
index 2a9019c4a43e39eec877866964e42fceaa98fc5d..f832179c27291d5b1e65f49800e731ebf17531fb 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/FilterFormat.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/FilterFormat.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\FilterFormats.
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\FilterFormat.
  */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/NodeRevision.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/NodeRevision.php
index 264adaa39ba6e3e648627499f0faa67c01053c72..c419586c3a5ce5404011beeadb94b15721da29f1 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/NodeRevision.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/NodeRevision.php
@@ -1,9 +1,9 @@
 <?php
 
 /**
-* @file
-* Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\NodeRevision.
-*/
+ * @file
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\NodeRevision.
+ */
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateDateFormatTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateDateFormatTest.php
index 320b7a1f6f93384ad1f88d91a537c216bfee96bf..48465d99990ace6fb1891b5fcdf2d4ead0d3dcd9 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateDateFormatTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateDateFormatTest.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\migrate_drupal\Tests\d6\MigrateDateFormatTest.
+ */
+
 namespace Drupal\migrate_drupal\Tests\d6;
 
 use Drupal\Core\Datetime\DrupalDateTime;
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php
index 91727cd063af71b1d3bf53b4ef3217ef9a53466d..e50871893fe8ce4bd6e75f913d3b0028ae4953ea 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\MigrateDrupal6TestBase.
+ * Contains \Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase.
  */
 
 namespace Drupal\migrate_drupal\Tests\d6;
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuLinkTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuLinkTest.php
index cd4fee3fb09795a52be44da84e941475f0140cf8..18aea259d24ffd022fd3e7592e2c4e8a5b862001 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuLinkTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuLinkTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateMenuLinkTest
+ * Contains \Drupal\migrate_drupal\Tests\d6\MigrateMenuLinkTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\d6;
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuTest.php
index 2f4c836f0dd21a6e4c3973d42a56da184a1534fe..e45199234a079a4ce58ad5f00beefa6ac8ddcc57 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateMenuTest
+ * Contains \Drupal\migrate_drupal\Tests\d6\MigrateMenuTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\d6;
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeConfigsTest.php
index 080b404e086d8022122b57b5a28a2dcaa4bfa9cc..edf8b1ac47b8f3d369e2e050c50f26e781162c15 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeConfigsTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeConfigsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateSystemSiteTest.
+ * Contains \Drupal\migrate_drupal\Tests\d6\MigrateNodeConfigsTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\d6;
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateTermNodeRevisionTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateTermNodeRevisionTest.php
index 80342d8cb193cb863e7365b50b3aa53bca8197af..ddb1a23d471964e147d8b5e10c362e98e15c3d48 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateTermNodeRevisionTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateTermNodeRevisionTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateTermNodeTest.
+ * Contains \Drupal\migrate_drupal\Tests\d6\MigrateTermNodeRevisionTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\d6;
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadFieldTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadFieldTest.php
index d077270fa02234e537c1d25d8d3909751b116e22..f9abe7974766158ca23b536a0550c9b3c2ed5842 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadFieldTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadFieldTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateUploadInstanceTest.
+ * Contains \Drupal\migrate_drupal\Tests\d6\MigrateUploadFieldTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\d6;
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureFieldTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureFieldTest.php
index 8653de2a509e4f5a15e3d743148cd5fccf06d44b..eac1c3d8217aa82afae7b6c2d920845b7b43ab9d 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureFieldTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureFieldTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateUploadInstanceTest.
+ * Contains \Drupal\migrate_drupal\Tests\d6\MigrateUserPictureFieldTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\d6;
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyFieldTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyFieldTest.php
index edf8d7b26072963da5328e8769d1c64322e42626..7ac3455e093db6dbfc8fa88f9d26d86286283f41 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyFieldTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyFieldTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateVocabularyToFieldTest.
+ * Contains \Drupal\migrate_drupal\Tests\d6\MigrateVocabularyFieldTest.
  */
 
 namespace Drupal\migrate_drupal\Tests\d6;
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/BoxTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/BoxTest.php
index 71e2a55b1d42deb44c692494f82a2afc5d0c4593..fdd33edd5d83e17cd7f9ac417da807441d029597 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/BoxTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/BoxTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\BoxesTest.
+ * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\BoxTest.
  */
 
 namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/CommentSourceWithHighwaterTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/CommentSourceWithHighWaterTest.php
similarity index 100%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/CommentSourceWithHighwaterTest.php
rename to core/modules/migrate_drupal/tests/src/Unit/source/d6/CommentSourceWithHighWaterTest.php
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/UserTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/UserTest.php
index 17d1e96f93465fa1fcfb39faeda210751f50b5f1..36d4b6730447f8aa9f5644a3077133048bd92711 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/UserTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/UserTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\CommentTest.
+ * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\UserTest.
  */
 
 namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
diff --git a/core/modules/node/src/Cache/NodeAccessGrantsCacheContext.php b/core/modules/node/src/Cache/NodeAccessGrantsCacheContext.php
index 13ce366a0c9a6bf4519fbecee38e6aa1a4fb1f1c..a0249f081c151f51261a792a7477ef6fd1edcd9c 100644
--- a/core/modules/node/src/Cache/NodeAccessGrantsCacheContext.php
+++ b/core/modules/node/src/Cache/NodeAccessGrantsCacheContext.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Cache\NodeAccessGrantsCacheContext.
+ * Contains \Drupal\node\Cache\NodeAccessGrantsCacheContext.
  */
 
 namespace Drupal\node\Cache;
diff --git a/core/modules/node/src/Form/NodeRevisionRevertForm.php b/core/modules/node/src/Form/NodeRevisionRevertForm.php
index 00c9993ff22576279a0a722040daaecbbb1c3a24..1fe5ee1755ba5dfd1e0fef0453dab8ab00823c21 100644
--- a/core/modules/node/src/Form/NodeRevisionRevertForm.php
+++ b/core/modules/node/src/Form/NodeRevisionRevertForm.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\node\Form\NodeRevisionDeleteForm.
+ * Contains \Drupal\node\Form\NodeRevisionRevertForm.
  */
 
 namespace Drupal\node\Form;
diff --git a/core/modules/node/src/NodeForm.php b/core/modules/node/src/NodeForm.php
index c57baa94f07b3e1a3651e67469f82ac41ee4f85c..33dec701f940d8c37716672448b492164d10d33b 100644
--- a/core/modules/node/src/NodeForm.php
+++ b/core/modules/node/src/NodeForm.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\NodeForm.
+ * Contains \Drupal\node\NodeForm.
  */
 
 namespace Drupal\node;
diff --git a/core/modules/node/src/NodeGrantDatabaseStorageInterface.php b/core/modules/node/src/NodeGrantDatabaseStorageInterface.php
index 7f45ab6de7632647e3097384866c4a718aa924e7..505a63a871305dfa5ef42901bc97eb019c7d3644 100644
--- a/core/modules/node/src/NodeGrantDatabaseStorageInterface.php
+++ b/core/modules/node/src/NodeGrantDatabaseStorageInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\node\NodeGrantStorageInterface.
+ * Contains \Drupal\node\NodeGrantDatabaseStorageInterface.
  */
 
 namespace Drupal\node;
diff --git a/core/modules/node/src/NodeStorageInterface.php b/core/modules/node/src/NodeStorageInterface.php
index 3a56e63a8174b8d338f6b4bc6a5dcd3d7ab51595..4b9fb585b1f2bf2f32b907c6fd9c46f657497dfb 100644
--- a/core/modules/node/src/NodeStorageInterface.php
+++ b/core/modules/node/src/NodeStorageInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\node\NodeStorageControllerInterface.
+ * Contains \Drupal\node\NodeStorageInterface.
  */
 
 namespace Drupal\node;
diff --git a/core/modules/node/src/NodeTypeAccessControlHandler.php b/core/modules/node/src/NodeTypeAccessControlHandler.php
index b35894408915319106f5e78620f90fff21f24070..067727dc48996e1f5f7b0b8e5a39b4ea59c269b4 100644
--- a/core/modules/node/src/NodeTypeAccessControlHandler.php
+++ b/core/modules/node/src/NodeTypeAccessControlHandler.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\taxonomy\NodeTypeAccessControlHandler.
+ * Contains \Drupal\node\NodeTypeAccessControlHandler.
  */
 
 namespace Drupal\node;
diff --git a/core/modules/node/src/NodeViewBuilder.php b/core/modules/node/src/NodeViewBuilder.php
index 7b40ba98d2b76634427b75413306c9765161f355..37db17d379fc34f1e337a78175d4789fd976baea 100644
--- a/core/modules/node/src/NodeViewBuilder.php
+++ b/core/modules/node/src/NodeViewBuilder.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\NodeViewBuilder.
+ * Contains \Drupal\node\NodeViewBuilder.
  */
 
 namespace Drupal\node;
diff --git a/core/modules/node/src/Plugin/views/argument/Nid.php b/core/modules/node/src/Plugin/views/argument/Nid.php
index 890aaaae0bce4b598770bd34712cc2e89dc425d3..879ac9de38d02cc01d28ee76dd2c0400b789877d 100644
--- a/core/modules/node/src/Plugin/views/argument/Nid.php
+++ b/core/modules/node/src/Plugin/views/argument/Nid.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Plugin\views\argument\Nid.
+ * Contains \Drupal\node\Plugin\views\argument\Nid.
  */
 
 namespace Drupal\node\Plugin\views\argument;
diff --git a/core/modules/node/src/Plugin/views/argument/Type.php b/core/modules/node/src/Plugin/views/argument/Type.php
index 00798afa3b635cd0d5ea313e5ef5899247c3b0d6..26ab17afcb1f06a148b053a82a465aab772e13fa 100644
--- a/core/modules/node/src/Plugin/views/argument/Type.php
+++ b/core/modules/node/src/Plugin/views/argument/Type.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Plugin\views\argument\Type.
+ * Contains \Drupal\node\Plugin\views\argument\Type.
  */
 
 namespace Drupal\node\Plugin\views\argument;
diff --git a/core/modules/node/src/Plugin/views/argument/UidRevision.php b/core/modules/node/src/Plugin/views/argument/UidRevision.php
index 8f8afc6282292ebacf442d28d6b0cb6a6bf98606..f2488154b9912f7d119dde066ad8bac199154ea0 100644
--- a/core/modules/node/src/Plugin/views/argument/UidRevision.php
+++ b/core/modules/node/src/Plugin/views/argument/UidRevision.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Plugin\views\argument\UidRevision.
+ * Contains \Drupal\node\Plugin\views\argument\UidRevision.
  */
 
 namespace Drupal\node\Plugin\views\argument;
diff --git a/core/modules/node/src/Plugin/views/argument/Vid.php b/core/modules/node/src/Plugin/views/argument/Vid.php
index ded1ab88f55c303dae82d9d8098936aa49b45934..c223a72a232ec4e2456042fe12a901971d7dabe7 100644
--- a/core/modules/node/src/Plugin/views/argument/Vid.php
+++ b/core/modules/node/src/Plugin/views/argument/Vid.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Plugin\views\argument\Vid.
+ * Contains \Drupal\node\Plugin\views\argument\Vid.
  */
 
 namespace Drupal\node\Plugin\views\argument;
diff --git a/core/modules/node/src/Plugin/views/argument_default/Node.php b/core/modules/node/src/Plugin/views/argument_default/Node.php
index e6d8343233c508feb86651cc9b1ab0fbb7bee451..556b9aa95b3d30fa465d3fe20542f37b19c99145 100644
--- a/core/modules/node/src/Plugin/views/argument_default/Node.php
+++ b/core/modules/node/src/Plugin/views/argument_default/Node.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Plugin\views\argument_default\Node.
+ * Contains \Drupal\node\Plugin\views\argument_default\Node.
  */
 
 namespace Drupal\node\Plugin\views\argument_default;
diff --git a/core/modules/node/src/Plugin/views/field/Node.php b/core/modules/node/src/Plugin/views/field/Node.php
index 43077e20b0dbd369c54991332d430c23c4964c89..74685ebed34f135aa723ff0145df9c12fa5d679d 100644
--- a/core/modules/node/src/Plugin/views/field/Node.php
+++ b/core/modules/node/src/Plugin/views/field/Node.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Plugin\views\field\Node.
+ * Contains \Drupal\node\Plugin\views\field\Node.
  */
 
 namespace Drupal\node\Plugin\views\field;
diff --git a/core/modules/node/src/Plugin/views/field/Path.php b/core/modules/node/src/Plugin/views/field/Path.php
index 1848b481a36731a94c2603511077d9937a0954d4..b3d438801d53c850650f8da05947e73c65b3f451 100644
--- a/core/modules/node/src/Plugin/views/field/Path.php
+++ b/core/modules/node/src/Plugin/views/field/Path.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Plugin\views\field\Path.
+ * Contains \Drupal\node\Plugin\views\field\Path.
  */
 
 namespace Drupal\node\Plugin\views\field;
diff --git a/core/modules/node/src/Plugin/views/field/RevisionLink.php b/core/modules/node/src/Plugin/views/field/RevisionLink.php
index c26830473d0c8b2ce199399561e467f5628da16d..75b785cbd5af99e764cc2cf13f667f2588fcd3f3 100644
--- a/core/modules/node/src/Plugin/views/field/RevisionLink.php
+++ b/core/modules/node/src/Plugin/views/field/RevisionLink.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Plugin\views\field\RevisionLink.
+ * Contains \Drupal\node\Plugin\views\field\RevisionLink.
  */
 
 namespace Drupal\node\Plugin\views\field;
diff --git a/core/modules/node/src/Plugin/views/field/RevisionLinkDelete.php b/core/modules/node/src/Plugin/views/field/RevisionLinkDelete.php
index 76bbd4bf192ce6cb03083a45004de9521bd67193..c66cf2b4847621a4c9b0013df21c660882eaf236 100644
--- a/core/modules/node/src/Plugin/views/field/RevisionLinkDelete.php
+++ b/core/modules/node/src/Plugin/views/field/RevisionLinkDelete.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Plugin\views\field\RevisionLinkDelete.
+ * Contains \Drupal\node\Plugin\views\field\RevisionLinkDelete.
  */
 
 namespace Drupal\node\Plugin\views\field;
diff --git a/core/modules/node/src/Plugin/views/field/RevisionLinkRevert.php b/core/modules/node/src/Plugin/views/field/RevisionLinkRevert.php
index 5ffa30fad82bbd12b00fccada17efdc4c06e7ba8..ffc073ba7c87ca6e6fc261beb4e45eee08e14dbb 100644
--- a/core/modules/node/src/Plugin/views/field/RevisionLinkRevert.php
+++ b/core/modules/node/src/Plugin/views/field/RevisionLinkRevert.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Plugin\views\field\RevisionLinkRevert.
+ * Contains \Drupal\node\Plugin\views\field\RevisionLinkRevert.
  */
 
 namespace Drupal\node\Plugin\views\field;
diff --git a/core/modules/node/src/Plugin/views/filter/Access.php b/core/modules/node/src/Plugin/views/filter/Access.php
index 5497a91d861edadc24099e285c33f614585da238..761f8de76d97d69bd1cb78a3d8fe5401c74af2b9 100644
--- a/core/modules/node/src/Plugin/views/filter/Access.php
+++ b/core/modules/node/src/Plugin/views/filter/Access.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Plugin\views\filter\Access.
+ * Contains \Drupal\node\Plugin\views\filter\Access.
  */
 
 namespace Drupal\node\Plugin\views\filter;
diff --git a/core/modules/node/src/Plugin/views/filter/Status.php b/core/modules/node/src/Plugin/views/filter/Status.php
index ccfc58cccd6da670b2e546034c48feee1dc0fb0e..5e119e5174280d08623c93508738291e9c0c0c91 100644
--- a/core/modules/node/src/Plugin/views/filter/Status.php
+++ b/core/modules/node/src/Plugin/views/filter/Status.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Plugins\views\filter\Status.
+ * Contains \Drupal\node\Plugin\views\filter\Status.
  */
 
 namespace Drupal\node\Plugin\views\filter;
diff --git a/core/modules/node/src/Plugin/views/filter/UidRevision.php b/core/modules/node/src/Plugin/views/filter/UidRevision.php
index 39e0a7b4e6b5b06343cc193f648d38eba3dc6786..84a3df66d5c5e68223175d9cb065cfd5adc030f5 100644
--- a/core/modules/node/src/Plugin/views/filter/UidRevision.php
+++ b/core/modules/node/src/Plugin/views/filter/UidRevision.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Plugin\views\filter\UidRevision.
+ * Contains \Drupal\node\Plugin\views\filter\UidRevision.
  */
 
 namespace Drupal\node\Plugin\views\filter;
diff --git a/core/modules/node/src/Plugin/views/row/Rss.php b/core/modules/node/src/Plugin/views/row/Rss.php
index 37261c14429eb1445b61cfb19fc9ba56b52da3e6..098012f76e1e03400c8e7b63e24620377ea61755 100644
--- a/core/modules/node/src/Plugin/views/row/Rss.php
+++ b/core/modules/node/src/Plugin/views/row/Rss.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Plugin\views\row\Rss.
+ * Contains \Drupal\node\Plugin\views\row\Rss.
  */
 
 namespace Drupal\node\Plugin\views\row;
diff --git a/core/modules/node/src/Plugin/views/wizard/Node.php b/core/modules/node/src/Plugin/views/wizard/Node.php
index ae8777bd0bf9d3f992d78a9197aee6fcf37a2305..53271b8924512f719e54aa639fe6ba43274847c9 100644
--- a/core/modules/node/src/Plugin/views/wizard/Node.php
+++ b/core/modules/node/src/Plugin/views/wizard/Node.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Plugin\views\wizard\Node.
+ * Contains \Drupal\node\Plugin\views\wizard\Node.
  */
 
 namespace Drupal\node\Plugin\views\wizard;
diff --git a/core/modules/node/src/Plugin/views/wizard/NodeRevision.php b/core/modules/node/src/Plugin/views/wizard/NodeRevision.php
index fafb3fc3863cb37f92e97de1a4290ce7ea28bc5b..d01f7e837232e0ac1c9fc36720073671204d911a 100644
--- a/core/modules/node/src/Plugin/views/wizard/NodeRevision.php
+++ b/core/modules/node/src/Plugin/views/wizard/NodeRevision.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Plugin\views\wizard\NodeRevision.
+ * Contains \Drupal\node\Plugin\views\wizard\NodeRevision.
  */
 
 namespace Drupal\node\Plugin\views\wizard;
diff --git a/core/modules/node/src/Tests/Condition/NodeConditionTest.php b/core/modules/node/src/Tests/Condition/NodeConditionTest.php
index 548f180b2414c4fbdbbef12a9187d01ab7810125..d7397515f16fdc48e78870f412a65a087d248994 100644
--- a/core/modules/node/src/Tests/Condition/NodeConditionTest.php
+++ b/core/modules/node/src/Tests/Condition/NodeConditionTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\condition\Tests\Condition\NodeConditionTest.
+ * Contains \Drupal\node\Tests\Condition\NodeConditionTest.
  */
 
 namespace Drupal\node\Tests\Condition;
diff --git a/core/modules/node/src/Tests/MultiStepNodeFormBasicOptionsTest.php b/core/modules/node/src/Tests/MultiStepNodeFormBasicOptionsTest.php
index f6c5b6949a6d0439c2c6cbf2683d8801ca50c137..84ffbe2e8646e61c4cd45cdaa66732e776bfc1c5 100644
--- a/core/modules/node/src/Tests/MultiStepNodeFormBasicOptionsTest.php
+++ b/core/modules/node/src/Tests/MultiStepNodeFormBasicOptionsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\MultiStepNodeFormBasicOptionsTest.
+ * Contains \Drupal\node\Tests\MultiStepNodeFormBasicOptionsTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/NodeAccessBaseTableTest.php b/core/modules/node/src/Tests/NodeAccessBaseTableTest.php
index b0cb361e7a1e37215f21a886013086b2f43db221..91547c40fa2bd3e8ccc17d3145c5339891187dbd 100644
--- a/core/modules/node/src/Tests/NodeAccessBaseTableTest.php
+++ b/core/modules/node/src/Tests/NodeAccessBaseTableTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\NodeAccessBaseTableTest.
+ * Contains \Drupal\node\Tests\NodeAccessBaseTableTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/NodeAccessFieldTest.php b/core/modules/node/src/Tests/NodeAccessFieldTest.php
index 7d3f6473683fac69b9bd984745db216dc5427a18..ab490bbe96dc185fb3e4427e906a16d6116311ec 100644
--- a/core/modules/node/src/Tests/NodeAccessFieldTest.php
+++ b/core/modules/node/src/Tests/NodeAccessFieldTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\NodeAccessFieldTest.
+ * Contains \Drupal\node\Tests\NodeAccessFieldTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/NodeAccessLanguageTest.php b/core/modules/node/src/Tests/NodeAccessLanguageTest.php
index 949c385bd577b8e757dbcfed3d111a3657eb3ff1..7718c080b00c5682645d8bfc001ddab9d11a80c8 100644
--- a/core/modules/node/src/Tests/NodeAccessLanguageTest.php
+++ b/core/modules/node/src/Tests/NodeAccessLanguageTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\NodeAccessLanguageTest.
+ * Contains \Drupal\node\Tests\NodeAccessLanguageTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/NodeAccessPagerTest.php b/core/modules/node/src/Tests/NodeAccessPagerTest.php
index 87b422aa5afccc93c7fccab6fac7e5a49a0607d6..c442566255754e02bea5e94fa87582123e0bdc6b 100644
--- a/core/modules/node/src/Tests/NodeAccessPagerTest.php
+++ b/core/modules/node/src/Tests/NodeAccessPagerTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\NodeAccessPagerTest.
+ * Contains \Drupal\node\Tests\NodeAccessPagerTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/NodeAccessRebuildTest.php b/core/modules/node/src/Tests/NodeAccessRebuildTest.php
index db1d8eb61c2bced265f841d36019a714154c62ce..821030d28b9c4ba2ce403654de16c5ec50f7e3d4 100644
--- a/core/modules/node/src/Tests/NodeAccessRebuildTest.php
+++ b/core/modules/node/src/Tests/NodeAccessRebuildTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\NodeAccessRebuildTest.
+ * Contains \Drupal\node\Tests\NodeAccessRebuildTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/NodeAccessRecordsTest.php b/core/modules/node/src/Tests/NodeAccessRecordsTest.php
index 4b019c8c0b1284afbbb83a5207f1884482152ed5..3a84528a0c84fa17710e4e6da8c8afc7c39a1bd2 100644
--- a/core/modules/node/src/Tests/NodeAccessRecordsTest.php
+++ b/core/modules/node/src/Tests/NodeAccessRecordsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\NodeAccessRecordsTest.
+ * Contains \Drupal\node\Tests\NodeAccessRecordsTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/NodeAccessTest.php b/core/modules/node/src/Tests/NodeAccessTest.php
index 588f5e473c901f15778a0925d48b0d3726e49ed0..4decd660565134767e64146cb6b1131de75698e0 100644
--- a/core/modules/node/src/Tests/NodeAccessTest.php
+++ b/core/modules/node/src/Tests/NodeAccessTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\NodeAccessTest.
+ * Contains \Drupal\node\Tests\NodeAccessTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/NodeAdminTest.php b/core/modules/node/src/Tests/NodeAdminTest.php
index 425678f8a7c0f1f4e7f0c9babbaf4bd3186652ad..7769acc79347f1c279b2d1420c5b2533bb10c85d 100644
--- a/core/modules/node/src/Tests/NodeAdminTest.php
+++ b/core/modules/node/src/Tests/NodeAdminTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\NodeAdminTest.
+ * Contains \Drupal\node\Tests\NodeAdminTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/NodeBlockFunctionalTest.php b/core/modules/node/src/Tests/NodeBlockFunctionalTest.php
index 84f24529cdd8d17d7bbe4744e7bc35c29ec1cd7c..32bb69224540a767402deac89bbd8e6f1c944f51 100644
--- a/core/modules/node/src/Tests/NodeBlockFunctionalTest.php
+++ b/core/modules/node/src/Tests/NodeBlockFunctionalTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\NodeBlockFunctionalTest.
+ * Contains \Drupal\node\Tests\NodeBlockFunctionalTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/NodeCreationTest.php b/core/modules/node/src/Tests/NodeCreationTest.php
index 7af3769eaef0ac197de7896a9aec4c286736086d..7c1ef5f9cc805138bd3512fa89a0b2b0a04a54c3 100644
--- a/core/modules/node/src/Tests/NodeCreationTest.php
+++ b/core/modules/node/src/Tests/NodeCreationTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\NodeCreationTest.
+ * Contains \Drupal\node\Tests\NodeCreationTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/NodeEntityViewModeAlterTest.php b/core/modules/node/src/Tests/NodeEntityViewModeAlterTest.php
index 232fde71554962c93768d6a93b045a54598ab245..2d571ff0e7d8a57299baa9757a2de03cb784fca2 100644
--- a/core/modules/node/src/Tests/NodeEntityViewModeAlterTest.php
+++ b/core/modules/node/src/Tests/NodeEntityViewModeAlterTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\NodeEntityViewModeAlterTest.
+ * Contains \Drupal\node\Tests\NodeEntityViewModeAlterTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/NodeFormButtonsTest.php b/core/modules/node/src/Tests/NodeFormButtonsTest.php
index b5c2df551bc5c76390401797fc6f273ba271f903..7201504458d69e508a9768efd128c9d0fc0b2136 100644
--- a/core/modules/node/src/Tests/NodeFormButtonsTest.php
+++ b/core/modules/node/src/Tests/NodeFormButtonsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\node\Tests\NodeLoadHooksTest.
+ * Contains \Drupal\node\Tests\NodeFormButtonsTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/NodeLinksTest.php b/core/modules/node/src/Tests/NodeLinksTest.php
index 4c0efa7c3b00b6f0c12034878da95764e9efa5c9..d188ea82eb8b9b1212a792d866d1c251c3b93eae 100644
--- a/core/modules/node/src/Tests/NodeLinksTest.php
+++ b/core/modules/node/src/Tests/NodeLinksTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains \Drupal\node\Tests\NodeLinksTest
+ * Contains \Drupal\node\Tests\NodeLinksTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/NodeLoadMultipleTest.php b/core/modules/node/src/Tests/NodeLoadMultipleTest.php
index afb1d30b2a35a9cd5e4fe333c680a35336183d92..914dbff1ae270d68a6c42bb5f4863993fa079194 100644
--- a/core/modules/node/src/Tests/NodeLoadMultipleTest.php
+++ b/core/modules/node/src/Tests/NodeLoadMultipleTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\NodeLoadMultipleTest.
+ * Contains \Drupal\node\Tests\NodeLoadMultipleTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/NodePostSettingsTest.php b/core/modules/node/src/Tests/NodePostSettingsTest.php
index 0acee504d9fcf44778fce1a0c8deb446342e0246..a776347330a87cdfda89591afac3d60ea82c1e7a 100644
--- a/core/modules/node/src/Tests/NodePostSettingsTest.php
+++ b/core/modules/node/src/Tests/NodePostSettingsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\NodePostSettingsTest.
+ * Contains \Drupal\node\Tests\NodePostSettingsTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/NodeQueryAlterTest.php b/core/modules/node/src/Tests/NodeQueryAlterTest.php
index a26dcd0ca4e54ac10c0c3c483d64d284456d7089..d0d615ee74fff0ee711908d64cfff75da7be282d 100644
--- a/core/modules/node/src/Tests/NodeQueryAlterTest.php
+++ b/core/modules/node/src/Tests/NodeQueryAlterTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\NodeQueryAlterTest.
+ * Contains \Drupal\node\Tests\NodeQueryAlterTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/NodeRSSContentTest.php b/core/modules/node/src/Tests/NodeRSSContentTest.php
index 6deb8af9ca8a1d74b5870b51195e13dd5e2b1b62..4b63eea6964c19f37c005130a114558e2ceac0e3 100644
--- a/core/modules/node/src/Tests/NodeRSSContentTest.php
+++ b/core/modules/node/src/Tests/NodeRSSContentTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\NodeRSSContentTest.
+ * Contains \Drupal\node\Tests\NodeRSSContentTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/NodeRevisionPermissionsTest.php b/core/modules/node/src/Tests/NodeRevisionPermissionsTest.php
index affcc368945fc3e61c726b7e3943b1d7ada967d1..61797dbbd96a35dffa0e7f807a19ae019f22a881 100644
--- a/core/modules/node/src/Tests/NodeRevisionPermissionsTest.php
+++ b/core/modules/node/src/Tests/NodeRevisionPermissionsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\NodeRevisionPermissionsTest.
+ * Contains \Drupal\node\Tests\NodeRevisionPermissionsTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/NodeRevisionsTest.php b/core/modules/node/src/Tests/NodeRevisionsTest.php
index 6062e7fba158353bf81a9219e3741dddbd23bdee..0a0acae3de5c4ef64f80866f5c0e79fb694f8e5b 100644
--- a/core/modules/node/src/Tests/NodeRevisionsTest.php
+++ b/core/modules/node/src/Tests/NodeRevisionsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\NodeRevisionsTest.
+ * Contains \Drupal\node\Tests\NodeRevisionsTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/NodeSaveTest.php b/core/modules/node/src/Tests/NodeSaveTest.php
index c045e2a75ad7780e53a899361fdc2a94a9cb5365..3acbf821aef75cc52f0aab2a0246a944f329fdff 100644
--- a/core/modules/node/src/Tests/NodeSaveTest.php
+++ b/core/modules/node/src/Tests/NodeSaveTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\NodeSaveTest.
+ * Contains \Drupal\node\Tests\NodeSaveTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/NodeSyndicateBlockTest.php b/core/modules/node/src/Tests/NodeSyndicateBlockTest.php
index 8df914728e09dd2329f3f5c27fbb21f552127f19..7581339026af4b4ed6573950af3ab919f6033973 100644
--- a/core/modules/node/src/Tests/NodeSyndicateBlockTest.php
+++ b/core/modules/node/src/Tests/NodeSyndicateBlockTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\NodeSyndicateBlockTest.
+ * Contains \Drupal\node\Tests\NodeSyndicateBlockTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/NodeTemplateSuggestionsTest.php b/core/modules/node/src/Tests/NodeTemplateSuggestionsTest.php
index fef6aa04921e4d56ed7acf3605765fb5874a38a2..97ae43189164c22e905bf9e205c4941b17d24e66 100644
--- a/core/modules/node/src/Tests/NodeTemplateSuggestionsTest.php
+++ b/core/modules/node/src/Tests/NodeTemplateSuggestionsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains of \Drupal\node\Tests\NodeTemplateSuggestionsTest.
+ * Contains \Drupal\node\Tests\NodeTemplateSuggestionsTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/NodeTestBase.php b/core/modules/node/src/Tests/NodeTestBase.php
index 7b61e08209e5576dc3eb4386e07891d1339b2599..1f4dca09688da724aafab689296fc9b5eca4339b 100644
--- a/core/modules/node/src/Tests/NodeTestBase.php
+++ b/core/modules/node/src/Tests/NodeTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\NodeTestBase.
+ * Contains \Drupal\node\Tests\NodeTestBase.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/NodeTitleTest.php b/core/modules/node/src/Tests/NodeTitleTest.php
index 61dc3bff0f8adcd2cdb8125d7f1cf7d431792293..ddf1fc62021c188510124266839c7438badefea4 100644
--- a/core/modules/node/src/Tests/NodeTitleTest.php
+++ b/core/modules/node/src/Tests/NodeTitleTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\NodeTitleTest.
+ * Contains \Drupal\node\Tests\NodeTitleTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/NodeTitleXSSTest.php b/core/modules/node/src/Tests/NodeTitleXSSTest.php
index 221222accc4669abfddff1e36cd1b246ebf28d40..f0e80eaf4f175282f3b056d7a4a55e67b9e273e5 100644
--- a/core/modules/node/src/Tests/NodeTitleXSSTest.php
+++ b/core/modules/node/src/Tests/NodeTitleXSSTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\NodeTitleXSSTest.
+ * Contains \Drupal\node\Tests\NodeTitleXSSTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/NodeTokenReplaceTest.php b/core/modules/node/src/Tests/NodeTokenReplaceTest.php
index 1ba30033926e5872990f46cdad819eebddc14dce..f4f7d268be2d06e06023056a361ad967bb657d81 100644
--- a/core/modules/node/src/Tests/NodeTokenReplaceTest.php
+++ b/core/modules/node/src/Tests/NodeTokenReplaceTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\NodeTokenReplaceTest.
+ * Contains \Drupal\node\Tests\NodeTokenReplaceTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/NodeTranslationUITest.php b/core/modules/node/src/Tests/NodeTranslationUITest.php
index 55214c2ba2b57bc8e76256fde156b5ab009a6b9f..608ab43e406b8fb1d942980adc978ff01354f083 100644
--- a/core/modules/node/src/Tests/NodeTranslationUITest.php
+++ b/core/modules/node/src/Tests/NodeTranslationUITest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\NodeTranslationUITest.
+ * Contains \Drupal\node\Tests\NodeTranslationUITest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/NodeTypeInitialLanguageTest.php b/core/modules/node/src/Tests/NodeTypeInitialLanguageTest.php
index 1e05e8eb6dae8e473a41ce465ebb182779abf85d..f7df02f7c3757361571591e395c6ce44555b6891 100644
--- a/core/modules/node/src/Tests/NodeTypeInitialLanguageTest.php
+++ b/core/modules/node/src/Tests/NodeTypeInitialLanguageTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\NodeTypeInitialLanguageTest.
+ * Contains \Drupal\node\Tests\NodeTypeInitialLanguageTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/NodeTypeTest.php b/core/modules/node/src/Tests/NodeTypeTest.php
index 05e93d0db2b13528410c3a57ad13b877b6ce0455..97f6738981548198f3b8ab997e9aa70ce6b9fdb6 100644
--- a/core/modules/node/src/Tests/NodeTypeTest.php
+++ b/core/modules/node/src/Tests/NodeTypeTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\NodeTypeTest.
+ * Contains \Drupal\node\Tests\NodeTypeTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/PageEditTest.php b/core/modules/node/src/Tests/PageEditTest.php
index 582ab6fafa0176d1c62396922045115e06e50f5e..9082dcaae7d46e7c5076eebbbd034ed54633ecbb 100644
--- a/core/modules/node/src/Tests/PageEditTest.php
+++ b/core/modules/node/src/Tests/PageEditTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\PageEditTest.
+ * Contains \Drupal\node\Tests\PageEditTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/PagePreviewTest.php b/core/modules/node/src/Tests/PagePreviewTest.php
index 009765cdf14794a6df8ba1a4b971da9bac54c6ce..9910710fc53fc0b5469e983e7e4f2a947d44eb43 100644
--- a/core/modules/node/src/Tests/PagePreviewTest.php
+++ b/core/modules/node/src/Tests/PagePreviewTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\PagePreviewTest.
+ * Contains \Drupal\node\Tests\PagePreviewTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/PageViewTest.php b/core/modules/node/src/Tests/PageViewTest.php
index c47a97fbbaf7bf6e04c4b1f6a38ebe354dbc1154..61ee56f9087d9ead9df84345366037b207a4f595 100644
--- a/core/modules/node/src/Tests/PageViewTest.php
+++ b/core/modules/node/src/Tests/PageViewTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\PageViewTest.
+ * Contains \Drupal\node\Tests\PageViewTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/node/src/Tests/SummaryLengthTest.php b/core/modules/node/src/Tests/SummaryLengthTest.php
index 3eb44df17e9c8dd52c64ded55baf72fc69347be1..aee545564f381bb9b1932f4ce4196b8051ba014b 100644
--- a/core/modules/node/src/Tests/SummaryLengthTest.php
+++ b/core/modules/node/src/Tests/SummaryLengthTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Tests\SummaryLengthTest.
+ * Contains \Drupal\node\Tests\SummaryLengthTest.
  */
 
 namespace Drupal\node\Tests;
diff --git a/core/modules/options/src/Plugin/Field/FieldFormatter/OptionsDefaultFormatter.php b/core/modules/options/src/Plugin/Field/FieldFormatter/OptionsDefaultFormatter.php
index f4d9afb60f838a2f5778ee81777e126c0e24964e..37220f574c6903b8a91d582c53f329565300b1b8 100644
--- a/core/modules/options/src/Plugin/Field/FieldFormatter/OptionsDefaultFormatter.php
+++ b/core/modules/options/src/Plugin/Field/FieldFormatter/OptionsDefaultFormatter.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\options\Plugin\field\formatter\OptionsDefaultFormatter.
+ * Contains \Drupal\options\Plugin\Field\FieldFormatter\OptionsDefaultFormatter.
  */
 
 namespace Drupal\options\Plugin\Field\FieldFormatter;
diff --git a/core/modules/options/src/Plugin/Field/FieldFormatter/OptionsKeyFormatter.php b/core/modules/options/src/Plugin/Field/FieldFormatter/OptionsKeyFormatter.php
index 9dd2524199cb8b54124b454c7a6ecdb7939c59ca..f6328a802e09653e2a235828b193f4ac2d5e5204 100644
--- a/core/modules/options/src/Plugin/Field/FieldFormatter/OptionsKeyFormatter.php
+++ b/core/modules/options/src/Plugin/Field/FieldFormatter/OptionsKeyFormatter.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\options\Plugin\field\formatter\OptionsKeyFormatter.
+ * Contains \Drupal\options\Plugin\Field\FieldFormatter\OptionsKeyFormatter.
  */
 
 namespace Drupal\options\Plugin\Field\FieldFormatter;
diff --git a/core/modules/options/src/Plugin/Field/FieldType/ListFloatItem.php b/core/modules/options/src/Plugin/Field/FieldType/ListFloatItem.php
index 9ce7cb0612db8c1af35234fb056832776320423f..870ad9199821e9fd406b58392e36066cb305464c 100644
--- a/core/modules/options/src/Plugin/Field/FieldType/ListFloatItem.php
+++ b/core/modules/options/src/Plugin/Field/FieldType/ListFloatItem.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\options\Type\ListFloatItem.
+ * Contains \Drupal\options\Plugin\Field\FieldType\ListFloatItem.
  */
 
 namespace Drupal\options\Plugin\Field\FieldType;
diff --git a/core/modules/options/src/Plugin/Field/FieldType/ListIntegerItem.php b/core/modules/options/src/Plugin/Field/FieldType/ListIntegerItem.php
index 2ded4ca9642c206a7613cb6054dcaf7a2fe6cc5e..aa2c4388b44d3e2e0f5f6bfab02deeab7703e3e0 100644
--- a/core/modules/options/src/Plugin/Field/FieldType/ListIntegerItem.php
+++ b/core/modules/options/src/Plugin/Field/FieldType/ListIntegerItem.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\options\Type\ListIntegerItem.
+ * Contains \Drupal\options\Plugin\Field\FieldType\ListIntegerItem.
  */
 
 namespace Drupal\options\Plugin\Field\FieldType;
diff --git a/core/modules/options/src/Plugin/Field/FieldType/ListItemBase.php b/core/modules/options/src/Plugin/Field/FieldType/ListItemBase.php
index 9b785d862ee1a4e971c645582cb49ec0878ce52f..bbca1701de75c9c1eb29da33cf04dcd265f92674 100644
--- a/core/modules/options/src/Plugin/Field/FieldType/ListItemBase.php
+++ b/core/modules/options/src/Plugin/Field/FieldType/ListItemBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\options\Type\ListItemBase.
+ * Contains \Drupal\options\Plugin\Field\FieldType\ListItemBase.
  */
 
 namespace Drupal\options\Plugin\Field\FieldType;
diff --git a/core/modules/options/src/Plugin/Field/FieldType/ListStringItem.php b/core/modules/options/src/Plugin/Field/FieldType/ListStringItem.php
index da308109ff3df63898b8dea3f3a35bce7e138fe8..df061f2a7364f4c517602e6359588a6758b78eaa 100644
--- a/core/modules/options/src/Plugin/Field/FieldType/ListStringItem.php
+++ b/core/modules/options/src/Plugin/Field/FieldType/ListStringItem.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\options\Type\ListStringItem.
+ * Contains \Drupal\options\Plugin\Field\FieldType\ListStringItem.
  */
 
 namespace Drupal\options\Plugin\Field\FieldType;
diff --git a/core/modules/options/src/Plugin/views/filter/ListField.php b/core/modules/options/src/Plugin/views/filter/ListField.php
index f7cad307b266bbb7918a461f53d400305d2f1d68..e41d90929ee6cde759c24d6ba904b3561a5e6b99 100644
--- a/core/modules/options/src/Plugin/views/filter/ListField.php
+++ b/core/modules/options/src/Plugin/views/filter/ListField.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\field\Plugin\views\filter\ListField.
+ * Contains \Drupal\options\Plugin\views\filter\ListField.
  */
 
 namespace Drupal\options\Plugin\views\filter;
diff --git a/core/modules/options/src/Tests/OptionsDynamicValuesValidationTest.php b/core/modules/options/src/Tests/OptionsDynamicValuesValidationTest.php
index d0410b458c305cdf642e4c51560ce7ab5e724352..9bf64b69830bc25fd283a996180c0429522bf567 100644
--- a/core/modules/options/src/Tests/OptionsDynamicValuesValidationTest.php
+++ b/core/modules/options/src/Tests/OptionsDynamicValuesValidationTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\options\Tests\OptionsDynamicValuesValidationTest.
+ * Contains \Drupal\options\Tests\OptionsDynamicValuesValidationTest.
  */
 
 namespace Drupal\options\Tests;
diff --git a/core/modules/options/src/Tests/OptionsFieldTest.php b/core/modules/options/src/Tests/OptionsFieldTest.php
index d70ec01d7ad9325d0fafa57c0a9c041fb1f663eb..0380ec0d59dbe3be73c5f7ff27b53142e967a146 100644
--- a/core/modules/options/src/Tests/OptionsFieldTest.php
+++ b/core/modules/options/src/Tests/OptionsFieldTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\options\Tests\OptionsFieldTest.
+ * Contains \Drupal\options\Tests\OptionsFieldTest.
  */
 
 namespace Drupal\options\Tests;
diff --git a/core/modules/options/src/Tests/OptionsSelectDynamicValuesTest.php b/core/modules/options/src/Tests/OptionsSelectDynamicValuesTest.php
index d3989eb4117b7d65a587770e0d33949d44d5b667..f6a661a70a39ab682c1728e33cddb0d0e65d357f 100644
--- a/core/modules/options/src/Tests/OptionsSelectDynamicValuesTest.php
+++ b/core/modules/options/src/Tests/OptionsSelectDynamicValuesTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\options\Tests\OptionsSelectDynamicValuesTest.
+ * Contains \Drupal\options\Tests\OptionsSelectDynamicValuesTest.
  */
 
 namespace Drupal\options\Tests;
diff --git a/core/modules/options/src/Tests/OptionsWidgetsTest.php b/core/modules/options/src/Tests/OptionsWidgetsTest.php
index 56d84187fd064004d4c452378768d204e01972dd..6bd4714d655546be625352027862568f5d1bda83 100644
--- a/core/modules/options/src/Tests/OptionsWidgetsTest.php
+++ b/core/modules/options/src/Tests/OptionsWidgetsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\options\Tests\OptionsWidgetsTest.
+ * Contains \Drupal\options\Tests\OptionsWidgetsTest.
  */
 
 namespace Drupal\options\Tests;
diff --git a/core/modules/path/src/Tests/PathAliasTest.php b/core/modules/path/src/Tests/PathAliasTest.php
index cfdb14ac377bf74b02e7b0f8e1fef2c3cdc3c052..c41b99334e9c1139cc003dffe5a7e418e2bdf387 100644
--- a/core/modules/path/src/Tests/PathAliasTest.php
+++ b/core/modules/path/src/Tests/PathAliasTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\path\Tests\PathAliasTest.
+ * Contains \Drupal\path\Tests\PathAliasTest.
  */
 
 namespace Drupal\path\Tests;
diff --git a/core/modules/path/src/Tests/PathLanguageTest.php b/core/modules/path/src/Tests/PathLanguageTest.php
index e14042b54a78d7e63596d8c81fa0a04282bc8331..5351a80a84cdbdcc5edf807aa970e7bbc2bdd52c 100644
--- a/core/modules/path/src/Tests/PathLanguageTest.php
+++ b/core/modules/path/src/Tests/PathLanguageTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\path\Tests\PathLanguageTest.
+ * Contains \Drupal\path\Tests\PathLanguageTest.
  */
 
 namespace Drupal\path\Tests;
diff --git a/core/modules/path/src/Tests/PathLanguageUiTest.php b/core/modules/path/src/Tests/PathLanguageUiTest.php
index ab33c0ee162d35afac93de3b475907a9fcb64ee9..39ea81f463f9affffcf67fa2d4a8abe845a6a5b6 100644
--- a/core/modules/path/src/Tests/PathLanguageUiTest.php
+++ b/core/modules/path/src/Tests/PathLanguageUiTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\path\Tests\PathLanguageUiTest.
+ * Contains \Drupal\path\Tests\PathLanguageUiTest.
  */
 
 namespace Drupal\path\Tests;
diff --git a/core/modules/path/src/Tests/PathTaxonomyTermTest.php b/core/modules/path/src/Tests/PathTaxonomyTermTest.php
index f53eb7d9eb0b6b56fecb0168c44f4891b982f0ce..0d49c86216bb3a333ee7c0d34351631c9fe73d9d 100644
--- a/core/modules/path/src/Tests/PathTaxonomyTermTest.php
+++ b/core/modules/path/src/Tests/PathTaxonomyTermTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\path\Tests\PathTaxonomyTermTest.
+ * Contains \Drupal\path\Tests\PathTaxonomyTermTest.
  */
 
 namespace Drupal\path\Tests;
diff --git a/core/modules/path/src/Tests/PathTestBase.php b/core/modules/path/src/Tests/PathTestBase.php
index 9b857b695372dbc0263f6a5647b3d3626e9d4871..0fecdb101e5a744b2e944b4dbb8db11b4ba1ec91 100644
--- a/core/modules/path/src/Tests/PathTestBase.php
+++ b/core/modules/path/src/Tests/PathTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\path\Tests\PathTestBase.
+ * Contains \Drupal\path\Tests\PathTestBase.
  */
 
 namespace Drupal\path\Tests;
diff --git a/core/modules/path/tests/src/Unit/Field/PathFieldDefinitionTest.php b/core/modules/path/tests/src/Unit/Field/PathFieldDefinitionTest.php
index 9c96634ca6f6d36628c58e4dfdf990c6a88bd812..920d2139f8d8de3d3d81965c2e2e68d1b1c705bc 100644
--- a/core/modules/path/tests/src/Unit/Field/PathFieldDefinitionTest.php
+++ b/core/modules/path/tests/src/Unit/Field/PathFieldDefinitionTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\path\Unit\Plugin\Field\FieldType\PathFieldDefinitionTest.
+ * Contains \Drupal\Tests\path\Unit\Field\PathFieldDefinitionTest.
  */
 
 namespace Drupal\Tests\path\Unit\Field;
diff --git a/core/modules/quickedit/src/Tests/MetadataGeneratorTest.php b/core/modules/quickedit/src/Tests/MetadataGeneratorTest.php
index 072d888535d9f35feb86559dac5e03a63e97579b..a48890a5b1c51f176934c7572b28bd83f33047ec 100644
--- a/core/modules/quickedit/src/Tests/MetadataGeneratorTest.php
+++ b/core/modules/quickedit/src/Tests/MetadataGeneratorTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\edit\Tests\MetadataGeneratorTest.
+ * Contains \Drupal\quickedit\Tests\MetadataGeneratorTest.
  */
 
 namespace Drupal\quickedit\Tests;
diff --git a/core/modules/rdf/src/RdfMappingInterface.php b/core/modules/rdf/src/RdfMappingInterface.php
index 3ccbb4e1ecd8311371e00ac008303f97e304527a..1f78b47a0b1608d9fb19467bc3d0be0f12b9bf16 100644
--- a/core/modules/rdf/src/RdfMappingInterface.php
+++ b/core/modules/rdf/src/RdfMappingInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains \Drupal\rdf\RdfMappingInterface
+ * Contains \Drupal\rdf\RdfMappingInterface.
  */
 
 namespace Drupal\rdf;
diff --git a/core/modules/rdf/src/Tests/CrudTest.php b/core/modules/rdf/src/Tests/CrudTest.php
index 1d7c1cb3017dec4f44e569cfe367a9b00293d59d..e40f3e601bf189208d9321553857e13ee3d9dd48 100644
--- a/core/modules/rdf/src/Tests/CrudTest.php
+++ b/core/modules/rdf/src/Tests/CrudTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\rdf\Tests\CrudTest.
+ * Contains \Drupal\rdf\Tests\CrudTest.
  */
 
 namespace Drupal\rdf\Tests;
diff --git a/core/modules/rdf/src/Tests/Field/EntityReferenceRdfaTest.php b/core/modules/rdf/src/Tests/Field/EntityReferenceRdfaTest.php
index 31b8465f5a93a1e6547ba461c78e28ea92909527..15760c7712bfe7581da4508814a1fc783784385b 100644
--- a/core/modules/rdf/src/Tests/Field/EntityReferenceRdfaTest.php
+++ b/core/modules/rdf/src/Tests/Field/EntityReferenceRdfaTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains \Drupal\rdf\Tests\Field\TaxonomyTermReferenceRdfaTest.
+ * Contains \Drupal\rdf\Tests\Field\EntityReferenceRdfaTest.
  */
 
 namespace Drupal\rdf\Tests\Field;
diff --git a/core/modules/rdf/src/Tests/Field/StringFieldRdfaTest.php b/core/modules/rdf/src/Tests/Field/StringFieldRdfaTest.php
index 92be1d61ac5f2724cfb4125759619a80256b598c..428a43506cdad469d279e45565ff53bb8d38f3b0 100644
--- a/core/modules/rdf/src/Tests/Field/StringFieldRdfaTest.php
+++ b/core/modules/rdf/src/Tests/Field/StringFieldRdfaTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains \Drupal\rdf\Tests\Field\TextFieldRdfaTest.
+ * Contains \Drupal\rdf\Tests\Field\StringFieldRdfaTest.
  */
 
 namespace Drupal\rdf\Tests\Field;
diff --git a/core/modules/rdf/src/Tests/GetNamespacesTest.php b/core/modules/rdf/src/Tests/GetNamespacesTest.php
index da09739ac32af88b9077576fe0e965899dd6e5e0..4b6c220f271e470e38df95d3621289bb21cbb50a 100644
--- a/core/modules/rdf/src/Tests/GetNamespacesTest.php
+++ b/core/modules/rdf/src/Tests/GetNamespacesTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\rdf\Tests\GetNamespacesTest.
+ * Contains \Drupal\rdf\Tests\GetNamespacesTest.
  */
 
 namespace Drupal\rdf\Tests;
diff --git a/core/modules/rdf/src/Tests/GetRdfNamespacesTest.php b/core/modules/rdf/src/Tests/GetRdfNamespacesTest.php
index d5bb87f0adf9b77b69e19ce8177120dc7ae0fa42..6a8ba8d1489cb96fd8cb4541a763951d196cf972 100644
--- a/core/modules/rdf/src/Tests/GetRdfNamespacesTest.php
+++ b/core/modules/rdf/src/Tests/GetRdfNamespacesTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\rdf\Tests\GetRdfNamespacesTest.
+ * Contains \Drupal\rdf\Tests\GetRdfNamespacesTest.
  */
 
 namespace Drupal\rdf\Tests;
diff --git a/core/modules/rdf/src/Tests/UserAttributesTest.php b/core/modules/rdf/src/Tests/UserAttributesTest.php
index 064e67db4c7082e1ce22118dae7ef5ebc6d6e59e..fcaa53b5e2b934a2f9350a98354ff7cebbb3b152 100644
--- a/core/modules/rdf/src/Tests/UserAttributesTest.php
+++ b/core/modules/rdf/src/Tests/UserAttributesTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\rdf\Tests\UserAttributesTest.
+ * Contains \Drupal\rdf\Tests\UserAttributesTest.
  */
 
 namespace Drupal\rdf\Tests;
diff --git a/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php b/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php
index 64d0b7e682bab6110ae6010f4cbd33a53d56b2ae..3620501b030ac5285fd637e12e4c7fb10caaf9c9 100644
--- a/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php
+++ b/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\responsive_image\Plugin\field\formatter\ResponsiveImageFormatter.
+ * Contains \Drupal\responsive_image\Plugin\Field\FieldFormatter\ResponsiveImageFormatter.
  */
 
 namespace Drupal\responsive_image\Plugin\Field\FieldFormatter;
diff --git a/core/modules/responsive_image/src/ResponsiveImageStyleForm.php b/core/modules/responsive_image/src/ResponsiveImageStyleForm.php
index 04241fdda9d8f37dbbcc0d707b715d8b38e31c95..a22742ae74b73062592bfd9d82f7052c56f752a0 100644
--- a/core/modules/responsive_image/src/ResponsiveImageStyleForm.php
+++ b/core/modules/responsive_image/src/ResponsiveImageStyleForm.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\responsive_image\ResponsiveImageStyleForm.
+ * Contains \Drupal\responsive_image\ResponsiveImageStyleForm.
  */
 
 namespace Drupal\responsive_image;
diff --git a/core/modules/responsive_image/src/ResponsiveImageStyleListBuilder.php b/core/modules/responsive_image/src/ResponsiveImageStyleListBuilder.php
index 744edc3f098d130cfb564ae00b13f576947ded8a..5a3da8daac99e4bb9c30a24f60758ce3ff6168fe 100644
--- a/core/modules/responsive_image/src/ResponsiveImageStyleListBuilder.php
+++ b/core/modules/responsive_image/src/ResponsiveImageStyleListBuilder.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\responsive_image\ResponsiveImageStyleListBuilder.
+ * Contains \Drupal\responsive_image\ResponsiveImageStyleListBuilder.
  */
 
 namespace Drupal\responsive_image;
diff --git a/core/modules/responsive_image/src/Tests/ResponsiveImageAdminUITest.php b/core/modules/responsive_image/src/Tests/ResponsiveImageAdminUITest.php
index fae8cf8871a83e176d6e17c4c6ad727b55ef05ae..a3e2213e4517bebbf3e3d4040096828c736ef821 100644
--- a/core/modules/responsive_image/src/Tests/ResponsiveImageAdminUITest.php
+++ b/core/modules/responsive_image/src/Tests/ResponsiveImageAdminUITest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\responsive_image\Tests\ResponsiveImageAdminUITest.
+ * Contains \Drupal\responsive_image\Tests\ResponsiveImageAdminUITest.
  */
 
 namespace Drupal\responsive_image\Tests;
diff --git a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php
index facd063dc5b882fd3667dc3a12bc9e3a18623d43..9b480ca4bcd0fd86122571817695e5681632283c 100644
--- a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php
+++ b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\responsive_image\Tests\ResponsiveImageFieldDisplayTest.
+ * Contains \Drupal\responsive_image\Tests\ResponsiveImageFieldDisplayTest.
  */
 
 namespace Drupal\responsive_image\Tests;
diff --git a/core/modules/rest/src/Access/CSRFAccessCheck.php b/core/modules/rest/src/Access/CSRFAccessCheck.php
index 5db08fe7a7a394232a0284180101126025c5a1c1..f3d07c88fbbdccd920b5c949366bb4846143c3c4 100644
--- a/core/modules/rest/src/Access/CSRFAccessCheck.php
+++ b/core/modules/rest/src/Access/CSRFAccessCheck.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\rest\Access\CSRFAccessCheck.
+ * Contains \Drupal\rest\Access\CSRFAccessCheck.
  */
 
 namespace Drupal\rest\Access;
diff --git a/core/modules/rest/src/LinkManager/LinkManagerInterface.php b/core/modules/rest/src/LinkManager/LinkManagerInterface.php
index 60e56294ba25e628b9a38d6416e0bcee497abc00..26c3bb86f9e62664006bba5fc15ef8e0f2f43ce1 100644
--- a/core/modules/rest/src/LinkManager/LinkManagerInterface.php
+++ b/core/modules/rest/src/LinkManager/LinkManagerInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\rest\LinkManager\LinkManagerInterface
+ * Contains \Drupal\rest\LinkManager\LinkManagerInterface.
  */
 
 namespace Drupal\rest\LinkManager;
diff --git a/core/modules/rest/src/Plugin/Deriver/EntityDeriver.php b/core/modules/rest/src/Plugin/Deriver/EntityDeriver.php
index 160d75d7202addd597770060faa82ce926508388..2cfca7166eb6d675a00dfeac389b283a06bf77bb 100644
--- a/core/modules/rest/src/Plugin/Deriver/EntityDeriver.php
+++ b/core/modules/rest/src/Plugin/Deriver/EntityDeriver.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\rest\Plugin\Deriver\EntityDerivative.
+ * Contains \Drupal\rest\Plugin\Deriver\EntityDeriver.
  */
 
 namespace Drupal\rest\Plugin\Deriver;
diff --git a/core/modules/rest/src/Plugin/Type/ResourcePluginManager.php b/core/modules/rest/src/Plugin/Type/ResourcePluginManager.php
index 97594c4771b2c00c5de4175c7f7545d7f67a0e20..90ad18263c05489dde26d3e09339c4ad23bcbbfd 100644
--- a/core/modules/rest/src/Plugin/Type/ResourcePluginManager.php
+++ b/core/modules/rest/src/Plugin/Type/ResourcePluginManager.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\rest\Plugin\Type\ResourcePluginManager.
+ * Contains \Drupal\rest\Plugin\Type\ResourcePluginManager.
  */
 
 namespace Drupal\rest\Plugin\Type;
diff --git a/core/modules/rest/src/Plugin/rest/resource/EntityResource.php b/core/modules/rest/src/Plugin/rest/resource/EntityResource.php
index 7ed3ff6d5cbf6724c0ef3902e54ee2058747e13e..86310863b874fd9bbf034656ef80e9e8557f070d 100644
--- a/core/modules/rest/src/Plugin/rest/resource/EntityResource.php
+++ b/core/modules/rest/src/Plugin/rest/resource/EntityResource.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\rest\Plugin\rest\resource\EntityResource.
+ * Contains \Drupal\rest\Plugin\rest\resource\EntityResource.
  */
 
 namespace Drupal\rest\Plugin\rest\resource;
diff --git a/core/modules/rest/src/RequestHandler.php b/core/modules/rest/src/RequestHandler.php
index 2aa65ada48453fd35b09ea5cdb19cda09fa63398..b558b217d70497c9f1e81bdeb34c313a1ec22b21 100644
--- a/core/modules/rest/src/RequestHandler.php
+++ b/core/modules/rest/src/RequestHandler.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\rest\RequestHandler.
+ * Contains \Drupal\rest\RequestHandler.
  */
 
 namespace Drupal\rest;
diff --git a/core/modules/rest/src/Tests/AuthTest.php b/core/modules/rest/src/Tests/AuthTest.php
index 4552fc681a12e48c8208446d6492c12fdb6abadb..8d4601a093fbd0afbe1f8a1ea91049c0763654e4 100644
--- a/core/modules/rest/src/Tests/AuthTest.php
+++ b/core/modules/rest/src/Tests/AuthTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\rest\test\AuthTest.
+ * Contains \Drupal\rest\Tests\AuthTest.
  */
 
 namespace Drupal\rest\Tests;
diff --git a/core/modules/rest/src/Tests/CreateTest.php b/core/modules/rest/src/Tests/CreateTest.php
index 4badd7dd5f4828b50da58c8ee61e8deabcbc6968..31fbd88e35ffe3d9e41ae08cf7ec75b5671d8935 100644
--- a/core/modules/rest/src/Tests/CreateTest.php
+++ b/core/modules/rest/src/Tests/CreateTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\rest\test\CreateTest.
+ * Contains \Drupal\rest\Tests\CreateTest.
  */
 
 namespace Drupal\rest\Tests;
diff --git a/core/modules/rest/src/Tests/CsrfTest.php b/core/modules/rest/src/Tests/CsrfTest.php
index a438b173ed78c483ce63146ba2296e77b8a5ba25..af49a334c941287961a6b22af0921b635a87e596 100644
--- a/core/modules/rest/src/Tests/CsrfTest.php
+++ b/core/modules/rest/src/Tests/CsrfTest.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @file
  * Contains \Drupal\rest\Tests\CsrfTest.
  */
 
diff --git a/core/modules/rest/src/Tests/DeleteTest.php b/core/modules/rest/src/Tests/DeleteTest.php
index f205f3024edbf57b5f784d06b58de97ec663f289..5bc69bb5f7c730cc156ab1642b41e52577583848 100644
--- a/core/modules/rest/src/Tests/DeleteTest.php
+++ b/core/modules/rest/src/Tests/DeleteTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\rest\test\DeleteTest.
+ * Contains \Drupal\rest\Tests\DeleteTest.
  */
 
 namespace Drupal\rest\Tests;
diff --git a/core/modules/rest/src/Tests/PageCacheTest.php b/core/modules/rest/src/Tests/PageCacheTest.php
index 573238f810acc8c3770859e611b522f4f87e8377..3ae008450bb4010248c77fe3da56e98d046dc44e 100644
--- a/core/modules/rest/src/Tests/PageCacheTest.php
+++ b/core/modules/rest/src/Tests/PageCacheTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\rest\test\PageCacheTest.
+ * Contains \Drupal\rest\Tests\PageCacheTest.
  */
 
 namespace Drupal\rest\Tests;
diff --git a/core/modules/rest/src/Tests/RESTTestBase.php b/core/modules/rest/src/Tests/RESTTestBase.php
index f31ac53d0b3164d8d0e1ab3e812c388b32425422..46003af33eacc7919edade5ce6fb6de24f1ce7d8 100644
--- a/core/modules/rest/src/Tests/RESTTestBase.php
+++ b/core/modules/rest/src/Tests/RESTTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\rest\test\RESTTestBase.
+ * Contains \Drupal\rest\Tests\RESTTestBase.
  */
 
 namespace Drupal\rest\Tests;
diff --git a/core/modules/rest/src/Tests/ReadTest.php b/core/modules/rest/src/Tests/ReadTest.php
index 983b54742419088bc014964c5e2f6294dd00acae..c59d64f687f8aa1bd7c03be955e63c83b3bb4ed1 100644
--- a/core/modules/rest/src/Tests/ReadTest.php
+++ b/core/modules/rest/src/Tests/ReadTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\rest\test\ReadTest.
+ * Contains \Drupal\rest\Tests\ReadTest.
  */
 
 namespace Drupal\rest\Tests;
diff --git a/core/modules/rest/src/Tests/ResourceTest.php b/core/modules/rest/src/Tests/ResourceTest.php
index af2208575cceb67df414bcbe9c898654ec0fc2ab..f55ad54bcbe0aaef01686ed21b6d36dfba26560b 100644
--- a/core/modules/rest/src/Tests/ResourceTest.php
+++ b/core/modules/rest/src/Tests/ResourceTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\rest\test\ResourceTest.
+ * Contains \Drupal\rest\Tests\ResourceTest.
  */
 
 namespace Drupal\rest\Tests;
diff --git a/core/modules/rest/src/Tests/UpdateTest.php b/core/modules/rest/src/Tests/UpdateTest.php
index 481e33b5f02e4d688c079de2675ef590e97e0c94..2081012d4944f9f97a3f9ed5cec4f56b2412af93 100644
--- a/core/modules/rest/src/Tests/UpdateTest.php
+++ b/core/modules/rest/src/Tests/UpdateTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\rest\test\UpdateTest.
+ * Contains \Drupal\rest\Tests\UpdateTest.
  */
 
 namespace Drupal\rest\Tests;
diff --git a/core/modules/search/src/Controller/SearchController.php b/core/modules/search/src/Controller/SearchController.php
index b7b9a8f97a92a62ac4f7453f59e1f55392f92377..08983c22d3cd4a6c0d24e4213e86615404d65430 100644
--- a/core/modules/search/src/Controller/SearchController.php
+++ b/core/modules/search/src/Controller/SearchController.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\search\Controller\SearchController
+ * Contains \Drupal\search\Controller\SearchController.
  */
 
 namespace Drupal\search\Controller;
diff --git a/core/modules/search/src/Plugin/SearchPluginBase.php b/core/modules/search/src/Plugin/SearchPluginBase.php
index f3d9fc6568d09f9e026107d9e53c775290f93bb1..ee24ea77735c13d1d944d5902da7501d0d4f71ca 100644
--- a/core/modules/search/src/Plugin/SearchPluginBase.php
+++ b/core/modules/search/src/Plugin/SearchPluginBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\search\Plugin\SearchPluginBase
+ * Contains \Drupal\search\Plugin\SearchPluginBase.
  */
 
 namespace Drupal\search\Plugin;
diff --git a/core/modules/search/src/Plugin/views/argument/Search.php b/core/modules/search/src/Plugin/views/argument/Search.php
index 2cafe481410a78f9a0aea738a4ab0aa7d0983522..cffa128f0165d734558fdb451713991eafcd8e7c 100644
--- a/core/modules/search/src/Plugin/views/argument/Search.php
+++ b/core/modules/search/src/Plugin/views/argument/Search.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\search\Plugin\views\argument\Search.
+ * Contains \Drupal\search\Plugin\views\argument\Search.
  */
 
 namespace Drupal\search\Plugin\views\argument;
diff --git a/core/modules/search/src/Plugin/views/field/Score.php b/core/modules/search/src/Plugin/views/field/Score.php
index 7d093b76fb2764f044ce51ce4f03149711d22fdb..6aa9a3401be4c57bf5fc5c3e739cfba427797075 100644
--- a/core/modules/search/src/Plugin/views/field/Score.php
+++ b/core/modules/search/src/Plugin/views/field/Score.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\search\Plugin\views\field\Score.
+ * Contains \Drupal\search\Plugin\views\field\Score.
  */
 
 namespace Drupal\search\Plugin\views\field;
diff --git a/core/modules/search/src/Plugin/views/filter/Search.php b/core/modules/search/src/Plugin/views/filter/Search.php
index 69f53b76f03fd02b0ce4f46a89d365add8dc8018..d675a29abbaf6deb229085fefb8c23358bf83dd0 100644
--- a/core/modules/search/src/Plugin/views/filter/Search.php
+++ b/core/modules/search/src/Plugin/views/filter/Search.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\search\Plugin\views\filter\Search.
+ * Contains \Drupal\search\Plugin\views\filter\Search.
  */
 
 namespace Drupal\search\Plugin\views\filter;
diff --git a/core/modules/search/src/Plugin/views/row/SearchRow.php b/core/modules/search/src/Plugin/views/row/SearchRow.php
index 492a348186a0b92597be1abb4dee4741542fb04c..675f303a0e8683ed222ededb6cab011815094d07 100644
--- a/core/modules/search/src/Plugin/views/row/SearchRow.php
+++ b/core/modules/search/src/Plugin/views/row/SearchRow.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\search\Plugin\views\row\SearchRow.
+ * Contains \Drupal\search\Plugin\views\row\SearchRow.
  */
 
 namespace Drupal\search\Plugin\views\row;
diff --git a/core/modules/search/src/Plugin/views/sort/Score.php b/core/modules/search/src/Plugin/views/sort/Score.php
index 898108b981b30ce6a5dd7af18cd58e768ad3cbfa..cd85ca833e0ba1d37bbde4c1b7bf01ecade47cf0 100644
--- a/core/modules/search/src/Plugin/views/sort/Score.php
+++ b/core/modules/search/src/Plugin/views/sort/Score.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\search\Plugin\views\sort\Score.
+ * Contains \Drupal\search\Plugin\views\sort\Score.
  */
 
 namespace Drupal\search\Plugin\views\sort;
diff --git a/core/modules/search/src/SearchPageRepositoryInterface.php b/core/modules/search/src/SearchPageRepositoryInterface.php
index 7a4a40a1cea6ca7e11b916d8d968fe7dc46dcde6..0bec28b9d924270d050c5075e0181df8eefcc6e6 100644
--- a/core/modules/search/src/SearchPageRepositoryInterface.php
+++ b/core/modules/search/src/SearchPageRepositoryInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\search\SearchPageRepositoryInterface;
+ * Contains \Drupal\search\SearchPageRepositoryInterface.
  */
 
 namespace Drupal\search;
diff --git a/core/modules/search/src/SearchQuery.php b/core/modules/search/src/SearchQuery.php
index 331809a4559df15d10cdc528c067f14097d7ef58..164aa3b18b5f9662fba1bd8ef36a917c035cc252 100644
--- a/core/modules/search/src/SearchQuery.php
+++ b/core/modules/search/src/SearchQuery.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\search\SearchQuery.
+ * Contains \Drupal\search\SearchQuery.
  *
  * Search query extender and helper functions.
  */
diff --git a/core/modules/search/src/Tests/SearchAdvancedSearchFormTest.php b/core/modules/search/src/Tests/SearchAdvancedSearchFormTest.php
index b598849eb86731b207e0f30d6344b433197e25a8..1465f5227701a8067b90162130cdaf3d6961b34b 100644
--- a/core/modules/search/src/Tests/SearchAdvancedSearchFormTest.php
+++ b/core/modules/search/src/Tests/SearchAdvancedSearchFormTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\search\Tests\SearchAdvancedSearchFormTest.
+ * Contains \Drupal\search\Tests\SearchAdvancedSearchFormTest.
  */
 
 namespace Drupal\search\Tests;
diff --git a/core/modules/search/src/Tests/SearchCommentCountToggleTest.php b/core/modules/search/src/Tests/SearchCommentCountToggleTest.php
index 92161d8e951e6e70d52074988afbf451198a7e1e..a2de1e662eed767b0aa91b4bf8b23782bca7b74a 100644
--- a/core/modules/search/src/Tests/SearchCommentCountToggleTest.php
+++ b/core/modules/search/src/Tests/SearchCommentCountToggleTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\search\Tests\SearchCommentCountToggleTest.
+ * Contains \Drupal\search\Tests\SearchCommentCountToggleTest.
  */
 
 namespace Drupal\search\Tests;
diff --git a/core/modules/search/src/Tests/SearchCommentTest.php b/core/modules/search/src/Tests/SearchCommentTest.php
index f674a0de0785412a3ff4e4874e7f3ca7b10ce376..b9916e2bdbdd93da04fb22ac83142b205bc3c015 100644
--- a/core/modules/search/src/Tests/SearchCommentTest.php
+++ b/core/modules/search/src/Tests/SearchCommentTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\search\Tests\SearchCommentTest.
+ * Contains \Drupal\search\Tests\SearchCommentTest.
  */
 
 namespace Drupal\search\Tests;
diff --git a/core/modules/search/src/Tests/SearchEmbedFormTest.php b/core/modules/search/src/Tests/SearchEmbedFormTest.php
index edfe22008118a5b3f29c5db9377d7f6db2f2435a..6db5b37b67444c74e5f2dbb3960ed9dbae8b365f 100644
--- a/core/modules/search/src/Tests/SearchEmbedFormTest.php
+++ b/core/modules/search/src/Tests/SearchEmbedFormTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\search\Tests\SearchEmbedFormTest.
+ * Contains \Drupal\search\Tests\SearchEmbedFormTest.
  */
 
 namespace Drupal\search\Tests;
diff --git a/core/modules/search/src/Tests/SearchExactTest.php b/core/modules/search/src/Tests/SearchExactTest.php
index 74c9468ae33b9414714c06f7dfb7cb91ff7e2844..e4f351113599062edfaaaf7a4564cd8f7d8e46be 100644
--- a/core/modules/search/src/Tests/SearchExactTest.php
+++ b/core/modules/search/src/Tests/SearchExactTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\search\Tests\SearchExactTest.
+ * Contains \Drupal\search\Tests\SearchExactTest.
  */
 
 namespace Drupal\search\Tests;
diff --git a/core/modules/search/src/Tests/SearchExcerptTest.php b/core/modules/search/src/Tests/SearchExcerptTest.php
index 6bea2cb046c1c6fb1da2ea94fc42d16193acc7de..9ed44034391bb796d7764d2fc5d18d4079a2711d 100644
--- a/core/modules/search/src/Tests/SearchExcerptTest.php
+++ b/core/modules/search/src/Tests/SearchExcerptTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\search\Tests\SearchExcerptTest.
+ * Contains \Drupal\search\Tests\SearchExcerptTest.
  */
 
 namespace Drupal\search\Tests;
diff --git a/core/modules/search/src/Tests/SearchLanguageTest.php b/core/modules/search/src/Tests/SearchLanguageTest.php
index f4acf9ca3c93a387c862d0fd2d9bbbb2ad7d4016..66828fb00e5479bb21acf690d77d93a3d16b3c65 100644
--- a/core/modules/search/src/Tests/SearchLanguageTest.php
+++ b/core/modules/search/src/Tests/SearchLanguageTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\search\Tests\SearchLanguageTest.
+ * Contains \Drupal\search\Tests\SearchLanguageTest.
  */
 
 namespace Drupal\search\Tests;
diff --git a/core/modules/search/src/Tests/SearchMatchTest.php b/core/modules/search/src/Tests/SearchMatchTest.php
index a24ef094faabb505e58bb4edcea70e8da2f6bcd3..8e78943dbc144abd46e68dbe4d92f5fc1120c067 100644
--- a/core/modules/search/src/Tests/SearchMatchTest.php
+++ b/core/modules/search/src/Tests/SearchMatchTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\search\Tests\SearchMatchTest.
+ * Contains \Drupal\search\Tests\SearchMatchTest.
  */
 
 namespace Drupal\search\Tests;
diff --git a/core/modules/search/src/Tests/SearchMultilingualEntityTest.php b/core/modules/search/src/Tests/SearchMultilingualEntityTest.php
index aec10e01b2706ad8a02347531e74647b36c2d155..f924de84610b5c268caf57e96e08ed3271685a94 100644
--- a/core/modules/search/src/Tests/SearchMultilingualEntityTest.php
+++ b/core/modules/search/src/Tests/SearchMultilingualEntityTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\search\Tests\SearchMultilingualEntityTest.
+ * Contains \Drupal\search\Tests\SearchMultilingualEntityTest.
  */
 
 namespace Drupal\search\Tests;
diff --git a/core/modules/search/src/Tests/SearchNodeUpdateAndDeletionTest.php b/core/modules/search/src/Tests/SearchNodeUpdateAndDeletionTest.php
index 7a4befbd16c2d78a24d1fe411e481c6ce326cfbe..ed681b3294a1ab2d9f9557c32abc9ca560229afc 100644
--- a/core/modules/search/src/Tests/SearchNodeUpdateAndDeletionTest.php
+++ b/core/modules/search/src/Tests/SearchNodeUpdateAndDeletionTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Definition of Drupal\search\Tests\SearchNodeUpdateAndDeletionTest.
+ * Contains \Drupal\search\Tests\SearchNodeUpdateAndDeletionTest.
  */
 
 namespace Drupal\search\Tests;
diff --git a/core/modules/search/src/Tests/SearchPageTextTest.php b/core/modules/search/src/Tests/SearchPageTextTest.php
index 4614bafbd0b6ff0f693e5d0f09fb9838035a711a..d973ffc5ed74381eb025a8ba13db9e2ad84c48e9 100644
--- a/core/modules/search/src/Tests/SearchPageTextTest.php
+++ b/core/modules/search/src/Tests/SearchPageTextTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\search\Tests\SearchPageTextTest.
+ * Contains \Drupal\search\Tests\SearchPageTextTest.
  */
 
 namespace Drupal\search\Tests;
diff --git a/core/modules/search/src/Tests/SearchPreprocessLangcodeTest.php b/core/modules/search/src/Tests/SearchPreprocessLangcodeTest.php
index 4ef7493ec451a5ee461b4b59d467b03e69c0ecfe..043ba1d043dddbeb819477acc50a7c087bd44693 100644
--- a/core/modules/search/src/Tests/SearchPreprocessLangcodeTest.php
+++ b/core/modules/search/src/Tests/SearchPreprocessLangcodeTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Definition of Drupal\search\Tests\SearchPreprocessLangcodeTest.
+ * Contains \Drupal\search\Tests\SearchPreprocessLangcodeTest.
  */
 
 namespace Drupal\search\Tests;
diff --git a/core/modules/search/src/Tests/SearchQueryAlterTest.php b/core/modules/search/src/Tests/SearchQueryAlterTest.php
index b1811a22cecf4cdcdd89aea30788bdbb662aac92..5e8d216a4cfdbe4c38a6c70efa04a08d039d5837 100644
--- a/core/modules/search/src/Tests/SearchQueryAlterTest.php
+++ b/core/modules/search/src/Tests/SearchQueryAlterTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\search\Tests\SearchQueryAlterTest.
+ * Contains \Drupal\search\Tests\SearchQueryAlterTest.
  */
 
 namespace Drupal\search\Tests;
diff --git a/core/modules/search/src/Tests/SearchRankingTest.php b/core/modules/search/src/Tests/SearchRankingTest.php
index 552c8bb4cbe6b3714933f816e6da6ca8495a26fc..4f12cdf5f096a3523da928204e91f5f85a35f4bf 100644
--- a/core/modules/search/src/Tests/SearchRankingTest.php
+++ b/core/modules/search/src/Tests/SearchRankingTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\search\Tests\SearchRankingTest.
+ * Contains \Drupal\search\Tests\SearchRankingTest.
  */
 
 namespace Drupal\search\Tests;
diff --git a/core/modules/search/src/Tests/SearchSetLocaleTest.php b/core/modules/search/src/Tests/SearchSetLocaleTest.php
index 301cb9bed107ef83981fd8b442d0927cb720583f..f98a00e421f36a3f858898efb8f54b704035c185 100644
--- a/core/modules/search/src/Tests/SearchSetLocaleTest.php
+++ b/core/modules/search/src/Tests/SearchSetLocaleTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\search\Tests\SearchSetLocaleTest.
+ * Contains \Drupal\search\Tests\SearchSetLocaleTest.
  */
 
 namespace Drupal\search\Tests;
diff --git a/core/modules/search/src/Tests/SearchSimplifyTest.php b/core/modules/search/src/Tests/SearchSimplifyTest.php
index 02f9b7565c1367f6f2f69d2f1c6b9e2ca5fb69aa..82363fd13f10e623f935ac8f7560c42f997b73b9 100644
--- a/core/modules/search/src/Tests/SearchSimplifyTest.php
+++ b/core/modules/search/src/Tests/SearchSimplifyTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\search\Tests\SearchSimplifyTest.
+ * Contains \Drupal\search\Tests\SearchSimplifyTest.
  */
 
 namespace Drupal\search\Tests;
diff --git a/core/modules/search/src/Tests/SearchTestBase.php b/core/modules/search/src/Tests/SearchTestBase.php
index 146982812d7226f37c190e463ef32d4bc5380dc2..358319b742e86a06593fa0982f08894cc85e5d81 100644
--- a/core/modules/search/src/Tests/SearchTestBase.php
+++ b/core/modules/search/src/Tests/SearchTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\search\Tests\SearchTestBase.
+ * Contains \Drupal\search\Tests\SearchTestBase.
  */
 
 namespace Drupal\search\Tests;
diff --git a/core/modules/search/src/Tests/SearchTokenizerTest.php b/core/modules/search/src/Tests/SearchTokenizerTest.php
index a9ca22bc7043d66da57c0525f445d31c0eb23f45..204cace481644b4d748524258b9c7bf1577e56d8 100644
--- a/core/modules/search/src/Tests/SearchTokenizerTest.php
+++ b/core/modules/search/src/Tests/SearchTokenizerTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\search\Tests\SearchTokenizerTest.
+ * Contains \Drupal\search\Tests\SearchTokenizerTest.
  */
 
 namespace Drupal\search\Tests;
diff --git a/core/modules/search/src/ViewsSearchQuery.php b/core/modules/search/src/ViewsSearchQuery.php
index d9a8890e36a57e7ba189c4673bcb8ca851a77b04..d725b3a05d2e7189524cf928458f9a9671a22abf 100644
--- a/core/modules/search/src/ViewsSearchQuery.php
+++ b/core/modules/search/src/ViewsSearchQuery.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\search\ViewsSearchQuery.
+ * Contains \Drupal\search\ViewsSearchQuery.
  */
 
 namespace Drupal\search;
diff --git a/core/modules/serialization/src/EntityResolver/ChainEntityResolver.php b/core/modules/serialization/src/EntityResolver/ChainEntityResolver.php
index af105574f8134a3b86f77b87384bf1a0bf13bc1b..669dcb5d7e170d5b3dc2c978f74039ed6af06ed1 100644
--- a/core/modules/serialization/src/EntityResolver/ChainEntityResolver.php
+++ b/core/modules/serialization/src/EntityResolver/ChainEntityResolver.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\serialization\EntityResolver\ChainEntityResolver
+ * Contains \Drupal\serialization\EntityResolver\ChainEntityResolver.
  */
 
 namespace Drupal\serialization\EntityResolver;
diff --git a/core/modules/serialization/src/EntityResolver/ChainEntityResolverInterface.php b/core/modules/serialization/src/EntityResolver/ChainEntityResolverInterface.php
index 16dcfc05b4e8e32e8e3f3fc6d100f119cf8f187e..205d1ff26e267986bd98de3f922a013d35ae5982 100644
--- a/core/modules/serialization/src/EntityResolver/ChainEntityResolverInterface.php
+++ b/core/modules/serialization/src/EntityResolver/ChainEntityResolverInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\serialization\EntityResolver\ChainEntityResolverInterface
+ * Contains \Drupal\serialization\EntityResolver\ChainEntityResolverInterface.
  */
 
 namespace Drupal\serialization\EntityResolver;
diff --git a/core/modules/serialization/src/EntityResolver/EntityResolverInterface.php b/core/modules/serialization/src/EntityResolver/EntityResolverInterface.php
index 9861d56ca91b3d1921b3a98e5cbe80eb4059dfb8..883bb8b8c629e98f150a6087e1cc146c59e7720b 100644
--- a/core/modules/serialization/src/EntityResolver/EntityResolverInterface.php
+++ b/core/modules/serialization/src/EntityResolver/EntityResolverInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\serialization\EntityResolver\EntityResolverInterface
+ * Contains \Drupal\serialization\EntityResolver\EntityResolverInterface.
  */
 
 namespace Drupal\serialization\EntityResolver;
diff --git a/core/modules/serialization/src/EntityResolver/UuidReferenceInterface.php b/core/modules/serialization/src/EntityResolver/UuidReferenceInterface.php
index 75805bef60accf93f600254fd736d897b8b242d5..632eef499453f152e5d60cf2ffa729a2345cc30f 100644
--- a/core/modules/serialization/src/EntityResolver/UuidReferenceInterface.php
+++ b/core/modules/serialization/src/EntityResolver/UuidReferenceInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\serialization\EntityResolver\UuidReferenceInterface
+ * Contains \Drupal\serialization\EntityResolver\UuidReferenceInterface.
  */
 
 namespace Drupal\serialization\EntityResolver;
diff --git a/core/modules/serialization/src/EntityResolver/UuidResolver.php b/core/modules/serialization/src/EntityResolver/UuidResolver.php
index c245eabfad6ff587f5dfc7df6d4ead7e8588dfd3..043fdfd66ceaf10b2f5048ac3dd5f2a36d0f1ca3 100644
--- a/core/modules/serialization/src/EntityResolver/UuidResolver.php
+++ b/core/modules/serialization/src/EntityResolver/UuidResolver.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\serialization\EntityResolver\UuidResolver
+ * Contains \Drupal\serialization\EntityResolver\UuidResolver.
  */
 
 namespace Drupal\serialization\EntityResolver;
diff --git a/core/modules/serialization/src/Tests/NormalizerTestBase.php b/core/modules/serialization/src/Tests/NormalizerTestBase.php
index 8ac44856cc28062fe446d29d25c83279474fdd01..c38c5543359bc9878a1aa45d9a1f4a3f36e54466 100644
--- a/core/modules/serialization/src/Tests/NormalizerTestBase.php
+++ b/core/modules/serialization/src/Tests/NormalizerTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- *
+ * Contains \Drupal\serialization\Tests\NormalizerTestBase.
  */
 
 namespace Drupal\serialization\Tests;
diff --git a/core/modules/serialization/tests/src/Unit/Normalizer/NullNormalizerTest.php b/core/modules/serialization/tests/src/Unit/Normalizer/NullNormalizerTest.php
index e79c07f2d8f7caff02bfa5691966626b47156f9c..28c7af7e531e7b639a014aae2bce89b43869f178 100644
--- a/core/modules/serialization/tests/src/Unit/Normalizer/NullNormalizerTest.php
+++ b/core/modules/serialization/tests/src/Unit/Normalizer/NullNormalizerTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\serialization\Unit\Normalizer\NullNormalizerTest
+ * Contains \Drupal\Tests\serialization\Unit\Normalizer\NullNormalizerTest.
  */
 
 namespace Drupal\Tests\serialization\Unit\Normalizer;
diff --git a/core/modules/serialization/tests/src/Unit/Normalizer/TypedDataNormalizerTest.php b/core/modules/serialization/tests/src/Unit/Normalizer/TypedDataNormalizerTest.php
index 4d285a562fb7728a269867b498e47764f9adaaf3..1b9c10115bac8634a1107eec283f8ab3c5581c08 100644
--- a/core/modules/serialization/tests/src/Unit/Normalizer/TypedDataNormalizerTest.php
+++ b/core/modules/serialization/tests/src/Unit/Normalizer/TypedDataNormalizerTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\serialization\Unit\Normalizer\TypedDataNormalizerTest
+ * Contains \Drupal\Tests\serialization\Unit\Normalizer\TypedDataNormalizerTest.
  */
 
 namespace Drupal\Tests\serialization\Unit\Normalizer;
diff --git a/core/modules/shortcut/src/Tests/ShortcutSetsTest.php b/core/modules/shortcut/src/Tests/ShortcutSetsTest.php
index db98745d9f54daacb3ac3a5e2c83cd4d4f694536..75112058f56019b4ad148ef1753524021a1e2077 100644
--- a/core/modules/shortcut/src/Tests/ShortcutSetsTest.php
+++ b/core/modules/shortcut/src/Tests/ShortcutSetsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\shortcut\Tests\ShortcutSetsTest.
+ * Contains \Drupal\shortcut\Tests\ShortcutSetsTest.
  */
 
 namespace Drupal\shortcut\Tests;
diff --git a/core/modules/shortcut/src/Tests/ShortcutTestBase.php b/core/modules/shortcut/src/Tests/ShortcutTestBase.php
index eabfbedba4b4724d1f46ae96fb35e857fdd2258a..a4b2acafad7aaf4c78ae9b25598a524539ee6f99 100644
--- a/core/modules/shortcut/src/Tests/ShortcutTestBase.php
+++ b/core/modules/shortcut/src/Tests/ShortcutTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\shortcut\Tests\ShortcutTestBase.
+ * Contains \Drupal\shortcut\Tests\ShortcutTestBase.
  */
 
 namespace Drupal\shortcut\Tests;
diff --git a/core/modules/simpletest/src/TestBase.php b/core/modules/simpletest/src/TestBase.php
index 5471ed6391bd67b52f641e2d0e6836d3525aaa68..fded92d84adb1c8521ecddb9af7d2250f2e38e14 100644
--- a/core/modules/simpletest/src/TestBase.php
+++ b/core/modules/simpletest/src/TestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of \Drupal\simpletest\TestBase.
+ * Contains \Drupal\simpletest\TestBase.
  */
 
 namespace Drupal\simpletest;
diff --git a/core/modules/simpletest/src/TestServiceProvider.php b/core/modules/simpletest/src/TestServiceProvider.php
index 9b26f12c5f99b886516aa40b7371a9944826066b..64dedb8bbb6424899a853ccd812de2568c9dce87 100644
--- a/core/modules/simpletest/src/TestServiceProvider.php
+++ b/core/modules/simpletest/src/TestServiceProvider.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\simpletest\TestServiceProvider.
+ */
+
 namespace Drupal\simpletest;
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
diff --git a/core/modules/simpletest/src/Tests/BrokenSetUpTest.php b/core/modules/simpletest/src/Tests/BrokenSetUpTest.php
index 6621545bf75b776c5e4730a797b5cf6ddeb74736..e5c1ebbdc2d4f4f2be79bdd317c1254f41153ef9 100644
--- a/core/modules/simpletest/src/Tests/BrokenSetUpTest.php
+++ b/core/modules/simpletest/src/Tests/BrokenSetUpTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of \Drupal\simpletest\Tests\BrokenSetUpTest.
+ * Contains \Drupal\simpletest\Tests\BrokenSetUpTest.
  */
 
 namespace Drupal\simpletest\Tests;
diff --git a/core/modules/simpletest/src/Tests/BrowserTest.php b/core/modules/simpletest/src/Tests/BrowserTest.php
index d43f63b59212961daafbe2f89b912ccc5a9ddcc0..02422e7a2dd340d0505af28cddf313eb7075d588 100644
--- a/core/modules/simpletest/src/Tests/BrowserTest.php
+++ b/core/modules/simpletest/src/Tests/BrowserTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of \Drupal\simpletest\Tests\BrowserTest.
+ * Contains \Drupal\simpletest\Tests\BrowserTest.
  */
 
 namespace Drupal\simpletest\Tests;
diff --git a/core/modules/simpletest/src/Tests/FolderTest.php b/core/modules/simpletest/src/Tests/FolderTest.php
index 99e2ee7e3bc63b38a5b7c749319c3cf162e5dde2..5af7e4771301689925bf64f78dd3a2f6506ad045 100644
--- a/core/modules/simpletest/src/Tests/FolderTest.php
+++ b/core/modules/simpletest/src/Tests/FolderTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of \Drupal\simpletest\Tests\FolderTest.
+ * Contains \Drupal\simpletest\Tests\FolderTest.
  */
 
 namespace Drupal\simpletest\Tests;
diff --git a/core/modules/simpletest/src/Tests/InstallationProfileModuleTestsTest.php b/core/modules/simpletest/src/Tests/InstallationProfileModuleTestsTest.php
index 424469a204b8cdfe7ccef392c6f32a4df0e6b39b..544dabd2dd19d78ef4de1a0e203cad8225189b6f 100644
--- a/core/modules/simpletest/src/Tests/InstallationProfileModuleTestsTest.php
+++ b/core/modules/simpletest/src/Tests/InstallationProfileModuleTestsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of \Drupal\simpletest\Tests\InstallationProfileModuleTestsTest.
+ * Contains \Drupal\simpletest\Tests\InstallationProfileModuleTestsTest.
  */
 
 namespace Drupal\simpletest\Tests;
diff --git a/core/modules/simpletest/src/Tests/MailCaptureTest.php b/core/modules/simpletest/src/Tests/MailCaptureTest.php
index 00b4be8cbfe73ae6919c0e4dbc83793e7eff3847..e86dc24c77d0db0fb3c066a9afb54d491e2c6dad 100644
--- a/core/modules/simpletest/src/Tests/MailCaptureTest.php
+++ b/core/modules/simpletest/src/Tests/MailCaptureTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of \Drupal\simpletest\Tests\MailCaptureTest.
+ * Contains \Drupal\simpletest\Tests\MailCaptureTest.
  */
 
 namespace Drupal\simpletest\Tests;
diff --git a/core/modules/simpletest/src/Tests/MissingCheckedRequirementsTest.php b/core/modules/simpletest/src/Tests/MissingCheckedRequirementsTest.php
index e4790f9a1f7deb237c04c42e0f9eb7b90d3a2648..fd8d8e0d8088abfb309ea43b388c42a94f2114b1 100644
--- a/core/modules/simpletest/src/Tests/MissingCheckedRequirementsTest.php
+++ b/core/modules/simpletest/src/Tests/MissingCheckedRequirementsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of \Drupal\simpletest\Tests\MissingCheckedRequirementsTest.
+ * Contains \Drupal\simpletest\Tests\MissingCheckedRequirementsTest.
  */
 
 namespace Drupal\simpletest\Tests;
diff --git a/core/modules/simpletest/src/Tests/MissingDependentModuleUnitTest.php b/core/modules/simpletest/src/Tests/MissingDependentModuleUnitTest.php
index a9e375cfd59b744700b3a7bc67aa51d726716478..d1827289596b5bee9aec2eb1cd924bcd5c36a4a6 100644
--- a/core/modules/simpletest/src/Tests/MissingDependentModuleUnitTest.php
+++ b/core/modules/simpletest/src/Tests/MissingDependentModuleUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of \Drupal\simpletest\Tests\MissingDependentModuleUnitTest.
+ * Contains \Drupal\simpletest\Tests\MissingDependentModuleUnitTest.
  */
 
 namespace Drupal\simpletest\Tests;
diff --git a/core/modules/simpletest/src/Tests/SimpleTestTest.php b/core/modules/simpletest/src/Tests/SimpleTestTest.php
index 479ca391e0b465a647ea4ec4b0975be41bb8b2ce..e4df908793faa303e41b3728c7140bc3f3b545d0 100644
--- a/core/modules/simpletest/src/Tests/SimpleTestTest.php
+++ b/core/modules/simpletest/src/Tests/SimpleTestTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of \Drupal\simpletest\Tests\SimpleTestTest.
+ * Contains \Drupal\simpletest\Tests\SimpleTestTest.
  */
 
 namespace Drupal\simpletest\Tests;
diff --git a/core/modules/simpletest/src/Tests/UserHelpersTest.php b/core/modules/simpletest/src/Tests/UserHelpersTest.php
index fb15567a9220e92cca7b3fa9b0f0587d2149417a..3df1b64883303bb5f1da0e3e2bd4e1c6875dc7ee 100644
--- a/core/modules/simpletest/src/Tests/UserHelpersTest.php
+++ b/core/modules/simpletest/src/Tests/UserHelpersTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\simpletest\Tests\UserLoginTest.
+ * Contains \Drupal\simpletest\Tests\UserHelpersTest.
  */
 
 namespace Drupal\simpletest\Tests;
diff --git a/core/modules/simpletest/src/WebTestBase.php b/core/modules/simpletest/src/WebTestBase.php
index 6bd21a5c2376975f380e3a646085b7edd2dac7d1..a0062844d08e56eaba43ab9a55011e53bf62bd53 100644
--- a/core/modules/simpletest/src/WebTestBase.php
+++ b/core/modules/simpletest/src/WebTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of \Drupal\simpletest\WebTestBase.
+ * Contains \Drupal\simpletest\WebTestBase.
  */
 
 namespace Drupal\simpletest;
diff --git a/core/modules/simpletest/tests/src/Unit/PhpUnitErrorTest.php b/core/modules/simpletest/tests/src/Unit/PhpUnitErrorTest.php
index 0a82609e97eb6dfd2af6207e70a119ab5e63d3b2..37b854678258c1f1f13a464ca3db9d7b95618d4f 100644
--- a/core/modules/simpletest/tests/src/Unit/PhpUnitErrorTest.php
+++ b/core/modules/simpletest/tests/src/Unit/PhpUnitErrorTest.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\Tests\simpletest\Unit\PhpUnitErrorTest.
+ */
+
 namespace Drupal\Tests\simpletest\Unit;
 
 use Drupal\Tests\UnitTestCase;
diff --git a/core/modules/simpletest/tests/src/Unit/TestInfoParsingTest.php b/core/modules/simpletest/tests/src/Unit/TestInfoParsingTest.php
index a6953cf9dc3171ffdbad48773603b82fac461ff2..d527996e4fa75e221248a9177ddffb9c5a485492 100644
--- a/core/modules/simpletest/tests/src/Unit/TestInfoParsingTest.php
+++ b/core/modules/simpletest/tests/src/Unit/TestInfoParsingTest.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\Tests\simpletest\Unit\TestInfoParsingTest.
+ */
+
 namespace Drupal\Tests\simpletest\Unit;
 
 use Drupal\Tests\UnitTestCase;
diff --git a/core/modules/statistics/src/Tests/StatisticsAdminTest.php b/core/modules/statistics/src/Tests/StatisticsAdminTest.php
index d2561a96142e442173b35fbf0d071e5298559202..476b2ff16e928567035648fcea74effd2009f5bd 100644
--- a/core/modules/statistics/src/Tests/StatisticsAdminTest.php
+++ b/core/modules/statistics/src/Tests/StatisticsAdminTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\statistics\Tests\StatisticsAdminTest.
+ * Contains \Drupal\statistics\Tests\StatisticsAdminTest.
  */
 
 namespace Drupal\statistics\Tests;
diff --git a/core/modules/statistics/src/Tests/StatisticsLoggingTest.php b/core/modules/statistics/src/Tests/StatisticsLoggingTest.php
index cc792cd875b43d4903c6c9b96863c59336f2a5ca..02dcfbcb016ba6df79e16ebd56ae770f1c92ae2f 100644
--- a/core/modules/statistics/src/Tests/StatisticsLoggingTest.php
+++ b/core/modules/statistics/src/Tests/StatisticsLoggingTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\statistics\Tests\StatisticsLoggingTest.
+ * Contains \Drupal\statistics\Tests\StatisticsLoggingTest.
  */
 
 namespace Drupal\statistics\Tests;
diff --git a/core/modules/statistics/src/Tests/StatisticsReportsTest.php b/core/modules/statistics/src/Tests/StatisticsReportsTest.php
index 7f2937d08f7ed1ec4459356c0c89621083773eec..50e5f5e3eb86183ef9dedb632d58dd15b15249cc 100644
--- a/core/modules/statistics/src/Tests/StatisticsReportsTest.php
+++ b/core/modules/statistics/src/Tests/StatisticsReportsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\statistics\Tests\StatisticsReportsTest.
+ * Contains \Drupal\statistics\Tests\StatisticsReportsTest.
  */
 
 namespace Drupal\statistics\Tests;
diff --git a/core/modules/statistics/src/Tests/StatisticsTestBase.php b/core/modules/statistics/src/Tests/StatisticsTestBase.php
index 077267e58f5d18081cb34e678b2cdbbaa8d7004d..ccd635eb62867d491ef11545c93877e17a014c10 100644
--- a/core/modules/statistics/src/Tests/StatisticsTestBase.php
+++ b/core/modules/statistics/src/Tests/StatisticsTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\statistics\Tests\StatisticsTestBase.
+ * Contains \Drupal\statistics\Tests\StatisticsTestBase.
  */
 
 namespace Drupal\statistics\Tests;
diff --git a/core/modules/statistics/src/Tests/StatisticsTokenReplaceTest.php b/core/modules/statistics/src/Tests/StatisticsTokenReplaceTest.php
index d481f0141da0776c6c0bf1a9c778619c7f8d3554..9534c8a28ddc52a27471139b9ec5e768472eafaf 100644
--- a/core/modules/statistics/src/Tests/StatisticsTokenReplaceTest.php
+++ b/core/modules/statistics/src/Tests/StatisticsTokenReplaceTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\statistics\Tests\StatisticsTokenReplaceTest.
+ * Contains \Drupal\statistics\Tests\StatisticsTokenReplaceTest.
  */
 
 namespace Drupal\statistics\Tests;
diff --git a/core/modules/syslog/src/Tests/SyslogTest.php b/core/modules/syslog/src/Tests/SyslogTest.php
index 6d479ac5939ef4ec8c53ae1015f7b5b78f82298c..bb58719009ca59bc16fd3684f4855f728ceaa2d2 100644
--- a/core/modules/syslog/src/Tests/SyslogTest.php
+++ b/core/modules/syslog/src/Tests/SyslogTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\syslog\Tests\SyslogTest.
+ * Contains \Drupal\syslog\Tests\SyslogTest.
  */
 
 namespace Drupal\syslog\Tests;
diff --git a/core/modules/system/src/Access/CronAccessCheck.php b/core/modules/system/src/Access/CronAccessCheck.php
index fa555da17b174283d4c281cafce8a4644d106ff6..a14c916a39c55634cb10518ec2f22262dfe793c8 100644
--- a/core/modules/system/src/Access/CronAccessCheck.php
+++ b/core/modules/system/src/Access/CronAccessCheck.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Access\CronAccessCheck.
+ * Contains \Drupal\system\Access\CronAccessCheck.
  */
 
 namespace Drupal\system\Access;
diff --git a/core/modules/system/src/Access/DbUpdateAccessCheck.php b/core/modules/system/src/Access/DbUpdateAccessCheck.php
index f78199185141adbb630bde77c087bfad72380c57..03058842f304082c4b315189acdd917f8340d274 100644
--- a/core/modules/system/src/Access/DbUpdateAccessCheck.php
+++ b/core/modules/system/src/Access/DbUpdateAccessCheck.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Access\DbUpdateAccessCheck.
+ * Contains \Drupal\system\Access\DbUpdateAccessCheck.
  */
 
 namespace Drupal\system\Access;
diff --git a/core/modules/system/src/Controller/TimezoneController.php b/core/modules/system/src/Controller/TimezoneController.php
index e9835d8e1a19e08fe575067a59ba641a602486fd..a7ae165a23370e8b2c6ad47bc7c3bdb5e0ce19a1 100644
--- a/core/modules/system/src/Controller/TimezoneController.php
+++ b/core/modules/system/src/Controller/TimezoneController.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\TimezoneController.
+ * Contains \Drupal\system\Controller\TimezoneController.
  */
 
 namespace Drupal\system\Controller;
diff --git a/core/modules/system/src/CronController.php b/core/modules/system/src/CronController.php
index 67d9354ba55192841cf63d529b8920135257c3f5..8b05562392218e475ea3c458160b854ef2c9c21a 100644
--- a/core/modules/system/src/CronController.php
+++ b/core/modules/system/src/CronController.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\CronController.
+ * Contains \Drupal\system\CronController.
  */
 
 namespace Drupal\system;
diff --git a/core/modules/system/src/EventSubscriber/AdminRouteSubscriber.php b/core/modules/system/src/EventSubscriber/AdminRouteSubscriber.php
index 316a1a60d08a2aa5f4ab3ab72125c3e5c0fecdab..b78b45df9ab0f01fb0fcfb9bd77947d09060dc24 100644
--- a/core/modules/system/src/EventSubscriber/AdminRouteSubscriber.php
+++ b/core/modules/system/src/EventSubscriber/AdminRouteSubscriber.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\EventSubscriber\AdminRouteSubscriber
+ * Contains \Drupal\system\EventSubscriber\AdminRouteSubscriber.
  */
 
 namespace Drupal\system\EventSubscriber;
diff --git a/core/modules/system/src/EventSubscriber/AutomaticCron.php b/core/modules/system/src/EventSubscriber/AutomaticCron.php
index 15c5b6ca36c9151796b10780a042edb5f9d53f17..3b630df1a169428e4805b48a1b28c57a19884b24 100644
--- a/core/modules/system/src/EventSubscriber/AutomaticCron.php
+++ b/core/modules/system/src/EventSubscriber/AutomaticCron.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\EventSubscriber\AutomaticCron.
+ * Contains \Drupal\system\EventSubscriber\AutomaticCron.
  */
 
 namespace Drupal\system\EventSubscriber;
diff --git a/core/modules/system/src/FileAjaxForm.php b/core/modules/system/src/FileAjaxForm.php
index 1be14b4e5188eafe46c9ba9c0b0c305a958c786c..0400f7fce01424a30dd7acc0447f3d52a5223a95 100644
--- a/core/modules/system/src/FileAjaxForm.php
+++ b/core/modules/system/src/FileAjaxForm.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\FileAjaxForm.
+ * Contains \Drupal\system\FileAjaxForm.
  */
 
 namespace Drupal\system;
diff --git a/core/modules/system/src/Form/ThemeAdminForm.php b/core/modules/system/src/Form/ThemeAdminForm.php
index ed00639549f83d36e00a6fb5dcdae667622e2569..260cedaf290f3501a08658259ec2e9e36f40ea2b 100644
--- a/core/modules/system/src/Form/ThemeAdminForm.php
+++ b/core/modules/system/src/Form/ThemeAdminForm.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains \Drupal\system\Form\ThemeAdminForm
+ * Contains \Drupal\system\Form\ThemeAdminForm.
  */
 
 namespace Drupal\system\Form;
diff --git a/core/modules/system/src/MenuInterface.php b/core/modules/system/src/MenuInterface.php
index 340d9ed6ab545d64f0f2f11ebc59aaf0e19837a5..baa81733db0fac0b6683bfb4b4d7fdaf8fbdf060 100644
--- a/core/modules/system/src/MenuInterface.php
+++ b/core/modules/system/src/MenuInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Entity\MenuInterface.
+ * Contains \Drupal\system\MenuInterface.
  */
 
 namespace Drupal\system;
diff --git a/core/modules/system/src/PathProcessor/PathProcessorFiles.php b/core/modules/system/src/PathProcessor/PathProcessorFiles.php
index bce1f7f8f4b1b2ca3539ac711bb13d8baf1d90a5..17730aa59998f8176799de828057869d93f81c62 100644
--- a/core/modules/system/src/PathProcessor/PathProcessorFiles.php
+++ b/core/modules/system/src/PathProcessor/PathProcessorFiles.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\PathProcessor\PathProcessorPrivateFiles.
+ * Contains \Drupal\system\PathProcessor\PathProcessorFiles.
  */
 
 namespace Drupal\system\PathProcessor;
diff --git a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/GDImageToolkitOperationBase.php b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/GDImageToolkitOperationBase.php
index b1a9b79b4675158cb99f8a25f2b670bed03ba973..5b9b50428af8a46128e11c78c7ec22b36a81890c 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/GDImageToolkitOperationBase.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/GDImageToolkitOperationBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Plugin\ImageToolkit\Operation\gd\GDToolkitOperationBase
+ * Contains \Drupal\system\Plugin\ImageToolkit\Operation\gd\GDImageToolkitOperationBase.
  */
 
 namespace Drupal\system\Plugin\ImageToolkit\Operation\gd;
diff --git a/core/modules/system/src/Tests/Ajax/AjaxTestBase.php b/core/modules/system/src/Tests/Ajax/AjaxTestBase.php
index 588da098e72dce9b943978ac7e4fae90082dfd52..a4c7bfc9673bf4bac7472689492f2ff9c406c95b 100644
--- a/core/modules/system/src/Tests/Ajax/AjaxTestBase.php
+++ b/core/modules/system/src/Tests/Ajax/AjaxTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Ajax\AjaxTestBase.
+ * Contains \Drupal\system\Tests\Ajax\AjaxTestBase.
  */
 
 namespace Drupal\system\Tests\Ajax;
diff --git a/core/modules/system/src/Tests/Ajax/DialogTest.php b/core/modules/system/src/Tests/Ajax/DialogTest.php
index 58426c941a307be58bd64c5e655c51ae646291eb..83a102b27d7ad0130078f4dd169cfbf1d076a95b 100644
--- a/core/modules/system/src/Tests/Ajax/DialogTest.php
+++ b/core/modules/system/src/Tests/Ajax/DialogTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Ajax\DialogTest.
+ * Contains \Drupal\system\Tests\Ajax\DialogTest.
  */
 
 namespace Drupal\system\Tests\Ajax;
diff --git a/core/modules/system/src/Tests/Ajax/ElementValidationTest.php b/core/modules/system/src/Tests/Ajax/ElementValidationTest.php
index 455ae464354ac37bc7bdbdc8bdfefb8051f8ff63..73328aab67c33fcbe3858523a93b653114f25ee6 100644
--- a/core/modules/system/src/Tests/Ajax/ElementValidationTest.php
+++ b/core/modules/system/src/Tests/Ajax/ElementValidationTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Ajax\ElementValidationTest.
+ * Contains \Drupal\system\Tests\Ajax\ElementValidationTest.
  */
 
 namespace Drupal\system\Tests\Ajax;
diff --git a/core/modules/system/src/Tests/Ajax/MultiFormTest.php b/core/modules/system/src/Tests/Ajax/MultiFormTest.php
index 70a085b1af1ec3075e634acc44cd3e8c8728cb0c..5c3a60aa6b683b2a6b40299e4b3e8aa273114ddd 100644
--- a/core/modules/system/src/Tests/Ajax/MultiFormTest.php
+++ b/core/modules/system/src/Tests/Ajax/MultiFormTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Ajax\MultiFormTest.
+ * Contains \Drupal\system\Tests\Ajax\MultiFormTest.
  */
 
 namespace Drupal\system\Tests\Ajax;
diff --git a/core/modules/system/src/Tests/Batch/PageTest.php b/core/modules/system/src/Tests/Batch/PageTest.php
index ad5d83ab07698f91f1e99f24cbfa257797aa23e1..3d9adfcafc39f6f384d21fbcb267c01b31cbae72 100644
--- a/core/modules/system/src/Tests/Batch/PageTest.php
+++ b/core/modules/system/src/Tests/Batch/PageTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Batch\PageTest.
+ * Contains \Drupal\system\Tests\Batch\PageTest.
  */
 
 namespace Drupal\system\Tests\Batch;
diff --git a/core/modules/system/src/Tests/Batch/ProcessingTest.php b/core/modules/system/src/Tests/Batch/ProcessingTest.php
index 243eb06c41c2a64e5d1956343aefc60b74be7370..fe198230ed5bfba2da285bae5b6da8a357b6ac77 100644
--- a/core/modules/system/src/Tests/Batch/ProcessingTest.php
+++ b/core/modules/system/src/Tests/Batch/ProcessingTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Batch\ProcessingTest.
+ * Contains \Drupal\system\Tests\Batch\ProcessingTest.
  */
 
 namespace Drupal\system\Tests\Batch;
diff --git a/core/modules/system/src/Tests/Block/SystemMenuBlockTest.php b/core/modules/system/src/Tests/Block/SystemMenuBlockTest.php
index ef4fc8b3a7c96431b43f1bb24c1abc990682845a..a28b696b5a83691eb2b33bfd7161468eca39cf6f 100644
--- a/core/modules/system/src/Tests/Block/SystemMenuBlockTest.php
+++ b/core/modules/system/src/Tests/Block/SystemMenuBlockTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * Contains \Drupal\system\Tests\Block\SystemMenuBlockTest
+ * @file
+ * Contains \Drupal\system\Tests\Block\SystemMenuBlockTest.
  */
 
 namespace Drupal\system\Tests\Block;
diff --git a/core/modules/system/src/Tests/Bootstrap/GetFilenameUnitTest.php b/core/modules/system/src/Tests/Bootstrap/GetFilenameUnitTest.php
index 948aeb7943285d9b6feef2ee49e71b15c7fb57f5..27ca16221f10e720d29b035d1c392ff8fb311d0c 100644
--- a/core/modules/system/src/Tests/Bootstrap/GetFilenameUnitTest.php
+++ b/core/modules/system/src/Tests/Bootstrap/GetFilenameUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Bootstrap\GetFilenameUnitTest.
+ * Contains \Drupal\system\Tests\Bootstrap\GetFilenameUnitTest.
  */
 
 namespace Drupal\system\Tests\Bootstrap;
diff --git a/core/modules/system/src/Tests/Bootstrap/ResettableStaticUnitTest.php b/core/modules/system/src/Tests/Bootstrap/ResettableStaticUnitTest.php
index 4dd34c8107a558697b9cda151a546aa9e9a9bfc8..1cc0c858fec0ba2a788a37998447897e9db07d87 100644
--- a/core/modules/system/src/Tests/Bootstrap/ResettableStaticUnitTest.php
+++ b/core/modules/system/src/Tests/Bootstrap/ResettableStaticUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Bootstrap\ResettableStaticUnitTest.
+ * Contains \Drupal\system\Tests\Bootstrap\ResettableStaticUnitTest.
  */
 
 namespace Drupal\system\Tests\Bootstrap;
diff --git a/core/modules/system/src/Tests/Cache/BackendChainUnitTest.php b/core/modules/system/src/Tests/Cache/BackendChainUnitTest.php
index 4c90701f54af696ab9e61257ac46aba8eaf1cb2e..6664ecf5e68f5175c0df9d6bf428ed8bd6427bd7 100644
--- a/core/modules/system/src/Tests/Cache/BackendChainUnitTest.php
+++ b/core/modules/system/src/Tests/Cache/BackendChainUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Cache\BackendChainUnitTest.
+ * Contains \Drupal\system\Tests\Cache\BackendChainUnitTest.
  */
 
 namespace Drupal\system\Tests\Cache;
diff --git a/core/modules/system/src/Tests/Cache/CacheTestBase.php b/core/modules/system/src/Tests/Cache/CacheTestBase.php
index df52a3768ea1bfe7017aa7163064e2dddf8b64a4..e15cc8c3e75f7a287cddf67d0de64b040e2dc2a7 100644
--- a/core/modules/system/src/Tests/Cache/CacheTestBase.php
+++ b/core/modules/system/src/Tests/Cache/CacheTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Cache\CacheTestBase.
+ * Contains \Drupal\system\Tests\Cache\CacheTestBase.
  */
 
 namespace Drupal\system\Tests\Cache;
diff --git a/core/modules/system/src/Tests/Cache/ClearTest.php b/core/modules/system/src/Tests/Cache/ClearTest.php
index 7ba9419b612ca08c50e2fbae4ef9d2bc7c26f8ff..4e13008724a10b53bb8954e47d689b69b998308c 100644
--- a/core/modules/system/src/Tests/Cache/ClearTest.php
+++ b/core/modules/system/src/Tests/Cache/ClearTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Cache\ClearTest.
+ * Contains \Drupal\system\Tests\Cache\ClearTest.
  */
 
 namespace Drupal\system\Tests\Cache;
diff --git a/core/modules/system/src/Tests/Cache/DatabaseBackendUnitTest.php b/core/modules/system/src/Tests/Cache/DatabaseBackendUnitTest.php
index e182cc0b104b41354214ab5e937a1db28d3a8439..934fe81ddaabe5230d11a62b3fc604e9b88a0007 100644
--- a/core/modules/system/src/Tests/Cache/DatabaseBackendUnitTest.php
+++ b/core/modules/system/src/Tests/Cache/DatabaseBackendUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Cache\DatabaseBackendUnitTest.
+ * Contains \Drupal\system\Tests\Cache\DatabaseBackendUnitTest.
  */
 
 namespace Drupal\system\Tests\Cache;
diff --git a/core/modules/system/src/Tests/Cache/MemoryBackendUnitTest.php b/core/modules/system/src/Tests/Cache/MemoryBackendUnitTest.php
index 0dfeae710ae7e76315f36a5bfd760ad95afbe57d..d9021fff2e2a3b019e75c29548eff1e265a84a30 100644
--- a/core/modules/system/src/Tests/Cache/MemoryBackendUnitTest.php
+++ b/core/modules/system/src/Tests/Cache/MemoryBackendUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Cache\MemoryBackendUnitTest.
+ * Contains \Drupal\system\Tests\Cache\MemoryBackendUnitTest.
  */
 
 namespace Drupal\system\Tests\Cache;
diff --git a/core/modules/system/src/Tests/Common/AddFeedTest.php b/core/modules/system/src/Tests/Common/AddFeedTest.php
index fbb9cc21d8866b320c5bd18acbcd678f4b979b9b..9634163996331a1e2d1d82fda8d57b56e4bf44ba 100644
--- a/core/modules/system/src/Tests/Common/AddFeedTest.php
+++ b/core/modules/system/src/Tests/Common/AddFeedTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Common\AddFeedTest.
+ * Contains \Drupal\system\Tests\Common\AddFeedTest.
  */
 
 namespace Drupal\system\Tests\Common;
diff --git a/core/modules/system/src/Tests/Common/AlterTest.php b/core/modules/system/src/Tests/Common/AlterTest.php
index a0eb95b1186c9d3c1a2a26f26f99f89b4b1a8f42..ae92618eea61cf2751ea62b5c80903a91088a258 100644
--- a/core/modules/system/src/Tests/Common/AlterTest.php
+++ b/core/modules/system/src/Tests/Common/AlterTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Common\AlterTest.
+ * Contains \Drupal\system\Tests\Common\AlterTest.
  */
 
 namespace Drupal\system\Tests\Common;
diff --git a/core/modules/system/src/Tests/Common/AttachedAssetsTest.php b/core/modules/system/src/Tests/Common/AttachedAssetsTest.php
index a9701ffc0888e657a750839a7ec47d935b43ccb1..ca8dbc6d03cbafed65dbf3e4bfea429f68b1bd76 100644
--- a/core/modules/system/src/Tests/Common/AttachedAssetsTest.php
+++ b/core/modules/system/src/Tests/Common/AttachedAssetsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Common\JavaScriptTest.
+ * Contains \Drupal\system\Tests\Common\AttachedAssetsTest.
  */
 
 namespace Drupal\system\Tests\Common;
diff --git a/core/modules/system/src/Tests/Common/FormatDateTest.php b/core/modules/system/src/Tests/Common/FormatDateTest.php
index f9959bd2f260e8f2758ab7e28899d01663f3c271..0ece4583fb66fb690bfa1f3ba385ca1183abda84 100644
--- a/core/modules/system/src/Tests/Common/FormatDateTest.php
+++ b/core/modules/system/src/Tests/Common/FormatDateTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Common\FormatDateTest.
+ * Contains \Drupal\system\Tests\Common\FormatDateTest.
  */
 
 namespace Drupal\system\Tests\Common;
diff --git a/core/modules/system/src/Tests/Common/RenderElementTypesTest.php b/core/modules/system/src/Tests/Common/RenderElementTypesTest.php
index a18fd7776d045bdae207d812708a2e20f231e58f..d7c42cd10238e2b9d81f7beaf6ef783cb3e952e5 100644
--- a/core/modules/system/src/Tests/Common/RenderElementTypesTest.php
+++ b/core/modules/system/src/Tests/Common/RenderElementTypesTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\Common\RenderElementTypesTest.
+ * Contains \Drupal\system\Tests\Common\RenderElementTypesTest.
  */
 
 namespace Drupal\system\Tests\Common;
diff --git a/core/modules/system/src/Tests/Common/RenderTest.php b/core/modules/system/src/Tests/Common/RenderTest.php
index 7ae448ad5b5875a9056acfc4c978ef4a1bc4f134..11bb96abd92bc4a7edb32c63554d8db0042d8dc5 100644
--- a/core/modules/system/src/Tests/Common/RenderTest.php
+++ b/core/modules/system/src/Tests/Common/RenderTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Common\RenderTest.
+ * Contains \Drupal\system\Tests\Common\RenderTest.
  */
 
 namespace Drupal\system\Tests\Common;
diff --git a/core/modules/system/src/Tests/Common/RenderWebTest.php b/core/modules/system/src/Tests/Common/RenderWebTest.php
index f88a13d9c9a6ed95438dc46048da3f46e0f50b3c..e9397699e4998ad6fe94b071e4e6d3005aa45208 100644
--- a/core/modules/system/src/Tests/Common/RenderWebTest.php
+++ b/core/modules/system/src/Tests/Common/RenderWebTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Common\RenderWebTest.
+ * Contains \Drupal\system\Tests\Common\RenderWebTest.
  */
 
 namespace Drupal\system\Tests\Common;
diff --git a/core/modules/system/src/Tests/Common/SimpleTestErrorCollectorTest.php b/core/modules/system/src/Tests/Common/SimpleTestErrorCollectorTest.php
index bcc651c74670603083f7bb75394498a8a6279781..43ca8e29bc257f64b0f4ee968b50772e67dfcb79 100644
--- a/core/modules/system/src/Tests/Common/SimpleTestErrorCollectorTest.php
+++ b/core/modules/system/src/Tests/Common/SimpleTestErrorCollectorTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Common\SimpleTestErrorCollectorTest.
+ * Contains \Drupal\system\Tests\Common\SimpleTestErrorCollectorTest.
  */
 
 namespace Drupal\system\Tests\Common;
diff --git a/core/modules/system/src/Tests/Common/SizeUnitTest.php b/core/modules/system/src/Tests/Common/SizeUnitTest.php
index afe1d3a70dcf11d1ebd9dd707462141178a6e603..1cc5d0eb3ae0e725f9fb4c964143ae2dd3a4f435 100644
--- a/core/modules/system/src/Tests/Common/SizeUnitTest.php
+++ b/core/modules/system/src/Tests/Common/SizeUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Common\SizeUnitTest.
+ * Contains \Drupal\system\Tests\Common\SizeUnitTest.
  */
 
 namespace Drupal\system\Tests\Common;
diff --git a/core/modules/system/src/Tests/Common/SystemListingTest.php b/core/modules/system/src/Tests/Common/SystemListingTest.php
index 861a1df52aaf03e8cb08dd35d518a5ca3ae92f6c..a9d1549d4331a11f969a0449f6657cf6355b7b24 100644
--- a/core/modules/system/src/Tests/Common/SystemListingTest.php
+++ b/core/modules/system/src/Tests/Common/SystemListingTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Common\SystemListingTest.
+ * Contains \Drupal\system\Tests\Common\SystemListingTest.
  */
 
 namespace Drupal\system\Tests\Common;
diff --git a/core/modules/system/src/Tests/Common/TableSortExtenderUnitTest.php b/core/modules/system/src/Tests/Common/TableSortExtenderUnitTest.php
index 4868b8239724426f99159775f5abe040f38d823a..7073c28c62b4ec7925eeb611b547e9208e9069c1 100644
--- a/core/modules/system/src/Tests/Common/TableSortExtenderUnitTest.php
+++ b/core/modules/system/src/Tests/Common/TableSortExtenderUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Common\TableSortExtenderTest.
+ * Contains \Drupal\system\Tests\Common\TableSortExtenderUnitTest.
  */
 
 namespace Drupal\system\Tests\Common;
diff --git a/core/modules/system/src/Tests/Common/UrlTest.php b/core/modules/system/src/Tests/Common/UrlTest.php
index b0b47e89b9478504d7d90b16b2d05a31da77a9f4..74d9129b4baf67b574ca2a166729ab2ede54176c 100644
--- a/core/modules/system/src/Tests/Common/UrlTest.php
+++ b/core/modules/system/src/Tests/Common/UrlTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Common\UrlTest.
+ * Contains \Drupal\system\Tests\Common\UrlTest.
  */
 
 namespace Drupal\system\Tests\Common;
diff --git a/core/modules/system/src/Tests/Common/XssUnitTest.php b/core/modules/system/src/Tests/Common/XssUnitTest.php
index 511dcc6852fa98c21d3c1c1e38b42f4988835354..f1358e030cb187de535c42e80fb9f8a83b47b513 100644
--- a/core/modules/system/src/Tests/Common/XssUnitTest.php
+++ b/core/modules/system/src/Tests/Common/XssUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Common\XssUnitTest.
+ * Contains \Drupal\system\Tests\Common\XssUnitTest.
  */
 
 namespace Drupal\system\Tests\Common;
diff --git a/core/modules/system/src/Tests/Database/AlterTest.php b/core/modules/system/src/Tests/Database/AlterTest.php
index 6371b733e4bf366d4d189c31f674eedee18b0f0f..991ae85876c496f4148acb4f2a46af4b09f2437a 100644
--- a/core/modules/system/src/Tests/Database/AlterTest.php
+++ b/core/modules/system/src/Tests/Database/AlterTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\AlterTest.
+ * Contains \Drupal\system\Tests\Database\AlterTest.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/BasicSyntaxTest.php b/core/modules/system/src/Tests/Database/BasicSyntaxTest.php
index 7d10a95d0ac678e74f2c24d97d5eddc13d1efcca..3d4b68d3fceed6b9675b2fcf1b2664988b79afcd 100644
--- a/core/modules/system/src/Tests/Database/BasicSyntaxTest.php
+++ b/core/modules/system/src/Tests/Database/BasicSyntaxTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\BasicSyntaxTest.
+ * Contains \Drupal\system\Tests\Database\BasicSyntaxTest.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/CaseSensitivityTest.php b/core/modules/system/src/Tests/Database/CaseSensitivityTest.php
index 699707346b0d5bdb1beefdea2c2b06360411f332..6dcf743f87c74162fd3de929a024bc0e7363057d 100644
--- a/core/modules/system/src/Tests/Database/CaseSensitivityTest.php
+++ b/core/modules/system/src/Tests/Database/CaseSensitivityTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\CaseSensitivityTest.
+ * Contains \Drupal\system\Tests\Database\CaseSensitivityTest.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/ConnectionTest.php b/core/modules/system/src/Tests/Database/ConnectionTest.php
index 81b769fb324e015345617bf2ce6754fed4c66911..160746155b79c6969cf72e73aca9ba10a1ad5c47 100644
--- a/core/modules/system/src/Tests/Database/ConnectionTest.php
+++ b/core/modules/system/src/Tests/Database/ConnectionTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\ConnectionTest.
+ * Contains \Drupal\system\Tests\Database\ConnectionTest.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/ConnectionUnitTest.php b/core/modules/system/src/Tests/Database/ConnectionUnitTest.php
index 36301fdabde20604e7915f05fe165047b4c0daab..0593ce8c9a676e347fefd4b633ddc09edffbb083 100644
--- a/core/modules/system/src/Tests/Database/ConnectionUnitTest.php
+++ b/core/modules/system/src/Tests/Database/ConnectionUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\Database\ConnectionUnitTest.
+ * Contains \Drupal\system\Tests\Database\ConnectionUnitTest.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/DatabaseExceptionWrapperTest.php b/core/modules/system/src/Tests/Database/DatabaseExceptionWrapperTest.php
index 8237e361fdf4cb3382be09f10b019973657b4b7f..d534e5a0fbe65dcf046abe5029155ece9629eae2 100644
--- a/core/modules/system/src/Tests/Database/DatabaseExceptionWrapperTest.php
+++ b/core/modules/system/src/Tests/Database/DatabaseExceptionWrapperTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\Database\DatabaseExceptionWrapperTest.
+ * Contains \Drupal\system\Tests\Database\DatabaseExceptionWrapperTest.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/DatabaseTestBase.php b/core/modules/system/src/Tests/Database/DatabaseTestBase.php
index 524e0e8aa8b4d26f41f65b814040637e8e07033f..ebef8b86334c38cbf7a2d2ec2f3defda0ccc0a66 100644
--- a/core/modules/system/src/Tests/Database/DatabaseTestBase.php
+++ b/core/modules/system/src/Tests/Database/DatabaseTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\DatabaseTestBase.
+ * Contains \Drupal\system\Tests\Database\DatabaseTestBase.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/DatabaseWebTestBase.php b/core/modules/system/src/Tests/Database/DatabaseWebTestBase.php
index c8d2f7677e996d7911d9d8dbbc0034ed960c9e38..690a2a67d38d3d9065f2b7834e36e0bc54ed4644 100644
--- a/core/modules/system/src/Tests/Database/DatabaseWebTestBase.php
+++ b/core/modules/system/src/Tests/Database/DatabaseWebTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\DatabaseWebTestBase.
+ * Contains \Drupal\system\Tests\Database\DatabaseWebTestBase.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/DeleteTruncateTest.php b/core/modules/system/src/Tests/Database/DeleteTruncateTest.php
index 5c7b9776c4b244860e3ba08253c7d90767c9a588..431a01e93fe8790e15617d6e7c51708b40f6f74a 100644
--- a/core/modules/system/src/Tests/Database/DeleteTruncateTest.php
+++ b/core/modules/system/src/Tests/Database/DeleteTruncateTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\DeleteTruncateTest.
+ * Contains \Drupal\system\Tests\Database\DeleteTruncateTest.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/FakeRecord.php b/core/modules/system/src/Tests/Database/FakeRecord.php
index 89babd555887e781700354a9e430f4d1f68e363c..a5e94b7de22ed79515719d16fb20590c2c08aeb0 100644
--- a/core/modules/system/src/Tests/Database/FakeRecord.php
+++ b/core/modules/system/src/Tests/Database/FakeRecord.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\FakeRecord.
+ * Contains \Drupal\system\Tests\Database\FakeRecord.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/InsertDefaultsTest.php b/core/modules/system/src/Tests/Database/InsertDefaultsTest.php
index 576d53f86ce2685922a22134b86d722238ec36ad..980b6b304377c84e246e7a8b89429da98c941d09 100644
--- a/core/modules/system/src/Tests/Database/InsertDefaultsTest.php
+++ b/core/modules/system/src/Tests/Database/InsertDefaultsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\InsertDefaultsTest.
+ * Contains \Drupal\system\Tests\Database\InsertDefaultsTest.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/InsertLobTest.php b/core/modules/system/src/Tests/Database/InsertLobTest.php
index 2fcf182bcb91920f067eb527eacaff577933bae0..774c89a579b945665afe9d3b5df286f6b4b7554a 100644
--- a/core/modules/system/src/Tests/Database/InsertLobTest.php
+++ b/core/modules/system/src/Tests/Database/InsertLobTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\InsertLobTest.
+ * Contains \Drupal\system\Tests\Database\InsertLobTest.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/InsertTest.php b/core/modules/system/src/Tests/Database/InsertTest.php
index c4d5bd39e2c0c3a17d112d06340770e148a81154..7bf5fad9390f2871c6f0a26ca15b4a1fa9979b23 100644
--- a/core/modules/system/src/Tests/Database/InsertTest.php
+++ b/core/modules/system/src/Tests/Database/InsertTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\InsertTest.
+ * Contains \Drupal\system\Tests\Database\InsertTest.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/InvalidDataTest.php b/core/modules/system/src/Tests/Database/InvalidDataTest.php
index 84645acb8e07274ba96d29a6f0ee00349d9df6bb..8fcfb23841b9171973b988dd4ebf723029d442f1 100644
--- a/core/modules/system/src/Tests/Database/InvalidDataTest.php
+++ b/core/modules/system/src/Tests/Database/InvalidDataTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\InvalidDataTest.
+ * Contains \Drupal\system\Tests\Database\InvalidDataTest.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/LoggingTest.php b/core/modules/system/src/Tests/Database/LoggingTest.php
index cf83b011b165827321dc7ea879f4a24870836903..f17f6c5a0cf633e5758b0d82c77a9c5ff22ec35d 100644
--- a/core/modules/system/src/Tests/Database/LoggingTest.php
+++ b/core/modules/system/src/Tests/Database/LoggingTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\LoggingTest.
+ * Contains \Drupal\system\Tests\Database\LoggingTest.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/MergeTest.php b/core/modules/system/src/Tests/Database/MergeTest.php
index b13c8864ec57eda657c13494a812a23766afd5da..c4e83bb0e0be0990e64099fcb841dea32a7cdc89 100644
--- a/core/modules/system/src/Tests/Database/MergeTest.php
+++ b/core/modules/system/src/Tests/Database/MergeTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\MergeTest.
+ * Contains \Drupal\system\Tests\Database\MergeTest.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/NextIdTest.php b/core/modules/system/src/Tests/Database/NextIdTest.php
index d7456c7b2f3b404321876012a49c74e648564978..cabbe167897b6db09287af3f51ffed50ec401029 100644
--- a/core/modules/system/src/Tests/Database/NextIdTest.php
+++ b/core/modules/system/src/Tests/Database/NextIdTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\NextIdTest.
+ * Contains \Drupal\system\Tests\Database\NextIdTest.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/QueryTest.php b/core/modules/system/src/Tests/Database/QueryTest.php
index be0dbc7a0fdc2a789af70961e7bf1a7f03f041e9..4e9d84b157922abe223b1861a4e7720aa4945678 100644
--- a/core/modules/system/src/Tests/Database/QueryTest.php
+++ b/core/modules/system/src/Tests/Database/QueryTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\QueryTest.
+ * Contains \Drupal\system\Tests\Database\QueryTest.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/RangeQueryTest.php b/core/modules/system/src/Tests/Database/RangeQueryTest.php
index c3f9d1dde57429916c093d7c7fa9643e87c4458f..13b10c1c5eca53d9d905369fec1ce876d08fd85b 100644
--- a/core/modules/system/src/Tests/Database/RangeQueryTest.php
+++ b/core/modules/system/src/Tests/Database/RangeQueryTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\RangeQueryTest.
+ * Contains \Drupal\system\Tests\Database\RangeQueryTest.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/RegressionTest.php b/core/modules/system/src/Tests/Database/RegressionTest.php
index 6f87d2a6444b1efdd241957254c5e6414f04b53d..c6dbc06b0d9d201b2aef658c3a001cbfeeb2048b 100644
--- a/core/modules/system/src/Tests/Database/RegressionTest.php
+++ b/core/modules/system/src/Tests/Database/RegressionTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\RegressionTest.
+ * Contains \Drupal\system\Tests\Database\RegressionTest.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/SchemaTest.php b/core/modules/system/src/Tests/Database/SchemaTest.php
index 4f4b9b4620c33b9400c0b8f8c36d988075705b2b..1e770848db361715c5a4ff55bc2a6a00d53bcde5 100644
--- a/core/modules/system/src/Tests/Database/SchemaTest.php
+++ b/core/modules/system/src/Tests/Database/SchemaTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\Database\SchemaTest.
+ * Contains \Drupal\system\Tests\Database\SchemaTest.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/SelectOrderedTest.php b/core/modules/system/src/Tests/Database/SelectOrderedTest.php
index 4436ce464dcfd4c5aba269ee84218b7003323515..7b63bb754fb45f5c356698c1428e658aa51d3b98 100644
--- a/core/modules/system/src/Tests/Database/SelectOrderedTest.php
+++ b/core/modules/system/src/Tests/Database/SelectOrderedTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\SelectOrderedTest.
+ * Contains \Drupal\system\Tests\Database\SelectOrderedTest.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/SelectPagerDefaultTest.php b/core/modules/system/src/Tests/Database/SelectPagerDefaultTest.php
index 009efb9aebec6bcf59fc78b86adb6daece915314..1ec9231751446df1419d9978af20764343f7e826 100644
--- a/core/modules/system/src/Tests/Database/SelectPagerDefaultTest.php
+++ b/core/modules/system/src/Tests/Database/SelectPagerDefaultTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\SelectPagerDefaultTest.
+ * Contains \Drupal\system\Tests\Database\SelectPagerDefaultTest.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/SelectSubqueryTest.php b/core/modules/system/src/Tests/Database/SelectSubqueryTest.php
index c3ea3021629aeca3c0c232881ad785880f85985b..9eb304820ef575106c28c3958ec15d1c8df90022 100644
--- a/core/modules/system/src/Tests/Database/SelectSubqueryTest.php
+++ b/core/modules/system/src/Tests/Database/SelectSubqueryTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\SelectSubqueryTest.
+ * Contains \Drupal\system\Tests\Database\SelectSubqueryTest.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/SelectTableSortDefaultTest.php b/core/modules/system/src/Tests/Database/SelectTableSortDefaultTest.php
index 70b56ecc46e6a83aa3f4ded8d78bd43a01476e23..a7488c16424fe7447e7547ae28c7c1f5afeb1f42 100644
--- a/core/modules/system/src/Tests/Database/SelectTableSortDefaultTest.php
+++ b/core/modules/system/src/Tests/Database/SelectTableSortDefaultTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\SelectTableSortDefaultTest.
+ * Contains \Drupal\system\Tests\Database\SelectTableSortDefaultTest.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/SelectTest.php b/core/modules/system/src/Tests/Database/SelectTest.php
index 7937e27221aabc23d821f94fb8e5d87f99829e3e..641cdc2eb586b4a3c75c65b4efb525380d809201 100644
--- a/core/modules/system/src/Tests/Database/SelectTest.php
+++ b/core/modules/system/src/Tests/Database/SelectTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\SelectTest.
+ * Contains \Drupal\system\Tests\Database\SelectTest.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/SerializeQueryTest.php b/core/modules/system/src/Tests/Database/SerializeQueryTest.php
index 91e533e05a4d0c8faed713d46c89d27b06539604..00f295f7d6927949ada5c6d1debf5bd91d5cf0d5 100644
--- a/core/modules/system/src/Tests/Database/SerializeQueryTest.php
+++ b/core/modules/system/src/Tests/Database/SerializeQueryTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\SerializeQueryTest.
+ * Contains \Drupal\system\Tests\Database\SerializeQueryTest.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/TaggingTest.php b/core/modules/system/src/Tests/Database/TaggingTest.php
index 5c7a92af1ac437781c08cb8834c6098a1e4cdb6c..a297d7b3bbecdc6a2521ca1bf98cc30a40d2833f 100644
--- a/core/modules/system/src/Tests/Database/TaggingTest.php
+++ b/core/modules/system/src/Tests/Database/TaggingTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\TaggingTest.
+ * Contains \Drupal\system\Tests\Database\TaggingTest.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/TemporaryQueryTest.php b/core/modules/system/src/Tests/Database/TemporaryQueryTest.php
index 5c95f6b7140bfdc5ea78da65045fd8a21c8cbd44..9596a7bab53d37233a7b4c169fa1bba0e8ab51a6 100644
--- a/core/modules/system/src/Tests/Database/TemporaryQueryTest.php
+++ b/core/modules/system/src/Tests/Database/TemporaryQueryTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\TemporaryQueryTest.
+ * Contains \Drupal\system\Tests\Database\TemporaryQueryTest.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/TransactionTest.php b/core/modules/system/src/Tests/Database/TransactionTest.php
index 6211ecb3ef82e41cb5a7d01cb3d38f692d2aa291..1137b21c5e7179c285441a3c92de85725b265807 100644
--- a/core/modules/system/src/Tests/Database/TransactionTest.php
+++ b/core/modules/system/src/Tests/Database/TransactionTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\TransactionTest.
+ * Contains \Drupal\system\Tests\Database\TransactionTest.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/UpdateComplexTest.php b/core/modules/system/src/Tests/Database/UpdateComplexTest.php
index abe27302d7dbe09d66ccdeb38520e3291951fcae..a53938a6809e80e812ccc570e56edb8fc5b5699e 100644
--- a/core/modules/system/src/Tests/Database/UpdateComplexTest.php
+++ b/core/modules/system/src/Tests/Database/UpdateComplexTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\UpdateComplexTest.
+ * Contains \Drupal\system\Tests\Database\UpdateComplexTest.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/UpdateLobTest.php b/core/modules/system/src/Tests/Database/UpdateLobTest.php
index 7b26fdf5c8ea1170da5fd8aa3ea305558ef1fe5a..62c0f45feaaf8db9ed3de665fb8036b2277d8492 100644
--- a/core/modules/system/src/Tests/Database/UpdateLobTest.php
+++ b/core/modules/system/src/Tests/Database/UpdateLobTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\UpdateLobTest.
+ * Contains \Drupal\system\Tests\Database\UpdateLobTest.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Database/UpdateTest.php b/core/modules/system/src/Tests/Database/UpdateTest.php
index d48b706ecdd2382c0b4e8dd20866e62a3d7a3d50..53663eebcf7b5025c253b114bf47af1ba03b8ccf 100644
--- a/core/modules/system/src/Tests/Database/UpdateTest.php
+++ b/core/modules/system/src/Tests/Database/UpdateTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\UpdateTest.
+ * Contains \Drupal\system\Tests\Database\UpdateTest.
  */
 
 namespace Drupal\system\Tests\Database;
diff --git a/core/modules/system/src/Tests/Datetime/DrupalDateTimeTest.php b/core/modules/system/src/Tests/Datetime/DrupalDateTimeTest.php
index f560c32d2b6435ef029e21ce0e004465c1ac45b1..d907c6707e5f8eb67aa839dc2e0205fed5aa185c 100644
--- a/core/modules/system/src/Tests/Datetime/DrupalDateTimeTest.php
+++ b/core/modules/system/src/Tests/Datetime/DrupalDateTimeTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Datetime\DateTimePlusTest.
+ * Contains \Drupal\system\Tests\Datetime\DrupalDateTimeTest.
  */
 
 namespace Drupal\system\Tests\Datetime;
diff --git a/core/modules/system/src/Tests/DrupalKernel/ContentNegotiationTest.php b/core/modules/system/src/Tests/DrupalKernel/ContentNegotiationTest.php
index f454b021c7a73083e25d17e0d75e80ea68349c94..14a9ed04988d691d509bb2d5ea03668328b5e36c 100644
--- a/core/modules/system/src/Tests/DrupalKernel/ContentNegotiationTest.php
+++ b/core/modules/system/src/Tests/DrupalKernel/ContentNegotiationTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\DrupalKernel\ContentNegotiationTest.
+ * Contains \Drupal\system\Tests\DrupalKernel\ContentNegotiationTest.
  */
 
 namespace Drupal\system\Tests\DrupalKernel;
diff --git a/core/modules/system/src/Tests/DrupalKernel/DrupalKernelTest.php b/core/modules/system/src/Tests/DrupalKernel/DrupalKernelTest.php
index 84178a1f23be5e46939a77e2f7996f8f3a4dfa10..a4424eab8744d1820b45343dbf241fd7d684b7b9 100644
--- a/core/modules/system/src/Tests/DrupalKernel/DrupalKernelTest.php
+++ b/core/modules/system/src/Tests/DrupalKernel/DrupalKernelTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\DrupalKernel\DrupalKernelTest.
+ * Contains \Drupal\system\Tests\DrupalKernel\DrupalKernelTest.
  */
 
 namespace Drupal\system\Tests\DrupalKernel;
diff --git a/core/modules/system/src/Tests/Entity/BundleConstraintValidatorTest.php b/core/modules/system/src/Tests/Entity/BundleConstraintValidatorTest.php
index 6886e29e027bda19e2b90239983b48fc9208bbb1..2a433c5e0cdaa32f249d425bab130dfd9f8608e9 100644
--- a/core/modules/system/src/Tests/Entity/BundleConstraintValidatorTest.php
+++ b/core/modules/system/src/Tests/Entity/BundleConstraintValidatorTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\Entity\BundleConstraintValidatorTest.
+ * Contains \Drupal\system\Tests\Entity\BundleConstraintValidatorTest.
  */
 
 namespace Drupal\system\Tests\Entity;
diff --git a/core/modules/system/src/Tests/Entity/ConfigEntityImportTest.php b/core/modules/system/src/Tests/Entity/ConfigEntityImportTest.php
index 57a97c2d543a30f06521ceab399e986e8d69ac94..19caf37bd784732471827cdabd187c50868c544e 100644
--- a/core/modules/system/src/Tests/Entity/ConfigEntityImportTest.php
+++ b/core/modules/system/src/Tests/Entity/ConfigEntityImportTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Entity\ConfigEntityImportTestBase.
+ * Contains \Drupal\system\Tests\Entity\ConfigEntityImportTest.
  */
 
 namespace Drupal\system\Tests\Entity;
diff --git a/core/modules/system/src/Tests/Entity/ConfigEntityQueryTest.php b/core/modules/system/src/Tests/Entity/ConfigEntityQueryTest.php
index 583c64dc6ff866f5ddd81e444456c10933055379..e94248724876afde985b4b4236919d61fad8778d 100644
--- a/core/modules/system/src/Tests/Entity/ConfigEntityQueryTest.php
+++ b/core/modules/system/src/Tests/Entity/ConfigEntityQueryTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\ConfigEntityQueryTest.
+ * Contains \Drupal\system\Tests\Entity\ConfigEntityQueryTest.
  */
 
 namespace Drupal\system\Tests\Entity;
diff --git a/core/modules/system/src/Tests/Entity/ContentEntityChangedTest.php b/core/modules/system/src/Tests/Entity/ContentEntityChangedTest.php
index 13ec8b409ad2f3d03bbaaae6f6e655d6c8a84eb3..a9f821b1456377694a2a611897daa97d05b425ae 100644
--- a/core/modules/system/src/Tests/Entity/ContentEntityChangedTest.php
+++ b/core/modules/system/src/Tests/Entity/ContentEntityChangedTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\Entity\ContentEntityChangedTest.
+ * Contains \Drupal\system\Tests\Entity\ContentEntityChangedTest.
  */
 
 namespace Drupal\system\Tests\Entity;
diff --git a/core/modules/system/src/Tests/Entity/EntityApiTest.php b/core/modules/system/src/Tests/Entity/EntityApiTest.php
index decbcd04c30ec5b7e82453066504dc115b1f1b81..f337088ea1901e78fb6de4a35a0f2db5e27096bd 100644
--- a/core/modules/system/src/Tests/Entity/EntityApiTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityApiTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Entity\EntityApiTest.
+ * Contains \Drupal\system\Tests\Entity\EntityApiTest.
  */
 
 namespace Drupal\system\Tests\Entity;
diff --git a/core/modules/system/src/Tests/Entity/EntityCrudHookTest.php b/core/modules/system/src/Tests/Entity/EntityCrudHookTest.php
index 0e62fcef31ed762bb9f71a11c91dd58b36487c8b..b7d996febbd9f70dea71b52141a0c2e85b8fe73c 100644
--- a/core/modules/system/src/Tests/Entity/EntityCrudHookTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityCrudHookTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Entity\EntityCrudHookTest.
+ * Contains \Drupal\system\Tests\Entity\EntityCrudHookTest.
  */
 
 namespace Drupal\system\Tests\Entity;
diff --git a/core/modules/system/src/Tests/Entity/EntityDefinitionUpdateTest.php b/core/modules/system/src/Tests/Entity/EntityDefinitionUpdateTest.php
index 2d1f997a95816ed28471d44f354a4765446e662d..6d9408e839f4330b01350f302421e031420946fd 100644
--- a/core/modules/system/src/Tests/Entity/EntityDefinitionUpdateTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityDefinitionUpdateTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\Entity\EntityDefinitionUpdateTest.
+ * Contains \Drupal\system\Tests\Entity\EntityDefinitionUpdateTest.
  */
 
 namespace Drupal\system\Tests\Entity;
diff --git a/core/modules/system/src/Tests/Entity/EntityFieldTest.php b/core/modules/system/src/Tests/Entity/EntityFieldTest.php
index 0ac3dc74857eb011612dacb14eb50faa2aa5f9c3..308132da4c9f4b2fa16d843b4c9285ef9039610e 100644
--- a/core/modules/system/src/Tests/Entity/EntityFieldTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityFieldTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Entity\EntityFieldTest.
+ * Contains \Drupal\system\Tests\Entity\EntityFieldTest.
  */
 
 namespace Drupal\system\Tests\Entity;
diff --git a/core/modules/system/src/Tests/Entity/EntityFormTest.php b/core/modules/system/src/Tests/Entity/EntityFormTest.php
index e4365ebe977b11b8555bf742826c329b9b4904e0..f268dd751124b0c8493fb82b9a19bd2b96a7d708 100644
--- a/core/modules/system/src/Tests/Entity/EntityFormTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityFormTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Entity\EntityFormTest.
+ * Contains \Drupal\system\Tests\Entity\EntityFormTest.
  */
 
 namespace Drupal\system\Tests\Entity;
diff --git a/core/modules/system/src/Tests/Entity/EntityLanguageTestBase.php b/core/modules/system/src/Tests/Entity/EntityLanguageTestBase.php
index 666ea03a0c524d32e0fad37ad5684b196b1c225a..61a5ad2c9603d761290e1d4bfd1f80e6cdf38925 100644
--- a/core/modules/system/src/Tests/Entity/EntityLanguageTestBase.php
+++ b/core/modules/system/src/Tests/Entity/EntityLanguageTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Entity\EntityLanguageTestBase.
+ * Contains \Drupal\system\Tests\Entity\EntityLanguageTestBase.
  */
 
 namespace Drupal\system\Tests\Entity;
diff --git a/core/modules/system/src/Tests/Entity/EntityQueryRelationshipTest.php b/core/modules/system/src/Tests/Entity/EntityQueryRelationshipTest.php
index 89bc9dab2b83b0f3811b14afa63e7259ebcc7550..254bfdba8510942077cd320d26e159ed57f7b0b2 100644
--- a/core/modules/system/src/Tests/Entity/EntityQueryRelationshipTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityQueryRelationshipTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Entity\Tests\EntityQueryRelationshipTest.
+ * Contains \Drupal\system\Tests\Entity\EntityQueryRelationshipTest.
  */
 
 namespace Drupal\system\Tests\Entity;
diff --git a/core/modules/system/src/Tests/Entity/EntityQueryTest.php b/core/modules/system/src/Tests/Entity/EntityQueryTest.php
index 6dc5673c1581c4286c40ca1357ea9bedb002254c..44b87335bd72a7c11319d1e0b92f8967d361b81e 100644
--- a/core/modules/system/src/Tests/Entity/EntityQueryTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityQueryTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Entity\EntityQueryTest.
+ * Contains \Drupal\system\Tests\Entity\EntityQueryTest.
  */
 
 namespace Drupal\system\Tests\Entity;
diff --git a/core/modules/system/src/Tests/Entity/EntityRevisionsTest.php b/core/modules/system/src/Tests/Entity/EntityRevisionsTest.php
index 3009307f9d4e367295c2c368047fecf21e3e68c8..53f5288e2847fd50e7554385ba435caa761ddd52 100644
--- a/core/modules/system/src/Tests/Entity/EntityRevisionsTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityRevisionsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Entity\EntityRevisionsTest.
+ * Contains \Drupal\system\Tests\Entity\EntityRevisionsTest.
  */
 
 namespace Drupal\system\Tests\Entity;
diff --git a/core/modules/system/src/Tests/Entity/EntityTranslationFormTest.php b/core/modules/system/src/Tests/Entity/EntityTranslationFormTest.php
index 933f8dd8692baa14e37b2d59b9378c2883e25253..fc5c89222e8818aef91743ef2e001d660ea1d17f 100644
--- a/core/modules/system/src/Tests/Entity/EntityTranslationFormTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityTranslationFormTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Entity\EntityTranslationFormTest.
+ * Contains \Drupal\system\Tests\Entity\EntityTranslationFormTest.
  */
 
 namespace Drupal\system\Tests\Entity;
diff --git a/core/modules/system/src/Tests/Entity/EntityTranslationTest.php b/core/modules/system/src/Tests/Entity/EntityTranslationTest.php
index 138794fb67cda98a0f441b078e337542e084582b..11ec5898cca37e3d454e9c2020e48a3ef1bf0262 100644
--- a/core/modules/system/src/Tests/Entity/EntityTranslationTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityTranslationTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Entity\EntityTranslationTest.
+ * Contains \Drupal\system\Tests\Entity\EntityTranslationTest.
  */
 
 namespace Drupal\system\Tests\Entity;
diff --git a/core/modules/system/src/Tests/Entity/EntityTypeConstraintValidatorTest.php b/core/modules/system/src/Tests/Entity/EntityTypeConstraintValidatorTest.php
index 06314ef6c300bff239c11bd5b64781658c48d3c7..3d6ecc67da04bb95f21e047c3cba5783903e8418 100644
--- a/core/modules/system/src/Tests/Entity/EntityTypeConstraintValidatorTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityTypeConstraintValidatorTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\Entity\EntityTypeConstraintValidatorTest.
+ * Contains \Drupal\system\Tests\Entity\EntityTypeConstraintValidatorTest.
  */
 
 namespace Drupal\system\Tests\Entity;
diff --git a/core/modules/system/src/Tests/Entity/EntityTypeConstraintsTest.php b/core/modules/system/src/Tests/Entity/EntityTypeConstraintsTest.php
index 95191439bbb905efe02f06dae64367031d7b9913..688b96c51938f7d38d18e5f9096848fd769198c2 100644
--- a/core/modules/system/src/Tests/Entity/EntityTypeConstraintsTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityTypeConstraintsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\Entity\EntityTypeConstraintsTest.
+ * Contains \Drupal\system\Tests\Entity\EntityTypeConstraintsTest.
  */
 
 namespace Drupal\system\Tests\Entity;
diff --git a/core/modules/system/src/Tests/Entity/EntityUUIDTest.php b/core/modules/system/src/Tests/Entity/EntityUUIDTest.php
index 91082567a99d0a98b7d3534464dbb544e3ba5e7a..48a6e4e32ca3a634e39f3ac59a78c8b042102e00 100644
--- a/core/modules/system/src/Tests/Entity/EntityUUIDTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityUUIDTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Entity\EntityUUIDTest.
+ * Contains \Drupal\system\Tests\Entity\EntityUUIDTest.
  */
 
 namespace Drupal\system\Tests\Entity;
diff --git a/core/modules/system/src/Tests/Entity/FieldTranslationSqlStorageTest.php b/core/modules/system/src/Tests/Entity/FieldTranslationSqlStorageTest.php
index af3461eccafcce23526d9477f5f35c9c085307a8..989f00b5458ff68cdc2a67cfeec2977865417868 100644
--- a/core/modules/system/src/Tests/Entity/FieldTranslationSqlStorageTest.php
+++ b/core/modules/system/src/Tests/Entity/FieldTranslationSqlStorageTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Entity\FieldTranslationSqlStorageTest.
+ * Contains \Drupal\system\Tests\Entity\FieldTranslationSqlStorageTest.
  */
 
 namespace Drupal\system\Tests\Entity;
diff --git a/core/modules/system/src/Tests/Entity/FieldWidgetConstraintValidatorTest.php b/core/modules/system/src/Tests/Entity/FieldWidgetConstraintValidatorTest.php
index 5f369734f24f62a9534cb97b3251e1eb29416671..426ac5b4398567724808245b5717d969261d95be 100644
--- a/core/modules/system/src/Tests/Entity/FieldWidgetConstraintValidatorTest.php
+++ b/core/modules/system/src/Tests/Entity/FieldWidgetConstraintValidatorTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\Entity\FieldWidgetConstraintValidatorTest.
+ * Contains \Drupal\system\Tests\Entity\FieldWidgetConstraintValidatorTest.
  */
 
 namespace Drupal\system\Tests\Entity;
diff --git a/core/modules/system/src/Tests/Field/FieldModuleUninstallValidatorTest.php b/core/modules/system/src/Tests/Field/FieldModuleUninstallValidatorTest.php
index 0bed70beed3e062caa62c48536dd5dfc5cb09529..37203213ce76b9d5a17fdb1b20a6c77c49892a65 100644
--- a/core/modules/system/src/Tests/Field/FieldModuleUninstallValidatorTest.php
+++ b/core/modules/system/src/Tests/Field/FieldModuleUninstallValidatorTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\Field\FieldModuleUninstallValidatorTest.
+ * Contains \Drupal\system\Tests\Field\FieldModuleUninstallValidatorTest.
  */
 
 namespace Drupal\system\Tests\Field;
diff --git a/core/modules/system/src/Tests/File/ConfigTest.php b/core/modules/system/src/Tests/File/ConfigTest.php
index 183d95adb3f7ec9b9f2e3f9e03e2a4c5e7a36976..d80951b11074374ad0d60f52e1726726a7d44b29 100644
--- a/core/modules/system/src/Tests/File/ConfigTest.php
+++ b/core/modules/system/src/Tests/File/ConfigTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\File\ConfigTest.
+ * Contains \Drupal\system\Tests\File\ConfigTest.
  */
 
 namespace Drupal\system\Tests\File;
diff --git a/core/modules/system/src/Tests/File/DirectoryTest.php b/core/modules/system/src/Tests/File/DirectoryTest.php
index 50d498a88c5629b818801de9d8658d843f40815e..4c15a8ebff9d64557ea170a2dedb9dde44b2dfdb 100644
--- a/core/modules/system/src/Tests/File/DirectoryTest.php
+++ b/core/modules/system/src/Tests/File/DirectoryTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\File\DirectoryTest.
+ * Contains \Drupal\system\Tests\File\DirectoryTest.
  */
 
 namespace Drupal\system\Tests\File;
diff --git a/core/modules/system/src/Tests/File/FileTestBase.php b/core/modules/system/src/Tests/File/FileTestBase.php
index 8e51ffffd1080bebee1853600b6d7ab148add597..93e998d5f3051367ad0287bd93dff16caba58f59 100644
--- a/core/modules/system/src/Tests/File/FileTestBase.php
+++ b/core/modules/system/src/Tests/File/FileTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\File\FileTestBase.
+ * Contains \Drupal\system\Tests\File\FileTestBase.
  */
 
 namespace Drupal\system\Tests\File;
diff --git a/core/modules/system/src/Tests/File/MimeTypeTest.php b/core/modules/system/src/Tests/File/MimeTypeTest.php
index f09b60dd845fa325086e72d9b17cca0cdbe871df..6324bf0e9ac676651b46783bc66a18e4b6f95bab 100644
--- a/core/modules/system/src/Tests/File/MimeTypeTest.php
+++ b/core/modules/system/src/Tests/File/MimeTypeTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\File\MimeTypeTest.
+ * Contains \Drupal\system\Tests\File\MimeTypeTest.
  */
 
 namespace Drupal\system\Tests\File;
diff --git a/core/modules/system/src/Tests/File/NameMungingTest.php b/core/modules/system/src/Tests/File/NameMungingTest.php
index cf3fd8940fa3b738052fbd3344cea48ac0847986..10caf61bf89d432cd774f1be54e4c6ae9f52ab56 100644
--- a/core/modules/system/src/Tests/File/NameMungingTest.php
+++ b/core/modules/system/src/Tests/File/NameMungingTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\File\NameMungingTest.
+ * Contains \Drupal\system\Tests\File\NameMungingTest.
  */
 
 namespace Drupal\system\Tests\File;
diff --git a/core/modules/system/src/Tests/File/ReadOnlyStreamWrapperTest.php b/core/modules/system/src/Tests/File/ReadOnlyStreamWrapperTest.php
index d4e7e31ed2cf5ae4d7874256b3f1aa4f1435d67d..df9a1ea42e5d0a4e208bf722d468ca6b6abccf27 100644
--- a/core/modules/system/src/Tests/File/ReadOnlyStreamWrapperTest.php
+++ b/core/modules/system/src/Tests/File/ReadOnlyStreamWrapperTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\File\ReadOnlyStreamWrapperTest.
+ * Contains \Drupal\system\Tests\File\ReadOnlyStreamWrapperTest.
  */
 
 namespace Drupal\system\Tests\File;
diff --git a/core/modules/system/src/Tests/File/RemoteFileDirectoryTest.php b/core/modules/system/src/Tests/File/RemoteFileDirectoryTest.php
index d8c97a3ed94a4c9aabd18fe76272f7479e9b8b5b..12e32678a92c97714b7f8463c1a38b26c1783e4a 100644
--- a/core/modules/system/src/Tests/File/RemoteFileDirectoryTest.php
+++ b/core/modules/system/src/Tests/File/RemoteFileDirectoryTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\File\RemoteFileDirectoryTest.
+ * Contains \Drupal\system\Tests\File\RemoteFileDirectoryTest.
  */
 
 namespace Drupal\system\Tests\File;
diff --git a/core/modules/system/src/Tests/File/RemoteFileScanDirectoryTest.php b/core/modules/system/src/Tests/File/RemoteFileScanDirectoryTest.php
index 3e76a2d4bc79f85c946cdbde22f75398978d212c..4f601f8e5b1e8b9edc70c9e804ce432601003703 100644
--- a/core/modules/system/src/Tests/File/RemoteFileScanDirectoryTest.php
+++ b/core/modules/system/src/Tests/File/RemoteFileScanDirectoryTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\File\RemoteFileScanDirectoryTest.
+ * Contains \Drupal\system\Tests\File\RemoteFileScanDirectoryTest.
  */
 
 namespace Drupal\system\Tests\File;
diff --git a/core/modules/system/src/Tests/File/RemoteFileUnmanagedCopyTest.php b/core/modules/system/src/Tests/File/RemoteFileUnmanagedCopyTest.php
index df8d00fafc68ede21eec95d7f3498917133210e0..bf2a518523873ff09bb2034cf308995c93960853 100644
--- a/core/modules/system/src/Tests/File/RemoteFileUnmanagedCopyTest.php
+++ b/core/modules/system/src/Tests/File/RemoteFileUnmanagedCopyTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\File\RemoteFileUnmanagedCopyTest.
+ * Contains \Drupal\system\Tests\File\RemoteFileUnmanagedCopyTest.
  */
 
 namespace Drupal\system\Tests\File;
diff --git a/core/modules/system/src/Tests/File/RemoteFileUnmanagedDeleteRecursiveTest.php b/core/modules/system/src/Tests/File/RemoteFileUnmanagedDeleteRecursiveTest.php
index b339658b28c5839b021b2eb5508cade03a0ff196..0eb8c2f4bf75fa8bbf28718d254e794c46c67d5b 100644
--- a/core/modules/system/src/Tests/File/RemoteFileUnmanagedDeleteRecursiveTest.php
+++ b/core/modules/system/src/Tests/File/RemoteFileUnmanagedDeleteRecursiveTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\File\RemoteFileUnmanagedDeleteRecursiveTest.
+ * Contains \Drupal\system\Tests\File\RemoteFileUnmanagedDeleteRecursiveTest.
  */
 
 namespace Drupal\system\Tests\File;
diff --git a/core/modules/system/src/Tests/File/RemoteFileUnmanagedDeleteTest.php b/core/modules/system/src/Tests/File/RemoteFileUnmanagedDeleteTest.php
index 15c1cc754b54106440505b92734de8ad78c694d1..0fc03687a3ec93300af8dacbdf431c3dd5caad5d 100644
--- a/core/modules/system/src/Tests/File/RemoteFileUnmanagedDeleteTest.php
+++ b/core/modules/system/src/Tests/File/RemoteFileUnmanagedDeleteTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\File\RemoteFileUnmanagedDeleteTest.
+ * Contains \Drupal\system\Tests\File\RemoteFileUnmanagedDeleteTest.
  */
 
 namespace Drupal\system\Tests\File;
diff --git a/core/modules/system/src/Tests/File/RemoteFileUnmanagedMoveTest.php b/core/modules/system/src/Tests/File/RemoteFileUnmanagedMoveTest.php
index 3bee1e41170984d42ddb7997cb1760a175016994..41e2f6c2aa8b3dee7341394c99f2e1dcdcd64383 100644
--- a/core/modules/system/src/Tests/File/RemoteFileUnmanagedMoveTest.php
+++ b/core/modules/system/src/Tests/File/RemoteFileUnmanagedMoveTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\File\RemoteFileUnmanagedMoveTest.
+ * Contains \Drupal\system\Tests\File\RemoteFileUnmanagedMoveTest.
  */
 
 namespace Drupal\system\Tests\File;
diff --git a/core/modules/system/src/Tests/File/RemoteFileUnmanagedSaveDataTest.php b/core/modules/system/src/Tests/File/RemoteFileUnmanagedSaveDataTest.php
index fad2b5fd6458ab06ccc2413b796c8fc7c3421c88..4c43330fb197883523afd5ba75e21eff20b43f5a 100644
--- a/core/modules/system/src/Tests/File/RemoteFileUnmanagedSaveDataTest.php
+++ b/core/modules/system/src/Tests/File/RemoteFileUnmanagedSaveDataTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\File\RemoteFileUnmanagedSaveDataTest.
+ * Contains \Drupal\system\Tests\File\RemoteFileUnmanagedSaveDataTest.
  */
 
 namespace Drupal\system\Tests\File;
diff --git a/core/modules/system/src/Tests/File/ScanDirectoryTest.php b/core/modules/system/src/Tests/File/ScanDirectoryTest.php
index 54d1df22aaa072ce3a71bc35d74ca44830333900..4b067f058054df9bd0a0ff0c6ddcca508256a4ad 100644
--- a/core/modules/system/src/Tests/File/ScanDirectoryTest.php
+++ b/core/modules/system/src/Tests/File/ScanDirectoryTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\File\ScanDirectoryTest.
+ * Contains \Drupal\system\Tests\File\ScanDirectoryTest.
  */
 
 namespace Drupal\system\Tests\File;
diff --git a/core/modules/system/src/Tests/File/StreamWrapperTest.php b/core/modules/system/src/Tests/File/StreamWrapperTest.php
index fb3c8057d85a58a563a3e4df0bc58d726f3e2a98..770a40f917dd154b2a24f82c6d1b6884a4188f9b 100644
--- a/core/modules/system/src/Tests/File/StreamWrapperTest.php
+++ b/core/modules/system/src/Tests/File/StreamWrapperTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\File\StreamWrapperTest.
+ * Contains \Drupal\system\Tests\File\StreamWrapperTest.
  */
 
 namespace Drupal\system\Tests\File;
diff --git a/core/modules/system/src/Tests/File/UnmanagedCopyTest.php b/core/modules/system/src/Tests/File/UnmanagedCopyTest.php
index f525c1d532528234100d5a21562c2a790a3c10f2..22a061592b3da24d9b0761886888647382805cd8 100644
--- a/core/modules/system/src/Tests/File/UnmanagedCopyTest.php
+++ b/core/modules/system/src/Tests/File/UnmanagedCopyTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\File\UnmanagedCopyTest.
+ * Contains \Drupal\system\Tests\File\UnmanagedCopyTest.
  */
 
 namespace Drupal\system\Tests\File;
diff --git a/core/modules/system/src/Tests/File/UnmanagedDeleteRecursiveTest.php b/core/modules/system/src/Tests/File/UnmanagedDeleteRecursiveTest.php
index 50fdbc11adf6d6ce5af5a972576688fdeade6068..abef365d299afca8719a46dfdbc3485dc3b0f860 100644
--- a/core/modules/system/src/Tests/File/UnmanagedDeleteRecursiveTest.php
+++ b/core/modules/system/src/Tests/File/UnmanagedDeleteRecursiveTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\File\UnmanagedDeleteRecursiveTest.
+ * Contains \Drupal\system\Tests\File\UnmanagedDeleteRecursiveTest.
  */
 
 namespace Drupal\system\Tests\File;
diff --git a/core/modules/system/src/Tests/File/UnmanagedDeleteTest.php b/core/modules/system/src/Tests/File/UnmanagedDeleteTest.php
index 4c649da51f560d26afaf2ce9468c8f7a93fe1de6..5cdcfe8fdcf416660cf93a5ae7b5b2599dd02c58 100644
--- a/core/modules/system/src/Tests/File/UnmanagedDeleteTest.php
+++ b/core/modules/system/src/Tests/File/UnmanagedDeleteTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\File\UnmanagedDeleteTest.
+ * Contains \Drupal\system\Tests\File\UnmanagedDeleteTest.
  */
 
 namespace Drupal\system\Tests\File;
diff --git a/core/modules/system/src/Tests/File/UnmanagedMoveTest.php b/core/modules/system/src/Tests/File/UnmanagedMoveTest.php
index ea39c545e6adccb284495f900edddc1b54410790..4a4e9e90602f0f50f5a348d0da05b03607cbb5f9 100644
--- a/core/modules/system/src/Tests/File/UnmanagedMoveTest.php
+++ b/core/modules/system/src/Tests/File/UnmanagedMoveTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\File\UnmanagedMoveTest.
+ * Contains \Drupal\system\Tests\File\UnmanagedMoveTest.
  */
 
 namespace Drupal\system\Tests\File;
diff --git a/core/modules/system/src/Tests/File/UnmanagedSaveDataTest.php b/core/modules/system/src/Tests/File/UnmanagedSaveDataTest.php
index fc715c6487967efe44da9cc7315c7d4019e0cfcd..2d3342c9003b7ff606fada2c14033ef6e0fdfb98 100644
--- a/core/modules/system/src/Tests/File/UnmanagedSaveDataTest.php
+++ b/core/modules/system/src/Tests/File/UnmanagedSaveDataTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\File\UnmanagedSaveDataTest.
+ * Contains \Drupal\system\Tests\File\UnmanagedSaveDataTest.
  */
 
 namespace Drupal\system\Tests\File;
diff --git a/core/modules/system/src/Tests/File/UrlRewritingTest.php b/core/modules/system/src/Tests/File/UrlRewritingTest.php
index aa0d3d26a332e36ec9d59418f6aa8146d25d3051..0df69cc8892601bb86fe3ac7c15bdd1522f8eee6 100644
--- a/core/modules/system/src/Tests/File/UrlRewritingTest.php
+++ b/core/modules/system/src/Tests/File/UrlRewritingTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\File\UrlRewritingTest.
+ * Contains \Drupal\system\Tests\File\UrlRewritingTest.
  */
 
 namespace Drupal\system\Tests\File;
diff --git a/core/modules/system/src/Tests/FileTransfer/FileTransferTest.php b/core/modules/system/src/Tests/FileTransfer/FileTransferTest.php
index 07ce6add22d20ab471d387f3388a9605f3d3e015..a1ff1fdb1e9bf53516e1b9bd06e3fefb0e5919b7 100644
--- a/core/modules/system/src/Tests/FileTransfer/FileTransferTest.php
+++ b/core/modules/system/src/Tests/FileTransfer/FileTransferTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\FileTransfer\FileTransferTest.
+ * Contains \Drupal\system\Tests\FileTransfer\FileTransferTest.
  */
 
 namespace Drupal\system\Tests\FileTransfer;
diff --git a/core/modules/system/src/Tests/FileTransfer/MockTestConnection.php b/core/modules/system/src/Tests/FileTransfer/MockTestConnection.php
index 55548ad6e6f8937ba785a7fd8da222739f60ed94..e459b4a1e76126c3b9b3aadf21cf9fea5bbfa79c 100644
--- a/core/modules/system/src/Tests/FileTransfer/MockTestConnection.php
+++ b/core/modules/system/src/Tests/FileTransfer/MockTestConnection.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\FileTransfer\MockTestConnection.
+ * Contains \Drupal\system\Tests\FileTransfer\MockTestConnection.
  */
 
 namespace Drupal\system\Tests\FileTransfer;
diff --git a/core/modules/system/src/Tests/FileTransfer/TestFileTransfer.php b/core/modules/system/src/Tests/FileTransfer/TestFileTransfer.php
index 1d13960947368ae61e59065665091ce1bb6b4220..4bd098d5b224bf963f0c29868f6f5f907ff0f1e9 100644
--- a/core/modules/system/src/Tests/FileTransfer/TestFileTransfer.php
+++ b/core/modules/system/src/Tests/FileTransfer/TestFileTransfer.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\FileTransfer\TestFileTransfer.
+ * Contains \Drupal\system\Tests\FileTransfer\TestFileTransfer.
  */
 
 namespace Drupal\system\Tests\FileTransfer;
diff --git a/core/modules/system/src/Tests/Form/AlterTest.php b/core/modules/system/src/Tests/Form/AlterTest.php
index eb9411d0ac00558de60f2af4a618605bebe3722a..3daa08527e3283b25c6f7f0fdd148f6cbb2babc0 100644
--- a/core/modules/system/src/Tests/Form/AlterTest.php
+++ b/core/modules/system/src/Tests/Form/AlterTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Form\AlterTest.
+ * Contains \Drupal\system\Tests\Form\AlterTest.
  */
 
 namespace Drupal\system\Tests\Form;
diff --git a/core/modules/system/src/Tests/Form/ArbitraryRebuildTest.php b/core/modules/system/src/Tests/Form/ArbitraryRebuildTest.php
index 3f21cbc335d63f22a1af436f170e81c100844985..09eba7b1b4236061b0084f856143043be0ebfc9f 100644
--- a/core/modules/system/src/Tests/Form/ArbitraryRebuildTest.php
+++ b/core/modules/system/src/Tests/Form/ArbitraryRebuildTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Form\ArbitraryRebuildTest.
+ * Contains \Drupal\system\Tests\Form\ArbitraryRebuildTest.
  */
 
 namespace Drupal\system\Tests\Form;
diff --git a/core/modules/system/src/Tests/Form/CheckboxTest.php b/core/modules/system/src/Tests/Form/CheckboxTest.php
index 13b7d07498ca3f112ab4bdea2c489471870f35d0..f902a0246db52ee2f885d8235f89e7f422e72494 100644
--- a/core/modules/system/src/Tests/Form/CheckboxTest.php
+++ b/core/modules/system/src/Tests/Form/CheckboxTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Form\CheckboxTest.
+ * Contains \Drupal\system\Tests\Form\CheckboxTest.
  */
 
 namespace Drupal\system\Tests\Form;
diff --git a/core/modules/system/src/Tests/Form/ElementTest.php b/core/modules/system/src/Tests/Form/ElementTest.php
index 9fa7eca55cf8611b5feb0969f1e4c87ecc7bd065..d7085dd621e4f7aca99d14bd71571945368c2039 100644
--- a/core/modules/system/src/Tests/Form/ElementTest.php
+++ b/core/modules/system/src/Tests/Form/ElementTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Form\ElementTest.
+ * Contains \Drupal\system\Tests\Form\ElementTest.
  */
 
 namespace Drupal\system\Tests\Form;
diff --git a/core/modules/system/src/Tests/Form/ElementsLabelsTest.php b/core/modules/system/src/Tests/Form/ElementsLabelsTest.php
index db5dbee91c01e3b8a3ef665de91a948ad6a5f6f2..9baf888eab6147fb455af2011a2742741f1af7dd 100644
--- a/core/modules/system/src/Tests/Form/ElementsLabelsTest.php
+++ b/core/modules/system/src/Tests/Form/ElementsLabelsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Form\ElementsLabelsTest.
+ * Contains \Drupal\system\Tests\Form\ElementsLabelsTest.
  */
 
 namespace Drupal\system\Tests\Form;
diff --git a/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php b/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php
index 8d6cb65846fcf28af1d1a2f7f01da5a64a5b694f..22622e74d16187e803b68ad553dc1325bbdb4009 100644
--- a/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php
+++ b/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Form\ElementsTableSelectTest.
+ * Contains \Drupal\system\Tests\Form\ElementsTableSelectTest.
  */
 
 namespace Drupal\system\Tests\Form;
diff --git a/core/modules/system/src/Tests/Form/ElementsVerticalTabsTest.php b/core/modules/system/src/Tests/Form/ElementsVerticalTabsTest.php
index 44f331f98b8ad0fffb4dbdb8059d204c5e2ce506..d4b16e45e9b09bd5f67b952175df48cdabc45931 100644
--- a/core/modules/system/src/Tests/Form/ElementsVerticalTabsTest.php
+++ b/core/modules/system/src/Tests/Form/ElementsVerticalTabsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Form\ElementsVerticalTabsTest.
+ * Contains \Drupal\system\Tests\Form\ElementsVerticalTabsTest.
  */
 
 namespace Drupal\system\Tests\Form;
diff --git a/core/modules/system/src/Tests/Form/EmailTest.php b/core/modules/system/src/Tests/Form/EmailTest.php
index 8e88f50146fa1f9a67ee91d3c57c3bd633a7c518..69e9807c80a2b4750b6738c70d17006fd38a54b3 100644
--- a/core/modules/system/src/Tests/Form/EmailTest.php
+++ b/core/modules/system/src/Tests/Form/EmailTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Form\EmailTest.
+ * Contains \Drupal\system\Tests\Form\EmailTest.
  */
 
 namespace Drupal\system\Tests\Form;
diff --git a/core/modules/system/src/Tests/Form/FormTest.php b/core/modules/system/src/Tests/Form/FormTest.php
index 910000b700255b13429b1f27fe75cf752946bce4..c5e7fe76a3bc0c8a249e3b1c99f85780212e785f 100644
--- a/core/modules/system/src/Tests/Form/FormTest.php
+++ b/core/modules/system/src/Tests/Form/FormTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Form\FormTest.
+ * Contains \Drupal\system\Tests\Form\FormTest.
  */
 
 namespace Drupal\system\Tests\Form;
diff --git a/core/modules/system/src/Tests/Form/LanguageSelectElementTest.php b/core/modules/system/src/Tests/Form/LanguageSelectElementTest.php
index 410d320f14ec79d9285a3f3b0ae0e0cdb8e7c5b2..35da8b2c9b9d1806cdc5673af6221dfc9e2d8c21 100644
--- a/core/modules/system/src/Tests/Form/LanguageSelectElementTest.php
+++ b/core/modules/system/src/Tests/Form/LanguageSelectElementTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Form\LanguageSelectElementTest.
+ * Contains \Drupal\system\Tests\Form\LanguageSelectElementTest.
  */
 
 namespace Drupal\system\Tests\Form;
diff --git a/core/modules/system/src/Tests/Form/ModulesListFormWebTest.php b/core/modules/system/src/Tests/Form/ModulesListFormWebTest.php
index 7f4f2d67a65726834e73316d5d2a1232bc342908..f0945ed99e203a12202f719429f100d9e32df6d7 100644
--- a/core/modules/system/src/Tests/Form/ModulesListFormWebTest.php
+++ b/core/modules/system/src/Tests/Form/ModulesListFormWebTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Form\ModulesListFormWebTest.
+ * Contains \Drupal\system\Tests\Form\ModulesListFormWebTest.
  */
 
 namespace Drupal\system\Tests\Form;
diff --git a/core/modules/system/src/Tests/Form/ProgrammaticTest.php b/core/modules/system/src/Tests/Form/ProgrammaticTest.php
index ef8130cc01fd60faa65ebfc936683cadf4942d4a..b138d163393e1267a3d78e92c606ae94f8bad4f4 100644
--- a/core/modules/system/src/Tests/Form/ProgrammaticTest.php
+++ b/core/modules/system/src/Tests/Form/ProgrammaticTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Form\ProgrammaticTest.
+ * Contains \Drupal\system\Tests\Form\ProgrammaticTest.
  */
 
 namespace Drupal\system\Tests\Form;
diff --git a/core/modules/system/src/Tests/Form/RebuildTest.php b/core/modules/system/src/Tests/Form/RebuildTest.php
index 53de2f2bb0c5bb319fff19777fe17d939a71d5cb..98260704172df7bf68a71e0e59d13ceb7ca93f24 100644
--- a/core/modules/system/src/Tests/Form/RebuildTest.php
+++ b/core/modules/system/src/Tests/Form/RebuildTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Form\RebuildTest.
+ * Contains \Drupal\system\Tests\Form\RebuildTest.
  */
 
 namespace Drupal\system\Tests\Form;
diff --git a/core/modules/system/src/Tests/Form/RedirectTest.php b/core/modules/system/src/Tests/Form/RedirectTest.php
index 6ea944ca73a4b500053d024da0f8098ebf6a676c..6e701749e757ae073391fc1d0b770af25a61a6e1 100644
--- a/core/modules/system/src/Tests/Form/RedirectTest.php
+++ b/core/modules/system/src/Tests/Form/RedirectTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Form\RedirectTest.
+ * Contains \Drupal\system\Tests\Form\RedirectTest.
  */
 
 namespace Drupal\system\Tests\Form;
diff --git a/core/modules/system/src/Tests/Form/ResponseTest.php b/core/modules/system/src/Tests/Form/ResponseTest.php
index 851c1232318bba599ce59ccb6656b710d1b86b1d..616b1003f9652d992924a59bd3b745b776db8cd5 100644
--- a/core/modules/system/src/Tests/Form/ResponseTest.php
+++ b/core/modules/system/src/Tests/Form/ResponseTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Form\ResponseTest.
+ * Contains \Drupal\system\Tests\Form\ResponseTest.
  */
 
 namespace Drupal\system\Tests\Form;
diff --git a/core/modules/system/src/Tests/Form/StateValuesCleanAdvancedTest.php b/core/modules/system/src/Tests/Form/StateValuesCleanAdvancedTest.php
index 1c9ed4c556a35709ab4c79593d4840f799573b6f..bfdc64cc483fa6c40c181795498d283379a1951a 100644
--- a/core/modules/system/src/Tests/Form/StateValuesCleanAdvancedTest.php
+++ b/core/modules/system/src/Tests/Form/StateValuesCleanAdvancedTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Form\StateValuesCleanAdvancedTest.
+ * Contains \Drupal\system\Tests\Form\StateValuesCleanAdvancedTest.
  */
 
 namespace Drupal\system\Tests\Form;
diff --git a/core/modules/system/src/Tests/Form/StateValuesCleanTest.php b/core/modules/system/src/Tests/Form/StateValuesCleanTest.php
index 642a85cc98281a60405cbe0eddf41e07b5b81ba0..9ea7fb9ced4909940ef174b9cec14aebf8b0da26 100644
--- a/core/modules/system/src/Tests/Form/StateValuesCleanTest.php
+++ b/core/modules/system/src/Tests/Form/StateValuesCleanTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Form\StateValuesCleanTest.
+ * Contains \Drupal\system\Tests\Form\StateValuesCleanTest.
  */
 
 namespace Drupal\system\Tests\Form;
diff --git a/core/modules/system/src/Tests/Form/StorageTest.php b/core/modules/system/src/Tests/Form/StorageTest.php
index 94808cf40ffff72a2c2038cd73b225d5e6cdf048..8f3873a7f98002495b79ef074de55791018f3e70 100644
--- a/core/modules/system/src/Tests/Form/StorageTest.php
+++ b/core/modules/system/src/Tests/Form/StorageTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Form\StorageTest.
+ * Contains \Drupal\system\Tests\Form\StorageTest.
  */
 
 namespace Drupal\system\Tests\Form;
diff --git a/core/modules/system/src/Tests/Form/TriggeringElementTest.php b/core/modules/system/src/Tests/Form/TriggeringElementTest.php
index 24cc2d2247cb1ecdf47cb9f9cc3a1d448374defb..bdfb7395e1b49d10c5a1dca96e19e061fae566cd 100644
--- a/core/modules/system/src/Tests/Form/TriggeringElementTest.php
+++ b/core/modules/system/src/Tests/Form/TriggeringElementTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Form\TriggeringElementTest.
+ * Contains \Drupal\system\Tests\Form\TriggeringElementTest.
  */
 
 namespace Drupal\system\Tests\Form;
diff --git a/core/modules/system/src/Tests/Form/UrlTest.php b/core/modules/system/src/Tests/Form/UrlTest.php
index ae3ecea8141e22d76c562fee059d32bf98b5dc96..494255d15ceb82e5b4dce335ad5cb51a5d863735 100644
--- a/core/modules/system/src/Tests/Form/UrlTest.php
+++ b/core/modules/system/src/Tests/Form/UrlTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Form\UrlTest.
+ * Contains \Drupal\system\Tests\Form\UrlTest.
  */
 
 namespace Drupal\system\Tests\Form;
diff --git a/core/modules/system/src/Tests/Form/ValidationTest.php b/core/modules/system/src/Tests/Form/ValidationTest.php
index eda6dae73dc433e1ef6d488bf4c3a778b1cbc9d1..7fd60e7f889173b2d3978dd0eae8c768d67e37c2 100644
--- a/core/modules/system/src/Tests/Form/ValidationTest.php
+++ b/core/modules/system/src/Tests/Form/ValidationTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Form\ValidationTest.
+ * Contains \Drupal\system\Tests\Form\ValidationTest.
  */
 
 namespace Drupal\system\Tests\Form;
diff --git a/core/modules/system/src/Tests/Image/ToolkitGdTest.php b/core/modules/system/src/Tests/Image/ToolkitGdTest.php
index 9b25182ab04330ad31ad3e1ced91dfa0f05549b7..d7f55dc9c95a04809f466a208beb4446a472fe26 100644
--- a/core/modules/system/src/Tests/Image/ToolkitGdTest.php
+++ b/core/modules/system/src/Tests/Image/ToolkitGdTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Image\ToolkitGdTest.
+ * Contains \Drupal\system\Tests\Image\ToolkitGdTest.
  */
 
 namespace Drupal\system\Tests\Image;
diff --git a/core/modules/system/src/Tests/Image/ToolkitTest.php b/core/modules/system/src/Tests/Image/ToolkitTest.php
index 35686bffcfd12dceb31f4e36eab2d7a0440ca24a..ea5bd5f661f042b1e991c8ec75f6b167131babe2 100644
--- a/core/modules/system/src/Tests/Image/ToolkitTest.php
+++ b/core/modules/system/src/Tests/Image/ToolkitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Image\ToolkitTest.
+ * Contains \Drupal\system\Tests\Image\ToolkitTest.
  */
 
 namespace Drupal\system\Tests\Image;
diff --git a/core/modules/system/src/Tests/Image/ToolkitTestBase.php b/core/modules/system/src/Tests/Image/ToolkitTestBase.php
index 72703adb0138033e07267c03674977ec1434e2cb..21a514cb799bbe26db3b7d195643507018f9c6ef 100644
--- a/core/modules/system/src/Tests/Image/ToolkitTestBase.php
+++ b/core/modules/system/src/Tests/Image/ToolkitTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Image\ToolkitTestBase.
+ * Contains \Drupal\system\Tests\Image\ToolkitTestBase.
  */
 
 namespace Drupal\system\Tests\Image;
diff --git a/core/modules/system/src/Tests/Installer/InstallerLanguageTest.php b/core/modules/system/src/Tests/Installer/InstallerLanguageTest.php
index 05be03bd952ba21f10657b432b1e55aecc043284..417cfd05213b28bee695b8acb92218f858585e51 100644
--- a/core/modules/system/src/Tests/Installer/InstallerLanguageTest.php
+++ b/core/modules/system/src/Tests/Installer/InstallerLanguageTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\Installer\InstallerLanguageTest.
+ * Contains \Drupal\system\Tests\Installer\InstallerLanguageTest.
  */
 
 namespace Drupal\system\Tests\Installer;
diff --git a/core/modules/system/src/Tests/Installer/InstallerTranslationVersionUnitTest.php b/core/modules/system/src/Tests/Installer/InstallerTranslationVersionUnitTest.php
index dd4948fa35e3547442a24ccabb5005a83de96800..5e16171d4c9585239ed3b481bb23cc35a8532d42 100644
--- a/core/modules/system/src/Tests/Installer/InstallerTranslationVersionUnitTest.php
+++ b/core/modules/system/src/Tests/Installer/InstallerTranslationVersionUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\Installer\InstallerTranslationVersionUnitTest.
+ * Contains \Drupal\system\Tests\Installer\InstallerTranslationVersionUnitTest.
  */
 
 namespace Drupal\system\Tests\Installer;
diff --git a/core/modules/system/src/Tests/KeyValueStore/DatabaseStorageExpirableTest.php b/core/modules/system/src/Tests/KeyValueStore/DatabaseStorageExpirableTest.php
index 592abcf6b37f42245cf5571c399126a5c8599f4f..944c9a137c55a6e3a54701ce51a0dc8c8c7873c9 100644
--- a/core/modules/system/src/Tests/KeyValueStore/DatabaseStorageExpirableTest.php
+++ b/core/modules/system/src/Tests/KeyValueStore/DatabaseStorageExpirableTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\KeyValueStore\DatabaseStorageExpirableTest.
+ * Contains \Drupal\system\Tests\KeyValueStore\DatabaseStorageExpirableTest.
  */
 
 namespace Drupal\system\Tests\KeyValueStore;
diff --git a/core/modules/system/src/Tests/KeyValueStore/DatabaseStorageTest.php b/core/modules/system/src/Tests/KeyValueStore/DatabaseStorageTest.php
index f7632a9a87544d7f838e39f75618ab24bbe06dcf..dd9e44c66c5a456c018667e650c3ca38a9d98786 100644
--- a/core/modules/system/src/Tests/KeyValueStore/DatabaseStorageTest.php
+++ b/core/modules/system/src/Tests/KeyValueStore/DatabaseStorageTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\KeyValueStore\DatabaseStorageTest.
+ * Contains \Drupal\system\Tests\KeyValueStore\DatabaseStorageTest.
  */
 
 namespace Drupal\system\Tests\KeyValueStore;
diff --git a/core/modules/system/src/Tests/KeyValueStore/GarbageCollectionTest.php b/core/modules/system/src/Tests/KeyValueStore/GarbageCollectionTest.php
index 4ea8fa748697e419cedadd80055de3678189319e..7afcda719cdb0dfd412a405dad89f4ece7017936 100644
--- a/core/modules/system/src/Tests/KeyValueStore/GarbageCollectionTest.php
+++ b/core/modules/system/src/Tests/KeyValueStore/GarbageCollectionTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\KeyValueStore\GarbageCollectionTest.
+ * Contains \Drupal\system\Tests\KeyValueStore\GarbageCollectionTest.
  */
 
 namespace Drupal\system\Tests\KeyValueStore;
diff --git a/core/modules/system/src/Tests/KeyValueStore/MemoryStorageTest.php b/core/modules/system/src/Tests/KeyValueStore/MemoryStorageTest.php
index 6df79d6267294cdfefbe22c500c891df3048fbf1..4c6ac0c54dadaaacc283ec84445c1f1618a364b8 100644
--- a/core/modules/system/src/Tests/KeyValueStore/MemoryStorageTest.php
+++ b/core/modules/system/src/Tests/KeyValueStore/MemoryStorageTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\KeyValueStore\MemoryStorageTest.
+ * Contains \Drupal\system\Tests\KeyValueStore\MemoryStorageTest.
  */
 
 namespace Drupal\system\Tests\KeyValueStore;
diff --git a/core/modules/system/src/Tests/KeyValueStore/StorageTestBase.php b/core/modules/system/src/Tests/KeyValueStore/StorageTestBase.php
index cb82a72c3361621befb24fbd8f173fb3d3d00640..dd9b248d0d50d86024e3cc4948fa7913881f9209 100644
--- a/core/modules/system/src/Tests/KeyValueStore/StorageTestBase.php
+++ b/core/modules/system/src/Tests/KeyValueStore/StorageTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\KeyValueStore\StorageTestBase.
+ * Contains \Drupal\system\Tests\KeyValueStore\StorageTestBase.
  */
 
 namespace Drupal\system\Tests\KeyValueStore;
diff --git a/core/modules/system/src/Tests/Lock/LockFunctionalTest.php b/core/modules/system/src/Tests/Lock/LockFunctionalTest.php
index cece86d7fe202b5ad1bd9f9c76c9716732b17025..ffd9513fa4cc9c8d9056f9d73c4439ff3e41aa6d 100644
--- a/core/modules/system/src/Tests/Lock/LockFunctionalTest.php
+++ b/core/modules/system/src/Tests/Lock/LockFunctionalTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Lock\LockFunctionalTest.
+ * Contains \Drupal\system\Tests\Lock\LockFunctionalTest.
  */
 
 namespace Drupal\system\Tests\Lock;
diff --git a/core/modules/system/src/Tests/Mail/HtmlToTextTest.php b/core/modules/system/src/Tests/Mail/HtmlToTextTest.php
index 8b5d6258ea30f4bdbbbf84a3aae122cd323c03cf..fe6f7c05e9e71831ce87d7c2f8b4250b4ff6eb08 100644
--- a/core/modules/system/src/Tests/Mail/HtmlToTextTest.php
+++ b/core/modules/system/src/Tests/Mail/HtmlToTextTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Mail\HtmlToTextTest.
+ * Contains \Drupal\system\Tests\Mail\HtmlToTextTest.
  */
 
 namespace Drupal\system\Tests\Mail;
diff --git a/core/modules/system/src/Tests/Mail/MailTest.php b/core/modules/system/src/Tests/Mail/MailTest.php
index 469f82e55235ddb79e60b6352dbe5208d3c4f07c..cf950ddb094289b7793690554552d99e91d6cf05 100644
--- a/core/modules/system/src/Tests/Mail/MailTest.php
+++ b/core/modules/system/src/Tests/Mail/MailTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Mail\MailTest.
+ * Contains \Drupal\system\Tests\Mail\MailTest.
  */
 
 namespace Drupal\system\Tests\Mail;
diff --git a/core/modules/system/src/Tests/Menu/BreadcrumbTest.php b/core/modules/system/src/Tests/Menu/BreadcrumbTest.php
index 456ff5eadfb969dac966135271e2cb8a15b3e82f..65482088402854b29df01c13b423d1bf29dc74f2 100644
--- a/core/modules/system/src/Tests/Menu/BreadcrumbTest.php
+++ b/core/modules/system/src/Tests/Menu/BreadcrumbTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Menu\BreadcrumbTest.
+ * Contains \Drupal\system\Tests\Menu\BreadcrumbTest.
  */
 
 namespace Drupal\system\Tests\Menu;
diff --git a/core/modules/system/src/Tests/Menu/MenuRouterTest.php b/core/modules/system/src/Tests/Menu/MenuRouterTest.php
index d75bd6c7ee5c608f1a941e92fbf20e0d6abf0520..ef78c7b71c744e9ddd21eb6813e79f3d6697ff18 100644
--- a/core/modules/system/src/Tests/Menu/MenuRouterTest.php
+++ b/core/modules/system/src/Tests/Menu/MenuRouterTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Menu\MenuRouterTest.
+ * Contains \Drupal\system\Tests\Menu\MenuRouterTest.
  */
 
 namespace Drupal\system\Tests\Menu;
diff --git a/core/modules/system/src/Tests/Menu/MenuTestBase.php b/core/modules/system/src/Tests/Menu/MenuTestBase.php
index 833d72fd9693409172efcdc4350db72b5cc37b1b..9659f14549e4a4005408061de7dac59aae32de4c 100644
--- a/core/modules/system/src/Tests/Menu/MenuTestBase.php
+++ b/core/modules/system/src/Tests/Menu/MenuTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Menu\MenuTestBase.
+ * Contains \Drupal\system\Tests\Menu\MenuTestBase.
  */
 
 namespace Drupal\system\Tests\Menu;
diff --git a/core/modules/system/src/Tests/Module/ClassLoaderTest.php b/core/modules/system/src/Tests/Module/ClassLoaderTest.php
index cfea56d0d9cf6f52f284bbf00e71a29cf5d2833d..ad935865a2ed5748f930469f269485c2de982cb8 100644
--- a/core/modules/system/src/Tests/Module/ClassLoaderTest.php
+++ b/core/modules/system/src/Tests/Module/ClassLoaderTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Module\ClassLoaderTest.
+ * Contains \Drupal\system\Tests\Module\ClassLoaderTest.
  */
 
 namespace Drupal\system\Tests\Module;
diff --git a/core/modules/system/src/Tests/Module/HookRequirementsTest.php b/core/modules/system/src/Tests/Module/HookRequirementsTest.php
index dd286e9d949dac1835c498488b7ee0c07b84630a..ad8796057c3aac3646f6c944f4069e58194549ab 100644
--- a/core/modules/system/src/Tests/Module/HookRequirementsTest.php
+++ b/core/modules/system/src/Tests/Module/HookRequirementsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Module\HookRequirementsTest.
+ * Contains \Drupal\system\Tests\Module\HookRequirementsTest.
  */
 
 namespace Drupal\system\Tests\Module;
diff --git a/core/modules/system/src/Tests/Module/InstallTest.php b/core/modules/system/src/Tests/Module/InstallTest.php
index 1068b60a3e54dd8dac355a4842b14431d1f43a8b..ad81180cf8084ddb0f1fd614cce0a9db80942c90 100644
--- a/core/modules/system/src/Tests/Module/InstallTest.php
+++ b/core/modules/system/src/Tests/Module/InstallTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Module\InstallTest.
+ * Contains \Drupal\system\Tests\Module\InstallTest.
  */
 
 namespace Drupal\system\Tests\Module;
diff --git a/core/modules/system/src/Tests/Module/ModuleTestBase.php b/core/modules/system/src/Tests/Module/ModuleTestBase.php
index d421d4368d2e60566ed3aba1445d8d0c435f579e..1f225bb5cee1f6fdada2a67cb02e6f04331308b0 100644
--- a/core/modules/system/src/Tests/Module/ModuleTestBase.php
+++ b/core/modules/system/src/Tests/Module/ModuleTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Module\ModuleTestBase.
+ * Contains \Drupal\system\Tests\Module\ModuleTestBase.
  */
 
 namespace Drupal\system\Tests\Module;
diff --git a/core/modules/system/src/Tests/Module/RequiredTest.php b/core/modules/system/src/Tests/Module/RequiredTest.php
index c14d2932310b6e48458f0f3c4ccdd9725fa178bf..ba9c6aa8ec875f544ca3896051d541a3f00bbd48 100644
--- a/core/modules/system/src/Tests/Module/RequiredTest.php
+++ b/core/modules/system/src/Tests/Module/RequiredTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Module\RequiredTest.
+ * Contains \Drupal\system\Tests\Module\RequiredTest.
  */
 
 namespace Drupal\system\Tests\Module;
diff --git a/core/modules/system/src/Tests/Module/UninstallTest.php b/core/modules/system/src/Tests/Module/UninstallTest.php
index aa8a1696e30ce28c3e545dfea6ca0e62c2e3373b..f060986fd7ebe6018b89309514de2e1195db28c4 100644
--- a/core/modules/system/src/Tests/Module/UninstallTest.php
+++ b/core/modules/system/src/Tests/Module/UninstallTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Module\UninstallTest.
+ * Contains \Drupal\system\Tests\Module\UninstallTest.
  */
 
 namespace Drupal\system\Tests\Module;
diff --git a/core/modules/system/src/Tests/Module/VersionTest.php b/core/modules/system/src/Tests/Module/VersionTest.php
index 2d6705a859ad8b2acbfa810da8aa61268d9a32ab..db9ad28c16951f5efc7c7f2011df452098c06baa 100644
--- a/core/modules/system/src/Tests/Module/VersionTest.php
+++ b/core/modules/system/src/Tests/Module/VersionTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Module\VersionTest.
+ * Contains \Drupal\system\Tests\Module\VersionTest.
  */
 
 namespace Drupal\system\Tests\Module;
diff --git a/core/modules/system/src/Tests/Page/DefaultMetatagsTest.php b/core/modules/system/src/Tests/Page/DefaultMetatagsTest.php
index beb43c0d8b5952a61678c1afb409c416cee3d71f..2cbdbb0e241d11230c3da07195916fc5d0df5569 100644
--- a/core/modules/system/src/Tests/Page/DefaultMetatagsTest.php
+++ b/core/modules/system/src/Tests/Page/DefaultMetatagsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\simpletest\Tests\Page\DefaultMetatagsTest.
+ * Contains \Drupal\system\Tests\Page\DefaultMetatagsTest.
  */
 
 namespace Drupal\system\Tests\Page;
diff --git a/core/modules/system/src/Tests/ParamConverter/UpcastingTest.php b/core/modules/system/src/Tests/ParamConverter/UpcastingTest.php
index 1b277113d6429536c2962078f911b3c8cd81df5c..53888d99ddbdc38b1fa721f76e0bda78a46fc443 100644
--- a/core/modules/system/src/Tests/ParamConverter/UpcastingTest.php
+++ b/core/modules/system/src/Tests/ParamConverter/UpcastingTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\ParamConverter\UpcastingTest.
+ * Contains \Drupal\system\Tests\ParamConverter\UpcastingTest.
  */
 
 namespace Drupal\system\Tests\ParamConverter;
diff --git a/core/modules/system/src/Tests/Path/AliasTest.php b/core/modules/system/src/Tests/Path/AliasTest.php
index f1f6bf2bb0774d3fac4fcad6b728b8686307da80..8eba1c984c4deae27256171720b15a83fa1052e3 100644
--- a/core/modules/system/src/Tests/Path/AliasTest.php
+++ b/core/modules/system/src/Tests/Path/AliasTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\Path\AliasTest.
+ * Contains \Drupal\system\Tests\Path\AliasTest.
  */
 
 namespace Drupal\system\Tests\Path;
diff --git a/core/modules/system/src/Tests/Path/PathUnitTestBase.php b/core/modules/system/src/Tests/Path/PathUnitTestBase.php
index e9a19f7ac346f81d05854f6ae444eaa8453bb451..f0077508c615443ec6abf65d80f6ce40fe5f2b76 100644
--- a/core/modules/system/src/Tests/Path/PathUnitTestBase.php
+++ b/core/modules/system/src/Tests/Path/PathUnitTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\Path\PathUnitTestBase.
+ * Contains \Drupal\system\Tests\Path\PathUnitTestBase.
  */
 
 namespace Drupal\system\Tests\Path;
diff --git a/core/modules/system/src/Tests/Path/UrlAliasFixtures.php b/core/modules/system/src/Tests/Path/UrlAliasFixtures.php
index 550ea76ea7b3ae59bbde5268c877e9732bb5bd63..1b300d61967a31742985fbb67c827a85582c9034 100644
--- a/core/modules/system/src/Tests/Path/UrlAliasFixtures.php
+++ b/core/modules/system/src/Tests/Path/UrlAliasFixtures.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\system\Tests\Path\UrlAliasFixtures.
+ */
+
 namespace Drupal\system\Tests\Path;
 
 use Drupal\Core\Database\Connection;
diff --git a/core/modules/system/src/Tests/Path/UrlAlterFunctionalTest.php b/core/modules/system/src/Tests/Path/UrlAlterFunctionalTest.php
index 1988708533e2332058c236efd4bd8d4ea86a72b0..2a6d79617758c079b46e43f093ffd37096cac800 100644
--- a/core/modules/system/src/Tests/Path/UrlAlterFunctionalTest.php
+++ b/core/modules/system/src/Tests/Path/UrlAlterFunctionalTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Path\UrlAlterFunctionalTest.
+ * Contains \Drupal\system\Tests\Path\UrlAlterFunctionalTest.
  */
 
 namespace Drupal\system\Tests\Path;
diff --git a/core/modules/system/src/Tests/PhpStorage/PhpStorageFactoryTest.php b/core/modules/system/src/Tests/PhpStorage/PhpStorageFactoryTest.php
index 248d203b910781af8284468d0a7e78a004d3d16d..580bfa108054c41f0d246e196ce5bd555bd978f0 100644
--- a/core/modules/system/src/Tests/PhpStorage/PhpStorageFactoryTest.php
+++ b/core/modules/system/src/Tests/PhpStorage/PhpStorageFactoryTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Session\PhpStorage\PhpStorageFactoryTest.
+ * Contains \Drupal\system\Tests\PhpStorage\PhpStorageFactoryTest.
  */
 
 namespace Drupal\system\Tests\PhpStorage;
diff --git a/core/modules/system/src/Tests/Plugin/Condition/RequestPathTest.php b/core/modules/system/src/Tests/Plugin/Condition/RequestPathTest.php
index 45011f8e48249fa07dc1a18a42e99ad52a458d28..b5ac9ff915f5fe1a318e39a2503ca69d959c18c7 100644
--- a/core/modules/system/src/Tests/Plugin/Condition/RequestPathTest.php
+++ b/core/modules/system/src/Tests/Plugin/Condition/RequestPathTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\Plugin\Core\Condition\RequestPathTest
+ * Contains \Drupal\system\Tests\Plugin\Condition\RequestPathTest.
  */
 
 namespace Drupal\system\Tests\Plugin\Condition;
diff --git a/core/modules/system/src/Tests/Plugin/InspectionTest.php b/core/modules/system/src/Tests/Plugin/InspectionTest.php
index e16f4bf47fda753aafc46c777f3198ddd0469f9c..814a1741416945c9dbdd7897d46607d39a347a1e 100644
--- a/core/modules/system/src/Tests/Plugin/InspectionTest.php
+++ b/core/modules/system/src/Tests/Plugin/InspectionTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Plugin\InspectionTest
+ * Contains \Drupal\system\Tests\Plugin\InspectionTest.
  */
 
 namespace Drupal\system\Tests\Plugin;
diff --git a/core/modules/system/src/Tests/Queue/QueueTest.php b/core/modules/system/src/Tests/Queue/QueueTest.php
index 18585c409a82411fa601955bc626e8ef4e536145..ab1b083dc7d825b197396cdf3b1ce27572d972d5 100644
--- a/core/modules/system/src/Tests/Queue/QueueTest.php
+++ b/core/modules/system/src/Tests/Queue/QueueTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Queue\QueueTest.
+ * Contains \Drupal\system\Tests\Queue\QueueTest.
  */
 
 namespace Drupal\system\Tests\Queue;
diff --git a/core/modules/system/src/Tests/Routing/ContentNegotiationRoutingTest.php b/core/modules/system/src/Tests/Routing/ContentNegotiationRoutingTest.php
index e9430b0861f2e9a30d0e619c19e0bab4a3da40e8..ffc3157729f4b9fd8ede15483833a833c8bcc2f2 100644
--- a/core/modules/system/src/Tests/Routing/ContentNegotiationRoutingTest.php
+++ b/core/modules/system/src/Tests/Routing/ContentNegotiationRoutingTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\conneg_test\Tests\ContentNegotiationRoutingTest.
+ * Contains \Drupal\system\Tests\Routing\ContentNegotiationRoutingTest.
  */
 
 namespace Drupal\system\Tests\Routing;
diff --git a/core/modules/system/src/Tests/Routing/MockAliasManager.php b/core/modules/system/src/Tests/Routing/MockAliasManager.php
index 6c3839d230425a6a2ecfcc1c380dc93e6ea05761..7ca6f9dc0769cd7eeed59c884bab8f49f42190fd 100644
--- a/core/modules/system/src/Tests/Routing/MockAliasManager.php
+++ b/core/modules/system/src/Tests/Routing/MockAliasManager.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\Routing\MockAliasManager.
+ * Contains \Drupal\system\Tests\Routing\MockAliasManager.
  */
 
 namespace Drupal\system\Tests\Routing;
diff --git a/core/modules/system/src/Tests/Routing/MockMatcher.php b/core/modules/system/src/Tests/Routing/MockMatcher.php
index dc796b83551c11df784e8dc91cf1f72132949ebc..db7a272b8da9ce580a1db2931ecc0dd055843738 100644
--- a/core/modules/system/src/Tests/Routing/MockMatcher.php
+++ b/core/modules/system/src/Tests/Routing/MockMatcher.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Routing\MockMatcher.
+ * Contains \Drupal\system\Tests\Routing\MockMatcher.
  */
 
 namespace Drupal\system\Tests\Routing;
diff --git a/core/modules/system/src/Tests/Routing/MockRouteProvider.php b/core/modules/system/src/Tests/Routing/MockRouteProvider.php
index eba563fa12f036537428a03d771ac861948d1d6f..21be90914f8f5980163f422de88de7b5974dde19 100644
--- a/core/modules/system/src/Tests/Routing/MockRouteProvider.php
+++ b/core/modules/system/src/Tests/Routing/MockRouteProvider.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\Routing\MockRouteProvider.
+ * Contains \Drupal\system\Tests\Routing\MockRouteProvider.
  */
 
 namespace Drupal\system\Tests\Routing;
diff --git a/core/modules/system/src/Tests/Routing/RouteProviderTest.php b/core/modules/system/src/Tests/Routing/RouteProviderTest.php
index 06a40fbdc5efa75274a2bd66d3e9e3a084003fef..82d202883cf7dd64646e5dc8b57f17b8147f0e55 100644
--- a/core/modules/system/src/Tests/Routing/RouteProviderTest.php
+++ b/core/modules/system/src/Tests/Routing/RouteProviderTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\Routing\RouteProviderTest.
+ * Contains \Drupal\system\Tests\Routing\RouteProviderTest.
  */
 
 namespace Drupal\system\Tests\Routing;
diff --git a/core/modules/system/src/Tests/Routing/RouterPermissionTest.php b/core/modules/system/src/Tests/Routing/RouterPermissionTest.php
index 3dacbfa82afe9f6cfd697615b09c6ee9963b5493..048982c25a7c0759c0d416f53fa6bb990de14b1d 100644
--- a/core/modules/system/src/Tests/Routing/RouterPermissionTest.php
+++ b/core/modules/system/src/Tests/Routing/RouterPermissionTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\Routing\RouterPermissionTest.
+ * Contains \Drupal\system\Tests\Routing\RouterPermissionTest.
  */
 
 namespace Drupal\system\Tests\Routing;
diff --git a/core/modules/system/src/Tests/Routing/RouterTest.php b/core/modules/system/src/Tests/Routing/RouterTest.php
index e7bc5f058938d49783fe16bbb217297639a30e1f..209336c2c0a93226178412922c9e0ff874060355 100644
--- a/core/modules/system/src/Tests/Routing/RouterTest.php
+++ b/core/modules/system/src/Tests/Routing/RouterTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Routing\RouterTest.
+ * Contains \Drupal\system\Tests\Routing\RouterTest.
  */
 
 namespace Drupal\system\Tests\Routing;
diff --git a/core/modules/system/src/Tests/Session/AccountSwitcherTest.php b/core/modules/system/src/Tests/Session/AccountSwitcherTest.php
index 148cf672e098e0aa628ceeaf7109a42b028f1746..edbf6b2742150560e050174b24ef04596b08d1f0 100644
--- a/core/modules/system/src/Tests/Session/AccountSwitcherTest.php
+++ b/core/modules/system/src/Tests/Session/AccountSwitcherTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\Session\AccountSwitcherTest.
+ * Contains \Drupal\system\Tests\Session\AccountSwitcherTest.
  */
 
 namespace Drupal\system\Tests\Session;
diff --git a/core/modules/system/src/Tests/Session/SessionHttpsTest.php b/core/modules/system/src/Tests/Session/SessionHttpsTest.php
index 8205e9853e375e1210ac18b49d6512f92c7f98dd..a6632b502e953007439dd49e52e1ec8bc6705655 100644
--- a/core/modules/system/src/Tests/Session/SessionHttpsTest.php
+++ b/core/modules/system/src/Tests/Session/SessionHttpsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Session\SessionHttpsTest.
+ * Contains \Drupal\system\Tests\Session\SessionHttpsTest.
  */
 
 namespace Drupal\system\Tests\Session;
diff --git a/core/modules/system/src/Tests/Session/SessionTest.php b/core/modules/system/src/Tests/Session/SessionTest.php
index 632cbcd3d43073ae8b7860f20a4331b12f955132..c9eb3ee9e2eeee2c6de7f8bab4939ee5abcce2f6 100644
--- a/core/modules/system/src/Tests/Session/SessionTest.php
+++ b/core/modules/system/src/Tests/Session/SessionTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Session\SessionTest.
+ * Contains \Drupal\system\Tests\Session\SessionTest.
  */
 
 namespace Drupal\system\Tests\Session;
diff --git a/core/modules/system/src/Tests/System/AccessDeniedTest.php b/core/modules/system/src/Tests/System/AccessDeniedTest.php
index 17cb9d50d299fa6b309637485bba910bb9335706..46984d064483c481c5413041b6d2ff182f215bc7 100644
--- a/core/modules/system/src/Tests/System/AccessDeniedTest.php
+++ b/core/modules/system/src/Tests/System/AccessDeniedTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\System\AccessDeniedTest.
+ * Contains \Drupal\system\Tests\System\AccessDeniedTest.
  */
 
 namespace Drupal\system\Tests\System;
diff --git a/core/modules/system/src/Tests/System/AdminMetaTagTest.php b/core/modules/system/src/Tests/System/AdminMetaTagTest.php
index 1e2a1f080c4e6a782ceb87110c5bcb3eba7bf008..bd76cd23fe92b643a72972551d2488a5537499ae 100644
--- a/core/modules/system/src/Tests/System/AdminMetaTagTest.php
+++ b/core/modules/system/src/Tests/System/AdminMetaTagTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\System\AdminMetaTagTest.
+ * Contains \Drupal\system\Tests\System\AdminMetaTagTest.
  */
 
 namespace Drupal\system\Tests\System;
diff --git a/core/modules/system/src/Tests/System/CronQueueTest.php b/core/modules/system/src/Tests/System/CronQueueTest.php
index 102e168daf7df52e7c5337b7f23caa24f50c923a..b11e9c2281bfcaac01ed53420587a980831a26ba 100644
--- a/core/modules/system/src/Tests/System/CronQueueTest.php
+++ b/core/modules/system/src/Tests/System/CronQueueTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\System\CronQueueTest.
+ * Contains \Drupal\system\Tests\System\CronQueueTest.
  */
 
 namespace Drupal\system\Tests\System;
diff --git a/core/modules/system/src/Tests/System/CronRunTest.php b/core/modules/system/src/Tests/System/CronRunTest.php
index e17bbf311293e0f13f51675c3c4d73c84fc76ff4..063d9ab5284ffef9a5cb3d3a7f41cba97354c359 100644
--- a/core/modules/system/src/Tests/System/CronRunTest.php
+++ b/core/modules/system/src/Tests/System/CronRunTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\System\CronRunTest.
+ * Contains \Drupal\system\Tests\System\CronRunTest.
  */
 
 namespace Drupal\system\Tests\System;
diff --git a/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php b/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php
index 4232a88f230ba90305b10a6c2a51b0767b9c2fc7..ae2d3f4ffe2eecf6b3395b6ebbf827e4492c7618 100644
--- a/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php
+++ b/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\System\DefaultMobileMetaTagsTest.
+ * Contains \Drupal\system\Tests\System\DefaultMobileMetaTagsTest.
  */
 
 namespace Drupal\system\Tests\System;
diff --git a/core/modules/system/src/Tests/System/ErrorHandlerTest.php b/core/modules/system/src/Tests/System/ErrorHandlerTest.php
index a42686bf06cd0e710aee7d180bbe94f73a6e86c2..e985f283850a76500e0c1202b764a204eb88033f 100644
--- a/core/modules/system/src/Tests/System/ErrorHandlerTest.php
+++ b/core/modules/system/src/Tests/System/ErrorHandlerTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\System\ErrorHandlerTest.
+ * Contains \Drupal\system\Tests\System\ErrorHandlerTest.
  */
 
 namespace Drupal\system\Tests\System;
diff --git a/core/modules/system/src/Tests/System/FloodTest.php b/core/modules/system/src/Tests/System/FloodTest.php
index d1835ccb9d1a6803c26b55f67be192b84daf6ddc..29868e58bff3943c7353d6758f7250d6bd7c0575 100644
--- a/core/modules/system/src/Tests/System/FloodTest.php
+++ b/core/modules/system/src/Tests/System/FloodTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\System\FloodTest.
+ * Contains \Drupal\system\Tests\System\FloodTest.
  */
 
 namespace Drupal\system\Tests\System;
diff --git a/core/modules/system/src/Tests/System/FrontPageTest.php b/core/modules/system/src/Tests/System/FrontPageTest.php
index bb0b10b17c702197d0be1c395ae7890708ea35cb..cb9a13ff849faa4d8d070f86d12260420598f165 100644
--- a/core/modules/system/src/Tests/System/FrontPageTest.php
+++ b/core/modules/system/src/Tests/System/FrontPageTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\System\FrontPageTest.
+ * Contains \Drupal\system\Tests\System\FrontPageTest.
  */
 
 namespace Drupal\system\Tests\System;
diff --git a/core/modules/system/src/Tests/System/HtaccessTest.php b/core/modules/system/src/Tests/System/HtaccessTest.php
index fe21b9c82acda5242870edbce8100daec8c19653..5254075d2df92a234a67858d3b5467552b7b0719 100644
--- a/core/modules/system/src/Tests/System/HtaccessTest.php
+++ b/core/modules/system/src/Tests/System/HtaccessTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\System\HtaccessTest
+ * Contains \Drupal\system\Tests\System\HtaccessTest.
  */
 
 namespace Drupal\system\Tests\System;
diff --git a/core/modules/system/src/Tests/System/IgnoreReplicaSubscriberTest.php b/core/modules/system/src/Tests/System/IgnoreReplicaSubscriberTest.php
index 18298f9e94fc1fef17e418c497d60cfc83f38b19..0ba18d6917905187cafe54cc71512a35decb01ab 100644
--- a/core/modules/system/src/Tests/System/IgnoreReplicaSubscriberTest.php
+++ b/core/modules/system/src/Tests/System/IgnoreReplicaSubscriberTest.php
@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @file
  * Contains \Drupal\system\Tests\System\IgnoreReplicaSubscriberTest.
  */
 
diff --git a/core/modules/system/src/Tests/System/IndexPhpTest.php b/core/modules/system/src/Tests/System/IndexPhpTest.php
index 00ebedd2a220c4a339eba4910e4c10537f6ff28c..aa36e13144ac9da621037ec83c6067554597b8e6 100644
--- a/core/modules/system/src/Tests/System/IndexPhpTest.php
+++ b/core/modules/system/src/Tests/System/IndexPhpTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\System\IndexPhpTest.
+ * Contains \Drupal\system\Tests\System\IndexPhpTest.
  */
 
 namespace Drupal\system\Tests\System;
diff --git a/core/modules/system/src/Tests/System/InfoAlterTest.php b/core/modules/system/src/Tests/System/InfoAlterTest.php
index 2af3d05692461f5542d8e2655ea3a0e087636e64..6e7d231e88b8e824adb4d49b1ed467e0210d1e7a 100644
--- a/core/modules/system/src/Tests/System/InfoAlterTest.php
+++ b/core/modules/system/src/Tests/System/InfoAlterTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\System\InfoAlterTest.
+ * Contains \Drupal\system\Tests\System\InfoAlterTest.
  */
 
 namespace Drupal\system\Tests\System;
diff --git a/core/modules/system/src/Tests/System/MainContentFallbackTest.php b/core/modules/system/src/Tests/System/MainContentFallbackTest.php
index a6ec81e74fb98c5ca4ff4d71ed3131cfd8cf4f75..56a7e85530c6e0041efe5e23c1f92c2ed3a15132 100644
--- a/core/modules/system/src/Tests/System/MainContentFallbackTest.php
+++ b/core/modules/system/src/Tests/System/MainContentFallbackTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\System\MainContentFallbackTest.
+ * Contains \Drupal\system\Tests\System\MainContentFallbackTest.
  */
 
 namespace Drupal\system\Tests\System;
diff --git a/core/modules/system/src/Tests/System/PageNotFoundTest.php b/core/modules/system/src/Tests/System/PageNotFoundTest.php
index 41b8ed654cbd4d972d3f977f4054792014481305..03599b0a4a0414a73269386f26754cf349e483a8 100644
--- a/core/modules/system/src/Tests/System/PageNotFoundTest.php
+++ b/core/modules/system/src/Tests/System/PageNotFoundTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\System\PageNotFoundTest.
+ * Contains \Drupal\system\Tests\System\PageNotFoundTest.
  */
 
 namespace Drupal\system\Tests\System;
diff --git a/core/modules/system/src/Tests/System/ResponseGeneratorTest.php b/core/modules/system/src/Tests/System/ResponseGeneratorTest.php
index 8684624b3e9b89b17d3d944da2e6b02bd2f68303..a2ed46ca7526a4306c5175d8796979926ddfb290 100644
--- a/core/modules/system/src/Tests/System/ResponseGeneratorTest.php
+++ b/core/modules/system/src/Tests/System/ResponseGeneratorTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\System\ResponseGeneratorTest.
+ * Contains \Drupal\system\Tests\System\ResponseGeneratorTest.
  */
 
 namespace Drupal\system\Tests\System;
diff --git a/core/modules/system/src/Tests/System/RetrieveFileTest.php b/core/modules/system/src/Tests/System/RetrieveFileTest.php
index fc161eb5ad6314cd70316d17ab42ff49b3868a92..1f1a09bd88e3a065a1b2c72b2ffe65089edcec1d 100644
--- a/core/modules/system/src/Tests/System/RetrieveFileTest.php
+++ b/core/modules/system/src/Tests/System/RetrieveFileTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\System\RetrieveFileTest.
+ * Contains \Drupal\system\Tests\System\RetrieveFileTest.
  */
 
 namespace Drupal\system\Tests\System;
diff --git a/core/modules/system/src/Tests/System/SettingsRewriteTest.php b/core/modules/system/src/Tests/System/SettingsRewriteTest.php
index 1446cbd1ad93dc408c3b14a99bd1d7279e6156ca..3e7433783234fafde4c7702d6ff295bc7a1d202f 100644
--- a/core/modules/system/src/Tests/System/SettingsRewriteTest.php
+++ b/core/modules/system/src/Tests/System/SettingsRewriteTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\System\SettingsRewriteTest.
+ * Contains \Drupal\system\Tests\System\SettingsRewriteTest.
  */
 
 namespace Drupal\system\Tests\System;
diff --git a/core/modules/system/src/Tests/System/ShutdownFunctionsTest.php b/core/modules/system/src/Tests/System/ShutdownFunctionsTest.php
index fd86ccaefdcc5b2fad95eb43ff3dd9b95581cb1a..ec25e52bfbf7ac16e89561d4e6a86b74eea409d3 100644
--- a/core/modules/system/src/Tests/System/ShutdownFunctionsTest.php
+++ b/core/modules/system/src/Tests/System/ShutdownFunctionsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\System\ShutdownFunctionsTest.
+ * Contains \Drupal\system\Tests\System\ShutdownFunctionsTest.
  */
 
 namespace Drupal\system\Tests\System;
diff --git a/core/modules/system/src/Tests/System/SiteMaintenanceTest.php b/core/modules/system/src/Tests/System/SiteMaintenanceTest.php
index 95e474719874ad44500dca008b34deb1936bbb10..ade29a50919cc6c7afb038bf10c35c74b4a058b2 100644
--- a/core/modules/system/src/Tests/System/SiteMaintenanceTest.php
+++ b/core/modules/system/src/Tests/System/SiteMaintenanceTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\System\SiteMaintenanceTest.
+ * Contains \Drupal\system\Tests\System\SiteMaintenanceTest.
  */
 
 namespace Drupal\system\Tests\System;
diff --git a/core/modules/system/src/Tests/System/SystemAuthorizeTest.php b/core/modules/system/src/Tests/System/SystemAuthorizeTest.php
index 3632efa611a3c0b3a2dcb15b0bc8044f3d692988..3b302bd12f363d3834e3e0c839f3869c3ba8c485 100644
--- a/core/modules/system/src/Tests/System/SystemAuthorizeTest.php
+++ b/core/modules/system/src/Tests/System/SystemAuthorizeTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\System\SystemAuthorizeTest.
+ * Contains \Drupal\system\Tests\System\SystemAuthorizeTest.
  */
 
 namespace Drupal\system\Tests\System;
diff --git a/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php b/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php
index 8aa38aa469588604e8b47bb77362de636952b94b..6c4db08cf169e3a9c08d7dd1eab86c8dc9016697 100644
--- a/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php
+++ b/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\System\SystemConfigFormTestBase.
+ * Contains \Drupal\system\Tests\System\SystemConfigFormTestBase.
  */
 
 namespace Drupal\system\Tests\System;
diff --git a/core/modules/system/src/Tests/System/ThemeTest.php b/core/modules/system/src/Tests/System/ThemeTest.php
index d5bb6f6f222ae94d2fc1686226fa6da8ff21a976..3c36ae4308d9df46f389b50693440523ac9acd03 100644
--- a/core/modules/system/src/Tests/System/ThemeTest.php
+++ b/core/modules/system/src/Tests/System/ThemeTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\System\ThemeTest.
+ * Contains \Drupal\system\Tests\System\ThemeTest.
  */
 
 namespace Drupal\system\Tests\System;
diff --git a/core/modules/system/src/Tests/System/TokenScanTest.php b/core/modules/system/src/Tests/System/TokenScanTest.php
index 65fc041d50849a349c9d9255fa7353264b8aa840..f15ddcdf0aadfdfb751e0c050272d762640e031b 100644
--- a/core/modules/system/src/Tests/System/TokenScanTest.php
+++ b/core/modules/system/src/Tests/System/TokenScanTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\System\TokenScanTest.
+ * Contains \Drupal\system\Tests\System\TokenScanTest.
  */
 
 namespace Drupal\system\Tests\System;
diff --git a/core/modules/system/src/Tests/Theme/EntityFilteringThemeTest.php b/core/modules/system/src/Tests/Theme/EntityFilteringThemeTest.php
index 5c90c822356a0d77a42443de7b91f25b300529fb..ba366a3297c4afef82475f46a569351ae06efae0 100644
--- a/core/modules/system/src/Tests/Theme/EntityFilteringThemeTest.php
+++ b/core/modules/system/src/Tests/Theme/EntityFilteringThemeTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\Theme\EntityFilteringThemeTest.
+ * Contains \Drupal\system\Tests\Theme\EntityFilteringThemeTest.
  */
 
 namespace Drupal\system\Tests\Theme;
diff --git a/core/modules/system/src/Tests/Theme/FastTest.php b/core/modules/system/src/Tests/Theme/FastTest.php
index 591888c6b87f4f67c2a72732b99d7aec030a4cab..4c19650847443649438e8623d2fafc15f8ff2086 100644
--- a/core/modules/system/src/Tests/Theme/FastTest.php
+++ b/core/modules/system/src/Tests/Theme/FastTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Theme\FastTest.
+ * Contains \Drupal\system\Tests\Theme\FastTest.
  */
 
 namespace Drupal\system\Tests\Theme;
diff --git a/core/modules/system/src/Tests/Theme/ImageTest.php b/core/modules/system/src/Tests/Theme/ImageTest.php
index f22ef2e8cb38fca17b9e51d440f0bb6874819122..87b403c75a005aed542fa1f3f0019008689ff107 100644
--- a/core/modules/system/src/Tests/Theme/ImageTest.php
+++ b/core/modules/system/src/Tests/Theme/ImageTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Theme\ImageTest.
+ * Contains \Drupal\system\Tests\Theme\ImageTest.
  */
 
 namespace Drupal\system\Tests\Theme;
diff --git a/core/modules/system/src/Tests/Theme/RegistryTest.php b/core/modules/system/src/Tests/Theme/RegistryTest.php
index 8872f103a63659d400029503d4b1198f63b19292..8a72ecce5568fa7ee8e0b2daa15bba25361fdfa6 100644
--- a/core/modules/system/src/Tests/Theme/RegistryTest.php
+++ b/core/modules/system/src/Tests/Theme/RegistryTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Theme\RegistryTest.
+ * Contains \Drupal\system\Tests\Theme\RegistryTest.
  */
 
 namespace Drupal\system\Tests\Theme;
diff --git a/core/modules/system/src/Tests/Theme/ThemeEarlyInitializationTest.php b/core/modules/system/src/Tests/Theme/ThemeEarlyInitializationTest.php
index af21a563ecd0ee713708fff96699b358baa556e8..ae68d04ff27997fb006d1610c888ce00c82f5ede 100644
--- a/core/modules/system/src/Tests/Theme/ThemeEarlyInitializationTest.php
+++ b/core/modules/system/src/Tests/Theme/ThemeEarlyInitializationTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Theme\ThemeEarlyInitializationTest.
+ * Contains \Drupal\system\Tests\Theme\ThemeEarlyInitializationTest.
  */
 
 namespace Drupal\system\Tests\Theme;
diff --git a/core/modules/system/src/Tests/Theme/ThemeInfoTest.php b/core/modules/system/src/Tests/Theme/ThemeInfoTest.php
index 55c71e691455449fc7378246daea207f082b26d3..0b38ea782fa05871770d446cf9329daa5bbc1070 100644
--- a/core/modules/system/src/Tests/Theme/ThemeInfoTest.php
+++ b/core/modules/system/src/Tests/Theme/ThemeInfoTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\Theme\ThemeInfoTest.
+ * Contains \Drupal\system\Tests\Theme\ThemeInfoTest.
  */
 
 namespace Drupal\system\Tests\Theme;
diff --git a/core/modules/system/src/Tests/Theme/ThemeTest.php b/core/modules/system/src/Tests/Theme/ThemeTest.php
index e62a19955aa92906d5afc0ebb2805c78fb9b88a3..f6a2ef59d772bd29f882f1a7fe401f6959504603 100644
--- a/core/modules/system/src/Tests/Theme/ThemeTest.php
+++ b/core/modules/system/src/Tests/Theme/ThemeTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Theme\ThemeTest.
+ * Contains \Drupal\system\Tests\Theme\ThemeTest.
  */
 
 namespace Drupal\system\Tests\Theme;
diff --git a/core/modules/system/src/Tests/TypedData/TypedDataDefinitionTest.php b/core/modules/system/src/Tests/TypedData/TypedDataDefinitionTest.php
index 4a2dabc0d7d0961d9faaee4ef29d1fe4b4a8dd3a..f534dd8001210cd7e01f03c4dd14366689e9bd5a 100644
--- a/core/modules/system/src/Tests/TypedData/TypedDataDefinitionTest.php
+++ b/core/modules/system/src/Tests/TypedData/TypedDataDefinitionTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\TypedData\TypedDataDefinitionTest.
+ * Contains \Drupal\system\Tests\TypedData\TypedDataDefinitionTest.
  */
 
 namespace Drupal\system\Tests\TypedData;
diff --git a/core/modules/system/src/Tests/TypedData/TypedDataTest.php b/core/modules/system/src/Tests/TypedData/TypedDataTest.php
index 9cfeb8d5be2198fa1bcfea94ab755fd4c82ebe71..c6a7f1c291127c51653459b5449dcdc8572ac81a 100644
--- a/core/modules/system/src/Tests/TypedData/TypedDataTest.php
+++ b/core/modules/system/src/Tests/TypedData/TypedDataTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\TypedData\TypedDataTest.
+ * Contains \Drupal\system\Tests\TypedData\TypedDataTest.
  */
 
 namespace Drupal\system\Tests\TypedData;
diff --git a/core/modules/system/src/Tests/Update/CompatibilityFixTest.php b/core/modules/system/src/Tests/Update/CompatibilityFixTest.php
index bfa752f196a5b7062636e6b5aee401cc1c2eb143..9ed5845cf1d1ad3bb1b1617d51d5c1132ca5d687 100644
--- a/core/modules/system/src/Tests/Update/CompatibilityFixTest.php
+++ b/core/modules/system/src/Tests/Update/CompatibilityFixTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Update\CompatibilityFixTest.
+ * Contains \Drupal\system\Tests\Update\CompatibilityFixTest.
  */
 
 namespace Drupal\system\Tests\Update;
diff --git a/core/modules/system/src/Tests/Update/DependencyHookInvocationTest.php b/core/modules/system/src/Tests/Update/DependencyHookInvocationTest.php
index 1dd0bef7f071a397d71a3a88808cde0d398591e9..3378b12295e2ec5cb2f17b577b32a4380a34f58d 100644
--- a/core/modules/system/src/Tests/Update/DependencyHookInvocationTest.php
+++ b/core/modules/system/src/Tests/Update/DependencyHookInvocationTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Update\DependencyHookInvocationTest.
+ * Contains \Drupal\system\Tests\Update\DependencyHookInvocationTest.
  */
 
 namespace Drupal\system\Tests\Update;
diff --git a/core/modules/system/src/Tests/Update/DependencyMissingTest.php b/core/modules/system/src/Tests/Update/DependencyMissingTest.php
index 70cd56b6119ea81b1b769befd8b28600c59540ca..46c41b175d1aa628aaf6a3b4715c4affa7b211a7 100644
--- a/core/modules/system/src/Tests/Update/DependencyMissingTest.php
+++ b/core/modules/system/src/Tests/Update/DependencyMissingTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Update\DependencyMissingTest.
+ * Contains \Drupal\system\Tests\Update\DependencyMissingTest.
  */
 
 namespace Drupal\system\Tests\Update;
diff --git a/core/modules/system/src/Tests/Update/DependencyOrderingTest.php b/core/modules/system/src/Tests/Update/DependencyOrderingTest.php
index 1360c6d72bad10a9a27ce6f740d3f6ac07e64436..c53aebc15a68f8ea9676c5e9823ca94b69733ccb 100644
--- a/core/modules/system/src/Tests/Update/DependencyOrderingTest.php
+++ b/core/modules/system/src/Tests/Update/DependencyOrderingTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Update\DependencyOrderingTest.
+ * Contains \Drupal\system\Tests\Update\DependencyOrderingTest.
  */
 
 namespace Drupal\system\Tests\Update;
diff --git a/core/modules/system/src/Tests/Update/UpdateSchemaTest.php b/core/modules/system/src/Tests/Update/UpdateSchemaTest.php
index de78a9ebc8e4175a162a282109d990fe1b1a5ffe..d92809589f07c3fc0c920463f02aaf92dbde8e47 100644
--- a/core/modules/system/src/Tests/Update/UpdateSchemaTest.php
+++ b/core/modules/system/src/Tests/Update/UpdateSchemaTest.php
@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @file
  * Contains \Drupal\system\Tests\Update\UpdateSchemaTest.
  */
 
diff --git a/core/modules/system/src/Tests/Update/UpdateScriptTest.php b/core/modules/system/src/Tests/Update/UpdateScriptTest.php
index 83cc388187e1bc152065e8767c70205ee34d66d0..995165027ebcab47380172c592d42b8740718804 100644
--- a/core/modules/system/src/Tests/Update/UpdateScriptTest.php
+++ b/core/modules/system/src/Tests/Update/UpdateScriptTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Update\UpdateScriptTest.
+ * Contains \Drupal\system\Tests\Update\UpdateScriptTest.
  */
 
 namespace Drupal\system\Tests\Update;
diff --git a/core/modules/system/src/Tests/Validation/AllowedValuesConstraintValidatorTest.php b/core/modules/system/src/Tests/Validation/AllowedValuesConstraintValidatorTest.php
index a5242c10640320b5934cccaf1f4ba956d0777a77..87c19036421a548feddfafd02adb2b001ae2e53f 100644
--- a/core/modules/system/src/Tests/Validation/AllowedValuesConstraintValidatorTest.php
+++ b/core/modules/system/src/Tests/Validation/AllowedValuesConstraintValidatorTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\Validation\AllowedValuesConstraintValidatorTest.
+ * Contains \Drupal\system\Tests\Validation\AllowedValuesConstraintValidatorTest.
  */
 
 namespace Drupal\system\Tests\Validation;
diff --git a/core/modules/system/src/Tests/Validation/ComplexDataConstraintValidatorTest.php b/core/modules/system/src/Tests/Validation/ComplexDataConstraintValidatorTest.php
index e27d97ac80c6e94db98590e91a1e54087ba44764..567228031778f69661719206ea1c92384d2bd710 100644
--- a/core/modules/system/src/Tests/Validation/ComplexDataConstraintValidatorTest.php
+++ b/core/modules/system/src/Tests/Validation/ComplexDataConstraintValidatorTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\Validation\ComplexDataConstraintValidatorTest.
+ * Contains \Drupal\system\Tests\Validation\ComplexDataConstraintValidatorTest.
  */
 
 namespace Drupal\system\Tests\Validation;
diff --git a/core/modules/system/tests/modules/accept_header_routing_test/tests/Unit/AcceptHeaderMatcherTest.php b/core/modules/system/tests/modules/accept_header_routing_test/tests/Unit/AcceptHeaderMatcherTest.php
index 4dc9ddf5fbd62eeb60609d97ed664ab36cbf6a94..315380ef0ca01711817da78c16a9e1fa48905635 100644
--- a/core/modules/system/tests/modules/accept_header_routing_test/tests/Unit/AcceptHeaderMatcherTest.php
+++ b/core/modules/system/tests/modules/accept_header_routing_test/tests/Unit/AcceptHeaderMatcherTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\accept_header_routing_test\Unit\Routing\AcceptHeaderMatcherTest.
+ * Contains \Drupal\Tests\accept_header_routing_teste\Unit\Routing\AcceptHeaderMatcherTest.
  */
 
 namespace Drupal\Tests\accept_header_routing_teste\Unit\Routing;
diff --git a/core/modules/system/tests/modules/ajax_forms_test/src/Callbacks.php b/core/modules/system/tests/modules/ajax_forms_test/src/Callbacks.php
index d66373477fa193117860b86f5af2b20b58781059..7722fc9f5a87786409457b7f620d68fb49021410 100644
--- a/core/modules/system/tests/modules/ajax_forms_test/src/Callbacks.php
+++ b/core/modules/system/tests/modules/ajax_forms_test/src/Callbacks.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\ajax_forms_test\Callbacks.
+ * Contains \Drupal\ajax_forms_test\Callbacks.
  */
 
 namespace Drupal\ajax_forms_test;
diff --git a/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestValidationForm.php b/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestValidationForm.php
index 4646956705e9e86765bb04ca83669998d5ac69ee..2c738d344c45ce0e91435f3e423c169707cf1512 100644
--- a/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestValidationForm.php
+++ b/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestValidationForm.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\ajax_forms_test\Form\AjaxFormsTestSimpleForm.
+ * Contains \Drupal\ajax_forms_test\Form\AjaxFormsTestValidationForm.
  */
 
 namespace Drupal\ajax_forms_test\Form;
diff --git a/core/modules/system/tests/modules/conneg_test/src/Controller/TestController.php b/core/modules/system/tests/modules/conneg_test/src/Controller/TestController.php
index c93a5a1d29af97addc0b88c4fca1f31a9b2f747e..51d99f336c1da48bab8b6d3a8385cad72a3b5ade 100644
--- a/core/modules/system/tests/modules/conneg_test/src/Controller/TestController.php
+++ b/core/modules/system/tests/modules/conneg_test/src/Controller/TestController.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\conneg_test\Controller\Test.
+ * Contains \Drupal\conneg_test\Controller\TestController.
  */
 
 namespace Drupal\conneg_test\Controller;
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestFieldOverride.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestFieldOverride.php
index 763212522831b58dc5dd1f6d1596ec5895a5c1f3..659c09738947c1508e8f02a3a96dbd0d7451cad0 100644
--- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestFieldOverride.php
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestFieldOverride.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\entity_test\Entity\EntityTestDefaultValue.
+ * Contains \Drupal\entity_test\Entity\EntityTestFieldOverride.
  */
 
 namespace Drupal\entity_test\Entity;
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulChanged.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulChanged.php
index 93af073657b80c0804fd8c8a2b9c07f847342466..48c3ddca9f05a0592183572f32bba775ed0fd7fe 100644
--- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulChanged.php
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulChanged.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\entity_test\Entity\EntityTestMulDefaultValue.
+ * Contains \Drupal\entity_test\Entity\EntityTestMulChanged.
  */
 
 namespace Drupal\entity_test\Entity;
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulLangcodeKey.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulLangcodeKey.php
index c50f2c73e58ad13f24ab686e06041129e4e984de..3be6a903e9ee4e1d798769e543dfaba5097fd108 100644
--- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulLangcodeKey.php
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulLangcodeKey.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\entity_test\Entity\EntityTestMul.
+ * Contains \Drupal\entity_test\Entity\EntityTestMulLangcodeKey.
  */
 
 namespace Drupal\entity_test\Entity;
diff --git a/core/modules/system/tests/modules/entity_test/src/EntityTestAccessControlHandler.php b/core/modules/system/tests/modules/entity_test/src/EntityTestAccessControlHandler.php
index 14141273ad2b5d5c40b2435ddc57b9de02add5bb..be95080d2b7de34326f848b7837c3c72c0ce2403 100644
--- a/core/modules/system/tests/modules/entity_test/src/EntityTestAccessControlHandler.php
+++ b/core/modules/system/tests/modules/entity_test/src/EntityTestAccessControlHandler.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\entity_test\EntityTestAccessControlHandler.
+ * Contains \Drupal\entity_test\EntityTestAccessControlHandler.
  */
 
 namespace Drupal\entity_test;
diff --git a/core/modules/system/tests/modules/entity_test/src/EntityTestForm.php b/core/modules/system/tests/modules/entity_test/src/EntityTestForm.php
index ec7c3e0b059ce30b7110307e8c1b252da9d7a9e3..fb3c486dad943f02d161a07333bb844e8bad5e85 100644
--- a/core/modules/system/tests/modules/entity_test/src/EntityTestForm.php
+++ b/core/modules/system/tests/modules/entity_test/src/EntityTestForm.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Definition of Drupal\entity_test\EntityTestForm.
+ * Contains \Drupal\entity_test\EntityTestForm.
  */
 
 namespace Drupal\entity_test;
diff --git a/core/modules/system/tests/modules/entity_test/src/EntityTestViewsData.php b/core/modules/system/tests/modules/entity_test/src/EntityTestViewsData.php
index 0c9cd83317e8c60ddef30acd7082442988db6b90..c7164314dfb5aebf874644f12ee4c29138f08a6f 100644
--- a/core/modules/system/tests/modules/entity_test/src/EntityTestViewsData.php
+++ b/core/modules/system/tests/modules/entity_test/src/EntityTestViewsData.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\entity_test\EntityTestViewsData.
+ * Contains \Drupal\entity_test\EntityTestViewsData.
  */
 
 namespace Drupal\entity_test;
diff --git a/core/modules/system/tests/modules/entity_test/src/Routing/EntityTestRoutes.php b/core/modules/system/tests/modules/entity_test/src/Routing/EntityTestRoutes.php
index 53c19786fa3344bafa14d560078237d9bba01c83..3a5bbe95b02b1999ae28e8069f02a69b1ebad651 100644
--- a/core/modules/system/tests/modules/entity_test/src/Routing/EntityTestRoutes.php
+++ b/core/modules/system/tests/modules/entity_test/src/Routing/EntityTestRoutes.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\entity_test\Routing\RouteSubscriber.
+ * Contains \Drupal\entity_test\Routing\EntityTestRoutes.
  */
 
 namespace Drupal\entity_test\Routing;
diff --git a/core/modules/system/tests/modules/form_test/src/Callbacks.php b/core/modules/system/tests/modules/form_test/src/Callbacks.php
index 3d45894e848e56a24bc79e4ccc683bb8cdfda99a..80da941ccffa36b48645845153ac30d9f27d5359 100644
--- a/core/modules/system/tests/modules/form_test/src/Callbacks.php
+++ b/core/modules/system/tests/modules/form_test/src/Callbacks.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\form_test\Callbacks.
+ * Contains \Drupal\form_test\Callbacks.
  */
 
 namespace Drupal\form_test;
diff --git a/core/modules/system/tests/modules/form_test/src/Form/FormTestDescriptionForm.php b/core/modules/system/tests/modules/form_test/src/Form/FormTestDescriptionForm.php
index aeb11964253ceb309bc3f94f7e257d437201703c..df4cce54c24821e392d8e40ae29737c39ab335ae 100644
--- a/core/modules/system/tests/modules/form_test/src/Form/FormTestDescriptionForm.php
+++ b/core/modules/system/tests/modules/form_test/src/Form/FormTestDescriptionForm.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\form_test\Form\FormTestEmailForm.
+ * Contains \Drupal\form_test\Form\FormTestDescriptionForm.
  */
 
 namespace Drupal\form_test\Form;
diff --git a/core/modules/system/tests/modules/form_test/src/Form/FormTestInputForgeryForm.php b/core/modules/system/tests/modules/form_test/src/Form/FormTestInputForgeryForm.php
index 96829b2c65a8e0c91c8c970504f1dd1b5c9946d1..1093eda14f31dee6a79d82d242b3960fd8dd4617 100644
--- a/core/modules/system/tests/modules/form_test/src/Form/FormTestInputForgeryForm.php
+++ b/core/modules/system/tests/modules/form_test/src/Form/FormTestInputForgeryForm.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal/form_test/FormTestInputForgeryForm.
+ * Contains \Drupal\form_test\Form\FormTestInputForgeryForm.
  */
 
 namespace Drupal\form_test\Form;
diff --git a/core/modules/system/tests/modules/form_test/src/Form/FormTestStoragePageCacheForm.php b/core/modules/system/tests/modules/form_test/src/Form/FormTestStoragePageCacheForm.php
index e700c193151b5253260476dc6f051c62be004422..e8eef2272dc11a6588005dae29167fed1733ac57 100644
--- a/core/modules/system/tests/modules/form_test/src/Form/FormTestStoragePageCacheForm.php
+++ b/core/modules/system/tests/modules/form_test/src/Form/FormTestStoragePageCacheForm.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\form_test\Form\FormTestStorageForm.
+ * Contains \Drupal\form_test\Form\FormTestStoragePageCacheForm.
  */
 
 namespace Drupal\form_test\Form;
diff --git a/core/modules/system/tests/modules/form_test/src/StackMiddleware/FormTestMiddleware.php b/core/modules/system/tests/modules/form_test/src/StackMiddleware/FormTestMiddleware.php
index 7c632cb27d3921987af24fdf5f66b77f38230c6e..c284364ce87a567d9774e016991152b390974c17 100644
--- a/core/modules/system/tests/modules/form_test/src/StackMiddleware/FormTestMiddleware.php
+++ b/core/modules/system/tests/modules/form_test/src/StackMiddleware/FormTestMiddleware.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains \Drupal\form_test\StackMiddleware\FormTestMiddleware
+ * Contains \Drupal\form_test\StackMiddleware\FormTestMiddleware.
  */
 
 namespace Drupal\form_test\StackMiddleware;
diff --git a/core/modules/system/tests/modules/httpkernel_test/src/Controller/TestController.php b/core/modules/system/tests/modules/httpkernel_test/src/Controller/TestController.php
index 06ca4f633aad14df544b59d4ba0d3b286f0f1b02..1699594444e8c96cb15050046a210121c588f935 100644
--- a/core/modules/system/tests/modules/httpkernel_test/src/Controller/TestController.php
+++ b/core/modules/system/tests/modules/httpkernel_test/src/Controller/TestController.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\httpkernel_test\Controller\TestController
+ * Contains \Drupal\httpkernel_test\Controller\TestController.
  */
 
 namespace Drupal\httpkernel_test\Controller;
diff --git a/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/LocalTaskTest.php b/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/LocalTaskTest.php
index a345458a0bd0efc59cdfbeeb612db572de33c612..807311aff573f516c8db2326e9a205b7e88fef5e 100644
--- a/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/LocalTaskTest.php
+++ b/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/LocalTaskTest.php
@@ -1,7 +1,8 @@
 <?php
 
 /**
- * Contains \Drupal\menu_test\Plugin\Derivative\LocalTaskTest
+ * @file
+ * Contains \Drupal\menu_test\Plugin\Derivative\LocalTaskTest.
  */
 
 namespace Drupal\menu_test\Plugin\Derivative;
diff --git a/core/modules/system/tests/modules/module_autoload_test/src/SomeClass.php b/core/modules/system/tests/modules/module_autoload_test/src/SomeClass.php
index 33c278699e595d42ce47a3c99cc850e63a6602a6..82169cb5229bf1393eea805a61832a4686417c45 100644
--- a/core/modules/system/tests/modules/module_autoload_test/src/SomeClass.php
+++ b/core/modules/system/tests/modules/module_autoload_test/src/SomeClass.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\module_autoload_test\SomeClass.
+ * Contains \Drupal\module_autoload_test\SomeClass.
  */
 
 namespace Drupal\module_autoload_test;
diff --git a/core/modules/system/tests/modules/paramconverter_test/src/TestControllers.php b/core/modules/system/tests/modules/paramconverter_test/src/TestControllers.php
index 282261232fcde99d52e7f59db3468b19a3209985..1e8e2f4e8f484a82e31d21c3d311d7116e004172 100644
--- a/core/modules/system/tests/modules/paramconverter_test/src/TestControllers.php
+++ b/core/modules/system/tests/modules/paramconverter_test/src/TestControllers.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\paramconverter_test\TestControllers.
+ * Contains \Drupal\paramconverter_test\TestControllers.
  */
 
 namespace Drupal\paramconverter_test;
diff --git a/core/modules/system/tests/modules/plugin_test/src/Plugin/DefaultsTestPluginManager.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/DefaultsTestPluginManager.php
index bda80fa2df9adf0ba8dd8ae057ae627b515d9fcb..742f84c09a3c2b876150594cbea4e15c0218d073 100644
--- a/core/modules/system/tests/modules/plugin_test/src/Plugin/DefaultsTestPluginManager.php
+++ b/core/modules/system/tests/modules/plugin_test/src/Plugin/DefaultsTestPluginManager.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\plugin_test\Plugin\DefaultsTestPluginManager.
+ * Contains \Drupal\plugin_test\Plugin\DefaultsTestPluginManager.
  */
 
 namespace Drupal\plugin_test\Plugin;
diff --git a/core/modules/system/tests/modules/plugin_test/src/Plugin/MockBlockManager.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/MockBlockManager.php
index ca5847fcd7f27bff2ad91dccdfe409da09b8202f..e435c0a22973903bc7e63c9a9eea5548b5b96902 100644
--- a/core/modules/system/tests/modules/plugin_test/src/Plugin/MockBlockManager.php
+++ b/core/modules/system/tests/modules/plugin_test/src/Plugin/MockBlockManager.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\plugin_test\Plugin\MockBlockManager.
+ * Contains \Drupal\plugin_test\Plugin\MockBlockManager.
  */
 
 namespace Drupal\plugin_test\Plugin;
diff --git a/core/modules/system/tests/modules/plugin_test/src/Plugin/TestPluginManager.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/TestPluginManager.php
index adffdef161e9d393ee09d2de354ff0ec858b2d0d..330ef4efecd0775e4567a03e56d60d4c7a7643a8 100644
--- a/core/modules/system/tests/modules/plugin_test/src/Plugin/TestPluginManager.php
+++ b/core/modules/system/tests/modules/plugin_test/src/Plugin/TestPluginManager.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\plugin_test\Plugin\TestPluginManager.
+ * Contains \Drupal\plugin_test\Plugin\TestPluginManager.
  */
 
 namespace Drupal\plugin_test\Plugin;
diff --git a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/fruit/Apple.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/fruit/Apple.php
index d81b6ba55a98ac56ab2be976a2f880de1f6feafc..83dbc9ce2c9ba4d66f8d801e6eb701bb069319e0 100644
--- a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/fruit/Apple.php
+++ b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/fruit/Apple.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\plugin_test\Plugin\plugin_test\fruit\Apple.
+ * Contains \Drupal\plugin_test\Plugin\plugin_test\fruit\Apple.
  */
 
 namespace Drupal\plugin_test\Plugin\plugin_test\fruit;
diff --git a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/fruit/Cherry.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/fruit/Cherry.php
index 30db5526b7b171df94fd8f7116af43c4b7ff0e4f..c3f6d5b9653008bdf7b3af27edb595d89a614ae5 100644
--- a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/fruit/Cherry.php
+++ b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/fruit/Cherry.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\plugin_test\Plugin\plugin_test\fruit\Cherry.
+ * Contains \Drupal\plugin_test\Plugin\plugin_test\fruit\Cherry.
  */
 
 namespace Drupal\plugin_test\Plugin\plugin_test\fruit;
diff --git a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/fruit/Orange.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/fruit/Orange.php
index 10ba4eaedf9b2baeaaddb80d5c6c4ce8fa4baabb..abdeb6959b1f04d4062eeb9a2f81f564ee1e7aea 100644
--- a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/fruit/Orange.php
+++ b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/fruit/Orange.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\plugin_test\Plugin\plugin_test\fruit\Orange.
+ * Contains \Drupal\plugin_test\Plugin\plugin_test\fruit\Orange.
  */
 
 namespace Drupal\plugin_test\Plugin\plugin_test\fruit;
diff --git a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockLayoutBlock.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockLayoutBlock.php
index 4fd0ba580ceeb9e7474df0909a206d772489c643..92a5de456ebe906a0a7839761e691e8f801a720f 100644
--- a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockLayoutBlock.php
+++ b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockLayoutBlock.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\plugin_test\Plugin\plugin_test\mock_block\MockLayoutBlock.
+ * Contains \Drupal\plugin_test\Plugin\plugin_test\mock_block\MockLayoutBlock.
  */
 
 namespace Drupal\plugin_test\Plugin\plugin_test\mock_block;
diff --git a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockLayoutBlockDeriver.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockLayoutBlockDeriver.php
index 267a397586ab6375858e118b8cd88a5eed24a083..4eb087a38a656ff68be4e5b26cc850ad63398abd 100644
--- a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockLayoutBlockDeriver.php
+++ b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockLayoutBlockDeriver.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\plugin_test\Plugin\plugin_test\mock_block\MockLayoutBlockDeriver.
+ * Contains \Drupal\plugin_test\Plugin\plugin_test\mock_block\MockLayoutBlockDeriver.
  */
 
 namespace Drupal\plugin_test\Plugin\plugin_test\mock_block;
diff --git a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlock.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlock.php
index 85feb7babadf2e7f02c80f746338b9a91acab39a..375b784c71cb2035f0062f2f7c66460647479a40 100644
--- a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlock.php
+++ b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlock.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\plugin_test\Plugin\plugin_test\mock_block\MockMenuBlock.
+ * Contains \Drupal\plugin_test\Plugin\plugin_test\mock_block\MockMenuBlock.
  */
 
 namespace Drupal\plugin_test\Plugin\plugin_test\mock_block;
diff --git a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlockDeriver.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlockDeriver.php
index 9048e0059209c1ef60b014be6f3ae30a2bd7db59..f4832e04fbd0e5704d3f09f6bd51a3b466c57c66 100644
--- a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlockDeriver.php
+++ b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlockDeriver.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\plugin_test\Plugin\plugin_test\mock_block\MockMenuBlockDeriver.
+ * Contains \Drupal\plugin_test\Plugin\plugin_test\mock_block\MockMenuBlockDeriver.
  */
 
 namespace Drupal\plugin_test\Plugin\plugin_test\mock_block;
diff --git a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockTestBlock.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockTestBlock.php
index d54f2585b603e2c6d9aab2894b6d644eacfc1f02..3f2994ad8f784926cb67158bc26f0d4a9c77a3a3 100644
--- a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockTestBlock.php
+++ b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockTestBlock.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\plugin_test\Plugin\plugin_test\mock_block\MockTestBlock.
+ * Contains \Drupal\plugin_test\Plugin\plugin_test\mock_block\MockTestBlock.
  */
 
 namespace Drupal\plugin_test\Plugin\plugin_test\mock_block;
diff --git a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockUserLoginBlock.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockUserLoginBlock.php
index 9ca84bc4676ccd203e25563eab11aceb02c748cb..07d6203310df72cd6f6592c1fc3ffcfb1272ce78 100644
--- a/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockUserLoginBlock.php
+++ b/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockUserLoginBlock.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\plugin_test\Plugin\plugin_test\mock_block\MockUserLoginBlock.
+ * Contains \Drupal\plugin_test\Plugin\plugin_test\mock_block\MockUserLoginBlock.
  */
 
 namespace Drupal\plugin_test\Plugin\plugin_test\mock_block;
diff --git a/core/modules/system/tests/modules/router_test_directory/src/Access/TestAccessCheck.php b/core/modules/system/tests/modules/router_test_directory/src/Access/TestAccessCheck.php
index d4686bfd1938568cc47dc6171e204682b1a29e25..14c97ea2ab51d094732605091c93b873ec69cefe 100644
--- a/core/modules/system/tests/modules/router_test_directory/src/Access/TestAccessCheck.php
+++ b/core/modules/system/tests/modules/router_test_directory/src/Access/TestAccessCheck.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\router_test\Access\TestAccessCheck.
+ * Contains \Drupal\router_test\Access\TestAccessCheck.
  */
 
 namespace Drupal\router_test\Access;
diff --git a/core/modules/system/tests/modules/router_test_directory/src/RouteTestSubscriber.php b/core/modules/system/tests/modules/router_test_directory/src/RouteTestSubscriber.php
index 4a5e05f8f5e8a761733b8c6d7b9b1d702306b6ae..3bc703b93063c18fa52217d15405dd2cea340b82 100644
--- a/core/modules/system/tests/modules/router_test_directory/src/RouteTestSubscriber.php
+++ b/core/modules/system/tests/modules/router_test_directory/src/RouteTestSubscriber.php
@@ -1,7 +1,8 @@
 <?php
 
 /**
- * Definition of \Drupal\router_test\RouteTestSubscriber.
+ * @file
+ * Contains \Drupal\router_test\RouteTestSubscriber.
  */
 
 namespace Drupal\router_test;
diff --git a/core/modules/system/tests/modules/router_test_directory/src/RouterTestServiceProvider.php b/core/modules/system/tests/modules/router_test_directory/src/RouterTestServiceProvider.php
index 641a0557b66af4ea607ec7f0c4cbcd16b2e6ab0e..5732836e26d521512b1a739fdf33d3f812083537 100644
--- a/core/modules/system/tests/modules/router_test_directory/src/RouterTestServiceProvider.php
+++ b/core/modules/system/tests/modules/router_test_directory/src/RouterTestServiceProvider.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of \Drupal\router_test\RouterTestServiceProvider.
+ * Contains \Drupal\router_test\RouterTestServiceProvider.
  */
 
 namespace Drupal\router_test;
diff --git a/core/modules/system/tests/modules/router_test_directory/src/TestControllers.php b/core/modules/system/tests/modules/router_test_directory/src/TestControllers.php
index ae3b050290e12fdc3458a322bcb1b907d219c05c..614c9a85046e92d4949a0351769521a046bb00b4 100644
--- a/core/modules/system/tests/modules/router_test_directory/src/TestControllers.php
+++ b/core/modules/system/tests/modules/router_test_directory/src/TestControllers.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\router_test\TestControllers.
+ * Contains \Drupal\router_test\TestControllers.
  */
 
 namespace Drupal\router_test;
diff --git a/core/modules/system/tests/modules/service_provider_test/src/ServiceProviderTestServiceProvider.php b/core/modules/system/tests/modules/service_provider_test/src/ServiceProviderTestServiceProvider.php
index 9759e2c80bd5bd103090d3af142fa13365ccf2e3..9e218839403346d230fcbc00e7470483144e1899 100644
--- a/core/modules/system/tests/modules/service_provider_test/src/ServiceProviderTestServiceProvider.php
+++ b/core/modules/system/tests/modules/service_provider_test/src/ServiceProviderTestServiceProvider.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\service_provider_test\ServiceProviderTestServiceProvider.
+ * Contains \Drupal\service_provider_test\ServiceProviderTestServiceProvider.
  */
 
 namespace Drupal\service_provider_test;
diff --git a/core/modules/system/tests/modules/service_provider_test/src/TestClass.php b/core/modules/system/tests/modules/service_provider_test/src/TestClass.php
index a651ae8ed52e70e4e2c8ced0d0db2ab5aa9af12c..cbbe773ea48d3b66dfbc804611aee58b0e7aa0f2 100644
--- a/core/modules/system/tests/modules/service_provider_test/src/TestClass.php
+++ b/core/modules/system/tests/modules/service_provider_test/src/TestClass.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\service_provider_test\TestClass.
+ * Contains \Drupal\service_provider_test\TestClass.
  */
 
 namespace Drupal\service_provider_test;
diff --git a/core/modules/system/tests/modules/service_provider_test/src/TestFileUsage.php b/core/modules/system/tests/modules/service_provider_test/src/TestFileUsage.php
index a2c943eb7bdf4bc5784071b16f7aadcd4b396fbb..4cd67b917ff6c09d33151a05c6f750c2d8e9b3f9 100644
--- a/core/modules/system/tests/modules/service_provider_test/src/TestFileUsage.php
+++ b/core/modules/system/tests/modules/service_provider_test/src/TestFileUsage.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\service_provider_test\TestFileUsage.
+ * Contains \Drupal\service_provider_test\TestFileUsage.
  */
 
 namespace Drupal\service_provider_test;
diff --git a/core/modules/system/tests/modules/session_test/src/Form/SessionTestForm.php b/core/modules/system/tests/modules/session_test/src/Form/SessionTestForm.php
index 1de250a34be802df0b22302f900d385ee75b4929..6f6fc9bb9709eba93b56a47b795838c947e695b3 100644
--- a/core/modules/system/tests/modules/session_test/src/Form/SessionTestForm.php
+++ b/core/modules/system/tests/modules/session_test/src/Form/SessionTestForm.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\session_test\Form\SessionTestForm
+ * Contains \Drupal\session_test\Form\SessionTestForm.
  */
 
 namespace Drupal\session_test\Form;
diff --git a/core/modules/system/tests/modules/system_test/src/MockFileTransfer.php b/core/modules/system/tests/modules/system_test/src/MockFileTransfer.php
index 900e0be4fa1a89e90522e9fc606343bcde8e2c4d..4d98b093d7f5571823915aecfa5f5b97189849f3 100644
--- a/core/modules/system/tests/modules/system_test/src/MockFileTransfer.php
+++ b/core/modules/system/tests/modules/system_test/src/MockFileTransfer.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system_test\MockFileTransfer.
+ * Contains \Drupal\system_test\MockFileTransfer.
  */
 
 namespace Drupal\system_test;
diff --git a/core/modules/system/tests/modules/trusted_hosts_test/src/Controller/TrustedHostsTestController.php b/core/modules/system/tests/modules/trusted_hosts_test/src/Controller/TrustedHostsTestController.php
index b97c45c543e0c07c3d5cb37954a9b7f46148b9c4..e417bb5c809f698e8860ae0319a3cc9255492807 100644
--- a/core/modules/system/tests/modules/trusted_hosts_test/src/Controller/TrustedHostsTestController.php
+++ b/core/modules/system/tests/modules/trusted_hosts_test/src/Controller/TrustedHostsTestController.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\trusted_hosts_test\Controller\TrustedHostsTestController.
+ * Contains \Drupal\trusted_hosts_test\Controller\TrustedHostsTestController.
  */
 
 namespace Drupal\trusted_hosts_test\Controller;
diff --git a/core/modules/system/tests/modules/url_alter_test/src/PathProcessor.php b/core/modules/system/tests/modules/url_alter_test/src/PathProcessor.php
index 1632d5e5f197b3153a988252cc178f269f1b1c49..ecf1c95045e204dc8e898f6d88e38385b120f5e1 100644
--- a/core/modules/system/tests/modules/url_alter_test/src/PathProcessor.php
+++ b/core/modules/system/tests/modules/url_alter_test/src/PathProcessor.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\url_alter_test\PathProcessor.
+ * Contains \Drupal\url_alter_test\PathProcessor.
  */
 
 namespace Drupal\url_alter_test;
diff --git a/core/modules/system/tests/modules/url_alter_test/src/PathProcessorTest.php b/core/modules/system/tests/modules/url_alter_test/src/PathProcessorTest.php
index 9af6cabfee88a219f50f618ba0a0496a8cb88dc9..0b4e8ee59c60264284feed4aae19a44bcff8588d 100644
--- a/core/modules/system/tests/modules/url_alter_test/src/PathProcessorTest.php
+++ b/core/modules/system/tests/modules/url_alter_test/src/PathProcessorTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\url_alter_test\PathProcessorTest.
+ * Contains \Drupal\url_alter_test\PathProcessorTest.
  */
 
 namespace Drupal\url_alter_test;
diff --git a/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php b/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php
index 68e1abf1f19672dd0542ea1311efe1a5e227600e..0a00029f2cfc6de4c83431d3facc7e402948d349 100644
--- a/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php
+++ b/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\system\Unit\Breadcrumbs\PathBasedBreadcrumbBuilderTest
+ * Contains \Drupal\Tests\system\Unit\Breadcrumbs\PathBasedBreadcrumbBuilderTest.
  */
 
 namespace Drupal\Tests\system\Unit\Breadcrumbs;
diff --git a/core/modules/system/tests/themes/test_theme/src/ThemeClass.php b/core/modules/system/tests/themes/test_theme/src/ThemeClass.php
index eec20a356bc411fdabf4de55ae7c46f48cba2262..4ed3f53d60dfb1809d67948729dfbacd890f7167 100644
--- a/core/modules/system/tests/themes/test_theme/src/ThemeClass.php
+++ b/core/modules/system/tests/themes/test_theme/src/ThemeClass.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\test_theme\ThemeClass.
+ * Contains \Drupal\test_theme\ThemeClass.
  */
 
 namespace Drupal\test_theme;
diff --git a/core/modules/taxonomy/src/Form/OverviewTerms.php b/core/modules/taxonomy/src/Form/OverviewTerms.php
index 42dc0497dff99853a4c60bafbef38aa197f02a9b..556e79b8d94f8561b6aec61d6c556006da61f574 100644
--- a/core/modules/taxonomy/src/Form/OverviewTerms.php
+++ b/core/modules/taxonomy/src/Form/OverviewTerms.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\taxonomy\Form\OverviewTerms
+ * Contains \Drupal\taxonomy\Form\OverviewTerms.
  */
 
 namespace Drupal\taxonomy\Form;
diff --git a/core/modules/taxonomy/src/Form/VocabularyResetForm.php b/core/modules/taxonomy/src/Form/VocabularyResetForm.php
index 4b8ed8543f2bf1eda3d6fd47e8ab2726e05c1c56..e3c190f1a14b1c0abb8dc64d6ccedf713318201f 100644
--- a/core/modules/taxonomy/src/Form/VocabularyResetForm.php
+++ b/core/modules/taxonomy/src/Form/VocabularyResetForm.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\taxonomy\Form\VocabularyReset.
+ * Contains \Drupal\taxonomy\Form\VocabularyResetForm.
  */
 
 namespace Drupal\taxonomy\Form;
diff --git a/core/modules/taxonomy/src/Plugin/Field/FieldFormatter/EntityReferenceTaxonomyTermRssFormatter.php b/core/modules/taxonomy/src/Plugin/Field/FieldFormatter/EntityReferenceTaxonomyTermRssFormatter.php
index 614f165c6cc220f78b7d097571c6d74fdbe138cf..04330664a4cd04c71b0b018a01552470f9e7a291 100644
--- a/core/modules/taxonomy/src/Plugin/Field/FieldFormatter/EntityReferenceTaxonomyTermRssFormatter.php
+++ b/core/modules/taxonomy/src/Plugin/Field/FieldFormatter/EntityReferenceTaxonomyTermRssFormatter.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\taxonomy\Plugin\field\formatter\EntityReferenceTaxonomyTermRssFormatter.
+ * Contains \Drupal\taxonomy\Plugin\Field\FieldFormatter\EntityReferenceTaxonomyTermRssFormatter.
  */
 
 namespace Drupal\taxonomy\Plugin\Field\FieldFormatter;
diff --git a/core/modules/taxonomy/src/Plugin/views/argument/IndexTid.php b/core/modules/taxonomy/src/Plugin/views/argument/IndexTid.php
index 95df98c304f2375ed4592245c2a1aca69289ac49..3b4798a9a1a2a7ee7da5848e3eac6ba5d5770dd4 100644
--- a/core/modules/taxonomy/src/Plugin/views/argument/IndexTid.php
+++ b/core/modules/taxonomy/src/Plugin/views/argument/IndexTid.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\Plugin\views\argument\IndexTid.
+ * Contains \Drupal\taxonomy\Plugin\views\argument\IndexTid.
  */
 
 namespace Drupal\taxonomy\Plugin\views\argument;
diff --git a/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepth.php b/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepth.php
index 1bf9f5ef415d44e42bdce13cb2170d99cdca175d..f5bd524d75a9991848383a6ee6f05bf36204d049 100644
--- a/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepth.php
+++ b/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepth.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\Plugin\views\argument\IndexTidDepth.
+ * Contains \Drupal\taxonomy\Plugin\views\argument\IndexTidDepth.
  */
 
 namespace Drupal\taxonomy\Plugin\views\argument;
diff --git a/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepthModifier.php b/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepthModifier.php
index 077b1fd0deb64d0b8ca86522c002398a27cba814..bede035ce4ac0dcac11ed165d405696ad503f46d 100644
--- a/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepthModifier.php
+++ b/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepthModifier.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\Plugin\views\argument\IndexTidDepthModifier.
+ * Contains \Drupal\taxonomy\Plugin\views\argument\IndexTidDepthModifier.
  */
 
 namespace Drupal\taxonomy\Plugin\views\argument;
diff --git a/core/modules/taxonomy/src/Plugin/views/argument/Taxonomy.php b/core/modules/taxonomy/src/Plugin/views/argument/Taxonomy.php
index 1257a6a56b3b9dc45cc3736536203c7345099e79..ca365974f85de3976e62e77615297f9fe6250454 100644
--- a/core/modules/taxonomy/src/Plugin/views/argument/Taxonomy.php
+++ b/core/modules/taxonomy/src/Plugin/views/argument/Taxonomy.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\Plugin\views\argument\Taxonomy.
+ * Contains \Drupal\taxonomy\Plugin\views\argument\Taxonomy.
  */
 
 namespace Drupal\taxonomy\Plugin\views\argument;
diff --git a/core/modules/taxonomy/src/Plugin/views/argument/VocabularyVid.php b/core/modules/taxonomy/src/Plugin/views/argument/VocabularyVid.php
index e632b6aaaeeeb37104a2d3e476d2bd89ca52e4ff..7aedd518e0828b26ea399fd548354716cb04127f 100644
--- a/core/modules/taxonomy/src/Plugin/views/argument/VocabularyVid.php
+++ b/core/modules/taxonomy/src/Plugin/views/argument/VocabularyVid.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\Plugin\views\argument\VocabularyVid.
+ * Contains \Drupal\taxonomy\Plugin\views\argument\VocabularyVid.
  */
 
 namespace Drupal\taxonomy\Plugin\views\argument;
diff --git a/core/modules/taxonomy/src/Plugin/views/argument_default/Tid.php b/core/modules/taxonomy/src/Plugin/views/argument_default/Tid.php
index 526e4c3093b9bcc697b069add6ea945be8a313c3..f162195f699e162a0392e54aa29590fe6ed9d377 100644
--- a/core/modules/taxonomy/src/Plugin/views/argument_default/Tid.php
+++ b/core/modules/taxonomy/src/Plugin/views/argument_default/Tid.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\Plugin\views\argument_default\Tid.
+ * Contains \Drupal\taxonomy\Plugin\views\argument_default\Tid.
  */
 
 namespace Drupal\taxonomy\Plugin\views\argument_default;
diff --git a/core/modules/taxonomy/src/Plugin/views/argument_validator/Term.php b/core/modules/taxonomy/src/Plugin/views/argument_validator/Term.php
index 56a4701fd13fbd2ff54a932f521be6139dce405f..189b254fc1e80dd0ffdb2fce7d316b0f172cdbcb 100644
--- a/core/modules/taxonomy/src/Plugin/views/argument_validator/Term.php
+++ b/core/modules/taxonomy/src/Plugin/views/argument_validator/Term.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\Plugin\views\argument_validator\Term.
+ * Contains \Drupal\taxonomy\Plugin\views\argument_validator\Term.
  */
 
 namespace Drupal\taxonomy\Plugin\views\argument_validator;
diff --git a/core/modules/taxonomy/src/Plugin/views/field/TaxonomyIndexTid.php b/core/modules/taxonomy/src/Plugin/views/field/TaxonomyIndexTid.php
index 79629fac7c1a254ddbc4f862f5ed192662371eee..4fab01c3d4d6bef27a2b2ce44d5c80dc09a2fd6b 100644
--- a/core/modules/taxonomy/src/Plugin/views/field/TaxonomyIndexTid.php
+++ b/core/modules/taxonomy/src/Plugin/views/field/TaxonomyIndexTid.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\Plugin\views\field\TaxonomyIndexTid.
+ * Contains \Drupal\taxonomy\Plugin\views\field\TaxonomyIndexTid.
  */
 
 namespace Drupal\taxonomy\Plugin\views\field;
diff --git a/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTidDepth.php b/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTidDepth.php
index a6d1be64c4b0bee7006a99b300ebbef6b094a031..d99cde9737b4434e1b8c79d8b2a674067ff9803c 100644
--- a/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTidDepth.php
+++ b/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTidDepth.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\Plugin\views\filter\TaxonomyIndexTidDepth.
+ * Contains \Drupal\taxonomy\Plugin\views\filter\TaxonomyIndexTidDepth.
  */
 
 namespace Drupal\taxonomy\Plugin\views\filter;
diff --git a/core/modules/taxonomy/src/Plugin/views/wizard/TaxonomyTerm.php b/core/modules/taxonomy/src/Plugin/views/wizard/TaxonomyTerm.php
index c728c2c53d59ad5d228f44409519cf0949107687..3e97ec367fe1dc34cedc16c204126d63ef96f14e 100644
--- a/core/modules/taxonomy/src/Plugin/views/wizard/TaxonomyTerm.php
+++ b/core/modules/taxonomy/src/Plugin/views/wizard/TaxonomyTerm.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\Plugin\views\wizard\TaxonomyTerm.
+ * Contains \Drupal\taxonomy\Plugin\views\wizard\TaxonomyTerm.
  */
 
 namespace Drupal\taxonomy\Plugin\views\wizard;
diff --git a/core/modules/taxonomy/src/TermBreadcrumbBuilder.php b/core/modules/taxonomy/src/TermBreadcrumbBuilder.php
index 7c4cc897dbff286c40e04b249f32ef754eafa4e8..c2e47a1d068744f751feb8164ffad0256ace8ac4 100644
--- a/core/modules/taxonomy/src/TermBreadcrumbBuilder.php
+++ b/core/modules/taxonomy/src/TermBreadcrumbBuilder.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains of \Drupal\taxonomy\TermBreadcrumbBuilder.
+ * Contains \Drupal\taxonomy\TermBreadcrumbBuilder.
  */
 
 namespace Drupal\taxonomy;
diff --git a/core/modules/taxonomy/src/TermForm.php b/core/modules/taxonomy/src/TermForm.php
index 1a59a8b3bab0facbab5db65d16b6ecbeb9987cd7..a0d1279f0d61ba0b1067250a6c9a02314a936512 100644
--- a/core/modules/taxonomy/src/TermForm.php
+++ b/core/modules/taxonomy/src/TermForm.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\TermForm.
+ * Contains \Drupal\taxonomy\TermForm.
  */
 
 namespace Drupal\taxonomy;
diff --git a/core/modules/taxonomy/src/TermStorage.php b/core/modules/taxonomy/src/TermStorage.php
index 60b233043ef5f70dc08eb2e1b230b3894854fa65..56349b7547af345df101d84126ba936cbfcbc790 100644
--- a/core/modules/taxonomy/src/TermStorage.php
+++ b/core/modules/taxonomy/src/TermStorage.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\TermStorage.
+ * Contains \Drupal\taxonomy\TermStorage.
  */
 
 namespace Drupal\taxonomy;
diff --git a/core/modules/taxonomy/src/TermViewBuilder.php b/core/modules/taxonomy/src/TermViewBuilder.php
index 64edd9a05a8b73ce81dfaa1191465acd560b5ead..767529c4c8b1747580fa3b04cc5f8639d43e121f 100644
--- a/core/modules/taxonomy/src/TermViewBuilder.php
+++ b/core/modules/taxonomy/src/TermViewBuilder.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\TermViewBuilder.
+ * Contains \Drupal\taxonomy\TermViewBuilder.
  */
 
 namespace Drupal\taxonomy;
diff --git a/core/modules/taxonomy/src/Tests/EfqTest.php b/core/modules/taxonomy/src/Tests/EfqTest.php
index e8790cfd8cc9e14bccd7bad20820c9185d059e6c..f2fd1becebf48cf6014d3532ca7261a8701a7478 100644
--- a/core/modules/taxonomy/src/Tests/EfqTest.php
+++ b/core/modules/taxonomy/src/Tests/EfqTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\Tests\EfqTest.
+ * Contains \Drupal\taxonomy\Tests\EfqTest.
  */
 
 namespace Drupal\taxonomy\Tests;
diff --git a/core/modules/taxonomy/src/Tests/LegacyTest.php b/core/modules/taxonomy/src/Tests/LegacyTest.php
index 1da22ac0deb418a2e73e7ce697f526d8b6463ca2..06966b894866dca83aa732f89185b290d73081cb 100644
--- a/core/modules/taxonomy/src/Tests/LegacyTest.php
+++ b/core/modules/taxonomy/src/Tests/LegacyTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\Tests\LegacyTest.
+ * Contains \Drupal\taxonomy\Tests\LegacyTest.
  */
 
 namespace Drupal\taxonomy\Tests;
diff --git a/core/modules/taxonomy/src/Tests/LoadMultipleTest.php b/core/modules/taxonomy/src/Tests/LoadMultipleTest.php
index 4a2c1ce73102dc52b62955d86ad4f806d6dfb910..f82479296ef505b685f135540df91a6b7f5a895f 100644
--- a/core/modules/taxonomy/src/Tests/LoadMultipleTest.php
+++ b/core/modules/taxonomy/src/Tests/LoadMultipleTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\Tests\LoadMultipleTest.
+ * Contains \Drupal\taxonomy\Tests\LoadMultipleTest.
  */
 
 namespace Drupal\taxonomy\Tests;
diff --git a/core/modules/taxonomy/src/Tests/RssTest.php b/core/modules/taxonomy/src/Tests/RssTest.php
index 588917606f32e712070e847ecf47a3259f4a4c20..0871b4bd30d07b3c840c727df6a136ae07d3a66d 100644
--- a/core/modules/taxonomy/src/Tests/RssTest.php
+++ b/core/modules/taxonomy/src/Tests/RssTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\Tests\RssTest.
+ * Contains \Drupal\taxonomy\Tests\RssTest.
  */
 
 namespace Drupal\taxonomy\Tests;
diff --git a/core/modules/taxonomy/src/Tests/TaxonomyTestBase.php b/core/modules/taxonomy/src/Tests/TaxonomyTestBase.php
index e18a9ed33b9cd121d1b9db236eab56492cfee65c..c26ed2fdabb685aa88abcb99064f206e9d220c2f 100644
--- a/core/modules/taxonomy/src/Tests/TaxonomyTestBase.php
+++ b/core/modules/taxonomy/src/Tests/TaxonomyTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\Tests\TaxonomyTestBase.
+ * Contains \Drupal\taxonomy\Tests\TaxonomyTestBase.
  */
 
 namespace Drupal\taxonomy\Tests;
diff --git a/core/modules/taxonomy/src/Tests/TermIndexTest.php b/core/modules/taxonomy/src/Tests/TermIndexTest.php
index aecb90a64c467d945ad8c3fb8e53dee5be7217c3..9fb797e7cb2a7a05f010ffc37506e1da3a216a34 100644
--- a/core/modules/taxonomy/src/Tests/TermIndexTest.php
+++ b/core/modules/taxonomy/src/Tests/TermIndexTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\Tests\TermIndexTest.
+ * Contains \Drupal\taxonomy\Tests\TermIndexTest.
  */
 
 namespace Drupal\taxonomy\Tests;
diff --git a/core/modules/taxonomy/src/Tests/TermLanguageTest.php b/core/modules/taxonomy/src/Tests/TermLanguageTest.php
index c679204b11f7e321874da4b413545842eb10e2d6..01da9ee9eba799c8a9ec0569206f8951c6bfdab6 100644
--- a/core/modules/taxonomy/src/Tests/TermLanguageTest.php
+++ b/core/modules/taxonomy/src/Tests/TermLanguageTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\Tests\TermLanguageTest.
+ * Contains \Drupal\taxonomy\Tests\TermLanguageTest.
  */
 
 namespace Drupal\taxonomy\Tests;
diff --git a/core/modules/taxonomy/src/Tests/TermTest.php b/core/modules/taxonomy/src/Tests/TermTest.php
index bfeeb86963ccb017d036aebe25cdc5c263686c0b..09a0de2b23741102dfb90bfb92a63d87476e0c28 100644
--- a/core/modules/taxonomy/src/Tests/TermTest.php
+++ b/core/modules/taxonomy/src/Tests/TermTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\Tests\TermTest.
+ * Contains \Drupal\taxonomy\Tests\TermTest.
  */
 
 namespace Drupal\taxonomy\Tests;
diff --git a/core/modules/taxonomy/src/Tests/TermTranslationUITest.php b/core/modules/taxonomy/src/Tests/TermTranslationUITest.php
index 5b4f028bb3db88d64c610fa01118e18ef8d2bb52..176319bff352df2465a4c967746739dd26b59ef8 100644
--- a/core/modules/taxonomy/src/Tests/TermTranslationUITest.php
+++ b/core/modules/taxonomy/src/Tests/TermTranslationUITest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\Tests\TermTranslationUITest.
+ * Contains \Drupal\taxonomy\Tests\TermTranslationUITest.
  */
 
 namespace Drupal\taxonomy\Tests;
diff --git a/core/modules/taxonomy/src/Tests/ThemeTest.php b/core/modules/taxonomy/src/Tests/ThemeTest.php
index ed9eac20894a30a802db9a40fb7d8241468c0405..959848860ac4ef61b99ae416d8d9b572d99df01c 100644
--- a/core/modules/taxonomy/src/Tests/ThemeTest.php
+++ b/core/modules/taxonomy/src/Tests/ThemeTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\Tests\ThemeTest.
+ * Contains \Drupal\taxonomy\Tests\ThemeTest.
  */
 
 namespace Drupal\taxonomy\Tests;
diff --git a/core/modules/taxonomy/src/Tests/TokenReplaceTest.php b/core/modules/taxonomy/src/Tests/TokenReplaceTest.php
index c65f16a99eaad7df2b8a3abe43a60d65f9344929..10512018500ecad561dce7f87b31ef3805da77a7 100644
--- a/core/modules/taxonomy/src/Tests/TokenReplaceTest.php
+++ b/core/modules/taxonomy/src/Tests/TokenReplaceTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\Tests\TokenReplaceTest.
+ * Contains \Drupal\taxonomy\Tests\TokenReplaceTest.
  */
 
 namespace Drupal\taxonomy\Tests;
diff --git a/core/modules/taxonomy/src/Tests/Views/TaxonomyDefaultArgumentTest.php b/core/modules/taxonomy/src/Tests/Views/TaxonomyDefaultArgumentTest.php
index be4a9fcf9ae418005feb8511172fedcc84d925c4..aeae56719c83d2df66f6f38909e16397f692296c 100644
--- a/core/modules/taxonomy/src/Tests/Views/TaxonomyDefaultArgumentTest.php
+++ b/core/modules/taxonomy/src/Tests/Views/TaxonomyDefaultArgumentTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\taxonomy\Tests\Views\RelationshipRepresentativeNodeTest.
+ * Contains \Drupal\taxonomy\Tests\Views\TaxonomyDefaultArgumentTest.
  */
 
 namespace Drupal\taxonomy\Tests\Views;
diff --git a/core/modules/taxonomy/src/Tests/Views/TaxonomyRelationshipTest.php b/core/modules/taxonomy/src/Tests/Views/TaxonomyRelationshipTest.php
index fe1e3f0828ec3016587a3ce0ce6214f11cd291d7..ae065cf30f910706d1d55cef621f93ac41d231ae 100644
--- a/core/modules/taxonomy/src/Tests/Views/TaxonomyRelationshipTest.php
+++ b/core/modules/taxonomy/src/Tests/Views/TaxonomyRelationshipTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\taxonomy\Tests\Views\TaxonomyParentUITest.
+ * Contains \Drupal\taxonomy\Tests\Views\TaxonomyRelationshipTest.
  */
 
 namespace Drupal\taxonomy\Tests\Views;
diff --git a/core/modules/taxonomy/src/Tests/VocabularyLanguageTest.php b/core/modules/taxonomy/src/Tests/VocabularyLanguageTest.php
index 7987502868c576311780bc96e19e4fd2e8b359b0..6866a5fce759cee33728afb3c3de4175d714c2c8 100644
--- a/core/modules/taxonomy/src/Tests/VocabularyLanguageTest.php
+++ b/core/modules/taxonomy/src/Tests/VocabularyLanguageTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\Tests\VocabularyLanguageTest.
+ * Contains \Drupal\taxonomy\Tests\VocabularyLanguageTest.
  */
 
 namespace Drupal\taxonomy\Tests;
diff --git a/core/modules/taxonomy/src/VocabularyStorage.php b/core/modules/taxonomy/src/VocabularyStorage.php
index 6eeed05aafee9e29e4d985a50a7ec100f4cbf4a1..85fd4a6293164f7dc528243a34a2904120bf4579 100644
--- a/core/modules/taxonomy/src/VocabularyStorage.php
+++ b/core/modules/taxonomy/src/VocabularyStorage.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\VocabularyStorage.
+ * Contains \Drupal\taxonomy\VocabularyStorage.
  */
 
 namespace Drupal\taxonomy;
diff --git a/core/modules/telephone/src/Plugin/Field/FieldFormatter/TelephoneLinkFormatter.php b/core/modules/telephone/src/Plugin/Field/FieldFormatter/TelephoneLinkFormatter.php
index 5d83b7c6020243078b44a12920e4c044567dc127..c0b833738b619535b83a81b6d9f0bafb71f6abc7 100644
--- a/core/modules/telephone/src/Plugin/Field/FieldFormatter/TelephoneLinkFormatter.php
+++ b/core/modules/telephone/src/Plugin/Field/FieldFormatter/TelephoneLinkFormatter.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\telephone\Plugin\field\formatter\TelephoneLinkFormatter.
+ * Contains \Drupal\telephone\Plugin\Field\FieldFormatter\TelephoneLinkFormatter.
  */
 
 namespace Drupal\telephone\Plugin\Field\FieldFormatter;
diff --git a/core/modules/telephone/src/Tests/TelephoneFieldTest.php b/core/modules/telephone/src/Tests/TelephoneFieldTest.php
index 361376b753cc3bd0310f8e42daeb903a7d95c31f..515d7e0d07f04ffe1a3e139e3e9fff10b705d36b 100644
--- a/core/modules/telephone/src/Tests/TelephoneFieldTest.php
+++ b/core/modules/telephone/src/Tests/TelephoneFieldTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\telephone\TelephoneFieldTest.
+ * Contains \Drupal\telephone\Tests\TelephoneFieldTest.
  */
 
 namespace Drupal\telephone\Tests;
diff --git a/core/modules/telephone/src/Tests/TelephoneItemTest.php b/core/modules/telephone/src/Tests/TelephoneItemTest.php
index 56a64b5ac7528db6681e547614deec87d3cd9e28..42b7973f9bb2ffd14929195a8e7e9029a0b87f5c 100644
--- a/core/modules/telephone/src/Tests/TelephoneItemTest.php
+++ b/core/modules/telephone/src/Tests/TelephoneItemTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\field\Tests\TelephoneItemTest.
+ * Contains \Drupal\telephone\Tests\TelephoneItemTest.
  */
 
 namespace Drupal\telephone\Tests;
diff --git a/core/modules/text/src/Plugin/Field/FieldFormatter/TextDefaultFormatter.php b/core/modules/text/src/Plugin/Field/FieldFormatter/TextDefaultFormatter.php
index 623c808b4e70a0f4fa08f3098449edb8df3f8de5..87861e8840e1e7eb0d2804966b670e89282c45a6 100644
--- a/core/modules/text/src/Plugin/Field/FieldFormatter/TextDefaultFormatter.php
+++ b/core/modules/text/src/Plugin/Field/FieldFormatter/TextDefaultFormatter.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\text\Plugin\field\formatter\TextDefaultFormatter.
+ * Contains \Drupal\text\Plugin\Field\FieldFormatter\TextDefaultFormatter.
  */
 
 namespace Drupal\text\Plugin\Field\FieldFormatter;
diff --git a/core/modules/text/src/Plugin/Field/FieldFormatter/TextSummaryOrTrimmedFormatter.php b/core/modules/text/src/Plugin/Field/FieldFormatter/TextSummaryOrTrimmedFormatter.php
index 5e4d556384e3fcfb1995ed4bcfb8cf8a520e6580..604e7b9a00c672fa2b6483a5948070569d70c55a 100644
--- a/core/modules/text/src/Plugin/Field/FieldFormatter/TextSummaryOrTrimmedFormatter.php
+++ b/core/modules/text/src/Plugin/Field/FieldFormatter/TextSummaryOrTrimmedFormatter.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\text\Plugin\field\formatter\TextSummaryOrTrimmedFormatter.
+ * Contains \Drupal\text\Plugin\Field\FieldFormatter\TextSummaryOrTrimmedFormatter.
  */
 
 namespace Drupal\text\Plugin\Field\FieldFormatter;
diff --git a/core/modules/text/src/Plugin/Field/FieldFormatter/TextTrimmedFormatter.php b/core/modules/text/src/Plugin/Field/FieldFormatter/TextTrimmedFormatter.php
index 61fd119dec29aeb23d993ccc3e845650a80a547a..09404d6c731eedc1ef8cf3e6b32f1af6b29239b5 100644
--- a/core/modules/text/src/Plugin/Field/FieldFormatter/TextTrimmedFormatter.php
+++ b/core/modules/text/src/Plugin/Field/FieldFormatter/TextTrimmedFormatter.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\text\Plugin\field\FieldFormatter\TextTrimmedFormatter.
+ * Contains \Drupal\text\Plugin\Field\FieldFormatter\TextTrimmedFormatter.
  */
 namespace Drupal\text\Plugin\Field\FieldFormatter;
 
diff --git a/core/modules/text/src/Tests/TextFieldTest.php b/core/modules/text/src/Tests/TextFieldTest.php
index 37120c9237773d31771942425986a16bc8d6f291..a22bc5b104a9c341620e39884c7d40031fbf3373 100644
--- a/core/modules/text/src/Tests/TextFieldTest.php
+++ b/core/modules/text/src/Tests/TextFieldTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\text\TextFieldTest.
+ * Contains \Drupal\text\Tests\TextFieldTest.
  */
 
 namespace Drupal\text\Tests;
diff --git a/core/modules/text/src/Tests/TextSummaryTest.php b/core/modules/text/src/Tests/TextSummaryTest.php
index 54ad86608ffe94ba4965cf4dbac502931d1d636b..7b1dfabf9d6d789d24bab5818aba447a79620d41 100644
--- a/core/modules/text/src/Tests/TextSummaryTest.php
+++ b/core/modules/text/src/Tests/TextSummaryTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\text\TextSummaryTest.
+ * Contains \Drupal\text\Tests\TextSummaryTest.
  */
 
 namespace Drupal\text\Tests;
diff --git a/core/modules/tour/tests/tour_test/src/Plugin/tour/tip/TipPluginImage.php b/core/modules/tour/tests/tour_test/src/Plugin/tour/tip/TipPluginImage.php
index 90a5a4f22e797b96e1e37de77ed360752ef3d03b..5c683b97965f2f6a859ace0195f052ee8b3fd2fc 100644
--- a/core/modules/tour/tests/tour_test/src/Plugin/tour/tip/TipPluginImage.php
+++ b/core/modules/tour/tests/tour_test/src/Plugin/tour/tip/TipPluginImage.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\tour_test\Plugin\tour\tour\TipPluginImage.
+ * Contains \Drupal\tour_test\Plugin\tour\tip\TipPluginImage.
  */
 
 namespace Drupal\tour_test\Plugin\tour\tip;
diff --git a/core/modules/tracker/src/Access/ViewOwnTrackerAccessCheck.php b/core/modules/tracker/src/Access/ViewOwnTrackerAccessCheck.php
index 097627cccb568aeae27e6f0eac7868c752d68e4f..c4925dc4da0ff1f63922ed05869dde5b883efc63 100644
--- a/core/modules/tracker/src/Access/ViewOwnTrackerAccessCheck.php
+++ b/core/modules/tracker/src/Access/ViewOwnTrackerAccessCheck.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\tracker\Access\ViewOwnTrackerAccessCheck.
+ * Contains \Drupal\tracker\Access\ViewOwnTrackerAccessCheck.
  */
 
 namespace Drupal\tracker\Access;
diff --git a/core/modules/tracker/src/Plugin/views/argument/UserUid.php b/core/modules/tracker/src/Plugin/views/argument/UserUid.php
index 67ebd0f4c596319a0aac898af6ba8392850130ef..b54ccf8d3350d85013994f2f8e946bfc6a258264 100644
--- a/core/modules/tracker/src/Plugin/views/argument/UserUid.php
+++ b/core/modules/tracker/src/Plugin/views/argument/UserUid.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\tracker\Plugin\views\argument\UserUid
+ * Contains \Drupal\tracker\Plugin\views\argument\UserUid.
  */
 
 namespace Drupal\tracker\Plugin\views\argument;
diff --git a/core/modules/tracker/src/Tests/TrackerNodeAccessTest.php b/core/modules/tracker/src/Tests/TrackerNodeAccessTest.php
index 9a52768237afee5a77f54d9e57342103ab01d80c..28a376d5d08f25111364fa71306075272fd4b5bf 100644
--- a/core/modules/tracker/src/Tests/TrackerNodeAccessTest.php
+++ b/core/modules/tracker/src/Tests/TrackerNodeAccessTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\tracker\Tests\TrackerNodeAccessTest.
+ * Contains \Drupal\tracker\Tests\TrackerNodeAccessTest.
  */
 
 namespace Drupal\tracker\Tests;
diff --git a/core/modules/tracker/src/Tests/TrackerTest.php b/core/modules/tracker/src/Tests/TrackerTest.php
index c20c054b8a3151a7226c31edbd4634bfff89b998..391355564979bb5348b5ea45ee982aa1c9b175c5 100644
--- a/core/modules/tracker/src/Tests/TrackerTest.php
+++ b/core/modules/tracker/src/Tests/TrackerTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\tracker\Tests\TrackerTest.
+ * Contains \Drupal\tracker\Tests\TrackerTest.
  */
 
 namespace Drupal\tracker\Tests;
diff --git a/core/modules/update/src/Access/UpdateManagerAccessCheck.php b/core/modules/update/src/Access/UpdateManagerAccessCheck.php
index df52c5c37314cd64b0418559c83d6b0bc39639c0..837684c3a0c818cd0db588d5c170dd1515509f3b 100644
--- a/core/modules/update/src/Access/UpdateManagerAccessCheck.php
+++ b/core/modules/update/src/Access/UpdateManagerAccessCheck.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\update\Access\UpdateManagerAccessCheck.
+ * Contains \Drupal\update\Access\UpdateManagerAccessCheck.
  */
 
 namespace Drupal\update\Access;
diff --git a/core/modules/update/src/Tests/UpdateContribTest.php b/core/modules/update/src/Tests/UpdateContribTest.php
index a18a547781f50dece0cff4110b913f3ce33852c4..62fadd3601cbc085243f7337f1a19760280284d8 100644
--- a/core/modules/update/src/Tests/UpdateContribTest.php
+++ b/core/modules/update/src/Tests/UpdateContribTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\update\Tests\UpdateContribTest.
+ * Contains \Drupal\update\Tests\UpdateContribTest.
  */
 
 namespace Drupal\update\Tests;
diff --git a/core/modules/update/src/Tests/UpdateCoreTest.php b/core/modules/update/src/Tests/UpdateCoreTest.php
index 3aa598a8658910de05dce0ef899549bb75f99fa8..aef7c5eba5d5e2f613d61e6e53073035730e10c4 100644
--- a/core/modules/update/src/Tests/UpdateCoreTest.php
+++ b/core/modules/update/src/Tests/UpdateCoreTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\update\Tests\UpdateCoreTest.
+ * Contains \Drupal\update\Tests\UpdateCoreTest.
  */
 
 namespace Drupal\update\Tests;
diff --git a/core/modules/update/src/Tests/UpdateTestBase.php b/core/modules/update/src/Tests/UpdateTestBase.php
index 3d36aac24985ce7a6e2a6521a441fdc6e165f658..21a0d21f4b3d2bad6b6f25f14bf621ffe7c710f8 100644
--- a/core/modules/update/src/Tests/UpdateTestBase.php
+++ b/core/modules/update/src/Tests/UpdateTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\update\Tests\UpdateTestBase.
+ * Contains \Drupal\update\Tests\UpdateTestBase.
  *
  * The overarching methodology of these tests is we need to compare a given
  * state of installed modules and themes (e.g., version, project grouping,
diff --git a/core/modules/update/src/Tests/UpdateUploadTest.php b/core/modules/update/src/Tests/UpdateUploadTest.php
index 8bb75351f9a1ba35da3e456dda300a9e246a060e..7636f7ab3ab359670235ac723b683852cc39fb46 100644
--- a/core/modules/update/src/Tests/UpdateUploadTest.php
+++ b/core/modules/update/src/Tests/UpdateUploadTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\update\Tests\UpdateUploadTest.
+ * Contains \Drupal\update\Tests\UpdateUploadTest.
  */
 
 namespace Drupal\update\Tests;
diff --git a/core/modules/update/src/UpdateManagerInterface.php b/core/modules/update/src/UpdateManagerInterface.php
index f938bf7cc20fff5c05e2e0a5feb16b3411db554a..e1dd5a447e1860bb5a9f9746588a77629454b678 100644
--- a/core/modules/update/src/UpdateManagerInterface.php
+++ b/core/modules/update/src/UpdateManagerInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains  \Drupal\update\UpdateManagerInterface.
+ * Contains \Drupal\update\UpdateManagerInterface.
  */
 
 namespace Drupal\update;
diff --git a/core/modules/update/tests/modules/update_test/src/MockFileTransfer.php b/core/modules/update/tests/modules/update_test/src/MockFileTransfer.php
index 97b2988bb97ad14d59259d7f30ac732ab45cf1d2..a96b563c1b78ec621c4396435012b857353818bc 100644
--- a/core/modules/update/tests/modules/update_test/src/MockFileTransfer.php
+++ b/core/modules/update/tests/modules/update_test/src/MockFileTransfer.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\update_test\MockFileTransfer.
+ * Contains \Drupal\update_test\MockFileTransfer.
  */
 
 namespace Drupal\update_test;
diff --git a/core/modules/user/src/Access/PermissionAccessCheck.php b/core/modules/user/src/Access/PermissionAccessCheck.php
index addacc2fec10a0c0974088ec73acf740f505d1fa..64be7d6a2663673692c2b06023bcd190b4a90b1e 100644
--- a/core/modules/user/src/Access/PermissionAccessCheck.php
+++ b/core/modules/user/src/Access/PermissionAccessCheck.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\user\Access\PermissionAccessCheck.
+ * Contains \Drupal\user\Access\PermissionAccessCheck.
  */
 
 namespace Drupal\user\Access;
diff --git a/core/modules/user/src/Access/RegisterAccessCheck.php b/core/modules/user/src/Access/RegisterAccessCheck.php
index ee0e5beb5bb143b8f4c5475ca861d103eb8ab8ef..2ac40e9494d49b6dc8517d0013b4a8e7b48497df 100644
--- a/core/modules/user/src/Access/RegisterAccessCheck.php
+++ b/core/modules/user/src/Access/RegisterAccessCheck.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\user\Access\RegisterAccessCheck.
+ * Contains \Drupal\user\Access\RegisterAccessCheck.
  */
 
 namespace Drupal\user\Access;
diff --git a/core/modules/user/src/Entity/Role.php b/core/modules/user/src/Entity/Role.php
index 930c04a5be50a1e7931c981a5c77a427bb46efff..84212150c4fc89ca563852c21e129a7960376702 100644
--- a/core/modules/user/src/Entity/Role.php
+++ b/core/modules/user/src/Entity/Role.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\user\Entity\Role.
+ * Contains \Drupal\user\Entity\Role.
  */
 
 namespace Drupal\user\Entity;
diff --git a/core/modules/user/src/Plugin/LanguageNegotiation/LanguageNegotiationUser.php b/core/modules/user/src/Plugin/LanguageNegotiation/LanguageNegotiationUser.php
index e609c39a85483d21dcfa4a26146120aa631658ab..20759376c30716ac9489e742be403a7e4692797b 100644
--- a/core/modules/user/src/Plugin/LanguageNegotiation/LanguageNegotiationUser.php
+++ b/core/modules/user/src/Plugin/LanguageNegotiation/LanguageNegotiationUser.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl.
+ * Contains \Drupal\user\Plugin\LanguageNegotiation\LanguageNegotiationUser.
  */
 
 namespace Drupal\user\Plugin\LanguageNegotiation;
diff --git a/core/modules/user/src/Plugin/views/access/Permission.php b/core/modules/user/src/Plugin/views/access/Permission.php
index 18f0275bcb43678360fdffc0eb2c3bfb33e0f422..0dc5165db57b963c92faf64e2d903c6f6645d1c0 100644
--- a/core/modules/user/src/Plugin/views/access/Permission.php
+++ b/core/modules/user/src/Plugin/views/access/Permission.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Plugin\views\access\Permission.
+ * Contains \Drupal\user\Plugin\views\access\Permission.
  */
 
 namespace Drupal\user\Plugin\views\access;
diff --git a/core/modules/user/src/Plugin/views/access/Role.php b/core/modules/user/src/Plugin/views/access/Role.php
index 9686d084f73965f8e6253d646a04560028341a69..4c2b732560e3ceb9416e639a7bdf31c1258d9040 100644
--- a/core/modules/user/src/Plugin/views/access/Role.php
+++ b/core/modules/user/src/Plugin/views/access/Role.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Plugin\views\access\Role.
+ * Contains \Drupal\user\Plugin\views\access\Role.
  */
 
 namespace Drupal\user\Plugin\views\access;
diff --git a/core/modules/user/src/Plugin/views/argument_default/CurrentUser.php b/core/modules/user/src/Plugin/views/argument_default/CurrentUser.php
index 3b2f2a86dcc61e060353331ee8a07938dc54b34d..b3c86ece49a5b8eb3e5e48e993b7d2497fc256fd 100644
--- a/core/modules/user/src/Plugin/views/argument_default/CurrentUser.php
+++ b/core/modules/user/src/Plugin/views/argument_default/CurrentUser.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Plugin\views\argument_default\CurrentUser.
+ * Contains \Drupal\user\Plugin\views\argument_default\CurrentUser.
  */
 
 namespace Drupal\user\Plugin\views\argument_default;
diff --git a/core/modules/user/src/Plugin/views/argument_default/User.php b/core/modules/user/src/Plugin/views/argument_default/User.php
index 16daae7a0edb1d2f53b384e435437e1e5c70f372..edfb709921a139f0a8ecb2f0db1afa8f8e75fb5b 100644
--- a/core/modules/user/src/Plugin/views/argument_default/User.php
+++ b/core/modules/user/src/Plugin/views/argument_default/User.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Plugin\views\argument_default\User.
+ * Contains \Drupal\user\Plugin\views\argument_default\User.
  */
 
 namespace Drupal\user\Plugin\views\argument_default;
diff --git a/core/modules/user/src/Plugin/views/argument_validator/User.php b/core/modules/user/src/Plugin/views/argument_validator/User.php
index dd30b9d641a261eaff0bb1b420ce809bb09cd62d..ede8dd51ac2e200f121b818f2317d30b17a4f06b 100644
--- a/core/modules/user/src/Plugin/views/argument_validator/User.php
+++ b/core/modules/user/src/Plugin/views/argument_validator/User.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Plugin\views\argument_validator\User.
+ * Contains \Drupal\user\Plugin\views\argument_validator\User.
  */
 
 namespace Drupal\user\Plugin\views\argument_validator;
diff --git a/core/modules/user/src/Plugin/views/field/Permissions.php b/core/modules/user/src/Plugin/views/field/Permissions.php
index 9488c084a85be2bb73521d552baac1c9211f3572..036a3e3809c50132e129bb72d892d750ff68ed14 100644
--- a/core/modules/user/src/Plugin/views/field/Permissions.php
+++ b/core/modules/user/src/Plugin/views/field/Permissions.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Plugin\views\field\Permissions.
+ * Contains \Drupal\user\Plugin\views\field\Permissions.
  */
 
 namespace Drupal\user\Plugin\views\field;
diff --git a/core/modules/user/src/Plugin/views/field/Roles.php b/core/modules/user/src/Plugin/views/field/Roles.php
index 53a7252e32058a802a1fcea7350d8e6d1ec2293f..403e9a4b9636009ca58a9834d3905bbe7bf42aca 100644
--- a/core/modules/user/src/Plugin/views/field/Roles.php
+++ b/core/modules/user/src/Plugin/views/field/Roles.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Plugin\views\field\Roles.
+ * Contains \Drupal\user\Plugin\views\field\Roles.
  */
 
 namespace Drupal\user\Plugin\views\field;
diff --git a/core/modules/user/src/Plugin/views/filter/Current.php b/core/modules/user/src/Plugin/views/filter/Current.php
index d619f142e90018df699c35962274161812a052e5..f7e20fad5228d23c4e9fc5cb0e28b8b7b71cb75b 100644
--- a/core/modules/user/src/Plugin/views/filter/Current.php
+++ b/core/modules/user/src/Plugin/views/filter/Current.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of views_handler_filter_user_current.
+ * Contains \Drupal\user\Plugin\views\filter\Current.
  */
 
 namespace Drupal\user\Plugin\views\filter;
diff --git a/core/modules/user/src/Plugin/views/filter/Name.php b/core/modules/user/src/Plugin/views/filter/Name.php
index 3cf6b79b702d483a39b09682c4e78732ee93ddb3..5794b627f7a0233595249d20aad78443b0da211b 100644
--- a/core/modules/user/src/Plugin/views/filter/Name.php
+++ b/core/modules/user/src/Plugin/views/filter/Name.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Plugin\views\filter\Name.
+ * Contains \Drupal\user\Plugin\views\filter\Name.
  */
 
 namespace Drupal\user\Plugin\views\filter;
diff --git a/core/modules/user/src/Plugin/views/filter/Permissions.php b/core/modules/user/src/Plugin/views/filter/Permissions.php
index 418dd3151d7c77a4f5161ae26abe6a55f032c621..a637705271b5c9eefec5ff78c54e97e4acf7f3f2 100644
--- a/core/modules/user/src/Plugin/views/filter/Permissions.php
+++ b/core/modules/user/src/Plugin/views/filter/Permissions.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Plugin\views\filter\Permissions.
+ * Contains \Drupal\user\Plugin\views\filter\Permissions.
  */
 
 namespace Drupal\user\Plugin\views\filter;
diff --git a/core/modules/user/src/Plugin/views/filter/Roles.php b/core/modules/user/src/Plugin/views/filter/Roles.php
index 5ac9619c887c28c0af6d0716e857401642ee7a4f..bcae6f94cdc2493f9eb9f5876f17d73139a888b5 100644
--- a/core/modules/user/src/Plugin/views/filter/Roles.php
+++ b/core/modules/user/src/Plugin/views/filter/Roles.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Plugin\views\filter\Roles.
+ * Contains \Drupal\user\Plugin\views\filter\Roles.
  */
 
 namespace Drupal\user\Plugin\views\filter;
diff --git a/core/modules/user/src/Plugin/views/wizard/Users.php b/core/modules/user/src/Plugin/views/wizard/Users.php
index 171bf4bb40a32cdac0f6766d29694a301d5a73a0..f6f0cf0c99c067d8684eb932cc8ea4d6ab9be8eb 100644
--- a/core/modules/user/src/Plugin/views/wizard/Users.php
+++ b/core/modules/user/src/Plugin/views/wizard/Users.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Plugin\views\wizard\Users.
+ * Contains \Drupal\user\Plugin\views\wizard\Users.
  */
 
 namespace Drupal\user\Plugin\views\wizard;
diff --git a/core/modules/user/src/PrivateTempStore.php b/core/modules/user/src/PrivateTempStore.php
index 79be710b0d497b0f7ed83985cc9b708b1eeb250f..090aad43a187f940391bc7b36b70cae41f2e81d7 100644
--- a/core/modules/user/src/PrivateTempStore.php
+++ b/core/modules/user/src/PrivateTempStore.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\user\PrivateTempStore.
+ * Contains \Drupal\user\PrivateTempStore.
  */
 
 namespace Drupal\user;
diff --git a/core/modules/user/src/PrivateTempStoreFactory.php b/core/modules/user/src/PrivateTempStoreFactory.php
index d23525c3325ab41c577cc458a2adfb6fbb9bba0f..b8cfdcdeaa1b2f19d2b35fd62084e345f76f29c8 100644
--- a/core/modules/user/src/PrivateTempStoreFactory.php
+++ b/core/modules/user/src/PrivateTempStoreFactory.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\PrivateTempStoreFactory.
+ * Contains \Drupal\user\PrivateTempStoreFactory.
  */
 
 namespace Drupal\user;
diff --git a/core/modules/user/src/RegisterForm.php b/core/modules/user/src/RegisterForm.php
index bbf131e3d399ed5577a42a8a30b578ca06e45bfb..53dad45dda37def6c17f47f286669f220d000c4a 100644
--- a/core/modules/user/src/RegisterForm.php
+++ b/core/modules/user/src/RegisterForm.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\RegisterForm.
+ * Contains \Drupal\user\RegisterForm.
  */
 
 namespace Drupal\user;
diff --git a/core/modules/user/src/RoleInterface.php b/core/modules/user/src/RoleInterface.php
index 53ce14efbefc41689861df1a1c79f0b24ce2f41c..0820db422a3fecd203e40d0a6dc24c6ec4395299 100644
--- a/core/modules/user/src/RoleInterface.php
+++ b/core/modules/user/src/RoleInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\user\Entity\RoleInterface.
+ * Contains \Drupal\user\RoleInterface.
  */
 
 namespace Drupal\user;
diff --git a/core/modules/user/src/SharedTempStore.php b/core/modules/user/src/SharedTempStore.php
index 89c9725d35ac487ef8554c3e4ebbb283d683aad6..0fa9ba44c76d23d64eae327dba29a24f379bca1c 100644
--- a/core/modules/user/src/SharedTempStore.php
+++ b/core/modules/user/src/SharedTempStore.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\user\SharedTempStore.
+ * Contains \Drupal\user\SharedTempStore.
  */
 
 namespace Drupal\user;
diff --git a/core/modules/user/src/SharedTempStoreFactory.php b/core/modules/user/src/SharedTempStoreFactory.php
index da2331dd0777d9642df5767a0b6512e331715d26..c5f11e890e089789d9ed8c022546a9a1ffdcfb9d 100644
--- a/core/modules/user/src/SharedTempStoreFactory.php
+++ b/core/modules/user/src/SharedTempStoreFactory.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\SharedTempStoreFactory.
+ * Contains \Drupal\user\SharedTempStoreFactory.
  */
 
 namespace Drupal\user;
diff --git a/core/modules/user/src/TempStoreException.php b/core/modules/user/src/TempStoreException.php
index a552b7b1385f1eb3c8bb080422b99d600b642973..e7cb29e08a56d83c48128ab1ced83e33d4adf5f6 100644
--- a/core/modules/user/src/TempStoreException.php
+++ b/core/modules/user/src/TempStoreException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\user\TempStoreException.
+ * Contains \Drupal\user\TempStoreException.
  */
 
 namespace Drupal\user;
diff --git a/core/modules/user/src/Tests/TempStoreDatabaseTest.php b/core/modules/user/src/Tests/TempStoreDatabaseTest.php
index ffe85c4e88fdf6c24521967df205ac26f362ed55..6e897000c593d50dcd4a7ba8609068addce89e79 100644
--- a/core/modules/user/src/Tests/TempStoreDatabaseTest.php
+++ b/core/modules/user/src/Tests/TempStoreDatabaseTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Tests\TempStoreDatabaseTest.
+ * Contains \Drupal\user\Tests\TempStoreDatabaseTest.
  */
 
 namespace Drupal\user\Tests;
diff --git a/core/modules/user/src/Tests/UserAccountLinksTest.php b/core/modules/user/src/Tests/UserAccountLinksTest.php
index 3d509986b2c95aeb47b8423a81f67d3953556f2a..dac093b765fe4c4e91b426103bbcaf253bf053bc 100644
--- a/core/modules/user/src/Tests/UserAccountLinksTest.php
+++ b/core/modules/user/src/Tests/UserAccountLinksTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains of Drupal\user\Tests\UserAccountLinksTest.
+ * Contains \Drupal\user\Tests\UserAccountLinksTest.
  */
 
 namespace Drupal\user\Tests;
diff --git a/core/modules/user/src/Tests/UserAdminSettingsFormTest.php b/core/modules/user/src/Tests/UserAdminSettingsFormTest.php
index 87d8aa3c41a8f7f9a6860b05360ba772824693a6..904cea4632e50702d6d6482afa7a635539bd2db3 100644
--- a/core/modules/user/src/Tests/UserAdminSettingsFormTest.php
+++ b/core/modules/user/src/Tests/UserAdminSettingsFormTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Tests\UserAdminSettingsFormTest.
+ * Contains \Drupal\user\Tests\UserAdminSettingsFormTest.
  */
 
 namespace Drupal\user\Tests;
diff --git a/core/modules/user/src/Tests/UserAdminTest.php b/core/modules/user/src/Tests/UserAdminTest.php
index 691839d540ec2c8bec179ed8ab9a96ee06e116b0..cf942f9654d9b65bbf6c5d7174464afe14243eb9 100644
--- a/core/modules/user/src/Tests/UserAdminTest.php
+++ b/core/modules/user/src/Tests/UserAdminTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Tests\UserAdminTest.
+ * Contains \Drupal\user\Tests\UserAdminTest.
  */
 
 namespace Drupal\user\Tests;
diff --git a/core/modules/user/src/Tests/UserCancelTest.php b/core/modules/user/src/Tests/UserCancelTest.php
index 2d4939721375bc81add34ae57bf19114a64ac8c5..a6a161bb8b3b7344337a1690e72ec96c862efb14 100644
--- a/core/modules/user/src/Tests/UserCancelTest.php
+++ b/core/modules/user/src/Tests/UserCancelTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Tests\UserCancelTest.
+ * Contains \Drupal\user\Tests\UserCancelTest.
  */
 
 namespace Drupal\user\Tests;
diff --git a/core/modules/user/src/Tests/UserCreateFailMailTest.php b/core/modules/user/src/Tests/UserCreateFailMailTest.php
index b7b9618debbf4a0f43ae623636dca3748c4bc4e8..83bf5c10767c15ba169059fcac24e6c17bf6a423 100644
--- a/core/modules/user/src/Tests/UserCreateFailMailTest.php
+++ b/core/modules/user/src/Tests/UserCreateFailMailTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\user\Tests\UserCreateFailMailTest.
+ * Contains \Drupal\user\Tests\UserCreateFailMailTest.
  */
 
 namespace Drupal\user\Tests;
diff --git a/core/modules/user/src/Tests/UserCreateTest.php b/core/modules/user/src/Tests/UserCreateTest.php
index c906267b1e8dcac4847e69a3067cb8cc1e7c4584..d10b8d1085dad6cea927b3cfa086e4e6224b149f 100644
--- a/core/modules/user/src/Tests/UserCreateTest.php
+++ b/core/modules/user/src/Tests/UserCreateTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Tests\UserCreateTest.
+ * Contains \Drupal\user\Tests\UserCreateTest.
  */
 
 namespace Drupal\user\Tests;
diff --git a/core/modules/user/src/Tests/UserDeleteTest.php b/core/modules/user/src/Tests/UserDeleteTest.php
index 2ff00d9a24885cbcfb606e7994c34a0ea588e094..027727e102d080c4956efe9c10738d970accce2f 100644
--- a/core/modules/user/src/Tests/UserDeleteTest.php
+++ b/core/modules/user/src/Tests/UserDeleteTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Tests\UserDeleteTest.
+ * Contains \Drupal\user\Tests\UserDeleteTest.
  */
 
 namespace Drupal\user\Tests;
diff --git a/core/modules/user/src/Tests/UserEditTest.php b/core/modules/user/src/Tests/UserEditTest.php
index 46502f4084438502f182c6a64dbd0f7d3dfd8e3b..5d2c359becc636a137d94a41ce312cf19d22300b 100644
--- a/core/modules/user/src/Tests/UserEditTest.php
+++ b/core/modules/user/src/Tests/UserEditTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Tests\UserEditTest.
+ * Contains \Drupal\user\Tests\UserEditTest.
  */
 
 namespace Drupal\user\Tests;
diff --git a/core/modules/user/src/Tests/UserEditedOwnAccountTest.php b/core/modules/user/src/Tests/UserEditedOwnAccountTest.php
index bee1a9b669581828e1b9a6556b46448a4f6e6b8f..65282c0cf83d9afb719c49e434a17ad228960239 100644
--- a/core/modules/user/src/Tests/UserEditedOwnAccountTest.php
+++ b/core/modules/user/src/Tests/UserEditedOwnAccountTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Tests\UserEditedOwnAccountTest.
+ * Contains \Drupal\user\Tests\UserEditedOwnAccountTest.
  */
 
 namespace Drupal\user\Tests;
diff --git a/core/modules/user/src/Tests/UserEntityCallbacksTest.php b/core/modules/user/src/Tests/UserEntityCallbacksTest.php
index 18348729fcb7b786afdbfddecd9c8fb3bf035985..a56e6cab273130747bd982fcc2ebc76e2f5a0eca 100644
--- a/core/modules/user/src/Tests/UserEntityCallbacksTest.php
+++ b/core/modules/user/src/Tests/UserEntityCallbacksTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Tests\UserEntityCallbacksTest.
+ * Contains \Drupal\user\Tests\UserEntityCallbacksTest.
  */
 
 namespace Drupal\user\Tests;
diff --git a/core/modules/user/src/Tests/UserLanguageCreationTest.php b/core/modules/user/src/Tests/UserLanguageCreationTest.php
index 3b9c5b1b82288b2000ed7199be8f5cfa4f773e00..4c49a3bf759a3fc78f0a616d9e29d8b19c7e9aee 100644
--- a/core/modules/user/src/Tests/UserLanguageCreationTest.php
+++ b/core/modules/user/src/Tests/UserLanguageCreationTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Tests\UserLanguageCreationTest.
+ * Contains \Drupal\user\Tests\UserLanguageCreationTest.
  */
 
 namespace Drupal\user\Tests;
diff --git a/core/modules/user/src/Tests/UserLanguageTest.php b/core/modules/user/src/Tests/UserLanguageTest.php
index 550aeff3a2c63c25b285d157a18ae67fed04d417..dd3b769fe56d7842032bededaa6e663540945d87 100644
--- a/core/modules/user/src/Tests/UserLanguageTest.php
+++ b/core/modules/user/src/Tests/UserLanguageTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Tests\UserLanguageTest.
+ * Contains \Drupal\user\Tests\UserLanguageTest.
  */
 
 namespace Drupal\user\Tests;
diff --git a/core/modules/user/src/Tests/UserLoginTest.php b/core/modules/user/src/Tests/UserLoginTest.php
index 4462f440e61e068bbed52698a3a4b493043e5888..8a31137765e0f444df79e3fb96230656a7609397 100644
--- a/core/modules/user/src/Tests/UserLoginTest.php
+++ b/core/modules/user/src/Tests/UserLoginTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Tests\UserLoginTest.
+ * Contains \Drupal\user\Tests\UserLoginTest.
  */
 
 namespace Drupal\user\Tests;
diff --git a/core/modules/user/src/Tests/UserPasswordResetTest.php b/core/modules/user/src/Tests/UserPasswordResetTest.php
index 07c7fcf481d75de4bf1bcc2e5d9ada540f810264..32339189fd2731fe7f571ac26e22289d8756b323 100644
--- a/core/modules/user/src/Tests/UserPasswordResetTest.php
+++ b/core/modules/user/src/Tests/UserPasswordResetTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Tests\UserPasswordResetTest.
+ * Contains \Drupal\user\Tests\UserPasswordResetTest.
  */
 
 namespace Drupal\user\Tests;
diff --git a/core/modules/user/src/Tests/UserPermissionsTest.php b/core/modules/user/src/Tests/UserPermissionsTest.php
index 9108fc3c016677c38ff22812d3d34c3994484ab9..e5baa49b24f63975865e63b5dbca9860c0b40055 100644
--- a/core/modules/user/src/Tests/UserPermissionsTest.php
+++ b/core/modules/user/src/Tests/UserPermissionsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Tests\UserPermissionsTest.
+ * Contains \Drupal\user\Tests\UserPermissionsTest.
  */
 
 namespace Drupal\user\Tests;
diff --git a/core/modules/user/src/Tests/UserPictureTest.php b/core/modules/user/src/Tests/UserPictureTest.php
index 4f70d441d36dbe1d4f12c986955a19e56431a85d..efadce57885567aab4917f51d1ebdfe7e3554d83 100644
--- a/core/modules/user/src/Tests/UserPictureTest.php
+++ b/core/modules/user/src/Tests/UserPictureTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Tests\UserPictureTest.
+ * Contains \Drupal\user\Tests\UserPictureTest.
  */
 
 namespace Drupal\user\Tests;
diff --git a/core/modules/user/src/Tests/UserRegistrationTest.php b/core/modules/user/src/Tests/UserRegistrationTest.php
index bba6849b839dbd65db3a63a99e9395f58a867555..1ee1bfc13e620a38ba89b3f93aa7a91c5142b500 100644
--- a/core/modules/user/src/Tests/UserRegistrationTest.php
+++ b/core/modules/user/src/Tests/UserRegistrationTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Tests\UserRegistrationTest.
+ * Contains \Drupal\user\Tests\UserRegistrationTest.
  */
 
 namespace Drupal\user\Tests;
diff --git a/core/modules/user/src/Tests/UserRoleAdminTest.php b/core/modules/user/src/Tests/UserRoleAdminTest.php
index c19130c42390a63ffaee468ab2317d4e67688eb6..455d6f7d08a165221c035ce708f07966e949cc60 100644
--- a/core/modules/user/src/Tests/UserRoleAdminTest.php
+++ b/core/modules/user/src/Tests/UserRoleAdminTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Tests\UserRoleAdminTest.
+ * Contains \Drupal\user\Tests\UserRoleAdminTest.
  */
 
 namespace Drupal\user\Tests;
diff --git a/core/modules/user/src/Tests/UserRolesAssignmentTest.php b/core/modules/user/src/Tests/UserRolesAssignmentTest.php
index 8e164f5a62526ba7183ca2048772c911ea3ac7c4..fc074c8a09c52a564f7f5d03c2669f195b0b42f0 100644
--- a/core/modules/user/src/Tests/UserRolesAssignmentTest.php
+++ b/core/modules/user/src/Tests/UserRolesAssignmentTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Tests\UserRolesAssignmentTest.
+ * Contains \Drupal\user\Tests\UserRolesAssignmentTest.
  */
 
 namespace Drupal\user\Tests;
diff --git a/core/modules/user/src/Tests/UserSaveStatusTest.php b/core/modules/user/src/Tests/UserSaveStatusTest.php
index d1410a149dbc1dd7d87c4e10b805985f014194f2..7ce77c78120407a692f7ca1dce117f0be2b36948 100644
--- a/core/modules/user/src/Tests/UserSaveStatusTest.php
+++ b/core/modules/user/src/Tests/UserSaveStatusTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Tests\UserSaveStatusTest.
+ * Contains \Drupal\user\Tests\UserSaveStatusTest.
  */
 
 namespace Drupal\user\Tests;
diff --git a/core/modules/user/src/Tests/UserSaveTest.php b/core/modules/user/src/Tests/UserSaveTest.php
index 528ef8d80dbbb10d571d6d1f493313cb9c67ae4b..0682c97088e2fe6a92d93bf2e0295d42f4d8843b 100644
--- a/core/modules/user/src/Tests/UserSaveTest.php
+++ b/core/modules/user/src/Tests/UserSaveTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Tests\UserSaveTest.
+ * Contains \Drupal\user\Tests\UserSaveTest.
  */
 
 namespace Drupal\user\Tests;
diff --git a/core/modules/user/src/Tests/UserSearchTest.php b/core/modules/user/src/Tests/UserSearchTest.php
index 0adee080e5cf04423107ed1128cda3c23be12eb5..f211e1789dba228e424edeb6ef62e7060c659ba0 100644
--- a/core/modules/user/src/Tests/UserSearchTest.php
+++ b/core/modules/user/src/Tests/UserSearchTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Tests\UserSearchTest.
+ * Contains \Drupal\user\Tests\UserSearchTest.
  */
 
 namespace Drupal\user\Tests;
diff --git a/core/modules/user/src/Tests/UserTimeZoneTest.php b/core/modules/user/src/Tests/UserTimeZoneTest.php
index 4a75381d789275681e85bd52cda84a8b700644d9..300f57bd1e04c28c7c2f084b8d977c0f5a480509 100644
--- a/core/modules/user/src/Tests/UserTimeZoneTest.php
+++ b/core/modules/user/src/Tests/UserTimeZoneTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Tests\UserTimeZoneTest.
+ * Contains \Drupal\user\Tests\UserTimeZoneTest.
  */
 
 namespace Drupal\user\Tests;
diff --git a/core/modules/user/src/Tests/UserTokenReplaceTest.php b/core/modules/user/src/Tests/UserTokenReplaceTest.php
index 2a64e1908efb49be0d8e0b3fae22a5c956ff2106..b2dfe6da6fa10d4c0e0835660959a6b99af9e4f4 100644
--- a/core/modules/user/src/Tests/UserTokenReplaceTest.php
+++ b/core/modules/user/src/Tests/UserTokenReplaceTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Tests\UserTokenReplaceTest.
+ * Contains \Drupal\user\Tests\UserTokenReplaceTest.
  */
 
 namespace Drupal\user\Tests;
diff --git a/core/modules/user/src/Tests/UserTranslationUITest.php b/core/modules/user/src/Tests/UserTranslationUITest.php
index bcdc5767d6cfa0c66a447ce52979eec53934d444..dd74391072c6d0c50f53d47e305a771a4b8fc9c4 100644
--- a/core/modules/user/src/Tests/UserTranslationUITest.php
+++ b/core/modules/user/src/Tests/UserTranslationUITest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\Tests\UserTranslationUITest.
+ * Contains \Drupal\user\Tests\UserTranslationUITest.
  */
 
 namespace Drupal\user\Tests;
diff --git a/core/modules/user/src/Tests/Views/HandlerFieldRoleTest.php b/core/modules/user/src/Tests/Views/HandlerFieldRoleTest.php
index 56124b26a991d5242640c0e8b27ada27c6f0e93a..0072d678f61ce19fd2cabe1d2557f6cabff14206 100644
--- a/core/modules/user/src/Tests/Views/HandlerFieldRoleTest.php
+++ b/core/modules/user/src/Tests/Views/HandlerFieldRoleTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\user\Tests\Views\HandlerFieldRoleTest.
+ * Contains \Drupal\user\Tests\Views\HandlerFieldRoleTest.
  */
 
 namespace Drupal\user\Tests\Views;
diff --git a/core/modules/user/src/Tests/Views/UserViewsFieldAccessTest.php b/core/modules/user/src/Tests/Views/UserViewsFieldAccessTest.php
index 37f5597415e9d0f16c8f6f4a0ff4adb561aa8765..f3e4dc78acdb69c42a4a4232bb2fb1fb3f21d993 100644
--- a/core/modules/user/src/Tests/Views/UserViewsFieldAccessTest.php
+++ b/core/modules/user/src/Tests/Views/UserViewsFieldAccessTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Views\userViewsFieldAccessTest.
+ * Contains \Drupal\user\Tests\Views\UserViewsFieldAccessTest.
  */
 
 namespace Drupal\user\Tests\Views;
diff --git a/core/modules/user/src/UserData.php b/core/modules/user/src/UserData.php
index 3f6b5931811dd73edad76c8c6fb16243a9bb9306..946da701d0ac2a38b0e3f0c332d7a6afc91c673d 100644
--- a/core/modules/user/src/UserData.php
+++ b/core/modules/user/src/UserData.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\user\UserData.
+ * Contains \Drupal\user\UserData.
  */
 
 namespace Drupal\user;
diff --git a/core/modules/user/src/UserDataInterface.php b/core/modules/user/src/UserDataInterface.php
index b56baf49a4957483254be0237a0f0624635f01bf..e32c4fb399b8b4fe3b02998d99d7cc5fd32fe30d 100644
--- a/core/modules/user/src/UserDataInterface.php
+++ b/core/modules/user/src/UserDataInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\user\UserDataInterface.
+ * Contains \Drupal\user\UserDataInterface.
  */
 
 namespace Drupal\user;
diff --git a/core/modules/user/src/UserStorage.php b/core/modules/user/src/UserStorage.php
index 4aad5c56fdff269ddcd6fc6d8e40830a4476b2f2..590950d0a4f56fd73274ccf0d7be76c0deec5de7 100644
--- a/core/modules/user/src/UserStorage.php
+++ b/core/modules/user/src/UserStorage.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\UserStorage.
+ * Contains \Drupal\user\UserStorage.
  */
 
 namespace Drupal\user;
diff --git a/core/modules/views/src/Annotation/ViewsHandlerAnnotationBase.php b/core/modules/views/src/Annotation/ViewsHandlerAnnotationBase.php
index 73d65869982aea4a38ecdddc4be96c1457a297bc..e12131b97edab7e124f6774c5709755ee735dbec 100644
--- a/core/modules/views/src/Annotation/ViewsHandlerAnnotationBase.php
+++ b/core/modules/views/src/Annotation/ViewsHandlerAnnotationBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\views\Annotation\ViewsPluginAnnotationBase.
+ * Contains \Drupal\views\Annotation\ViewsHandlerAnnotationBase.
  */
 
 namespace Drupal\views\Annotation;
diff --git a/core/modules/views/src/Entity/View.php b/core/modules/views/src/Entity/View.php
index b9de0af7ae297b837c81c61562c6a05d05b5e5ad..de736ece159ef00d8709864a8204317ed96dd182 100644
--- a/core/modules/views/src/Entity/View.php
+++ b/core/modules/views/src/Entity/View.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Entity\View.
+ * Contains \Drupal\views\Entity\View.
  */
 
 namespace Drupal\views\Entity;
diff --git a/core/modules/views/src/ManyToOneHelper.php b/core/modules/views/src/ManyToOneHelper.php
index 0c2180115972c6e49b49d85d5412685b66e8fc5d..e6e31aa611a81a96697fa8242b0858811f1952e8 100644
--- a/core/modules/views/src/ManyToOneHelper.php
+++ b/core/modules/views/src/ManyToOneHelper.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\ManyToOneHelper.
+ * Contains \Drupal\views\ManyToOneHelper.
  */
 
 namespace Drupal\views;
diff --git a/core/modules/views/src/Plugin/views/HandlerBase.php b/core/modules/views/src/Plugin/views/HandlerBase.php
index b10b948477e11d4afe714492026a002311b0c279..82a4a92fae82034f48ae34883de883bfcb3a8cc8 100644
--- a/core/modules/views/src/Plugin/views/HandlerBase.php
+++ b/core/modules/views/src/Plugin/views/HandlerBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\HandlerBase.
+ * Contains \Drupal\views\Plugin\views\HandlerBase.
  */
 
 namespace Drupal\views\Plugin\views;
diff --git a/core/modules/views/src/Plugin/views/PluginInterface.php b/core/modules/views/src/Plugin/views/PluginInterface.php
index 5b187917e26f770b92bc69b2b72fbc7236a6794b..0ac06e018024710252eb8cf7a098deb2fd336de7 100644
--- a/core/modules/views/src/Plugin/views/PluginInterface.php
+++ b/core/modules/views/src/Plugin/views/PluginInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\PluginInterface.
+ * Contains \Drupal\views\Plugin\views\PluginInterface.
  */
 
 namespace Drupal\views\Plugin\views;
diff --git a/core/modules/views/src/Plugin/views/access/AccessPluginBase.php b/core/modules/views/src/Plugin/views/access/AccessPluginBase.php
index c0aaa5d0a6bf1a2aa06fed4a9c64bec85fa84f72..57481fa7d1f60b9e5fb84687052a1c922f2dbb24 100644
--- a/core/modules/views/src/Plugin/views/access/AccessPluginBase.php
+++ b/core/modules/views/src/Plugin/views/access/AccessPluginBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\access\AccessPluginBase.
+ * Contains \Drupal\views\Plugin\views\access\AccessPluginBase.
  */
 
 namespace Drupal\views\Plugin\views\access;
diff --git a/core/modules/views/src/Plugin/views/access/None.php b/core/modules/views/src/Plugin/views/access/None.php
index fa1789bfcf2160c97d1820981b3f277be5aa0c3c..0498cf014dd981d764504791d6421e4ce13fc4df 100644
--- a/core/modules/views/src/Plugin/views/access/None.php
+++ b/core/modules/views/src/Plugin/views/access/None.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\access\None.
+ * Contains \Drupal\views\Plugin\views\access\None.
  */
 
 namespace Drupal\views\Plugin\views\access;
diff --git a/core/modules/views/src/Plugin/views/area/Broken.php b/core/modules/views/src/Plugin/views/area/Broken.php
index 677cb8ec1c70ed6e9e120ad791ad8b32d4fae1e7..9106d2dd70ddb52c735e6fbb544252526b91b73d 100644
--- a/core/modules/views/src/Plugin/views/area/Broken.php
+++ b/core/modules/views/src/Plugin/views/area/Broken.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\area\Broken
+ * Contains \Drupal\views\Plugin\views\area\Broken.
  */
 
 namespace Drupal\views\Plugin\views\area;
diff --git a/core/modules/views/src/Plugin/views/area/Result.php b/core/modules/views/src/Plugin/views/area/Result.php
index 52ce7f2b2be05764df5a3f10a2b78b408ace23f8..02017e3a4c078827e108b863f653d9d51420287c 100644
--- a/core/modules/views/src/Plugin/views/area/Result.php
+++ b/core/modules/views/src/Plugin/views/area/Result.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\area\Result.
+ * Contains \Drupal\views\Plugin\views\area\Result.
  */
 
 namespace Drupal\views\Plugin\views\area;
diff --git a/core/modules/views/src/Plugin/views/area/Text.php b/core/modules/views/src/Plugin/views/area/Text.php
index a8d9555af2250e01fc235615c6b118ab0d1bb3d5..cbf524e7accb8520dbc29bb48450f4674160e4ee 100644
--- a/core/modules/views/src/Plugin/views/area/Text.php
+++ b/core/modules/views/src/Plugin/views/area/Text.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\area\Text.
+ * Contains \Drupal\views\Plugin\views\area\Text.
  */
 
 namespace Drupal\views\Plugin\views\area;
diff --git a/core/modules/views/src/Plugin/views/area/TextCustom.php b/core/modules/views/src/Plugin/views/area/TextCustom.php
index fd6641ba33535beb54bd09fa8278c19d5e924c61..d24e8f328c6b2e4b24d938dbdda9a454f7f6bcab 100644
--- a/core/modules/views/src/Plugin/views/area/TextCustom.php
+++ b/core/modules/views/src/Plugin/views/area/TextCustom.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\area\TextCustom.
+ * Contains \Drupal\views\Plugin\views\area\TextCustom.
  */
 
 namespace Drupal\views\Plugin\views\area;
diff --git a/core/modules/views/src/Plugin/views/area/Title.php b/core/modules/views/src/Plugin/views/area/Title.php
index 88433246fc3808895d78ce2a6da6840dc24641cc..7827b620eb8b77b6755b7e771fdc17d7aa525273 100644
--- a/core/modules/views/src/Plugin/views/area/Title.php
+++ b/core/modules/views/src/Plugin/views/area/Title.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\area\Title.
+ * Contains \Drupal\views\Plugin\views\area\Title.
  */
 
 namespace Drupal\views\Plugin\views\area;
diff --git a/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php b/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
index c9e2ce903bbb75cd5bc7b86ae7c896851898bf3e..a1f1c5ea17ba5d09b2c880e7b771a248b07cf4b8 100644
--- a/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
+++ b/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\argument\ArgumentPluginBase.
+ * Contains \Drupal\views\Plugin\views\argument\ArgumentPluginBase.
  */
 
 namespace Drupal\views\Plugin\views\argument;
diff --git a/core/modules/views/src/Plugin/views/argument/Broken.php b/core/modules/views/src/Plugin/views/argument/Broken.php
index 131318559b5adfa62e61f8c3f2ee6e5edb28062a..4e8bb92d13097f2fbb4cbb58038529b1c0cee108 100644
--- a/core/modules/views/src/Plugin/views/argument/Broken.php
+++ b/core/modules/views/src/Plugin/views/argument/Broken.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\argument\Broken.
+ * Contains \Drupal\views\Plugin\views\argument\Broken.
  */
 
 namespace Drupal\views\Plugin\views\argument;
diff --git a/core/modules/views/src/Plugin/views/argument/Date.php b/core/modules/views/src/Plugin/views/argument/Date.php
index 457a0dff957fc54c407a7ffd66d2656fc5b34489..c737d38b041844dd80db675c55baa838fa8d62e2 100644
--- a/core/modules/views/src/Plugin/views/argument/Date.php
+++ b/core/modules/views/src/Plugin/views/argument/Date.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\argument\Date.
+ * Contains \Drupal\views\Plugin\views\argument\Date.
  */
 
 namespace Drupal\views\Plugin\views\argument;
diff --git a/core/modules/views/src/Plugin/views/argument/Formula.php b/core/modules/views/src/Plugin/views/argument/Formula.php
index 6835621f1572b8ea12547ec583f02f411167d7cd..db94c24387e2422d5b0e38f3bd3e3bfe70edb378 100644
--- a/core/modules/views/src/Plugin/views/argument/Formula.php
+++ b/core/modules/views/src/Plugin/views/argument/Formula.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\argument\Formula.
+ * Contains \Drupal\views\Plugin\views\argument\Formula.
  */
 
 namespace Drupal\views\Plugin\views\argument;
diff --git a/core/modules/views/src/Plugin/views/argument/GroupByNumeric.php b/core/modules/views/src/Plugin/views/argument/GroupByNumeric.php
index e0818db7e25e2d09004c6f7961a8c571ca09b24b..9febda7def8beab8dba1c1d4e3c43f3c1fcb7b5c 100644
--- a/core/modules/views/src/Plugin/views/argument/GroupByNumeric.php
+++ b/core/modules/views/src/Plugin/views/argument/GroupByNumeric.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\argument\GroupByNumeric.
+ * Contains \Drupal\views\Plugin\views\argument\GroupByNumeric.
  */
 
 namespace Drupal\views\Plugin\views\argument;
diff --git a/core/modules/views/src/Plugin/views/argument/LanguageArgument.php b/core/modules/views/src/Plugin/views/argument/LanguageArgument.php
index a9928cc95cd2fb008993db66ac31d48564476066..6c545127052d1da9b3815fbbfb50a0e7204d2c13 100644
--- a/core/modules/views/src/Plugin/views/argument/LanguageArgument.php
+++ b/core/modules/views/src/Plugin/views/argument/LanguageArgument.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\views\Plugin\views\argument\LanguageArgument.
+ * Contains \Drupal\views\Plugin\views\argument\LanguageArgument.
  */
 
 namespace Drupal\views\Plugin\views\argument;
diff --git a/core/modules/views/src/Plugin/views/argument/ManyToOne.php b/core/modules/views/src/Plugin/views/argument/ManyToOne.php
index 39e68115fd2d523eb835e04b4b0e7853f0177df9..781ea80bb973e588fe021c5b8a0c2d221dff1b1c 100644
--- a/core/modules/views/src/Plugin/views/argument/ManyToOne.php
+++ b/core/modules/views/src/Plugin/views/argument/ManyToOne.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\argument\ManyToOne.
+ * Contains \Drupal\views\Plugin\views\argument\ManyToOne.
  */
 
 namespace Drupal\views\Plugin\views\argument;
diff --git a/core/modules/views/src/Plugin/views/argument/Standard.php b/core/modules/views/src/Plugin/views/argument/Standard.php
index 7a7f4d3588aba7acafb46108a9e1a71cf37f2117..b4d70733ebf0f2094b8b2b050707eb5cb9798c70 100644
--- a/core/modules/views/src/Plugin/views/argument/Standard.php
+++ b/core/modules/views/src/Plugin/views/argument/Standard.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\argument\Standard.
+ * Contains \Drupal\views\Plugin\views\argument\Standard.
  */
 
 namespace Drupal\views\Plugin\views\argument;
diff --git a/core/modules/views/src/Plugin/views/argument_default/Fixed.php b/core/modules/views/src/Plugin/views/argument_default/Fixed.php
index 03b9330deb193c7fe245460faaa0e8c5c64db108..99f55ae6405a627d0b401c44961cc82c29b1705e 100644
--- a/core/modules/views/src/Plugin/views/argument_default/Fixed.php
+++ b/core/modules/views/src/Plugin/views/argument_default/Fixed.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\argument_default\Fixed.
+ * Contains \Drupal\views\Plugin\views\argument_default\Fixed.
  */
 
 namespace Drupal\views\Plugin\views\argument_default;
diff --git a/core/modules/views/src/Plugin/views/argument_default/Raw.php b/core/modules/views/src/Plugin/views/argument_default/Raw.php
index 40bddf3531f2f099ab02b4d9b1ab763c8ec9335d..20715f341ef19b6e7d5f36bb3ee7c62343e0a4f8 100644
--- a/core/modules/views/src/Plugin/views/argument_default/Raw.php
+++ b/core/modules/views/src/Plugin/views/argument_default/Raw.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\argument_default\Raw.
+ * Contains \Drupal\views\Plugin\views\argument_default\Raw.
  */
 
 namespace Drupal\views\Plugin\views\argument_default;
diff --git a/core/modules/views/src/Plugin/views/argument_validator/None.php b/core/modules/views/src/Plugin/views/argument_validator/None.php
index b53ba930589422017e9b053666f29de697b1d4ee..e6e65bd6a65c3b39007271b49ecd8789c3a373e8 100644
--- a/core/modules/views/src/Plugin/views/argument_validator/None.php
+++ b/core/modules/views/src/Plugin/views/argument_validator/None.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\argument_validator\None.
+ * Contains \Drupal\views\Plugin\views\argument_validator\None.
  */
 
 namespace Drupal\views\Plugin\views\argument_validator;
diff --git a/core/modules/views/src/Plugin/views/cache/None.php b/core/modules/views/src/Plugin/views/cache/None.php
index 863cfe3ebf36e9ae458996f9cdccdb323f193d3a..0fbf4a863fa64adf7fb2b1868ead4a0e5644034c 100644
--- a/core/modules/views/src/Plugin/views/cache/None.php
+++ b/core/modules/views/src/Plugin/views/cache/None.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\cache\None.
+ * Contains \Drupal\views\Plugin\views\cache\None.
  */
 
 namespace Drupal\views\Plugin\views\cache;
diff --git a/core/modules/views/src/Plugin/views/cache/Time.php b/core/modules/views/src/Plugin/views/cache/Time.php
index 0ac9dee3e7a8b39ae60bc8db8ed804597c9b3243..d14ed1cfd57bc004690a26baff27fadb47de2541 100644
--- a/core/modules/views/src/Plugin/views/cache/Time.php
+++ b/core/modules/views/src/Plugin/views/cache/Time.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\cache\Time.
+ * Contains \Drupal\views\Plugin\views\cache\Time.
  */
 
 namespace Drupal\views\Plugin\views\cache;
diff --git a/core/modules/views/src/Plugin/views/display/Attachment.php b/core/modules/views/src/Plugin/views/display/Attachment.php
index 30a4674293e4f52f3c4fec9277458beb5d5ac55a..dcc4282e4006c2bbfa4b463d35d8daaa670ef51b 100644
--- a/core/modules/views/src/Plugin/views/display/Attachment.php
+++ b/core/modules/views/src/Plugin/views/display/Attachment.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\display\Attachment.
+ * Contains \Drupal\views\Plugin\views\display\Attachment.
  */
 
 namespace Drupal\views\Plugin\views\display;
diff --git a/core/modules/views/src/Plugin/views/display/DefaultDisplay.php b/core/modules/views/src/Plugin/views/display/DefaultDisplay.php
index c4a49f53e207dde3a18ff5100b2f48f1d45d88a2..8615dd561b0ca484588e32e89f50e99aad768234 100644
--- a/core/modules/views/src/Plugin/views/display/DefaultDisplay.php
+++ b/core/modules/views/src/Plugin/views/display/DefaultDisplay.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\display\DefaultDisplay.
+ * Contains \Drupal\views\Plugin\views\display\DefaultDisplay.
  */
 
 namespace Drupal\views\Plugin\views\display;
diff --git a/core/modules/views/src/Plugin/views/display/Embed.php b/core/modules/views/src/Plugin/views/display/Embed.php
index 1175c473874a82905e62bba5ec3e11ce7ad69871..b3597bc2aa84844c85d9ab3db34553de4c18c85d 100644
--- a/core/modules/views/src/Plugin/views/display/Embed.php
+++ b/core/modules/views/src/Plugin/views/display/Embed.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\display\Embed.
+ * Contains \Drupal\views\Plugin\views\display\Embed.
  */
 
 namespace Drupal\views\Plugin\views\display;
diff --git a/core/modules/views/src/Plugin/views/exposed_form/Basic.php b/core/modules/views/src/Plugin/views/exposed_form/Basic.php
index 8de9d357f315e8949d1aac7c856363ab1d80baa4..44385c278c6675a372f23b5c867c87b08330dc9f 100644
--- a/core/modules/views/src/Plugin/views/exposed_form/Basic.php
+++ b/core/modules/views/src/Plugin/views/exposed_form/Basic.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\exposed_form\Basic.
+ * Contains \Drupal\views\Plugin\views\exposed_form\Basic.
  */
 
 namespace Drupal\views\Plugin\views\exposed_form;
diff --git a/core/modules/views/src/Plugin/views/exposed_form/InputRequired.php b/core/modules/views/src/Plugin/views/exposed_form/InputRequired.php
index f6ab6bcfbc9e1897919b50bb4503a707d00bc2e1..110115a925d3074b89bb00d9ae3771bea2f221f1 100644
--- a/core/modules/views/src/Plugin/views/exposed_form/InputRequired.php
+++ b/core/modules/views/src/Plugin/views/exposed_form/InputRequired.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\exposed_form\InputRequired.
+ * Contains \Drupal\views\Plugin\views\exposed_form\InputRequired.
  */
 
 namespace Drupal\views\Plugin\views\exposed_form;
diff --git a/core/modules/views/src/Plugin/views/field/Boolean.php b/core/modules/views/src/Plugin/views/field/Boolean.php
index 94dc6797074315ee297180ad5cee5b53cf664585..28a40fdcc60b4b2e7e0333a6dfaebe46f18b16e6 100644
--- a/core/modules/views/src/Plugin/views/field/Boolean.php
+++ b/core/modules/views/src/Plugin/views/field/Boolean.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\field\Boolean.
+ * Contains \Drupal\views\Plugin\views\field\Boolean.
  */
 
 namespace Drupal\views\Plugin\views\field;
diff --git a/core/modules/views/src/Plugin/views/field/Broken.php b/core/modules/views/src/Plugin/views/field/Broken.php
index dea772e1eb893cdd3a8c1ee09d0e11f93d3f15d0..d5c2f57fe6493cb02f2d0d27301df6b9c2be6002 100644
--- a/core/modules/views/src/Plugin/views/field/Broken.php
+++ b/core/modules/views/src/Plugin/views/field/Broken.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\field\Broken.
+ * Contains \Drupal\views\Plugin\views\field\Broken.
  */
 
 namespace Drupal\views\Plugin\views\field;
diff --git a/core/modules/views/src/Plugin/views/field/Counter.php b/core/modules/views/src/Plugin/views/field/Counter.php
index 0dc9884ea96a8577d9db7511f7a0a6a7c7502861..aba51d5edff85cf73b2a35e3c404ae2bcfaeef00 100644
--- a/core/modules/views/src/Plugin/views/field/Counter.php
+++ b/core/modules/views/src/Plugin/views/field/Counter.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\field\Counter.
+ * Contains \Drupal\views\Plugin\views\field\Counter.
  */
 
 namespace Drupal\views\Plugin\views\field;
diff --git a/core/modules/views/src/Plugin/views/field/Custom.php b/core/modules/views/src/Plugin/views/field/Custom.php
index fe21dc27dbe7fc2d04903034aab21cd0cebcb74f..4696cd6b30251eef486c48f553359b49b9dc05ed 100644
--- a/core/modules/views/src/Plugin/views/field/Custom.php
+++ b/core/modules/views/src/Plugin/views/field/Custom.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\field\Custom.
+ * Contains \Drupal\views\Plugin\views\field\Custom.
  */
 
 namespace Drupal\views\Plugin\views\field;
diff --git a/core/modules/views/src/Plugin/views/field/Date.php b/core/modules/views/src/Plugin/views/field/Date.php
index 2a7886a5396be3a4de37e5a7008c41bffeac5aa6..340518ca5da1232fee475cce015f7cc5251b98a4 100644
--- a/core/modules/views/src/Plugin/views/field/Date.php
+++ b/core/modules/views/src/Plugin/views/field/Date.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\field\Date.
+ * Contains \Drupal\views\Plugin\views\field\Date.
  */
 
 namespace Drupal\views\Plugin\views\field;
diff --git a/core/modules/views/src/Plugin/views/field/FieldHandlerInterface.php b/core/modules/views/src/Plugin/views/field/FieldHandlerInterface.php
index 218126419f066478b62e909053d5238d1fecf74c..6cd22acd950c78b4ccc11e1ab9917e3e51252fee 100644
--- a/core/modules/views/src/Plugin/views/field/FieldHandlerInterface.php
+++ b/core/modules/views/src/Plugin/views/field/FieldHandlerInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\views\Plugin\views\Field\FieldHandlerInterface
+ * Contains \Drupal\views\Plugin\views\field\FieldHandlerInterface.
  */
 
 namespace Drupal\views\Plugin\views\field;
diff --git a/core/modules/views/src/Plugin/views/field/FileSize.php b/core/modules/views/src/Plugin/views/field/FileSize.php
index 92a1e1f33a1206012274477980b62f71bdf7fc05..25a6f9b3fd8512d9925e5c1a23f127aa21b85754 100644
--- a/core/modules/views/src/Plugin/views/field/FileSize.php
+++ b/core/modules/views/src/Plugin/views/field/FileSize.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\field\FileSize.
+ * Contains \Drupal\views\Plugin\views\field\FileSize.
  */
 
 namespace Drupal\views\Plugin\views\field;
diff --git a/core/modules/views/src/Plugin/views/field/LanguageField.php b/core/modules/views/src/Plugin/views/field/LanguageField.php
index bbc28ef3767d0b5f1bef9e6dd7a4bc5f8141f5fd..4f08211d8a4f36038a1569128640ba7c7447fc20 100644
--- a/core/modules/views/src/Plugin/views/field/LanguageField.php
+++ b/core/modules/views/src/Plugin/views/field/LanguageField.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\views\Plugin\views\field\LanguageField.
+ * Contains \Drupal\views\Plugin\views\field\LanguageField.
  */
 
 namespace Drupal\views\Plugin\views\field;
diff --git a/core/modules/views/src/Plugin/views/field/MachineName.php b/core/modules/views/src/Plugin/views/field/MachineName.php
index feaffb30d37f603e09b4bca22f65f174fc3c0c14..0c289cddce57bae925e2b8a51f41f2092362e225 100644
--- a/core/modules/views/src/Plugin/views/field/MachineName.php
+++ b/core/modules/views/src/Plugin/views/field/MachineName.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\field\MachineName.
+ * Contains \Drupal\views\Plugin\views\field\MachineName.
  */
 
 namespace Drupal\views\Plugin\views\field;
diff --git a/core/modules/views/src/Plugin/views/field/Markup.php b/core/modules/views/src/Plugin/views/field/Markup.php
index f0fee24d389eb1de7ec54841f8e81ec72d841cd3..aa275ccede1db96518c673f6332727ad25e71ac7 100644
--- a/core/modules/views/src/Plugin/views/field/Markup.php
+++ b/core/modules/views/src/Plugin/views/field/Markup.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\field\Markup.
+ * Contains \Drupal\views\Plugin\views\field\Markup.
  */
 
 namespace Drupal\views\Plugin\views\field;
diff --git a/core/modules/views/src/Plugin/views/field/PrerenderList.php b/core/modules/views/src/Plugin/views/field/PrerenderList.php
index 38a4b1edb6ed624c9b00bf9380e320e5bdda01bb..ce0caee45d96cace53e4a70b2ad83db78c488c52 100644
--- a/core/modules/views/src/Plugin/views/field/PrerenderList.php
+++ b/core/modules/views/src/Plugin/views/field/PrerenderList.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\field\PrerenderList.
+ * Contains \Drupal\views\Plugin\views\field\PrerenderList.
  */
 
 namespace Drupal\views\Plugin\views\field;
diff --git a/core/modules/views/src/Plugin/views/field/Serialized.php b/core/modules/views/src/Plugin/views/field/Serialized.php
index cc04113eaff96ba9f9e1b26b6a7dce57a0c24d93..f7f5a222842f9f2198d920a4f1db1838427f6beb 100644
--- a/core/modules/views/src/Plugin/views/field/Serialized.php
+++ b/core/modules/views/src/Plugin/views/field/Serialized.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\field\Serialized.
+ * Contains \Drupal\views\Plugin\views\field\Serialized.
  */
 
 namespace Drupal\views\Plugin\views\field;
diff --git a/core/modules/views/src/Plugin/views/field/Standard.php b/core/modules/views/src/Plugin/views/field/Standard.php
index 11ecc6a460e90be5b1c02fb5c87b9129bd826b1e..e623eb50f38827c1fac36396972ac63a8e649168 100644
--- a/core/modules/views/src/Plugin/views/field/Standard.php
+++ b/core/modules/views/src/Plugin/views/field/Standard.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\field\Standard.
+ * Contains \Drupal\views\Plugin\views\field\Standard.
  */
 
 namespace Drupal\views\Plugin\views\field;
diff --git a/core/modules/views/src/Plugin/views/field/TimeInterval.php b/core/modules/views/src/Plugin/views/field/TimeInterval.php
index faf5fd6746266fbfe3d0290de14ff47f77030543..08ebef7351f63151fa3a3f9a676e66d1c90a907b 100644
--- a/core/modules/views/src/Plugin/views/field/TimeInterval.php
+++ b/core/modules/views/src/Plugin/views/field/TimeInterval.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\field\TimeInterval.
+ * Contains \Drupal\views\Plugin\views\field\TimeInterval.
  */
 
 namespace Drupal\views\Plugin\views\field;
diff --git a/core/modules/views/src/Plugin/views/field/Url.php b/core/modules/views/src/Plugin/views/field/Url.php
index b900dccb2053ca608133e2d8487c73b70659377d..f5da4dbb3e42b1af898d2cfb2d1cb7bfb0a1d141 100644
--- a/core/modules/views/src/Plugin/views/field/Url.php
+++ b/core/modules/views/src/Plugin/views/field/Url.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\field\Url.
+ * Contains \Drupal\views\Plugin\views\field\Url.
  */
 
 namespace Drupal\views\Plugin\views\field;
diff --git a/core/modules/views/src/Plugin/views/filter/BooleanOperator.php b/core/modules/views/src/Plugin/views/filter/BooleanOperator.php
index f1b65d116328cf8e093ea62a42426a6eb6586842..cd26297460f41a933aa889b15b0dd7a9f2cbee1c 100644
--- a/core/modules/views/src/Plugin/views/filter/BooleanOperator.php
+++ b/core/modules/views/src/Plugin/views/filter/BooleanOperator.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\filter\BooleanOperator.
+ * Contains \Drupal\views\Plugin\views\filter\BooleanOperator.
  */
 
 namespace Drupal\views\Plugin\views\filter;
diff --git a/core/modules/views/src/Plugin/views/filter/BooleanOperatorString.php b/core/modules/views/src/Plugin/views/filter/BooleanOperatorString.php
index c435886b101380a2b7d480732d5e7a394aea628c..31861baccff6f48d8869908daafcbd30cb47cb6a 100644
--- a/core/modules/views/src/Plugin/views/filter/BooleanOperatorString.php
+++ b/core/modules/views/src/Plugin/views/filter/BooleanOperatorString.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\filter\BooleanOperatorString.
+ * Contains \Drupal\views\Plugin\views\filter\BooleanOperatorString.
  */
 
 namespace Drupal\views\Plugin\views\filter;
diff --git a/core/modules/views/src/Plugin/views/filter/Broken.php b/core/modules/views/src/Plugin/views/filter/Broken.php
index be2e69616811a2ddac6d8857bed1cb40a35ea13c..82ee626ff2b359f644aac7c5a2c05617a01cb4f1 100644
--- a/core/modules/views/src/Plugin/views/filter/Broken.php
+++ b/core/modules/views/src/Plugin/views/filter/Broken.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\filter\Broken.
+ * Contains \Drupal\views\Plugin\views\filter\Broken.
  */
 
 namespace Drupal\views\Plugin\views\filter;
diff --git a/core/modules/views/src/Plugin/views/filter/Bundle.php b/core/modules/views/src/Plugin/views/filter/Bundle.php
index e2e2372d286c147d87ce9760532d08bb2f6252bc..e328dfc5544b5678dee950bd79b4116c6fdfb244 100644
--- a/core/modules/views/src/Plugin/views/filter/Bundle.php
+++ b/core/modules/views/src/Plugin/views/filter/Bundle.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of \Drupal\views\Plugin\views\filter\Bundle.
+ * Contains \Drupal\views\Plugin\views\filter\Bundle.
  */
 
 namespace Drupal\views\Plugin\views\filter;
diff --git a/core/modules/views/src/Plugin/views/filter/Combine.php b/core/modules/views/src/Plugin/views/filter/Combine.php
index 7ed5aea06f09a6ebe075d5788349dfe694ea4dcd..9c62fb38d962a6d141d954d9bc36aedc6a1b3c04 100644
--- a/core/modules/views/src/Plugin/views/filter/Combine.php
+++ b/core/modules/views/src/Plugin/views/filter/Combine.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\filter\Combine.
+ * Contains \Drupal\views\Plugin\views\filter\Combine.
  */
 
 namespace Drupal\views\Plugin\views\filter;
diff --git a/core/modules/views/src/Plugin/views/filter/Date.php b/core/modules/views/src/Plugin/views/filter/Date.php
index 84e4d3b63b7096faedb78a61bebbf79d8e766110..60dd6059010280c656029df359496e265b4c915c 100644
--- a/core/modules/views/src/Plugin/views/filter/Date.php
+++ b/core/modules/views/src/Plugin/views/filter/Date.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\filter\Date.
+ * Contains \Drupal\views\Plugin\views\filter\Date.
  */
 
 namespace Drupal\views\Plugin\views\filter;
diff --git a/core/modules/views/src/Plugin/views/filter/Equality.php b/core/modules/views/src/Plugin/views/filter/Equality.php
index 36070ae3fca027c1fb313bc86ee5d77fc92732ec..f6771295caa058c4564c7e3ada0ac065d16627c7 100644
--- a/core/modules/views/src/Plugin/views/filter/Equality.php
+++ b/core/modules/views/src/Plugin/views/filter/Equality.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\filter\Equality.
+ * Contains \Drupal\views\Plugin\views\filter\Equality.
  */
 
 namespace Drupal\views\Plugin\views\filter;
diff --git a/core/modules/views/src/Plugin/views/filter/GroupByNumeric.php b/core/modules/views/src/Plugin/views/filter/GroupByNumeric.php
index e7157a902d91f36cf1830ceec644e5ff2b098f99..656e7c8a615601aa82df553ae0dfcb756d8aa502 100644
--- a/core/modules/views/src/Plugin/views/filter/GroupByNumeric.php
+++ b/core/modules/views/src/Plugin/views/filter/GroupByNumeric.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\filter\GroupByNumeric.
+ * Contains \Drupal\views\Plugin\views\filter\GroupByNumeric.
  */
 
 namespace Drupal\views\Plugin\views\filter;
diff --git a/core/modules/views/src/Plugin/views/filter/InOperator.php b/core/modules/views/src/Plugin/views/filter/InOperator.php
index 19824c7172705cf1aeb2a817d61dcf6ac941bdf0..d08aa00979cf811c978847118976f5ff155ff972 100644
--- a/core/modules/views/src/Plugin/views/filter/InOperator.php
+++ b/core/modules/views/src/Plugin/views/filter/InOperator.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\filter\InOperator.
+ * Contains \Drupal\views\Plugin\views\filter\InOperator.
  */
 
 namespace Drupal\views\Plugin\views\filter;
diff --git a/core/modules/views/src/Plugin/views/filter/LanguageFilter.php b/core/modules/views/src/Plugin/views/filter/LanguageFilter.php
index 9396d0d8b4dc51213d5babfddb1204250478f30f..c42122c4ddea903ec8f9bdb528023c368188846a 100644
--- a/core/modules/views/src/Plugin/views/filter/LanguageFilter.php
+++ b/core/modules/views/src/Plugin/views/filter/LanguageFilter.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\views\Plugin\views\filter\LanguageFilter.
+ * Contains \Drupal\views\Plugin\views\filter\LanguageFilter.
  */
 
 namespace Drupal\views\Plugin\views\filter;
diff --git a/core/modules/views/src/Plugin/views/filter/ManyToOne.php b/core/modules/views/src/Plugin/views/filter/ManyToOne.php
index ee12a1f4ba2c1b50550ecee1c732697cff32c6d8..e9279918be3ef4fec6a8b6242d8e7487a3d8d207 100644
--- a/core/modules/views/src/Plugin/views/filter/ManyToOne.php
+++ b/core/modules/views/src/Plugin/views/filter/ManyToOne.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\filter\ManyToOne.
+ * Contains \Drupal\views\Plugin\views\filter\ManyToOne.
  */
 
 namespace Drupal\views\Plugin\views\filter;
diff --git a/core/modules/views/src/Plugin/views/filter/Standard.php b/core/modules/views/src/Plugin/views/filter/Standard.php
index a952184eb3d3cdf04fdd75415fa6eab4f76dc015..c327898ac87528587fb60f3a3c2b2ff71ec79082 100644
--- a/core/modules/views/src/Plugin/views/filter/Standard.php
+++ b/core/modules/views/src/Plugin/views/filter/Standard.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\filter\Standard.
+ * Contains \Drupal\views\Plugin\views\filter\Standard.
  */
 
 namespace Drupal\views\Plugin\views\filter;
diff --git a/core/modules/views/src/Plugin/views/pager/Full.php b/core/modules/views/src/Plugin/views/pager/Full.php
index 3a522e8066effbda02eb80eead62ed208de5ef58..da1a0ec7b99e003987b2255b46c6a3c3988e4a15 100644
--- a/core/modules/views/src/Plugin/views/pager/Full.php
+++ b/core/modules/views/src/Plugin/views/pager/Full.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\pager\Full.
+ * Contains \Drupal\views\Plugin\views\pager\Full.
  */
 
 namespace Drupal\views\Plugin\views\pager;
diff --git a/core/modules/views/src/Plugin/views/pager/Mini.php b/core/modules/views/src/Plugin/views/pager/Mini.php
index b08c9d28500a65c236b96ada0aab77be11772924..6547242945728d18ee33b88c6a36b205805f7548 100644
--- a/core/modules/views/src/Plugin/views/pager/Mini.php
+++ b/core/modules/views/src/Plugin/views/pager/Mini.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\pager\Mini.
+ * Contains \Drupal\views\Plugin\views\pager\Mini.
  */
 
 namespace Drupal\views\Plugin\views\pager;
diff --git a/core/modules/views/src/Plugin/views/pager/None.php b/core/modules/views/src/Plugin/views/pager/None.php
index b36403264534fdba87ed9f14a391502231c7af5a..e64107eb9e48162c704661d0ad1cbc769483fc0a 100644
--- a/core/modules/views/src/Plugin/views/pager/None.php
+++ b/core/modules/views/src/Plugin/views/pager/None.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\pager\None.
+ * Contains \Drupal\views\Plugin\views\pager\None.
  */
 
 namespace Drupal\views\Plugin\views\pager;
diff --git a/core/modules/views/src/Plugin/views/pager/Some.php b/core/modules/views/src/Plugin/views/pager/Some.php
index 125fc3cfa8b6f2660109cc53fd05f9a3b72c205f..297fdd6d9940350303d9e11290f7e94b2794d5c5 100644
--- a/core/modules/views/src/Plugin/views/pager/Some.php
+++ b/core/modules/views/src/Plugin/views/pager/Some.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\pager\Some.
+ * Contains \Drupal\views\Plugin\views\pager\Some.
  */
 
 namespace Drupal\views\Plugin\views\pager;
diff --git a/core/modules/views/src/Plugin/views/pager/SqlBase.php b/core/modules/views/src/Plugin/views/pager/SqlBase.php
index 4eda114f3296ed057a4fa5327b1b574420f4c4b9..b2d73892483db7d824b466bf813c7f66f579cd33 100644
--- a/core/modules/views/src/Plugin/views/pager/SqlBase.php
+++ b/core/modules/views/src/Plugin/views/pager/SqlBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\views\Plugin\views\pager\SqlBase
+ * Contains \Drupal\views\Plugin\views\pager\SqlBase.
  */
 
 namespace Drupal\views\Plugin\views\pager;
diff --git a/core/modules/views/src/Plugin/views/query/QueryPluginBase.php b/core/modules/views/src/Plugin/views/query/QueryPluginBase.php
index 857c0c7cb4ad069ce636875da3eb8c2992f1834e..0d6d9f86286c3192ffaa9e6f4876b6fc187d5794 100644
--- a/core/modules/views/src/Plugin/views/query/QueryPluginBase.php
+++ b/core/modules/views/src/Plugin/views/query/QueryPluginBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\query\QueryPluginBase.
+ * Contains \Drupal\views\Plugin\views\query\QueryPluginBase.
  */
 
 namespace Drupal\views\Plugin\views\query;
diff --git a/core/modules/views/src/Plugin/views/relationship/Broken.php b/core/modules/views/src/Plugin/views/relationship/Broken.php
index f07483233a03822f1e57ef68c73ba33cef3a3a50..5b9484cfab37895b27f0ac3fcb42f7863b6acbac 100644
--- a/core/modules/views/src/Plugin/views/relationship/Broken.php
+++ b/core/modules/views/src/Plugin/views/relationship/Broken.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\relationship\Broken.
+ * Contains \Drupal\views\Plugin\views\relationship\Broken.
  */
 
 namespace Drupal\views\Plugin\views\relationship;
diff --git a/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php b/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php
index 6d044677a41fbe5cc57ce51d109e4233159623eb..52b1ff70956cdaad5e090caf28f0caf69ddcb779 100644
--- a/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php
+++ b/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\relationship\GroupwiseMax.
+ * Contains \Drupal\views\Plugin\views\relationship\GroupwiseMax.
  */
 
 namespace Drupal\views\Plugin\views\relationship;
diff --git a/core/modules/views/src/Plugin/views/relationship/Standard.php b/core/modules/views/src/Plugin/views/relationship/Standard.php
index e4c51fbc107aa7009734fdb8bffecee83535a952..105d00c8beba4ea724f3dbd0e33076816932f941 100644
--- a/core/modules/views/src/Plugin/views/relationship/Standard.php
+++ b/core/modules/views/src/Plugin/views/relationship/Standard.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\relationship\Standard.
+ * Contains \Drupal\views\Plugin\views\relationship\Standard.
  */
 
 namespace Drupal\views\Plugin\views\relationship;
diff --git a/core/modules/views/src/Plugin/views/row/Fields.php b/core/modules/views/src/Plugin/views/row/Fields.php
index 69d96ec2ea2decc550c371f183d596ab85820b64..e1751f84650d238d0b6788d5862e776197d6b371 100644
--- a/core/modules/views/src/Plugin/views/row/Fields.php
+++ b/core/modules/views/src/Plugin/views/row/Fields.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\row\Fields.
+ * Contains \Drupal\views\Plugin\views\row\Fields.
  */
 
 namespace Drupal\views\Plugin\views\row;
diff --git a/core/modules/views/src/Plugin/views/row/RssFields.php b/core/modules/views/src/Plugin/views/row/RssFields.php
index 1d1e48c67aa029373422cb3b02f8cef53866a99a..25a75d1da0034ec0efcbb4ce16de204c9025e25b 100644
--- a/core/modules/views/src/Plugin/views/row/RssFields.php
+++ b/core/modules/views/src/Plugin/views/row/RssFields.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\row\RssFields.
+ * Contains \Drupal\views\Plugin\views\row\RssFields.
  */
 
 namespace Drupal\views\Plugin\views\row;
diff --git a/core/modules/views/src/Plugin/views/row/RssPluginBase.php b/core/modules/views/src/Plugin/views/row/RssPluginBase.php
index ed1e5b959128f8f0c7c7297961357292f9ad3daa..a72b3133d981e83beedd0dd456463b98ca147bae 100644
--- a/core/modules/views/src/Plugin/views/row/RssPluginBase.php
+++ b/core/modules/views/src/Plugin/views/row/RssPluginBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\node\Plugin\views\row\RssPluginBase.
+ * Contains \Drupal\views\Plugin\views\row\RssPluginBase.
  */
 
 namespace Drupal\views\Plugin\views\row;
diff --git a/core/modules/views/src/Plugin/views/sort/Broken.php b/core/modules/views/src/Plugin/views/sort/Broken.php
index 509f327de4dc6ceb0bbad6f638db2893db3aa6be..163da4e7de2e058675c040edf8bf7cd75e11c0b6 100644
--- a/core/modules/views/src/Plugin/views/sort/Broken.php
+++ b/core/modules/views/src/Plugin/views/sort/Broken.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\sort\Broken.
+ * Contains \Drupal\views\Plugin\views\sort\Broken.
  */
 
 namespace Drupal\views\Plugin\views\sort;
diff --git a/core/modules/views/src/Plugin/views/sort/Date.php b/core/modules/views/src/Plugin/views/sort/Date.php
index 090aff918d3140233ec5d819a238b52bc6360a2b..9f9d8bfca3cda0fd71667ad1a33670f63595eca9 100644
--- a/core/modules/views/src/Plugin/views/sort/Date.php
+++ b/core/modules/views/src/Plugin/views/sort/Date.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\sort\Date.
+ * Contains \Drupal\views\Plugin\views\sort\Date.
  */
 
 namespace Drupal\views\Plugin\views\sort;
diff --git a/core/modules/views/src/Plugin/views/sort/GroupByNumeric.php b/core/modules/views/src/Plugin/views/sort/GroupByNumeric.php
index 538f16baa3f3aa83615ff1d6f4f1a80a1e193f71..974a91e2056d31893588d27573e81b897ed6e357 100644
--- a/core/modules/views/src/Plugin/views/sort/GroupByNumeric.php
+++ b/core/modules/views/src/Plugin/views/sort/GroupByNumeric.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\sort\GroupByNumeric.
+ * Contains \Drupal\views\Plugin\views\sort\GroupByNumeric.
  */
 
 namespace Drupal\views\Plugin\views\sort;
diff --git a/core/modules/views/src/Plugin/views/sort/Random.php b/core/modules/views/src/Plugin/views/sort/Random.php
index 6f682e5df0b3c1d3d7822af9b90b4916bd57a04b..9d8fdbbdb76c8791e915da989ed09e2b3b0b8681 100644
--- a/core/modules/views/src/Plugin/views/sort/Random.php
+++ b/core/modules/views/src/Plugin/views/sort/Random.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\sort\Random.
+ * Contains \Drupal\views\Plugin\views\sort\Random.
  */
 
 namespace Drupal\views\Plugin\views\sort;
diff --git a/core/modules/views/src/Plugin/views/sort/Standard.php b/core/modules/views/src/Plugin/views/sort/Standard.php
index b779f9308d619ce7f291bd660a9024825524dcba..7a78a329d99e30325fd380f723ec52cc6be69efe 100644
--- a/core/modules/views/src/Plugin/views/sort/Standard.php
+++ b/core/modules/views/src/Plugin/views/sort/Standard.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\sort\Standard.
+ * Contains \Drupal\views\Plugin\views\sort\Standard.
  */
 
 namespace Drupal\views\Plugin\views\sort;
diff --git a/core/modules/views/src/Plugin/views/style/DefaultStyle.php b/core/modules/views/src/Plugin/views/style/DefaultStyle.php
index e315c1c0c0f83a3f0b4add9a453613c202d807b2..d0fc4fd951a747a6141f81147ab679ef0d6c71fd 100644
--- a/core/modules/views/src/Plugin/views/style/DefaultStyle.php
+++ b/core/modules/views/src/Plugin/views/style/DefaultStyle.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\style\DefaultStyle.
+ * Contains \Drupal\views\Plugin\views\style\DefaultStyle.
  */
 
 namespace Drupal\views\Plugin\views\style;
diff --git a/core/modules/views/src/Plugin/views/style/DefaultSummary.php b/core/modules/views/src/Plugin/views/style/DefaultSummary.php
index f81c9a133dec2e1f9ad3ce10790d3cf0ded30c37..63cf9dc5b6d86fbf41e0e6156413dfc12f80c971 100644
--- a/core/modules/views/src/Plugin/views/style/DefaultSummary.php
+++ b/core/modules/views/src/Plugin/views/style/DefaultSummary.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\style\StyleSummaryPluginBase.
+ * Contains \Drupal\views\Plugin\views\style\DefaultSummary.
  */
 
 namespace Drupal\views\Plugin\views\style;
diff --git a/core/modules/views/src/Plugin/views/style/Grid.php b/core/modules/views/src/Plugin/views/style/Grid.php
index a09803b0f37237cfc447abf233e7b388ea9cae86..3cd2ecd60da2cd5b667d3f7c083171fbf244c6ef 100644
--- a/core/modules/views/src/Plugin/views/style/Grid.php
+++ b/core/modules/views/src/Plugin/views/style/Grid.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\style\Grid.
+ * Contains \Drupal\views\Plugin\views\style\Grid.
  */
 
 namespace Drupal\views\Plugin\views\style;
diff --git a/core/modules/views/src/Plugin/views/style/HtmlList.php b/core/modules/views/src/Plugin/views/style/HtmlList.php
index d965792700147690a953b08d631954f7b0595595..59d606d325b09aa10bd798505dcc00bf6c7fe744 100644
--- a/core/modules/views/src/Plugin/views/style/HtmlList.php
+++ b/core/modules/views/src/Plugin/views/style/HtmlList.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\style\List.
+ * Contains \Drupal\views\Plugin\views\style\HtmlList.
  */
 
 namespace Drupal\views\Plugin\views\style;
diff --git a/core/modules/views/src/Plugin/views/style/Mapping.php b/core/modules/views/src/Plugin/views/style/Mapping.php
index 4644196960dfe5dc56373bd221516b57df262933..e4823e61675f763270e4baadb87ef5219ff736eb 100644
--- a/core/modules/views/src/Plugin/views/style/Mapping.php
+++ b/core/modules/views/src/Plugin/views/style/Mapping.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\style\Mapping.
+ * Contains \Drupal\views\Plugin\views\style\Mapping.
  */
 
 namespace Drupal\views\Plugin\views\style;
diff --git a/core/modules/views/src/Plugin/views/style/Rss.php b/core/modules/views/src/Plugin/views/style/Rss.php
index de0bce7e0387f2cc3015a46e24c716b843451a8c..99c8bd806a7975390a04b1914854c81ca35a57e2 100644
--- a/core/modules/views/src/Plugin/views/style/Rss.php
+++ b/core/modules/views/src/Plugin/views/style/Rss.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\style\Rss.
+ * Contains \Drupal\views\Plugin\views\style\Rss.
  */
 
 namespace Drupal\views\Plugin\views\style;
diff --git a/core/modules/views/src/Plugin/views/style/Table.php b/core/modules/views/src/Plugin/views/style/Table.php
index 3089703f9d58e2fab9e6d221cdd2ccb106af9d34..4efeda2e6a47bbc641c489da0cf94c8fdb3c7666 100644
--- a/core/modules/views/src/Plugin/views/style/Table.php
+++ b/core/modules/views/src/Plugin/views/style/Table.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\style\Table.
+ * Contains \Drupal\views\Plugin\views\style\Table.
  */
 
 namespace Drupal\views\Plugin\views\style;
diff --git a/core/modules/views/src/Plugin/views/style/UnformattedSummary.php b/core/modules/views/src/Plugin/views/style/UnformattedSummary.php
index 4d5d3bd82190e41da20a52669e05631133a366e0..3fef19f90c424d573f9539ba2466a9ebd571e97b 100644
--- a/core/modules/views/src/Plugin/views/style/UnformattedSummary.php
+++ b/core/modules/views/src/Plugin/views/style/UnformattedSummary.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\style\UnformattedSummary.
+ * Contains \Drupal\views\Plugin\views\style\UnformattedSummary.
  */
 
 namespace Drupal\views\Plugin\views\style;
diff --git a/core/modules/views/src/Plugin/views/wizard/Standard.php b/core/modules/views/src/Plugin/views/wizard/Standard.php
index 6683adced1ed0a02046f2367a87529c48d4b1bfc..1b40ea0e2445f127be60164be30ee89dc219f251 100644
--- a/core/modules/views/src/Plugin/views/wizard/Standard.php
+++ b/core/modules/views/src/Plugin/views/wizard/Standard.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\wizard\Standard.
+ * Contains \Drupal\views\Plugin\views\wizard\Standard.
  */
 
 namespace Drupal\views\Plugin\views\wizard;
diff --git a/core/modules/views/src/Plugin/views/wizard/WizardException.php b/core/modules/views/src/Plugin/views/wizard/WizardException.php
index 2c188da9e5fcec25e83f7116d0699a4914fddcf2..4d5bc9434bb9e1f9133d9837bbf0d4e3935cc419 100644
--- a/core/modules/views/src/Plugin/views/wizard/WizardException.php
+++ b/core/modules/views/src/Plugin/views/wizard/WizardException.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\wizard\WizardException.
+ * Contains \Drupal\views\Plugin\views\wizard\WizardException.
  */
 
 namespace Drupal\views\Plugin\views\wizard;
diff --git a/core/modules/views/src/Tests/BasicTest.php b/core/modules/views/src/Tests/BasicTest.php
index aafa3f43b120bda10d1c441a55af48e527a98b9f..42d622fb5358aecbd13106ba95f58224d8ab48f8 100644
--- a/core/modules/views/src/Tests/BasicTest.php
+++ b/core/modules/views/src/Tests/BasicTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\BasicTest.
+ * Contains \Drupal\views\Tests\BasicTest.
  */
 
 namespace Drupal\views\Tests;
diff --git a/core/modules/views/src/Tests/DefaultViewsTest.php b/core/modules/views/src/Tests/DefaultViewsTest.php
index 4ef50916c85e1086e0c1b3f94e62d1fc83a40c56..3df40822dea89a9d578ffdc32eae91670bfb2fef 100644
--- a/core/modules/views/src/Tests/DefaultViewsTest.php
+++ b/core/modules/views/src/Tests/DefaultViewsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\DefaultViewsTest.
+ * Contains \Drupal\views\Tests\DefaultViewsTest.
  */
 
 namespace Drupal\views\Tests;
diff --git a/core/modules/views/src/Tests/Entity/FieldEntityTest.php b/core/modules/views/src/Tests/Entity/FieldEntityTest.php
index 404434f1a5d1bfe3e58caa96679008c045e06e52..7790bd57e3a9168e1422e83332629d36986ca0ff 100644
--- a/core/modules/views/src/Tests/Entity/FieldEntityTest.php
+++ b/core/modules/views/src/Tests/Entity/FieldEntityTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Entity\FieldEntityTest.
+ * Contains \Drupal\views\Tests\Entity\FieldEntityTest.
  */
 
 namespace Drupal\views\Tests\Entity;
diff --git a/core/modules/views/src/Tests/GlossaryTest.php b/core/modules/views/src/Tests/GlossaryTest.php
index 9b1275927f6fd5d0849a728f7b7e41d23ed0e3fd..7d55f85e3ec04678a896cb559e3408820f2704ad 100644
--- a/core/modules/views/src/Tests/GlossaryTest.php
+++ b/core/modules/views/src/Tests/GlossaryTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\GlossaryTest.
+ * Contains \Drupal\views\Tests\GlossaryTest.
  */
 
 namespace Drupal\views\Tests;
diff --git a/core/modules/views/src/Tests/Handler/AreaTest.php b/core/modules/views/src/Tests/Handler/AreaTest.php
index bdc1e4873a34582895ebc1f863e6f0cfc5bf17c3..de41c3d9b18775fa8c61b7341e4bdfeb66baeea8 100644
--- a/core/modules/views/src/Tests/Handler/AreaTest.php
+++ b/core/modules/views/src/Tests/Handler/AreaTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Handler\AreaTest.
+ * Contains \Drupal\views\Tests\Handler\AreaTest.
  */
 
 namespace Drupal\views\Tests\Handler;
diff --git a/core/modules/views/src/Tests/Handler/AreaTextTest.php b/core/modules/views/src/Tests/Handler/AreaTextTest.php
index e37f2a2a795c80c45b8effc472389afc0305bdbc..7fa5c13171237441ac328748a6fed27dab9f945b 100644
--- a/core/modules/views/src/Tests/Handler/AreaTextTest.php
+++ b/core/modules/views/src/Tests/Handler/AreaTextTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Handler\AreaTextTest.
+ * Contains \Drupal\views\Tests\Handler\AreaTextTest.
  */
 
 namespace Drupal\views\Tests\Handler;
diff --git a/core/modules/views/src/Tests/Handler/ArgumentNullTest.php b/core/modules/views/src/Tests/Handler/ArgumentNullTest.php
index 3e078bf81f4c75f41de55254df43090201b42f8a..b366d00bc5c719b4e4e69f6cd1f3074c72101aac 100644
--- a/core/modules/views/src/Tests/Handler/ArgumentNullTest.php
+++ b/core/modules/views/src/Tests/Handler/ArgumentNullTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Handler\ArgumentNullTest.
+ * Contains \Drupal\views\Tests\Handler\ArgumentNullTest.
  */
 
 namespace Drupal\views\Tests\Handler;
diff --git a/core/modules/views/src/Tests/Handler/ArgumentStringTest.php b/core/modules/views/src/Tests/Handler/ArgumentStringTest.php
index 4b5b9feb7acd8783f01447c7578032f72367c799..8d3792302db0c6ba0d5688468e8060d750c0ad64 100644
--- a/core/modules/views/src/Tests/Handler/ArgumentStringTest.php
+++ b/core/modules/views/src/Tests/Handler/ArgumentStringTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Handler\ArgumentStringTest.
+ * Contains \Drupal\views\Tests\Handler\ArgumentStringTest.
  */
 
 namespace Drupal\views\Tests\Handler;
diff --git a/core/modules/views/src/Tests/Handler/FieldBooleanTest.php b/core/modules/views/src/Tests/Handler/FieldBooleanTest.php
index 27b8165d6c1ef063e813313df72b1ed5ecb40155..38c6a531234fd62179c54e9a0515696b0bc465bf 100644
--- a/core/modules/views/src/Tests/Handler/FieldBooleanTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldBooleanTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Handler\FieldBooleanTest.
+ * Contains \Drupal\views\Tests\Handler\FieldBooleanTest.
  */
 
 namespace Drupal\views\Tests\Handler;
diff --git a/core/modules/views/src/Tests/Handler/FieldCounterTest.php b/core/modules/views/src/Tests/Handler/FieldCounterTest.php
index fd17ffd902f68a2c26034661da14d58f110e4877..4d1eac1fd5cb8afb7ca64f7c9f121740b1aeae5d 100644
--- a/core/modules/views/src/Tests/Handler/FieldCounterTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldCounterTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Handler\FieldCounterTest.
+ * Contains \Drupal\views\Tests\Handler\FieldCounterTest.
  */
 
 namespace Drupal\views\Tests\Handler;
diff --git a/core/modules/views/src/Tests/Handler/FieldCustomTest.php b/core/modules/views/src/Tests/Handler/FieldCustomTest.php
index b6ffa2bda838da575926e9b0987ba0b05f5dad21..4ea1d9d0144d949331736e77464db62bf3a1f523 100644
--- a/core/modules/views/src/Tests/Handler/FieldCustomTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldCustomTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Handler\FieldCustomTest.
+ * Contains \Drupal\views\Tests\Handler\FieldCustomTest.
  */
 
 namespace Drupal\views\Tests\Handler;
diff --git a/core/modules/views/src/Tests/Handler/FieldDateTest.php b/core/modules/views/src/Tests/Handler/FieldDateTest.php
index 98eae40a01735f5ff275f533103a864e9cb13db3..58086d503eb41cf225a40f43cf119e7390f8f5cf 100644
--- a/core/modules/views/src/Tests/Handler/FieldDateTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldDateTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Handler\FieldDateTest.
+ * Contains \Drupal\views\Tests\Handler\FieldDateTest.
  */
 
 namespace Drupal\views\Tests\Handler;
diff --git a/core/modules/views/src/Tests/Handler/FieldEntityOperationsTest.php b/core/modules/views/src/Tests/Handler/FieldEntityOperationsTest.php
index cdc2da560c25b0a51998d2d714dbe665eaa50b8d..990c4c4da9c1b0c2ac1bd55bb558035b19f5ac37 100644
--- a/core/modules/views/src/Tests/Handler/FieldEntityOperationsTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldEntityOperationsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of \Drupal\views\Tests\Handler\FieldEntityOperationsTest.
+ * Contains \Drupal\views\Tests\Handler\FieldEntityOperationsTest.
  */
 
 namespace Drupal\views\Tests\Handler;
diff --git a/core/modules/views/src/Tests/Handler/FieldFieldAccessTestBase.php b/core/modules/views/src/Tests/Handler/FieldFieldAccessTestBase.php
index 09b397da28d0e4dec057ce9ca960ffca0681a214..9ab720b980844e352e7521d52e75e6e8ac2912a4 100644
--- a/core/modules/views/src/Tests/Handler/FieldFieldAccessTestBase.php
+++ b/core/modules/views/src/Tests/Handler/FieldFieldAccessTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\Handler\FieldFieldAccessTest.
+ * Contains \Drupal\views\Tests\Handler\FieldFieldAccessTestBase.
  */
 
 namespace Drupal\views\Tests\Handler;
diff --git a/core/modules/views/src/Tests/Handler/FieldFieldTest.php b/core/modules/views/src/Tests/Handler/FieldFieldTest.php
index fd0da5211d690066549c8fc2e369f4f40e4374c9..8ad0bd14ba4e22bbc583cda3eb7582ba24d9ae6a 100644
--- a/core/modules/views/src/Tests/Handler/FieldFieldTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldFieldTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\views\Tests\Handler\FieldFieldTest.
+ * Contains \Drupal\views\Tests\Handler\FieldFieldTest.
  */
 
 namespace Drupal\views\Tests\Handler;
diff --git a/core/modules/views/src/Tests/Handler/FieldFileSizeTest.php b/core/modules/views/src/Tests/Handler/FieldFileSizeTest.php
index 78e77a0e130ba07f576eef2c9aa4d4b443c02f2a..c2c9af57328dc8a495c49047cf0729806db1f6d2 100644
--- a/core/modules/views/src/Tests/Handler/FieldFileSizeTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldFileSizeTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Handler\FieldFileSizeTest.
+ * Contains \Drupal\views\Tests\Handler\FieldFileSizeTest.
  */
 
 namespace Drupal\views\Tests\Handler;
diff --git a/core/modules/views/src/Tests/Handler/FieldGroupRowsTest.php b/core/modules/views/src/Tests/Handler/FieldGroupRowsTest.php
index 2aa0e9c482917a32bf7ff12e0aa83b41cb15e2b3..d318a796724fb37fd116087347bb524c11a5b815 100644
--- a/core/modules/views/src/Tests/Handler/FieldGroupRowsTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldGroupRowsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\views\Tests\Handler\FieldGroupRowsTest.
+ * Contains \Drupal\views\Tests\Handler\FieldGroupRowsTest.
  */
 
 namespace Drupal\views\Tests\Handler;
diff --git a/core/modules/views/src/Tests/Handler/FieldGroupRowsWebTest.php b/core/modules/views/src/Tests/Handler/FieldGroupRowsWebTest.php
index 39609340e6cc8e58a14a0c07497047a82342016a..c731f068535141abb213af6a5860637a22d412c7 100644
--- a/core/modules/views/src/Tests/Handler/FieldGroupRowsWebTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldGroupRowsWebTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\Handler\GroupRowsTest.
+ * Contains \Drupal\views\Tests\Handler\FieldGroupRowsWebTest.
  */
 
 namespace Drupal\views\Tests\Handler;
diff --git a/core/modules/views/src/Tests/Handler/FieldUrlTest.php b/core/modules/views/src/Tests/Handler/FieldUrlTest.php
index 67616caae2acf0bdffb135f1d3fd974d8048e2aa..3f3e5bbac51e1f585be6b699887375739660559d 100644
--- a/core/modules/views/src/Tests/Handler/FieldUrlTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldUrlTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Handler\FieldUrlTest.
+ * Contains \Drupal\views\Tests\Handler\FieldUrlTest.
  */
 
 namespace Drupal\views\Tests\Handler;
diff --git a/core/modules/views/src/Tests/Handler/FilterCombineTest.php b/core/modules/views/src/Tests/Handler/FilterCombineTest.php
index be5494603aaca3a46a68e42aabe16fca0ca05889..f8c749561c5153989d5ef24cd2b8f65a1db64fc1 100644
--- a/core/modules/views/src/Tests/Handler/FilterCombineTest.php
+++ b/core/modules/views/src/Tests/Handler/FilterCombineTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Handler\FilterCombineTest.
+ * Contains \Drupal\views\Tests\Handler\FilterCombineTest.
  */
 
 namespace Drupal\views\Tests\Handler;
diff --git a/core/modules/views/src/Tests/Handler/FilterDateTest.php b/core/modules/views/src/Tests/Handler/FilterDateTest.php
index 9a43a8bf52b6bf7a851444d9306d4e6549f7246f..a8590913364481d0aadb0d05f8c8ec3b00174ff9 100644
--- a/core/modules/views/src/Tests/Handler/FilterDateTest.php
+++ b/core/modules/views/src/Tests/Handler/FilterDateTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Handler\FilterDateTest.
+ * Contains \Drupal\views\Tests\Handler\FilterDateTest.
  */
 
 namespace Drupal\views\Tests\Handler;
diff --git a/core/modules/views/src/Tests/Handler/FilterEqualityTest.php b/core/modules/views/src/Tests/Handler/FilterEqualityTest.php
index 9223838c109154d482e113011c5c0b9d3f918e05..bda80ee3b2609ce999f12bcef0a39dfe3e9658ba 100644
--- a/core/modules/views/src/Tests/Handler/FilterEqualityTest.php
+++ b/core/modules/views/src/Tests/Handler/FilterEqualityTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Handler\FilterEqualityTest.
+ * Contains \Drupal\views\Tests\Handler\FilterEqualityTest.
  */
 
 namespace Drupal\views\Tests\Handler;
diff --git a/core/modules/views/src/Tests/Handler/FilterInOperatorTest.php b/core/modules/views/src/Tests/Handler/FilterInOperatorTest.php
index 89e471cd59732bb5228e0510955b9b6a6999c611..7f5609f301003f06b8db0b494bf12cf29bf43567 100644
--- a/core/modules/views/src/Tests/Handler/FilterInOperatorTest.php
+++ b/core/modules/views/src/Tests/Handler/FilterInOperatorTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Handler\FilterInOperatorTest.
+ * Contains \Drupal\views\Tests\Handler\FilterInOperatorTest.
  */
 
 namespace Drupal\views\Tests\Handler;
diff --git a/core/modules/views/src/Tests/Handler/FilterNumericTest.php b/core/modules/views/src/Tests/Handler/FilterNumericTest.php
index 66f9ff14426a85e78ff1095bc86e528ccba11a09..9396b3bdf414d037509d1eb31a74b572ea3472ba 100644
--- a/core/modules/views/src/Tests/Handler/FilterNumericTest.php
+++ b/core/modules/views/src/Tests/Handler/FilterNumericTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Handler\FilterNumericTest.
+ * Contains \Drupal\views\Tests\Handler\FilterNumericTest.
  */
 
 namespace Drupal\views\Tests\Handler;
diff --git a/core/modules/views/src/Tests/Handler/FilterStringTest.php b/core/modules/views/src/Tests/Handler/FilterStringTest.php
index 072497688ddc2a8c24b9a3644962634bd3d25638..1fe454dc833944d3088b539ba4cc14101d7b2ab4 100644
--- a/core/modules/views/src/Tests/Handler/FilterStringTest.php
+++ b/core/modules/views/src/Tests/Handler/FilterStringTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Handler\FilterStringTest.
+ * Contains \Drupal\views\Tests\Handler\FilterStringTest.
  */
 
 namespace Drupal\views\Tests\Handler;
diff --git a/core/modules/views/src/Tests/Handler/HandlerAliasTest.php b/core/modules/views/src/Tests/Handler/HandlerAliasTest.php
index 10f65b38d1e35b5bd36e9242e49c370a823aee1e..16318aa72cfdc27d5df58fefeea807727a2ab2f8 100644
--- a/core/modules/views/src/Tests/Handler/HandlerAliasTest.php
+++ b/core/modules/views/src/Tests/Handler/HandlerAliasTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Handler\HandlerAliasTest.
+ * Contains \Drupal\views\Tests\Handler\HandlerAliasTest.
  */
 
 namespace Drupal\views\Tests\Handler;
diff --git a/core/modules/views/src/Tests/Handler/HandlerAllTest.php b/core/modules/views/src/Tests/Handler/HandlerAllTest.php
index c4c64978ea1f407d356cc64c8fb963befee70035..84579a835e246caafaafcd649a159d2838f718b3 100644
--- a/core/modules/views/src/Tests/Handler/HandlerAllTest.php
+++ b/core/modules/views/src/Tests/Handler/HandlerAllTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Handler\HandlerAllTest.
+ * Contains \Drupal\views\Tests\Handler\HandlerAllTest.
  */
 
 namespace Drupal\views\Tests\Handler;
diff --git a/core/modules/views/src/Tests/Handler/HandlerTestBase.php b/core/modules/views/src/Tests/Handler/HandlerTestBase.php
index ce20f78f245ec586d28c41ce92feabab8e08760d..f7305b228bfacb686429a63c467cf24016c79e90 100644
--- a/core/modules/views/src/Tests/Handler/HandlerTestBase.php
+++ b/core/modules/views/src/Tests/Handler/HandlerTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Handler\HandlerTestBase.
+ * Contains \Drupal\views\Tests\Handler\HandlerTestBase.
  */
 
 namespace Drupal\views\Tests\Handler;
diff --git a/core/modules/views/src/Tests/Handler/RelationshipTest.php b/core/modules/views/src/Tests/Handler/RelationshipTest.php
index 36f608be338a8cabfd080bd4cae7d33d09ff5028..76b44970589cf505d60663d8effbde55bc8fbe6a 100644
--- a/core/modules/views/src/Tests/Handler/RelationshipTest.php
+++ b/core/modules/views/src/Tests/Handler/RelationshipTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Handler\RelationshipTest.
+ * Contains \Drupal\views\Tests\Handler\RelationshipTest.
  */
 
 namespace Drupal\views\Tests\Handler;
diff --git a/core/modules/views/src/Tests/Handler/SortDateTest.php b/core/modules/views/src/Tests/Handler/SortDateTest.php
index b8e11f17bc9868ee8bfc61d477c1209e87d6fe6c..371ba8d9510babf729b6144e3e59011fe26136ba 100644
--- a/core/modules/views/src/Tests/Handler/SortDateTest.php
+++ b/core/modules/views/src/Tests/Handler/SortDateTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Handler\SortDateTest.
+ * Contains \Drupal\views\Tests\Handler\SortDateTest.
  */
 
 namespace Drupal\views\Tests\Handler;
diff --git a/core/modules/views/src/Tests/Handler/SortRandomTest.php b/core/modules/views/src/Tests/Handler/SortRandomTest.php
index f18855891834667a29a7c28e6841932537197ef0..9c2c44b21b742edd31e3a7e8c95df1a2519a6c34 100644
--- a/core/modules/views/src/Tests/Handler/SortRandomTest.php
+++ b/core/modules/views/src/Tests/Handler/SortRandomTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Handler\SortRandomTest.
+ * Contains \Drupal\views\Tests\Handler\SortRandomTest.
  */
 
 namespace Drupal\views\Tests\Handler;
diff --git a/core/modules/views/src/Tests/Handler/SortTest.php b/core/modules/views/src/Tests/Handler/SortTest.php
index fc3be55687dd55df8ed47031d0edc7c24204f7ee..0a1d8c83077aae35ff6abe1135bde807658f6588 100644
--- a/core/modules/views/src/Tests/Handler/SortTest.php
+++ b/core/modules/views/src/Tests/Handler/SortTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Handler\SortTest.
+ * Contains \Drupal\views\Tests\Handler\SortTest.
  */
 
 namespace Drupal\views\Tests\Handler;
diff --git a/core/modules/views/src/Tests/ModuleTest.php b/core/modules/views/src/Tests/ModuleTest.php
index 04cb9cdbfbe0c2ed98a7c355c5e89b6f1d6ef7fd..f46749ec268f97ef828d051a233ef35cfaa965e3 100644
--- a/core/modules/views/src/Tests/ModuleTest.php
+++ b/core/modules/views/src/Tests/ModuleTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\ModuleTest.
+ * Contains \Drupal\views\Tests\ModuleTest.
  */
 
 namespace Drupal\views\Tests;
diff --git a/core/modules/views/src/Tests/Plugin/AccessTest.php b/core/modules/views/src/Tests/Plugin/AccessTest.php
index 208e60c6cb1832821f2efd9be02f4d8259cfdbfb..5ee6c98f89b6976a6219da5d9be1265455135115 100644
--- a/core/modules/views/src/Tests/Plugin/AccessTest.php
+++ b/core/modules/views/src/Tests/Plugin/AccessTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Plugin\AccessTest
+ * Contains \Drupal\views\Tests\Plugin\AccessTest.
  */
 
 namespace Drupal\views\Tests\Plugin;
diff --git a/core/modules/views/src/Tests/Plugin/ArgumentDefaultTest.php b/core/modules/views/src/Tests/Plugin/ArgumentDefaultTest.php
index 7499b316063240c532c2c88f6bf42b7d51f2af47..58dadf113df6e3ab901bb15cb986a41079108c1f 100644
--- a/core/modules/views/src/Tests/Plugin/ArgumentDefaultTest.php
+++ b/core/modules/views/src/Tests/Plugin/ArgumentDefaultTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Plugin\ArgumentDefaultTest.
+ * Contains \Drupal\views\Tests\Plugin\ArgumentDefaultTest.
  */
 
 namespace Drupal\views\Tests\Plugin;
diff --git a/core/modules/views/src/Tests/Plugin/ArgumentValidatorTest.php b/core/modules/views/src/Tests/Plugin/ArgumentValidatorTest.php
index 6a29a4e4e4a6f0fa3fec59eb4fcca68b726fdbaa..235635ae1b97b7c30a6c97ee04a6f91fca83376d 100644
--- a/core/modules/views/src/Tests/Plugin/ArgumentValidatorTest.php
+++ b/core/modules/views/src/Tests/Plugin/ArgumentValidatorTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Plugin\ArgumentValidatorTest.
+ * Contains \Drupal\views\Tests\Plugin\ArgumentValidatorTest.
  */
 
 namespace Drupal\views\Tests\Plugin;
diff --git a/core/modules/views/src/Tests/Plugin/CacheTest.php b/core/modules/views/src/Tests/Plugin/CacheTest.php
index bae30f5ed5a7359dc071f221e66a492ad2d1fec3..e628f8eb324b2898a9d49f02b5869d3a72a1fa08 100644
--- a/core/modules/views/src/Tests/Plugin/CacheTest.php
+++ b/core/modules/views/src/Tests/Plugin/CacheTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Plugin\CacheTest.
+ * Contains \Drupal\views\Tests\Plugin\CacheTest.
  */
 
 namespace Drupal\views\Tests\Plugin;
diff --git a/core/modules/views/src/Tests/Plugin/DisplayExtenderTest.php b/core/modules/views/src/Tests/Plugin/DisplayExtenderTest.php
index 7acdbe8f108965d3bf9c61dce65903c6a4bf58cf..37ce57def4fd18bb9b4711e9d7bb4784d74fab18 100644
--- a/core/modules/views/src/Tests/Plugin/DisplayExtenderTest.php
+++ b/core/modules/views/src/Tests/Plugin/DisplayExtenderTest.php
@@ -1,9 +1,9 @@
 <?php
 
-  /**
-   * @file
-   * Definition of Drupal\views\Tests\Plugin\DisplayExtenderTest.
-   */
+/**
+ * @file
+ * Contains \Drupal\views\Tests\Plugin\DisplayExtenderTest.
+ */
 
 namespace Drupal\views\Tests\Plugin;
 
diff --git a/core/modules/views/src/Tests/Plugin/FilterTest.php b/core/modules/views/src/Tests/Plugin/FilterTest.php
index a868359c99111b8f6f0e22ec38cecaf0686b3d4f..721b3fa33833d4cf67b3153bfc9603334162c585 100644
--- a/core/modules/views/src/Tests/Plugin/FilterTest.php
+++ b/core/modules/views/src/Tests/Plugin/FilterTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Plugin\FilterTest.
+ * Contains \Drupal\views\Tests\Plugin\FilterTest.
  */
 
 namespace Drupal\views\Tests\Plugin;
diff --git a/core/modules/views/src/Tests/Plugin/JoinTest.php b/core/modules/views/src/Tests/Plugin/JoinTest.php
index 2648cd0684e2c5c5025ef1de1f110bd9122eba7f..fa1460cbab1498e013274ec03e8c297a7fa64cd3 100644
--- a/core/modules/views/src/Tests/Plugin/JoinTest.php
+++ b/core/modules/views/src/Tests/Plugin/JoinTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Plugin\JoinTest.
+ * Contains \Drupal\views\Tests\Plugin\JoinTest.
  */
 
 namespace Drupal\views\Tests\Plugin;
diff --git a/core/modules/views/src/Tests/Plugin/MiniPagerTest.php b/core/modules/views/src/Tests/Plugin/MiniPagerTest.php
index f6f31c428ca04104e91f63f48f9c6b2be4bc8af0..9a89606daea175d948881d9fdbc1f4f6cfb9f482 100644
--- a/core/modules/views/src/Tests/Plugin/MiniPagerTest.php
+++ b/core/modules/views/src/Tests/Plugin/MiniPagerTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\views\Tests\Plugin\MiniPagerTest.
+ * Contains \Drupal\views\Tests\Plugin\MiniPagerTest.
  */
 
 namespace Drupal\views\Tests\Plugin;
diff --git a/core/modules/views/src/Tests/Plugin/PagerTest.php b/core/modules/views/src/Tests/Plugin/PagerTest.php
index d9c1eecb3dfa875812e91ecdf258f23dff7c69c2..4a75fdc5f355fb20f319f6f55ea472dfa748ced7 100644
--- a/core/modules/views/src/Tests/Plugin/PagerTest.php
+++ b/core/modules/views/src/Tests/Plugin/PagerTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Plugin\PagerTest.
+ * Contains \Drupal\views\Tests\Plugin\PagerTest.
  */
 
 namespace Drupal\views\Tests\Plugin;
diff --git a/core/modules/views/src/Tests/Plugin/PluginTestBase.php b/core/modules/views/src/Tests/Plugin/PluginTestBase.php
index 048690edaabfca36da8fb0d01c5aca9ddbf754cf..1e7100ca8470079b17d204afada5029d6d566182 100644
--- a/core/modules/views/src/Tests/Plugin/PluginTestBase.php
+++ b/core/modules/views/src/Tests/Plugin/PluginTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Plugin\PluginTestBase.
+ * Contains \Drupal\views\Tests\Plugin\PluginTestBase.
  */
 
 namespace Drupal\views\Tests\Plugin;
diff --git a/core/modules/views/src/Tests/Plugin/QueryTest.php b/core/modules/views/src/Tests/Plugin/QueryTest.php
index 7557faa6c6cef30ad6509c2eff607a7170b6b248..38ab1a032c1d9d425306f80e360222909765cab4 100644
--- a/core/modules/views/src/Tests/Plugin/QueryTest.php
+++ b/core/modules/views/src/Tests/Plugin/QueryTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Plugin\QueryTest.
+ * Contains \Drupal\views\Tests\Plugin\QueryTest.
  */
 
 namespace Drupal\views\Tests\Plugin;
diff --git a/core/modules/views/src/Tests/Plugin/StyleHtmlListTest.php b/core/modules/views/src/Tests/Plugin/StyleHtmlListTest.php
index 80243d12ea9bf887eba225d3871d8c8c903da35e..552a5b10fb2be64eb1128de10a053b6d5b85983d 100644
--- a/core/modules/views/src/Tests/Plugin/StyleHtmlListTest.php
+++ b/core/modules/views/src/Tests/Plugin/StyleHtmlListTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\views\Tests\Plugin\StyleHtmlListTest.
+ * Contains \Drupal\views\Tests\Plugin\StyleHtmlListTest.
  */
 
 namespace Drupal\views\Tests\Plugin;
diff --git a/core/modules/views/src/Tests/Plugin/StyleMappingTest.php b/core/modules/views/src/Tests/Plugin/StyleMappingTest.php
index 2712958f78f49a020b493968e522806c1539bf01..b6aeb0bfe28223e496f538724cfd958bf9da1995 100644
--- a/core/modules/views/src/Tests/Plugin/StyleMappingTest.php
+++ b/core/modules/views/src/Tests/Plugin/StyleMappingTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Plugin\StyleMappingTest.
+ * Contains \Drupal\views\Tests\Plugin\StyleMappingTest.
  */
 
 namespace Drupal\views\Tests\Plugin;
diff --git a/core/modules/views/src/Tests/Plugin/StyleTest.php b/core/modules/views/src/Tests/Plugin/StyleTest.php
index a0675c2f54983d49ddaee2d7e0bc9db284f3963c..112988c062c30405155879bcb9d1c3639b86d512 100644
--- a/core/modules/views/src/Tests/Plugin/StyleTest.php
+++ b/core/modules/views/src/Tests/Plugin/StyleTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Plugin\StyleTest.
+ * Contains \Drupal\views\Tests\Plugin\StyleTest.
  */
 
 namespace Drupal\views\Tests\Plugin;
diff --git a/core/modules/views/src/Tests/Plugin/StyleTestBase.php b/core/modules/views/src/Tests/Plugin/StyleTestBase.php
index b5f729c5395b54199903c07226d382ff8de557bc..2369d98e901ca5137e834c0d14173e91eb83bfe8 100644
--- a/core/modules/views/src/Tests/Plugin/StyleTestBase.php
+++ b/core/modules/views/src/Tests/Plugin/StyleTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Plugin\StyleTestBase.
+ * Contains \Drupal\views\Tests\Plugin\StyleTestBase.
  */
 
 namespace Drupal\views\Tests\Plugin;
diff --git a/core/modules/views/src/Tests/Plugin/StyleUnformattedTest.php b/core/modules/views/src/Tests/Plugin/StyleUnformattedTest.php
index 083a975bbd4399b4a8bc030f969a87afeaff8c72..40c534dc566a440821e4c8d3560da7bf8d4553e1 100644
--- a/core/modules/views/src/Tests/Plugin/StyleUnformattedTest.php
+++ b/core/modules/views/src/Tests/Plugin/StyleUnformattedTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Plugin\StyleUnformattedTest.
+ * Contains \Drupal\views\Tests\Plugin\StyleUnformattedTest.
  */
 
 namespace Drupal\views\Tests\Plugin;
diff --git a/core/modules/views/src/Tests/PluginInstanceTest.php b/core/modules/views/src/Tests/PluginInstanceTest.php
index 189399f65ec99a089357867b0bcab655ffcc6b7f..3c819fbfd00efe05c0a024d9059e86607dfcf72d 100644
--- a/core/modules/views/src/Tests/PluginInstanceTest.php
+++ b/core/modules/views/src/Tests/PluginInstanceTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\PluginInstanceTest.
+ * Contains \Drupal\views\Tests\PluginInstanceTest.
  */
 
 namespace Drupal\views\Tests;
diff --git a/core/modules/views/src/Tests/TestViewsTest.php b/core/modules/views/src/Tests/TestViewsTest.php
index ca869eab32c0bee5c289148418f2663a247cc526..5c2d544a6866641d8db2a4a43915d387fe7a0a24 100644
--- a/core/modules/views/src/Tests/TestViewsTest.php
+++ b/core/modules/views/src/Tests/TestViewsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\views\Tests\TestViewsTest.
+ * Contains \Drupal\views\Tests\TestViewsTest.
  */
 
 namespace Drupal\views\Tests;
diff --git a/core/modules/views/src/Tests/TokenReplaceTest.php b/core/modules/views/src/Tests/TokenReplaceTest.php
index d4bcc67bd4f103a3c09677aef1a3d6c567ec75b4..ad00b7ed11642a9e83d3463c5de4684d4e132666 100644
--- a/core/modules/views/src/Tests/TokenReplaceTest.php
+++ b/core/modules/views/src/Tests/TokenReplaceTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\TokenReplaceTest.
+ * Contains \Drupal\views\Tests\TokenReplaceTest.
  */
 
 namespace Drupal\views\Tests;
diff --git a/core/modules/views/src/Tests/ViewElementTest.php b/core/modules/views/src/Tests/ViewElementTest.php
index 014f2ea344180a9ec4f53f2730528718ff97fd0e..d54211b083fbfc936aa54fcfa60bf61f690e6af6 100644
--- a/core/modules/views/src/Tests/ViewElementTest.php
+++ b/core/modules/views/src/Tests/ViewElementTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\ViewElementTest.
+ * Contains \Drupal\views\Tests\ViewElementTest.
  */
 
 namespace Drupal\views\Tests;
diff --git a/core/modules/views/src/Tests/ViewResultAssertionTrait.php b/core/modules/views/src/Tests/ViewResultAssertionTrait.php
index f88c8c5f0e43643f37ce731832d3748afd575b27..8525e80b9ba6c710b641c7e57ac11f4954da2400 100644
--- a/core/modules/views/src/Tests/ViewResultAssertionTrait.php
+++ b/core/modules/views/src/Tests/ViewResultAssertionTrait.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * contains Drupal\views\Tests\ViewResultAssertionTrait.
+ * Contains \Drupal\views\Tests\ViewResultAssertionTrait.
  */
 
 namespace Drupal\views\Tests;
diff --git a/core/modules/views/src/Tests/ViewStorageTest.php b/core/modules/views/src/Tests/ViewStorageTest.php
index f30c1ddee962bd40cd0338aa006a6ddcfde33ea7..e922ddf5c49717979ed23ea55e2c786ed6f8a608 100644
--- a/core/modules/views/src/Tests/ViewStorageTest.php
+++ b/core/modules/views/src/Tests/ViewStorageTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\ViewStorageTest.
+ * Contains \Drupal\views\Tests\ViewStorageTest.
  */
 
 namespace Drupal\views\Tests;
diff --git a/core/modules/views/src/Tests/Wizard/BasicTest.php b/core/modules/views/src/Tests/Wizard/BasicTest.php
index 894a37537bb7ec4245f86cce3be5c366cb551216..d55b941ba6a60e74c1ac2fe6fffb97184539badd 100644
--- a/core/modules/views/src/Tests/Wizard/BasicTest.php
+++ b/core/modules/views/src/Tests/Wizard/BasicTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Wizard\BasicTest.
+ * Contains \Drupal\views\Tests\Wizard\BasicTest.
  */
 
 namespace Drupal\views\Tests\Wizard;
diff --git a/core/modules/views/src/Tests/Wizard/ItemsPerPageTest.php b/core/modules/views/src/Tests/Wizard/ItemsPerPageTest.php
index a201cb1c99fc2ab30895391d7ec55d72c3234300..8e8edfc19e1c8e9277d4024240f7d401baa7d616 100644
--- a/core/modules/views/src/Tests/Wizard/ItemsPerPageTest.php
+++ b/core/modules/views/src/Tests/Wizard/ItemsPerPageTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Wizard\ItemsPerPageTest.
+ * Contains \Drupal\views\Tests\Wizard\ItemsPerPageTest.
  */
 
 namespace Drupal\views\Tests\Wizard;
diff --git a/core/modules/views/src/Tests/Wizard/MenuTest.php b/core/modules/views/src/Tests/Wizard/MenuTest.php
index 48232198220163ad3693b33fcf362bb5d58a51fd..af6a98d2649d8e21b38f32de04a08602c7fd05e6 100644
--- a/core/modules/views/src/Tests/Wizard/MenuTest.php
+++ b/core/modules/views/src/Tests/Wizard/MenuTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Wizard\MenuTest.
+ * Contains \Drupal\views\Tests\Wizard\MenuTest.
  */
 
 namespace Drupal\views\Tests\Wizard;
diff --git a/core/modules/views/src/Tests/Wizard/SortingTest.php b/core/modules/views/src/Tests/Wizard/SortingTest.php
index 31128536b5e8f16a897213ed7115cf9075511fa2..41a0040f2eeb79326a15e2b5c38f7916f1a026a9 100644
--- a/core/modules/views/src/Tests/Wizard/SortingTest.php
+++ b/core/modules/views/src/Tests/Wizard/SortingTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Wizard\SortingTest.
+ * Contains \Drupal\views\Tests\Wizard\SortingTest.
  */
 
 namespace Drupal\views\Tests\Wizard;
diff --git a/core/modules/views/src/Tests/Wizard/TaggedWithTest.php b/core/modules/views/src/Tests/Wizard/TaggedWithTest.php
index b31e2b6ae2136183b93c8bf60b59993cc493b3bc..b9c58f7f13c4d206dc0b9a6cff2776e6721360ff 100644
--- a/core/modules/views/src/Tests/Wizard/TaggedWithTest.php
+++ b/core/modules/views/src/Tests/Wizard/TaggedWithTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Wizard\TaggedWithTest.
+ * Contains \Drupal\views\Tests\Wizard\TaggedWithTest.
  */
 
 namespace Drupal\views\Tests\Wizard;
diff --git a/core/modules/views/src/Tests/Wizard/WizardTestBase.php b/core/modules/views/src/Tests/Wizard/WizardTestBase.php
index 0a2e998080b4c3f15abc6ea7e96819ddd5988375..f610a5f39a81cf12868cbcd7d8ac428bf28bc61b 100644
--- a/core/modules/views/src/Tests/Wizard/WizardTestBase.php
+++ b/core/modules/views/src/Tests/Wizard/WizardTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Wizard\WizardTestBase.
+ * Contains \Drupal\views\Tests\Wizard\WizardTestBase.
  */
 
 namespace Drupal\views\Tests\Wizard;
diff --git a/core/modules/views/src/ViewEntityInterface.php b/core/modules/views/src/ViewEntityInterface.php
index 17345529b104cd5f908164a08baf61d04b17b971..68dbc146754e245cc0f289a5ef32051fe391aacc 100644
--- a/core/modules/views/src/ViewEntityInterface.php
+++ b/core/modules/views/src/ViewEntityInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\ViewEntityInterface.
+ * Contains \Drupal\views\ViewEntityInterface.
  */
 
 namespace Drupal\views;
diff --git a/core/modules/views/src/ViewExecutable.php b/core/modules/views/src/ViewExecutable.php
index d0ae414b8bbbbc94ecc4640c4707322d6262ad07..b21f3148cc530ddbc890c04bad936d96a087b579 100644
--- a/core/modules/views/src/ViewExecutable.php
+++ b/core/modules/views/src/ViewExecutable.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\ViewExecutable.
+ * Contains \Drupal\views\ViewExecutable.
  */
 
 namespace Drupal\views;
diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/access/StaticTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/access/StaticTest.php
index c2be6658967781b95f675c400f24bba59093b135..e37bf3a3ed38d1c8bf0d41fdc56c09fdb2b6da9a 100644
--- a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/access/StaticTest.php
+++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/access/StaticTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views_test_data\Plugin\views\access\StaticTest.
+ * Contains \Drupal\views_test_data\Plugin\views\access\StaticTest.
  */
 
 namespace Drupal\views_test_data\Plugin\views\access;
diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/area/TestExample.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/area/TestExample.php
index 1bcf2f4d83ccf2f727c241ad9d97a169ea61f164..1afb7d4d5b6d5aeb53d0bf363954ba01c864a159 100644
--- a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/area/TestExample.php
+++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/area/TestExample.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views_test_data\Plugin\views\area\TestExample
+ * Contains \Drupal\views_test_data\Plugin\views\area\TestExample.
  */
 
 namespace Drupal\views_test_data\Plugin\views\area;
diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/argument_default/ArgumentDefaultTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/argument_default/ArgumentDefaultTest.php
index 7c6afbb47dbf48a0ceabf623cdfc80c66d9ab107..96a7175ba010d681a62db5444c72e7dff362e2f2 100644
--- a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/argument_default/ArgumentDefaultTest.php
+++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/argument_default/ArgumentDefaultTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views_test_data\Plugin\views\argument_default\ArgumentDefaultTest.
+ * Contains \Drupal\views_test_data\Plugin\views\argument_default\ArgumentDefaultTest.
  */
 
 namespace Drupal\views_test_data\Plugin\views\argument_default;
diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/argument_validator/ArgumentValidatorTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/argument_validator/ArgumentValidatorTest.php
index 9cc4081759371f8fd6e7a6736d09c8c64af30724..83e6f3c2ea8617a3c17e7fae7c0fe8a3e8edbaf0 100644
--- a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/argument_validator/ArgumentValidatorTest.php
+++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/argument_validator/ArgumentValidatorTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\views_test_data\Plugin\views\argument_validator\ArgumentValidatorTest.
+ * Contains \Drupal\views_test_data\Plugin\views\argument_validator\ArgumentValidatorTest.
  */
 
 namespace Drupal\views_test_data\Plugin\views\argument_validator;
diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display/DisplayNoAreaTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display/DisplayNoAreaTest.php
index d79cf07252b241dab2ee39bafd10b7c41125b58e..79d4e47ec41f6f3c6da2dec2d4271ac8d3b23cc0 100644
--- a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display/DisplayNoAreaTest.php
+++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display/DisplayNoAreaTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views_test_data\Plugin\views\display\DisplayNoAreaTest.
+ * Contains \Drupal\views_test_data\Plugin\views\display\DisplayNoAreaTest.
  */
 
 namespace Drupal\views_test_data\Plugin\views\display;
diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display/DisplayTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display/DisplayTest.php
index 3cc53cc5305425b9208550b14db314384119823d..35d9b3db62e2a4a4208ad420e1689f985ecc7b4f 100644
--- a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display/DisplayTest.php
+++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display/DisplayTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views_test_data\Plugin\views\display\DisplayTest.
+ * Contains \Drupal\views_test_data\Plugin\views\display\DisplayTest.
  */
 
 namespace Drupal\views_test_data\Plugin\views\display;
diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display_extender/DisplayExtenderTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display_extender/DisplayExtenderTest.php
index a302062ef356d95165595f8304692a2e32b17af8..44818265c9e9cec8055cb19e7bee2668f631db4b 100644
--- a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display_extender/DisplayExtenderTest.php
+++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display_extender/DisplayExtenderTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views_test_data\Plugin\views\display_extender\DisplayExtenderTest.
+ * Contains \Drupal\views_test_data\Plugin\views\display_extender\DisplayExtenderTest.
  */
 
 namespace Drupal\views_test_data\Plugin\views\display_extender;
diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display_extender/DisplayExtenderTest2.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display_extender/DisplayExtenderTest2.php
index ffe3a77de8e7ef2ccfb07a90dba34cff5c76cd49..4ca7ed0d87520f579c78cdab9be9c27d30f597da 100644
--- a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display_extender/DisplayExtenderTest2.php
+++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display_extender/DisplayExtenderTest2.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views_test_data\Plugin\views\display_extender\DisplayExtenderTest2.
+ * Contains \Drupal\views_test_data\Plugin\views\display_extender\DisplayExtenderTest2.
  */
 
 namespace Drupal\views_test_data\Plugin\views\display_extender;
diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/field/FieldTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/field/FieldTest.php
index 80336580c3b5310aee5817057b16e0664f03fe69..74d5d3d625a716cffeef7bef3b38d7d5b6b63ca7 100644
--- a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/field/FieldTest.php
+++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/field/FieldTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views_test_data\Plugin\views\field\FieldTest.
+ * Contains \Drupal\views_test_data\Plugin\views\field\FieldTest.
  */
 
 namespace Drupal\views_test_data\Plugin\views\field;
diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/filter/FilterTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/filter/FilterTest.php
index 77bf117faa32ad61468ede688b1cd58a6b18e20f..aa141a33dfccf0ffee2f76b8ecfa16c08e6a7085 100644
--- a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/filter/FilterTest.php
+++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/filter/FilterTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views_test_data\Plugin\views\filter\FilterTest.
+ * Contains \Drupal\views_test_data\Plugin\views\filter\FilterTest.
  */
 
 namespace Drupal\views_test_data\Plugin\views\filter;
diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/join/JoinTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/join/JoinTest.php
index e98fe31e2c84a7e314921050d215fc366fc4d7f3..7298c35f4de8a585ca68c80dfa02b777e23ca3fc 100644
--- a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/join/JoinTest.php
+++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/join/JoinTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views_test_data\views\join\JoinTest.
+ * Contains \Drupal\views_test_data\Plugin\views\join\JoinTest.
  */
 
 namespace Drupal\views_test_data\Plugin\views\join;
diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/query/QueryTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/query/QueryTest.php
index 173e8577b3fdedce25dc2907c5a839f22717d836..c8bac3145793f22ec3df3149c59960b81ab3dc58 100644
--- a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/query/QueryTest.php
+++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/query/QueryTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views_test_data\Plugin\views\query\QueryTest.
+ * Contains \Drupal\views_test_data\Plugin\views\query\QueryTest.
  */
 
 namespace Drupal\views_test_data\Plugin\views\query;
diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/row/RowTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/row/RowTest.php
index f3c8d9e2e731b282fbb7377f6340cf81e876c8a8..64a0041d331fa4e1b626b59f2a8ee172c9ec29f8 100644
--- a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/row/RowTest.php
+++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/row/RowTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views_test_data\Plugin\views\row\RowTest.
+ * Contains \Drupal\views_test_data\Plugin\views\row\RowTest.
  */
 
 namespace Drupal\views_test_data\Plugin\views\row;
diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/MappingTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/MappingTest.php
index ec0ac1ac278b3e36e5229a67cce5d88b7587bb0e..076ca5b9e9afe5fd8afb405a3a3f903bdf9479a7 100644
--- a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/MappingTest.php
+++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/MappingTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views_test_data\Plugin\views\style\MappingTest;
+ * Contains \Drupal\views_test_data\Plugin\views\style\MappingTest.
  */
 
 namespace Drupal\views_test_data\Plugin\views\style;
diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/StyleTemplateTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/StyleTemplateTest.php
index ee791a92846d4e55ac6625319737f851f76364e1..4a55c30d0dfe10a3179f27f44e491e9fd4642adf 100644
--- a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/StyleTemplateTest.php
+++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/StyleTemplateTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views_test_data\Plugin\views\style\StyleTemplateTest.
+ * Contains \Drupal\views_test_data\Plugin\views\style\StyleTemplateTest.
  */
 
 namespace Drupal\views_test_data\Plugin\views\style;
diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/StyleTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/StyleTest.php
index a81ac82e7813391a66d131d4a0c4f6e15326d24a..4323f51a4aac34ec36f3b7f62657ed59a78c8f81 100644
--- a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/StyleTest.php
+++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/StyleTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views_test_data\Plugin\views\style\StyleTest.
+ * Contains \Drupal\views_test_data\Plugin\views\style\StyleTest.
  */
 
 namespace Drupal\views_test_data\Plugin\views\style;
diff --git a/core/modules/views/tests/modules/views_test_formatter/src/Plugin/Field/FieldFormatter/AttachmentTestFormatter.php b/core/modules/views/tests/modules/views_test_formatter/src/Plugin/Field/FieldFormatter/AttachmentTestFormatter.php
index a5fb7e37fadab1b60e7ee54d8f90753693624d4a..002105e1e0c4e88688a7fbb4e25172d04a59c7f8 100644
--- a/core/modules/views/tests/modules/views_test_formatter/src/Plugin/Field/FieldFormatter/AttachmentTestFormatter.php
+++ b/core/modules/views/tests/modules/views_test_formatter/src/Plugin/Field/FieldFormatter/AttachmentTestFormatter.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\views_test_formatter\Field\Plugin\Field\FieldFormatter\AttachmentTestFormatter.
+ * Contains \Drupal\views_test_formatter\Plugin\Field\FieldFormatter\AttachmentTestFormatter.
  */
 
 namespace Drupal\views_test_formatter\Plugin\Field\FieldFormatter;
diff --git a/core/modules/views/tests/src/Unit/Plugin/pager/PagerPluginBaseTest.php b/core/modules/views/tests/src/Unit/Plugin/pager/PagerPluginBaseTest.php
index 8aa6c7ada5d2ce3caf3476d347a3b920750a9406..b6e15d7b0c1099d537dc313bc6eb55a398d5b758 100644
--- a/core/modules/views/tests/src/Unit/Plugin/pager/PagerPluginBaseTest.php
+++ b/core/modules/views/tests/src/Unit/Plugin/pager/PagerPluginBaseTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\views\Unit\Plugin\pager\PagerPluginBaseTest
+ * Contains \Drupal\Tests\views\Unit\Plugin\pager\PagerPluginBaseTest.
  */
 
 namespace Drupal\Tests\views\Unit\Plugin\pager;
diff --git a/core/modules/views/tests/src/Unit/PluginTypeListTest.php b/core/modules/views/tests/src/Unit/PluginTypeListTest.php
index 650d48efa323bf9373f53b6b2203eb4f65faef2e..304e2cdaba36dce1416d9f1bc441a621445331c6 100644
--- a/core/modules/views/tests/src/Unit/PluginTypeListTest.php
+++ b/core/modules/views/tests/src/Unit/PluginTypeListTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Definition of Drupal\Tests\views\Unit\PluginTypeListTest.
+ * Contains \Drupal\Tests\views\Unit\PluginTypeListTest.
  */
 
 namespace Drupal\Tests\views\Unit;
diff --git a/core/modules/views/tests/src/Unit/ViewExecutableFactoryTest.php b/core/modules/views/tests/src/Unit/ViewExecutableFactoryTest.php
index 17b61c8d091fad77465bdb42e301625156d5d58c..0d36dc0b70d070a1a66046b4dd85a678d3f7423f 100644
--- a/core/modules/views/tests/src/Unit/ViewExecutableFactoryTest.php
+++ b/core/modules/views/tests/src/Unit/ViewExecutableFactoryTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\views\Unit\VIewExecutableFactoryTest.
+ * Contains \Drupal\Tests\views\Unit\ViewExecutableFactoryTest.
  */
 
 namespace Drupal\Tests\views\Unit;
diff --git a/core/modules/views/tests/src/Unit/ViewExecutableTest.php b/core/modules/views/tests/src/Unit/ViewExecutableTest.php
index 59fa23a054c565b005d5287655d125bf1bc415ca..fea412b63b36c9901e689c2afde50485d8e9e604 100644
--- a/core/modules/views/tests/src/Unit/ViewExecutableTest.php
+++ b/core/modules/views/tests/src/Unit/ViewExecutableTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Tests\views\Unit\ViewExecutableTest.
+ * Contains \Drupal\Tests\views\Unit\ViewExecutableTest.
  */
 
 namespace Drupal\Tests\views\Unit;
diff --git a/core/modules/views_ui/src/Tests/AreaEntityUITest.php b/core/modules/views_ui/src/Tests/AreaEntityUITest.php
index 3de39d84521e7e40b9b154489a4485e1de3dfd3f..421367da3b7a86ca8ac812daf9fbdcb17e22c4cf 100644
--- a/core/modules/views_ui/src/Tests/AreaEntityUITest.php
+++ b/core/modules/views_ui/src/Tests/AreaEntityUITest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\views_ui\Tests\AreaEntityUITest.
+ * Contains \Drupal\views_ui\Tests\AreaEntityUITest.
  */
 
 namespace Drupal\views_ui\Tests;
diff --git a/core/modules/views_ui/src/Tests/FilterUITest.php b/core/modules/views_ui/src/Tests/FilterUITest.php
index 046b1665f3fbe4a146ef2a1e19d4313128f10f3e..1b1cc132912943d6518d51e22ed5ca1b8b87a333 100644
--- a/core/modules/views_ui/src/Tests/FilterUITest.php
+++ b/core/modules/views_ui/src/Tests/FilterUITest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\FilterUITest.
+ * Contains \Drupal\views_ui\Tests\FilterUITest.
  */
 
 namespace Drupal\views_ui\Tests;
diff --git a/core/modules/views_ui/src/Tests/UnsavedPreviewTest.php b/core/modules/views_ui/src/Tests/UnsavedPreviewTest.php
index f3f44641caff0560f9fb953ee37e34302cd9eb6b..8929235bb801e7d126119766ba88ddd9f7b0e0b4 100644
--- a/core/modules/views_ui/src/Tests/UnsavedPreviewTest.php
+++ b/core/modules/views_ui/src/Tests/UnsavedPreviewTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains of \Drupal\views_ui\Tests\UnsavedPreviewTest.
+ * Contains \Drupal\views_ui\Tests\UnsavedPreviewTest.
  */
 
 namespace Drupal\views_ui\Tests;
diff --git a/core/modules/views_ui/src/ViewAddForm.php b/core/modules/views_ui/src/ViewAddForm.php
index 9750094fc7ff00a6f2f1b94ab3a8a5ef14d66561..6db3e95e6cdfdfeafd1ff2c2e9db659ef83e4c57 100644
--- a/core/modules/views_ui/src/ViewAddForm.php
+++ b/core/modules/views_ui/src/ViewAddForm.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\views_ui\ViewAddForm.
+ * Contains \Drupal\views_ui\ViewAddForm.
  */
 
 namespace Drupal\views_ui;
diff --git a/core/modules/views_ui/src/ViewEditForm.php b/core/modules/views_ui/src/ViewEditForm.php
index 6cfaf5d8c6a69f2a50ebbd22679547259ecc5384..9e598f28d94e5ce53e8e2283702faf159f1ad6b3 100644
--- a/core/modules/views_ui/src/ViewEditForm.php
+++ b/core/modules/views_ui/src/ViewEditForm.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\views_ui\ViewEditForm.
+ * Contains \Drupal\views_ui\ViewEditForm.
  */
 
 namespace Drupal\views_ui;
diff --git a/core/modules/views_ui/src/ViewFormBase.php b/core/modules/views_ui/src/ViewFormBase.php
index 4da7f8bae79db6c7e4e90e761719e7c13b97e00e..cddfddcd7a25e79ea1decdae4e47deb448efe1d2 100644
--- a/core/modules/views_ui/src/ViewFormBase.php
+++ b/core/modules/views_ui/src/ViewFormBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\views_ui\ViewFormBase.
+ * Contains \Drupal\views_ui\ViewFormBase.
  */
 
 namespace Drupal\views_ui;
diff --git a/core/modules/views_ui/src/ViewPreviewForm.php b/core/modules/views_ui/src/ViewPreviewForm.php
index 006810e181c6dcb1792d87b835c0350ef73e4dab..7ec8f4de1206a7569bbebf126891f989025862c2 100644
--- a/core/modules/views_ui/src/ViewPreviewForm.php
+++ b/core/modules/views_ui/src/ViewPreviewForm.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\views_ui\ViewPreviewForm.
+ * Contains \Drupal\views_ui\ViewPreviewForm.
  */
 
 namespace Drupal\views_ui;
diff --git a/core/modules/views_ui/src/ViewUI.php b/core/modules/views_ui/src/ViewUI.php
index 23491f22ba166411077a1f09d22e0d7e63e369a3..05451beb8160261b3c9f47e255a17dfd22471a03 100644
--- a/core/modules/views_ui/src/ViewUI.php
+++ b/core/modules/views_ui/src/ViewUI.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views_ui\ViewUI.
+ * Contains \Drupal\views_ui\ViewUI.
  */
 
 namespace Drupal\views_ui;
diff --git a/core/profiles/minimal/src/Tests/MinimalTest.php b/core/profiles/minimal/src/Tests/MinimalTest.php
index 4666e4b0e997f6db5a1ca7e5cbd4f79999cc5b1e..d70c0970014fb739408b5ba08fada2fc2363142e 100644
--- a/core/profiles/minimal/src/Tests/MinimalTest.php
+++ b/core/profiles/minimal/src/Tests/MinimalTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\minimal\Tests\MinimalTest.
+ * Contains \Drupal\minimal\Tests\MinimalTest.
  */
 
 namespace Drupal\minimal\Tests;
diff --git a/core/profiles/standard/src/Tests/StandardTest.php b/core/profiles/standard/src/Tests/StandardTest.php
index 3e2ee07ef1c402b13bd5495cca765a0956c1dbef..19b703e86a149739aaf3c19aced147c4987cbced 100644
--- a/core/profiles/standard/src/Tests/StandardTest.php
+++ b/core/profiles/standard/src/Tests/StandardTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\standard\Tests\StandardTest.
+ * Contains \Drupal\standard\Tests\StandardTest.
  */
 
 namespace Drupal\standard\Tests;
diff --git a/core/profiles/testing/modules/drupal_system_listing_compatible_test/src/Tests/SystemListingCompatibleTest.php b/core/profiles/testing/modules/drupal_system_listing_compatible_test/src/Tests/SystemListingCompatibleTest.php
index 5fb09323278d49dea3fcf333bbb532f166f89f46..22d94e7d4b26868ff9b124d3cbfc0979d2de47e0 100644
--- a/core/profiles/testing/modules/drupal_system_listing_compatible_test/src/Tests/SystemListingCompatibleTest.php
+++ b/core/profiles/testing/modules/drupal_system_listing_compatible_test/src/Tests/SystemListingCompatibleTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\drupal_system_listing_compatible_test\Tests\SystemListingCompatibleTest.
+ * Contains \Drupal\drupal_system_listing_compatible_test\Tests\SystemListingCompatibleTest.
  */
 
 namespace Drupal\drupal_system_listing_compatible_test\Tests;
diff --git a/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php b/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php
index 58c11b07f218a8ab6e1b3be693f20a65deea4fe1..6009e65436c0c6555015b521eea49eb5a55f79d6 100644
--- a/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php
+++ b/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\Component\EventDispatcher\ContainerAwareEventDispatcherTest
+ * Contains \Drupal\Tests\Component\EventDispatcher\ContainerAwareEventDispatcherTest.
  */
 
 namespace Drupal\Tests\Component\EventDispatcher;
diff --git a/core/tests/Drupal/Tests/Component/Plugin/Discovery/StaticDiscoveryDecoratorTest.php b/core/tests/Drupal/Tests/Component/Plugin/Discovery/StaticDiscoveryDecoratorTest.php
index 8c472c31c752e812155f10190c4d492870dd0810..2daa1a24afdc52905acd47163fcefedc70332f39 100644
--- a/core/tests/Drupal/Tests/Component/Plugin/Discovery/StaticDiscoveryDecoratorTest.php
+++ b/core/tests/Drupal/Tests/Component/Plugin/Discovery/StaticDiscoveryDecoratorTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\Component\Plugin\Discovery\DiscoveryTraitTest.
+ * Contains \Drupal\Tests\Component\Plugin\Discovery\StaticDiscoveryDecoratorTest.
  */
 
 namespace Drupal\Tests\Component\Plugin\Discovery;
diff --git a/core/tests/Drupal/Tests/Component/Utility/NumberTest.php b/core/tests/Drupal/Tests/Component/Utility/NumberTest.php
index 7edf50cc2e585a7a3b732d3a523f69241ccfef8f..bce38736ad5e986ea42e44b995efd5a98c66a033 100644
--- a/core/tests/Drupal/Tests/Component/Utility/NumberTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/NumberTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\Common\Utility\NumberTest.
+ * Contains \Drupal\Tests\Component\Utility\NumberTest.
  *
  * @see \Drupal\Component\Utility\Number
  */
diff --git a/core/tests/Drupal/Tests/Component/Utility/TextWrapper.php b/core/tests/Drupal/Tests/Component/Utility/TextWrapper.php
index 53f25f47fb839f34804112284f1474d6cfa7257c..3e43a7bd566312f070aad7ca2403072ecc0c09bf 100644
--- a/core/tests/Drupal/Tests/Component/Utility/TextWrapper.php
+++ b/core/tests/Drupal/Tests/Component/Utility/TextWrapper.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains \Drupal\Tests\Component\Utility\TextWrapper
+ * Contains \Drupal\Tests\Component\Utility\TextWrapper.
  */
 
 namespace Drupal\Tests\Component\Utility;
diff --git a/core/tests/Drupal/Tests/Component/Utility/UserAgentTest.php b/core/tests/Drupal/Tests/Component/Utility/UserAgentTest.php
index b14c3477d52475e877f7c9a42ad5f41275e978e5..bcb6d76bb1fe8ba245217aa38daa94c14d220513 100644
--- a/core/tests/Drupal/Tests/Component/Utility/UserAgentTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/UserAgentTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Container Drupal\Tests\Component\Utility\UserAgentTest.
+ * Contains \Drupal\Tests\Component\Utility\UserAgentTest.
  */
 
 namespace Drupal\Tests\Component\Utility;
diff --git a/core/tests/Drupal/Tests/Core/Annotation/TranslationTest.php b/core/tests/Drupal/Tests/Core/Annotation/TranslationTest.php
index 7cd83d640b75cf9ecb53af8c0ecca64038e02f17..be8cca3b8495f1044a5b37f78fb41259e913ca2b 100644
--- a/core/tests/Drupal/Tests/Core/Annotation/TranslationTest.php
+++ b/core/tests/Drupal/Tests/Core/Annotation/TranslationTest.php
@@ -1,7 +1,8 @@
 <?php
 
 /**
- * @file Contains \Drupal\Tests\Core\Annotation\TranslationTest.
+ * @file
+ * Contains \Drupal\Tests\Core\Annotation\TranslationTest.
  */
 
 namespace Drupal\Tests\Core\Annotation;
diff --git a/core/tests/Drupal/Tests/Core/Asset/CssCollectionGrouperUnitTest.php b/core/tests/Drupal/Tests/Core/Asset/CssCollectionGrouperUnitTest.php
index 2d82c83c930b1da850d80c21ebcc710c8af108ad..30ecfe5415ccd61dcc5bd0c26f8fc44ce7844494 100644
--- a/core/tests/Drupal/Tests/Core/Asset/CssCollectionGrouperUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Asset/CssCollectionGrouperUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Asset\CssGrouperUnitTest.
+ * Contains \Drupal\Tests\Core\Asset\CssCollectionGrouperUnitTest.
  */
 
 
diff --git a/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php b/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php
index ad3c80fee586be9afae33c594ba6a67c6e988581..efc449603a4d6297cd404093fc964d49580af789 100644
--- a/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Asset\CssCollectionRendererUnitTest.
+ * Contains \Drupal\Tests\Core\Asset\CssCollectionRendererUnitTest.
  */
 
 
diff --git a/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php b/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php
index 9a158cc66160cc2526f0f319a9ee4da71bb0ea42..3ad398c173871073ace6862f6a83a55bffbabea0 100644
--- a/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Asset\CssOptimizerUnitTest.
+ * Contains \Drupal\Tests\Core\Asset\CssOptimizerUnitTest.
  */
 
 
diff --git a/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryCollectorTest.php b/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryCollectorTest.php
index c098c6f7f4361fccec20dc9e06c852c7b059e9d1..1c3733d67e763662481cac4c2b70d8ea9cb2623f 100644
--- a/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryCollectorTest.php
+++ b/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryCollectorTest.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\Tests\Core\Asset\LibraryDiscoveryCollectorTest.
+ */
+
 namespace Drupal\Tests\Core\Asset;
 
 use Drupal\Core\Asset\LibraryDiscoveryCollector;
diff --git a/core/tests/Drupal/Tests/Core/Cache/BackendChainImplementationUnitTest.php b/core/tests/Drupal/Tests/Core/Cache/BackendChainImplementationUnitTest.php
index 6ab09c42808c270d311ad019d8e1881ed011f9d7..61ca9740af60d479fa27f4fa40414d632489edf2 100644
--- a/core/tests/Drupal/Tests/Core/Cache/BackendChainImplementationUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Cache/BackendChainImplementationUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Tests\Core\Cache\BackendChainImplementationUnitTest.
+ * Contains \Drupal\Tests\Core\Cache\BackendChainImplementationUnitTest.
  */
 
 namespace Drupal\Tests\Core\Cache;
diff --git a/core/tests/Drupal/Tests/Core/Cache/CacheCollectorTest.php b/core/tests/Drupal/Tests/Core/Cache/CacheCollectorTest.php
index 7e98390d13881f2307f5b3bb6a1285fcc8167157..1d8edcb00fcfea75c2079265c90541426b486d5d 100644
--- a/core/tests/Drupal/Tests/Core/Cache/CacheCollectorTest.php
+++ b/core/tests/Drupal/Tests/Core/Cache/CacheCollectorTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Tests\Core\Cache\CacheCollectorTest.
+ * Contains \Drupal\Tests\Core\Cache\CacheCollectorTest.
  */
 
 namespace Drupal\Tests\Core\Cache;
diff --git a/core/tests/Drupal/Tests/Core/Cache/CacheTagsInvalidatorTest.php b/core/tests/Drupal/Tests/Core/Cache/CacheTagsInvalidatorTest.php
index 27c70e57052bc6c2fb327c960c02a4f8f595b802..a2daba7be47ee520dd6fe0b02b3626451d95624b 100644
--- a/core/tests/Drupal/Tests/Core/Cache/CacheTagsInvalidatorTest.php
+++ b/core/tests/Drupal/Tests/Core/Cache/CacheTagsInvalidatorTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\Core\Cache\CacheTest.
+ * Contains \Drupal\Tests\Core\Cache\CacheTagsInvalidatorTest.
  */
 
 namespace Drupal\Tests\Core\Cache;
diff --git a/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php b/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php
index b4f5a2dfbcd373092401e8ad4cc1dd1431a2bf7c..99a32b330f2ff1ca436ff7958d9e090bb2901591 100644
--- a/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\Core\Cache\CacheContextsTest.
+ * Contains \Drupal\Tests\Core\Cache\Context\CacheContextsManagerTest.
  */
 
 namespace Drupal\Tests\Core\Cache\Context;
diff --git a/core/tests/Drupal/Tests/Core/Cache/NullBackendTest.php b/core/tests/Drupal/Tests/Core/Cache/NullBackendTest.php
index 30bde29f026f1da2c18e17ff7ed97220a1e4446c..3c07515a8663f287ef02388becea88246cc3eede 100644
--- a/core/tests/Drupal/Tests/Core/Cache/NullBackendTest.php
+++ b/core/tests/Drupal/Tests/Core/Cache/NullBackendTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Tests\Core\Cache\NullBackendTest.
+ * Contains \Drupal\Tests\Core\Cache\NullBackendTest.
  */
 
 namespace Drupal\Tests\Core\Cache;
diff --git a/core/tests/Drupal/Tests/Core/Config/CachedStorageTest.php b/core/tests/Drupal/Tests/Core/Config/CachedStorageTest.php
index 1a4c2db4a1aa5ab3280d2cfa03e2c5d992a02abf..82613158a0515a0cb3054017e9a83c4ff38d5064 100644
--- a/core/tests/Drupal/Tests/Core/Config/CachedStorageTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/CachedStorageTest.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\Tests\Core\Config\CachedStorageTest.
+ */
+
 namespace Drupal\Tests\Core\Config;
 
 use Drupal\Tests\UnitTestCase;
diff --git a/core/tests/Drupal/Tests/Core/Config/ConfigFactoryTest.php b/core/tests/Drupal/Tests/Core/Config/ConfigFactoryTest.php
index 1c51138a45b49c8eb8d61dccdbfb005d6bdb51ac..05d93114f11ef18ec49d8d5fa15b5caf3052458c 100644
--- a/core/tests/Drupal/Tests/Core/Config/ConfigFactoryTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/ConfigFactoryTest.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\Tests\Core\Config\ConfigFactoryTest.
+ */
+
 namespace Drupal\Tests\Core\Config;
 
 use Drupal\Core\Config\Config;
diff --git a/core/tests/Drupal/Tests/Core/Database/ConnectionTest.php b/core/tests/Drupal/Tests/Core/Database/ConnectionTest.php
index cba899bfca07f56ac9ffcc0b279626e6d000178c..ea2fa24736cc27f28ddc607e5077c1e51022dd5b 100644
--- a/core/tests/Drupal/Tests/Core/Database/ConnectionTest.php
+++ b/core/tests/Drupal/Tests/Core/Database/ConnectionTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Tests\Core\Database\ConnectionTest.
+ * Contains \Drupal\Tests\Core\Database\ConnectionTest.
  */
 
 namespace Drupal\Tests\Core\Database;
diff --git a/core/tests/Drupal/Tests/Core/Database/Driver/pgsql/PostgresqlConnectionTest.php b/core/tests/Drupal/Tests/Core/Database/Driver/pgsql/PostgresqlConnectionTest.php
index 693f0e75be788e09e3bd5420d59a6808549d418c..b17726146dbe0dd7331dba69cc1c5dec8bbf9cca 100644
--- a/core/tests/Drupal/Tests/Core/Database/Driver/pgsql/PostgresqlConnectionTest.php
+++ b/core/tests/Drupal/Tests/Core/Database/Driver/pgsql/PostgresqlConnectionTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains Drupal\Tests\Core\Database\Driver\pgsql\PostgresqlConnectionTest
+ * Contains \Drupal\Tests\Core\Database\Driver\pgsql\PostgresqlConnectionTest.
  */
 
 namespace Drupal\Tests\Core\Database\Driver\pgsql;
diff --git a/core/tests/Drupal/Tests/Core/Database/EmptyStatementTest.php b/core/tests/Drupal/Tests/Core/Database/EmptyStatementTest.php
index 693775a59ea6f0aae2fd93b17600135ae0e51fbb..69e909d6cb4259b6c92401c26b9e6c388271468f 100644
--- a/core/tests/Drupal/Tests/Core/Database/EmptyStatementTest.php
+++ b/core/tests/Drupal/Tests/Core/Database/EmptyStatementTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\EmptyStatementTest.
+ * Contains \Drupal\Tests\Core\Database\EmptyStatementTest.
  */
 
 namespace Drupal\Tests\Core\Database;
diff --git a/core/tests/Drupal/Tests/Core/Database/OrderByTest.php b/core/tests/Drupal/Tests/Core/Database/OrderByTest.php
index 9ed5421bf99289ffc2bb1fb7f9ceddb895295282..17adee03fb1749aeaa8bf06c2f2c452ea3b7c022 100644
--- a/core/tests/Drupal/Tests/Core/Database/OrderByTest.php
+++ b/core/tests/Drupal/Tests/Core/Database/OrderByTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Tests\Core\Database\OrderByTest.
+ * Contains \Drupal\Tests\Core\Database\OrderByTest.
  */
 
 namespace Drupal\Tests\Core\Database;
diff --git a/core/tests/Drupal/Tests/Core/Database/Stub/Driver/Schema.php b/core/tests/Drupal/Tests/Core/Database/Stub/Driver/Schema.php
index eb7f773d0364eb99065c845a1f5fabba9728f86e..2d855b77aa713d7367bf5db1bdb2f316e56de35f 100644
--- a/core/tests/Drupal/Tests/Core/Database/Stub/Driver/Schema.php
+++ b/core/tests/Drupal/Tests/Core/Database/Stub/Driver/Schema.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\Stub\Driver\Schema.
+ * Contains \Drupal\Tests\Core\Database\Stub\Driver\Schema.
  */
 
 namespace Drupal\Tests\Core\Database\Stub\Driver;
diff --git a/core/tests/Drupal/Tests/Core/Database/Stub/StubConnection.php b/core/tests/Drupal/Tests/Core/Database/Stub/StubConnection.php
index d36a8d18aa585bcc1c1f9239ed46faddba7f01d7..a02de80a2c08e9fb3b83eb6c1b580f364253086f 100644
--- a/core/tests/Drupal/Tests/Core/Database/Stub/StubConnection.php
+++ b/core/tests/Drupal/Tests/Core/Database/Stub/StubConnection.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\Stub\StubConnection.
+ * Contains \Drupal\Tests\Core\Database\Stub\StubConnection.
  */
 
 namespace Drupal\Tests\Core\Database\Stub;
diff --git a/core/tests/Drupal/Tests/Core/Database/Stub/StubPDO.php b/core/tests/Drupal/Tests/Core/Database/Stub/StubPDO.php
index c0ea2be2f235f265ac8f2acf0988296204d49b64..6bea47cdd54228dbb66acf220542f26f133b3ffb 100644
--- a/core/tests/Drupal/Tests/Core/Database/Stub/StubPDO.php
+++ b/core/tests/Drupal/Tests/Core/Database/Stub/StubPDO.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Database\Stub\StubPDO.
+ * Contains \Drupal\Tests\Core\Database\Stub\StubPDO.
  */
 
 namespace Drupal\Tests\Core\Database\Stub;
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityFormBuilderTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityFormBuilderTest.php
index 963c1a1dc3db3e8f191784d59c136f0c218a4643..b65340db1d85b11c93b05312129cac1ccade5711 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityFormBuilderTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityFormBuilderTest.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\Tests\Core\Entity\EntityFormBuilderTest.
+ */
+
 namespace Drupal\Tests\Core\Entity;
 
 use Drupal\Core\Entity\EntityFormBuilder;
diff --git a/core/tests/Drupal/Tests/Core/Entity/TypedData/EntityAdapterUnitTest.php b/core/tests/Drupal/Tests/Core/Entity/TypedData/EntityAdapterUnitTest.php
index 79eb3b2b7d8c4a1000d68904ba92046de377a5a1..672e20bf783dab25eb3e88e4041af54dff0448e5 100644
--- a/core/tests/Drupal/Tests/Core/Entity/TypedData/EntityAdapterUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/TypedData/EntityAdapterUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\Core\Entity\EntityAdapterUnitTest.
+ * Contains \Drupal\Tests\Core\Entity\TypedData\EntityAdapterUnitTest.
  */
 
 namespace Drupal\Tests\Core\Entity\TypedData;
diff --git a/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php b/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php
index ffb2a2180d29e198e184e12f824836a387129a26..a7efb7e88214357050a469027e4f44fa3f84a34b 100644
--- a/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php
+++ b/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php
@@ -2,8 +2,7 @@
 
 /**
  * @file
- * Contains
- *   \Drupal\Tests\Core\EventSubscriber\CustomPageExceptionHtmlSubscriberTest.
+ * Contains \Drupal\Tests\Core\EventSubscriber\CustomPageExceptionHtmlSubscriberTest.
  */
 
 namespace Drupal\Tests\Core\EventSubscriber;
diff --git a/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php b/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php
index 3c465b622696eb4af4ff4e0dc6efd1e88d4c7165..4653f1371e2583aa56d47465ad63fdc7934699cf 100644
--- a/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php
+++ b/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\Core\Extension\ThemeInstallerTest.
+ * Contains \Drupal\Tests\Core\Extension\ThemeHandlerTest.
  */
 
 namespace Drupal\Tests\Core\Extension;
diff --git a/core/tests/Drupal/Tests/Core/Field/FieldItemListTest.php b/core/tests/Drupal/Tests/Core/Field/FieldItemListTest.php
index 2aad33ce017d03d082aa3ad9a3ee600a4b883667..42f776a793048e573a886d8d045c55369725bc26 100644
--- a/core/tests/Drupal/Tests/Core/Field/FieldItemListTest.php
+++ b/core/tests/Drupal/Tests/Core/Field/FieldItemListTest.php
@@ -1,7 +1,8 @@
 <?php
 
 /**
- * @file Contains \Drupal\Tests\Core\Field\FieldItemListTest.
+ * @file
+ * Contains \Drupal\Tests\Core\Field\FieldItemListTest.
  */
 
 namespace Drupal\Tests\Core\Field;
diff --git a/core/tests/Drupal/Tests/Core/Form/FormHelperTest.php b/core/tests/Drupal/Tests/Core/Form/FormHelperTest.php
index cf127cd12ae5dd848650265e908a352f46d78141..9ba72e94a66a8ad951dd7abe83aa756f4f5bc5a3 100644
--- a/core/tests/Drupal/Tests/Core/Form/FormHelperTest.php
+++ b/core/tests/Drupal/Tests/Core/Form/FormHelperTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Form\FormHelperTest.
+ * Contains \Drupal\Tests\Core\Form\FormHelperTest.
  */
 
 namespace Drupal\Tests\Core\Form;
diff --git a/core/tests/Drupal/Tests/Core/Http/TrustedHostsRequestFactoryTest.php b/core/tests/Drupal/Tests/Core/Http/TrustedHostsRequestFactoryTest.php
index 643b821b1f2fa1b3ab27804e6492f2ff3f776527..254805f57aa38ea28f6b2e8edb69969c63ed8a63 100644
--- a/core/tests/Drupal/Tests/Core/Http/TrustedHostsRequestFactoryTest.php
+++ b/core/tests/Drupal/Tests/Core/Http/TrustedHostsRequestFactoryTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Tests\Core\Http\TrustedHostsRequestFactoryTest.
+ * Contains \Drupal\Tests\Core\Http\TrustedHostsRequestFactoryTest.
  */
 
 namespace Drupal\Tests\Core\Http;
diff --git a/core/tests/Drupal/Tests/Core/Mail/MailFormatHelperTest.php b/core/tests/Drupal/Tests/Core/Mail/MailFormatHelperTest.php
index a0dd6ae760f9fbd3c5c5aa94b47df8c237ca01d5..adedb605b13885776fe48f030e4a1b2f52842a21 100644
--- a/core/tests/Drupal/Tests/Core/Mail/MailFormatHelperTest.php
+++ b/core/tests/Drupal/Tests/Core/Mail/MailFormatHelperTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Tests\Core\Mail\MailFormatHelperTest.
+ * Contains \Drupal\Tests\Core\Mail\MailFormatHelperTest.
  */
 
 namespace Drupal\Tests\Core\Mail;
diff --git a/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php b/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php
index 25d9c6d16748dcba4f57f5a84943082deb880960..69cc9c586c84152caf8951b6b18533f40220c3a9 100644
--- a/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php
+++ b/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\Core\Menu\LocalTaskUnitTest.
+ * Contains \Drupal\Tests\Core\Menu\LocalTaskIntegrationTestBase.
  */
 
 namespace Drupal\Tests\Core\Menu;
diff --git a/core/tests/Drupal/Tests/Core/Menu/MenuLinkMock.php b/core/tests/Drupal/Tests/Core/Menu/MenuLinkMock.php
index b0b8354cbdcdeda312720aa66e969900424f36fc..ea3d9d418654391c195483ca8d20ba0352038c31 100644
--- a/core/tests/Drupal/Tests/Core/Menu/MenuLinkMock.php
+++ b/core/tests/Drupal/Tests/Core/Menu/MenuLinkMock.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\Core\Menu\MenuLinkMock
+ * Contains \Drupal\Tests\Core\Menu\MenuLinkMock.
  */
 
 namespace Drupal\Tests\Core\Menu;
diff --git a/core/tests/Drupal/Tests/Core/ParamConverter/ParamConverterManagerTest.php b/core/tests/Drupal/Tests/Core/ParamConverter/ParamConverterManagerTest.php
index dc0f3cc16fbc550384761728aebe434167a5f9ee..0afeef995bb44d7e80f1d882946bc3227c62bf35 100644
--- a/core/tests/Drupal/Tests/Core/ParamConverter/ParamConverterManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/ParamConverter/ParamConverterManagerTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Tests\Core\ParamConverter\ParamConverterManagerTest.
+ * Contains \Drupal\Tests\Core\ParamConverter\ParamConverterManagerTest.
  */
 
 namespace Drupal\Tests\Core\ParamConverter;
diff --git a/core/tests/Drupal/Tests/Core/Password/PasswordHashingTest.php b/core/tests/Drupal/Tests/Core/Password/PasswordHashingTest.php
index 8371f2b1f29207d639bf1609e56be5a3ea3c5e43..4bebf4cec72aa9d635ee25576363f13660d41222 100644
--- a/core/tests/Drupal/Tests/Core/Password/PasswordHashingTest.php
+++ b/core/tests/Drupal/Tests/Core/Password/PasswordHashingTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\system\Tests\System\PasswordHashingTest.
+ * Contains \Drupal\Tests\Core\Password\PasswordHashingTest.
  */
 
 namespace Drupal\Tests\Core\Password;
diff --git a/core/tests/Drupal/Tests/Core/Path/PathMatcherTest.php b/core/tests/Drupal/Tests/Core/Path/PathMatcherTest.php
index a192210f1345e8b3c0b85bbc4a96275872269803..75f7ca5df728dcfc385458fb530d7e0a05d6896e 100644
--- a/core/tests/Drupal/Tests/Core/Path/PathMatcherTest.php
+++ b/core/tests/Drupal/Tests/Core/Path/PathMatcherTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Tests\Core\Path\PathMatcherTest
+ * Contains \Drupal\Tests\Core\Path\PathMatcherTest.
  */
 
 namespace Drupal\Tests\Core\Path;
diff --git a/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php b/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php
index f2a8cecfeef317e3fdafed58bf29c582487e5dc9..8a84c1852f7b4c640eb878c215d171fa927b9421 100644
--- a/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php
+++ b/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Tests\Core\PathProcessor\PathProcessorTest.
+ * Contains \Drupal\Tests\Core\PathProcessor\PathProcessorTest.
  */
 
 namespace Drupal\Tests\Core\PathProcessor;
diff --git a/core/tests/Drupal/Tests/Core/Plugin/Context/ContextTypedDataTest.php b/core/tests/Drupal/Tests/Core/Plugin/Context/ContextTypedDataTest.php
index a5de4a48084558f508b73087cbde84a20b274f3c..49335a697fd55b7113526948a001a1d236c5f6c2 100644
--- a/core/tests/Drupal/Tests/Core/Plugin/Context/ContextTypedDataTest.php
+++ b/core/tests/Drupal/Tests/Core/Plugin/Context/ContextTypedDataTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Tests\Core\Plugin\Context\ContextTypedDataTest.
+ * Contains \Drupal\Tests\Core\Plugin\Context\ContextTypedDataTest.
  */
 
 namespace Drupal\Tests\Core\Plugin\Context;
diff --git a/core/tests/Drupal/Tests/Core/Plugin/DefaultPluginManagerTest.php b/core/tests/Drupal/Tests/Core/Plugin/DefaultPluginManagerTest.php
index d2944001e107f1db186de9fee30f570700a0b310..180fd88db7ad21966145fe63e6edc1ad332c7aab 100644
--- a/core/tests/Drupal/Tests/Core/Plugin/DefaultPluginManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Plugin/DefaultPluginManagerTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Plugin\DefaultPluginManagerTest.
+ * Contains \Drupal\Tests\Core\Plugin\DefaultPluginManagerTest.
  */
 
 namespace Drupal\Tests\Core\Plugin;
diff --git a/core/tests/Drupal/Tests/Core/Plugin/Discovery/TestDerivativeDiscovery.php b/core/tests/Drupal/Tests/Core/Plugin/Discovery/TestDerivativeDiscovery.php
index 633475af229afef9c134c2d495c86ed95f780a4e..fd5e9c6e0330bca1d92709bc5a6d5fa6292365c2 100644
--- a/core/tests/Drupal/Tests/Core/Plugin/Discovery/TestDerivativeDiscovery.php
+++ b/core/tests/Drupal/Tests/Core/Plugin/Discovery/TestDerivativeDiscovery.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\Core\Plugin\Discovery\TestDiscovery.
+ * Contains \Drupal\Tests\Core\Plugin\Discovery\TestDerivativeDiscovery.
  */
 
 namespace Drupal\Tests\Core\Plugin\Discovery;
diff --git a/core/tests/Drupal/Tests/Core/Plugin/TestPluginManager.php b/core/tests/Drupal/Tests/Core/Plugin/TestPluginManager.php
index c1c2d7f93f272c74dca7671bb2eb35fc086ac2d3..2b317dd71d852e99d4f97c002238072ac7e0a250 100644
--- a/core/tests/Drupal/Tests/Core/Plugin/TestPluginManager.php
+++ b/core/tests/Drupal/Tests/Core/Plugin/TestPluginManager.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\Plugin\Core\TestDefaultPluginManager.
+ * Contains \Drupal\Tests\Core\Plugin\TestPluginManager.
  */
 
 namespace Drupal\Tests\Core\Plugin;
diff --git a/core/tests/Drupal/Tests/Core/Render/TestCacheableDependency.php b/core/tests/Drupal/Tests/Core/Render/TestCacheableDependency.php
index 8980e8934042df9c51845b0d3a919be1c648d6ad..25be7b0e08338d875c4884cf460993950d0a7d7e 100644
--- a/core/tests/Drupal/Tests/Core/Render/TestCacheableDependency.php
+++ b/core/tests/Drupal/Tests/Core/Render/TestCacheableDependency.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\Tests\Core\Render\TestCacheableDependency.
+ */
+
 namespace Drupal\Tests\Core\Render;
 
 use Drupal\Core\Cache\CacheableDependencyInterface;
diff --git a/core/tests/Drupal/Tests/Core/Routing/AccessAwareRouterTest.php b/core/tests/Drupal/Tests/Core/Routing/AccessAwareRouterTest.php
index da58cd93f8a5e130c2d159243ee4d9316829ebd4..b343e3b8627282ee745960fc41d38772b0889c71 100644
--- a/core/tests/Drupal/Tests/Core/Routing/AccessAwareRouterTest.php
+++ b/core/tests/Drupal/Tests/Core/Routing/AccessAwareRouterTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\Core\Routing\RoutingTest.
+ * Contains \Drupal\Tests\Core\Routing\AccessAwareRouterTest.
  */
 
 namespace Drupal\Tests\Core\Routing;
diff --git a/core/tests/Drupal/Tests/Core/Routing/ContentTypeHeaderMatcherTest.php b/core/tests/Drupal/Tests/Core/Routing/ContentTypeHeaderMatcherTest.php
index b8e6ececd069841caae81ec6875dae31627442ab..02775850fda337ac58a781a484a419287c0f1c1a 100644
--- a/core/tests/Drupal/Tests/Core/Routing/ContentTypeHeaderMatcherTest.php
+++ b/core/tests/Drupal/Tests/Core/Routing/ContentTypeHeaderMatcherTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Tests\Core\Routing\ContentTypeHeaderMatcherTest.
+ * Contains \Drupal\Tests\Core\Routing\ContentTypeHeaderMatcherTest.
  */
 
 namespace Drupal\Tests\Core\Routing;
diff --git a/core/tests/Drupal/Tests/Core/Routing/CurrentRouteMatchTest.php b/core/tests/Drupal/Tests/Core/Routing/CurrentRouteMatchTest.php
index 732b630ee0a99973f3b95ca945e80b4e4f6db382..cba533ca6140cdb6a039e27d8ba3b7b87d84e12e 100644
--- a/core/tests/Drupal/Tests/Core/Routing/CurrentRouteMatchTest.php
+++ b/core/tests/Drupal/Tests/Core/Routing/CurrentRouteMatchTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Tests\Core\Routing\RouteMatchTest.
+ * Contains \Drupal\Tests\Core\Routing\CurrentRouteMatchTest.
  */
 
 namespace Drupal\Tests\Core\Routing;
diff --git a/core/tests/Drupal/Tests/Core/Routing/RouteCompilerTest.php b/core/tests/Drupal/Tests/Core/Routing/RouteCompilerTest.php
index a64cd696462e740964c93f31149c7a1f30d8f322..bb7f13f50ffba13144a00334114bb6db069824c1 100644
--- a/core/tests/Drupal/Tests/Core/Routing/RouteCompilerTest.php
+++ b/core/tests/Drupal/Tests/Core/Routing/RouteCompilerTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Tests\Core\Routing\RouteCompilerTest.
+ * Contains \Drupal\Tests\Core\Routing\RouteCompilerTest.
  */
 
 namespace Drupal\Tests\Core\Routing;
diff --git a/core/tests/Drupal/Tests/Core/Routing/RouteMatchTest.php b/core/tests/Drupal/Tests/Core/Routing/RouteMatchTest.php
index 4ef6e6e80c052f573665fed7db6f19bf9277af0e..a2ca66555c9e03f201b4bc4901db08a04ba8668e 100644
--- a/core/tests/Drupal/Tests/Core/Routing/RouteMatchTest.php
+++ b/core/tests/Drupal/Tests/Core/Routing/RouteMatchTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Tests\Core\Routing\RouteMatchTest.
+ * Contains \Drupal\Tests\Core\Routing\RouteMatchTest.
  */
 
 namespace Drupal\Tests\Core\Routing;
diff --git a/core/tests/Drupal/Tests/Core/Routing/RouteMatchTestBase.php b/core/tests/Drupal/Tests/Core/Routing/RouteMatchTestBase.php
index 6d183f37182a5acd1c99747470d4dbe54766801e..519ae4e6af76530be76ef09912d9952d1a9f663f 100644
--- a/core/tests/Drupal/Tests/Core/Routing/RouteMatchTestBase.php
+++ b/core/tests/Drupal/Tests/Core/Routing/RouteMatchTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Tests\Core\Routing\RouteMatchTest.
+ * Contains \Drupal\Tests\Core\Routing\RouteMatchTestBase.
  */
 
 namespace Drupal\Tests\Core\Routing;
diff --git a/core/tests/Drupal/Tests/Core/Routing/RoutingFixtures.php b/core/tests/Drupal/Tests/Core/Routing/RoutingFixtures.php
index 05762353d33f35c28877dc96fdb3d89555e8df1d..6ea7e9584913a95993bc8cb090bb01dd7dd91f38 100644
--- a/core/tests/Drupal/Tests/Core/Routing/RoutingFixtures.php
+++ b/core/tests/Drupal/Tests/Core/Routing/RoutingFixtures.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\Tests\Core\Routing\RoutingFixtures.
+ */
+
 namespace Drupal\Tests\Core\Routing;
 
 use Symfony\Component\Routing\Route;
diff --git a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
index f4e90de34db18ce4ae7113abd8568b2f8409ebc1..2bdba788147fa4a49291ac3a48666d1dbb087ea2 100644
--- a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
+++ b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Tests\Core\Routing\UrlGeneratorTest.
+ * Contains \Drupal\Tests\Core\Routing\UrlGeneratorTest.
  */
 
 namespace Drupal\Tests\Core\Routing;
diff --git a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTraitTest.php b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTraitTest.php
index 98e2bb288d2142c86f8e9f9b39f6e6ec18d1db2d..2bb4466fbbd31de185435855702b11fa3ca7deff 100644
--- a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTraitTest.php
+++ b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTraitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\Tests\Core\Routing\UrlGeneratorTraitTest.
+ * Contains \Drupal\Tests\Core\Routing\UrlGeneratorTraitTest.
  */
 
 namespace Drupal\Tests\Core\Routing;
diff --git a/core/tests/Drupal/Tests/Core/Theme/ThemeNegotiatorTest.php b/core/tests/Drupal/Tests/Core/Theme/ThemeNegotiatorTest.php
index 91f3a615324c50cda81a25354ff020dc4c4ef9a0..55a6f7f441ae834164cea5d072ef221df9216081 100644
--- a/core/tests/Drupal/Tests/Core/Theme/ThemeNegotiatorTest.php
+++ b/core/tests/Drupal/Tests/Core/Theme/ThemeNegotiatorTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Theme\ThemeNegotiatorTest.
+ * Contains \Drupal\Tests\Core\Theme\ThemeNegotiatorTest.
  */
 
 namespace Drupal\Tests\Core\Theme;