diff --git a/core/lib/Drupal/Component/Plugin/Definition/PluginDefinitionInterface.php b/core/lib/Drupal/Component/Plugin/Definition/PluginDefinitionInterface.php
index 3aeeaec..4a7e090 100644
--- a/core/lib/Drupal/Component/Plugin/Definition/PluginDefinitionInterface.php
+++ b/core/lib/Drupal/Component/Plugin/Definition/PluginDefinitionInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Component\Plugin\PluginDefinitionInterface.
+ * Contains \Drupal\Component\Plugin\Definition\PluginDefinitionInterface.
  */
 
 namespace Drupal\Component\Plugin\Definition;
diff --git a/core/lib/Drupal/Core/Block/Plugin/Block/PageTitleBlock.php b/core/lib/Drupal/Core/Block/Plugin/Block/PageTitleBlock.php
index d134d00..45e2240 100644
--- a/core/lib/Drupal/Core/Block/Plugin/Block/PageTitleBlock.php
+++ b/core/lib/Drupal/Core/Block/Plugin/Block/PageTitleBlock.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Plugin\Block\PageTitleBlock.
+ * Contains \Drupal\Core\Block\Plugin\Block\PageTitleBlock.
  */
 
 namespace Drupal\Core\Block\Plugin\Block;
diff --git a/core/lib/Drupal/Core/Cache/CacheableJsonResponse.php b/core/lib/Drupal/Core/Cache/CacheableJsonResponse.php
index bc7d2a3..32ea2e4 100644
--- a/core/lib/Drupal/Core/Cache/CacheableJsonResponse.php
+++ b/core/lib/Drupal/Core/Cache/CacheableJsonResponse.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Cache\CacheableResponse.
+ * Contains \Drupal\Core\Cache\CacheableJsonResponse.
  */
 
 namespace Drupal\Core\Cache;
diff --git a/core/lib/Drupal/Core/Command/DbImportCommand.php b/core/lib/Drupal/Core/Command/DbImportCommand.php
index a39f6cb..5843e23 100644
--- a/core/lib/Drupal/Core/Command/DbImportCommand.php
+++ b/core/lib/Drupal/Core/Command/DbImportCommand.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Command\DbDumpCommand.
+ * Contains \Drupal\Core\Command\DbImportCommand.
  */
 
 namespace Drupal\Core\Command;
diff --git a/core/lib/Drupal/Core/Menu/Plugin/Block/LocalActionsBlock.php b/core/lib/Drupal/Core/Menu/Plugin/Block/LocalActionsBlock.php
index 42a79fc..fecd970 100644
--- a/core/lib/Drupal/Core/Menu/Plugin/Block/LocalActionsBlock.php
+++ b/core/lib/Drupal/Core/Menu/Plugin/Block/LocalActionsBlock.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Plugin\Block\LocalActionsBlock.
+ * Contains \Drupal\Core\Menu\Plugin\Block\LocalActionsBlock.
  */
 
 namespace Drupal\Core\Menu\Plugin\Block;
diff --git a/core/lib/Drupal/Core/Render/PlaceholderGenerator.php b/core/lib/Drupal/Core/Render/PlaceholderGenerator.php
index 82e9d09..a6c4a23 100644
--- a/core/lib/Drupal/Core/Render/PlaceholderGenerator.php
+++ b/core/lib/Drupal/Core/Render/PlaceholderGenerator.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Render\Placeholder.
+ * Contains \Drupal\Core\Render\PlaceholderGenerator.
  */
 
 namespace Drupal\Core\Render;
diff --git a/core/modules/ban/tests/src/Unit/Plugin/migrate/source/d7/BlockedIpsTest.php b/core/modules/ban/tests/src/Unit/Plugin/migrate/source/d7/BlockedIpsTest.php
index fc368ef..6a35255 100644
--- a/core/modules/ban/tests/src/Unit/Plugin/migrate/source/d7/BlockedIpsTest.php
+++ b/core/modules/ban/tests/src/Unit/Plugin/migrate/source/d7/BlockedIpsTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\ban\Unit\Plugin\migrate\source\d7\BlockedIps.
+ * Contains \Drupal\ban\Tests\Unit\Plugin\migrate\source\d7\BlockedIps.
  */
 
