diff --git a/core/lib/Drupal.php b/core/lib/Drupal.php
index ef3fdee..0c4305b 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 6c8d2ed..db27e7f 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 8eaa626..b3699bf 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 ab5e193..2bdcb43 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 4a52c70..1bd0a73 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 308cbb2..cae0021 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 637eca9..1e02ec1 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 5dc9e1b..1789810 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 9fe90ce..387c401 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 120ac9e..0082a9f 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 2def622..f96c746 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 404b996..767be59 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 9792fb0..be524de 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 3b3b567..db68414 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 a3534f5..a67e8ca 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 5350a69..cba1df9 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 c9114bc..29939be 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 76016b7..42c9b5d 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 df391c0..2397d1b 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 6f4e6f5..aa8ea20 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 754f440..cefeee7 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 11c5361..d44f18d 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 fe22e5f..5801daa 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 7135818..49b73df 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 fc40c50..3beecdc 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 85cc9b3..848171b 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 08c6836..18206d9 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 726c723..b2824c3 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 1a460ad..d4665c9 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 573e23c..26d8200 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 1f6a682..417908a 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 b684630..e925407 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 cba0b7a..2d24a12 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 adaaa9c..75e692f 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 0a28bbc..0837bbb 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 57fb25b..7efea04 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 4aab380..b94a9a8 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 222b547..54faef9 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 707955e..0d75de5 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 3362654..1902b56 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 ae9dfe1..2dc2bf3 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 f1b6812..b54646e 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 aeff157..8e4f1d6 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 0dfe9e7..e617ac1 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 803682a..0611886 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 01e9805..ab09ceb 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 60ac07b..87bd0cf 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 4b09a28..004a4fb 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 bd1ef52..6ecd9a5 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 8829fc8..74e631c 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 2da908b..7653a18 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 ce1bd59..a1bfc3c 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 c597027..c14babe 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 6f5b1c6..c155006 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 ccd6312..c5a0208 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 9522783..ae27030 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 a2218e6..c2e8967 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 325c9c2..65a9f46 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 bf56362..041f794 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 8a97a88..8d52628 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 2832d58..7f30972 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 14566cf..d68de29 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 aba95d7..1a14a40 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 5b40e30..a495f71 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 82de657..cbae08e 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 a0b10db..05a7fd1 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 4aa1ea1..8c03210 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 6409a6a..c6cc036 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 f0e5aab..f4e6bbe 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 91514a3..b8cc881 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 708344c..834e555 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 216ad46..e334770 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 2ce74db..ce906e7 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 dfa6574..e1cc845 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 af10ca2..205c0ac 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 7d65487..93bcf5b 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 600d991..16d441e 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 389f9f1..15500f7 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 d5283bf..cc5c97a 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 171583d..5eaa9db 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 2f727e6..075246d 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 b02bb46..f2523ad 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 1dc8178..6ef6be3 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 6e32fbd..c85caaf 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 33d27be..41e0dac 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 a21725d..7824782 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 7db84ab..01f75ac 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 33aca69..546733c 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 8477fc3..2b8317b 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 506a4ae..1a83947 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 604a02b..99f8e10 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 5266572..5e282e9 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 f7681d9..c861b74 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 faf2459..87b0a1b 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 bf63041..833921a 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 ee1241b..b746b83 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 1bd01a5..a0c1ba8 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 2940c13..1749c3f 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 7afce73..5993424 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 4242109..bb2f291 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 5f478ec..85ba1a7 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 ff12845..49e830b 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 63b56c2..d9bad8d 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 852da7b..57ed5da 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 574d81a..5e939a2 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 c2abc3b..afc8012 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 a21f137..590d857 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 507216d..794fbc5 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 012fcfa..ed31d90 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 929731b..8906eba 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 3e99bce..ac7ca09 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 d915238..dae3b5b 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 ada9ac3..cd28d19 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 68be002..a810dbd 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 915b19d..b2fd171 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 76809ed..bd8c48c 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 4802173..59776aa 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 de3ac80..ec199e7 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 1768df4..3da4ecf 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 e7cef8d..33ea64a 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 6a97b31..f3a3298 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 5995da7..270aa8b 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 a317d8b..f75609d 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 f6145b8..bf22864 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 1074b81..8aa7e48 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 3bea7e0..bedfd17 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 64a9aee..bce1603 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 be3ce67..ed4828a 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 af91674..7c42402 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 a172d7e..493e471 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 718e008..d48c6f2 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 019d656..f28d58e 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 f9527d4..c28e1f2 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 fa1327f..65d1104 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 7c654e2..e6c16bb 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 de0db11..4e594da 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 c41fdf3..8501b14 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 202d056..19fbe5f 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 c48b830..b98d868 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 a5e89a8..8f5b710 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 aecae55..caa2dbf 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 570a130..a04d7a0 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 c7d7a36..00cf10c 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 5b3bda6..7d96e55 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 118974c..d5a5d2a 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 85c5003..f8940ad 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 fba74da..f21aa7e 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 e4e8d7e..83e0366 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 c3a2ae0..ad74c13 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 862e2df..561abee 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 90ca65f..0b58c67 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 8c3f701..682c53c 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 5357e6b..c0ad989 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 1bee32d..5d4171d 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 92f74f3..c0f6c10 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 e75090e..a6a07ce 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 8882fcd..0e940e7 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 68324b2..6f18a8f 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 3bbc3de..2acea07 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 d3c1762..3ac3811 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 5403611..8f2fdb7 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 d8c52bb..54e978d 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 ae73ed8..736dbcc 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 d06d27e..a0171c4 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 fa7d54b..aca3c95 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 bd5935a..10ed88a 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 2cf1c18..cbf5c1a 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 8036322..ee9c23e 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 b9208ee..6ca76da 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 412c5df..da61b1b 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 14f5a38..e45a3be 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 80b6ac8..36992f0 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 feb111b..4bb1d09 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 944d39c..3ecfcea 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 8848391..08e7af1 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 e776a52..c8e600e 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 f7d3af9..b59f69a 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 d9ddbc0..453fbe3 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 1fd52f2..7e21d73 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 dfa50e3..34f8378 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 805543f..0e9e7ec 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 a4114cd..bc5c533 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 68b802e..9323fd3 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 f16838d..f85aac4 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 c779fef..bfb7db6 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 56cfc2c..d3d08b9 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 857e199..f36dfac 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 4461ba0..28330b7 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 f5d27f1..b064046 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 a73e7eb..182e271 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 ac5a1f8..c63ec7b 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 e8221b5..855f577 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 ca70c4c..5246b21 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 e6cd08d..42d7f15 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 c6ea3ab..4e87be6 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 af87d0d..d322c05 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 52286e0..eb4e182 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 6a5309e..bbce797 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 79e2f1a..1045387 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 fd4bf23..6d0f26c 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 aef40cb..9634a6d 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 44acede..6223c04 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 2e2fe7a..e127307 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 98e8fb9..e7c71f1 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 8ecded9..748bf44 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 81b4252..a9ec3b6 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 33b2683..cb48a5f 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 01193d3..4659cb0 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 d6b1cd6..ce692b5 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 08c881e..09b34b3 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 f8cb491..ed1f23d 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 82afbaa..5823c82 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 c7eb93f..b17ed80 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 e791d8a..a818cd7 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 dc2bad0..6d0ef79 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 d58e841..d11d927 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 58ca1a2..346d0a5 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 0149ec3..9f89a72 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 aae79bb..f5fbf12 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 056a795..c90e7ee 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 c7be45c..074bf27 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 2ddbd5d..e0beb78 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 61f610e..2508a25 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 5b4f0bd..041ffe3 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 377f26b..ae92b08 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 20c2faf..1099686 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 944653a..1f9f28b 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 eaa248a..e408822 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 9b377b6..00908d5 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 76784e7..16bc905 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 8defc8a..ebfc322 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 cb178fb..0bc9676 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 df8071f..152aa98 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 93ca066..ce5af4f 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 43e3b5e..d614fdb 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 eeabca5..8eb5906 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 880a222..cdb9fa1 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 cd1ecda..27d6a52 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 b2e474d..0d0fb47 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 9707635..6f2127f 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 563da20..7107436 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 1a120f8..544390d 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 367a1bc..fc04f57 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 48bef3a..7ed68fb 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 2dafed5..b8d9500 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 1afd100..794d4b2 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 1bdd10e..19264ca 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 3069af3..d45e2d7 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 64b46c2..6ff20fd 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 2d99619..6201c52 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 9459dd1..1baf31d 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 cc64850..969061f 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 53712ca..3cfd379 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 1d716f4..ff62dda 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 342660a..9c28e46 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 f87293b..a40e6c1 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 d64624b..d8a0902 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 a9ac919..87ac0ce 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 ef79a42..5853369 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 91e6e5f..b678ddb 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 2f59e0d..3a4aa08 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 8fd36db..6011364 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 e05e64f..b822949 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 c6cbba8..ea8a1f7 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 bc518d7..e77e871 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 efcf3d9..51adfed 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 abbd0d1..fb440f3 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 99e34c8..1a20dbc 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 d18eaec..ff9fb14 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 391b08e..fda143d 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 b1efbf0..0c7b0a5 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 4085192..0ddcf59 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 a964042..335b49c 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 2ccc4aa..67e1d50 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 4f44bba..5578c36 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 ab89a6f..a1ecc9a 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 4c54271..1ca8f38 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 fa64cad..46fb892 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 492b42e..ac4c6a7 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 11ba90e..e0f9573 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 2024272..65c1f12 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 1b9e194..e575e22 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 7a37cd4..5ea2b7f 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 fb94a7e..3042a4d 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 c7922e8..c9410bf 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 6330d22..4a2b351 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 cbe4dc7..76cf89c 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 d64ff19..172b27b 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 2194239..d2819f1 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 8719cd9..997749f 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 1292934..1eac0f8 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 28d28f8..e87edaa 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 114d078..24768d8 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 fcf0968..f6132d0 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 a600207..836b0a4 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 7bc22a8..a02da88 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 a1fb57a..774f385 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 a45c24e..b7c99ef 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 9b6048f7..87e7e75 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 1bedad8..9974bc9 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 3386bba..69598e1 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 df86cf0..e58e39e 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 3d1c34f..ceabcd9 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 3331e97..4bab897 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 e546ebf..fb6c95b 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 1af9b82..513d2aa 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 9715d9d..2d172d9 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 20c2f9a..e18b655 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 a565450..49fd031 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 b0d9e4d..e798376 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 f36c23d..ace5191 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 410fa7b..117d68a 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 9616e70..dd5a1f2 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 589af5a..c19b177 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 20b0ecf..8a115b2 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 b6cfe4a..0fc82b8 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 05eede7..2e2ff6b 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 69875d8..0bfb699 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 979c189..2a6082c 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 194e577..71225f5 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 ff84971..35170d1 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 43e3219..4c1ac57 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 986523f..e095b5c 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 0ef2c3b..2e0b553 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 db4696e..a5fbf74 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 c3f36ee..df88540 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 29a4bfe..b10e8d5 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 5c129cc..1d223ff 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 eafb184..c3bbb78 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 2937ec0..e649f1a 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 170c10c..54aeef2 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 c935fa5..757c8c1 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 87247ae..3bb9e29 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 081a542..b17b784 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 dbd95d3..49bff8f 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 8b062ab..129e9ad 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 9de1603..994b4b9 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 413b8f8..12c6e1f 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 1ccdea1..46f7833 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 3b0bf76..57d9054 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 344364d..c6b49ab 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 f55591b..4013d0f 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 7720655..5c60942 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 b96b3ae..de6d66e 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 f85820d..1332a97 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 ea7d1e6..acfa7f4 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 c841444..67e6430 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 ac95452..34dc333 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 c5cf26a..e010867 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 550b68e..7d2a8d7 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 66a8d27..2834821 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 512c90d..e4608e4 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 eb785e5..0372a0e 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 53f9acf..1276e32 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 44943e2..81b8eeb 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 5b043bb..2bdde22 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 a28768d..25c03f9 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 cb4addb..8ad55f0 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 00f94b9..177b11d 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 577620e..fd30536 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 812c354..e34e0f6 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 66e2302..7cd7512 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 edc0089..c5e6055 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 11427ba..075abb5 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 d86615a..9556808 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 f447258..9e8ca90 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 358aa01..889baa1 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 d8d9bb2..bcde916 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 96bb63d..bdddc98 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 57b2525..bff2023 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 e678c90..c5c7014 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 1926d9e..8211d35 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 e0c7600..f5012bd 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 3098f08..b3ac8e4 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 5e5993b..2a7f037 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 59b6386..28fe269 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 d5c30ce..351f48c 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 3c5a452..3bee7f4 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 df18fb3..ba05327 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 5663da6..3020982 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 371b10f..df8c9bf 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 f351cbc..9e95af2 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 e100d64..0e94425 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 71ca7de..c660756 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 3e6028c..2924467 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 16ec458..d2f9b67 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 9096211..39ad9a9 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 cb70f3d..dcf95c9 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 849df45..cbc0a73 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 073f64f..52a51da 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 5165149..78ccd04 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 b5abe7c..347cdaf 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 0b955ea..c83882c 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 fe6cce7..1f344c6 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 722b6eb..6162d20 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 57ac06e..db908b0 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 45bcf54..fa2913c 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 42bbf5d..68592c8 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 563d12d..bc55ab2 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 eb23403..50f4d35 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 32035a6..854f413 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 a8d2c05..f712367 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 f834ae6..a610ce1 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 ee17c70..53207b7 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 66b6a9f..c050cd0 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 dd7e373..bfd3ae3 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 bafaab7..c3739d8 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 e21723a..b39c2a8 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 078bf76..197cf95 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 1d5cb43..9342b0e 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 b0c88bf..080c017 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 7ca296e..f78869b 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 8ce0c7a..dbfc07f 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 6849757..d113a76 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 24ec219..01b9081 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 02815ef..96cf56f 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 7d42dc5..cbefd0d 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 11fca80..0bcacee 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 b4977fa..7737d44 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 2ccc0c1..a1f826e 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 b6a5c04..6923220 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 f6558e6..5195a7a 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 b79abcc..09f6525 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 62aabf0..1733123 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 6aa7259..80d1948 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 695bd91..4ed2ba8 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 958d6df..a83ec39 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 16d4fb0..29d8656 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 3002765..85eacaa 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 a8bcad5..bef0747 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 35c3167..366e256 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 4838896..5cf7ead 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 ca12dde..fd813f7 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 ae68ff0..e6eee69 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 0b3a18b..47a31cc 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 c66f08a..a5efac0 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 6e97e6e..1136811 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 883eb17..8db195d 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 3ad1895..bea49c2 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 8dc3b5b..68f9f0e 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 b605f94..46e2795 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 175feba..7789991 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 c2959e3..4f942ef 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 75aca4d..a1d0804 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 e7072fa..b82da48 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 99c2955..d87205d 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 96ba7d6..14db3cc 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 c3808e6..3c6b48a 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 3d07024..cfb63c8 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 fa97f74..ad98d68 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 e2e21ec..c6f897a 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 e02934d..4469812 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 dc56910..b6ee57a 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 158e4a7..70b8919 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 73571ce..ee58be5 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 6cde087..7e0acef 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 2ad94aa..13ab721 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 f96a576..b7249a3 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 3a62f85..1347db5 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 cc36e36..dd00edf 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 d848afd..33f6171 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 c95a13e..169a7ba 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 df5e510..085ea31 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 c2061ca..065d6fa 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 e457023..e42545d 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 9e32a45..330cfb2 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 df1a5f0..c7dffe6 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 a88b344..2dd99ad 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 cd39f6d..412c772 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 dae7266..2407c67 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 56195e2..0967206 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 87e558b..76cb2e3 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 0cc207e..7d98c90 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 e747bd2..b162b86 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 abaea87..0397bc4 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 c7df098..158e576 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 a086f7a..24f58f5 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 d88ba5a..2adc4c2 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 97d22b9..61634f9 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 9d2e664..54c61fc 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 7dd958d..33e24db 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 1089b99..78dd202 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 8ebfa27..a786a0e 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 36f0a39..397288a 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 c979c5b..4d51eb5 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 d04be44..901fdbb 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 0c09322..51eb846 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 e8ba751..10eb3c3 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 9153446..f11f783 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 68929d1..12261b4 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 271cba9..184a490 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 62510e2..56740ca 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 9d7cec9..3f0c3e8 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 e622fe2..6957f51 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 9109775..fa42ad8 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 703c65b..2710145 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 85fcdb8..d7e1aca 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 a8ff4c0..6fc8174 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 a633fac..3617364 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 e13c39e..9441f67 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 3f646f0..0fe0906 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 d71f152..db91a88 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 afa2987..1e25680 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 4eedca8..40cf424 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 2b9e30c..8dd07ee 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 6fd241a..326692d 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 42fcc2b..3a72c67 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 b8550f0..7e072da 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 824e18c..1bf2260 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 4b9bb4b..bee7d50 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 84938ec..1f076f7 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 f33b258..20f7796 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 211c1cd..aaf2bf2 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 670184a..b90008a 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 b8a0dd2..ed43782 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 4ce3597..71df411 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 ff0c537..1c1b7e3 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 511c5d5..1a38c16 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 1bc76dc..8dd131b 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 872435f..700b881 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 ecd62ef..e28c94b 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 c3dea70..41d49ed 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 63600b5..4fc7c88 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 b21e96e..d935386 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 ede2512..77237e8 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 d28cf94..5d73454 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 5b64f84..31641d0 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 3a3a727..4b94449 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 5f0acc8..f89dfbf 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 3dc8342..25aab9b 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 12193e3..f4db765 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 4b3c3de..d7e0346 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 56400a8..7455301 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 3c26f59..bb3cf8a 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 d0d4cfa..4f8d9c8 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 3e35a00..d98f6cd 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 10f2cad..c03e118 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 8368610..c91c494 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 e26ccd3..07964f7 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 b02e316..c9f0c6b 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 4a3a17d..a11c81a 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 eaf2308..1f0d733 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 a712b9a..a9cf131 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 9b1bfc2..f3380db 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 4841d02..03065d6 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 59313bc..4260a47 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 8368e0b..24d8fb5 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 7b4bb18..2549177 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 5b0dbc1..155a67a 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 b9ad13f..56ed974 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 da96c47..0ed0037 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 943a830..25076b0 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 a17fa8f..8ad5939 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 59a0bb4..47216dd 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 112c486..7e6a2d3 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 a64c28f..d2d4d6f 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 4a48c11..daef17b 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 2ec62aa..13f6052 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 32d5d04..029c60b 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 6c46a80..b068354 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 df860f2..db8f9f8 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 b173eb1..69d4c10 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 0209a94..80bfc70 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 b88fcec..9b95336 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 5d0b1d6..7fdf8f9 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 0e0bd04..090f0ea 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 0df178f..4d59fb3 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 78e1c44..f505bdf 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 d598c6f..e84a3eb 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 1fa31b1..e660467 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 1e9eac9..73089e3 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 db7c091..d6186f0 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 897bc44..a47cac8 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 9fb1014..85d13f7 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 5669097..2a423ba 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 886e138..f0213a9 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 b605e6e..9d6c394 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 294c561..5f15073 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 dd8348e..6a0d3ed 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 179135d..d9c1120 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 39b2379..32e8f2b 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 dedb9b5..5501d80 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 6d97142..15494d0 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 0f19f8b..fd29537 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 9dea3f5..e541c27 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 360dca0..1e1d798 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 ae3f10a..271b969 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 3822df6..2a4c054 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 16fc8e6..eb09e07 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 9a2046b..54b471b 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 0e281a8..8f78de7 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 75592f5..4729648 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 80d2fb9..395bf6d 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 73e0246..857cf32 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 656fee0..d33138b 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 6d9bb71..a693309 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 aa018dc..77deb01 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 f99dae7..fbf1d27 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 cac5b51..7a9dafd 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 0364079..28d6330 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 1d4ee27..a8f33aa 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 8648328..868384b 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 da6ddf5..0927c2d 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 46b3041..8b289ab 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 e72a6b0..72e2b0a 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 d96e310..8ef3c09 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 d3aa814..c20a57e 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 c9ff8d0..91cc517 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 b07c36f..f06f203 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 089b3fd..3f7994b 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 6aab1d2..81602d1 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 ea78138..ebd4c9b 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 b1f463c..c9d1e9c 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 23f18b1..eb3804a 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 4260a49..3ea2770 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 aa98f06..e4f2aa9 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 7aa8f75..fad7b6d 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 e97cd46..067f6ef 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 0279ed1..d2242d8 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 d9531ce..c50d6fc 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 64460cc..a875800 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 cd993b3..dfefe90 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 65c83fc..38a90b1 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 876f05a..604c3db 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 6efbfc4..7e7519e 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 e151ac2..1d875ca 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 fec6b31..36d33e0 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 44c8957..eaa7122 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 4b18d5a..eecd505 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 da4e295..06f9f97 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 0992c1d..9cfd26e 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 645fcf4..a5b5f69 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 93a5e77..020e4be 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 29cbb63..061c161 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 4a7d402..a0e75d5 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 35c9a66..05af294 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 851f3d6..8270f9b 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 bb8674a..08cdc2d 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 430b024..7b9f8df 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 a5786b1..5422a10 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 7a4652e..6c35b18 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 584e975..5f5408b 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 74f18d3..bfaed81 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 e90b6b0..bda7eec 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 0a13796..c4f4fe8 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 44b344f..19fe6ca 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 fe5e65a..c35c221 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 08957a3..85a69bb 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 4a362fe..b0d62ec 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 42d6e95..2a35c8d 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 3d0454e..6e3ceee 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 51c9830..dd0e418 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 982ba3d..8379f6a 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 dcb397b..ac05db4 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 449073c..2e2de4b 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 5103037..8248c7f 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 9d1eba3..31f7a13 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 8355ad4..07e4b04 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 d4cd813..6b99444 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 7c15db4..334d7eb 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 2fa46f2..cc21e7c 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 02c804a..6eaf757 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 32a9ab7..0a93cb3 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 b84ae86..d1c1c90 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 a4e39c4..967f772 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 366de38..d6e726a 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 7572cb8..3bb2be1 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 7337edb..c12478b 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 8624367..a99af42 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 2afff81..bdcf27c 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 f2b30dd..dd664e3 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 e59631e..4690c3c 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 eb0349b..84c6917 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 c762768..7f8bb5a 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 ce3ed83..cdfffac 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 301c6bd..783a36f 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 9b70f65..62dc8fd 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 c9b83db..2e155f1 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 e5b3f5e..1a7e61a 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 966641b..01854bd 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 74c3841..a1b7856 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 67dc9cf..0ad1e6c 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 0003a04..6911d4a 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 fa6daa1..828221a 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 9abd53b..e96e351 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 42135e1..cb0271e 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 9044b02..a78666a 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 eceed0f..8e78c84 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 85020fe..5257d94 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 2ecea8d..b51ca90 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 2a9019c..f832179 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 264adaa..c419586 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 320b7a1..48465d9 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 91727cd..e508718 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 cd4fee3..18aea25 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 2f4c836..e451992 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 080b404..edf8b1a 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 80342d8..ddb1a23 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 d077270..f9abe79 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 8653de2..eac1c3d 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 edf8d7b..7ac3455 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 71e2a55..fdd33ed 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 17d1e96..36d4b67 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 13ce366..a0249f0 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 00c9993..1fe5ee1 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 c57baa9..33dec70 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 7f45ab6..505a63a 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 3a56e63..4b9fb58 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 b358944..067727d 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 7b40ba9..37db17d 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 890aaaa..879ac9d 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 00798af..26ab17a 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 8f8afc6..f248815 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 ded1ab8..c223a72 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 e6d8343..556b9aa 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 43077e2..74685eb 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 1848b48..b3d4388 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 c268304..75b785c 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 76bbd4b..c66cf2b 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 5ffa30f..ffc073b 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 5497a91..761f8de 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 ccfc58c..5e119e5 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 39e0a7b..84a3df6 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 37261c1..098012f 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 ae8777b..53271b8 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 fafb3fc..d01f7e8 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 548f180..d739751 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 f6c5b69..84ffbe2 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 b0cb361..91547c4 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 7d3f647..ab490bb 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 949c385..7718c08 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 87b422a..c442566 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 db1d8eb..821030d 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 4b019c8..3a84528 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 588f5e4..4decd66 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 425678f..7769acc 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 84f2452..32bb692 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 7af3769..7c1ef5f 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 232fde7..2d571ff 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 b5c2df5..7201504 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 4c0efa7..d188ea8 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 afb1d30..914dbff 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 0acee50..a776347 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 a26dcd0..d0d615e 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 6deb8af..4b63eea 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 affcc36..61797db 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 6062e7f..0a0acae 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 c045e2a..3acbf82 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 8df9147..7581339 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 fef6aa0..97ae431 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 7b61e08..1f4dca0 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 61dc3bf..ddf1fc6 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 221222a..f0e80ea 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 1ba3003..f4f7d26 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 55214c2..608ab43 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 1e05e8e..f7df02f 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 05e93d0..97f6738 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 582ab6f..9082dca 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 009765c..9910710 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 c47a97f..61ee56f 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 3eb44df..aee5455 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 f4d9afb..37220f5 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 9dd2524..f6328a8 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 9ce7cb0..870ad91 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 2ded4ca..aa2c438 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 9b785d8..bbca170 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 da30810..df061f2 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 f7cad30..e41d909 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 d0410b4..9bf64b6 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 d70ec01..0380ec0 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 d3989eb..f6a661a 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 56d8418..6bd4714 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 cfdb14a..c41b993 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 e14042b..5351a80 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 ab33c0e..39ea81f 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 f53eb7d..0d49c86 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 9b857b6..0fecdb1 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 9c96634..920d213 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 072d888..a48890a 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 3ccbb4e..1f78b47 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 1d7c1cb..e40f3e6 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 31b8465..15760c7 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 92be1d6..428a435 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 da09739..4b6c220 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 d5bb87f..6a8ba8d 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 064e67d..fcaa53b 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 64d0b7e..3620501 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 04241fd..a22742a 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 744edc3..5a3da8d 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 fae8cf8..a3e2213 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 facd063..9b480ca 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 5db08fe..f3d07c8 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 60e5629..26c3bb8 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 160d75d..2cfca71 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 97594c4..90ad182 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 7ed3ff6..8631086 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 2aa65ad..b558b21 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 4552fc6..8d4601a 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 4badd7d..31fbd88 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 a438b17..af49a33 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 f205f30..5bc69bb 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 573238f..3ae0084 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 f31ac53..46003af 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 983b547..c59d64f 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 af22085..f55ad54 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 481e33b..2081012 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 b7b9a8f..08983c2 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 f3d9fc6..ee24ea7 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 2cafe48..cffa128 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 7d093b7..6aa9a34 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 69f53b7..d675a29 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 492a348..675f303 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 898108b..cd85ca8 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 7a4a40a..0bec28b 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 331809a..164aa3b 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 b598849..1465f52 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 92161d8..a2de1e6 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 f674a0d..b9916e2 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 edfe220..6db5b37 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 74c9468..e4f3511 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 6bea2cb..9ed4403 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 f4acf9c..66828fb 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 a24ef09..8e78943 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 aec10e0..f924de8 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 7a4befb..ed681b3 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 4614baf..d973ffc 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 4ef7493..043ba1d 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 b1811a2..5e8d216 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 552c8bb..4f12cdf 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 301cb9b..f98a00e 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 02f9b75..82363fd 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 1469828..358319b 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 a9ca22b..204cace 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 d9a8890..d725b3a 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 af10557..669dcb5 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 16dcfc0..205d1ff 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 9861d56..883bb8b 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 75805be..632eef4 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 c245eab..043fdfd 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 8ac4485..c38c554 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 e79c07f..28c7af7 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 4d285a5..1b9c101 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 db98745..7511205 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 eabfbed..a4b2aca 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 5471ed6..fded92d 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 9b26f12..64dedb8 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 6621545..e5c1ebb 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 d43f63b..02422e7 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 99e2ee7..5af7e47 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 424469a..544dabd 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 00b4be8..e86dc24 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 e4790f9..fd8d8e0 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 a9e375c..d182728 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 479ca39..e4df908 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 fb15567..3df1b64 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 6bd21a5..a006284 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 0a82609..37b8546 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 a6953cf..d527996 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 d2561a9..476b2ff 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 cc792cd..02dcfbc 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 7f2937d..50e5f5e 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 077267e..ccd635e 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 d481f01..9534c8a 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 6d479ac..bb58719 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 fa555da..a14c916 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 f781991..0305884 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 e9835d8..a7ae165 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 67d9354..8b05562 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 316a1a6..b78b45d 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 15c5b6c..3b630df 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 1be14b4..0400f7f 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 ed00639..260ceda 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 340d9ed..baa8173 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 bce1f7f..17730aa 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 b1a9b79..5b9b504 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 588da09..a4c7bfc 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 58426c9..83a102b 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 455ae46..73328aa 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 70a085b..5c3a60a 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 ad5d83a..3d9adfc 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 243eb06..fe19823 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 ef4fc8b..a28b696 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 948aeb7..27ca162 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 4dd34c8..1cc0c85 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 4c90701..6664ecf 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 df52a37..e15cc8c 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 7ba9419..4e13008 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 e182cc0..934fe81 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 0dfeae7..d9021ff 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 fbb9cc2..9634163 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 a0eb95b..ae92618 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 a9701ff..ca8dbc6 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 f9959bd..0ece458 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 a18fd77..d7c42cd 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 7ae448a..11bb96a 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 f88a13d..e939769 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 bcc651c..43ca8e2 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 afe1d3a..1cc5d0e 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 861a1df..a9d1549 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 4868b82..7073c28 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 b0b47e8..74d9129 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 511dcc6..f1358e0 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 6371b73..991ae85 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 7d10a95..3d4b68d 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 6997073..6dcf743 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 81b769f..1607461 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 36301fd..0593ce8 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 8237e36..d534e5a 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 524e0e8..ebef8b8 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 c8d2f76..690a2a6 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 5c7b977..431a01e 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 89babd5..a5e94b7 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 576d53f..980b6b3 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 2fcf182..774c89a 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 c4d5bd3..7bf5fad 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 84645ac..8fcfb23 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 cf83b01..f17f6c5 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 b13c886..c4e83bb 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 d7456c7..cabbe16 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 be0dbc7..4e9d84b 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 c3f9d1d..13b10c1 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 6f87d2a..c6dbc06 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 4f4b9b4..1e77084 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 4436ce4..7b63bb7 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 009efb9..1ec9231 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 c3ea302..9eb3048 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 70b56ec..a7488c1 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 7937e27..641cdc2 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 91e533e..00f295f 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 5c7a92a..a297d7b 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 5c95f6b..9596a7b 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 6211ecb..1137b21 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 abe2730..a53938a 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 7b26fdf..62c0f45 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 d48b706..53663ee 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 f560c32..d907c67 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 f454b02..14a9ed0 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 84178a1..a4424ea 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 6886e29..2a433c5 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 57a97c2..19caf37 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 583c64d..e942487 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 13ec8b4..a9f821b 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 decbcd0..f337088 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 0e62fce..b7d996f 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 2d1f997..6d9408e8 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 0ac3dc7..308132d 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 e4365eb..f268dd7 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 666ea03..61a5ad2 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 89bc9da..254bfdb 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 6dc5673..44b8733 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 3009307..53f5288 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 933f8dd..fc5c892 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 138794f..11ec589 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 06314ef..3d6ecc6 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 9519143..688b96c 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 9108256..48a6e4e 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 af3461e..989f00b 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 5f36973..426ac5b 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 0bed70b..3720321 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 183d95a..d80951b 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 50d498a..4c15a8e 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 8e51fff..93e998d 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 f09b60d..6324bf0 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 cf3fd89..10caf61 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 d4e7e31..df9a1ea 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 d8c97a3..12e3267 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 3e76a2d..4f601f8 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 df8d00f..bf2a518 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 b339658..0eb8c2f 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 15c1cc7..0fc0368 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 3bee1e4..41e2f6c 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 fad2b5f..4c43330 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 54d1df2..4b067f0 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 fb3c805..770a40f 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 f525c1d..22a0615 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 50fdbc1..abef365 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 4c649da..5cdcfe8 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 ea39c54..4a4e9e9 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 fc715c6..2d3342c 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 aa0d3d2..0df69cc 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 07ce6ad..a1ff1fd 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 55548ad..e459b4a 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 1d13960..4bd098d 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 eb9411d..3daa085 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 3f21cbc..09eba7b 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 13b7d07..f902a02 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 9fa7eca..d7085dd 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 db5dbee..9baf888 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 8d6cb65..22622e7 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 44f331f..d4b16e4 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 8e88f50..69e9807 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 910000b..c5e7fe7 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 410d320..35da8b2 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 7f4f2d6..f0945ed 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 ef8130c..b138d16 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 53de2f2..9826070 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 6ea944c..6e70174 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 851c123..616b100 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 1c9ed4c..bfdc64c 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 642a85c..9ea7fb9 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 94808cf..8f3873a 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 24cc2d2..bdfb739 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 ae3ecea..494255d 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 eda6dae..7fd60e7 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 9b25182..d7f55dc 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 35686bf..ea5bd5f 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 72703ad..21a514c 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 05be03b..417cfd0 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 dd4948f..5e16171 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 592abcf..944c9a1 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 f7632a9..dd9e44c 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 4ea8fa7..7afcda7 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 6df79d6..4c6ac0c 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 cb82a72..dd9b248 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 cece86d..ffd9513 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 8b5d625..fe6f7c0 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 469f82e..cf950dd 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 456ff5e..6548208 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 d75bd6c..ef78c7b 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 833d72f..9659f14 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 cfea56d..ad93586 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 dd286e9..ad87960 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 1068b60..ad81180 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 d421d43..1f225bb 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 c14d293..ba9c6aa 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 aa8a169..f060986 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 2d6705a..db9ad28 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 beb43c0..2cbdbb0 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 1b27711..53888d9 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 f1f6bf2..8eba1c9 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 e9a19f7..f007750 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 550ea76..1b300d6 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 1988708..2a6d796 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 248d203..580bfa1 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 45011f8..b5ac9ff 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 e16f4bf..814a174 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 18585c4..ab1b083 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 e9430b0..ffc3157 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 6c3839d..7ca6f9d 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 dc796b8..db7a272 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 eba563f..21be909 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 06a40fb..82d2028 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 3dacbfa..048982c 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 e7bc5f0..209336c 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 148cf67..edbf6b2 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 8205e98..a6632b5 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 632cbcd..c9eb3ee 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 17cb9d5..46984d0 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 1e2a1f0..bd76cd2 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 102e168..b11e9c2 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 e17bbf3..063d9ab 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 4232a88..ae2d3f4 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 a42686b..e985f28 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 d1835cc..29868e5 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 bb0b10b..cb9a13f 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 fe21b9c..5254075 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 18298f9..0ba18d6 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 00ebedd..aa36e13 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 2af3d05..6e7d231 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 a6ec81e..56a7e85 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 41b8ed6..03599b0 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 8684624..a2ed46c 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 fc161eb..1f1a09b 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 1446cbd..3e74337 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 fd86cca..ec25e52 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 95e4747..ade29a5 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 3632efa..3b302bd 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 8aa38aa..6c4db08 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 d5bb6f6..3c36ae4 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 65fc041..f15ddcd 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 5c90c82..ba366a3 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 591888c..4c19650 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 f22ef2e..87b403c 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 8872f10..8a72ecc 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 af21a56..ae68d04 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 55c71e6..0b38ea7 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 e62a199..f6a2ef5 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 4a2dabc..f534dd8 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 9cfeb8d..c6a7f1c 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 bfa752f..9ed5845 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 1dd0bef..3378b12 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 70cd56b..46c41b1 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 1360c6d..c53aebc 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 de78a9e..d928095 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 83cc388..9951650 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 a5242c1..87c1903 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 e27d97a..5672280 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 4dc9ddf..315380e 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 d663734..7722fc9 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 4646956..2c738d3 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 c93a5a1..51d99f3 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 7632125..659c097 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 93af073..48c3ddc 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 c50f2c7..3be6a90 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 1414127..be95080 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 ec7c3e0..fb3c486 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 0c9cd83..c716431 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 53c1978..3a5bbe9 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 3d45894..80da941 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 aeb1196..df4cce5 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 96829b2..1093eda 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 e700c19..e8eef22 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 7c632cb..c284364 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 06ca4f6..1699594 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 a345458..807311a 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 33c2786..82169cb 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 2822612..1e8e2f4 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 bda80fa..742f84c 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 ca5847f..e435c0a 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 adffdef..330ef4e 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 d81b6ba..83dbc9c 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 30db552..c3f6d5b 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 10ba4ea..abdeb69 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 4fd0ba5..92a5de4 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 267a397..4eb087a 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 85feb7b..375b784 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 9048e00..f4832e0 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 d54f258..3f2994a 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 9ca84bc..07d6203 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 d4686bf..14c97ea 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 4a5e05f..3bc703b 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 641a055..5732836 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 ae3b050..614c9a8 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 9759e2c..9e21883 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 a651ae8..cbbe773 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 a2c943e..4cd67b9 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 1de250a..6f6fc9b 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 900e0be..4d98b09 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 b97c45c..e417bb5 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 1632d5e..ecf1c95 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 9af6cab..0b4e8ee 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 68e1abf..0a00029 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 eec20a3..4ed3f53 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 42dc049..556e79b 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 4b8ed85..e3c190f 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 614f165..0433066 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 95df98c..3b4798a 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 1bf9f5e..f5bd524 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 077b1fd..bede035 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 1257a6a..ca36597 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 e632b6a..7aedd51 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 526e4c3..f162195 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 56a4701..189b254 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 79629fac..4fab01c 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 a6d1be6..d99cde9 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 c728c2c..3e97ec3 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 7c4cc89..c2e47a1 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 1a59a8b..a0d1279 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 60b2330..56349b7 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 64edd9a..767529c 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 e8790cf..f2fd1be 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 1da22ac..06966b8 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 4a2c1ce..f824792 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 5889176..0871b4b 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 e18a9ed..c26ed2f 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 aecb90a..9fb797e 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 c679204..01da9ee 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 bfeeb86..09a0de2 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 5b4f028..176319b 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 ed9eac2..9598488 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 c65f16a..1051201 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 be4a9fc..aeae567 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 fe1e3f0..ae065cf 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 7987502..6866a5f 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 6eeed05..85fd4a6 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 5d83b7c..c0b8337 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 361376b..515d7e0 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 56a64b5..42b7973 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 623c808..87861e8 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 5e4d556..604e7b9 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 61fd119..09404d6 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 37120c9..a22bc5b 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 54ad866..7b1dfab 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 90a5a4f..5c683b9 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 097627c..c4925dc 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 67ebd0f..b54ccf8 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 9a52768..28a376d 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 c20c054..3913555 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 df52c5c..837684c 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 a18a547..62fadd3 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 3aa598a..aef7c5e 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 3d36aac..21a0d21 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 8bb7535..7636f7a 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 f938bf7..e1dd5a4 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 97b2988..a96b563 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 addacc2..64be7d6 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 ee0e5be..2ac40e9 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 930c04a..8421215 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 e609c39..2075937 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 18f0275..0dc5165 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 9686d08..4c2b732 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 3b2f2a8..b3c86ec 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 16daae7..edfb709 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 dd30b9d..ede8dd5 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 9488c08..036a3e3 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 53a7252..403e9a4 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 d619f14..f7e20fa 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 3cf6b79..5794b62 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 418dd31..a637705 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 5ac9619..bcae6f9 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 171bf4b..f6f0cf0 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 79be710..090aad4 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 d23525c..b8cfdcd 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 bbf131e..53dad45 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 53ce14e..0820db4 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 89c9725..0fa9ba4 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 da2331d..c5f11e8 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 a552b7b..e7cb29e 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 ffe85c4..6e89700 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 3d50998..dac093b 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 87d8aa3..904cea4 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 691839d..cf942f9 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 2d49397..a6a161b 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 b7b9618..83bf5c1 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 c906267..d10b8d1 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 2ff00d9..027727e 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 46502f4..5d2c359 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 bee1a9b..65282c0 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 1834872..a56e6ca 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 3b9c5b1..4c49a3b 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 550aeff..dd3b769 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 4462f44..8a31137 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 07c7fcf..3233918 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 9108fc3..e5baa49 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 4f70d44..efadce5 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 bba6849..1ee1bfc 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 c19130c..455d6f7 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 8e164f5..fc074c8 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 d1410a1..7ce77c7 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 528ef8d..0682c97 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 0adee08..f211e17 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 4a75381..300f57b 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 2a64e19..b2dfe6d 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 bcdc576..dd74391 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 56124b2..0072d67 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 37f5597..f3e4dc7 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 3f6b593..946da70 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 b56baf4..e32c4fb 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 4aad5c5..590950d 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 73d6586..e12131b 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 b9de0af..de736ec 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 0c21801..e6e31aa 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 b10b948..82a4a92 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 5b18791..0ac06e0 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 c0aaa5d..57481fa 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 fa1789b..0498cf0 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 677cb8e..9106d2d 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 52ce7f2..02017e3 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 a8d9555..cbf524e 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 fd6641b..d24e8f3 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 8843324..7827b62 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 c9e2ce9..a1f1c5e 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 1313185..4e8bb92 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 457a0df..c737d38 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 6835621..db94c24 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 e0818db..9febda7 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 a9928cc..6c54512 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 39e6811..781ea80 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 7a7f4d3..b4d7073 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 03b9330..99f55ae 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 40bddf3..20715f3 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 b53ba93..e6e65bd 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 863cfe3..0fbf4a8 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 0ac9dee..d14ed1c 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 30a4674..dcc4282 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 c4a49f5..8615dd5 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 1175c47..b3597bc 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 8de9d35..44385c2 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 f6ab6bc..110115a 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 94dc679..28a40fd 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 dea772e..d5c2f57 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 0dc9884..aba51d5 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 fe21dc2..4696cd6 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 2a7886a..340518c 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 2181264..6cd22ac 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 92a1e1f..25a6f9b 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 bbc28ef..4f08211 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 feaffb3..0c289cd 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 f0fee24..aa275cc 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 38a4b1e..ce0caee 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 cc04113..f7f5a22 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 11ecc6a..e623eb5 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 faf5fd6..08ebef7 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 b900dcc..f5da4db 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 f1b65d1..cd26297 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 c435886..31861ba 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 be2e696..82ee626 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 e2e2372..e328dfc 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 7ed5aea..9c62fb3 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 84e4d3b..60dd605 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 36070ae..f677129 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 e7157a9..656e7c8 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 19824c7..d08aa00 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 9396d0d..c42122c 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 ee12a1f..e927991 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 a952184..c327898 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 3a522e8..da1a0ec 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 b08c9d2..6547242 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 b364032..e64107e 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 125fc3c..297fdd6 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 4eda114..b2d7389 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 857c0c7..0d6d9f8 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 f074832..5b9484c 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 6d04467..52b1ff7 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 e4c51fb..105d00c 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 69d96ec..e1751f8 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 1d1e48c..25a75d1 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 ed1e5b9..a72b313 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 509f327..163da4e 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 090aff9..9f9d8bf 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 538f16b..974a91e 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 6f682e5..9d8fdbb 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 b779f93..7a78a32 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 e315c1c..d0fc4fd 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 f81c9a1..63cf9dc 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 a09803b..3cd2ecd 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 d965792..59d606d 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 4644196..e4823e6 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 de0bce7..99c8bd8 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 3089703..4efeda2 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 4d5d3bd..3fef19f 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 6683adc..1b40ea0 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 2c188da..4d5bc94 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 aafa3f4..42d622f 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 4ef5091..3df4082 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 404434f..7790bd5 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 9b12759..7d55f85 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 bdc1e48..de41c3d 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 e37f2a2..7fa5c13 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 3e078bf..b366d00 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 4b5b9fe..8d37923 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 27b8165..38c6a53 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 fd17ffd..4d1eac1 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 b6ffa2b..4ea1d9d 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 98eae40..58086d5 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 cdc2da5..990c4c4 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 09b397d..9ab720b 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 fd0da52..8ad0bd1 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 78e77a0..c2c9af5 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 2aa0e9c..d318a79 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 3960934..c731f06 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 67616ca..3f3e5bb 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 be54946..f8c7495 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 9a43a8b..a859091 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 9223838..bda80ee 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 89e471c..7f5609f 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 66f9ff1..9396b3b 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 0724976..1fe454d 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 10f65b3..16318aa 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 c4c6497..84579a8 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 ce20f78..f7305b2 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 36f608b..76b4497 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 b8e11f1..371ba8d 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 f188558..9c2c44b 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 fc3be55..0a1d8c8 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 04cb9cd..f46749e 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 208e60c..5ee6c98 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 7499b31..58dadf1 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 6a29a4e..235635a 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 bae30f5..e628f8e 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 7acdbe8..37ce57d 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 a868359..721b3fa 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 2648cd0..fa1460c 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 f6f31c4..9a89606 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 d9c1eec..4a75fdc 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 048690e..1e7100c 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 7557faa..38ab1a0 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 80243d1..552a5b1 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 2712958..b6aeb0b 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 a0675c2..112988c 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 b5f729c..2369d98 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 083a975..40c534d 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 189399f..3c819fb 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 ca869ea..5c2d544 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 d4bcc67..ad00b7e 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 014f2ea..d54211b 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 f88c8c5..8525e80 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 f30c1dd..e922ddf 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 894a375..d55b941 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 a201cb1..8e8edfc 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 4823219..af6a98d 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 3112853..41a0040 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 caf95be..d0bf33a 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 0a2e998..f610a5f 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 1734552..68dbc14 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 d0ae414..b21f314 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 c2be665..e37bf3a 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 1bcf2f4..1afb7d4 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 7c6afbb..96a7175 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 9cc4081..83e6f3c 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 d79cf07..79d4e47 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 3cc53cc..35d9b3d 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 a302062..4481826 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 ffe3a77..4ca7ed0 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 8033658..74d5d3d 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 77bf117..aa141a3 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 e98fe31..7298c35 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 173e857..c8bac31 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 f3c8d9e..64a0041 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 ec0ac1a..076ca5b 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 ee791a9..4a55c30 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 a81ac82..4323f51 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 a5fb7e3..002105e 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 8aa6c7a..b6e15d7 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 650d48e..304e2cd 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 17b61c8..0d36dc0 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 59fa23a..fea412b 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 3de39d8..421367d 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 046b166..1b1cc13 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 f3f4464..8929235 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 9750094..6db3e95 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 6cfaf5d..9e598f2 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 4da7f8b..cddfddc 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 006810e..7ec8f4d 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 23491f2..05451be 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 4666e4b..d70c097 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 3e2ee07..19b703e 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 5fb0932..22d94e7 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 58c11b0..6009e65 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 8c472c3..2daa1a2 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 7edf50c..bce3873 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 53f25f4..3e43a7b 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 b14c347..bcb6d76 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 7cd83d6..be8cca3 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 2d82c83..30ecfe5 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 ad3c80f..efc4496 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 9a158cc..3ad398c 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 c098c6f..1c3733d 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 6ab09c4..61ca974 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 7e98390..1d8edcb 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 27c70e5..a2daba7 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 b4f5a2d..99a32b3 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 30bde29..3c07515 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 1a4c2db..8261315 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 1c51138..05d9311 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 cba899b..ea2fa24 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 693f0e7..b177261 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 693775a..69e909d 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 9ed5421..17adee0 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 eb7f773..2d855b7 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 d36a8d1..a02de80 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 c0ea2be..6bea47c 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 963c1a1..b65340d 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 79eb3b2..672e20b 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 ffb2a21..a7efb7e 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 3c465b6..4653f13 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 2aad33c..42f776a 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 cf127cd..9ba72e9 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 643b821..254805f 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 a0dd6ae..adedb60 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 25d9c6d..69cc9c5 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 b0b8354..ea3d9d4 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 dc0f3cc..0afeef9 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 8371f2b..4bebf4c 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 a192210..75f7ca5 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 f2a8cec..8a84c18 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 a5de4a4..49335a6 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 d294400..180fd88 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 633475a..fd5e9c6 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 c1c2d7f..2b317dd 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 8980e89..25be7b0 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 da58cd9..b343e3b 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 b8e6ece..0277585 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 732b630..cba533c 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 a64cd69..bb7f13f 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 4ef6e6e..a2ca665 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 6d183f3..519ae4e 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 0576235..6ea7e95 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 f4e90de..2bdba78 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 98e2bb2..2bb4466 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 91f3a61..55a6f7f 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;