diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 0ee6f4c3f0d..31965090140 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -4,7 +4,7 @@
  * @file
  * Enables users to comment on published content.
  *
- * When enabled, the Comment module creates a field that facilitates a
+ * When installed, the Comment module creates a field that facilitates a
  * discussion board for each Drupal entity to which a comment field is attached.
  * Users can post comments to discuss a forum topic, story, collaborative
  * book page, user etc.
diff --git a/core/modules/comment/js/comment-new-indicator.js b/core/modules/comment/js/comment-new-indicator.js
index fae5cbbd586..b15e67cd14e 100644
--- a/core/modules/comment/js/comment-new-indicator.js
+++ b/core/modules/comment/js/comment-new-indicator.js
@@ -1,7 +1,8 @@
 /**
  * Attaches behaviors for the Comment module's "new" indicator.
  *
- * May only be loaded for authenticated users, with the History module enabled.
+ * May only be loaded for authenticated users, with the History module
+ * installed.
  */
 (function ($, Drupal, window) {
 
diff --git a/core/modules/comment/js/node-new-comments-link.js b/core/modules/comment/js/node-new-comments-link.js
index e1e10b20b61..2c89cf9e136 100644
--- a/core/modules/comment/js/node-new-comments-link.js
+++ b/core/modules/comment/js/node-new-comments-link.js
@@ -1,7 +1,8 @@
 /**
  * Attaches behaviors for the Comment module's "X new comments" link.
  *
- * May only be loaded for authenticated users, with the History module enabled.
+ * May only be loaded for authenticated users, with the History module
+ * installed.
  */
 (function ($, Drupal) {
 
diff --git a/core/modules/comment/src/Tests/CommentActionsTest.php b/core/modules/comment/src/Tests/CommentActionsTest.php
index 67618dae654..a0b50d6449a 100644
--- a/core/modules/comment/src/Tests/CommentActionsTest.php
+++ b/core/modules/comment/src/Tests/CommentActionsTest.php
@@ -17,7 +17,7 @@ use Drupal\comment\Entity\Comment;
 class CommentActionsTest extends CommentTestBase {
 
   /**
-   * Modules to enable.
+   * Modules to install.
    *
    * @var array
    */
diff --git a/core/modules/comment/src/Tests/CommentBlockTest.php b/core/modules/comment/src/Tests/CommentBlockTest.php
index fc6c1bfb9e0..cdbb4b04ee2 100644
--- a/core/modules/comment/src/Tests/CommentBlockTest.php
+++ b/core/modules/comment/src/Tests/CommentBlockTest.php
@@ -16,7 +16,7 @@ use Drupal\Component\Utility\String;
 class CommentBlockTest extends CommentTestBase {
 
   /**
-   * Modules to enable.
+   * Modules to install.
    *
    * @var array
    */
diff --git a/core/modules/comment/src/Tests/CommentBookTest.php b/core/modules/comment/src/Tests/CommentBookTest.php
index 6e324f3b3a5..eb20e68d715 100644
--- a/core/modules/comment/src/Tests/CommentBookTest.php
+++ b/core/modules/comment/src/Tests/CommentBookTest.php
@@ -18,7 +18,7 @@ use Drupal\simpletest\WebTestBase;
 class CommentBookTest extends WebTestBase {
 
   /**
-   * Modules to enable.
+   * Modules to install.
    *
    * @var array
    */
diff --git a/core/modules/comment/src/Tests/CommentDefaultFormatterCacheTagsTest.php b/core/modules/comment/src/Tests/CommentDefaultFormatterCacheTagsTest.php
index 8373964b97a..5e4359dbb3a 100644
--- a/core/modules/comment/src/Tests/CommentDefaultFormatterCacheTagsTest.php
+++ b/core/modules/comment/src/Tests/CommentDefaultFormatterCacheTagsTest.php
@@ -20,7 +20,7 @@ use Drupal\system\Tests\Entity\EntityUnitTestBase;
 class CommentDefaultFormatterCacheTagsTest extends EntityUnitTestBase {
 
   /**
-   * Modules to enable.
+   * Modules to install.
    *
    * @var array
    */
diff --git a/core/modules/comment/src/Tests/CommentFieldAccessTest.php b/core/modules/comment/src/Tests/CommentFieldAccessTest.php
index 83354fe622c..2d895e3cf92 100644
--- a/core/modules/comment/src/Tests/CommentFieldAccessTest.php
+++ b/core/modules/comment/src/Tests/CommentFieldAccessTest.php
@@ -25,7 +25,7 @@ use Drupal\user\Entity\Role;
 class CommentFieldAccessTest extends EntityUnitTestBase {
 
   /**
-   * Modules to enable.
+   * Modules to install.
    *
    * @var array
    */
diff --git a/core/modules/comment/src/Tests/CommentFieldsTest.php b/core/modules/comment/src/Tests/CommentFieldsTest.php
index 4b47eba64c3..4f3edea384b 100644
--- a/core/modules/comment/src/Tests/CommentFieldsTest.php
+++ b/core/modules/comment/src/Tests/CommentFieldsTest.php
@@ -19,7 +19,7 @@ use Drupal\field\Entity\FieldConfig;
 class CommentFieldsTest extends CommentTestBase {
 
   /**
-   * Enable the field UI.
+   * Install the field UI.
    *
    * @var array
    */
@@ -111,7 +111,7 @@ class CommentFieldsTest extends CommentTestBase {
     // field has been deleted.
     field_purge_batch(10);
 
-    // Disable the comment module.
+    // Uninstall the comment module.
     $edit = array();
     $edit['uninstall[comment]'] = TRUE;
     $this->drupalPostForm('admin/modules/uninstall', $edit, t('Uninstall'));
@@ -119,7 +119,7 @@ class CommentFieldsTest extends CommentTestBase {
     $this->rebuildContainer();
     $this->assertFalse($this->container->get('module_handler')->moduleExists('comment'), 'Comment module uninstalled.');
 
-    // Enable core content type module (book).
+    // Install core content type module (book).
     $edit = array();
     $edit['modules[Core][book][enable]'] = 'book';
     $this->drupalPostForm('admin/modules', $edit, t('Save configuration'));
diff --git a/core/modules/comment/src/Tests/CommentLanguageTest.php b/core/modules/comment/src/Tests/CommentLanguageTest.php
index 746aea4cc5e..03007bfc150 100644
--- a/core/modules/comment/src/Tests/CommentLanguageTest.php
+++ b/core/modules/comment/src/Tests/CommentLanguageTest.php
@@ -20,7 +20,7 @@ use Drupal\simpletest\WebTestBase;
 class CommentLanguageTest extends WebTestBase {
 
   /**
-   * Modules to enable.
+   * Modules to install.
    *
    * We also use the language_test module here to be able to turn on content
    * language negotiation. Drupal core does not provide a way in itself to do
diff --git a/core/modules/comment/src/Tests/CommentNodeAccessTest.php b/core/modules/comment/src/Tests/CommentNodeAccessTest.php
index 4c50180c46e..b50baf34e3a 100644
--- a/core/modules/comment/src/Tests/CommentNodeAccessTest.php
+++ b/core/modules/comment/src/Tests/CommentNodeAccessTest.php
@@ -20,7 +20,7 @@ use Drupal\comment\CommentManagerInterface;
 class CommentNodeAccessTest extends CommentTestBase {
 
   /**
-   * Modules to enable.
+   * Modules to install.
    *
    * @var array
    */
diff --git a/core/modules/comment/src/Tests/CommentRssTest.php b/core/modules/comment/src/Tests/CommentRssTest.php
index 9d6e4fd5e07..15ee9f4e68b 100644
--- a/core/modules/comment/src/Tests/CommentRssTest.php
+++ b/core/modules/comment/src/Tests/CommentRssTest.php
@@ -17,7 +17,7 @@ use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
 class CommentRssTest extends CommentTestBase {
 
   /**
-   * Modules to enable.
+   * Modules to install.
    *
    * @var array
    */
diff --git a/core/modules/comment/src/Tests/CommentStringIdEntitiesTest.php b/core/modules/comment/src/Tests/CommentStringIdEntitiesTest.php
index 24e933e57b6..3cb8ab0d8f9 100644
--- a/core/modules/comment/src/Tests/CommentStringIdEntitiesTest.php
+++ b/core/modules/comment/src/Tests/CommentStringIdEntitiesTest.php
@@ -18,7 +18,7 @@ use Drupal\simpletest\KernelTestBase;
 class CommentStringIdEntitiesTest extends KernelTestBase {
 
   /**
-   * Modules to enable.
+   * Modules to install.
    *
    * @var array
    */
diff --git a/core/modules/comment/src/Tests/CommentTestBase.php b/core/modules/comment/src/Tests/CommentTestBase.php
index d86e3d4a6dc..76083feee68 100644
--- a/core/modules/comment/src/Tests/CommentTestBase.php
+++ b/core/modules/comment/src/Tests/CommentTestBase.php
@@ -20,7 +20,7 @@ use Drupal\simpletest\WebTestBase;
 abstract class CommentTestBase extends WebTestBase {
 
   /**
-   * Modules to enable.
+   * Modules to install.
    *
    * @var array
    */
diff --git a/core/modules/comment/src/Tests/CommentTitleTest.php b/core/modules/comment/src/Tests/CommentTitleTest.php
index 6d64378c293..356ba1ee193 100644
--- a/core/modules/comment/src/Tests/CommentTitleTest.php
+++ b/core/modules/comment/src/Tests/CommentTitleTest.php
@@ -18,7 +18,7 @@ class CommentTitleTest extends CommentTestBase {
    * Tests markup for comments with empty titles.
    */
   public function testCommentEmptyTitles() {
-    // Enables module that sets comments to an empty string.
+    // Installs module that sets comments to an empty string.
     \Drupal::service('module_installer')->install(array('comment_empty_title_test'));
 
     // Set comments to have a subject with preview disabled.
diff --git a/core/modules/comment/src/Tests/CommentTranslationUITest.php b/core/modules/comment/src/Tests/CommentTranslationUITest.php
index 14ea0db4f6b..a11ef3f67e9 100644
--- a/core/modules/comment/src/Tests/CommentTranslationUITest.php
+++ b/core/modules/comment/src/Tests/CommentTranslationUITest.php
@@ -24,7 +24,7 @@ class CommentTranslationUITest extends ContentTranslationUITest {
   protected $subject;
 
   /**
-   * Modules to enable.
+   * Modules to install.
    *
    * @var array
    */
diff --git a/core/modules/comment/src/Tests/CommentUninstallTest.php b/core/modules/comment/src/Tests/CommentUninstallTest.php
index 53db75e8314..419932d96f5 100644
--- a/core/modules/comment/src/Tests/CommentUninstallTest.php
+++ b/core/modules/comment/src/Tests/CommentUninstallTest.php
@@ -18,7 +18,7 @@ use Drupal\simpletest\WebTestBase;
 class CommentUninstallTest extends WebTestBase {
 
   /**
-   * Modules to enable.
+   * Modules to install.
    *
    * @var array
    */
diff --git a/core/modules/comment/src/Tests/CommentValidationTest.php b/core/modules/comment/src/Tests/CommentValidationTest.php
index f468ec9d64b..cf627c42b09 100644
--- a/core/modules/comment/src/Tests/CommentValidationTest.php
+++ b/core/modules/comment/src/Tests/CommentValidationTest.php
@@ -18,7 +18,7 @@ use Drupal\system\Tests\Entity\EntityUnitTestBase;
 class CommentValidationTest extends EntityUnitTestBase {
 
   /**
-   * Modules to enable.
+   * Modules to install.
    *
    * @var array
    */
diff --git a/core/modules/comment/src/Tests/Views/CommentTestBase.php b/core/modules/comment/src/Tests/Views/CommentTestBase.php
index 06500bc0da9..5b3b8caea6a 100644
--- a/core/modules/comment/src/Tests/Views/CommentTestBase.php
+++ b/core/modules/comment/src/Tests/Views/CommentTestBase.php
@@ -16,7 +16,7 @@ use Drupal\views\Tests\ViewTestData;
 abstract class CommentTestBase extends ViewTestBase {
 
   /**
-   * Modules to enable.
+   * Modules to install.
    *
    * @var array
    */
diff --git a/core/modules/comment/src/Tests/Views/DefaultViewRecentCommentsTest.php b/core/modules/comment/src/Tests/Views/DefaultViewRecentCommentsTest.php
index 788ac4bba78..cd7031ecb64 100644
--- a/core/modules/comment/src/Tests/Views/DefaultViewRecentCommentsTest.php
+++ b/core/modules/comment/src/Tests/Views/DefaultViewRecentCommentsTest.php
@@ -19,7 +19,7 @@ use Drupal\views\Tests\ViewTestBase;
 class DefaultViewRecentCommentsTest extends ViewTestBase {
 
   /**
-   * Modules to enable.
+   * Modules to install.
    *
    * @var array
    */
diff --git a/core/modules/comment/src/Tests/Views/WizardTest.php b/core/modules/comment/src/Tests/Views/WizardTest.php
index aff98968401..c3f8693c0ce 100644
--- a/core/modules/comment/src/Tests/Views/WizardTest.php
+++ b/core/modules/comment/src/Tests/Views/WizardTest.php
@@ -19,7 +19,7 @@ use Drupal\views\Tests\Wizard\WizardTestBase;
 class WizardTest extends WizardTestBase {
 
   /**
-   * Modules to enable.
+   * Modules to install.
    *
    * @var array
    */