-namespace Drupal\Tests\ban\Unit\Plugin\migrate\source\d7;
+namespace Drupal\ban\Tests\Unit\Plugin\migrate\source\d7;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
diff --git a/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestContextAwareUnsatisfiedBlock.php b/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestContextAwareUnsatisfiedBlock.php
index 7232e74..f30a705 100644
--- a/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestContextAwareUnsatisfiedBlock.php
+++ b/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestContextAwareUnsatisfiedBlock.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\block_test\Plugin\Block\TestContextAwareBlock.
+ * Contains \Drupal\block_test\Plugin\Block\TestContextAwareUnsatisfiedBlock.
  */
 
 namespace Drupal\block_test\Plugin\Block;
diff --git a/core/modules/dynamic_page_cache/src/EventSubscriber/DynamicPageCacheSubscriber.php b/core/modules/dynamic_page_cache/src/EventSubscriber/DynamicPageCacheSubscriber.php
index 103b303..7602b4d 100644
--- a/core/modules/dynamic_page_cache/src/EventSubscriber/DynamicPageCacheSubscriber.php
+++ b/core/modules/dynamic_page_cache/src/EventSubscriber/DynamicPageCacheSubscriber.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\dynamic_page_cache\EventSubscriber\DynamicPageacheSubscriber.
+ * Contains \Drupal\dynamic_page_cache\EventSubscriber\DynamicPageCacheSubscriber.
  */
 
 namespace Drupal\dynamic_page_cache\EventSubscriber;
diff --git a/core/modules/field/tests/src/Unit/Plugin/migrate/source/d6/FieldInstancePerFormDisplayTest.php b/core/modules/field/tests/src/Unit/Plugin/migrate/source/d6/FieldInstancePerFormDisplayTest.php
index a57074e..82664c7 100644
--- a/core/modules/field/tests/src/Unit/Plugin/migrate/source/d6/FieldInstancePerFormDisplayTest.php
+++ b/core/modules/field/tests/src/Unit/Plugin/migrate/source/d6/FieldInstancePerFormDisplayTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\field\Unit\Plugin\migrate\source\d6\FieldInstancePerViewModeTest.
+ * Contains \Drupal\Tests\field\Unit\Plugin\migrate\source\d6\FieldInstancePerFormDisplayTest.
  */
 
 namespace Drupal\Tests\field\Unit\Plugin\migrate\source\d6;
diff --git a/core/modules/file/src/Plugin/migrate/destination/EntityFile.php b/core/modules/file/src/Plugin/migrate/destination/EntityFile.php
index 57529e1..c5e8989 100644
--- a/core/modules/file/src/Plugin/migrate/destination/EntityFile.php
+++ b/core/modules/file/src/Plugin/migrate/destination/EntityFile.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\destination\EntityFile.
+ * Contains \Drupal\file\Plugin\migrate\destination\EntityFile.
  */
 
 namespace Drupal\file\Plugin\migrate\destination;
diff --git a/core/modules/filter/src/Plugin/migrate/process/FilterSettings.php b/core/modules/filter/src/Plugin/migrate/process/FilterSettings.php
index 4a7e45b..c359c02 100644
--- a/core/modules/filter/src/Plugin/migrate/process/FilterSettings.php
+++ b/core/modules/filter/src/Plugin/migrate/process/FilterSettings.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\process\FilterSettings.
+ * Contains \Drupal\filter\Plugin\migrate\process\FilterSettings.
  */
 
 namespace Drupal\filter\Plugin\migrate\process;
