diff --git a/core/modules/rest/lib/Drupal/rest/Tests/CreateTest.php b/core/modules/rest/lib/Drupal/rest/Tests/CreateTest.php
index a3a5c60..d6973e5 100644
--- a/core/modules/rest/lib/Drupal/rest/Tests/CreateTest.php
+++ b/core/modules/rest/lib/Drupal/rest/Tests/CreateTest.php
@@ -40,14 +40,14 @@ public function testCreate() {
 
     $this->enableService('entity:' . $entity_type, 'POST');
     // Create a user account that has the required permissions to create
-    // resources via the web API.
+    // resources via the REST API.
     $account = $this->drupalCreateUser(array('restful post entity:' . $entity_type));
     $this->drupalLogin($account);
 
     $entity_values = $this->entityValues($entity_type);
     $entity = entity_create($entity_type, $entity_values);
     $serialized = $serializer->serialize($entity, 'drupal_jsonld');
-    // Create the entity over the web API.
+    // Create the entity over the REST API.
     $this->httpRequest('entity/' . $entity_type, 'POST', $serialized, 'application/vnd.drupal.ld+json');
     $this->assertResponse(201);
 
@@ -93,7 +93,7 @@ public function testCreate() {
     $this->assertResponse(403);
     $this->assertFalse(entity_load_multiple($entity_type, NULL, TRUE), 'No entity has been created in the database.');
 
-    // Try to create a resource which is not web API enabled.
+    // Try to create a resource which is not REST API enabled.
     $this->enableService(FALSE);
     $this->drupalLogin($account);
     $this->httpRequest('entity/entity_test', 'POST', $serialized, 'application/vnd.drupal.ld+json');
diff --git a/core/modules/rest/lib/Drupal/rest/Tests/DBLogTest.php b/core/modules/rest/lib/Drupal/rest/Tests/DBLogTest.php
index d4b9cc2..9be9896 100644
--- a/core/modules/rest/lib/Drupal/rest/Tests/DBLogTest.php
+++ b/core/modules/rest/lib/Drupal/rest/Tests/DBLogTest.php
@@ -31,12 +31,12 @@ public static function getInfo() {
 
   public function setUp() {
     parent::setUp();
-    // Enable web API for the watchdog resource.
+    // Enable REST API for the watchdog resource.
     $this->enableService('dblog');
   }
 
   /**
-   * Writes a log messages and retrieves it via the web API.
+   * Writes a log messages and retrieves it via the REST API.
    */
   public function testWatchdog() {
     // Write a log message to the DB.
@@ -46,7 +46,7 @@ public function testWatchdog() {
       ->fetchField();
 
     // Create a user account that has the required permissions to read
-    // the watchdog resource via the web API.
+    // the watchdog resource via the REST API.
     $account = $this->drupalCreateUser(array('restful get dblog'));
     $this->drupalLogin($account);
 
diff --git a/core/modules/rest/lib/Drupal/rest/Tests/DeleteTest.php b/core/modules/rest/lib/Drupal/rest/Tests/DeleteTest.php
index c29e7e6..2bed8ba 100644
--- a/core/modules/rest/lib/Drupal/rest/Tests/DeleteTest.php
+++ b/core/modules/rest/lib/Drupal/rest/Tests/DeleteTest.php
@@ -38,14 +38,14 @@ public function testDelete() {
     foreach ($entity_types as $entity_type) {
       $this->enableService('entity:' . $entity_type, 'DELETE');
       // Create a user account that has the required permissions to delete
-      // resources via the web API.
+      // resources via the REST API.
       $account = $this->drupalCreateUser(array('restful delete entity:' . $entity_type));
       $this->drupalLogin($account);
 
       // Create an entity programmatically.
       $entity = $this->entityCreate($entity_type);
       $entity->save();
-      // Delete it over the web API.
+      // Delete it over the REST API.
       $response = $this->httpRequest('entity/' . $entity_type . '/' . $entity->id(), 'DELETE');
       // Clear the static cache with entity_load(), otherwise we won't see the
       // update.
@@ -69,7 +69,7 @@ public function testDelete() {
       $this->assertResponse(403);
       $this->assertNotIdentical(FALSE, entity_load($entity_type, $entity->id(), TRUE), 'The ' . $entity_type . ' entity is still in the database.');
     }
-    // Try to delete a resource which is not web API enabled.
+    // Try to delete a resource which is not REST API enabled.
     $this->enableService(FALSE);
     $account = $this->drupalCreateUser();
     $this->drupalLogin($account);
diff --git a/core/modules/rest/lib/Drupal/rest/Tests/RESTTestBase.php b/core/modules/rest/lib/Drupal/rest/Tests/RESTTestBase.php
index c428c86..0a1b6b4 100644
--- a/core/modules/rest/lib/Drupal/rest/Tests/RESTTestBase.php
+++ b/core/modules/rest/lib/Drupal/rest/Tests/RESTTestBase.php
@@ -151,10 +151,10 @@ protected function entityValues($entity_type) {
   }
 
   /**
-   * Enables the web service interface for a specific entity type.
+   * Enables the REST service interface for a specific entity type.
    *
    * @param string|FALSE $resource_type
-   *   The resource type that should get web API enabled or FALSE to disable all
+   *   The resource type that should get REST API enabled or FALSE to disable all
    *   resource types.
    * @param string $method
    *   The HTTP method to enable, e.g. GET, POST etc.
@@ -162,7 +162,7 @@ protected function entityValues($entity_type) {
    *   (Optional) The serialization format, e.g. jsonld.
    */
   protected function enableService($resource_type, $method = 'GET', $format = NULL) {
-    // Enable web API for this entity type.
+    // Enable REST API for this entity type.
     $config = config('rest.settings');
     $settings = array();
     if ($resource_type) {
@@ -176,7 +176,7 @@ protected function enableService($resource_type, $method = 'GET', $format = NULL
     $config->set('resources', $settings);
     $config->save();
 
-    // Rebuild routing cache, so that the web API paths are available.
+    // Rebuild routing cache, so that the REST API paths are available.
     drupal_container()->get('router.builder')->rebuild();
     // Reset the Simpletest permission cache, so that the new resource
     // permissions get picked up.
diff --git a/core/modules/rest/lib/Drupal/rest/Tests/ReadTest.php b/core/modules/rest/lib/Drupal/rest/Tests/ReadTest.php
index 299bdd4..e157a2d 100644
--- a/core/modules/rest/lib/Drupal/rest/Tests/ReadTest.php
+++ b/core/modules/rest/lib/Drupal/rest/Tests/ReadTest.php
@@ -40,14 +40,14 @@ public function testRead() {
     foreach ($entity_types as $entity_type) {
       $this->enableService('entity:' . $entity_type, 'GET');
       // Create a user account that has the required permissions to delete
-      // resources via the web API.
+      // resources via the REST API.
       $account = $this->drupalCreateUser(array('restful get entity:' . $entity_type));
       $this->drupalLogin($account);
 
       // Create an entity programmatically.
       $entity = $this->entityCreate($entity_type);
       $entity->save();
-      // Read it over the web API.
+      // Read it over the REST API.
       $response = $this->httpRequest('entity/' . $entity_type . '/' . $entity->id(), 'GET', NULL, 'application/vnd.drupal.ld+json');
       $this->assertResponse('200', 'HTTP response code is correct.');
       $this->assertHeader('content-type', 'application/vnd.drupal.ld+json');
@@ -72,7 +72,7 @@ public function testRead() {
       $this->assertResponse(403);
       $this->assertNull(drupal_json_decode($response), 'No valid JSON found.');
     }
-    // Try to read a resource which is not web API enabled.
+    // Try to read a resource which is not REST API enabled.
     $account = $this->drupalCreateUser();
     $this->drupalLogin($account);
     $response = $this->httpRequest('entity/user/' . $account->id(), 'GET', NULL, 'application/vnd.drupal.ld+json');
diff --git a/core/modules/rest/lib/Drupal/rest/Tests/UpdateTest.php b/core/modules/rest/lib/Drupal/rest/Tests/UpdateTest.php
index 94be2bf..c920514 100644
--- a/core/modules/rest/lib/Drupal/rest/Tests/UpdateTest.php
+++ b/core/modules/rest/lib/Drupal/rest/Tests/UpdateTest.php
@@ -40,7 +40,7 @@ public function testPatchUpdate() {
 
     $this->enableService('entity:' . $entity_type, 'PATCH');
     // Create a user account that has the required permissions to create
-    // resources via the web API.
+    // resources via the REST API.
     $account = $this->drupalCreateUser(array('restful patch entity:' . $entity_type));
     $this->drupalLogin($account);
 
@@ -55,7 +55,7 @@ public function testPatchUpdate() {
     unset($patch_entity->uuid);
     $serialized = $serializer->serialize($patch_entity, 'drupal_jsonld');
 
-    // Update the entity over the web API.
+    // Update the entity over the REST API.
     $this->httpRequest('entity/' . $entity_type . '/' . $entity->id(), 'PATCH', $serialized, 'application/vnd.drupal.ld+json');
     $this->assertResponse(204);
 
@@ -68,7 +68,7 @@ public function testPatchUpdate() {
     $normalized['field_test_text'] = array();
     $serialized = $serializer->encode($normalized, 'jsonld');
 
-    // Update the entity over the web API.
+    // Update the entity over the REST API.
     $this->httpRequest('entity/' . $entity_type . '/' . $entity->id(), 'PATCH', $serialized, 'application/vnd.drupal.ld+json');
     $this->assertResponse(204);
 
@@ -87,7 +87,7 @@ public function testPatchUpdate() {
     $this->httpRequest('entity/' . $entity_type . '/' . $entity->id(), 'PATCH', $serialized, 'application/vnd.drupal.ld+json');
     $this->assertResponse(403);
 
-    // Try to update a resource which is not web API enabled.
+    // Try to update a resource which is not REST API enabled.
     $this->enableService(FALSE);
     $this->drupalLogin($account);
     $this->httpRequest('entity/' . $entity_type . '/' . $entity->id(), 'PATCH', $serialized, 'application/vnd.drupal.ld+json');
@@ -105,7 +105,7 @@ public function testPutUpdate() {
 
     $this->enableService('entity:' . $entity_type, 'PUT');
     // Create a user account that has the required permissions to create
-    // resources via the web API.
+    // resources via the REST API.
     $account = $this->drupalCreateUser(array('restful put entity:' . $entity_type));
     $this->drupalLogin($account);
 
@@ -121,7 +121,7 @@ public function testPutUpdate() {
     $update_entity->id->value = $entity->id();
 
     $serialized = $serializer->serialize($update_entity, 'drupal_jsonld');
-    // Update the entity over the web API.
+    // Update the entity over the REST API.
     $this->httpRequest('entity/' . $entity_type . '/' . $entity->id(), 'PUT', $serialized, 'application/vnd.drupal.ld+json');
     $this->assertResponse(204);
 
@@ -157,7 +157,7 @@ public function testPutUpdate() {
     $this->httpRequest('entity/' . $entity_type . '/' . $entity->id(), 'PUT', $serialized, 'application/vnd.drupal.ld+json');
     $this->assertResponse(403);
 
-    // Try to update a resource which is not web API enabled.
+    // Try to update a resource which is not REST API enabled.
     $this->enableService(FALSE);
     $this->drupalLogin($account);
     $this->httpRequest('entity/' . $entity_type . '/' . $entity->id(), 'PUT', $serialized, 'application/vnd.drupal.ld+json');