diff --git a/core/modules/taxonomy/src/TermViewsData.php b/core/modules/taxonomy/src/TermViewsData.php
index d101f84..7fb2753 100644
--- a/core/modules/taxonomy/src/TermViewsData.php
+++ b/core/modules/taxonomy/src/TermViewsData.php
@@ -75,7 +75,7 @@ public function getViewsData() {
     unset($data['taxonomy_term_field_data']['vid']['argument']);
     unset($data['taxonomy_term_field_data']['vid']['sort']);
 
-    $data['taxonomy_term_data']['edit_term'] = array(
+    $data['taxonomy_term_field_data']['edit_term'] = array(
       'field' => array(
         'title' => t('Term edit link'),
         'help' => t('Provide a simple link to edit the term.'),
@@ -85,7 +85,7 @@ public function getViewsData() {
     );
 
     if (\Drupal::moduleHandler()->moduleExists('content_translation')) {
-      $data['taxonomy_term_data']['translation_link'] = array(
+      $data['taxonomy_term_field_data']['translation_link'] = array(
         'title' => t('Translation link'),
         'help' => t('Provide a link to the translations overview for taxonomy terms.'),
         'field' => array(
@@ -160,8 +160,8 @@ public function getViewsData() {
     $data['taxonomy_index']['table']['group']  = t('Taxonomy term');
 
     $data['taxonomy_index']['table']['join'] = array(
-      'taxonomy_term_data' => array(
-        // links directly to taxonomy_term_data via tid
+      'taxonomy_term_field_data' => array(
+        // links directly to taxonomy_term_field_data via tid
         'left_field' => 'tid',
         'field' => 'tid',
       ),
@@ -255,8 +255,8 @@ public function getViewsData() {
         'left_field' => 'tid',
         'field' => 'parent',
       ),
-      'taxonomy_term_data' => array(
-        // Link directly to taxonomy_term_data via tid.
+      'taxonomy_term_field_data' => array(
+        // Link directly to taxonomy_term_field_data via tid.
         'left_field' => 'tid',
         'field' => 'tid',
       ),
@@ -266,7 +266,7 @@ public function getViewsData() {
       'title' => t('Parent term'),
       'help' => t('The parent term of the term. This can produce duplicate entries if you are using a vocabulary that allows multiple parents.'),
       'relationship' => array(
-        'base' => 'taxonomy_term_data',
+        'base' => 'taxonomy_term_field_data',
         'field' => 'parent',
         'label' => t('Parent'),
         'id' => 'standard',