diff --git a/includes/plugins.inc b/includes/plugins.inc
index 1bda0686860dd0df97de77124b1bc30bcd5e8eb5..09faa135690863cae7a114d16c83612b0d145fe0 100644
--- a/includes/plugins.inc
+++ b/includes/plugins.inc
@@ -112,7 +112,7 @@ function views_views_plugins() {
       'default' => array(
         'title' => t('Unformatted list'),
         'help' => t('Displays rows one after another.'),
-        'class' => 'Drupal\views\Plugins\views\style\Default',
+        'class' => 'Drupal\views\Plugins\views\style\DefaultStyle',
         'theme' => 'views_view_unformatted',
         'uses row plugin' => TRUE,
         'uses row class' => TRUE,
diff --git a/lib/Drupal/views/Plugins/views/style/Default.php b/lib/Drupal/views/Plugins/views/style/DefaultStyle.php
similarity index 65%
rename from lib/Drupal/views/Plugins/views/style/Default.php
rename to lib/Drupal/views/Plugins/views/style/DefaultStyle.php
index e52dba499f80556b10c97b0bdcccba1e87bc16c4..eae07b90b477653b60df4225d1b9db874869b97a 100644
--- a/lib/Drupal/views/Plugins/views/style/Default.php
+++ b/lib/Drupal/views/Plugins/views/style/DefaultStyle.php
@@ -2,18 +2,18 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\style\Default.
+ * Definition of Drupal\views\Plugins\views\style\DefaultStyle.
  */
 
 namespace Drupal\views\Plugins\views\style;
 
 /**
- * Default style plugin to render rows one after another with no
+ * Unformatted style plugin to render rows one after another with no
  * decorations.
  *
  * @ingroup views_style_plugins
  */
-class Default extends StylePluginBase {
+class DefaultStyle extends StylePluginBase {
   /**
    * Set default options
    */
diff --git a/lib/Drupal/views/View.php b/lib/Drupal/views/View.php
index f62d95ec0b4c1d50748393ca6f27d38bb96ff101..db826961a90a3103dba35be1aea52108cf7fe101 100644
--- a/lib/Drupal/views/View.php
+++ b/lib/Drupal/views/View.php
@@ -580,7 +580,8 @@ function init_style() {
       $this->style_options = $this->display_handler->get_option('style_options');
     }
 
-    $this->style_plugin = views_get_plugin('style', $this->plugin_name);
+    $style_manager = new StylePluginManager();
+    $this->style_plugin = $style_manager->createInstance($this->plugin_name);
 
     if (empty($this->style_plugin)) {
       return FALSE;