diff --git a/lib/Drupal/views/Plugins/views/access/AccessPluginBase.php b/lib/Drupal/views/Plugins/views/access/AccessPluginBase.php
index cb48c11468fe034b6505560cee38e218deea82f8..17a05522388b9f55f49b74616da5276b9b06c235 100644
--- a/lib/Drupal/views/Plugins/views/access/AccessPluginBase.php
+++ b/lib/Drupal/views/Plugins/views/access/AccessPluginBase.php
@@ -20,7 +20,7 @@
 /**
  * The base plugin to handle access control.
  */
-class AccessPluginBase extends Plugin {
+abstract class AccessPluginBase extends Plugin {
   /**
    * Initialize the plugin.
    *
diff --git a/lib/Drupal/views/Plugins/views/area/AreaPluginBase.php b/lib/Drupal/views/Plugins/views/area/AreaPluginBase.php
index 044fc5e9df4a61de6021f7a6f705fd11dac19c31..970a574237369c2089fd8a52e1c32f82318f4962 100644
--- a/lib/Drupal/views/Plugins/views/area/AreaPluginBase.php
+++ b/lib/Drupal/views/Plugins/views/area/AreaPluginBase.php
@@ -22,7 +22,7 @@
  *
  * @ingroup views_area_handlers
  */
-class AreaPluginBase extends Handler {
+abstract class AreaPluginBase extends Handler {
   /**
    * Get this field's label.
    */
diff --git a/lib/Drupal/views/Plugins/views/argument/ArgumentPluginBase.php b/lib/Drupal/views/Plugins/views/argument/ArgumentPluginBase.php
index 318197541727057357fe0109386d8370235a47d8..92d004171996ebb02fe62d54270b68b80c77b77b 100644
--- a/lib/Drupal/views/Plugins/views/argument/ArgumentPluginBase.php
+++ b/lib/Drupal/views/Plugins/views/argument/ArgumentPluginBase.php
@@ -40,7 +40,7 @@
  *
  * @ingroup views_argument_handlers
  */
-class ArgumentPluginBase extends Handler {
+abstract class ArgumentPluginBase extends Handler {
 
   var $validator = NULL;
   var $argument = NULL;
diff --git a/lib/Drupal/views/Plugins/views/argument_default/ArgumentDefaultPluginBase.php b/lib/Drupal/views/Plugins/views/argument_default/ArgumentDefaultPluginBase.php
index 79a17beb3de64a4abf1412532731a74368581102..2d8c781dd39d1c57469e0d578c2763d1e95fedbd 100644
--- a/lib/Drupal/views/Plugins/views/argument_default/ArgumentDefaultPluginBase.php
+++ b/lib/Drupal/views/Plugins/views/argument_default/ArgumentDefaultPluginBase.php
@@ -20,7 +20,7 @@
 /**
  * The fixed argument default handler; also used as the base.
  */
-class ArgumentDefaultPluginBase extends Plugin {
+abstract class ArgumentDefaultPluginBase extends Plugin {
   /**
    * Return the default argument.
    *
diff --git a/lib/Drupal/views/Plugins/views/argument_validator/ArgumentValidatorPluginBase.php b/lib/Drupal/views/Plugins/views/argument_validator/ArgumentValidatorPluginBase.php
index 8bd680ee9578ba5f923fbdb748445b057b8fbee2..d991f2d9d10491bb0e16c368a46d1bfbb0664b7f 100644
--- a/lib/Drupal/views/Plugins/views/argument_validator/ArgumentValidatorPluginBase.php
+++ b/lib/Drupal/views/Plugins/views/argument_validator/ArgumentValidatorPluginBase.php
@@ -20,7 +20,7 @@
 /**
  * Base argument validator plugin to provide basic functionality.
  */
-class ArgumentValidatorPluginBase extends Plugin {
+abstract class ArgumentValidatorPluginBase extends Plugin {
 
   /**
    * Initialize this plugin with the view and the argument
diff --git a/lib/Drupal/views/Plugins/views/cache/CachePluginBase.php b/lib/Drupal/views/Plugins/views/cache/CachePluginBase.php
index d5278f204d24e487602b968e9fac54fc9189ec4c..5ced8b4acb9324c82b68702772a0a2388133f204 100644
--- a/lib/Drupal/views/Plugins/views/cache/CachePluginBase.php
+++ b/lib/Drupal/views/Plugins/views/cache/CachePluginBase.php
@@ -20,7 +20,7 @@
 /**
  * The base plugin to handle caching.
  */
-class CachePluginBase extends Plugin {
+abstract class CachePluginBase extends Plugin {
   /**
    * Contains all data that should be written/read from cache.
    */
diff --git a/lib/Drupal/views/Plugins/views/display/DisplayPluginBase.php b/lib/Drupal/views/Plugins/views/display/DisplayPluginBase.php
index cca15942879aeab8b4e723af1a64612af3981ad5..17850f715b903bf11238c09f641964947795d470 100644
--- a/lib/Drupal/views/Plugins/views/display/DisplayPluginBase.php
+++ b/lib/Drupal/views/Plugins/views/display/DisplayPluginBase.php
@@ -28,7 +28,7 @@
  * The default display plugin handler. Display plugins handle options and
  * basic mechanisms for different output methods.
  */
-class DisplayPluginBase extends Plugin {
+abstract class DisplayPluginBase extends Plugin {
   /**
    * The top object of a view.
    *
diff --git a/lib/Drupal/views/Plugins/views/exposed_form/ExposedFormPluginBase.php b/lib/Drupal/views/Plugins/views/exposed_form/ExposedFormPluginBase.php
index e9ef1a2979588bb9933ff7eb82cb68c1c3a99fbf..ccbb0bca052c3456c73b62247d27b7e68c015ae9 100644
--- a/lib/Drupal/views/Plugins/views/exposed_form/ExposedFormPluginBase.php
+++ b/lib/Drupal/views/Plugins/views/exposed_form/ExposedFormPluginBase.php
@@ -22,7 +22,7 @@
 /**
  * The base plugin to handle exposed filter forms.
  */
-class ExposedFormPluginBase extends Plugin {
+abstract class ExposedFormPluginBase extends Plugin {
 
   /**
    * Initialize the plugin.
diff --git a/lib/Drupal/views/Plugins/views/field/FieldPluginBase.php b/lib/Drupal/views/Plugins/views/field/FieldPluginBase.php
index 1b51b1faf4a0a63fefc6ecc7ef56dd8bea576cd0..d8be38336aa7bdbf00518030e1b58df324d7cc5f 100644
--- a/lib/Drupal/views/Plugins/views/field/FieldPluginBase.php
+++ b/lib/Drupal/views/Plugins/views/field/FieldPluginBase.php
@@ -53,7 +53,7 @@
  *   plugin_id = "standard"
  * )
  */
-class FieldPluginBase extends Handler {
+abstract class FieldPluginBase extends Handler {
 
   var $field_alias = 'unknown';
   var $aliases = array();
diff --git a/lib/Drupal/views/Plugins/views/filter/FilterPluginBase.php b/lib/Drupal/views/Plugins/views/filter/FilterPluginBase.php
index 180897465f26232dcc64c2bb41e877a290627bed..cc18be93c07c38c35418267c8cc52f15b487955c 100644
--- a/lib/Drupal/views/Plugins/views/filter/FilterPluginBase.php
+++ b/lib/Drupal/views/Plugins/views/filter/FilterPluginBase.php
@@ -42,7 +42,7 @@
  *   plugin_id = "standard"
  * )
  */
-class FilterPluginBase extends Handler {
+abstract class FilterPluginBase extends Handler {
   /**
    * Contains the actual value of the field,either configured in the views ui
    * or entered in the exposed filters.
diff --git a/lib/Drupal/views/Plugins/views/localization/LocalizationPluginBase.php b/lib/Drupal/views/Plugins/views/localization/LocalizationPluginBase.php
index f920ec88025741d1da83c1d6106fafe5f1770add..bc6cd1913a688f5e16d018d88e02700f849349a9 100644
--- a/lib/Drupal/views/Plugins/views/localization/LocalizationPluginBase.php
+++ b/lib/Drupal/views/Plugins/views/localization/LocalizationPluginBase.php
@@ -20,7 +20,7 @@
 /**
  * The base plugin to handle localization of Views strings.
  */
-class LocalizationPluginBase extends Plugin {
+abstract class LocalizationPluginBase extends Plugin {
   // Store for exported strings
   var $export_strings = array();
   var $translate = TRUE;
diff --git a/lib/Drupal/views/Plugins/views/pager/PagerPluginBase.php b/lib/Drupal/views/Plugins/views/pager/PagerPluginBase.php
index c38723cb432c6fdc49956a33d9863bcff6bde70f..0b5823c995653846d6d55ab9d8dc237fa0fe24de 100644
--- a/lib/Drupal/views/Plugins/views/pager/PagerPluginBase.php
+++ b/lib/Drupal/views/Plugins/views/pager/PagerPluginBase.php
@@ -20,7 +20,7 @@
 /**
  * The base plugin to handle pager.
  */
-class PagerPluginBase extends Plugin {
+abstract class PagerPluginBase extends Plugin {
   var $current_page = NULL;
   var $total_items = 0;
 
diff --git a/lib/Drupal/views/Plugins/views/relationship/RelationshipPluginBase.php b/lib/Drupal/views/Plugins/views/relationship/RelationshipPluginBase.php
index 34132c430ec105875e8c3329ef615f3798fdd946..771e6f2ba32d0a5dd9ce8ff27750d74beac6c9be 100644
--- a/lib/Drupal/views/Plugins/views/relationship/RelationshipPluginBase.php
+++ b/lib/Drupal/views/Plugins/views/relationship/RelationshipPluginBase.php
@@ -47,7 +47,7 @@
  *   plugin_id = "standard"
  * )
  */
-class RelationshipPluginBase extends Handler {
+abstract class RelationshipPluginBase extends Handler {
   /**
    * Init handler to let relationships live on tables other than
    * the table they operate on.
diff --git a/lib/Drupal/views/Plugins/views/row/RowPluginBase.php b/lib/Drupal/views/Plugins/views/row/RowPluginBase.php
index 61c4c539554a860f34ef6081cab9ea16831b3c8f..4b082b610611cb1cfb525b5a4a8c9078096afb1e 100644
--- a/lib/Drupal/views/Plugins/views/row/RowPluginBase.php
+++ b/lib/Drupal/views/Plugins/views/row/RowPluginBase.php
@@ -24,7 +24,7 @@
  * Default plugin to view a single row of a table. This is really just a wrapper around
  * a theme function.
  */
-class RowPluginBase extends Plugin {
+abstract class RowPluginBase extends Plugin {
   /**
    * Initialize the row plugin.
    */
diff --git a/lib/Drupal/views/Plugins/views/sort/SortPluginBase.php b/lib/Drupal/views/Plugins/views/sort/SortPluginBase.php
index da5221e74b8b6382fcbaac9eaa78409eae471594..04f4c401f6e4407cee50afc380f030b84b10c18b 100644
--- a/lib/Drupal/views/Plugins/views/sort/SortPluginBase.php
+++ b/lib/Drupal/views/Plugins/views/sort/SortPluginBase.php
@@ -28,7 +28,7 @@
  *   plugin_id = "standard"
  * )
  */
-class SortPluginBase extends Handler {
+abstract class SortPluginBase extends Handler {
 
   /**
    * Determine if a sort can be exposed.
diff --git a/lib/Drupal/views/Plugins/views/style/StylePluginBase.php b/lib/Drupal/views/Plugins/views/style/StylePluginBase.php
index 5779e3c989e36cbca9ccba486c5e0dfdd053a7de..be736b7e964b5918d79a732163d6de8d2ccd5296 100644
--- a/lib/Drupal/views/Plugins/views/style/StylePluginBase.php
+++ b/lib/Drupal/views/Plugins/views/style/StylePluginBase.php
@@ -28,7 +28,7 @@
 /**
  * Base class to define a style plugin handler.
  */
-class StylePluginBase extends ViewsPlugin {
+abstract class StylePluginBase extends ViewsPlugin {
   /**
    * Store all available tokens row rows.
    */
diff --git a/lib/Drupal/views/Plugins/views/wizard/Comment.php b/lib/Drupal/views/Plugins/views/wizard/Comment.php
index 8b5abb0433f75d08a326f0edca52cc34e8fe13a4..5f4fee2faf6c17a4e355863fa19d18a4bddf42e6 100644
--- a/lib/Drupal/views/Plugins/views/wizard/Comment.php
+++ b/lib/Drupal/views/Plugins/views/wizard/Comment.php
@@ -49,7 +49,7 @@
  *   }
  * )
  */
-class Comment extends WizardBase {
+class Comment extends WizardPluginBase {
 
   protected function row_style_options($type) {
     $options = array();
diff --git a/lib/Drupal/views/Plugins/views/wizard/File.php b/lib/Drupal/views/Plugins/views/wizard/File.php
index c6d420192784f702a4df441e9a189b441099b093..976c1c634805f037efa4eb07e54d2b77bff8fae8 100644
--- a/lib/Drupal/views/Plugins/views/wizard/File.php
+++ b/lib/Drupal/views/Plugins/views/wizard/File.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Plugins\views\wizard;
 
-use Drupal\views\Plugins\views\wizard\WizardBase;
+use Drupal\views\Plugins\views\wizard\WizardPluginBase;
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 
@@ -28,7 +28,7 @@
  *   }
  * )
  */
-class File extends WizardBase {
+class File extends WizardPluginBase {
   protected function default_display_options($form, $form_state) {
     $display_options = parent::default_display_options($form, $form_state);
 
diff --git a/lib/Drupal/views/Plugins/views/wizard/Node.php b/lib/Drupal/views/Plugins/views/wizard/Node.php
index 532adf4a69e558123eebe6e9fb222b7875dc16ff..29e943a4953191faae62f2187db09715e7bab648 100644
--- a/lib/Drupal/views/Plugins/views/wizard/Node.php
+++ b/lib/Drupal/views/Plugins/views/wizard/Node.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Plugins\views\wizard;
 
-use Drupal\views\Plugins\views\wizard\WizardBase;
+use Drupal\views\Plugins\views\wizard\WizardPluginBase;
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 
@@ -48,7 +48,7 @@
  *
  */
 
-class Node extends WizardBase {
+class Node extends WizardPluginBase {
 
   protected function row_style_options($type) {
     $options = array();
diff --git a/lib/Drupal/views/Plugins/views/wizard/NodeRevision.php b/lib/Drupal/views/Plugins/views/wizard/NodeRevision.php
index 2fcec62dff24fe274bf137e8d20b1f189a0bd420..d288864c25055e61179da89343196b397552f8ef 100644
--- a/lib/Drupal/views/Plugins/views/wizard/NodeRevision.php
+++ b/lib/Drupal/views/Plugins/views/wizard/NodeRevision.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Plugins\views\wizard;
 
-use Drupal\views\Plugins\views\wizard\WizardBase;
+use Drupal\views\Plugins\views\wizard\WizardPluginBase;
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 
@@ -49,7 +49,7 @@
  *   }
  * )
  */
-class NodeRevision extends WizardBase {
+class NodeRevision extends WizardPluginBase {
 
   /**
    * Node revisions do not support full posts or teasers, so remove them.
diff --git a/lib/Drupal/views/Plugins/views/wizard/TaxonomyTerm.php b/lib/Drupal/views/Plugins/views/wizard/TaxonomyTerm.php
index 629df9ed625fa75aec7553f61a12cf4de2620235..78c98a65b33f95e3435b35fff279433da1d1bf7e 100644
--- a/lib/Drupal/views/Plugins/views/wizard/TaxonomyTerm.php
+++ b/lib/Drupal/views/Plugins/views/wizard/TaxonomyTerm.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Plugins\views\wizard;
 
-use Drupal\views\Plugins\views\wizard\WizardBase;
+use Drupal\views\Plugins\views\wizard\WizardPluginBase;
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 
@@ -32,7 +32,7 @@
  *   }
  * )
  */
-class TaxonomyTerm extends WizardBase {
+class TaxonomyTerm extends WizardPluginBase {
 
   protected function default_display_options($form, $form_state) {
     $display_options = parent::default_display_options($form, $form_state);
diff --git a/lib/Drupal/views/Plugins/views/wizard/Users.php b/lib/Drupal/views/Plugins/views/wizard/Users.php
index e55b486028368e103ecd8cff78e6ed8cec7d3181..47236c534533e570e8e22ed5e97ec98c8555942f 100644
--- a/lib/Drupal/views/Plugins/views/wizard/Users.php
+++ b/lib/Drupal/views/Plugins/views/wizard/Users.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Plugins\views\wizard;
 
-use Drupal\views\Plugins\views\wizard\WizardBase;
+use Drupal\views\Plugins\views\wizard\WizardPluginBase;
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 
@@ -43,7 +43,7 @@
  *   }
  * )
  */
-class Users extends WizardBase {
+class Users extends WizardPluginBase {
   protected function default_display_options($form, $form_state) {
     $display_options = parent::default_display_options($form, $form_state);
 
diff --git a/lib/Drupal/views/Plugins/views/wizard/WizardBase.php b/lib/Drupal/views/Plugins/views/wizard/WizardPluginBase.php
similarity index 99%
rename from lib/Drupal/views/Plugins/views/wizard/WizardBase.php
rename to lib/Drupal/views/Plugins/views/wizard/WizardPluginBase.php
index c7a7eaf869911763ee3dfda69ff5da759fa46a3f..c1af643c32da1378072c6e0d5ed227c325be2b11 100644
--- a/lib/Drupal/views/Plugins/views/wizard/WizardBase.php
+++ b/lib/Drupal/views/Plugins/views/wizard/WizardPluginBase.php
@@ -13,7 +13,7 @@
 /**
  * A very generic Views Wizard class - can be constructed for any base table.
  */
-class WizardBase implements WizardInterface {
+abstract class WizardPluginBase implements WizardInterface {
   protected $base_table;
   protected $entity_type;
   protected $entity_info = array();