diff --git a/core/modules/rest/config/install/rest.settings.yml b/core/modules/rest/config/install/rest.settings.yml
index e2699fc26b274a859f57876347b6a7b04a6a1b4c..0a4434677f659ea110be7a32357aaaf352c5560d 100644
--- a/core/modules/rest/config/install/rest.settings.yml
+++ b/core/modules/rest/config/install/rest.settings.yml
@@ -1,5 +1,5 @@
 # Enable all methods on nodes.
-# You must enable Hal and Basic_auth modules for this to work. Also, if you are
+# You must install Hal and Basic_auth modules for this to work. Also, if you are
 # going to use Basic_auth in a production environment then you should consider
 # setting up SSL.
 # There are alternatives to Basic_auth in contrib such as OAuth module.
diff --git a/core/modules/rest/rest.module b/core/modules/rest/rest.module
index 1b24f80a1a1e145b46868842be87d6c8eec9df8f..99870fac57d7ae031eae7f81cf65e1aeb9635255 100644
--- a/core/modules/rest/rest.module
+++ b/core/modules/rest/rest.module
@@ -18,8 +18,8 @@ function rest_help($route_name, RouteMatchInterface $route_match) {
       $output .= '<p>' . t('The RESTful Web Services module provides a framework for exposing REST resources on your site. It provides support for content entities (see the <a href="!entity">Entity module help page</a> for more information about entities) such as content, users, taxonomy terms, etc.; REST support for content items of the Node module is enabled by default, and support for other types of content entities can be enabled. Other modules may add support for other types of REST resources. For more information, see the <a href="!rest">online documentation for the RESTful Web Services module</a>.', array('!rest' => 'https://drupal.org/documentation/modules/rest', '!entity' => \Drupal::url('help.page', array('name' => 'entity')))) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
-      $output .= '<dt>' . t('Enabling supporting modules') . '</dt>';
-      $output .= '<dd>' . t('In order to use REST on a web site, you need to install and enable modules that provide serialization and authentication services. You can use the Core module <a href="!hal">HAL</a> for serialization and <a href="!basic_auth">HTTP Basic Authentication</a> for authentication, or install a contributed or custom module.', array('!hal' => (\Drupal::moduleHandler()->moduleExists('hal')) ? \Drupal::url('help.page', array('name' => 'hal')) : '#', '!basic_auth' => (\Drupal::moduleHandler()->moduleExists('basic_auth')) ? \Drupal::url('help.page', array('name' => 'basic_auth')) : '#')) . '</dd>';
+      $output .= '<dt>' . t('Installing supporting modules') . '</dt>';
+      $output .= '<dd>' . t('In order to use REST on a web site, you need to install modules that provide serialization and authentication services. You can use the Core module <a href="!hal">HAL</a> for serialization and <a href="!basic_auth">HTTP Basic Authentication</a> for authentication, or install a contributed or custom module.', array('!hal' => (\Drupal::moduleHandler()->moduleExists('hal')) ? \Drupal::url('help.page', array('name' => 'hal')) : '#', '!basic_auth' => (\Drupal::moduleHandler()->moduleExists('basic_auth')) ? \Drupal::url('help.page', array('name' => 'basic_auth')) : '#')) . '</dd>';
       $output .= '<dt>' . t('Enabling REST support for an entity type') . '</dt>';
       $output .= '<dd>' . t('REST support for content items of the Node module is enabled by default, and support for other types of content entities can be enabled. To enable support, you can use a <a href="!config">process based on configuration editing</a> or the contributed <a href="!restui">Rest UI module</a>.', array('!config' => 'https://drupal.org/documentation/modules/rest', '!restui' => 'https://drupal.org/project/restui')) . '</dd>';
       $output .= '<dd>' . t('You will also need to grant anonymous users permission to perform each of the REST operations you want to be available, and set up authentication properly to authorize web requests.') . '</dd>';
diff --git a/core/modules/rest/src/Plugin/Derivative/EntityDerivative.php b/core/modules/rest/src/Plugin/Derivative/EntityDerivative.php
index f80694fd6b099661b3484b7064438f2a9a6b459e..888a72470b08e31901520a112ac884948ac9f4bb 100644
--- a/core/modules/rest/src/Plugin/Derivative/EntityDerivative.php
+++ b/core/modules/rest/src/Plugin/Derivative/EntityDerivative.php
@@ -123,8 +123,8 @@ public function getDerivativeDefinitions($base_plugin_definition) {
             }
             catch (RouteNotFoundException $e) {
               // If the route does not exist it means we are in a brittle state
-              // of module enabling/disabling, so we simply exclude this entity
-              // type.
+              // of module installing/uninstalling, so we simply exclude this
+              // entity type.
               unset($this->derivatives[$entity_type_id]);
               // Continue with the next entity type;
               continue 2;
diff --git a/core/modules/rest/src/Tests/AuthTest.php b/core/modules/rest/src/Tests/AuthTest.php
index 230b24cc631d6f6e42eeff8bc65adb7448adfc81..bf51c00f72b6eb9987edc8ae09230197817b1f20 100644
--- a/core/modules/rest/src/Tests/AuthTest.php
+++ b/core/modules/rest/src/Tests/AuthTest.php
@@ -17,7 +17,7 @@
 class AuthTest extends RESTTestBase {
 
   /**
-   * Modules to enable.
+   * Modules to install.
    *
    * @var array
    */
diff --git a/core/modules/rest/src/Tests/CreateTest.php b/core/modules/rest/src/Tests/CreateTest.php
index 20478c7872aff806f2129c532d11b928bbfe0d34..affdfb512f4d4abe362136c86bce8dd713af2758 100644
--- a/core/modules/rest/src/Tests/CreateTest.php
+++ b/core/modules/rest/src/Tests/CreateTest.php
@@ -17,7 +17,7 @@
 class CreateTest extends RESTTestBase {
 
   /**
-   * Modules to enable.
+   * Modules to install.
    *
    * @var array
    */
diff --git a/core/modules/rest/src/Tests/CsrfTest.php b/core/modules/rest/src/Tests/CsrfTest.php
index 84bf71f4fad130e17d9742f585628dafdfe06ddc..7ff63896aff8ecd1a3f6922786de51ae16399544 100644
--- a/core/modules/rest/src/Tests/CsrfTest.php
+++ b/core/modules/rest/src/Tests/CsrfTest.php
@@ -13,7 +13,7 @@
 class CsrfTest extends RESTTestBase {
 
   /**
-   * Modules to enable.
+   * Modules to install.
    *
    * @var array
    */
diff --git a/core/modules/rest/src/Tests/DeleteTest.php b/core/modules/rest/src/Tests/DeleteTest.php
index 6456df14577aabd2ccf946463666b929e87c7873..ada84e25c956c9de975262dcb84b5cd81f248c34 100644
--- a/core/modules/rest/src/Tests/DeleteTest.php
+++ b/core/modules/rest/src/Tests/DeleteTest.php
@@ -17,7 +17,7 @@
 class DeleteTest extends RESTTestBase {
 
   /**
-   * Modules to enable.
+   * Modules to install.
    *
    * @var array
    */
diff --git a/core/modules/rest/src/Tests/NodeTest.php b/core/modules/rest/src/Tests/NodeTest.php
index 8e59e020ef4f5f5b040860033d7889cec7a30e16..71d4c3305fbc2b75449a3800b951e9eeb4ef408b 100644
--- a/core/modules/rest/src/Tests/NodeTest.php
+++ b/core/modules/rest/src/Tests/NodeTest.php
@@ -17,7 +17,7 @@
 class NodeTest extends RESTTestBase {
 
   /**
-   * Modules to enable.
+   * Modules to install.
    *
    * Ensure that the node resource works with comment module enabled.
    *
diff --git a/core/modules/rest/src/Tests/RESTTestBase.php b/core/modules/rest/src/Tests/RESTTestBase.php
index 32fa9c3e3d91ef1d7f254220294f0968f3fb7019..2fa0331c3f306e400ac20b5150b9acbdbf47bfde 100644
--- a/core/modules/rest/src/Tests/RESTTestBase.php
+++ b/core/modules/rest/src/Tests/RESTTestBase.php
@@ -44,7 +44,7 @@ abstract class RESTTestBase extends WebTestBase {
   protected $defaultAuth;
 
   /**
-   * Modules to enable.
+   * Modules to install.
    *
    * @var array
    */
diff --git a/core/modules/rest/src/Tests/ReadTest.php b/core/modules/rest/src/Tests/ReadTest.php
index afa178bfb1b2f96cb0df31c4311e4261d1a41266..8c5a670e08d302138132aa1918e0e769639dd8c7 100644
--- a/core/modules/rest/src/Tests/ReadTest.php
+++ b/core/modules/rest/src/Tests/ReadTest.php
@@ -18,7 +18,7 @@
 class ReadTest extends RESTTestBase {
 
   /**
-   * Modules to enable.
+   * Modules to install.
    *
    * @var array
    */
diff --git a/core/modules/rest/src/Tests/ResourceTest.php b/core/modules/rest/src/Tests/ResourceTest.php
index 35e1807ed46a94edbf2059c2290a5ed12fa33b7e..1b91551df1cea2d469f6c713ec725e096d77c1ab 100644
--- a/core/modules/rest/src/Tests/ResourceTest.php
+++ b/core/modules/rest/src/Tests/ResourceTest.php
@@ -17,7 +17,7 @@
 class ResourceTest extends RESTTestBase {
 
   /**
-   * Modules to enable.
+   * Modules to install.
    *
    * @var array
    */
diff --git a/core/modules/rest/src/Tests/UpdateTest.php b/core/modules/rest/src/Tests/UpdateTest.php
index 3d133c9a89e8f0dd76c3a10e8221cd7be03c2442..57bb0abf6f9a54c58a03a25cf001c54e1015a5c7 100644
--- a/core/modules/rest/src/Tests/UpdateTest.php
+++ b/core/modules/rest/src/Tests/UpdateTest.php
@@ -18,7 +18,7 @@
 class UpdateTest extends RESTTestBase {
 
   /**
-   * Modules to enable.
+   * Modules to install.
    *
    * @var array
    */
diff --git a/core/modules/rest/src/Tests/Views/StyleSerializerTest.php b/core/modules/rest/src/Tests/Views/StyleSerializerTest.php
index 87206e0087956987c88499aeeafe92c2c672af3b..3ab6f79a44ef723eed3ca5f4cb976745ecc272f9 100644
--- a/core/modules/rest/src/Tests/Views/StyleSerializerTest.php
+++ b/core/modules/rest/src/Tests/Views/StyleSerializerTest.php
@@ -25,7 +25,7 @@
 class StyleSerializerTest extends PluginTestBase {
 
   /**
-   * Modules to enable.
+   * Modules to install.
    *
    * @var array
    */