diff --git a/core/modules/forum/src/ForumManager.php b/core/modules/forum/src/ForumManager.php
index 47cd4c8..ecc9a7f 100644
--- a/core/modules/forum/src/ForumManager.php
+++ b/core/modules/forum/src/ForumManager.php
@@ -463,7 +463,7 @@ public function resetCache() {
    * {@inheritdoc}
    */
   public function getParents($tid) {
-    return $this->entityManager->getStorageController('taxonomy_term')->loadParentsAll($tid);
+    return $this->entityManager->getStorage('taxonomy_term')->loadParentsAll($tid);
   }
 
   /**
diff --git a/core/modules/taxonomy/src/Tests/TaxonomyTermIndentationTest.php b/core/modules/taxonomy/src/Tests/TaxonomyTermIndentationTest.php
index 3279af9..1952b5d 100644
--- a/core/modules/taxonomy/src/Tests/TaxonomyTermIndentationTest.php
+++ b/core/modules/taxonomy/src/Tests/TaxonomyTermIndentationTest.php
@@ -66,7 +66,7 @@ function testTermIndentation() {
     $this->assertNoPattern('|<div class="indentation">&nbsp;</div>|');
 
     // Check explicitly that term 2 has no parents.
-    \Drupal::entityManager()->getStorageController('taxonomy_term')->resetCache();
+    \Drupal::entityManager()->getStorage('taxonomy_term')->resetCache();
     $parents = taxonomy_term_load_parents($term2->id());
     $this->assertTrue(empty($parents), 'Term 2 has no parents now');
   }
diff --git a/core/modules/taxonomy/src/Tests/TermTest.php b/core/modules/taxonomy/src/Tests/TermTest.php
index f9aef57..c6a8ccc 100644
--- a/core/modules/taxonomy/src/Tests/TermTest.php
+++ b/core/modules/taxonomy/src/Tests/TermTest.php
@@ -432,7 +432,7 @@ function testTermReorder() {
 
     // Fetch the created terms in the default alphabetical order, i.e. term1
     // precedes term2 alphabetically, and term2 precedes term3.
-    \Drupal::entityManager()->getStorageController('taxonomy_term')->resetCache();
+    \Drupal::entityManager()->getStorage('taxonomy_term')->resetCache();
     list($term1, $term2, $term3) = taxonomy_get_tree($this->vocabulary->id(), 0, NULL, TRUE);
 
     $this->drupalGet('admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/overview');
@@ -457,7 +457,7 @@ function testTermReorder() {
     );
     $this->drupalPostForm(NULL, $edit, t('Save'));
 
-    \Drupal::entityManager()->getStorageController('taxonomy_term')->resetCache();
+    \Drupal::entityManager()->getStorage('taxonomy_term')->resetCache();
     $terms = taxonomy_get_tree($this->vocabulary->id());
     $this->assertEqual($terms[0]->tid, $term2->id(), 'Term 2 was moved above term 1.');
     $this->assertEqual($terms[1]->parents, array($term2->id()), 'Term 3 was made a child of term 2.');