diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/TaxonomyFormatterBase.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/TaxonomyFormatterBase.php
index 6f688da..e246ae7 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/TaxonomyFormatterBase.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/TaxonomyFormatterBase.php
@@ -36,7 +36,7 @@ public function prepareView(array $entities, $langcode, array &$items) {
       }
     }
     if ($tids) {
-      $terms = taxonomy_term_load_multiple($tids);
+      $terms = entity_load_multiple('taxonomy_term', $tids);
 
       // Iterate through the fieldable entities again to attach the loaded term
       // data.
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/LoadMultipleTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/LoadMultipleTest.php
index 501c26c..536e386 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/LoadMultipleTest.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/LoadMultipleTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\taxonomy\Tests;
 
 /**
- * Test the taxonomy_term_load_multiple() function.
+ * Test the entity_load_multiple() function.
  */
 class LoadMultipleTest extends TaxonomyTestBase {
 
@@ -28,7 +28,7 @@ function setUp() {
 
   /**
    * Create a vocabulary and some taxonomy terms, ensuring they're loaded
-   * correctly using taxonomy_term_load_multiple().
+   * correctly using entity_load_multiple().
    */
   function testTaxonomyTermMultipleLoad() {
     // Create a vocabulary.
@@ -46,7 +46,7 @@ function testTaxonomyTermMultipleLoad() {
     $this->assertEqual($count, 5, format_string('Correct number of terms were loaded. !count terms.', array('!count' => $count)));
 
     // Load the same terms again by tid.
-    $terms2 = taxonomy_term_load_multiple(array_keys($terms));
+    $terms2 = entity_load_multiple('taxonomy_term', array_keys($terms));
     $this->assertEqual($count, count($terms2), 'Five terms were loaded by tid.');
     $this->assertEqual($terms, $terms2, 'Both arrays contain the same terms.');
 
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyTest.php
index efc49c8..b5b4b47 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyTest.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyTest.php
@@ -85,7 +85,7 @@ function testTaxonomyAdminChangingWeights() {
       $this->createVocabulary();
     }
     // Get all vocabularies and change their weights.
-    $vocabularies = taxonomy_vocabulary_load_multiple();
+    $vocabularies = entity_load_multiple('taxonomy_vocabulary');
     $edit = array();
     foreach ($vocabularies as $key => $vocabulary) {
       $weight = -$vocabulary->weight;
@@ -97,7 +97,7 @@ function testTaxonomyAdminChangingWeights() {
 
     // Load the vocabularies from the database.
     $this->container->get('plugin.manager.entity')->getStorageController('taxonomy_vocabulary')->resetCache();
-    $new_vocabularies = taxonomy_vocabulary_load_multiple();
+    $new_vocabularies = entity_load_multiple('taxonomy_vocabulary');
     taxonomy_vocabulary_sort($new_vocabularies);
 
     // Check that the weights are saved in the database correctly.
@@ -111,12 +111,12 @@ function testTaxonomyAdminChangingWeights() {
    */
   function testTaxonomyAdminNoVocabularies() {
     // Delete all vocabularies.
-    $vocabularies = taxonomy_vocabulary_load_multiple();
+    $vocabularies = entity_load_multiple('taxonomy_vocabulary');
     foreach ($vocabularies as $key => $vocabulary) {
       $vocabulary->delete();
     }
     // Confirm that no vocabularies are found in the database.
-    $this->assertFalse(taxonomy_vocabulary_load_multiple(), 'No vocabularies found.');
+    $this->assertFalse(entity_load_multiple('taxonomy_vocabulary'), 'No vocabularies found.');
     $this->drupalGet('admin/structure/taxonomy');
     // Check the default message for no vocabularies.
     $this->assertText(t('No vocabularies available.'));
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyUnitTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyUnitTest.php
index fec21c3..622dd89 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyUnitTest.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyUnitTest.php
@@ -40,7 +40,7 @@ function setUp() {
    */
   function testTaxonomyVocabularyDeleteWithTerms() {
     // Delete any existing vocabularies.
-    foreach (taxonomy_vocabulary_load_multiple() as $vocabulary) {
+    foreach (entity_load_multiple('taxonomy_vocabulary') as $vocabulary) {
       $vocabulary->delete();
     }
 
@@ -90,7 +90,7 @@ function testTaxonomyVocabularyLoadStaticReset() {
 
     // Delete the vocabulary.
     $this->vocabulary->delete();
-    $vocabularies = taxonomy_vocabulary_load_multiple();
+    $vocabularies = entity_load_multiple('taxonomy_vocabulary');
     $this->assertTrue(!isset($vocabularies[$this->vocabulary->id()]), 'The vocabulary was deleted.');
   }
 
@@ -100,7 +100,7 @@ function testTaxonomyVocabularyLoadStaticReset() {
   function testTaxonomyVocabularyLoadMultiple() {
 
     // Delete any existing vocabularies.
-    foreach (taxonomy_vocabulary_load_multiple() as $vocabulary) {
+    foreach (entity_load_multiple('taxonomy_vocabulary') as $vocabulary) {
       $vocabulary->delete();
     }
 
@@ -120,17 +120,17 @@ function testTaxonomyVocabularyLoadMultiple() {
     $names = taxonomy_vocabulary_get_names();
     $this->assertEqual($names[$vocabulary1->id()], $vocabulary1->id(), 'Vocabulary 1 name found.');
 
-    // Fetch all of the vocabularies using taxonomy_vocabulary_load_multiple().
+    // Fetch all of the vocabularies using entity_load_multiple().
     // Confirm that the vocabularies are ordered by weight.
-    $vocabularies = taxonomy_vocabulary_load_multiple();
+    $vocabularies = entity_load_multiple('taxonomy_vocabulary');
     taxonomy_vocabulary_sort($vocabularies);
     $this->assertEqual(array_shift($vocabularies)->id(), $vocabulary1->id(), 'Vocabulary was found in the vocabularies array.');
     $this->assertEqual(array_shift($vocabularies)->id(), $vocabulary2->id(), 'Vocabulary was found in the vocabularies array.');
     $this->assertEqual(array_shift($vocabularies)->id(), $vocabulary3->id(), 'Vocabulary was found in the vocabularies array.');
 
-    // Fetch the vocabularies with taxonomy_vocabulary_load_multiple(), specifying IDs.
+    // Fetch the vocabularies with entity_load_multiple(), specifying IDs.
     // Ensure they are returned in the same order as the original array.
-    $vocabularies = taxonomy_vocabulary_load_multiple(array($vocabulary3->id(), $vocabulary2->id(), $vocabulary1->id()));
+    $vocabularies = entity_load_multiple('taxonomy_vocabulary', array($vocabulary3->id(), $vocabulary2->id(), $vocabulary1->id()));
     $this->assertEqual(array_shift($vocabularies)->id(), $vocabulary3->id(), 'Vocabulary loaded successfully by ID.');
     $this->assertEqual(array_shift($vocabularies)->id(), $vocabulary2->id(), 'Vocabulary loaded successfully by ID.');
     $this->assertEqual(array_shift($vocabularies)->id(), $vocabulary1->id(), 'Vocabulary loaded successfully by ID.');
diff --git a/core/modules/taxonomy/taxonomy.api.php b/core/modules/taxonomy/taxonomy.api.php
index ca3af07..7b20e85 100644
--- a/core/modules/taxonomy/taxonomy.api.php
+++ b/core/modules/taxonomy/taxonomy.api.php
@@ -31,7 +31,7 @@ function hook_taxonomy_vocabulary_create(\Drupal\taxonomy\Plugin\Core\Entity\Voc
  * Act on taxonomy vocabularies when loaded.
  *
  * Modules implementing this hook can act on the vocabulary objects before they
- * are returned by taxonomy_vocabulary_load_multiple().
+ * are returned by entity_load_multiple().
  *
  * @param array $vocabularies
  *   An array of taxonomy vocabulary entities.
@@ -142,7 +142,7 @@ function hook_taxonomy_term_create(\Drupal\taxonomy\Plugin\Core\Entity\Term $ter
  * Act on taxonomy terms when loaded.
  *
  * Modules implementing this hook can act on the term objects returned by
- * taxonomy_term_load_multiple().
+ * entity_load_multiple().
  *
  * For performance reasons, information to be added to term objects should be
  * loaded in a single query for all terms where possible.
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index 980ad00..639683d 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -91,7 +91,7 @@ function taxonomy_permission() {
       'title' => t('Administer vocabularies and terms'),
     ),
   );
-  foreach (taxonomy_vocabulary_load_multiple() as $vocabulary) {
+  foreach (entity_load_multiple('taxonomy_vocabulary') as $vocabulary) {
     $permissions += array(
       'edit terms in ' . $vocabulary->id() => array(
         'title' => t('Edit terms in %vocabulary', array('%vocabulary' => $vocabulary->name)),
@@ -435,7 +435,7 @@ function taxonomy_term_view(Term $term, $view_mode = 'full', $langcode = NULL) {
  * Constructs a drupal_render() style array from an array of loaded terms.
  *
  * @param array $terms
- *   An array of taxonomy terms as returned by taxonomy_term_load_multiple().
+ *   An array of taxonomy terms as returned by entity_load_multiple().
  * @param string $view_mode
  *   View mode, e.g. 'full', 'teaser'...
  * @param string $langcode
@@ -566,7 +566,7 @@ function taxonomy_term_load_parents($tid) {
     $query->orderBy('t.weight');
     $query->orderBy('t.name');
     $tids = $query->execute()->fetchCol();
-    $parents[$tid] = taxonomy_term_load_multiple($tids);
+    $parents[$tid] = entity_load_multiple('taxonomy_term', $tids);
   }
 
   return isset($parents[$tid]) ? $parents[$tid] : array();
@@ -624,7 +624,7 @@ function taxonomy_term_load_children($tid, $vid = NULL) {
     $query->orderBy('t.weight');
     $query->orderBy('t.name');
     $tids = $query->execute()->fetchCol();
-    $children[$tid] = taxonomy_term_load_multiple($tids);
+    $children[$tid] = entity_load_multiple('taxonomy_term', $tids);
   }
 
   return isset($children[$tid]) ? $children[$tid] : array();
@@ -685,7 +685,7 @@ function taxonomy_get_tree($vid, $parent = 0, $max_depth = NULL, $load_entities
   // Load full entities, if necessary. The entity controller statically
   // caches the results.
   if ($load_entities) {
-    $term_entities = taxonomy_term_load_multiple(array_keys($terms[$vid]));
+    $term_entities = entity_load_multiple('taxonomy_term', array_keys($terms[$vid]));
   }
 
   $max_depth = (!isset($max_depth)) ? count($children[$vid]) : $max_depth;
@@ -778,46 +778,6 @@ function taxonomy_term_load_multiple_by_name($name, $vocabulary = NULL) {
 }
 
 /**
- * Load multiple taxonomy terms based on certain conditions.
- *
- * This function should be used whenever you need to load more than one term
- * from the database. Terms are loaded into memory and will not require
- * database access if loaded again during the same page request.
- *
- * @see entity_load_multiple()
- * @see Drupal\Core\Entity\Query\EntityQueryInterface
- *
- * @param array $tids
- *   (optional) An array of entity IDs. If omitted, all entities are loaded.
- *
- * @return array
- *   An array of taxonomy term entities, indexed by tid. When no results are
- *   found, an empty array is returned.
- */
-function taxonomy_term_load_multiple(array $tids = NULL) {
-  return entity_load_multiple('taxonomy_term', $tids);
-}
-
-/**
- * Loads multiple taxonomy vocabularies based on certain conditions.
- *
- * This function should be used whenever you need to load more than one
- * vocabulary from the database. Terms are loaded into memory and will not
- * require database access if loaded again during the same page request.
- *
- * @see entity_load_multiple()
- *
- * @param array $vids
- *   (optional) An array of entity IDs. If omitted, all entities are loaded.
- *
- * @return array
- *  An array of vocabulary objects, indexed by vid.
- */
-function taxonomy_vocabulary_load_multiple(array $vids = NULL) {
-  return entity_load_multiple('taxonomy_vocabulary', $vids);
-}
-
-/**
  * Sorts vocabularies by its weight and label.
  *
  * @param array $vocabularies
@@ -946,14 +906,14 @@ function taxonomy_options_list(FieldDefinitionInterface $field_definition, Entit
  */
 function taxonomy_field_validate(EntityInterface $entity = NULL, $field, $instance, $langcode, $items, &$errors) {
   // Build an array of existing term IDs so they can be loaded with
-  // taxonomy_term_load_multiple();
+  // entity_load_multiple();
   foreach ($items as $delta => $item) {
     if (!empty($item['tid']) && $item['tid'] != 'autocreate') {
       $tids[] = $item['tid'];
     }
   }
   if (!empty($tids)) {
-    $terms = taxonomy_term_load_multiple($tids);
+    $terms = entity_load_multiple('taxonomy_term', $tids);
 
     // Check each existing item to ensure it can be found in the
     // allowed values for this field.
@@ -1055,7 +1015,7 @@ function taxonomy_autocomplete_validate($element, &$form_state) {
  */
 function taxonomy_field_settings_form($field, $instance) {
   // Get proper values for 'allowed_values_function', which is a core setting.
-  $vocabularies = taxonomy_vocabulary_load_multiple();
+  $vocabularies = entity_load_multiple('taxonomy_vocabulary');
   $options = array();
   foreach ($vocabularies as $vocabulary) {
     $options[$vocabulary->id()] = $vocabulary->name;