diff --git a/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php b/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
index e4a23db0fc1..0d4ac86124c 100644
--- a/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
@@ -40,6 +40,9 @@ use Drupal\views\Plugin\views\Handler;
  *
  * @ingroup views_argument_handlers
  */
+
+/**
+ */
 class ArgumentPluginBase extends Handler {
 
   var $validator = NULL;
diff --git a/lib/Drupal/views/Plugin/views/argument/ManyToOne.php b/lib/Drupal/views/Plugin/views/argument/ManyToOne.php
index a3a689bbf36..37c3095e888 100644
--- a/lib/Drupal/views/Plugin/views/argument/ManyToOne.php
+++ b/lib/Drupal/views/Plugin/views/argument/ManyToOne.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Plugin\views\argument;
 
 use Drupal\Core\Annotation\Plugin;
+use Drupal\views\ManyToOneHelper;
 
 /**
  * An argument handler for use in fields that have a many to one relationship
@@ -31,7 +32,7 @@ use Drupal\Core\Annotation\Plugin;
 class ManyToOne extends ArgumentPluginBase {
   function init(&$view, &$options) {
     parent::init($view, $options);
-    $this->helper = new views_many_to_one_helper($this);
+    $this->helper = new ManyToOneHelper($this);
 
     // Ensure defaults for these, during summaries and stuff:
     $this->operator = 'or';
@@ -52,7 +53,7 @@ class ManyToOne extends ArgumentPluginBase {
       $this->helper->option_definition($options);
     }
     else {
-      $helper = new views_many_to_one_helper($this);
+      $helper = new ManyToOneHelper($this);
       $helper->option_definition($options);
     }
 
diff --git a/lib/Drupal/views/Plugin/views/wizard/TaxonomyTerm.php b/lib/Drupal/views/Plugin/views/wizard/TaxonomyTerm.php
index 2ff6722a917..59392ead4ff 100644
--- a/lib/Drupal/views/Plugin/views/wizard/TaxonomyTerm.php
+++ b/lib/Drupal/views/Plugin/views/wizard/TaxonomyTerm.php
@@ -17,7 +17,6 @@ use Drupal\Core\Annotation\Translation;
  * @Plugin(
  *   plugin_id = "taxonomy_term",
  *   base_table = "taxonomy_term_data",
- *   created_column = "created",
  *   title = @Translation("Taxonomy terms"),
  *   path_field = {
  *     "id" = "tid",
diff --git a/lib/Views/aggregator/Plugin/views/argument/Iid.php b/lib/Views/aggregator/Plugin/views/argument/Iid.php
index e27482dd13a..5a311929d8a 100644
--- a/lib/Views/aggregator/Plugin/views/argument/Iid.php
+++ b/lib/Views/aggregator/Plugin/views/argument/Iid.php
@@ -21,7 +21,7 @@ use Drupal\Core\Annotation\Plugin;
  *   plugin_id = "aggregator_iid"
  * )
  */
-class views_handler_argument_aggregator_iid extends Numeric {
+class Iid extends Numeric {
   /**
    * Override the behavior of title(). Get the title of the category.
    */
diff --git a/lib/Views/node/Plugin/views/argument/CreatedWeek.php b/lib/Views/node/Plugin/views/argument/CreatedWeek.php
index a40a655850a..d71bc92f9cb 100644
--- a/lib/Views/node/Plugin/views/argument/CreatedWeek.php
+++ b/lib/Views/node/Plugin/views/argument/CreatedWeek.php
@@ -12,6 +12,7 @@ use Drupal\views\Plugin\views\argument\Date;
 /**
  * @Plugin(
  *   plugin_id = "node_created_week"
+ * )
  */
 class CreatedWeek extends Date {
   /**
diff --git a/lib/Views/node/Plugin/views/argument/CreatedYear.php b/lib/Views/node/Plugin/views/argument/CreatedYear.php
index 0559ec83a25..75e44ab7e6c 100644
--- a/lib/Views/node/Plugin/views/argument/CreatedYear.php
+++ b/lib/Views/node/Plugin/views/argument/CreatedYear.php
@@ -12,6 +12,7 @@ use Drupal\views\Plugin\views\argument\Date;
 /**
  * @Plugin(
  *   plugin_id = "node_created_year"
+ * )
  */
 class CreatedYear extends Date {
   /**
diff --git a/lib/Views/node/Plugin/views/argument/CreatedYearMonth.php b/lib/Views/node/Plugin/views/argument/CreatedYearMonth.php
index 0133ca90d21..ce28b7856ee 100644
--- a/lib/Views/node/Plugin/views/argument/CreatedYearMonth.php
+++ b/lib/Views/node/Plugin/views/argument/CreatedYearMonth.php
@@ -12,6 +12,7 @@ use Drupal\views\Plugin\views\argument\Date;
 /**
  * @Plugin(
  *   plugin_id = "node_created_year_month"
+ * )
  */
 class CreatedYearMonth extends Date {
   /**
diff --git a/lib/Views/node/Plugin/views/argument/UidRevision.php b/lib/Views/node/Plugin/views/argument/UidRevision.php
index 241799bf8ba..6eacec2e453 100644
--- a/lib/Views/node/Plugin/views/argument/UidRevision.php
+++ b/lib/Views/node/Plugin/views/argument/UidRevision.php
@@ -7,7 +7,7 @@
 
 namespace Views\node\Plugin\views\argument;
 
-use Views\user\Plugin\views\argument\UserUid;
+use Views\user\Plugin\views\argument\Uid;
 use Drupal\Core\Annotation\Plugin;
 
 /**
@@ -20,7 +20,7 @@ use Drupal\Core\Annotation\Plugin;
  *   plugin_id = "node_uid_revision"
  * )
  */
-class UidRevision extends UserUid {
+class UidRevision extends Uid {
   function query($group_by = FALSE) {
     $this->ensure_my_table();
     $placeholder = $this->placeholder();
diff --git a/lib/Views/search/Plugin/views/argument/Search.php b/lib/Views/search/Plugin/views/argument/Search.php
index f6cd2195039..b1059db6137 100644
--- a/lib/Views/search/Plugin/views/argument/Search.php
+++ b/lib/Views/search/Plugin/views/argument/Search.php
@@ -5,7 +5,7 @@
  * Definition of views_handler_argument_search.
  */
 
-namespace Views\node\Plugin\views\argument;
+namespace Views\search\Plugin\views\argument;
 
 use Drupal\views\Join;
 use Drupal\views\Plugin\views\argument\ArgumentPluginBase;
diff --git a/lib/Views/user/Plugin/views/argument/RolesRid.php b/lib/Views/user/Plugin/views/argument/RolesRid.php
index 989e235ad9f..18bc5d4e8b6 100644
--- a/lib/Views/user/Plugin/views/argument/RolesRid.php
+++ b/lib/Views/user/Plugin/views/argument/RolesRid.php
@@ -18,7 +18,7 @@ use Drupal\views\Plugin\views\argument\ManyToOne;
 
 /**
  * @Plugin(
- *   plugin_id = "user_roles_rid"
+ *   plugin_id = "users_roles_rid"
  * )
  */
 class RolesRid extends ManyToOne {
diff --git a/modules/taxonomy.views.inc b/modules/taxonomy.views.inc
index 71d5471e19f..4232fcdf22b 100644
--- a/modules/taxonomy.views.inc
+++ b/modules/taxonomy.views.inc
@@ -160,7 +160,7 @@ function taxonomy_views_data() {
     'filter' => array(
       'title' => t('Term'),
       'help' => t('Taxonomy term chosen from autocomplete or select widget.'),
-      'plugin_id' => 'taxonomy_tid',
+      'plugin_id' => 'taxonomy_index_tid',
       'hierarchy table' => 'taxonomy_term_hierarchy',
       'numeric' => TRUE,
     ),