diff --git a/core/modules/forum/src/Tests/Migrate/d7/MigrateForumSettingsTest.php b/core/modules/forum/src/Tests/Migrate/d7/MigrateForumSettingsTest.php
index 9eb80e7..f702b9a 100644
--- a/core/modules/forum/src/Tests/Migrate/d7/MigrateForumSettingsTest.php
+++ b/core/modules/forum/src/Tests/Migrate/d7/MigrateForumSettingsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\forum\Tests\d7\MigrateForumSettingsTest.
+ * Contains \Drupal\forum\Tests\Migrate\d7\MigrateForumSettingsTest.
  */
 
 namespace Drupal\forum\Tests\Migrate\d7;
diff --git a/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkAccessConstraintValidatorTest.php b/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkAccessConstraintValidatorTest.php
index 7089e47..b05d1c5 100644
--- a/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkAccessConstraintValidatorTest.php
+++ b/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkAccessConstraintValidatorTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\link\Plugin\Validation\Constraint\LinkAccessConstraintValidatorTest.
+ * Contains \Drupal\Tests\link\Unit\Plugin\Validation\Constraint\LinkAccessConstraintValidatorTest.
  */
 
 namespace Drupal\Tests\link\Unit\Plugin\Validation\Constraint;
diff --git a/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkExternalProtocolsConstraintValidatorTest.php b/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkExternalProtocolsConstraintValidatorTest.php
index 4fa9292..7a9c19c 100644
--- a/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkExternalProtocolsConstraintValidatorTest.php
+++ b/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkExternalProtocolsConstraintValidatorTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\link\Plugin\Validation\Constraint\LinkExternalProtocolsConstraintValidatorTest.
+ * Contains \Drupal\Tests\link\Unit\Plugin\Validation\Constraint\LinkExternalProtocolsConstraintValidatorTest.
  */
 
 namespace Drupal\Tests\link\Unit\Plugin\Validation\Constraint;
diff --git a/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkNotExistingInternalConstraintValidatorTest.php b/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkNotExistingInternalConstraintValidatorTest.php
index aa2e527..e23a45b 100644
--- a/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkNotExistingInternalConstraintValidatorTest.php
+++ b/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkNotExistingInternalConstraintValidatorTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\link\Plugin\Validation\Constraint\LinkNotExistingInternalConstraintValidatorTest.
+ * Contains \Drupal\Tests\link\Unit\Plugin\Validation\Constraint\LinkNotExistingInternalConstraintValidatorTest.
  */
 
 namespace Drupal\Tests\link\Unit\Plugin\Validation\Constraint;
diff --git a/core/modules/migrate/src/Event/MigratePreRowSaveEvent.php b/core/modules/migrate/src/Event/MigratePreRowSaveEvent.php
index d0ece73..9df2363 100644
--- a/core/modules/migrate/src/Event/MigratePreRowSaveEvent.php
+++ b/core/modules/migrate/src/Event/MigratePreRowSaveEvent.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Event\MigratePreSaveEvent.
+ * Contains \Drupal\migrate\Event\MigratePreRowSaveEvent.
  */
 
 namespace Drupal\migrate\Event;
diff --git a/core/modules/migrate/src/Tests/MigrationTest.php b/core/modules/migrate/src/Tests/MigrationTest.php
index a46b830..96dfada 100644
--- a/core/modules/migrate/src/Tests/MigrationTest.php
+++ b/core/modules/migrate/src/Tests/MigrationTest.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\migrate\Tests\MigrationTest.
+ */
+
 namespace Drupal\migrate\Tests;
 
 use Drupal\migrate\Entity\Migration;
diff --git a/core/modules/node/src/Tests/Views/NodeFieldTokensTest.php b/core/modules/node/src/Tests/Views/NodeFieldTokensTest.php
index 16a52bf..5cc96c7 100644
--- a/core/modules/node/src/Tests/Views/NodeFieldTokensTest.php
+++ b/core/modules/node/src/Tests/Views/NodeFieldTokensTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\node\Tests\NodeFieldTokensTest.
+ * Contains \Drupal\node\Tests\Views\NodeFieldTokensTest.
  */
 
 namespace Drupal\node\Tests\Views;
