diff --git a/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php b/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php
index 27d4cdbb09a22abf32d2a69843a762c7a1a12961..c362e8f882e6af4da234b0edaa4612b8c0aa1a22 100644
--- a/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php
+++ b/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php
@@ -10,20 +10,20 @@
 use Drupal\views\Tests\ViewsSqlTest;
 
 /**
- * Tests the core views_handler_argument_null handler.
+ * Tests the core Drupal\views\Plugin\views\argument\Null handler.
  */
 class ArgumentNullTest extends ViewsSqlTest {
   public static function getInfo() {
     return array(
       'name' => 'Argument: Null',
-      'description' => 'Test the core views_handler_argument_null handler.',
+      'description' => 'Test the core Drupal\views\Plugin\views\argument\Null handler.',
       'group' => 'Views Handlers',
     );
   }
 
   function viewsData() {
     $data = parent::viewsData();
-    $data['views_test']['id']['argument']['handler'] = 'views_handler_argument_null';
+    $data['views_test']['id']['argument']['id'] = 'null';
 
     return $data;
   }
diff --git a/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php b/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php
index 8695cc3657cb896afaf2b64c1a668d1a3ad1bf7f..2b9c1fa4f1ccdef0d36314efce66957a9d35499e 100644
--- a/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php
+++ b/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php
@@ -11,13 +11,13 @@
 use Drupal\views\View;
 
 /**
- * Tests the core views_handler_argument_string handler.
+ * Tests the core Drupal\views\Plugin\views\argument\String handler.
  */
 class ArgumentStringTest extends ViewsSqlTest {
   public static function getInfo() {
     return array(
       'name' => 'Argument: String',
-      'description' => 'Test the core views_handler_argument_string handler.',
+      'description' => 'Test the core Drupal\views\Plugin\views\argument\String handler.',
       'group' => 'Views Handlers',
     );
   }
diff --git a/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php b/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php
index 7e4e3758f76e1238b584ba9133be4821f12da445..21b9320cb99b99f01ae7382e263400af3e514e4b 100644
--- a/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php
@@ -10,13 +10,13 @@
 use Drupal\views\Tests\ViewsSqlTest;
 
 /**
- * Tests the core views_handler_field_boolean handler.
+ * Tests the core Drupal\views\Plugin\views\field\Boolean handler.
  */
 class FieldBooleanTest extends ViewsSqlTest {
   public static function getInfo() {
     return array(
       'name' => 'Field: Boolean',
-      'description' => 'Test the core views_handler_field_boolean handler.',
+      'description' => 'Test the core Drupal\views\Plugin\views\field\Boolean handler.',
       'group' => 'Views Handlers',
     );
   }
@@ -31,7 +31,7 @@ function dataSet() {
 
   function viewsData() {
     $data = parent::viewsData();
-    $data['views_test']['age']['field']['handler'] = 'views_handler_field_boolean';
+    $data['views_test']['age']['field']['id'] = 'boolean';
     return $data;
   }
 
diff --git a/lib/Drupal/views/Tests/Handler/FieldCounterTest.php b/lib/Drupal/views/Tests/Handler/FieldCounterTest.php
index 589747820f19deeafe20669964c51be3b12d84f2..c704bd40500b0ba2d7b1491efd243ed40e3eaec9 100644
--- a/lib/Drupal/views/Tests/Handler/FieldCounterTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldCounterTest.php
@@ -10,13 +10,13 @@
 use Drupal\views\Tests\ViewsSqlTest;
 
 /**
- * Tests the views_handler_field_counter handler.
+ * Tests the Drupal\views\Plugin\views\field\Counter handler.
  */
 class FieldCounterTest extends ViewsSqlTest {
   public static function getInfo() {
     return array(
       'name' => 'Field: Counter',
-      'description' => 'Tests the views_handler_field_counter handler.',
+      'description' => 'Tests the Drupal\views\Plugin\views\field\Counter handler.',
       'group' => 'Views Handlers',
     );
   }
diff --git a/lib/Drupal/views/Tests/Handler/FieldCustomTest.php b/lib/Drupal/views/Tests/Handler/FieldCustomTest.php
index 803ae616d0924c8dede77214e8ecf11dc4535dce..b0a76a62218841687eb7103fedb9d9008da4a64e 100644
--- a/lib/Drupal/views/Tests/Handler/FieldCustomTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldCustomTest.php
@@ -10,20 +10,20 @@
 use Drupal\views\Tests\ViewsSqlTest;
 
 /**
- * Tests the core views_handler_field_custom handler.
+ * Tests the core Drupal\views\Plugin\views\field\Custom handler.
  */
 class FieldCustomTest extends ViewsSqlTest {
   public static function getInfo() {
     return array(
       'name' => 'Field: Custom',
-      'description' => 'Test the core views_handler_field_custom handler.',
+      'description' => 'Test the core Drupal\views\Plugin\views\field\Custom handler.',
       'group' => 'Views Handlers',
     );
   }
 
   function viewsData() {
     $data = parent::viewsData();
-    $data['views_test']['name']['field']['handler'] = 'views_handler_field_custom';
+    $data['views_test']['name']['field']['id'] = 'custom';
     return $data;
   }
 
diff --git a/lib/Drupal/views/Tests/Handler/FieldDateTest.php b/lib/Drupal/views/Tests/Handler/FieldDateTest.php
index 86c1e85ca890b2ec034cba3899312623e327d452..f9cfbec02fd9fc45cff32e62b2a6eceeb80a30ef 100644
--- a/lib/Drupal/views/Tests/Handler/FieldDateTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldDateTest.php
@@ -10,20 +10,20 @@
 use Drupal\views\Tests\ViewsSqlTest;
 
 /**
- * Tests the core views_handler_field_date handler.
+ * Tests the core Drupal\views\Plugin\views\field\Date handler.
  */
 class FieldDateTest extends ViewsSqlTest {
   public static function getInfo() {
     return array(
       'name' => 'Field: Date',
-      'description' => 'Test the core views_handler_field_date handler.',
+      'description' => 'Test the core Drupal\views\Plugin\views\field\Date handler.',
       'group' => 'Views Handlers',
     );
   }
 
   function viewsData() {
     $data = parent::viewsData();
-    $data['views_test']['created']['field']['handler'] = 'views_handler_field_date';
+    $data['views_test']['created']['field']['id'] = 'date';
     return $data;
   }
 
diff --git a/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php b/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php
index 5d74e908db653d9b5255d200360eec50daa11204..e02559e0a3943cb3a7237b486ef5ef0217da2d8b 100644
--- a/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php
@@ -10,7 +10,7 @@
 use Drupal\views\Tests\ViewsSqlTest;
 
 /**
- * Tests the core views_handler_field_file_size handler.
+ * Tests the core Drupal\views\Plugin\views\field\FileSize handler.
  *
  * @see CommonXssUnitTest
  */
@@ -18,7 +18,7 @@ class FieldFileSizeTest extends ViewsSqlTest {
   public static function getInfo() {
     return array(
       'name' => 'Field: file_size',
-      'description' => 'Test the core views_handler_field_file_size handler.',
+      'description' => 'Test the core Drupal\views\Plugin\views\field\FileSize handler.',
       'group' => 'Views Handlers',
     );
   }
@@ -35,7 +35,7 @@ function dataSet() {
 
   function viewsData() {
     $data = parent::viewsData();
-    $data['views_test']['age']['field']['handler'] = 'views_handler_field_file_size';
+    $data['views_test']['age']['field']['id'] = 'file_size';
 
     return $data;
   }
diff --git a/lib/Drupal/views/Tests/Handler/FieldMathTest.php b/lib/Drupal/views/Tests/Handler/FieldMathTest.php
index cd7bbe1d559ccf9a090ad1e2dc18286cc180ec39..6ff67f23f375e5cc0d76260c6b5a26a22e307122 100644
--- a/lib/Drupal/views/Tests/Handler/FieldMathTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldMathTest.php
@@ -10,13 +10,13 @@
 use Drupal\views\Tests\ViewsSqlTest;
 
 /**
- * Tests the core views_handler_field_math handler.
+ * Tests the core Drupal\views\Plugin\views\field\Math handler.
  */
 class FieldMathTest extends ViewsSqlTest {
   public static function getInfo() {
     return array(
       'name' => 'Field: Math',
-      'description' => 'Test the core views_handler_field_math handler.',
+      'description' => 'Test the core Drupal\views\Plugin\views\field\Math handler.',
       'group' => 'Views Handlers',
     );
   }
diff --git a/lib/Drupal/views/Tests/Handler/FieldUrlTest.php b/lib/Drupal/views/Tests/Handler/FieldUrlTest.php
index edd1ccd718993e5db5e1703faac96e8cbffe58dc..ffc5b55f85a08ac41b85d52c4dab722b29455f32 100644
--- a/lib/Drupal/views/Tests/Handler/FieldUrlTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldUrlTest.php
@@ -9,20 +9,20 @@
 
 use Drupal\views\Tests\ViewsSqlTest;
 /**
- * Tests the core views_handler_field_url handler.
+ * Tests the core Drupal\views\Plugin\views\field\Url handler.
  */
 class FieldUrlTest extends ViewsSqlTest {
   public static function getInfo() {
     return array(
       'name' => 'Field: Url',
-      'description' => 'Test the core views_handler_field_url handler.',
+      'description' => 'Test the core Drupal\views\Plugin\views\field\Url handler.',
       'group' => 'Views Handlers',
     );
   }
 
   function viewsData() {
     $data = parent::viewsData();
-    $data['views_test']['name']['field']['handler'] = 'views_handler_field_url';
+    $data['views_test']['name']['field']['id'] = 'url';
     return $data;
   }
 
diff --git a/lib/Drupal/views/Tests/Handler/FieldXssTest.php b/lib/Drupal/views/Tests/Handler/FieldXssTest.php
index 97f636d5fa0f429a578808626c8f734eb4867414..c461915addd56c8cda56584939c7511b23d9f520 100644
--- a/lib/Drupal/views/Tests/Handler/FieldXssTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldXssTest.php
@@ -10,7 +10,7 @@
 use Drupal\views\Tests\ViewsSqlTest;
 
 /**
- * Tests the core views_handler_field_css handler.
+ * Tests the core Drupal\views\Plugin\views\field\Xss handler.
  *
  * @see CommonXssUnitTest
  */
@@ -18,7 +18,7 @@ class FieldXssTest extends ViewsSqlTest {
   public static function getInfo() {
     return array(
       'name' => 'Field: Xss',
-      'description' => 'Test the core views_handler_field_css handler.',
+      'description' => 'Test the core Drupal\views\Plugin\views\field\Xss handler.',
       'group' => 'Views Handlers',
     );
   }
@@ -36,7 +36,7 @@ function dataHelper() {
 
   function viewsData() {
     $data = parent::viewsData();
-    $data['views_test']['name']['field']['handler'] = 'views_handler_field_xss';
+    $data['views_test']['name']['field']['id'] = 'xss';
 
     return $data;
   }
diff --git a/lib/Drupal/views/Tests/Handler/FilterDateTest.php b/lib/Drupal/views/Tests/Handler/FilterDateTest.php
index 19d96a58ec751cbbadb1d38c8c744a3e2413389e..d5a22f9533470c54c86f97a47a7d4f9376447f12 100644
--- a/lib/Drupal/views/Tests/Handler/FilterDateTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterDateTest.php
@@ -11,13 +11,13 @@
 use Drupal\views\View;
 
 /**
- * Tests the core views_handler_filter_date handler.
+ * Tests the core Drupal\views\Plugin\views\filter\Date handler.
  */
 class FilterDateTest extends ViewsSqlTest {
   public static function getInfo() {
     return array(
       'name' => 'Filter: Date',
-      'description' => 'Test the core views_handler_filter_date handler.',
+      'description' => 'Test the core Drupal\views\Plugin\views\filter\Date handler.',
       'group' => 'Views Handlers',
     );
   }
@@ -38,7 +38,7 @@ function setUp() {
   }
 
   /**
-  /* Test the general offset functionality.
+   * Test the general offset functionality.
    */
   function testOffset() {
     $view = $this->views_test_offset();
diff --git a/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php b/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php
index 7e1874b077bc221a072bffff796b4ced766bf133..50d9ef5aa9cd7e4a7c6738dfba4ac426783e81ab 100644
--- a/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php
@@ -10,13 +10,13 @@
 use Drupal\views\Tests\ViewsSqlTest;
 
 /**
- * Tests the core views_handler_filter_equality handler.
+ * Tests the core Drupal\views\Plugin\views\filter\Equality handler.
  */
 class FilterEqualityTest extends ViewsSqlTest {
   public static function getInfo() {
     return array(
       'name' => 'Filter: Equality',
-      'description' => 'Test the core views_handler_filter_equality handler.',
+      'description' => 'Test the core Drupal\views\Plugin\views\filter\Equality handler.',
       'group' => 'Views Handlers',
     );
   }
@@ -30,7 +30,7 @@ function setUp() {
 
   function viewsData() {
     $data = parent::viewsData();
-    $data['views_test']['name']['filter']['handler'] = 'views_handler_filter_equality';
+    $data['views_test']['name']['filter']['id'] = 'equality';
 
     return $data;
   }
diff --git a/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php b/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php
index dd5ad33d5fdae8c84613bd61b2512d7f76d59078..aff37348fffef0f789563932267d67fd32d57350 100644
--- a/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php
@@ -10,20 +10,20 @@
 use Drupal\views\Tests\ViewsSqlTest;
 
 /**
- * Tests the core in_operator handler.
+ * Tests the core Drupal\views\Plugin\views\filter\InOperator handler.
  */
 class FilterInOperatorTest extends ViewsSqlTest {
   public static function getInfo() {
     return array(
       'name' => 'Filter: in_operator',
-      'description' => 'Test the core in_operator handler.',
+      'description' => 'Test the core Drupal\views\Plugin\views\filter\InOperator handler.',
       'group' => 'Views Handlers',
     );
   }
 
   function viewsData() {
     $data = parent::viewsData();
-    $data['views_test']['age']['filter']['handler'] = 'in_operator';
+    $data['views_test']['age']['filter']['id'] = 'in_operator';
 
     return $data;
   }
diff --git a/lib/Drupal/views/Tests/Handler/FilterStringTest.php b/lib/Drupal/views/Tests/Handler/FilterStringTest.php
index 426e6573e8ce1784ebbafb896eefb7eb3dc4b677..ce6f8260a65332b1ed5803d08606b61e6c574d7d 100644
--- a/lib/Drupal/views/Tests/Handler/FilterStringTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterStringTest.php
@@ -10,7 +10,7 @@
 use Drupal\views\Tests\ViewsSqlTest;
 
 /**
- * Tests the core views_handler_filter_string handler.
+ * Tests the core Drupal\views\Plugin\views\filter\String handler.
  */
 class FilterStringTest extends ViewsSqlTest {
   var $column_map = array();
@@ -18,7 +18,7 @@ class FilterStringTest extends ViewsSqlTest {
   public static function getInfo() {
     return array(
       'name' => 'Filter: String',
-      'description' => 'Tests the core views_handler_filter_string handler.',
+      'description' => 'Tests the core Drupal\views\Plugin\views\filter\String handler.',
       'group' => 'Views Handlers',
     );
   }
diff --git a/lib/Drupal/views/Tests/Handler/SortDateTest.php b/lib/Drupal/views/Tests/Handler/SortDateTest.php
index f2f67a2b92349439ba171b9c95ef128331861817..a0756f7075f53f2f99a479a03fd1462f2889d4cd 100644
--- a/lib/Drupal/views/Tests/Handler/SortDateTest.php
+++ b/lib/Drupal/views/Tests/Handler/SortDateTest.php
@@ -10,13 +10,13 @@
 use Drupal\views\Tests\ViewsSqlTest;
 
 /**
- * Tests for core views_handler_sort_date handler.
+ * Tests for core Drupal\views\Plugin\views\sort\Date handler.
  */
 class SortDateTest extends ViewsSqlTest {
   public static function getInfo() {
     return array(
       'name' => 'Sort: date',
-      'description' => 'Test the core views_handler_sort_date handler.',
+      'description' => 'Test the core Drupal\views\Plugin\views\sort\Date handler.',
       'group' => 'Views Handlers',
     );
   }
diff --git a/lib/Drupal/views/Tests/Handler/SortRandomTest.php b/lib/Drupal/views/Tests/Handler/SortRandomTest.php
index da9f4aacc2a724b4761da97c079cba0aa0426924..577e6bad11014415410e9f97554de763083082dd 100644
--- a/lib/Drupal/views/Tests/Handler/SortRandomTest.php
+++ b/lib/Drupal/views/Tests/Handler/SortRandomTest.php
@@ -10,13 +10,13 @@
 use Drupal\views\Tests\ViewsSqlTest;
 
 /**
- * Tests for core views_handler_sort_random handler.
+ * Tests for core Drupal\views\Plugin\views\sort\Random handler.
  */
 class SortRandomTest extends ViewsSqlTest {
   public static function getInfo() {
     return array(
       'name' => 'Sort: random',
-      'description' => 'Test the core views_handler_sort_random handler.',
+      'description' => 'Test the core Drupal\views\Plugin\views\sort\Random handler.',
       'group' => 'Views Handlers',
     );
   }
diff --git a/lib/Drupal/views/Tests/Handler/SortTest.php b/lib/Drupal/views/Tests/Handler/SortTest.php
index cf6a4caf7d034d47cad1f3d65454b8bfbf4be7f1..86f22d101bfc287f4aff162a286c0d6152f5a1fa 100644
--- a/lib/Drupal/views/Tests/Handler/SortTest.php
+++ b/lib/Drupal/views/Tests/Handler/SortTest.php
@@ -10,13 +10,13 @@
 use Drupal\views\Tests\ViewsSqlTest;
 
 /**
- * Tests for core views_handler_sort handler.
+ * Tests for core Drupal\views\Plugin\views\sort\SortPluginBase handler.
  */
 class SortTest extends ViewsSqlTest {
   public static function getInfo() {
     return array(
       'name' => 'Sort: generic',
-      'description' => 'Test the core views_handler_sort handler.',
+      'description' => 'Test the core Drupal\views\Plugin\views\sort\SortPluginBase handler.',
       'group' => 'Views Handlers',
     );
   }