diff --git a/core/lib/Drupal/Core/CoreBundle.php b/core/lib/Drupal/Core/CoreBundle.php
index fb8218a..2ab4e3e 100644
--- a/core/lib/Drupal/Core/CoreBundle.php
+++ b/core/lib/Drupal/Core/CoreBundle.php
@@ -21,11 +21,7 @@
 use Symfony\Component\DependencyInjection\Compiler\PassConfig;
 
 /**
- * Bundle class for mandatory core services.
- *
- * This is where Drupal core registers all of its services to the Dependency
- * Injection Container. Modules wishing to register services to the container
- * should extend Symfony's Bundle class directly, not this class.
+ * Registers core Drupal services.
  */
 class CoreBundle extends Bundle {
 
diff --git a/core/modules/ban/lib/Drupal/ban/BanBundle.php b/core/modules/ban/lib/Drupal/ban/BanBundle.php
index e9a92bb..e256041 100644
--- a/core/modules/ban/lib/Drupal/ban/BanBundle.php
+++ b/core/modules/ban/lib/Drupal/ban/BanBundle.php
@@ -12,7 +12,7 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Defines the Ban bundle.
+ * Registers Ban module services.
  */
 class BanBundle extends Bundle {
 
diff --git a/core/modules/block/lib/Drupal/block/BlockBundle.php b/core/modules/block/lib/Drupal/block/BlockBundle.php
index a20d06a..530dfdd 100644
--- a/core/modules/block/lib/Drupal/block/BlockBundle.php
+++ b/core/modules/block/lib/Drupal/block/BlockBundle.php
@@ -11,7 +11,7 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Provides the block dependency injection container.
+ * Registers Block module services.
  */
 class BlockBundle extends Bundle {
 
diff --git a/core/modules/edit/lib/Drupal/edit/EditBundle.php b/core/modules/edit/lib/Drupal/edit/EditBundle.php
index d92fd73..87235b4 100644
--- a/core/modules/edit/lib/Drupal/edit/EditBundle.php
+++ b/core/modules/edit/lib/Drupal/edit/EditBundle.php
@@ -12,7 +12,7 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Edit dependency injection container.
+ * Registers Edit module services.
  */
 class EditBundle extends Bundle {
 
diff --git a/core/modules/field/lib/Drupal/field/FieldBundle.php b/core/modules/field/lib/Drupal/field/FieldBundle.php
index 7fd0ddf..e20ec8d 100644
--- a/core/modules/field/lib/Drupal/field/FieldBundle.php
+++ b/core/modules/field/lib/Drupal/field/FieldBundle.php
@@ -11,7 +11,7 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Field dependency injection container.
+ * Registers Field module services.
  */
 class FieldBundle extends Bundle {
 
diff --git a/core/modules/field_sql_storage/lib/Drupal/field_sql_storage/FieldSqlStorageBundle.php b/core/modules/field_sql_storage/lib/Drupal/field_sql_storage/FieldSqlStorageBundle.php
index 2d5f996..dcf4ba8 100644
--- a/core/modules/field_sql_storage/lib/Drupal/field_sql_storage/FieldSqlStorageBundle.php
+++ b/core/modules/field_sql_storage/lib/Drupal/field_sql_storage/FieldSqlStorageBundle.php
@@ -11,6 +11,9 @@
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
+/**
+ * Registers Field SQL Storage module services.
+ */
 class FieldSqlStorageBundle extends Bundle {
 
   public function build(ContainerBuilder $container) {
diff --git a/core/modules/file/lib/Drupal/file/FileBundle.php b/core/modules/file/lib/Drupal/file/FileBundle.php
index 79618ad..eb3eb24 100644
--- a/core/modules/file/lib/Drupal/file/FileBundle.php
+++ b/core/modules/file/lib/Drupal/file/FileBundle.php
@@ -11,6 +11,9 @@
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
+/**
+ * Registers File module services.
+ */
 class FileBundle extends Bundle {
   public function build(ContainerBuilder $container) {
     $container->register('file.usage', 'Drupal\file\FileUsage\DatabaseFileUsageBackend')
diff --git a/core/modules/jsonld/lib/Drupal/jsonld/JsonldBundle.php b/core/modules/jsonld/lib/Drupal/jsonld/JsonldBundle.php
index 00f1433..231799e 100644
--- a/core/modules/jsonld/lib/Drupal/jsonld/JsonldBundle.php
+++ b/core/modules/jsonld/lib/Drupal/jsonld/JsonldBundle.php
@@ -13,7 +13,7 @@
 use Symfony\Component\Serializer\Serializer;
 
 /**
- * Jsonld dependency injection container.
+ * Registers JSON-LD module services.
  */
 class JsonldBundle extends Bundle {
 
diff --git a/core/modules/layout/lib/Drupal/layout/LayoutBundle.php b/core/modules/layout/lib/Drupal/layout/LayoutBundle.php
index 59b8513..11bdd4e 100644
--- a/core/modules/layout/lib/Drupal/layout/LayoutBundle.php
+++ b/core/modules/layout/lib/Drupal/layout/LayoutBundle.php
@@ -11,7 +11,7 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Layout dependency injection container.
+ * Registers Layout module services.
  */
 class LayoutBundle extends Bundle {
 
diff --git a/core/modules/rdf/lib/Drupal/rdf/RdfBundle.php b/core/modules/rdf/lib/Drupal/rdf/RdfBundle.php
index 40affcc..04994c9 100644
--- a/core/modules/rdf/lib/Drupal/rdf/RdfBundle.php
+++ b/core/modules/rdf/lib/Drupal/rdf/RdfBundle.php
@@ -12,7 +12,7 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * RDF dependency injection container.
+ * Registers RDF module services.
  */
 class RdfBundle extends Bundle {
 
diff --git a/core/modules/rdf/tests/rdf_test_mapping/lib/Drupal/rdf_test_mapping/RdfTestMappingBundle.php b/core/modules/rdf/tests/rdf_test_mapping/lib/Drupal/rdf_test_mapping/RdfTestMappingBundle.php
index 3de3980..1658ffd 100644
--- a/core/modules/rdf/tests/rdf_test_mapping/lib/Drupal/rdf_test_mapping/RdfTestMappingBundle.php
+++ b/core/modules/rdf/tests/rdf_test_mapping/lib/Drupal/rdf_test_mapping/RdfTestMappingBundle.php
@@ -11,7 +11,7 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * RDF dependency injection container.
+ * Registers "RDF module mapping test" module services.
  */
 class RdfTestMappingBundle extends Bundle {
 
diff --git a/core/modules/rest/lib/Drupal/rest/RestBundle.php b/core/modules/rest/lib/Drupal/rest/RestBundle.php
index 67d3c59..c3d8cfb 100644
--- a/core/modules/rest/lib/Drupal/rest/RestBundle.php
+++ b/core/modules/rest/lib/Drupal/rest/RestBundle.php
@@ -12,7 +12,7 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Rest dependency injection container.
+ * Registers REST module services.
  */
 class RestBundle extends Bundle {
 
diff --git a/core/modules/system/lib/Drupal/system/SystemBundle.php b/core/modules/system/lib/Drupal/system/SystemBundle.php
index 8662169..037418a 100644
--- a/core/modules/system/lib/Drupal/system/SystemBundle.php
+++ b/core/modules/system/lib/Drupal/system/SystemBundle.php
@@ -11,7 +11,7 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * System dependency injection container.
+ * Registers System module services.
  */
 class SystemBundle extends Bundle {
 
diff --git a/core/modules/system/tests/modules/bundle_test/lib/Drupal/bundle_test/BundleTestBundle.php b/core/modules/system/tests/modules/bundle_test/lib/Drupal/bundle_test/BundleTestBundle.php
index 21a62d5..cddd57b 100644
--- a/core/modules/system/tests/modules/bundle_test/lib/Drupal/bundle_test/BundleTestBundle.php
+++ b/core/modules/system/tests/modules/bundle_test/lib/Drupal/bundle_test/BundleTestBundle.php
@@ -13,7 +13,7 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Test bundle class.
+ * Registers Bundle Test module services.
  */
 class BundleTestBundle extends Bundle
 {
diff --git a/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/RouterTestBundle.php b/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/RouterTestBundle.php
index f2e123b..7ef4f1a 100644
--- a/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/RouterTestBundle.php
+++ b/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/RouterTestBundle.php
@@ -11,7 +11,7 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Registers a dynamic route provider.
+ * Registers Router Test module services.
  */
 class RouterTestBundle extends Bundle {
 
diff --git a/core/modules/system/tests/modules/serialization_test/lib/Drupal/serialization_test/SerializationTestBundle.php b/core/modules/system/tests/modules/serialization_test/lib/Drupal/serialization_test/SerializationTestBundle.php
index 1acb3f2..1ba3e3e 100644
--- a/core/modules/system/tests/modules/serialization_test/lib/Drupal/serialization_test/SerializationTestBundle.php
+++ b/core/modules/system/tests/modules/serialization_test/lib/Drupal/serialization_test/SerializationTestBundle.php
@@ -12,7 +12,7 @@
 use Symfony\Component\Serializer\Serializer;
 
 /**
- * SerializationTest dependency injection container.
+ * Registers Serialization Test module services.
  */
 class SerializationTestBundle extends Bundle {
 
diff --git a/core/modules/system/tests/modules/url_alter_test/lib/Drupal/url_alter_test/UrlAlterTestBundle.php b/core/modules/system/tests/modules/url_alter_test/lib/Drupal/url_alter_test/UrlAlterTestBundle.php
index cd028e8..88dc883 100644
--- a/core/modules/system/tests/modules/url_alter_test/lib/Drupal/url_alter_test/UrlAlterTestBundle.php
+++ b/core/modules/system/tests/modules/url_alter_test/lib/Drupal/url_alter_test/UrlAlterTestBundle.php
@@ -11,12 +11,7 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Test bundle class for url_alter_test.
- *
- * Used to register an event subscriber that resolves a path alias to a system
- * path based on an arbitrary set of rules.
- *
- * @see \Drupal\url_alter_test\PathSubscriber
+ * Registers Url Alter Test module services.
  */
 class UrlAlterTestBundle extends Bundle
 {
diff --git a/core/modules/user/lib/Drupal/user/UserBundle.php b/core/modules/user/lib/Drupal/user/UserBundle.php
index a4e7d8d..05bdc6e 100644
--- a/core/modules/user/lib/Drupal/user/UserBundle.php
+++ b/core/modules/user/lib/Drupal/user/UserBundle.php
@@ -12,7 +12,7 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * User dependency injection container.
+ * Registers User module services.
  */
 class UserBundle extends Bundle {
 
diff --git a/core/modules/user/tests/user_custom_phpass_params_test/lib/Drupal/user_custom_phpass_params_test/UserCustomPhpassParamsTestBundle.php b/core/modules/user/tests/user_custom_phpass_params_test/lib/Drupal/user_custom_phpass_params_test/UserCustomPhpassParamsTestBundle.php
index ab68d2e..eab8c64 100644
--- a/core/modules/user/tests/user_custom_phpass_params_test/lib/Drupal/user_custom_phpass_params_test/UserCustomPhpassParamsTestBundle.php
+++ b/core/modules/user/tests/user_custom_phpass_params_test/lib/Drupal/user_custom_phpass_params_test/UserCustomPhpassParamsTestBundle.php
@@ -10,6 +10,9 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
+/**
+ * Registers "User custom phpass params test" module services.
+ */
 class UserCustomPhpassParamsTestBundle extends Bundle
 {
   public function build(ContainerBuilder $container) {
diff --git a/core/modules/views/lib/Drupal/views/ViewsBundle.php b/core/modules/views/lib/Drupal/views/ViewsBundle.php
index 544b8c3..7278b9e 100644
--- a/core/modules/views/lib/Drupal/views/ViewsBundle.php
+++ b/core/modules/views/lib/Drupal/views/ViewsBundle.php
@@ -13,7 +13,7 @@
 use Drupal\views\ViewExecutable;
 
 /**
- * Views dependency injection container.
+ * Registers Views module services.
  */
 class ViewsBundle extends Bundle {