diff --git a/modules/node/views_handler_filter_node_status.inc b/lib/Drupal/node/Plugins/views/filter/Status.php
similarity index 80%
rename from modules/node/views_handler_filter_node_status.inc
rename to lib/Drupal/node/Plugins/views/filter/Status.php
index e04d0272c85a31d2187b0ef60d139a98ea2f64ed..6fc6c8b75231b67192318d48dfe04fcea73dce79 100644
--- a/modules/node/views_handler_filter_node_status.inc
+++ b/lib/Drupal/node/Plugins/views/filter/Status.php
@@ -2,9 +2,11 @@
 
 /**
  * @file
- * Definition of views_handler_filter_node_status.
+ * Definition of Drupal\node\Plugins\views\filter\Status
  */
 
+namespace Drupal\node\Plugins\views\filter;
+
 use Drupal\views\Plugins\views\filter\FilterPluginBase;
 
 /**
@@ -12,7 +14,7 @@
  *
  * @ingroup views_filter_handlers
  */
-class views_handler_filter_node_status extends FilterPluginBase {
+class Status extends FilterPluginBase {
   function admin_summary() { }
   function operator_form(&$form, &$form_state) { }
   function can_expose() { return FALSE; }
diff --git a/modules/node.views.inc b/modules/node.views.inc
index befcda151e22e6a8ac50c5583f2985e33deb7d24..b04a90a3e20efcc154b9361db5a2a743a05ee643 100644
--- a/modules/node.views.inc
+++ b/modules/node.views.inc
@@ -172,7 +172,7 @@ function node_views_data() {
     'help' => t('Filters out unpublished content if the current user cannot view it.'),
     'filter' => array(
       'field' => 'status',
-      'handler' => 'views_handler_filter_node_status',
+      'handler' => 'Drupal\node\Plugins\views\filter\Status',
       'label' => t('Published or admin'),
     ),
   );
diff --git a/views.module b/views.module
index 7c25d6d17d6f9a461f1363ee6a0d8f3c1e036557..ee7aa345347cab893b70ec860b85733d6c875365 100644
--- a/views.module
+++ b/views.module
@@ -33,6 +33,23 @@ function views_api_version() {
   return '3.0';
 }
 
+/**
+ * Implements hook_init().
+ *
+ *
+ */
+function views_init() {
+  $core_modules = array('aggregator', 'book', 'comment', 'contact', 'field', 'filter', 'locale', 'node', 'search', 'statistics', 'system', 'taxonomy', 'translation', 'user');
+  $path = drupal_get_path('module', 'views');
+  $loader = drupal_classloader();
+  foreach ($core_modules as $module) {
+    if (function_exists($module . '_views_api')) {
+      $name = $module . '\\Plugins';
+      $loader->registerNamespace('Drupal\\' . $name, DRUPAL_ROOT . '/' . $path . '/lib');
+    }
+  }
+}
+
 /**
  * Implements hook_ctools_exportable_info().
  */