diff --git a/core/modules/node/node.views.inc b/core/modules/node/node.views.inc
index 4f2d7e9..c9da4bb 100644
--- a/core/modules/node/node.views.inc
+++ b/core/modules/node/node.views.inc
@@ -125,7 +125,7 @@ function node_views_data() {
       'id' => 'standard',
     ),
     'filter' => array(
-      'id' => 'entity_type',
+      'id' => 'bundle',
     ),
     'argument' => array(
       'id' => 'node_type',
diff --git a/core/modules/taxonomy/taxonomy.views.inc b/core/modules/taxonomy/taxonomy.views.inc
index 21da986..61600bf 100644
--- a/core/modules/taxonomy/taxonomy.views.inc
+++ b/core/modules/taxonomy/taxonomy.views.inc
@@ -145,7 +145,7 @@ function taxonomy_views_data() {
     'title' => t('Vocabulary'),
     'help' => t('Filter the results of "Taxonomy: Term" to a particular vocabulary.'),
     'filter' => array(
-      'id' => 'entity_type',
+      'id' => 'bundle',
     ),
   );
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Bundle.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Bundle.php
index f5ac9e4..5a7d681 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Bundle.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Bundle.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of \Drupal\views\Plugin\views\filter\EntityType.
+ * Definition of \Drupal\views\Plugin\views\filter\Bundle.
  */
 
 namespace Drupal\views\Plugin\views\filter;
@@ -12,17 +12,15 @@
 use Drupal\views\Plugin\views\display\DisplayPluginBase;
 
 /**
- * Filter class which allows filtering by entity bundle types.
- *
- * This class provides a workaround for comment.
+ * Filter class which allows filtering by entity bundles.
  *
  * @ingroup views_filter_handlers
  *
  * @Plugin(
- *   id = "entity_type"
+ *   id = "bundle"
  * )
  */
-class EntityType extends InOperator {
+class Bundle extends InOperator {
 
   /**
    * The entity type for the filter.