diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorAdminTest.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorAdminTest.php
index c1cde8f..2b7474f 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorAdminTest.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorAdminTest.php
@@ -139,7 +139,7 @@ function testAdmin() {
     );
     $this->drupalPostForm(NULL, $edit, t('Save configuration'));
     $expected_settings['plugins']['stylescombo']['styles'] = "h1.title|Title\np.callout|Callout\n\n";
-    \Drupal::entityManager()->getStorageController('editor')->resetCache();
+    \Drupal::entityManager()->getStorage('editor')->resetCache();
     $editor = entity_load('editor', 'filtered_html');
     $this->assertTrue($editor instanceof Editor, 'An Editor config entity exists.');
     $this->assertIdentical($expected_settings, $editor->settings, 'The Editor config entity has the correct settings.');
@@ -157,7 +157,7 @@ function testAdmin() {
       'editor[settings][toolbar][button_groups]' => json_encode($expected_settings['toolbar']['rows']),
     );
     $this->drupalPostForm(NULL, $edit, t('Save configuration'));
-    \Drupal::entityManager()->getStorageController('editor')->resetCache();
+    \Drupal::entityManager()->getStorage('editor')->resetCache();
     $editor = entity_load('editor', 'filtered_html');
     $this->assertTrue($editor instanceof Editor, 'An Editor config entity exists.');
     $this->assertIdentical($expected_settings, $editor->settings, 'The Editor config entity has the correct settings.');
@@ -184,7 +184,7 @@ function testAdmin() {
     $ultra_llama_mode_checkbox = $this->xpath('//input[@type="checkbox" and @name="editor[settings][plugins][llama_contextual_and_button][ultra_llama_mode]" and @checked="checked"]');
     $this->assertTrue(count($ultra_llama_mode_checkbox) === 1, 'The "Ultra llama mode" checkbox exists and is checked.');
     $expected_settings['plugins']['llama_contextual_and_button']['ultra_llama_mode'] = 1;
-    \Drupal::entityManager()->getStorageController('editor')->resetCache();
+    \Drupal::entityManager()->getStorage('editor')->resetCache();
     $editor = entity_load('editor', 'filtered_html');
     $this->assertTrue($editor instanceof Editor, 'An Editor config entity exists.');
     $this->assertIdentical($expected_settings, $editor->settings);
diff --git a/core/modules/contact/lib/Drupal/contact/Tests/ContactSitewideTest.php b/core/modules/contact/lib/Drupal/contact/Tests/ContactSitewideTest.php
index ddb216b..2d77dd0 100644
--- a/core/modules/contact/lib/Drupal/contact/Tests/ContactSitewideTest.php
+++ b/core/modules/contact/lib/Drupal/contact/Tests/ContactSitewideTest.php
@@ -405,7 +405,7 @@ function deleteCategories() {
       else {
         $this->drupalPostForm("admin/structure/contact/manage/$id/delete", array(), t('Delete'));
         $this->assertRaw(t('Category %label has been deleted.', array('%label' => $category->label())));
-        \Drupal::entityManager()->getStorageController('contact_category')->resetCache();
+        \Drupal::entityManager()->getStorage('contact_category')->resetCache();
         $this->assertFalse(entity_load('contact_category', $id), format_string('Category %category not found', array('%category' => $category->label())));
       }
     }
diff --git a/core/modules/field/field.info.inc b/core/modules/field/field.info.inc
index 361a47b..24d7eb5 100644
--- a/core/modules/field/field.info.inc
+++ b/core/modules/field/field.info.inc
@@ -41,8 +41,8 @@ function field_info_cache_clear() {
 
   // Make sure that instantiated field definition and instance entities are
   // cleared.
-  \Drupal::entityManager()->getStorageController('field_config')->resetCache();
-  \Drupal::entityManager()->getStorageController('field_instance_config')->resetCache();
+  \Drupal::entityManager()->getStorage('field_config')->resetCache();
+  \Drupal::entityManager()->getStorage('field_instance_config')->resetCache();
 
   Field::fieldInfo()->flush();
 }
diff --git a/core/modules/field/lib/Drupal/field/FieldInfo.php b/core/modules/field/lib/Drupal/field/FieldInfo.php
index 981d10f..936bb98 100644
--- a/core/modules/field/lib/Drupal/field/FieldInfo.php
+++ b/core/modules/field/lib/Drupal/field/FieldInfo.php
@@ -163,8 +163,8 @@ public function flush() {
 
     Cache::deleteTags(array('field_info' => TRUE));
 
-    \Drupal::entityManager()->getStorageController('field_config')->resetCache();
-    \Drupal::entityManager()->getStorageController('field_instance_config')->resetCache();
+    \Drupal::entityManager()->getStorage('field_config')->resetCache();
+    \Drupal::entityManager()->getStorage('field_instance_config')->resetCache();
   }
 
   /**
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageDisplayTest.php b/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageDisplayTest.php
index f440993..7b80479 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageDisplayTest.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageDisplayTest.php
@@ -85,7 +85,7 @@ function testFormatterUI() {
 
     // Submit the form and check that the display is updated.
     $this->drupalPostForm(NULL, array(), t('Save'));
-    \Drupal::entityManager()->getStorageController('entity_view_display')->resetCache();
+    \Drupal::entityManager()->getStorage('entity_view_display')->resetCache();
     $display = entity_get_display('node', $this->type, 'default');
     $display_options = $display->getComponent('field_test');
     $current_format = $display_options['type'];
@@ -180,7 +180,7 @@ public function testWidgetUI() {
 
     // Submit the form and check that the display is updated.
     $this->drupalPostForm(NULL, array(), t('Save'));
-    \Drupal::entityManager()->getStorageController('entity_form_display')->resetCache();
+    \Drupal::entityManager()->getStorage('entity_form_display')->resetCache();
     $display = entity_get_form_display('node', $this->type, 'default');
     $display_options = $display->getComponent('field_test');
     $current_widget = $display_options['type'];
@@ -382,8 +382,8 @@ function assertNodeViewNoText(EntityInterface $node, $view_mode, $text, $message
   function assertNodeViewTextHelper(EntityInterface $node, $view_mode, $text, $message, $not_exists) {
     // Make sure caches on the tester side are refreshed after changes
     // submitted on the tested side.
-    \Drupal::entityManager()->getStorageController('entity_view_display')->resetCache();
-    \Drupal::entityManager()->getStorageController('entity_form_display')->resetCache();
+    \Drupal::entityManager()->getStorage('entity_view_display')->resetCache();
+    \Drupal::entityManager()->getStorage('entity_form_display')->resetCache();
     field_info_cache_clear();
 
     // Save current content so that we can restore it when we're done.
diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index 0b368ee..10e1723 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -178,7 +178,7 @@ function filter_formats(AccountInterface $account = NULL) {
 function filter_formats_reset() {
   Cache::deleteTags(array('filter_formats' => TRUE));
   drupal_static_reset('filter_formats');
-  \Drupal::entityManager()->getStorageController('filter_format')->resetCache();
+  \Drupal::entityManager()->getStorage('filter_format')->resetCache();
 }
 
 /**
diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterAdminTest.php b/core/modules/filter/lib/Drupal/filter/Tests/FilterAdminTest.php
index c6e22aa..69034f7 100644
--- a/core/modules/filter/lib/Drupal/filter/Tests/FilterAdminTest.php
+++ b/core/modules/filter/lib/Drupal/filter/Tests/FilterAdminTest.php
@@ -178,7 +178,7 @@ function testFilterAdmin() {
     ));
     $this->assertTrue(!empty($elements), 'Reorder confirmed in admin interface.');
 
-    \Drupal::entityManager()->getStorageController('filter_format')->resetCache();
+    \Drupal::entityManager()->getStorage('filter_format')->resetCache();
     $filter_format = entity_load('filter_format', $restricted);
     foreach ($filter_format->filters() as $filter_name => $filter) {
       if ($filter_name == $second_filter || $filter_name == $first_filter) {
diff --git a/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php b/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php
index 165ea0e..3781896 100644
--- a/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php
+++ b/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php
@@ -336,7 +336,7 @@ function editForumVocabulary() {
     $this->assertRaw(t('Updated vocabulary %name.', array('%name' => $edit['name'])), 'Vocabulary was edited');
 
     // Reset cache.
-    \Drupal::entityManager()->getStorageController('taxonomy_vocabulary')->resetCache();
+    \Drupal::entityManager()->getStorage('taxonomy_vocabulary')->resetCache();
 
     // Grab the newly edited vocabulary.
     $current_vocabulary = entity_load('taxonomy_vocabulary', $vid);
diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageAdminStylesTest.php b/core/modules/image/lib/Drupal/image/Tests/ImageAdminStylesTest.php
index 184178e..d8bf9bf 100644
--- a/core/modules/image/lib/Drupal/image/Tests/ImageAdminStylesTest.php
+++ b/core/modules/image/lib/Drupal/image/Tests/ImageAdminStylesTest.php
@@ -249,7 +249,7 @@ function testStyle() {
     $this->drupalPostForm($style_path . '/delete', array(), t('Delete'));
 
     // Reset cache.
-    \Drupal::entityManager()->getStorageController('image_style')->resetCache();
+    \Drupal::entityManager()->getStorage('image_style')->resetCache();
 
     // Confirm the style directory has been removed.
     $directory = file_default_scheme() . '://styles/' . $style_name;
diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php b/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php
index b56df71..e3ad510 100644
--- a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php
+++ b/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php
@@ -234,7 +234,7 @@ public function testDefaultImages() {
     );
 
     // Reset cache.
-    \Drupal::entityManager()->getStorageController('entity_view_display')->resetCache();
+    \Drupal::entityManager()->getStorage('entity_view_display')->resetCache();
 
     // Reload the nodes.
     $article_built = node_view($article = node_load($article->id(),  TRUE));
@@ -272,7 +272,7 @@ public function testDefaultImages() {
     );
 
     // Reset cache.
-    \Drupal::entityManager()->getStorageController('entity_view_display')->resetCache();
+    \Drupal::entityManager()->getStorage('entity_view_display')->resetCache();
 
     // Reload the nodes.
     $article_built = node_view($article = node_load($article->id(), TRUE));
diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php b/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
index 5fa0481..7df6a7f 100644
--- a/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
+++ b/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
@@ -216,7 +216,7 @@ function deleteCustomMenu() {
     $this->drupalPostForm("admin/structure/menu/manage/$menu_name/delete", array(), t('Delete'));
 
     // Reset cache.
-    \Drupal::entityManager()->getStorageController('menu')->resetCache();
+    \Drupal::entityManager()->getStorage('menu')->resetCache();
 
     $this->assertResponse(200);
     $this->assertRaw(t('The custom menu %title has been deleted.', array('%title' => $label)), 'Custom menu was deleted');
diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldTest.php b/core/modules/options/lib/Drupal/options/Tests/OptionsFieldTest.php
index 3e2351f..cba75e3 100644
--- a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldTest.php
+++ b/core/modules/options/lib/Drupal/options/Tests/OptionsFieldTest.php
@@ -62,7 +62,7 @@ function testUpdateAllowedValues() {
     $this->field->save();
 
     // Reset cache.
-    \Drupal::entityManager()->getStorageController('entity_form_display')->resetCache();
+    \Drupal::entityManager()->getStorage('entity_form_display')->resetCache();
 
     $entity = entity_create('entity_test');
     $form = \Drupal::service('entity.form_builder')->getForm($entity);
@@ -75,7 +75,7 @@ function testUpdateAllowedValues() {
     $this->field->save();
 
     // Reset cache.
-    \Drupal::entityManager()->getStorageController('entity_form_display')->resetCache();
+    \Drupal::entityManager()->getStorage('entity_form_display')->resetCache();
 
     // The entity holds an outdated field object with the old allowed values
     // setting, so we need to reintialize the entity object.
diff --git a/core/modules/path/lib/Drupal/path/Tests/PathLanguageTest.php b/core/modules/path/lib/Drupal/path/Tests/PathLanguageTest.php
index b604f7f..1ab0f09 100644
--- a/core/modules/path/lib/Drupal/path/Tests/PathLanguageTest.php
+++ b/core/modules/path/lib/Drupal/path/Tests/PathLanguageTest.php
@@ -68,7 +68,7 @@ function setUp() {
     $this->drupalPostForm('admin/config/regional/content-language', $edit, t('Save'));
 
     // Reset cache.
-    \Drupal::entityManager()->getStorageController('node')->resetCache();
+    \Drupal::entityManager()->getStorage('node')->resetCache();
 
     // Ensure configuration changes are picked up in the host environment.
     Field::fieldInfo()->flush();
@@ -144,7 +144,7 @@ function testAliasTranslation() {
     $this->drupalPostForm("user/" . $this->web_user->id() . "/edit", $edit, t('Save'));
 
     // Reset cache.
-    \Drupal::entityManager()->getStorageController('node')->resetCache();
+    \Drupal::entityManager()->getStorage('node')->resetCache();
 
     // Check that the English alias works. In this situation French is the
     // current UI and content language, while URL language is English (since we
diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchRankingTest.php b/core/modules/search/lib/Drupal/search/Tests/SearchRankingTest.php
index b7610af..5b9cbcc 100644
--- a/core/modules/search/lib/Drupal/search/Tests/SearchRankingTest.php
+++ b/core/modules/search/lib/Drupal/search/Tests/SearchRankingTest.php
@@ -125,7 +125,7 @@ public function testRankings() {
       $this->drupalGet('admin/config/search/settings/manage/node_search');
       $this->assertTrue($this->xpath('//select[@id="edit-rankings-' . $node_rank . '"]//option[@value="10"]'), 'Select list to prioritize ' . $node_rank . ' for node ranks is visible and set to 10.');
 
-      \Drupal::entityManager()->getStorageController('search_page')->resetCache(array('node_search'));
+      \Drupal::entityManager()->getStorage('search_page')->resetCache(array('node_search'));
       // Reload the plugin to get the up-to-date values.
       $this->nodeSearch = entity_load('search_page', 'node_search');
       // Do the search and assert the results.
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutLinksTest.php b/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutLinksTest.php
index ef496a2..8b71d15 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutLinksTest.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutLinksTest.php
@@ -62,7 +62,7 @@ public function testShortcutLinkAdd() {
       $this->assertResponse(200);
 
       // Reset cache.
-      \Drupal::entityManager()->getStorageController('shortcut_set')->resetCache();
+      \Drupal::entityManager()->getStorage('shortcut_set')->resetCache();
 
       $saved_set = shortcut_set_load($set->id());
       $paths = $this->getShortcutInformation($saved_set, 'path');
@@ -116,7 +116,7 @@ public function testShortcutLinkRename() {
     $this->drupalPostForm('admin/config/user-interface/shortcut/link/' . $shortcut->id(), array('title' => $new_link_name, 'path' => $shortcut->path->value), t('Save'));
 
     // Reset cache.
-    \Drupal::entityManager()->getStorageController('shortcut_set')->resetCache();
+    \Drupal::entityManager()->getStorage('shortcut_set')->resetCache();
 
     $saved_set = shortcut_set_load($set->id());
     $titles = $this->getShortcutInformation($saved_set, 'title');
@@ -138,7 +138,7 @@ public function testShortcutLinkChangePath() {
     $this->drupalPostForm('admin/config/user-interface/shortcut/link/' . $shortcut->id(), array('title' => $shortcut->getTitle(), 'path' => $new_link_path), t('Save'));
 
     // Reset cache.
-    \Drupal::entityManager()->getStorageController('shortcut_set')->resetCache();
+    \Drupal::entityManager()->getStorage('shortcut_set')->resetCache();
 
     $saved_set = shortcut_set_load($set->id());
     $paths = $this->getShortcutInformation($saved_set, 'path');
@@ -170,7 +170,7 @@ public function testShortcutLinkDelete() {
     $this->drupalPostForm('admin/config/user-interface/shortcut/link/' . $shortcut->id() . '/delete', array(), 'Delete');
 
     // Reset cache.
-    \Drupal::entityManager()->getStorageController('shortcut_set')->resetCache();
+    \Drupal::entityManager()->getStorage('shortcut_set')->resetCache();
 
     $saved_set = shortcut_set_load($set->id());
     $ids = $this->getShortcutInformation($saved_set, 'id');
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutSetsTest.php b/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutSetsTest.php
index 6f7cee8..b5dafbc 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutSetsTest.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutSetsTest.php
@@ -33,7 +33,7 @@ function testShortcutSetAdd() {
     $this->drupalPostForm(NULL, $edit, t('Save'));
 
     // Reset cache.
-    \Drupal::entityManager()->getStorageController('shortcut_set')->resetCache();
+    \Drupal::entityManager()->getStorage('shortcut_set')->resetCache();
 
     $new_set = $this->container->get('entity.manager')->getStorage('shortcut_set')->load($edit['id']);
     $this->assertIdentical($new_set->id(), $edit['id'], 'Successfully created a shortcut set.');
@@ -104,7 +104,7 @@ function testShortcutSetRename() {
     $this->drupalPostForm(NULL, array('label' => $new_label), t('Save'));
 
     // Reset cache.
-    \Drupal::entityManager()->getStorageController('shortcut_set')->resetCache();
+    \Drupal::entityManager()->getStorage('shortcut_set')->resetCache();
 
     $set = shortcut_set_load($set->id());
     $this->assertTrue($set->label() == $new_label, 'Shortcut set has been successfully renamed.');
diff --git a/core/modules/text/lib/Drupal/text/Tests/TextFieldTest.php b/core/modules/text/lib/Drupal/text/Tests/TextFieldTest.php
index 8fe4747..097d450 100644
--- a/core/modules/text/lib/Drupal/text/Tests/TextFieldTest.php
+++ b/core/modules/text/lib/Drupal/text/Tests/TextFieldTest.php
@@ -82,7 +82,7 @@ function testTextFieldValidation() {
    */
   function testTextfieldWidgets() {
     $this->_testTextfieldWidgets('text', 'text_textfield');
-    \Drupal::entityManager()->getStorageController('entity_view_display')->resetCache();
+    \Drupal::entityManager()->getStorage('entity_view_display')->resetCache();
     $this->_testTextfieldWidgets('text_long', 'text_textarea');
   }
 
@@ -150,7 +150,7 @@ function _testTextfieldWidgets($field_type, $widget_type) {
    */
   function testTextfieldWidgetsFormatted() {
     $this->_testTextfieldWidgetsFormatted('text', 'text_textfield');
-    \Drupal::entityManager()->getStorageController('entity_view_display')->resetCache();
+    \Drupal::entityManager()->getStorage('entity_view_display')->resetCache();
     $this->_testTextfieldWidgetsFormatted('text_long', 'text_textarea');
   }
 
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserPermissionsTest.php b/core/modules/user/lib/Drupal/user/Tests/UserPermissionsTest.php
index 32a01e7..4a337c6 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserPermissionsTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserPermissionsTest.php
@@ -96,7 +96,7 @@ function testAdministratorRole() {
     $this->drupalPostForm('admin/modules', $edit, t('Save configuration'));
 
     // Reset cache.
-    \Drupal::entityManager()->getStorageController('user_role')->resetCache();
+    \Drupal::entityManager()->getStorage('user_role')->resetCache();
 
     $this->assertTrue($this->admin_user->hasPermission('administer news feeds'), 'The permission was automatically assigned to the administrator role');
   }
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserRoleAdminTest.php b/core/modules/user/lib/Drupal/user/Tests/UserRoleAdminTest.php
index 5bbd156..9f9719d 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserRoleAdminTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserRoleAdminTest.php
@@ -66,7 +66,7 @@ function testRoleAdministration() {
     $this->assertRaw(t('Role %label has been updated.', array('%label' => $role_name)));
 
     // Reset cache.
-    \Drupal::entityManager()->getStorageController('user_role')->resetCache();
+    \Drupal::entityManager()->getStorage('user_role')->resetCache();
 
     $new_role = entity_load('user_role', $old_name);
     $this->assertEqual($new_role->label(), $role_name, 'The role name has been successfully changed.');
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/AccessRoleUITest.php b/core/modules/user/lib/Drupal/user/Tests/Views/AccessRoleUITest.php
index 5f977f9..bb230c7 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/AccessRoleUITest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/AccessRoleUITest.php
@@ -62,7 +62,7 @@ public function testAccessRoleUI() {
     $this->assertResponse(200);
 
     $this->drupalPostForm(NULL, array(), t('Save'));
-    $storage_controller = $entity_manager->getStorageController('view');
+    $storage_controller = $entity_manager->getStorage('view');
     $storage_controller->resetCache(array('test_access_role'));
     $view = $storage_controller->load('test_access_role');
 
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaViewTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/AreaViewTest.php
index 239d13d..04a55dc 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaViewTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/AreaViewTest.php
@@ -54,7 +54,7 @@ public function testViewArea() {
     $this->assertTrue(strpos($output, 'view-test-simple-argument') !== FALSE, 'The test view is correctly embedded.');
     $view->destroy();
 
-    \Drupal::entityManager()->getStorageController('view')->resetCache(array('test_simple_argument'));
+    \Drupal::entityManager()->getStorage('view')->resetCache(array('test_simple_argument'));
 
     $view->setArguments(array(27));
     $this->executeView($view);
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTest.php
index a4066a6..fbd1a07 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTest.php
@@ -76,7 +76,7 @@ public function testStyle() {
     $this->assertTrue(strpos($output, $random_text) !== FALSE, 'Make sure that the rendering of the row plugin appears in the output of the view.');
 
     // Reset cache.
-    \Drupal::entityManager()->getStorageController('view')->resetCache();
+    \Drupal::entityManager()->getStorage('view')->resetCache();
 
     // Test without row plugin support.
     $view = Views::getView('test_view');
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/CustomBooleanTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/CustomBooleanTest.php
index 2c68a21..fe92bfd 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/CustomBooleanTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/CustomBooleanTest.php
@@ -104,7 +104,7 @@ public function testCustomOption() {
       $this->drupalPostForm('admin/structure/views/view/test_view', array(), 'Save');
 
       // Reset cache.
-      \Drupal::entityManager()->getStorageController('view')->resetCache();
+      \Drupal::entityManager()->getStorage('view')->resetCache();
       $view = Views::getView('test_view');
       $output = $view->preview();
       $output = drupal_render($output);
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayAttachmentTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayAttachmentTest.php
index 54a051b..59ec7d8 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayAttachmentTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayAttachmentTest.php
@@ -61,7 +61,7 @@ public function testAttachmentUI() {
     $this->drupalPostForm(NULL, array(), t('Save'));
 
     // Reset cache.
-    \Drupal::entityManager()->getStorageController('view')->resetCache();
+    \Drupal::entityManager()->getStorage('view')->resetCache();
     $view = Views::getView('test_attachment_ui');
     $view->initDisplay();
     $this->assertEqual(array_keys($view->displayHandlers->get('attachment_1')->getOption('displays')), array('default', 'page_1'), 'The attached displays got saved as expected');
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayExtenderUITest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayExtenderUITest.php
index d5a99c4..e8aea7f 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayExtenderUITest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayExtenderUITest.php
@@ -48,7 +48,7 @@ public function testDisplayExtenderUI() {
     $this->drupalPostForm(NULL, array(), t('Save'));
 
     // Reset cache.
-    \Drupal::entityManager()->getStorageController('view')->resetCache();
+    \Drupal::entityManager()->getStorage('view')->resetCache();
     $view = Views::getView($view->storage->id());
     $view->initDisplay();
     $this->assertEqual($view->display_handler->getOption('test_extender_test_option'), $random_text, 'Make sure that the display extender option got saved.');
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/HandlerTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/HandlerTest.php
index 994500f..aa62940 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/HandlerTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/HandlerTest.php
@@ -111,7 +111,7 @@ public function testUICRUD() {
       $this->drupalPostForm(NULL, array(), t('Save'));
 
       // Reset cache.
-      \Drupal::entityManager()->getStorageController('view')->resetCache();
+      \Drupal::entityManager()->getStorage('view')->resetCache();
 
       $view = $this->container->get('entity.manager')->getStorage('view')->load('test_view_empty');
       $display = $view->getDisplay('default');
@@ -124,7 +124,7 @@ public function testUICRUD() {
       $this->drupalPostForm(NULL, array(), t('Save'));
 
       // Reset cache.
-      \Drupal::entityManager()->getStorageController('view')->resetCache();
+      \Drupal::entityManager()->getStorage('view')->resetCache();
 
       $view = $this->container->get('entity.manager')->getStorage('view')->load('test_view_empty');
       $display = $view->getDisplay('default');
@@ -147,7 +147,7 @@ public function testUICRUD() {
     $this->drupalPostForm(NULL, array(), t('Apply'));
 
     $this->drupalPostForm(NULL, array(), t('Save'));
-    $this->container->get('entity.manager')->getStorageController('view')->resetCache();
+    $this->container->get('entity.manager')->getStorage('view')->resetCache();
     $view = $this->container->get('entity.manager')->getStorage('view')->load('test_view_empty');
     $display = $view->getDisplay('default');
     $this->assertTrue(isset($display['display_options'][$type_info['plural']][$id]), 'Ensure the field was added to the view itself.');
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/ViewEditTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/ViewEditTest.php
index 9b6b3f6..69f215d 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/ViewEditTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/ViewEditTest.php
@@ -153,7 +153,7 @@ public function testPluginProviders() {
       // Save the plugin form, to change the plugin used.
       $this->drupalPostForm("admin/structure/views/nojs/display/test_view/default/$plugin_type", array($element_name => $plugin_options['value']), t('Apply'));
       $this->drupalPostForm('admin/structure/views/view/test_view', array(), t('Save'));
-      \Drupal::entityManager()->getStorageController('view')->resetCache(array('test_view'));
+      \Drupal::entityManager()->getStorage('view')->resetCache(array('test_view'));
       // Check the plugin provider.
       $view = Views::getView('test_view');
       $displays = $view->storage->get('display');