diff --git a/core/modules/taxonomy/src/Plugin/views/field/Taxonomy.php b/core/modules/taxonomy/src/Plugin/views/field/Taxonomy.php
deleted file mode 100644
index 903f174..0000000
--- a/core/modules/taxonomy/src/Plugin/views/field/Taxonomy.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\taxonomy\Plugin\views\field\Taxonomy.
- */
-
-namespace Drupal\taxonomy\Plugin\views\field;
-
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\views\Plugin\views\area\Result;
-use Drupal\views\Plugin\views\field\FieldPluginBase;
-use Drupal\views\Plugin\views\display\DisplayPluginBase;
-use Drupal\views\ResultRow;
-use Drupal\views\ViewExecutable;
-
-/**
- * Field handler to provide simple renderer that allows linking to a taxonomy
- * term.
- *
- * @todo This handler should use entities directly.
- *
- * @ingroup views_field_handlers
- *
- * @ViewsField("taxonomy")
- */
-class Taxonomy extends FieldPluginBase {
-
-  /**
-   * Overrides Drupal\views\Plugin\views\field\FieldPluginBase::init().
-   *
-   * This method assumes the taxonomy_term_data table. If using another table,
-   * we'll need to be more specific.
-   */
-  public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
-    parent::init($view, $display, $options);
-
-    $this->additional_fields['vid'] = 'vid';
-    $this->additional_fields['tid'] = 'tid';
-  }
-
-  protected function defineOptions() {
-    $options = parent::defineOptions();
-    $options['link_to_taxonomy'] = array('default' => FALSE);
-    $options['convert_spaces'] = array('default' => FALSE);
-    return $options;
-  }
-
-  /**
-   * Provide link to taxonomy option
-   */
-  public function buildOptionsForm(&$form, FormStateInterface $form_state) {
-    $form['link_to_taxonomy'] = array(
-      '#title' => $this->t('Link this field to its taxonomy term page'),
-      '#description' => $this->t("Enable to override this field's links."),
-      '#type' => 'checkbox',
-      '#default_value' => !empty($this->options['link_to_taxonomy']),
-    );
-     $form['convert_spaces'] = array(
-      '#title' => $this->t('Convert spaces in term names to hyphens'),
-      '#description' => $this->t('This allows links to work with Views taxonomy term arguments.'),
-      '#type' => 'checkbox',
-      '#default_value' => !empty($this->options['convert_spaces']),
-    );
-    parent::buildOptionsForm($form, $form_state);
-  }
-
-  /**
-   * Prepares a link to the taxonomy.
-   *
-   * @param string $data
-   *   The XSS safe string for the link text.
-   * @param \Drupal\views\ResultRow $values
-   *   The values retrieved from a single row of a view's query result.
-   *
-   * @return string
-   *   Returns a string for the link text.
-   */
-  protected function renderLink($data, ResultRow $values) {
-    $term = $this->getEntity($values);
-
-    if (!empty($this->options['link_to_taxonomy']) && $term && $data !== NULL && $data !== '') {
-      $this->options['alter']['make_link'] = TRUE;
-      $this->options['alter']['url'] = $term->urlInfo();
-    }
-
-    if (!empty($this->options['convert_spaces'])) {
-      $data = str_replace(' ', '-', $data);
-    }
-
-    return $data;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function render(ResultRow $values) {
-    $value = $this->getValue($values);
-    return $this->renderLink($this->sanitizeValue($value), $values);
-  }
-
-}
diff --git a/core/modules/taxonomy/src/TermViewsData.php b/core/modules/taxonomy/src/TermViewsData.php
index d101f84..22855b5 100644
--- a/core/modules/taxonomy/src/TermViewsData.php
+++ b/core/modules/taxonomy/src/TermViewsData.php
@@ -94,7 +94,8 @@ public function getViewsData() {
       );
     }
 
-    $data['taxonomy_term_field_data']['name']['field']['id'] = 'taxonomy';
+    $data['taxonomy_term_field_data']['name']['field']['id'] = 'field';
+    $data['taxonomy_term_field_data']['name']['field']['field_name'] = 'name';
     $data['taxonomy_term_field_data']['name']['argument']['many to one'] = TRUE;
     $data['taxonomy_term_field_data']['name']['argument']['empty field name'] = t('Uncategorized');
 
diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_default_argument_test.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_default_argument_test.yml
index 5842b34..e7d2823 100644
--- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_default_argument_test.yml
+++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_default_argument_test.yml
@@ -110,7 +110,7 @@ display:
           empty: ''
           hide_alter_empty: true
           convert_spaces: false
-          plugin_id: taxonomy
+          plugin_id: field
           entity_type: taxonomy_term
           entity_field: name
       filters: {  }
diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_field_filters.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_field_filters.yml
index ccde243..f55ee45 100644
--- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_field_filters.yml
+++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_field_filters.yml
@@ -86,7 +86,7 @@ display:
           empty: ''
           hide_alter_empty: true
           convert_spaces: false
-          plugin_id: taxonomy
+          plugin_id: field
           entity_type: taxonomy_term
           entity_field: name
       filters:
diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_groupwise_term.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_groupwise_term.yml
index c5ba611..76b5bc9 100644
--- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_groupwise_term.yml
+++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_groupwise_term.yml
@@ -27,7 +27,7 @@ display:
           field: name
           id: name
           table: taxonomy_term_field_data
-          plugin_id: taxonomy
+          plugin_id: field
           entity_type: taxonomy_term
           entity_field: name
         nid:
diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_node_term_data.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_node_term_data.yml
index 0623f98..f1ab7b8 100644
--- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_node_term_data.yml
+++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_node_term_data.yml
@@ -30,7 +30,7 @@ display:
           summary_options:
             items_per_page: 25
           table: taxonomy_term_field_data
-          plugin_id: taxonomy
+          plugin_id: field
           entity_type: taxonomy_term
           entity_field: tid
         tid_1:
@@ -44,7 +44,7 @@ display:
           summary_options:
             items_per_page: 25
           table: taxonomy_term_field_data
-          plugin_id: taxonomy
+          plugin_id: field
           entity_type: taxonomy_term
           entity_field: tid
       cache:
diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_parent.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_parent.yml
index d2c87b3..93cf7c1 100644
--- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_parent.yml
+++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_parent.yml
@@ -112,7 +112,7 @@ display:
           empty: ''
           hide_alter_empty: true
           convert_spaces: false
-          plugin_id: taxonomy
+          plugin_id: field
           entity_type: taxonomy_term
           entity_field: name
       filters: {  }
diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_tid_field.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_tid_field.yml
index 1d7562a..3a99034 100644
--- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_tid_field.yml
+++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_tid_field.yml
@@ -130,7 +130,7 @@ display:
           hide_alter_empty: true
           link_to_taxonomy: true
           convert_spaces: false
-          plugin_id: taxonomy
+          plugin_id: field
           entity_type: taxonomy_term
           entity_field: name
       filters: {  }
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_groupwise_term_ui.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_groupwise_term_ui.yml
index 4dcb99b..ab54d0b 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_groupwise_term_ui.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_groupwise_term_ui.yml
@@ -27,7 +27,7 @@ display:
           field: name
           id: name
           table: taxonomy_term_field_data
-          plugin_id: taxonomy
+          plugin_id: field
           entity_type: taxonomy_term
           entity_field: name
         nid: