diff --git a/help/api-example.html b/help/api-example.html
index 682fe87f0bdba9f27914071a2516d07a19169f50..e3b59d03ede87b45d9284618f5375b54c811413c 100644
--- a/help/api-example.html
+++ b/help/api-example.html
@@ -77,7 +77,7 @@
       'click sortable' => TRUE,
      ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
+      'plugin_id' => 'numeric',
     ),
     'sort' => array(
       'handler' => 'views_handler_sort',
@@ -94,7 +94,7 @@
       'click sortable' => TRUE,
      ),
      'filter' => array(
-      'handler' => 'views_handler_filter_string',
+      'plugin_id' => 'string',
      ),
      'argument' => array(
        'handler' => 'views_handler_argument_string',
diff --git a/lib/Drupal/views/Plugins/views/filter/Date.php b/lib/Drupal/views/Plugins/views/filter/Date.php
index c59478e350c53ba13a572a7681c579688b74d2a7..612bd8261a6d5cdad9c463010c45a4acd9e0158d 100644
--- a/lib/Drupal/views/Plugins/views/filter/Date.php
+++ b/lib/Drupal/views/Plugins/views/filter/Date.php
@@ -7,11 +7,19 @@
 
 namespace Drupal\views\Plugins\views\filter;
 
+use Drupal\Core\Annotation\Plugin;
+
 /**
  * Filter to handle dates stored as a timestamp.
  *
  * @ingroup views_filter_handlers
  */
+
+/**
+ * @Plugin(
+ *   plugin_id = "date"
+ * )
+ */
 class Date extends Numeric {
   function option_definition() {
     $options = parent::option_definition();
diff --git a/lib/Drupal/views/Plugins/views/filter/FilterPluginBase.php b/lib/Drupal/views/Plugins/views/filter/FilterPluginBase.php
index 7311213c59f0a82a3383a5b3cf9e50554f5dcea9..180897465f26232dcc64c2bb41e877a290627bed 100644
--- a/lib/Drupal/views/Plugins/views/filter/FilterPluginBase.php
+++ b/lib/Drupal/views/Plugins/views/filter/FilterPluginBase.php
@@ -7,8 +7,8 @@
 
 namespace Drupal\views\Plugins\views\filter;
 
-use Drupal\views\Plugins\views\Plugin;
 use Drupal\views\Plugins\views\Handler;
+use Drupal\Core\Annotation\Plugin;
 
 /**
  * @defgroup views_filter_handlers Views filter handlers
@@ -36,6 +36,12 @@
  *
  * @ingroup views_filter_handlers
  */
+
+/**
+ * @Plugin(
+ *   plugin_id = "standard"
+ * )
+ */
 class FilterPluginBase extends Handler {
   /**
    * Contains the actual value of the field,either configured in the views ui
diff --git a/lib/Drupal/views/Plugins/views/filter/Numeric.php b/lib/Drupal/views/Plugins/views/filter/Numeric.php
index 32ee4a8f37cf146b8fe11510d1969d8424425013..2890fc7c9d3ab228cdb6090a181e4f0d49f1e683 100644
--- a/lib/Drupal/views/Plugins/views/filter/Numeric.php
+++ b/lib/Drupal/views/Plugins/views/filter/Numeric.php
@@ -8,12 +8,19 @@
 namespace Drupal\views\Plugins\views\filter;
 
 use Drupal\Core\Database\Database;
+use Drupal\Core\Annotation\Plugin;
 
 /**
  * Simple filter to handle greater than/less than filters
  *
  * @ingroup views_filter_handlers
  */
+
+/**
+ * @Plugin(
+ *   plugin_id = "numeric"
+ * )
+ */
 class Numeric extends FilterPluginBase {
   var $always_multiple = TRUE;
   function option_definition() {
diff --git a/lib/Drupal/views/Plugins/views/filter/String.php b/lib/Drupal/views/Plugins/views/filter/String.php
index e809c8d5e736107360b994e29a7fc47609d9f187..618796402db0116f3b5ad00f872d51df7005b794 100644
--- a/lib/Drupal/views/Plugins/views/filter/String.php
+++ b/lib/Drupal/views/Plugins/views/filter/String.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Plugins\views\filter;
 
 use Drupal\Core\Database\Database;
+use Drupal\Core\Annotation\Plugin;
 
 /**
  * Basic textfield filter to handle string filtering commands
@@ -15,6 +16,12 @@
  *
  * @ingroup views_filter_handlers
  */
+
+/**
+ * @Plugin(
+ *   plugin_id = "string"
+ * )
+ */
 class String extends FilterPluginBase {
 
   // exposed filter options
diff --git a/lib/Drupal/views/Tests/ViewsSqlTest.php b/lib/Drupal/views/Tests/ViewsSqlTest.php
index bff82ccc9ba595d6a810f5ca8b78216866e31a79..deb70bd325f61c288f93fbc984f582b6e5b2010c 100644
--- a/lib/Drupal/views/Tests/ViewsSqlTest.php
+++ b/lib/Drupal/views/Tests/ViewsSqlTest.php
@@ -129,7 +129,7 @@ protected function viewsData() {
         'handler' => 'views_handler_argument_numeric',
       ),
       'filter' => array(
-        'handler' => 'views_handler_filter_numeric',
+        'plugin_id' => 'numeric',
       ),
       'sort' => array(
         'handler' => 'views_handler_sort',
@@ -146,7 +146,7 @@ protected function viewsData() {
         'handler' => 'views_handler_argument_string',
       ),
       'filter' => array(
-        'handler' => 'views_handler_filter_string',
+        'plugin_id' => 'string',
       ),
       'sort' => array(
         'handler' => 'views_handler_sort',
@@ -163,7 +163,7 @@ protected function viewsData() {
         'handler' => 'views_handler_argument_numeric',
       ),
       'filter' => array(
-        'handler' => 'views_handler_filter_numeric',
+        'plugin_id' => 'numeric',
       ),
       'sort' => array(
         'handler' => 'views_handler_sort',
@@ -180,7 +180,7 @@ protected function viewsData() {
         'handler' => 'views_handler_argument_string',
       ),
       'filter' => array(
-        'handler' => 'views_handler_filter_string',
+        'plugin_id' => 'string',
       ),
       'sort' => array(
         'handler' => 'views_handler_sort',
@@ -197,7 +197,7 @@ protected function viewsData() {
         'handler' => 'views_handler_argument_date',
       ),
       'filter' => array(
-        'handler' => 'views_handler_filter_date',
+        'plugin_id' => 'date',
       ),
       'sort' => array(
         'handler' => 'views_handler_sort_date',
diff --git a/modules/aggregator.views.inc b/modules/aggregator.views.inc
index 0fcae2c2f050334a03dca5cda987550af1c13357..9f3a74344e51c35e3970c0720f3c71dafa10ccc4 100644
--- a/modules/aggregator.views.inc
+++ b/modules/aggregator.views.inc
@@ -41,7 +41,7 @@ function aggregator_views_data() {
       'numeric' => TRUE,
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
+      'plugin_id' => 'numeric',
     ),
     'sort' => array(
       'handler' => 'views_handler_sort',
@@ -65,7 +65,7 @@ function aggregator_views_data() {
     ),
     // Information for accepting a nid as a filter
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
+      'plugin_id' => 'numeric',
     ),
     // Information for sorting on a nid.
     'sort' => array(
@@ -88,7 +88,7 @@ function aggregator_views_data() {
     ),
     // Information for accepting a title as a filter
     'filter' => array(
-      'handler' => 'views_handler_filter_string',
+      'plugin_id' => 'string',
     ),
   );
 
@@ -105,7 +105,7 @@ function aggregator_views_data() {
     ),
     // Information for accepting a title as a filter
     'filter' => array(
-      'handler' => 'views_handler_filter_string',
+      'plugin_id' => 'string',
     ),
   );
 
@@ -123,7 +123,7 @@ function aggregator_views_data() {
     ),
     // Information for accepting a title as a filter
     'filter' => array(
-      'handler' => 'views_handler_filter_string',
+      'plugin_id' => 'string',
     ),
     'argument' => array(
       'handler' => 'views_handler_argument_string',
@@ -144,7 +144,7 @@ function aggregator_views_data() {
     ),
     // Information for accepting a title as a filter
     'filter' => array(
-      'handler' => 'views_handler_filter_string',
+      'plugin_id' => 'string',
     ),
     'argument' => array(
       'handler' => 'views_handler_argument_string',
@@ -162,7 +162,7 @@ function aggregator_views_data() {
      ),
     // Information for accepting a title as a filter
     'filter' => array(
-      'handler' => 'views_handler_filter_string',
+      'plugin_id' => 'string',
     ),
   );
 
@@ -180,7 +180,7 @@ function aggregator_views_data() {
     ),
     // Information for accepting a title as a filter
     'filter' => array(
-      'handler' => 'views_handler_filter_date',
+      'plugin_id' => 'date',
     ),
     'argument' => array(
       'handler' => 'views_handler_argument_date',
@@ -218,7 +218,7 @@ function aggregator_views_data() {
     ),
     // Information for accepting a nid as a filter
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
+      'plugin_id' => 'numeric',
     ),
     // Information for sorting on a fid.
     'sort' => array(
@@ -241,7 +241,7 @@ function aggregator_views_data() {
     ),
     // Information for accepting a title as a filter
     'filter' => array(
-      'handler' => 'views_handler_filter_string',
+      'plugin_id' => 'string',
     ),
     'argument' => array(
       'handler' => 'views_handler_argument_string',
@@ -261,7 +261,7 @@ function aggregator_views_data() {
       'handler' => 'views_handler_sort',
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string',
+      'plugin_id' => 'string',
     ),
   );
 
@@ -278,7 +278,7 @@ function aggregator_views_data() {
       'handler' => 'views_handler_sort_date',
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date',
+      'plugin_id' => 'date',
     ),
     'argument' => array(
       'handler' => 'views_handler_argument_date',
@@ -295,7 +295,7 @@ function aggregator_views_data() {
       'click sortable' => FALSE,
      ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string',
+      'plugin_id' => 'string',
     ),
   );
 
@@ -313,7 +313,7 @@ function aggregator_views_data() {
     ),
     // Information for accepting a title as a filter
     'filter' => array(
-      'handler' => 'views_handler_filter_date',
+      'plugin_id' => 'date',
     ),
     'argument' => array(
       'handler' => 'views_handler_argument_date',
@@ -376,7 +376,7 @@ function aggregator_views_data() {
       'handler' => 'views_handler_sort',
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string',
+      'plugin_id' => 'string',
     ),
   );
 
diff --git a/modules/book.views.inc b/modules/book.views.inc
index db1660133e91f648795da7a7704e9ab9ef87cc7c..61751e8ee7d68ce95703cbbb1d27edac621f9ed1 100644
--- a/modules/book.views.inc
+++ b/modules/book.views.inc
@@ -71,7 +71,7 @@ function book_views_data() {
       'handler' => 'views_handler_sort',
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
+      'plugin_id' => 'numeric',
     ),
     'argument' => array(
       'handler' => 'views_handler_argument',
diff --git a/modules/comment.views.inc b/modules/comment.views.inc
index 06680cf7d9610f250ab82963deee9a881a5e0049..ccc7ebe10d9c6c3180243d58451d1f8d55ed369e 100644
--- a/modules/comment.views.inc
+++ b/modules/comment.views.inc
@@ -47,7 +47,7 @@ function comment_views_data() {
       'click sortable' => TRUE,
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string',
+      'plugin_id' => 'string',
     ),
     'sort' => array(
       'handler' => 'views_handler_sort',
@@ -66,7 +66,7 @@ function comment_views_data() {
       'click sortable' => TRUE,
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
+      'plugin_id' => 'numeric',
     ),
     'sort' => array(
       'handler' => 'views_handler_sort',
@@ -85,7 +85,7 @@ function comment_views_data() {
       'click sortable' => TRUE,
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string',
+      'plugin_id' => 'string',
     ),
     'sort' => array(
       'handler' => 'views_handler_sort',
@@ -104,7 +104,7 @@ function comment_views_data() {
       'click sortable' => TRUE,
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string',
+      'plugin_id' => 'string',
     ),
     'sort' => array(
       'handler' => 'views_handler_sort',
@@ -123,7 +123,7 @@ function comment_views_data() {
       'click sortable' => TRUE,
      ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string',
+      'plugin_id' => 'string',
     ),
     'sort' => array(
       'handler' => 'views_handler_sort',
@@ -142,7 +142,7 @@ function comment_views_data() {
       'click sortable' => TRUE,
      ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string',
+      'plugin_id' => 'string',
     ),
     'sort' => array(
       'handler' => 'views_handler_sort',
@@ -164,7 +164,7 @@ function comment_views_data() {
       'handler' => 'views_handler_sort_date',
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date',
+      'plugin_id' => 'date',
     ),
   );
 
@@ -203,7 +203,7 @@ function comment_views_data() {
       'handler' => 'views_handler_sort_date',
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date',
+      'plugin_id' => 'date',
     ),
   );
 
@@ -355,11 +355,11 @@ function comment_views_data() {
       'help' => t('The content to which the comment is a reply to.'),
       'base' => 'node',
       'base field' => 'nid',
-      'handler' => 'views_handler_relationship',
+      'plugin_id' => 'standard',
       'label' => t('Content'),
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
+      'plugin_id' => 'numeric',
     ),
     'argument' => array(
       'handler' => 'views_handler_argument_numeric',
@@ -377,11 +377,11 @@ function comment_views_data() {
       'help' => t("The User ID of the comment's author."),
       'base' => 'users',
       'base field' => 'uid',
-      'handler' => 'views_handler_relationship',
+      'plugin_id' => 'standard',
       'label' => t('author'),
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
+      'plugin_id' => 'numeric',
     ),
     'argument' => array(
       'handler' => 'views_handler_argument_numeric',
@@ -435,7 +435,7 @@ function comment_views_data() {
       'handler' => 'views_handler_sort_date',
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date',
+      'plugin_id' => 'date',
     ),
   );
 
@@ -463,7 +463,7 @@ function comment_views_data() {
       'click sortable' => TRUE,
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
+      'plugin_id' => 'numeric',
     ),
     'sort' => array(
       'handler' => 'views_handler_sort',
@@ -513,11 +513,11 @@ function comment_views_data() {
       'title' => t('Last comment author'),
       'base' => 'users',
       'base field' => 'uid',
-      'handler' => 'views_handler_relationship',
+      'plugin_id' => 'standard',
       'label' => t('Last comment author'),
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
+      'plugin_id' => 'numeric',
     ),
     'argument' => array(
       'handler' => 'views_handler_argument_numeric',
diff --git a/modules/field.views.inc b/modules/field.views.inc
index fe1968bb9763629aad44de9b1810ac98335acc5b..81c8e794b71b6b029c5e1edb9134823bf82ebe4f 100644
--- a/modules/field.views.inc
+++ b/modules/field.views.inc
@@ -383,7 +383,7 @@ function field_views_field_default_views_data($field) {
         $data[$table]['delta']['filter'] = array(
           'field' => 'delta',
           'table' => $table,
-          'handler' => 'views_handler_filter_numeric',
+          'plugin_id' => 'numeric',
           'additional fields' => $additional_fields,
           'field_name' => $field['field_name'],
           'allow empty' => TRUE,
diff --git a/modules/language.views.inc b/modules/language.views.inc
index d9065e850819f1b036d0ee4a23e9d7c47e614319..75336afb1ac257b8ee5b00df90c2079df4413cbf 100644
--- a/modules/language.views.inc
+++ b/modules/language.views.inc
@@ -30,7 +30,7 @@ function language_views_data() {
       'handler' => 'views_handler_field',
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+      'plugin_id' => 'string'
     ),
     'argument' => array(
       'handler' => 'views_handler_argument_string',
@@ -47,7 +47,7 @@ function language_views_data() {
       'handler' => 'views_handler_field',
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+      'plugin_id' => 'string'
     ),
     'argument' => array(
       'handler' => 'views_handler_argument_string',
@@ -64,7 +64,7 @@ function language_views_data() {
       'handler' => 'views_handler_field_numeric',
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+      'plugin_id' => 'numeric'
     ),
     'argument' => array(
       'handler' => 'views_handler_argument_numeric',
@@ -81,7 +81,7 @@ function language_views_data() {
       'handler' => 'views_handler_field_numeric',
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+      'plugin_id' => 'numeric'
     ),
     'argument' => array(
       'handler' => 'views_handler_argument_numeric',
diff --git a/modules/locale.views.inc b/modules/locale.views.inc
index 3bff7dbd401ed1c6a19c10a979a9d182db78f449..e27b8df5a56e2753bf55c5a56a8662d225a23f22 100644
--- a/modules/locale.views.inc
+++ b/modules/locale.views.inc
@@ -37,7 +37,7 @@ function locale_views_data() {
       'validate type' => 'lid',
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
+      'plugin_id' => 'numeric',
     ),
     'sort' => array(
       'handler' => 'views_handler_sort',
@@ -57,7 +57,7 @@ function locale_views_data() {
       'handler' => 'views_handler_sort',
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string',
+      'plugin_id' => 'string',
     ),
     'argument' => array(
       'handler' => 'views_handler_argument_string',
@@ -90,7 +90,7 @@ function locale_views_data() {
       'handler' => 'views_handler_field',
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string',
+      'plugin_id' => 'string',
     ),
   );
 
@@ -144,7 +144,7 @@ function locale_views_data() {
       'handler' => 'views_handler_field',
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string',
+      'plugin_id' => 'string',
     ),
   );
 
diff --git a/modules/node.views.inc b/modules/node.views.inc
index 9028201e59c87c076fb6e0d2ec37199883b62082..14931c5064d064c57b1174a2023b5d0191582142 100644
--- a/modules/node.views.inc
+++ b/modules/node.views.inc
@@ -60,7 +60,7 @@ function node_views_data() {
     ),
     // Information for accepting a nid as a filter
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\Numeric',
+      'plugin_id' => 'numeric',
     ),
     // Information for sorting on a nid.
     'sort' => array(
@@ -86,7 +86,7 @@ function node_views_data() {
     ),
     // Information for accepting a title as a filter
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\String',
+      'plugin_id' => 'string',
     ),
     'argument' => array(
       'handler' => 'Drupal\views\Plugins\views\argument\String',
@@ -502,7 +502,7 @@ function node_views_data() {
       'plugin_id' => 'standard',
     ),
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\String',
+      'plugin_id' => 'string',
     ),
     'argument' => array(
       'handler' => 'Drupal\views\Plugins\views\argument\String',
@@ -518,7 +518,7 @@ function node_views_data() {
       'handler' => 'Drupal\views\Plugins\views\field\Xss',
      ),
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\String',
+      'plugin_id' => 'string',
     ),
   );
 
diff --git a/modules/statistics.views.inc b/modules/statistics.views.inc
index 1d5692b2c1451bab2ede5cbbed94472c87a15c84..b33b84ab72de007ebdca73b817aca884332aaec0 100644
--- a/modules/statistics.views.inc
+++ b/modules/statistics.views.inc
@@ -36,7 +36,7 @@ function statistics_views_data() {
       'click sortable' => TRUE,
      ),
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\Numeric',
+      'plugin_id' => 'numeric',
     ),
     'sort' => array(
       'plugin_id' => 'standard',
@@ -53,7 +53,7 @@ function statistics_views_data() {
       'click sortable' => TRUE,
      ),
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\Numeric',
+      'plugin_id' => 'numeric',
     ),
     'sort' => array(
       'plugin_id' => 'standard',
@@ -113,7 +113,7 @@ function statistics_views_data() {
       'numeric' => TRUE,
     ),
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\Numeric',
+      'plugin_id' => 'numeric',
     ),
     'sort' => array(
       'plugin_id' => 'standard',
@@ -130,7 +130,7 @@ function statistics_views_data() {
       'click sortable' => TRUE,
      ),
      'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\String',
+      'plugin_id' => 'string',
      ),
      'argument' => array(
        'handler' => 'Drupal\views\Plugins\views\argument\String',
@@ -150,7 +150,7 @@ function statistics_views_data() {
       'click sortable' => TRUE,
      ),
      'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\String',
+      'plugin_id' => 'string',
      ),
      'sort' => array(
       'plugin_id' => 'standard',
@@ -170,7 +170,7 @@ function statistics_views_data() {
       'click sortable' => TRUE,
      ),
      'filter' => array(
-       'handler' => 'Drupal\views\Plugins\views\filter\String',
+       'plugin_id' => 'string',
      ),
      'sort' => array(
        'plugin_id' => 'standard',
@@ -189,7 +189,7 @@ function statistics_views_data() {
       'click sortable' => TRUE,
      ),
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\String',
+      'plugin_id' => 'string',
     ),
     'sort' => array(
       'plugin_id' => 'standard',
@@ -205,7 +205,7 @@ function statistics_views_data() {
       'click sortable' => TRUE,
      ),
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\String',
+      'plugin_id' => 'string',
     ),
     'sort' => array(
       'plugin_id' => 'standard',
@@ -235,7 +235,7 @@ function statistics_views_data() {
       'click sortable' => TRUE,
     ),
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\Numeric',
+      'plugin_id' => 'numeric',
     ),
     'sort' => array(
       'plugin_id' => 'standard',
diff --git a/modules/system.views.inc b/modules/system.views.inc
index 5ac1f8b93fc1142c8569bab2937da8f1d3fb79c2..4626fa68a793a97a11238ff67fe9c0a6b093610a 100644
--- a/modules/system.views.inc
+++ b/modules/system.views.inc
@@ -44,7 +44,7 @@ function system_views_data() {
       'numeric' => TRUE,
     ),
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\Numeric',
+      'plugin_id' => 'numeric',
     ),
     'sort' => array(
       'plugin_id' => 'standard',
@@ -63,7 +63,7 @@ function system_views_data() {
       'plugin_id' => 'standard',
     ),
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\String',
+      'plugin_id' => 'string',
     ),
     'argument' => array(
       'handler' => 'Drupal\views\Plugins\views\argument\String',
@@ -82,7 +82,7 @@ function system_views_data() {
       'plugin_id' => 'standard',
     ),
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\String',
+      'plugin_id' => 'string',
     ),
     'argument' => array(
       'handler' => 'Drupal\views\Plugins\views\argument\String',
@@ -101,7 +101,7 @@ function system_views_data() {
       'plugin_id' => 'standard',
     ),
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\String',
+      'plugin_id' => 'string',
     ),
     'argument' => array(
       'handler' => 'Drupal\views\Plugins\views\argument\String',
@@ -131,7 +131,7 @@ function system_views_data() {
       'plugin_id' => 'standard',
     ),
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\Numeric',
+      'plugin_id' => 'numeric',
     ),
   );
 
@@ -395,7 +395,7 @@ function system_views_data() {
       'click sortable' => TRUE,
      ),
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\String',
+      'plugin_id' => 'string',
     ),
     'argument' => array(
       'handler' => 'Drupal\views\Plugins\views\argument\String',
@@ -412,7 +412,7 @@ function system_views_data() {
       'click sortable' => TRUE,
      ),
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\String',
+      'plugin_id' => 'string',
     ),
     'argument' => array(
       'handler' => 'Drupal\views\Plugins\views\argument\String',
@@ -432,7 +432,7 @@ function system_views_data() {
       'handler' => 'Drupal\views\Plugins\views\argument\Numeric',
     ),
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\Numeric',
+      'plugin_id' => 'numeric',
     ),
     'sort' => array(
       'plugin_id' => 'standard',
@@ -446,7 +446,7 @@ function system_views_data() {
       'click sortable' => TRUE,
      ),
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\Numeric',
+      'plugin_id' => 'numeric',
     ),
     'sort' => array(
       'plugin_id' => 'standard',
@@ -478,7 +478,7 @@ function system_views_data() {
       'name field' => 'filename', // the field to display in the summary.
     ),
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\String',
+      'plugin_id' => 'string',
     ),
     'sort' => array(
       'plugin_id' => 'standard',
@@ -497,7 +497,7 @@ function system_views_data() {
       'name field' => 'name', // the field to display in the summary.
     ),
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\String',
+      'plugin_id' => 'string',
     ),
     'sort' => array(
       'plugin_id' => 'standard',
@@ -554,7 +554,7 @@ function system_views_data() {
       'name field' => 'schema_version', // the field to display in the summary.
     ),
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\Numeric',
+      'plugin_id' => 'numeric',
     ),
     'sort' => array(
       'plugin_id' => 'standard',
diff --git a/modules/taxonomy.views.inc b/modules/taxonomy.views.inc
index c72a306b21ab5c104bb981928393213a13e8a10d..22d839786bb314a441821b7c86c5ed820675678e 100644
--- a/modules/taxonomy.views.inc
+++ b/modules/taxonomy.views.inc
@@ -101,7 +101,7 @@ function taxonomy_views_data() {
       'plugin_id' => 'standard',
     ),
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\Numeric',
+      'plugin_id' => 'numeric',
     ),
   );
 
@@ -172,7 +172,7 @@ function taxonomy_views_data() {
     'help' => t('The tid of a taxonomy term.'),
     'real field' => 'tid',
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\Numeric',
+      'plugin_id' => 'numeric',
       'allow empty' => TRUE,
     ),
   );
@@ -204,7 +204,7 @@ function taxonomy_views_data() {
       'plugin_id' => 'standard',
     ),
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\String',
+      'plugin_id' => 'string',
       'help' => t('Taxonomy term name.'),
     ),
     'argument' => array(
@@ -227,7 +227,7 @@ function taxonomy_views_data() {
       'plugin_id' => 'standard',
     ),
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\Numeric',
+      'plugin_id' => 'numeric',
     ),
     'argument' => array(
       'handler' => 'Drupal\views\Plugins\views\argument\Numeric',
@@ -243,7 +243,7 @@ function taxonomy_views_data() {
       'format' => array('field' => 'format'),
     ),
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\String',
+      'plugin_id' => 'string',
     ),
   );
 
diff --git a/modules/user.views.inc b/modules/user.views.inc
index b6ae4d68d39fdc86524b598d4bf940d8516eca23..301d27f35d0f9f5ff3f979bdcca525314f1bfd58 100644
--- a/modules/user.views.inc
+++ b/modules/user.views.inc
@@ -78,7 +78,7 @@ function user_views_data() {
     'real field' => 'uid',
     'filter' => array(
       'title' => t('The user ID'),
-      'handler' => 'Drupal\views\Plugins\views\filter\Numeric',
+      'plugin_id' => 'numeric',
     ),
   );
 
@@ -124,7 +124,7 @@ function user_views_data() {
       'handler' => 'Drupal\views\Plugins\views\argument\String',
     ),
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\String',
+      'plugin_id' => 'string',
       'title' => t('Name (raw)'),
       'help' => t('The user or author name. This filter does not check if the user exists and allows partial matching. Does not utilize autocomplete.')
     ),
@@ -143,7 +143,7 @@ function user_views_data() {
       'plugin_id' => 'standard',
     ),
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\String',
+      'plugin_id' => 'string',
     ),
     'argument' => array(
       'handler' => 'Drupal\views\Plugins\views\argument\String',
@@ -333,7 +333,7 @@ function user_views_data() {
       'format' => filter_fallback_format(),
     ),
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\String',
+      'plugin_id' => 'string',
     ),
   );
 
@@ -488,7 +488,7 @@ function user_views_data() {
       'handler' => 'Drupal\views\Plugins\views\field\Numeric',
     ),
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\Numeric',
+      'plugin_id' => 'numeric',
       'numeric' => TRUE,
     ),
     'argument' => array(
@@ -503,7 +503,7 @@ function user_views_data() {
       'handler' => 'Drupal\views\Plugins\views\field\FieldPluginBase',
     ),
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\String',
+      'plugin_id' => 'string',
     ),
     'argument' => array(
       'handler' => 'Drupal\views\Plugins\views\argument\Numeric',
@@ -516,7 +516,7 @@ function user_views_data() {
       'handler' => 'Drupal\views\Plugins\views\field\FieldNumeric',
     ),
     'filter' => array(
-      'handler' => 'Drupal\views\Plugins\views\filter\String',
+      'plugin_id' => 'string',
     ),
     'argument' => array(
       'handler' => 'Drupal\views\Plugins\views\argment\String',
diff --git a/views.api.php b/views.api.php
index 85cc25f3e23c0a12eec04e8e752569f7a98b91bb..1297e1358392b9bb455b1543f3a1e0bb6697c23c 100644
--- a/views.api.php
+++ b/views.api.php
@@ -394,7 +394,7 @@ function hook_views_data() {
       'handler' => 'views_handler_sort',
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string',
+      'plugin_id' => 'string',
     ),
     'argument' => array(
       'handler' => 'views_handler_argument_string',
@@ -410,7 +410,7 @@ function hook_views_data() {
       'click sortable' => TRUE,
      ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric',
+      'plugin_id' => 'numeric',
     ),
     'sort' => array(
       'handler' => 'views_handler_sort',
@@ -451,7 +451,7 @@ function hook_views_data() {
       'plugin_id' => 'date',
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date',
+      'plugin_id' => 'date',
     ),
   );