diff --git a/core/modules/entity/lib/Drupal/entity/EntityDisplayModeBase.php b/core/modules/entity/lib/Drupal/entity/EntityDisplayModeBase.php
index 9309fad..57b37cb 100644
--- a/core/modules/entity/lib/Drupal/entity/EntityDisplayModeBase.php
+++ b/core/modules/entity/lib/Drupal/entity/EntityDisplayModeBase.php
@@ -92,16 +92,16 @@ public function calculateDependencies() {
   /**
    * {@inheritdoc}
    */
-  public function preSave(EntityStorageInterface $storage_controller) {
-    parent::preSave($storage_controller);
+  public function preSave(EntityStorageInterface $storage) {
+    parent::preSave($storage);
     \Drupal::entityManager()->clearCachedDefinitions();
   }
 
   /**
    * {@inheritdoc}
    */
-  public static function preDelete(EntityStorageInterface $storage_controller, array $entities) {
-    parent::preDelete($storage_controller, $entities);
+  public static function preDelete(EntityStorageInterface $storage, array $entities) {
+    parent::preDelete($storage, $entities);
     \Drupal::entityManager()->clearCachedDefinitions();
   }
 
diff --git a/core/modules/field/tests/Drupal/field/Tests/FieldInstanceConfigEntityUnitTest.php b/core/modules/field/tests/Drupal/field/Tests/FieldInstanceConfigEntityUnitTest.php
index 64c1dc7..d8a43d4 100644
--- a/core/modules/field/tests/Drupal/field/Tests/FieldInstanceConfigEntityUnitTest.php
+++ b/core/modules/field/tests/Drupal/field/Tests/FieldInstanceConfigEntityUnitTest.php
@@ -109,8 +109,8 @@ public function testCalculateDependencies() {
       ->method('getConfigDependencyName')
       ->will($this->returnValue('test.test_entity_type.id'));
 
-    $storage_controller = $this->getMock('\Drupal\Core\Config\Entity\ConfigEntityStorageInterface');
-    $storage_controller
+    $storage = $this->getMock('\Drupal\Core\Config\Entity\ConfigEntityStorageInterface');
+    $storage
       ->expects($this->any())
       ->method('load')
       ->with('test_bundle')
@@ -119,7 +119,7 @@ public function testCalculateDependencies() {
     $this->entityManager->expects($this->any())
       ->method('getStorage')
       ->with('bundle_entity_type')
-      ->will($this->returnValue($storage_controller));
+      ->will($this->returnValue($storage));
 
     $target_entity_type = $this->getMock('\Drupal\Core\Entity\EntityTypeInterface');
     $target_entity_type->expects($this->any())
diff --git a/core/modules/forum/tests/Drupal/forum/Tests/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php b/core/modules/forum/tests/Drupal/forum/Tests/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php
index e2f1f19..22d3618 100644
--- a/core/modules/forum/tests/Drupal/forum/Tests/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php
+++ b/core/modules/forum/tests/Drupal/forum/Tests/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php
@@ -94,8 +94,8 @@ public function testBuild() {
       ->method('label')
       ->will($this->returnValue('Fora_is_the_plural_of_forum'));
 
-    $vocab_storage_controller = $this->getMock('Drupal\Core\Entity\EntityStorageInterface');
-    $vocab_storage_controller->expects($this->any())
+    $vocab_storage = $this->getMock('Drupal\Core\Entity\EntityStorageInterface');
+    $vocab_storage->expects($this->any())
       ->method('load')
       ->will($this->returnValueMap(array(
         array('forums', $vocab_item),
@@ -107,7 +107,7 @@ public function testBuild() {
     $entity_manager->expects($this->any())
       ->method('getStorage')
       ->will($this->returnValueMap(array(
-        array('taxonomy_vocabulary', $vocab_storage_controller),
+        array('taxonomy_vocabulary', $vocab_storage),
       )));
 
     $config_factory = $this->getConfigFactoryStub(
diff --git a/core/modules/forum/tests/Drupal/forum/Tests/Breadcrumb/ForumListingBreadcrumbBuilderTest.php b/core/modules/forum/tests/Drupal/forum/Tests/Breadcrumb/ForumListingBreadcrumbBuilderTest.php
index 5f94c00..2aa2804 100644
--- a/core/modules/forum/tests/Drupal/forum/Tests/Breadcrumb/ForumListingBreadcrumbBuilderTest.php
+++ b/core/modules/forum/tests/Drupal/forum/Tests/Breadcrumb/ForumListingBreadcrumbBuilderTest.php
@@ -152,8 +152,8 @@ public function testBuild() {
     $vocab_item->expects($this->any())
       ->method('label')
       ->will($this->returnValue('Fora_is_the_plural_of_forum'));
-    $vocab_storage_controller = $this->getMock('Drupal\Core\Entity\EntityStorageInterface');
-    $vocab_storage_controller->expects($this->any())
+    $vocab_storage = $this->getMock('Drupal\Core\Entity\EntityStorageInterface');
+    $vocab_storage->expects($this->any())
       ->method('load')
       ->will($this->returnValueMap(array(
         array('forums', $vocab_item),
@@ -165,7 +165,7 @@ public function testBuild() {
     $entity_manager->expects($this->any())
       ->method('getStorage')
       ->will($this->returnValueMap(array(
-        array('taxonomy_vocabulary', $vocab_storage_controller),
+        array('taxonomy_vocabulary', $vocab_storage),
       )));
 
     $config_factory = $this->getConfigFactoryStub(
diff --git a/core/modules/forum/tests/Drupal/forum/Tests/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php b/core/modules/forum/tests/Drupal/forum/Tests/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php
index 61bd36f..4a12d0d 100644
--- a/core/modules/forum/tests/Drupal/forum/Tests/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php
+++ b/core/modules/forum/tests/Drupal/forum/Tests/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php
@@ -160,8 +160,8 @@ public function testBuild() {
     $vocab_item->expects($this->any())
       ->method('label')
       ->will($this->returnValue('Forums'));
-    $vocab_storage_controller = $this->getMock('Drupal\Core\Entity\EntityStorageInterface');
-    $vocab_storage_controller->expects($this->any())
+    $vocab_storage = $this->getMock('Drupal\Core\Entity\EntityStorageInterface');
+    $vocab_storage->expects($this->any())
       ->method('load')
       ->will($this->returnValueMap(array(
         array('forums', $vocab_item),
@@ -173,7 +173,7 @@ public function testBuild() {
     $entity_manager->expects($this->any())
       ->method('getStorage')
       ->will($this->returnValueMap(array(
-        array('taxonomy_vocabulary', $vocab_storage_controller),
+        array('taxonomy_vocabulary', $vocab_storage),
       )));
 
     $config_factory = $this->getConfigFactoryStub(