diff --git a/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php b/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
index dbfd70984f83ee69e1efd8ccb1b10ec102c33fcc..c8be0760ab776d897d935cf105a459aaf02dc12d 100644
--- a/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
@@ -893,7 +893,7 @@ function get_plugin($type = 'style', $name = NULL) {
         $plugin = views_get_plugin($type, $name);
       }
       else {
-        $plugin_type = new QueryPluginManager();
+        $plugin_type = new ViewsPluginManager('query');
         $plugin = $plugin_type->createInstance($name);
       }
 
diff --git a/views_ui.module b/views_ui.module
index 738c791c02190a76f9a2fa465c067ed6e25334be..00068323f964299d10c354b6c66f828ebb6366e3 100644
--- a/views_ui.module
+++ b/views_ui.module
@@ -629,7 +629,7 @@ function views_ui_ctools_plugin_type() {
 }
 
 function views_ui_get_form_wizard_instance($wizard) {
-  $manager = new WizardManager();
+  $manager = new ViewsPluginManager('wizard');
   $instance = $manager->createInstance($wizard['name']);
   return $instance;
 }