diff --git a/core/modules/serialization/src/Normalizer/EntityReferenceFieldItemNormalizer.php b/core/modules/serialization/src/Normalizer/EntityReferenceFieldItemNormalizer.php
index 846d883..d007bd9 100644
--- a/core/modules/serialization/src/Normalizer/EntityReferenceFieldItemNormalizer.php
+++ b/core/modules/serialization/src/Normalizer/EntityReferenceFieldItemNormalizer.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\serialization\Normalizer\FileFieldItemNormalizer.
+ * Contains \Drupal\serialization\Normalizer\EntityReferenceFieldItemNormalizer.
  */
 
 namespace Drupal\serialization\Normalizer;
diff --git a/core/modules/system/src/Plugin/migrate/process/d6/TimeZone.php b/core/modules/system/src/Plugin/migrate/process/d6/TimeZone.php
index dbb4a1d..ee18072 100644
--- a/core/modules/system/src/Plugin/migrate/process/d6/TimeZone.php
+++ b/core/modules/system/src/Plugin/migrate/process/d6/TimeZone.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\systeml\Plugin\migrate\process\d6\TimeZone.
+ * Contains \Drupal\system\Plugin\migrate\process\d6\TimeZone.
  */
 
 namespace Drupal\system\Plugin\migrate\process\d6;
diff --git a/core/modules/system/src/Tests/Update/SiteBrandingConvertedIntoBlockUpdateTest.php b/core/modules/system/src/Tests/Update/SiteBrandingConvertedIntoBlockUpdateTest.php
index a5e24ce..1dbef09 100644
--- a/core/modules/system/src/Tests/Update/SiteBrandingConvertedIntoBlockUpdateTest.php
+++ b/core/modules/system/src/Tests/Update/SiteBrandingConvertedIntoBlockUpdateTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Update\LocalActionsAndTasksConvertedIntoBlocksUpdateTest.
+ * Contains \Drupal\system\Tests\Update\SiteBrandingConvertedIntoBlockUpdateTest.
  */
 
 namespace Drupal\system\Tests\Update;
diff --git a/core/modules/system/tests/modules/early_rendering_controller_test/src/CacheableTestDomainObject.php b/core/modules/system/tests/modules/early_rendering_controller_test/src/CacheableTestDomainObject.php
index 4df64e2..64f6345 100644
--- a/core/modules/system/tests/modules/early_rendering_controller_test/src/CacheableTestDomainObject.php
+++ b/core/modules/system/tests/modules/early_rendering_controller_test/src/CacheableTestDomainObject.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\early_rendering_controller_test\AttachmentsTestDomainObject.
+ * Contains \Drupal\early_rendering_controller_test\CacheableTestDomainObject.
  */
 
 namespace Drupal\early_rendering_controller_test;
diff --git a/core/modules/system/tests/modules/form_test/src/Form/FormTestDetailsForm.php b/core/modules/system/tests/modules/form_test/src/Form/FormTestDetailsForm.php
index 8944a4c..f32f4b5 100644
--- a/core/modules/system/tests/modules/form_test/src/Form/FormTestDetailsForm.php
+++ b/core/modules/system/tests/modules/form_test/src/Form/FormTestDetailsForm.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\form_test\Form\FormTestGroupContainerForm.
+ * Contains \Drupal\form_test\Form\FormTestDetailsForm.
  */
 
 namespace Drupal\form_test\Form;
diff --git a/core/modules/system/tests/modules/render_attached_test/src/Controller/RenderAttachedTestController.php b/core/modules/system/tests/modules/render_attached_test/src/Controller/RenderAttachedTestController.php
index 9897b63..02ee87d 100644
--- a/core/modules/system/tests/modules/render_attached_test/src/Controller/RenderAttachedTestController.php
+++ b/core/modules/system/tests/modules/render_attached_test/src/Controller/RenderAttachedTestController.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\render_attached_test\Controller\TestController.
+ * Contains \Drupal\render_attached_test\Controller\RenderAttachedTestController.
  */
 
 namespace Drupal\render_attached_test\Controller;
diff --git a/core/modules/system/tests/modules/render_attached_test/src/Plugin/Block/AttachedRenderingBlock.php b/core/modules/system/tests/modules/render_attached_test/src/Plugin/Block/AttachedRenderingBlock.php
index 941689c..1980a97 100644
--- a/core/modules/system/tests/modules/render_attached_test/src/Plugin/Block/AttachedRenderingBlock.php
+++ b/core/modules/system/tests/modules/render_attached_test/src/Plugin/Block/AttachedRenderingBlock.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\render_attached_test\Plugin\Block\DrupalProcessAttachedBlock.
+ * Contains \Drupal\render_attached_test\Plugin\Block\AttachedRenderingBlock.
  */
 
 namespace Drupal\render_attached_test\Plugin\Block;
diff --git a/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldAllTermsTest.php b/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldAllTermsTest.php
index a913fa6..f4aba89 100644
--- a/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldAllTermsTest.php
+++ b/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldAllTermsTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\taxonomy\Tests\Views\TaxonomyFieldAllTerms.
+ * Contains \Drupal\taxonomy\Tests\Views\TaxonomyFieldAllTermsTest.
  */
 
 namespace Drupal\taxonomy\Tests\Views;
diff --git a/core/modules/user/src/Plugin/Menu/LoginLogoutMenuLink.php b/core/modules/user/src/Plugin/Menu/LoginLogoutMenuLink.php
index 278545c..fee7ecc 100644
--- a/core/modules/user/src/Plugin/Menu/LoginLogoutMenuLink.php
+++ b/core/modules/user/src/Plugin/Menu/LoginLogoutMenuLink.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\user\Plugin\Menu\MyAccountMenuLink.
+ * Contains \Drupal\user\Plugin\Menu\LoginLogoutMenuLink.
  */
 
 namespace Drupal\user\Plugin\Menu;
diff --git a/core/tests/Drupal/Tests/Component/Assertion/InspectorTest.php b/core/tests/Drupal/Tests/Component/Assertion/InspectorTest.php
index 7c36bda..9075128 100644
--- a/core/tests/Drupal/Tests/Component/Assertion/InspectorTest.php
+++ b/core/tests/Drupal/Tests/Component/Assertion/InspectorTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains \Drupal\Tests\Component\InspectorTest.
+ * Contains \Drupal\Tests\Component\Assertion\InspectorTest.
  */
 
 namespace Drupal\Tests\Component\Assertion;
diff --git a/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/ProxyServicesPassTest.php b/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/ProxyServicesPassTest.php
index 320ce70..a383de9 100644
--- a/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/ProxyServicesPassTest.php
+++ b/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/ProxyServicesPassTest.php
@@ -2,8 +2,7 @@
 
 /**
  * @file
- * Contains
- *   \Drupal\Tests\Core\DependencyInjection\Compiler\ProxyServicesPassTest.
+ * Contains \Drupal\Tests\Core\DependencyInjection\Compiler\ProxyServicesPassTest.
  */
 
 namespace Drupal\Tests\Core\DependencyInjection\Compiler;
diff --git a/core/tests/Drupal/Tests/Core/Extension/InfoParserUnitTest.php b/core/tests/Drupal/Tests/Core/Extension/InfoParserUnitTest.php
index 71948e1..262446e 100644
--- a/core/tests/Drupal/Tests/Core/Extension/InfoParserUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Extension/InfoParserUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Extension\InfoParserUnitTest.
+ * Contains \Drupal\Tests\Core\Extension\InfoParserUnitTest.
  */
 
 namespace Drupal\Tests\Core\Extension;