diff --git a/core/modules/action/lib/Drupal/action/Tests/BulkFormTest.php b/core/modules/action/lib/Drupal/action/Tests/BulkFormTest.php
index dde3914..d5dda7a 100644
--- a/core/modules/action/lib/Drupal/action/Tests/BulkFormTest.php
+++ b/core/modules/action/lib/Drupal/action/Tests/BulkFormTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\action\Tests;
 
 use Drupal\simpletest\WebTestBase;
+use Drupal\views\Views;
 
 /**
  * Tests the views bulk form test.
@@ -96,7 +97,7 @@ public function testBulkForm() {
     $this->assertTrue($node->isPublished(), 'An unchecked node is still published.');
 
     // Set up to include just the sticky actions.
-    $view = views_get_view('test_bulk_form');
+    $view = Views::getView('test_bulk_form');
     $display = &$view->storage->getDisplay('default');
     $display['display_options']['fields']['node_bulk_form']['include_exclude'] = 'include';
     $display['display_options']['fields']['node_bulk_form']['selected_actions']['node_make_sticky_action'] = 'node_make_sticky_action';
@@ -110,7 +111,7 @@ public function testBulkForm() {
     $this->assertOption('edit-action', 'node_make_unsticky_action');
 
     // Set up to exclude the sticky actions.
-    $view = views_get_view('test_bulk_form');
+    $view = Views::getView('test_bulk_form');
     $display = &$view->storage->getDisplay('default');
     $display['display_options']['fields']['node_bulk_form']['include_exclude'] = 'exclude';
     $view->save();
@@ -125,7 +126,7 @@ public function testBulkForm() {
     $this->assertEqual('With selection', (string) $result[0]);
 
     // Setup up a different bulk form title.
-    $view = views_get_view('test_bulk_form');
+    $view = Views::getView('test_bulk_form');
     $display = &$view->storage->getDisplay('default');
     $display['display_options']['fields']['node_bulk_form']['action_title'] = 'Test title';
     $view->save();
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/Views/IntegrationTest.php b/core/modules/aggregator/lib/Drupal/aggregator/Tests/Views/IntegrationTest.php
index 6fd1f93..f129067 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Tests/Views/IntegrationTest.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Tests/Views/IntegrationTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\aggregator\Tests\Views;
 
+use Drupal\views\Views;
 use Drupal\views\Tests\ViewTestData;
 use Drupal\views\Tests\ViewUnitTestBase;
 
@@ -86,7 +87,7 @@ public function testAggregatorItemView() {
       $expected[] = $values;
     }
 
-    $view = views_get_view('test_aggregator_items');
+    $view = Views::getView('test_aggregator_items');
     $this->executeView($view);
 
     $column_map = array(
diff --git a/core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php b/core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php
index 3c9745f..8f2ddc0 100644
--- a/core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\block\Tests\Views;
 
 use Drupal\Component\Utility\String;
+use Drupal\views\Views;
 use Drupal\views\Tests\ViewTestBase;
 use Drupal\views\Tests\ViewTestData;
 use Drupal\Core\Template\Attribute;
@@ -145,7 +146,7 @@ protected function testDeleteBlockDisplay() {
 
     // Remove the block display, so both block entities from the first view
     // should both disappear.
-    $view = views_get_view('test_view_block');
+    $view = Views::getView('test_view_block');
     $view->initDisplay();
     $view->displayHandlers->remove('block_1');
     $view->storage->save();
@@ -162,7 +163,7 @@ protected function testDeleteBlockDisplay() {
 
     // Remove the first block display of the second view and ensure the block
     // instance of the second block display still exists.
-    $view = views_get_view('test_view_block2');
+    $view = Views::getView('test_view_block2');
     $view->initDisplay();
     $view->displayHandlers->remove('block_1');
     $view->storage->save();
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/Views/ArgumentUserUIDTest.php b/core/modules/comment/lib/Drupal/comment/Tests/Views/ArgumentUserUIDTest.php
index e59b8f0..0903858 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/Views/ArgumentUserUIDTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/Views/ArgumentUserUIDTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\comment\Tests\Views;
 
+use Drupal\views\Views;
+
 /**
  * Tests the argument_comment_user_uid handler.
  */
@@ -28,7 +30,7 @@ public static function getInfo() {
   }
 
   function testCommentUserUIDTest() {
-    $view = views_get_view('test_comment_user_uid');
+    $view = Views::getView('test_comment_user_uid');
     $this->executeView($view, array($this->account->id()));
     $result_set = array(
       array(
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/Views/DefaultViewRecentComments.php b/core/modules/comment/lib/Drupal/comment/Tests/Views/DefaultViewRecentComments.php
index e7e699c..5b0e8e6 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/Views/DefaultViewRecentComments.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/Views/DefaultViewRecentComments.php
@@ -9,6 +9,7 @@
 
 use Drupal\comment\CommentInterface;
 use Drupal\entity\DatabaseStorageController;
+use Drupal\views\Views;
 use Drupal\views\Tests\ViewTestBase;
 
 class DefaultViewRecentComments extends ViewTestBase {
@@ -113,7 +114,7 @@ public function setUp() {
    * Tests the block defined by the comments_recent view.
    */
   public function testBlockDisplay() {
-    $view = views_get_view('comments_recent');
+    $view = Views::getView('comments_recent');
     $view->setDisplay('block_1');
     $this->executeView($view);
 
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/Views/FilterUserUIDTest.php b/core/modules/comment/lib/Drupal/comment/Tests/Views/FilterUserUIDTest.php
index abe0e4e..95efc48 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/Views/FilterUserUIDTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/Views/FilterUserUIDTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\comment\Tests\Views;
 
+use Drupal\views\Views;
+
 /**
  * Tests the filter_comment_user_uid handler.
  *
@@ -30,7 +32,7 @@ public static function getInfo() {
   }
 
   function testCommentUserUIDTest() {
-    $view = views_get_view('test_comment_user_uid');
+    $view = Views::getView('test_comment_user_uid');
     $view->setDisplay();
     $view->removeHandler('default', 'argument', 'uid_touch');
 
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/Views/WizardTest.php b/core/modules/comment/lib/Drupal/comment/Tests/Views/WizardTest.php
index 764a51a..9a39f2f 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/Views/WizardTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/Views/WizardTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\comment\Tests\Views;
 
+use Drupal\views\Views;
 use Drupal\views\Tests\Wizard\WizardTestBase;
 
 /**
@@ -73,7 +74,7 @@ public function testCommentWizard() {
     $this->drupalPostForm(NULL, $view, t('Save and edit'));
     $this->assertUrl('admin/structure/views/view/' . $view['id'], array(), 'Make sure the view saving was successful and the browser got redirected to the edit page.');
 
-    $view = views_get_view($view['id']);
+    $view = Views::getView($view['id']);
     $view->initHandlers();
     $row = $view->display_handler->getOption('row');
     $this->assertEqual($row['type'], 'entity:comment');
diff --git a/core/modules/dblog/lib/Drupal/dblog/Tests/Views/ViewsIntegrationTest.php b/core/modules/dblog/lib/Drupal/dblog/Tests/Views/ViewsIntegrationTest.php
index dce1106..8b2987c 100644
--- a/core/modules/dblog/lib/Drupal/dblog/Tests/Views/ViewsIntegrationTest.php
+++ b/core/modules/dblog/lib/Drupal/dblog/Tests/Views/ViewsIntegrationTest.php
@@ -9,6 +9,7 @@
 
 use Drupal\Component\Utility\String;
 use Drupal\Component\Utility\Xss;
+use Drupal\views\Views;
 use Drupal\views\Tests\ViewTestData;
 use Drupal\views\Tests\ViewUnitTestBase;
 
@@ -87,7 +88,7 @@ public function testIntegration() {
       watchdog($entry['type'], $entry['message'], $entry['variables'], $entry['severity'], $entry['link']);
     }
 
-    $view = views_get_view('test_dblog');
+    $view = Views::getView('test_dblog');
     $this->executeView($view);
     $view->initStyle();
 
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/display/EntityReference.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/display/EntityReference.php
index 98db690..b759831 100644
--- a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/display/EntityReference.php
+++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/display/EntityReference.php
@@ -13,7 +13,7 @@
  * The plugin that handles an EntityReference display.
  *
  * "entity_reference_display" is a custom property, used with
- * views_get_applicable_views() to retrieve all views with a
+ * \Drupal\views\Views::getApplicableViews() to retrieve all views with a
  * 'Entity Reference' display.
  *
  * @ingroup views_display_plugins
diff --git a/core/modules/field/lib/Drupal/field/Tests/Views/FieldUITest.php b/core/modules/field/lib/Drupal/field/Tests/Views/FieldUITest.php
index 07507fe..04dfcb5 100644
--- a/core/modules/field/lib/Drupal/field/Tests/Views/FieldUITest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/Views/FieldUITest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\field\Tests\Views;
 
+use Drupal\views\Views;
+
 /**
  * Tests the UI of the field field handler.
  *
@@ -87,7 +89,7 @@ public function testHandlerUI() {
 
     // Save the view and test whether the settings are saved.
     $this->drupalPostForm('admin/structure/views/view/test_view_fieldapi', array(), t('Save'));
-    $view = views_get_view('test_view_fieldapi');
+    $view = Views::getView('test_view_fieldapi');
     $view->initHandlers();
     $this->assertEqual($view->field['field_name_0']->options['type'], 'text_trimmed');
     $this->assertEqual($view->field['field_name_0']->options['settings']['trim_length'], $random_number);
diff --git a/core/modules/field/lib/Drupal/field/Tests/Views/HandlerFieldFieldTest.php b/core/modules/field/lib/Drupal/field/Tests/Views/HandlerFieldFieldTest.php
index b14d24d..9a25836 100644
--- a/core/modules/field/lib/Drupal/field/Tests/Views/HandlerFieldFieldTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/Views/HandlerFieldFieldTest.php
@@ -10,6 +10,7 @@
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Language\Language;
 use Drupal\views\ViewExecutable;
+use Drupal\views\Views;
 
 /**
  * Tests the field_field handler.
@@ -110,7 +111,7 @@ public function testFieldRender() {
   }
 
   public function _testSimpleFieldRender() {
-    $view = views_get_view('test_view_fieldapi');
+    $view = Views::getView('test_view_fieldapi');
     $this->prepareView($view);
     $this->executeView($view);
 
@@ -129,7 +130,7 @@ public function _testSimpleFieldRender() {
    * Tests that fields with formatters runs as expected.
    */
   public function _testFormatterSimpleFieldRender() {
-    $view = views_get_view('test_view_fieldapi');
+    $view = Views::getView('test_view_fieldapi');
     $this->prepareView($view);
     $view->displayHandlers->get('default')->options['fields'][$this->fields[0]->getName()]['type'] = 'text_trimmed';
     $view->displayHandlers->get('default')->options['fields'][$this->fields[0]->getName()]['settings'] = array(
@@ -146,7 +147,7 @@ public function _testFormatterSimpleFieldRender() {
   }
 
   public function _testMultipleFieldRender() {
-    $view = views_get_view('test_view_fieldapi');
+    $view = Views::getView('test_view_fieldapi');
     $field_name = $this->fields[3]->getName();
 
     // Test delta limit.
diff --git a/core/modules/file/lib/Drupal/file/Tests/Views/ExtensionViewsFieldTest.php b/core/modules/file/lib/Drupal/file/Tests/Views/ExtensionViewsFieldTest.php
index 9683c1f..1218e05 100644
--- a/core/modules/file/lib/Drupal/file/Tests/Views/ExtensionViewsFieldTest.php
+++ b/core/modules/file/lib/Drupal/file/Tests/Views/ExtensionViewsFieldTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\file\Tests\Views;
 
+use Drupal\views\Views;
 use Drupal\views\Tests\ViewUnitTestBase;
 use Drupal\views\Tests\ViewTestData;
 
@@ -71,7 +72,7 @@ protected function viewsData() {
    * Tests file extension views field handler extension_detect_tar option.
    */
   public function testFileExtensionTarOption() {
-    $view = views_get_view('file_extension_view');
+    $view = Views::getView('file_extension_view');
     $view->setDisplay();
 
     $this->executeView($view);
diff --git a/core/modules/forum/lib/Drupal/forum/Tests/Views/ForumIntegrationTest.php b/core/modules/forum/lib/Drupal/forum/Tests/Views/ForumIntegrationTest.php
index b7fe19d..a5b2a75 100644
--- a/core/modules/forum/lib/Drupal/forum/Tests/Views/ForumIntegrationTest.php
+++ b/core/modules/forum/lib/Drupal/forum/Tests/Views/ForumIntegrationTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\forum\Tests\Views;
 
+use Drupal\views\Views;
 use Drupal\views\Tests\ViewTestBase;
 use Drupal\views\Tests\ViewTestData;
 
@@ -74,7 +75,7 @@ public function testForumIntegration() {
       }
     }
 
-    $view = views_get_view('test_forum_index');
+    $view = Views::getView('test_forum_index');
     $this->executeView($view);
 
     $expected_result = array();
diff --git a/core/modules/history/lib/Drupal/history/Tests/Views/HistoryTimestampTest.php b/core/modules/history/lib/Drupal/history/Tests/Views/HistoryTimestampTest.php
index 182174c..fe0c1cb 100644
--- a/core/modules/history/lib/Drupal/history/Tests/Views/HistoryTimestampTest.php
+++ b/core/modules/history/lib/Drupal/history/Tests/Views/HistoryTimestampTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\history\Tests\Views;
 
+use Drupal\views\Views;
 use Drupal\views\Tests\ViewTestBase;
 
 /**
@@ -71,7 +72,7 @@ public function testHandlers() {
     );
 
     // Test the history field.
-    $view = views_get_view('test_history');
+    $view = Views::getView('test_history');
     $view->setDisplay('page_1');
     $this->executeView($view);
     $this->assertEqual(count($view->result), 2);
@@ -81,7 +82,7 @@ public function testHandlers() {
     $this->assertEqual(count($result), 1, 'Just one node is marked as new');
 
     // Test the history filter.
-    $view = views_get_view('test_history');
+    $view = Views::getView('test_history');
     $view->setDisplay('page_2');
     $this->executeView($view);
     $this->assertEqual(count($view->result), 1);
diff --git a/core/modules/language/lib/Drupal/language/Tests/Views/ArgumentLanguageTest.php b/core/modules/language/lib/Drupal/language/Tests/Views/ArgumentLanguageTest.php
index 9469d36..f25b251 100644
--- a/core/modules/language/lib/Drupal/language/Tests/Views/ArgumentLanguageTest.php
+++ b/core/modules/language/lib/Drupal/language/Tests/Views/ArgumentLanguageTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\language\Tests\Views;
 
 use Drupal\Core\Language\Language;
+use Drupal\views\Views;
 
 /**
  * Tests the argument language handler.
@@ -35,7 +36,7 @@ public static function getInfo() {
    * Tests the language argument.
    */
   public function testArgument() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     foreach (array('en' => 'John', 'xx-lolspeak' => 'George') as $langcode => $name) {
       $view->setDisplay();
       $view->displayHandlers->get('default')->overrideOption('arguments', array(
diff --git a/core/modules/language/lib/Drupal/language/Tests/Views/FieldLanguageTest.php b/core/modules/language/lib/Drupal/language/Tests/Views/FieldLanguageTest.php
index 7a831c6..13b5135 100644
--- a/core/modules/language/lib/Drupal/language/Tests/Views/FieldLanguageTest.php
+++ b/core/modules/language/lib/Drupal/language/Tests/Views/FieldLanguageTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\language\Tests\Views;
 
 use Drupal\Core\Language\Language;
+use Drupal\views\Views;
 
 /**
  * Tests the field language handler.
@@ -35,7 +36,7 @@ public static function getInfo() {
    * Tests the language field.
    */
   public function testField() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
     $view->displayHandlers->get('default')->overrideOption('fields', array(
       'langcode' => array(
diff --git a/core/modules/language/lib/Drupal/language/Tests/Views/FilterLanguageTest.php b/core/modules/language/lib/Drupal/language/Tests/Views/FilterLanguageTest.php
index 5387978..87717f6 100644
--- a/core/modules/language/lib/Drupal/language/Tests/Views/FilterLanguageTest.php
+++ b/core/modules/language/lib/Drupal/language/Tests/Views/FilterLanguageTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\language\Tests\Views;
 
 use Drupal\Core\Language\Language;
+use Drupal\views\Views;
 
 /**
  * Tests the filter language handler.
@@ -35,7 +36,7 @@ public static function getInfo() {
    * Tests the language filter.
    */
   public function testFilter() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     foreach (array('en' => 'John', 'xx-lolspeak' => 'George') as $langcode => $name) {
       $view->setDisplay();
       $view->displayHandlers->get('default')->overrideOption('filters', array(
diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/FieldTypeTest.php b/core/modules/node/lib/Drupal/node/Tests/Views/FieldTypeTest.php
index 17bcea5..e8f1e2c 100644
--- a/core/modules/node/lib/Drupal/node/Tests/Views/FieldTypeTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/Views/FieldTypeTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\node\Tests\Views;
 
+use Drupal\views\Views;
+
 /**
  * Tests the Drupal\node\Plugin\views\field\Type handler.
  */
@@ -38,7 +40,7 @@ public function testFieldType() {
       'node_field_data_type' => 'node_field_data_type',
     );
 
-    $view = views_get_view('test_field_type');
+    $view = Views::getView('test_field_type');
     $this->executeView($view);
     $this->assertIdenticalResultset($view, $expected_result, $column_map, 'The correct node type was displayed.');
   }
diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/FilterUidRevisionTest.php b/core/modules/node/lib/Drupal/node/Tests/Views/FilterUidRevisionTest.php
index a1cf0f2..1e38fb4 100644
--- a/core/modules/node/lib/Drupal/node/Tests/Views/FilterUidRevisionTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/Views/FilterUidRevisionTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\node\Tests\Views;
 
+use Drupal\views\Views;
+
 /**
  * Tests the node_uid_revision handler.
  */
@@ -53,7 +55,7 @@ public function testFilter() {
     // or the main node.
     $this->drupalCreateNode(array('uid' => $no_author->id()));
 
-    $view = views_get_view('test_filter_node_uid_revision');
+    $view = Views::getView('test_filter_node_uid_revision');
     $view->initHandlers();
     $view->filter['uid_revision']->value = array($author->id());
 
diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/FrontPageTest.php b/core/modules/node/lib/Drupal/node/Tests/Views/FrontPageTest.php
index 63c101f..7867334 100644
--- a/core/modules/node/lib/Drupal/node/Tests/Views/FrontPageTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/Views/FrontPageTest.php
@@ -9,6 +9,7 @@
 
 use Drupal\views\Tests\ViewTestBase;
 use Drupal\views\ViewExecutable;
+use Drupal\views\Views;
 
 /**
  * Tests the default frontpage provided by views.
@@ -53,7 +54,7 @@ public function testFrontPage() {
       ->set('name', $site_name)
       ->save();
 
-    $view = views_get_view('frontpage');
+    $view = Views::getView('frontpage');
     $view->setDisplay('page_1');
     $this->executeView($view);
     $view->preview();
diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/RevisionRelationships.php b/core/modules/node/lib/Drupal/node/Tests/Views/RevisionRelationships.php
index 8a31ceb..4968048 100644
--- a/core/modules/node/lib/Drupal/node/Tests/Views/RevisionRelationships.php
+++ b/core/modules/node/lib/Drupal/node/Tests/Views/RevisionRelationships.php
@@ -6,6 +6,7 @@
  */
 namespace Drupal\node\Tests\Views;
 
+use Drupal\views\Views;
 use Drupal\views\Tests\ViewTestBase;
 use Drupal\views\Tests\ViewTestData;
 
@@ -58,7 +59,7 @@ public function testNodeRevisionRelationship() {
     );
 
     // Here should be two rows.
-    $view_nid = views_get_view('test_node_revision_nid');
+    $view_nid = Views::getView('test_node_revision_nid');
     $this->executeView($view_nid, array($node->id()));
     $resultset_nid = array(
       array(
@@ -75,7 +76,7 @@ public function testNodeRevisionRelationship() {
     $this->assertIdenticalResultset($view_nid, $resultset_nid, $column_map);
 
     // There should be only one row with active revision 2.
-    $view_vid = views_get_view('test_node_revision_vid');
+    $view_vid = Views::getView('test_node_revision_vid');
     $this->executeView($view_vid, array($node->id()));
     $resultset_vid = array(
       array(
diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/RowPluginTest.php b/core/modules/node/lib/Drupal/node/Tests/Views/RowPluginTest.php
index 33b8ba7..a44a369 100644
--- a/core/modules/node/lib/Drupal/node/Tests/Views/RowPluginTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/Views/RowPluginTest.php
@@ -6,7 +6,9 @@
  */
 
 namespace Drupal\node\Tests\Views;
+
 use Drupal\Core\Language\Language;
+use Drupal\views\Views;
 
 /**
  * Tests the node row plugin.
@@ -109,7 +111,7 @@ public function drupalCreateComment(array $settings = array()) {
    * Tests the node row plugin.
    */
   public function testRowPlugin() {
-    $view = views_get_view('test_node_row_plugin');
+    $view = Views::getView('test_node_row_plugin');
     $view->initDisplay();
     $view->setDisplay('page_1');
     $view->initStyle();
diff --git a/core/modules/rest/lib/Drupal/rest/Tests/Views/StyleSerializerTest.php b/core/modules/rest/lib/Drupal/rest/Tests/Views/StyleSerializerTest.php
index 5903780..2a72be5 100644
--- a/core/modules/rest/lib/Drupal/rest/Tests/Views/StyleSerializerTest.php
+++ b/core/modules/rest/lib/Drupal/rest/Tests/Views/StyleSerializerTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\rest\Tests\Views;
 
+use Drupal\views\Views;
 use Drupal\views\Tests\Plugin\PluginTestBase;
 use Drupal\views\Tests\ViewTestData;
 
@@ -67,7 +68,7 @@ protected function setUp() {
    */
   public function testSerializerResponses() {
     // Test the serialize callback.
-    $view = views_get_view('test_serializer_display_field');
+    $view = Views::getView('test_serializer_display_field');
     $view->initDisplay();
     $this->executeView($view);
 
@@ -104,7 +105,7 @@ public function testSerializerResponses() {
 
     // Test the entity rows.
 
-    $view = views_get_view('test_serializer_display_entity');
+    $view = Views::getView('test_serializer_display_entity');
     $view->initDisplay();
     $this->executeView($view);
 
@@ -186,7 +187,7 @@ public function testUIFieldAlias() {
     $this->drupalPostForm($row_options, array('row_options[field_options][name][alias]' => ''), t('Apply'));
     $this->drupalPostForm(NULL, array(), t('Save'));
 
-    $view = views_get_view('test_serializer_display_field');
+    $view = Views::getView('test_serializer_display_field');
     $view->setDisplay('rest_export_1');
     $this->executeView($view);
 
@@ -221,7 +222,7 @@ public function testUIFieldAlias() {
 
     $this->drupalPostForm(NULL, array(), t('Save'));
 
-    $view = views_get_view('test_serializer_display_field');
+    $view = Views::getView('test_serializer_display_field');
     $view->setDisplay('rest_export_1');
     $this->executeView($view);
 
@@ -253,7 +254,7 @@ public function testFieldRawOutput() {
     $this->drupalPostForm($row_options, array('row_options[field_options][created][raw_output]' => '1'), t('Apply'));
     $this->drupalPostForm(NULL, array(), t('Save'));
 
-    $view = views_get_view('test_serializer_display_field');
+    $view = Views::getView('test_serializer_display_field');
     $view->setDisplay('rest_export_1');
     $this->executeView($view);
 
@@ -267,7 +268,7 @@ public function testFieldRawOutput() {
    * Tests the preview output for json output.
    */
   public function testPreview() {
-    $view = views_get_view('test_serializer_display_entity');
+    $view = Views::getView('test_serializer_display_entity');
     $view->setDisplay('rest_export_1');
     $this->executeView($view);
 
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipNodeTermDataTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipNodeTermDataTest.php
index b3f5af2..2d891b7 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipNodeTermDataTest.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipNodeTermDataTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\taxonomy\Tests\Views;
 
+use Drupal\views\Views;
+
 /**
  * Tests the node_term_data relationship handler.
  */
@@ -28,7 +30,7 @@ public static function getInfo() {
   }
 
   function testViewsHandlerRelationshipNodeTermData() {
-    $view = views_get_view('test_taxonomy_node_term_data');
+    $view = Views::getView('test_taxonomy_node_term_data');
     $this->executeView($view, array($this->term1->id(), $this->term2->id()));
     $resultset = array(
       array(
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipRepresentativeNode.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipRepresentativeNode.php
index bb22fda..1d754f0 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipRepresentativeNode.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipRepresentativeNode.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\taxonomy\Tests\Views;
 
+use Drupal\views\Views;
+
 /**
  * Tests the representative node relationship for terms.
  */
@@ -31,7 +33,7 @@ public static function getInfo() {
    * Tests the relationship.
    */
   public function testRelationship() {
-    $view = views_get_view('test_groupwise_term');
+    $view = Views::getView('test_groupwise_term');
     $this->executeView($view);
     $map = array('node_taxonomy_term_data_nid' => 'nid', 'tid' => 'tid');
     $expected_result = array(
diff --git a/core/modules/tracker/lib/Drupal/tracker/Tests/Views/TrackerUserUidTest.php b/core/modules/tracker/lib/Drupal/tracker/Tests/Views/TrackerUserUidTest.php
index b5c83bf..c50baee 100644
--- a/core/modules/tracker/lib/Drupal/tracker/Tests/Views/TrackerUserUidTest.php
+++ b/core/modules/tracker/lib/Drupal/tracker/Tests/Views/TrackerUserUidTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\tracker\Tests\Views;
 
+use Drupal\views\Views;
+
 /**
  * Tests the tracker user uid handlers.
  */
@@ -43,7 +45,7 @@ public function testUserUid() {
       )
     );
 
-    $view = views_get_view('test_tracker_user_uid');
+    $view = Views::getView('test_tracker_user_uid');
     $this->executeView($view);
 
     // We should have no results as the filter is set for uid 0.
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/AccessPermissionTest.php b/core/modules/user/lib/Drupal/user/Tests/Views/AccessPermissionTest.php
index aaf5a93..dcccacc 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/AccessPermissionTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/AccessPermissionTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\user\Tests\Views;
 
 use Drupal\user\Plugin\views\access\Permission;
+use Drupal\views\Views;
 
 /**
  * Tests views perm access plugin.
@@ -35,7 +36,7 @@ public static function getInfo() {
    * Tests perm access plugin.
    */
   function testAccessPerm() {
-    $view = views_get_view('test_access_perm');
+    $view = Views::getView('test_access_perm');
     $view->setDisplay();
 
     $access_plugin = $view->display_handler->getPlugin('access');
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/ArgumentDefaultTest.php b/core/modules/user/lib/Drupal/user/Tests/Views/ArgumentDefaultTest.php
index 654d1d7..8323de1 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/ArgumentDefaultTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/ArgumentDefaultTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\user\Tests\Views;
 
+use Drupal\views\Views;
+
 /**
  * Tests views user argument default plugin.
  */
@@ -38,7 +40,7 @@ public function test_plugin_argument_default_current_user() {
     drupal_save_session(FALSE);
     $user = $account;
 
-    $view = views_get_view('test_plugin_argument_default_current_user');
+    $view = Views::getView('test_plugin_argument_default_current_user');
     $view->initHandlers();
 
     $this->assertEqual($view->argument['null']->getDefaultArgument(), $account->id(), 'Uid of the current user is used.');
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/ArgumentValidateTest.php b/core/modules/user/lib/Drupal/user/Tests/Views/ArgumentValidateTest.php
index 418b826..332645c 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/ArgumentValidateTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/ArgumentValidateTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\user\Tests\Views;
 
+use Drupal\views\Views;
+
 /**
  * Tests views user argument validator plugin.
  */
@@ -83,7 +85,7 @@ function testArgumentValidateUserEither() {
   }
 
   function view_argument_validate_user($argtype) {
-    $view = views_get_view('test_view_argument_validate_user');
+    $view = Views::getView('test_view_argument_validate_user');
     $view->setDisplay();
     $view->displayHandlers->get('default')->options['arguments']['null']['validate_options']['type'] = $argtype;
     $view->preExecute();
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/BulkFormTest.php b/core/modules/user/lib/Drupal/user/Tests/Views/BulkFormTest.php
index af8e58d..f3dfca4 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/BulkFormTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/BulkFormTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\user\Tests\Views;
 
+use Drupal\views\Views;
+
 /**
  * Tests the views bulk form test.
  *
@@ -81,7 +83,7 @@ public function testBulkForm() {
     $this->assertNoRaw($account->label(), 'The user is not found in the table.');
 
     // Remove the user status filter from the view.
-    $view = views_get_view('test_user_bulk_form');
+    $view = Views::getView('test_user_bulk_form');
     $view->removeHandler('default', 'filter', 'status');
     $view->storage->save();
 
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerArgumentUserUidTest.php b/core/modules/user/lib/Drupal/user/Tests/Views/HandlerArgumentUserUidTest.php
index 2c44bd8..a52c5e3 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerArgumentUserUidTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/HandlerArgumentUserUidTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\user\Tests\Views;
 
+use Drupal\views\Views;
+
 /**
  * Tests views user uid argument handler.
  */
@@ -31,7 +33,7 @@ public static function getInfo() {
    * Tests the generated title of an user: uid argument.
    */
   public function testArgumentTitle() {
-    $view = views_get_view('test_user_uid_argument');
+    $view = Views::getView('test_user_uid_argument');
 
     // Tests an invalid user uid.
     $this->executeView($view, array(rand(1000, 10000)));
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldPermissionTest.php b/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldPermissionTest.php
index 70e772a..6f78d22 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldPermissionTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldPermissionTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\user\Tests\Views;
 
+use Drupal\views\Views;
 use Drupal\views\Tests\ViewTestData;
 use Drupal\views\Tests\ViewUnitTestBase;
 
@@ -38,7 +39,7 @@ public static function getInfo() {
   public function testFieldPermission() {
     $this->setupPermissionTestData();
 
-    $view = views_get_view('test_field_permission');
+    $view = Views::getView('test_field_permission');
     $this->executeView($view);
     $view->initStyle();
     $view->render();
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldRoleTest.php b/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldRoleTest.php
index b85b61a..b9b9791 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldRoleTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldRoleTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\user\Tests\Views;
 
+use Drupal\views\Views;
+
 /**
  * Tests the role field handler.
  *
@@ -46,7 +48,7 @@ public function testRole() {
     $user->addRole($rolename_b);
     $user->save();
 
-    $view = views_get_view('test_views_handler_field_role');
+    $view = Views::getView('test_views_handler_field_role');
     $this->executeView($view);
     $view->row_index = 0;
     // The role field is populated during preRender.
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldUserNameTest.php b/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldUserNameTest.php
index 1ec2c8b..4b1e9f9 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldUserNameTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldUserNameTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\user\Tests\Views;
 
+use Drupal\views\Views;
+
 /**
  * Tests the field username handler.
  *
@@ -32,7 +34,7 @@ public static function getInfo() {
   public function testUserName() {
     $this->drupalLogin($this->drupalCreateUser(array('access user profiles')));
 
-    $view = views_get_view('test_views_handler_field_user_name');
+    $view = Views::getView('test_views_handler_field_user_name');
     $this->executeView($view);
 
     $view->row_index = 0;
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFilterPermissionTest.php b/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFilterPermissionTest.php
index ed67b16..970ea70 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFilterPermissionTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFilterPermissionTest.php
@@ -9,6 +9,7 @@
 
 use Drupal\Component\Utility\String;
 use Drupal\user\Tests\Views\UserUnitTestBase;
+use Drupal\views\Views;
 
 /**
  * Tests the permissions filter handler.
@@ -44,7 +45,7 @@ public function testFilterPermission() {
     $this->setupPermissionTestData();
 
     $column_map = array('uid' => 'uid');
-    $view = views_get_view('test_filter_permission');
+    $view = Views::getView('test_filter_permission');
 
     // Filter by a non existing permission.
     $view->initHandlers();
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFilterUserNameTest.php b/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFilterUserNameTest.php
index f4eefdd..a498d37 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFilterUserNameTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFilterUserNameTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\user\Tests\Views;
 
+use Drupal\views\Views;
 use Drupal\views\Tests\ViewTestBase;
 use Drupal\views\Tests\ViewTestData;
 
@@ -82,7 +83,7 @@ protected function setUp() {
    * Tests just using the filter.
    */
   public function testUserNameApi() {
-    $view = views_get_view('test_user_name');
+    $view = Views::getView('test_user_name');
 
     $view->initHandlers();
     $view->filter['uid']->value = array($this->accounts[0]->id());
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/RelationshipRepresentativeNode.php b/core/modules/user/lib/Drupal/user/Tests/Views/RelationshipRepresentativeNode.php
index 7cd9b04..886c1ff 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/RelationshipRepresentativeNode.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/RelationshipRepresentativeNode.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\user\Tests\Views;
 
+use Drupal\views\Views;
+
 /**
  * Tests the representative node relationship for users.
  */
@@ -31,7 +33,7 @@ public static function getInfo() {
    * Tests the relationship.
    */
   public function testRelationship() {
-    $view = views_get_view('test_groupwise_user');
+    $view = Views::getView('test_groupwise_user');
     $this->executeView($view);
     $map = array('node_users_nid' => 'nid', 'uid' => 'uid');
     $expected_result = array(
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/UserDataTest.php b/core/modules/user/lib/Drupal/user/Tests/Views/UserDataTest.php
index 6c27bf9..7813dd7 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/UserDataTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/UserDataTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\user\Tests\Views;
 
+use Drupal\views\Views;
+
 /**
  * Tests the user data service field handler.
  *
@@ -45,7 +47,7 @@ public function testDataField() {
     $random_value = $this->randomName();
     $this->userData->set('views_test_config', $this->users[0]->id(), 'test_value_name', $random_value);
 
-    $view = views_get_view('test_user_data');
+    $view = Views::getView('test_user_data');
     $this->executeView($view);
 
     $output = $view->field['data']->render($view->result[0]);
diff --git a/core/modules/views/lib/Drupal/views/EventSubscriber/RouteSubscriber.php b/core/modules/views/lib/Drupal/views/EventSubscriber/RouteSubscriber.php
index 94b3ff4..1fdfcf0 100644
--- a/core/modules/views/lib/Drupal/views/EventSubscriber/RouteSubscriber.php
+++ b/core/modules/views/lib/Drupal/views/EventSubscriber/RouteSubscriber.php
@@ -14,6 +14,7 @@
 use Drupal\Core\Routing\RoutingEvents;
 use Drupal\views\Plugin\views\display\DisplayRouterInterface;
 use Drupal\views\ViewExecutable;
+use Drupal\views\Views;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
@@ -187,10 +188,10 @@ public function routeRebuildFinished() {
   /**
    * Returns all views/display combinations with routes.
    *
-   * @see views_get_applicable_views()
+   * @see \Drupal\views\Views::getApplicableViews()
    */
   protected function getApplicableViews() {
-    return views_get_applicable_views('uses_route');
+    return Views::getApplicableViews('uses_route');
   }
 
 }
diff --git a/core/modules/views/lib/Drupal/views/Plugin/entity_reference/selection/ViewsSelection.php b/core/modules/views/lib/Drupal/views/Plugin/entity_reference/selection/ViewsSelection.php
index 05e97d9..aa84db2 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/entity_reference/selection/ViewsSelection.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/entity_reference/selection/ViewsSelection.php
@@ -11,6 +11,7 @@
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\entity_reference\Plugin\Type\Selection\SelectionInterface;
+use Drupal\views\Views;
 
 /**
  * Plugin implementation of the 'selection' entity_reference.
@@ -59,7 +60,7 @@ public function __construct(FieldDefinitionInterface $field_definition, EntityIn
   public static function settingsForm(FieldDefinitionInterface $field_definition) {
     $selection_handler_settings = $field_definition->getSetting('handler_settings') ?: array();
     $view_settings = !empty($selection_handler_settings['view']) ? $selection_handler_settings['view'] : array();
-    $displays = views_get_applicable_views('entity_reference_display');
+    $displays = Views::getApplicableViews('entity_reference_display');
     // Filter views that list the entity type we want, and group the separate
     // displays by view.
     $entity_type = \Drupal::entityManager()->getDefinition($field_definition->getSetting('target_type'));
@@ -134,7 +135,7 @@ protected function initializeView($match = NULL, $match_operator = 'CONTAINS', $
     $display_name = $handler_settings['view']['display_name'];
 
     // Check that the view is valid and the display still exists.
-    $this->view = views_get_view($view_name);
+    $this->view = Views::getView($view_name);
     if (!$this->view || !$this->view->access($display_name)) {
       drupal_set_message(t('The reference view %view_name used in the %field_name field cannot be found.', array('%view_name' => $view_name, '%field_name' => $this->fieldDefinition->getLabel())), 'warning');
       return FALSE;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/View.php b/core/modules/views/lib/Drupal/views/Plugin/views/area/View.php
index 6fcf820..9e11d4d 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/area/View.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/area/View.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Plugin\views\area;
 
 use Drupal\Core\Entity\EntityStorageControllerInterface;
+use Drupal\views\Views;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -83,7 +84,7 @@ public function buildOptionsForm(&$form, &$form_state) {
     $view_display = $this->view->storage->id() . ':' . $this->view->current_display;
 
     $options = array('' => t('-Select-'));
-    $options += views_get_views_as_options(FALSE, 'all', $view_display, FALSE, TRUE);
+    $options += Views::getViewsAsOptions(FALSE, 'all', $view_display, FALSE, TRUE);
     $form['view_to_insert'] = array(
       '#type' => 'select',
       '#title' => t('View to insert'),
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
index db9eff1..bc99b02 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
@@ -1516,7 +1516,7 @@ public function buildOptionsForm(&$form, &$form_state) {
           '#title' => t('Access'),
           '#title_display' => 'invisible',
           '#type' => 'radios',
-          '#options' => views_fetch_plugin_names('access', $this->getType(), array($this->view->storage->get('base_table'))),
+          '#options' => Views::fetchPluginNames('access', $this->getType(), array($this->view->storage->get('base_table'))),
           '#default_value' => $access['type'],
         );
 
@@ -1553,7 +1553,7 @@ public function buildOptionsForm(&$form, &$form_state) {
           '#title' => t('Caching'),
           '#title_display' => 'invisible',
           '#type' => 'radios',
-          '#options' => views_fetch_plugin_names('cache', $this->getType(), array($this->view->storage->get('base_table'))),
+          '#options' => Views::fetchPluginNames('cache', $this->getType(), array($this->view->storage->get('base_table'))),
           '#default_value' => $cache['type'],
         );
 
@@ -1647,7 +1647,7 @@ public function buildOptionsForm(&$form, &$form_state) {
           '#title' => t('Style'),
           '#title_display' => 'invisible',
           '#type' => 'radios',
-          '#options' => views_fetch_plugin_names('style', $this->getType(), array($this->view->storage->get('base_table'))),
+          '#options' => Views::fetchPluginNames('style', $this->getType(), array($this->view->storage->get('base_table'))),
           '#default_value' => $style_plugin->definition['id'],
           '#description' => t('If the style you choose has settings, be sure to click the settings button that will appear next to it in the View summary.'),
         );
@@ -1696,7 +1696,7 @@ public function buildOptionsForm(&$form, &$form_state) {
           '#title' => t('Row'),
           '#title_display' => 'invisible',
           '#type' => 'radios',
-          '#options' => views_fetch_plugin_names('row', $this->getType(), array($this->view->storage->get('base_table'))),
+          '#options' => Views::fetchPluginNames('row', $this->getType(), array($this->view->storage->get('base_table'))),
           '#default_value' => $row_plugin_instance->definition['id'],
         );
 
@@ -1790,7 +1790,7 @@ public function buildOptionsForm(&$form, &$form_state) {
           '#title' => t('Exposed form'),
           '#title_display' => 'invisible',
           '#type' => 'radios',
-          '#options' => views_fetch_plugin_names('exposed_form', $this->getType(), array($this->view->storage->get('base_table'))),
+          '#options' => Views::fetchPluginNames('exposed_form', $this->getType(), array($this->view->storage->get('base_table'))),
           '#default_value' => $exposed_form['type'],
         );
 
@@ -1826,7 +1826,7 @@ public function buildOptionsForm(&$form, &$form_state) {
           '#title' => t('Pager'),
           '#title_display' => 'invisible',
           '#type' => 'radios',
-          '#options' => views_fetch_plugin_names('pager', !$this->usesPager() ? 'basic' : NULL, array($this->view->storage->get('base_table'))),
+          '#options' => Views::fetchPluginNames('pager', !$this->usesPager() ? 'basic' : NULL, array($this->view->storage->get('base_table'))),
           '#default_value' => $pager['type'],
         );
 
@@ -2233,7 +2233,7 @@ function preview() {
    * @return string
    *   The required display type. Defaults to 'normal'.
    *
-   * @see views_fetch_plugin_names()
+   * @see \Drupal\views\Views::fetchPluginNames()
    */
   protected function getType() {
     return 'normal';
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/Feed.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/Feed.php
index d50e976..ed7a571 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display/Feed.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/Feed.php
@@ -9,6 +9,7 @@
 
 use Drupal\Component\Utility\String;
 use Drupal\views\ViewExecutable;
+use Drupal\views\Views;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
@@ -50,7 +51,7 @@ public function initDisplay(ViewExecutable $view, array &$display, array &$optio
     // Set the default row style. Ideally this would be part of the option
     // definition, but in this case it's dependent on the view's base table,
     // which we don't know until init().
-    $row_plugins = views_fetch_plugin_names('row', $this->getType(), array($view->storage->get('base_table')));
+    $row_plugins = Views::fetchPluginNames('row', $this->getType(), array($view->storage->get('base_table')));
     $default_row_plugin = key($row_plugins);
     if (empty($this->options['row']['type'])) {
       $this->options['row']['type'] = $default_row_plugin;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php b/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php
index 4355a61..44be0ae 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php
@@ -121,7 +121,7 @@ public function buildOptionsForm(&$form, &$form_state) {
     // WIP: This stuff doens't work yet: namespacing issues.
     // A list of suitable views to pick one as the subview.
     $views = array('' => '- None -');
-    $all_views = views_get_all_views();
+    $all_views = Views::getAllViews();
     foreach ($all_views as $view) {
       // Only get views that are suitable:
       // - base must the base that our relationship joins towards
@@ -189,7 +189,7 @@ public function submitOptionsForm(&$form, &$form_state) {
   protected function leftQuery($options) {
     // Either load another view, or create one on the fly.
     if ($options['subquery_view']) {
-      $temp_view = views_get_view($options['subquery_view']);
+      $temp_view = Views::getView($options['subquery_view']);
       // Remove all fields from default display
       unset($temp_view->display['default']['display_options']['fields']);
     }
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
index 7416f10..b7a8bdf 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
@@ -201,8 +201,8 @@ public function getSorts() {
    * {@inheritdoc}
    */
   public function buildForm(array $form, array &$form_state) {
-    $style_options = views_fetch_plugin_names('style', 'normal', array($this->base_table));
-    $feed_row_options = views_fetch_plugin_names('row', 'feed', array($this->base_table));
+    $style_options = Views::fetchPluginNames('style', 'normal', array($this->base_table));
+    $feed_row_options = Views::fetchPluginNames('row', 'feed', array($this->base_table));
     $path_prefix = url(NULL, array('absolute' => TRUE));
 
     // Add filters and sorts which apply to the view as a whole.
@@ -548,7 +548,7 @@ protected function buildFormStyle(array &$form, array &$form_state, $type) {
    */
   protected function rowStyleOptions() {
     // Get all available row plugins by default.
-    $options = views_fetch_plugin_names('row', 'normal', array($this->base_table));
+    $options = Views::fetchPluginNames('row', 'normal', array($this->base_table));
     return $options;
   }
 
diff --git a/core/modules/views/lib/Drupal/views/Tests/BasicTest.php b/core/modules/views/lib/Drupal/views/Tests/BasicTest.php
index aef6a50..719e752 100644
--- a/core/modules/views/lib/Drupal/views/Tests/BasicTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/BasicTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\views\Tests;
 
+use Drupal\views\Views;
+
 /**
  * Basic test class for Views query builder tests.
  */
@@ -31,7 +33,7 @@ public static function getInfo() {
    * Tests a trivial result set.
    */
   public function testSimpleResultSet() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Execute the view.
@@ -49,7 +51,7 @@ public function testSimpleResultSet() {
    * Tests filtering of the result set.
    */
   public function testSimpleFiltering() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Add a filter.
@@ -109,7 +111,7 @@ public function testSimpleFiltering() {
    */
   public function testSimpleArgument() {
     // Execute with a view
-    $view = views_get_view('test_simple_argument');
+    $view = Views::getView('test_simple_argument');
     $view->setArguments(array(27));
     $this->executeView($view);
 
@@ -130,7 +132,7 @@ public function testSimpleArgument() {
     ));
 
     // Test "show all" if no argument is present.
-    $view = views_get_view('test_simple_argument');
+    $view = Views::getView('test_simple_argument');
     $this->executeView($view);
 
     // Build the expected result.
diff --git a/core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php b/core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php
index 81e692f..208b888 100644
--- a/core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php
@@ -11,6 +11,7 @@
 use Drupal\Core\Language\Language;
 use Drupal\simpletest\WebTestBase;
 use Drupal\views\ViewExecutable;
+use Drupal\views\Views;
 
 /**
  * Tests for views default views.
@@ -189,7 +190,7 @@ public function testArchiveView() {
     );
     $this->drupalCreateNode($node);
 
-    $view = views_get_view('archive');
+    $view = Views::getView('archive');
     $view->setDisplay('page_1');
     $this->executeView($view);
     $columns = array('nid', 'created_year_month', 'num_records');
diff --git a/core/modules/views/lib/Drupal/views/Tests/Entity/FieldEntityTest.php b/core/modules/views/lib/Drupal/views/Tests/Entity/FieldEntityTest.php
index 95e661e..d828383 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Entity/FieldEntityTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Entity/FieldEntityTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests\Entity;
 
 use Drupal\views\Tests\ViewTestBase;
+use Drupal\views\Views;
 
 /**
  * Tests the field plugin base integration with the entity system.
@@ -59,7 +60,7 @@ public function testGetEntity() {
     ));
     $comment->save();
 
-    $view = views_get_view('test_field_get_entity');
+    $view = Views::getView('test_field_get_entity');
     $this->executeView($view);
     $row = $view->result[0];
 
diff --git a/core/modules/views/lib/Drupal/views/Tests/Entity/FilterEntityBundleTest.php b/core/modules/views/lib/Drupal/views/Tests/Entity/FilterEntityBundleTest.php
index 0d7ee5d..d950a6a 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Entity/FilterEntityBundleTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Entity/FilterEntityBundleTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests\Entity;
 
 use Drupal\views\Tests\ViewTestBase;
+use Drupal\views\Views;
 
 /**
  * Tests the EntityType generic filter handler.
@@ -74,7 +75,7 @@ public function setUp() {
    * Tests the generic bundle filter.
    */
   public function testFilterEntity() {
-    $view = views_get_view('test_entity_type_filter');
+    $view = Views::getView('test_entity_type_filter');
     $this->executeView($view);
 
     // Test we have all the results, with all types selected.
diff --git a/core/modules/views/lib/Drupal/views/Tests/GlossaryTest.php b/core/modules/views/lib/Drupal/views/Tests/GlossaryTest.php
index 07b507b..739f2a6 100644
--- a/core/modules/views/lib/Drupal/views/Tests/GlossaryTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/GlossaryTest.php
@@ -6,7 +6,9 @@
  */
 
 namespace Drupal\views\Tests;
+
 use Drupal\Component\Utility\Unicode;
+use Drupal\views\Views;
 
 /**
  * Tests glossary view ( summary of arguments ).
@@ -54,7 +56,7 @@ public function testGlossaryView() {
     }
 
     // Execute glossary view
-    $view = views_get_view('glossary');
+    $view = Views::getView('glossary');
     $view->setDisplay('attachment_1');
     $view->executeDisplay('attachment_1');
 
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaEntityTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/AreaEntityTest.php
index ab4a6b5..81374f7 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaEntityTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/AreaEntityTest.php
@@ -89,7 +89,7 @@ public function testEntityArea() {
       \Drupal::state()->set('entity_test_entity_access.view.' . $entity_test->id(), $i != 2);
     }
 
-    $view = views_get_view('test_entity_area');
+    $view = Views::getView('test_entity_area');
     $preview = $view->preview('default', array($entities[1]->id()));
     $this->drupalSetContent(drupal_render($preview));
 
@@ -102,7 +102,7 @@ public function testEntityArea() {
     $this->assertTrue(strpos(trim((string) $result[0]), 'full') !== FALSE, 'The rendered entity appeared in the right view mode.');
 
     // Change the view mode of the area handler.
-    $view = views_get_view('test_entity_area');
+    $view = Views::getView('test_entity_area');
     $item = $view->getHandler('default', 'header', 'entity_entity_test');
     $item['view_mode'] = 'test';
     $view->setHandler('default', 'header', 'entity_entity_test', $item);
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaHTTPStatusCodeTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/AreaHTTPStatusCodeTest.php
index b2f5c08..b39c9d0 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaHTTPStatusCodeTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/AreaHTTPStatusCodeTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\views\Tests\Handler;
 
+use Drupal\views\Views;
+
 /**
  * Tests the http_status_code area handler.
  *
@@ -44,7 +46,7 @@ public function testHTTPStatusCodeHandler() {
     $this->assertResponse(200);
 
     // Change the HTTP status code to 418.
-    $view = views_get_view('test_http_status_code');
+    $view = Views::getView('test_http_status_code');
     $display = &$view->storage->getDisplay('default');
     $display['display_options']['empty']['http_status_code']['status_code'] = 418;
     $view->save();
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTest.php
index e7007de..2fae9d3 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\views\Tests\Handler;
 
+use Drupal\views\Views;
+
 /**
  * Tests the abstract area handler.
  *
@@ -92,7 +94,7 @@ public function testUI() {
    * Tests the rendering of an area.
    */
   public function testRenderArea() {
-    $view = views_get_view('test_example_area');
+    $view = Views::getView('test_example_area');
     $view->initHandlers();
 
     // Insert a random string to the test area plugin and see whether it is
@@ -124,7 +126,7 @@ public function testRenderAreaToken() {
     $admin_user = $this->drupalCreateUser(array('administer views', 'administer site configuration'));
     $this->drupalLogin($admin_user);
 
-    $view = views_get_view('test_example_area');
+    $view = Views::getView('test_example_area');
     $view->initHandlers();
 
     $this->drupalGet('admin/structure/views/nojs/handler/test_example_area/default/empty/test_example');
@@ -159,7 +161,7 @@ public function testRenderAreaToken() {
    * Tests overriding the view title using the area title handler.
    */
   public function testTitleArea() {
-    $view = views_get_view('frontpage');
+    $view = Views::getView('frontpage');
     $view->initDisplay('page_1');
 
     // Add the title area handler to the empty area.
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTextTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTextTest.php
index 82127e8..2ac78f8 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTextTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTextTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests\Handler;
 
 use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Views;
 
 /**
  * Tests the text area handler.
@@ -41,7 +42,7 @@ protected function setUp() {
   }
 
   public function testAreaText() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     // add a text header
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTitleTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTitleTest.php
index 38399d7..367e980 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTitleTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTitleTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests\Handler;
 
 use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Views;
 
 /**
  * Tests the title area handler.
@@ -35,7 +36,7 @@ public static function getInfo() {
    * Tests the title area handler.
    */
   public function testTitleText() {
-    $view = views_get_view('test_area_title');
+    $view = Views::getView('test_area_title');
 
     $view->setDisplay('default');
     $this->executeView($view);
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentDateTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentDateTest.php
index c5dac2e..6c1ae6e 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentDateTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentDateTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests\Handler;
 
 use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Views;
 
 /**
  * Tests the core date argument handlers.
@@ -68,7 +69,7 @@ public function viewsData() {
    * @see \Drupal\node\Plugin\views\argument\CreatedFullDate
    */
   public function testCreatedFullDateHandler() {
-    $view = views_get_view('test_argument_date');
+    $view = Views::getView('test_argument_date');
     $view->setDisplay('default');
     $this->executeView($view, array('20000102'));
     $expected = array();
@@ -99,7 +100,7 @@ public function testCreatedFullDateHandler() {
    * @see \Drupal\node\Plugin\views\argument\CreatedDay
    */
   public function testDayHandler() {
-    $view = views_get_view('test_argument_date');
+    $view = Views::getView('test_argument_date');
     $view->setDisplay('embed_1');
     $this->executeView($view, array('02'));
     $expected = array();
@@ -129,7 +130,7 @@ public function testDayHandler() {
    * @see \Drupal\node\Plugin\views\argument\CreatedMonth
    */
   public function testMonthHandler() {
-    $view = views_get_view('test_argument_date');
+    $view = Views::getView('test_argument_date');
     $view->setDisplay('embed_2');
     $this->executeView($view, array('01'));
     $expected = array();
@@ -168,7 +169,7 @@ public function testWeekHandler() {
       ->condition('id', 5)
       ->execute();
 
-    $view = views_get_view('test_argument_date');
+    $view = Views::getView('test_argument_date');
     $view->setDisplay('embed_3');
     // The first jan 2000 was still in the last week of the previous year.
     $this->executeView($view, array(52));
@@ -220,7 +221,7 @@ public function testYearHandler() {
       ->condition('id', 5)
       ->execute();
 
-    $view = views_get_view('test_argument_date');
+    $view = Views::getView('test_argument_date');
     $view->setDisplay('embed_4');
     $this->executeView($view, array('2000'));
     $expected = array();
@@ -271,7 +272,7 @@ public function testYearMonthHandler() {
       ->condition('id', 5)
       ->execute();
 
-    $view = views_get_view('test_argument_date');
+    $view = Views::getView('test_argument_date');
     $view->setDisplay('embed_5');
     $this->executeView($view, array('200001'));
     $expected = array();
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php
index b9bedbe..3c5930a 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests\Handler;
 
 use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Views;
 
 /**
  * Tests the core Drupal\views\Plugin\views\argument\Null handler.
@@ -38,7 +39,7 @@ function viewsData() {
 
   public function testAreaText() {
     // Test validation
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Add a null argument.
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php
index 3119adb..4f2a7bc 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\views\Tests\Handler;
 
+use Drupal\views\Views;
+
 /**
  * Tests the core Drupal\views\Plugin\views\argument\String handler.
  */
@@ -49,7 +51,7 @@ function testGlossary() {
       }
     }
 
-    $view = views_get_view('test_glossary');
+    $view = Views::getView('test_glossary');
     $this->executeView($view);
 
     $count_field = 'nid';
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php
index d81d5c9..482980d 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests\Handler;
 
 use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Views;
 
 /**
  * Tests the core Drupal\views\Plugin\views\field\Boolean handler.
@@ -44,7 +45,7 @@ function viewsData() {
   }
 
   public function testFieldBoolean() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     $view->displayHandlers->get('default')->overrideOption('fields', array(
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldCounterTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldCounterTest.php
index 8773248..3d12d42 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldCounterTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldCounterTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests\Handler;
 
 use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Views;
 
 /**
  * Tests the Drupal\views\Plugin\views\field\Counter handler.
@@ -37,7 +38,7 @@ public static function getInfo() {
   }
 
   function testSimple() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
     $view->displayHandlers->get('default')->overrideOption('fields', array(
       'counter' => array(
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldCustomTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldCustomTest.php
index 8f70f48..a761ce2 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldCustomTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldCustomTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests\Handler;
 
 use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Views;
 
 /**
  * Tests the core Drupal\views\Plugin\views\field\Custom handler.
@@ -36,7 +37,7 @@ function viewsData() {
   }
 
   public function testFieldCustom() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Alter the text of the field to a random string.
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldDateTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldDateTest.php
index cfa1270..54cdc02 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldDateTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldDateTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests\Handler;
 
 use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Views;
 
 /**
  * Tests the core Drupal\views\Plugin\views\field\Date handler.
@@ -36,7 +37,7 @@ function viewsData() {
   }
 
   public function testFieldDate() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     $view->displayHandlers->get('default')->overrideOption('fields', array(
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php
index 1f2304d..e1e317d 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests\Handler;
 
 use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Views;
 
 /**
  * Tests the core Drupal\views\Plugin\views\field\FileSize handler.
@@ -49,7 +50,7 @@ function viewsData() {
   }
 
   public function testFieldFileSize() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     $view->displayHandlers->get('default')->overrideOption('fields', array(
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUnitTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUnitTest.php
index 6ad3b19..e7f780c 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUnitTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUnitTest.php
@@ -9,6 +9,7 @@
 
 use Drupal\views\Tests\ViewUnitTestBase;
 use Drupal\views\Plugin\views\field\FieldPluginBase;
+use Drupal\views\Views;
 
 /**
  * Tests the generic field handler.
@@ -53,7 +54,7 @@ protected function viewsData() {
    * Tests that the render function is called.
    */
   public function testRender() {
-    $view = views_get_view('test_field_tokens');
+    $view = Views::getView('test_field_tokens');
     $this->executeView($view);
 
     $random_text = $this->randomName();
@@ -66,7 +67,7 @@ public function testRender() {
    */
   public function testQuery() {
     // Tests adding additional fields to the query.
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->initHandlers();
 
     $id_field = $view->field['id'];
@@ -142,7 +143,7 @@ protected function assertNotSubString($haystack, $needle, $message = '', $group
    * Tests general rewriting of the output.
    */
   public function testRewrite() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->initHandlers();
     $this->executeView($view);
     $row = $view->result[0];
@@ -162,7 +163,7 @@ public function testRewrite() {
    * Tests the field tokens, row level and field level.
    */
   public function testFieldTokens() {
-    $view = views_get_view('test_field_tokens');
+    $view = Views::getView('test_field_tokens');
     $this->executeView($view);
     $name_field_0 = $view->field['name'];
     $name_field_1 = $view->field['name_1'];
@@ -207,7 +208,7 @@ public function testFieldTokens() {
    * Tests the exclude setting.
    */
   public function testExclude() {
-    $view = views_get_view('test_field_output');
+    $view = Views::getView('test_field_output');
     $view->initHandlers();
     // Hide the field and see whether it's rendered.
     $view->field['name']->options['exclude'] = TRUE;
@@ -242,7 +243,7 @@ function testEmpty() {
    * This tests alters the result to get easier and less coupled results.
    */
   function _testHideIfEmpty() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->initDisplay();
     $this->executeView($view);
 
@@ -460,7 +461,7 @@ function _testHideIfEmpty() {
    * Tests the usage of the empty text.
    */
   function _testEmptyText() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->initDisplay();
     $this->executeView($view);
 
@@ -497,7 +498,7 @@ function _testEmptyText() {
    * Tests views_handler_field::isValueEmpty().
    */
   function testIsValueEmpty() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->initHandlers();
     $field = $view->field['name'];
 
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUrlTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUrlTest.php
index b2f2118..5e89599 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUrlTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUrlTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests\Handler;
 
 use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Views;
 
 /**
  * Tests the core Drupal\views\Plugin\views\field\Url handler.
@@ -43,7 +44,7 @@ function viewsData() {
   }
 
   public function testFieldUrl() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     $view->displayHandlers->get('default')->overrideOption('fields', array(
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldWebTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldWebTest.php
index 7bf0e89..dc9e3e8 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldWebTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldWebTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\views\Tests\Handler;
 
+use Drupal\views\Views;
+
 /**
  * Tests fields from within a UI.
  *
@@ -175,7 +177,7 @@ protected function xpathContent($content, $xpath, array $arguments = array()) {
    * Tests rewriting the output to a link.
    */
   public function testAlterUrl() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
     $view->initHandlers();
     $this->executeView($view);
@@ -323,7 +325,7 @@ public function testAlterUrl() {
    * Tests the field/label/wrapper classes.
    */
   public function testFieldClasses() {
-    $view = views_get_view('test_field_classes');
+    $view = Views::getView('test_field_classes');
     $view->initHandlers();
 
     // Tests whether the default field classes are added.
@@ -430,7 +432,7 @@ public function testFieldClasses() {
    * Tests trimming/read-more/ellipses.
    */
   public function testTextRendering() {
-    $view = views_get_view('test_field_output');
+    $view = Views::getView('test_field_output');
     $view->initHandlers();
     $name_field = $view->field['name'];
 
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldXssTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldXssTest.php
index dac9b56..5eb8911 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldXssTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldXssTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests\Handler;
 
 use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Views;
 
 /**
  * Tests the core Drupal\views\Plugin\views\field\Xss handler.
@@ -50,7 +51,7 @@ function viewsData() {
   }
 
   public function testFieldXss() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     $view->displayHandlers->get('default')->overrideOption('fields', array(
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterBooleanOperatorTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FilterBooleanOperatorTest.php
index a9ff2cf..b512a07 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterBooleanOperatorTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FilterBooleanOperatorTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests\Handler;
 
 use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Views;
 
 /**
  * Tests the BooleanOperator filter handler.
@@ -52,7 +53,7 @@ protected function setUp() {
    * Tests the BooleanOperator filter.
    */
   public function testFilterBooleanOperator() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Add a the status boolean filter.
@@ -103,7 +104,7 @@ public function testFilterBooleanOperator() {
    */
   public function testFilterGroupedExposed() {
     $filters = $this->getGroupedExposedFilters();
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
 
     $view->setExposedInput(array('status' => 1));
     $view->setDisplay();
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterCombineTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FilterCombineTest.php
index e49acdb..f18b912 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterCombineTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FilterCombineTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests\Handler;
 
 use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Views;
 
 /**
  * Tests the combine filter handler.
@@ -35,7 +36,7 @@ public static function getInfo() {
   }
 
   public function testFilterCombineContains() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     $fields = $view->displayHandlers->get('default')->getOption('fields');
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterDateTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FilterDateTest.php
index cd94718..5665e96 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterDateTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FilterDateTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\views\Tests\Handler;
 
+use Drupal\views\Views;
+
 /**
  * Tests the core Drupal\views\Plugin\views\filter\Date handler.
  */
@@ -61,7 +63,7 @@ protected function testDateFilter() {
    * Test the general offset functionality.
    */
   protected function _testOffset() {
-    $view = views_get_view('test_filter_date_between');
+    $view = Views::getView('test_filter_date_between');
 
     // Test offset for simple operator.
     $view->initHandlers();
@@ -92,7 +94,7 @@ protected function _testOffset() {
    * Tests the filter operator between/not between.
    */
   protected function _testBetween() {
-    $view = views_get_view('test_filter_date_between');
+    $view = Views::getView('test_filter_date_between');
 
     // Test between with min and max.
     $view->initHandlers();
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php
index f239773..bbc0758 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests\Handler;
 
 use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Views;
 
 /**
  * Tests the core Drupal\views\Plugin\views\filter\Equality handler.
@@ -48,7 +49,7 @@ function viewsData() {
   }
 
   function testEqual() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
@@ -74,7 +75,7 @@ function testEqual() {
 
   public function testEqualGroupedExposed() {
     $filters = $this->getGroupedExposedFilters();
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->newDisplay('page', 'Page', 'page_1');
 
     // Filter: Name, Operator: =, Value: Ringo
@@ -92,7 +93,7 @@ public function testEqualGroupedExposed() {
   }
 
   function testNotEqual() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
@@ -127,7 +128,7 @@ function testNotEqual() {
 
   public function testEqualGroupedNotExposed() {
     $filters = $this->getGroupedExposedFilters();
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->newDisplay('page', 'Page', 'page_1');
 
     // Filter: Name, Operator: !=, Value: Ringo
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php
index 7c710e3..4328154 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests\Handler;
 
 use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Views;
 
 /**
  * Tests the core Drupal\views\Plugin\views\filter\InOperator handler.
@@ -49,7 +50,7 @@ function viewsData() {
   }
 
   public function testFilterInOperatorSimple() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Add a in_operator ordering.
@@ -116,7 +117,7 @@ public function testFilterInOperatorSimple() {
 
   public function testFilterInOperatorGroupedExposedSimple() {
     $filters = $this->getGroupedExposedFilters();
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
 
     // Filter: Age, Operator: in, Value: 26, 30
     $filters['age']['group_info']['default_group'] = 1;
@@ -142,7 +143,7 @@ public function testFilterInOperatorGroupedExposedSimple() {
 
   public function testFilterNotInOperatorGroupedExposedSimple() {
     $filters = $this->getGroupedExposedFilters();
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
 
     // Filter: Age, Operator: in, Value: 26, 30
     $filters['age']['group_info']['default_group'] = 2;
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterNumericTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FilterNumericTest.php
index ae18750..8b70f44 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterNumericTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FilterNumericTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests\Handler;
 
 use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Views;
 
 /**
  * Tests the numeric filter handler.
@@ -51,7 +52,7 @@ function viewsData() {
   }
 
   public function testFilterNumericSimple() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
@@ -78,7 +79,7 @@ public function testFilterNumericSimple() {
 
   public function testFilterNumericExposedGroupedSimple() {
     $filters = $this->getGroupedExposedFilters();
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->newDisplay('page', 'Page', 'page_1');
 
     // Filter: Age, Operator: =, Value: 28
@@ -97,7 +98,7 @@ public function testFilterNumericExposedGroupedSimple() {
   }
 
   public function testFilterNumericBetween() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
@@ -171,7 +172,7 @@ public function testFilterNumericBetween() {
 
   public function testFilterNumericExposedGroupedBetween() {
     $filters = $this->getGroupedExposedFilters();
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->newDisplay('page', 'Page', 'page_1');
 
     // Filter: Age, Operator: between, Value: 26 and 29
@@ -199,7 +200,7 @@ public function testFilterNumericExposedGroupedBetween() {
 
   public function testFilterNumericExposedGroupedNotBetween() {
     $filters = $this->getGroupedExposedFilters();
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->newDisplay('page', 'Page', 'page_1');
 
     // Filter: Age, Operator: between, Value: 26 and 29
@@ -226,7 +227,7 @@ public function testFilterNumericExposedGroupedNotBetween() {
   }
 
   public function testFilterNumericEmpty() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
@@ -287,7 +288,7 @@ public function testFilterNumericEmpty() {
 
   public function testFilterNumericExposedGroupedEmpty() {
     $filters = $this->getGroupedExposedFilters();
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->newDisplay('page', 'Page', 'page_1');
 
     // Filter: Age, Operator: empty, Value:
@@ -303,7 +304,7 @@ public function testFilterNumericExposedGroupedEmpty() {
 
   public function testFilterNumericExposedGroupedNotEmpty() {
     $filters = $this->getGroupedExposedFilters();
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->newDisplay('page', 'Page', 'page_1');
 
     // Filter: Age, Operator: empty, Value:
@@ -338,7 +339,7 @@ public function testFilterNumericExposedGroupedNotEmpty() {
   }
 
   public function testAllowEmpty() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     $view->displayHandlers->get('default')->overrideOption('filters', array(
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterStringTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FilterStringTest.php
index 8d7e1f5..a0c0dc0 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterStringTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FilterStringTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests\Handler;
 
 use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Views;
 
 /**
  * Tests the core Drupal\views\Plugin\views\filter\String handler.
@@ -82,7 +83,7 @@ protected function dataSet() {
    * @return view
    */
   protected function getBasicPageView() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
 
     // In order to test exposed filters, we have to disable
     // the exposed forms cache.
@@ -93,7 +94,7 @@ protected function getBasicPageView() {
   }
 
   function testFilterStringEqual() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
@@ -138,7 +139,7 @@ function testFilterStringGroupedExposedEqual() {
   }
 
   function testFilterStringNotEqual() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
@@ -202,7 +203,7 @@ function testFilterStringGroupedExposedNotEqual() {
   }
 
   function testFilterStringContains() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
@@ -249,7 +250,7 @@ function testFilterStringGroupedExposedContains() {
 
 
   function testFilterStringWord() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
@@ -276,7 +277,7 @@ function testFilterStringWord() {
     $this->assertIdenticalResultset($view, $resultset, $this->column_map);
     $view->destroy();
 
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
@@ -342,7 +343,7 @@ function testFilterStringGroupedExposedWord() {
   }
 
   function testFilterStringStarts() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
@@ -386,7 +387,7 @@ function testFilterStringGroupedExposedStarts() {
   }
 
   function testFilterStringNotStarts() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
@@ -444,7 +445,7 @@ function testFilterStringGroupedExposedNotStarts() {
   }
 
   function testFilterStringEnds() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
@@ -494,7 +495,7 @@ function testFilterStringGroupedExposedEnds() {
   }
 
   function testFilterStringNotEnds() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
@@ -546,7 +547,7 @@ function testFilterStringGroupedExposedNotEnds() {
   }
 
   function testFilterStringNot() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
@@ -600,7 +601,7 @@ function testFilterStringGroupedExposedNot() {
   }
 
   function testFilterStringShorter() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
@@ -649,7 +650,7 @@ function testFilterStringGroupedExposedShorter() {
   }
 
   function testFilterStringLonger() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
@@ -693,7 +694,7 @@ function testFilterStringGroupedExposedLonger() {
 
 
   function testFilterStringEmpty() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAliasTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAliasTest.php
index a120aad..caec4c7 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAliasTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAliasTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests\Handler;
 
 use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Views;
 
 /**
  * Tests abstract handlers of views.
@@ -51,7 +52,7 @@ protected function viewsData() {
   }
 
   public function testPluginAliases() {
-    $view = views_get_view('test_filter');
+    $view = Views::getView('test_filter');
     $view->initDisplay();
 
     // Change the filtering.
@@ -78,7 +79,7 @@ public function testPluginAliases() {
     $this->assertIdentical($filter->realField, 'name');
 
     // Test an existing user uid field.
-    $view = views_get_view('test_alias');
+    $view = Views::getView('test_alias');
     $view->initDisplay();
     $this->executeView($view);
 
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerTest.php
index c719fce..fc5eeed 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerTest.php
@@ -194,7 +194,7 @@ function testBreakPhrase() {
   public function testHandlerWeights() {
     $handler_types = array('fields', 'filters', 'sorts');
 
-    $view = views_get_view('test_view_handler_weight');
+    $view = Views::getView('test_view_handler_weight');
     $view->initDisplay();
 
     // Store the order of handlers before saving the view.
@@ -205,7 +205,7 @@ public function testHandlerWeights() {
 
     // Save the view and see if our filters are in the same order.
     $view->save();
-    $view = views_get_view('test_view_handler_weight');
+    $view = views::getView('test_view_handler_weight');
     $view->initDisplay();
 
     foreach ($handler_types as $type) {
@@ -278,7 +278,7 @@ public function testRelationshipUI() {
    * Tests the relationship method on the base class.
    */
   public function testSetRelationship() {
-    $view = views_get_view('test_handler_relationships');
+    $view = Views::getView('test_handler_relationships');
     $view->setDisplay();
     // Setup a broken relationship.
     $view->addHandler('default', 'relationship', $this->randomName(), $this->randomName(), array(), 'broken_relationship');
@@ -317,7 +317,7 @@ public function testSetRelationship() {
    * @see \Drupal\views\Plugin\views\HandlerBase::placeholder()
    */
   public function testPlaceholder() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->initHandlers();
     $view->initQuery();
 
@@ -349,7 +349,7 @@ public function testPlaceholder() {
    * @see views_test_data_handler_test_access_callback
    */
   public function testAccess() {
-    $view = views_get_view('test_handler_test_access');
+    $view = Views::getView('test_handler_test_access');
     $views_data = $this->viewsData();
     $views_data = $views_data['views_test_data'];
 
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/RelationshipTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/RelationshipTest.php
index a5c295c..65621c9 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/RelationshipTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/RelationshipTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\views\Tests\Handler;
 
+use Drupal\views\Views;
 use Drupal\views\Tests\ViewUnitTestBase;
 use Drupal\views\Tests\Plugin\RelationshipJoinTestBase;
 
@@ -50,7 +51,7 @@ public function testRelationshipQuery() {
     db_query("UPDATE {views_test_data} SET uid = 1 WHERE id = 1");
     db_query("UPDATE {views_test_data} SET uid = 2 WHERE id <> 1");
 
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     $view->displayHandlers->get('default')->overrideOption('relationships', array(
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/SortDateTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/SortDateTest.php
index 813701e..1829773 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/SortDateTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/SortDateTest.php
@@ -9,6 +9,7 @@
 
 use Drupal\Component\Utility\String;
 use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Views;
 
 /**
  * Tests for core Drupal\views\Plugin\views\sort\Date handler.
@@ -158,7 +159,7 @@ protected function expectedResultSet($granularity, $reverse = TRUE) {
   public function testDateOrdering() {
     foreach (array('second', 'minute', 'hour', 'day', 'month', 'year') as $granularity) {
       foreach (array(FALSE, TRUE) as $reverse) {
-        $view = views_get_view('test_view');
+        $view = Views::getView('test_view');
         $view->setDisplay();
 
         // Change the fields.
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/SortRandomTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/SortRandomTest.php
index c7745b5..2de7b49 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/SortRandomTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/SortRandomTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests\Handler;
 
 use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Views;
 
 /**
  * Tests for core Drupal\views\Plugin\views\sort\Random handler.
@@ -50,7 +51,7 @@ protected function dataSet() {
    * Return a basic view with random ordering.
    */
   protected function getBasicRandomView() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Add a random ordering.
@@ -72,7 +73,7 @@ protected function getBasicRandomView() {
    */
   public function testRandomOrdering() {
     // Execute a basic view first.
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $this->executeView($view);
 
     // Verify the result.
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/SortTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/SortTest.php
index b7012ae..8f33acc 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/SortTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/SortTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests\Handler;
 
 use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Views;
 
 /**
  * Tests for core Drupal\views\Plugin\views\sort\SortPluginBase handler.
@@ -33,7 +34,7 @@ public static function getInfo() {
    * Tests numeric ordering of the result set.
    */
   public function testNumericOrdering() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the ordering
@@ -86,7 +87,7 @@ public function testNumericOrdering() {
    * Tests string ordering of the result set.
    */
   public function testStringOrdering() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the ordering
diff --git a/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php b/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php
index 8c31874..79bce4b 100644
--- a/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php
@@ -11,6 +11,7 @@
  * Tests basic functions from the Views module.
  */
 use Drupal\views\Plugin\views\filter\Standard;
+use Drupal\views\Views;
 use Drupal\Component\Utility\String;
 
 class ModuleTest extends ViewUnitTestBase {
@@ -163,46 +164,46 @@ public function testLoadFunctions() {
     // We can store this now, as we have enabled/disabled above.
     $all_views = $controller->loadMultiple();
 
-    // Test views_get_all_views().
-    $this->assertIdentical(array_keys($all_views), array_keys(views_get_all_views()), 'views_get_all_views works as expected.');
+    // Test Views::getAllViews().
+    $this->assertIdentical(array_keys($all_views), array_keys(Views::getAllViews()), 'Views::getAllViews works as expected.');
 
-    // Test views_get_enabled_views().
+    // Test Views::getEnabledViews().
     $expected_enabled = array_filter($all_views, function($view) {
       return views_view_is_enabled($view);
     });
-    $this->assertIdentical(array_keys($expected_enabled), array_keys(views_get_enabled_views()), 'Expected enabled views returned.');
+    $this->assertIdentical(array_keys($expected_enabled), array_keys(Views::getEnabledViews()), 'Expected enabled views returned.');
 
-    // Test views_get_disabled_views().
+    // Test Views::getDisabledViews().
     $expected_disabled = array_filter($all_views, function($view) {
       return views_view_is_disabled($view);
     });
-    $this->assertIdentical(array_keys($expected_disabled), array_keys(views_get_disabled_views()), 'Expected disabled views returned.');
+    $this->assertIdentical(array_keys($expected_disabled), array_keys(Views::getDisabledViews()), 'Expected disabled views returned.');
 
-    // Test views_get_views_as_options().
+    // Test Views::getViewsAsOptions().
     // Test the $views_only parameter.
-    $this->assertIdentical(array_keys($all_views), array_keys(views_get_views_as_options(TRUE)), 'Expected option keys for all views were returned.');
+    $this->assertIdentical(array_keys($all_views), array_keys(Views::getViewsAsOptions(TRUE)), 'Expected option keys for all views were returned.');
     $expected_options = array();
     foreach ($all_views as $id => $view) {
       $expected_options[$id] = $view->label();
     }
-    $this->assertIdentical($expected_options, views_get_views_as_options(TRUE), 'Expected options array was returned.');
+    $this->assertIdentical($expected_options, Views::getViewsAsOptions(TRUE), 'Expected options array was returned.');
 
     // Test the default.
-    $this->assertIdentical($this->formatViewOptions($all_views), views_get_views_as_options(), 'Expected options array for all views was returned.');
+    $this->assertIdentical($this->formatViewOptions($all_views), Views::getViewsAsOptions(), 'Expected options array for all views was returned.');
     // Test enabled views.
-    $this->assertIdentical($this->formatViewOptions($expected_enabled), views_get_views_as_options(FALSE, 'enabled'), 'Expected enabled options array was returned.');
+    $this->assertIdentical($this->formatViewOptions($expected_enabled), Views::getViewsAsOptions(FALSE, 'enabled'), 'Expected enabled options array was returned.');
     // Test disabled views.
-    $this->assertIdentical($this->formatViewOptions($expected_disabled), views_get_views_as_options(FALSE, 'disabled'), 'Expected disabled options array was returned.');
+    $this->assertIdentical($this->formatViewOptions($expected_disabled), Views::getViewsAsOptions(FALSE, 'disabled'), 'Expected disabled options array was returned.');
 
     // Test the sort parameter.
     $all_views_sorted = $all_views;
     ksort($all_views_sorted);
-    $this->assertIdentical(array_keys($all_views_sorted), array_keys(views_get_views_as_options(TRUE, 'all', NULL, FALSE, TRUE)), 'All view id keys returned in expected sort order');
+    $this->assertIdentical(array_keys($all_views_sorted), array_keys(Views::getViewsAsOptions(TRUE, 'all', NULL, FALSE, TRUE)), 'All view id keys returned in expected sort order');
 
     // Test $exclude_view parameter.
-    $this->assertFalse(array_key_exists('archive', views_get_views_as_options(TRUE, 'all', 'archive')), 'View excluded from options based on name');
-    $this->assertFalse(array_key_exists('archive:default', views_get_views_as_options(FALSE, 'all', 'archive:default')), 'View display excluded from options based on name');
-    $this->assertFalse(array_key_exists('archive', views_get_views_as_options(TRUE, 'all', $archive->getExecutable())), 'View excluded from options based on object');
+    $this->assertFalse(array_key_exists('archive', Views::getViewsAsOptions(TRUE, 'all', 'archive')), 'View excluded from options based on name');
+    $this->assertFalse(array_key_exists('archive:default', Views::getViewsAsOptions(FALSE, 'all', 'archive:default')), 'View display excluded from options based on name');
+    $this->assertFalse(array_key_exists('archive', Views::getViewsAsOptions(TRUE, 'all', $archive->getExecutable())), 'View excluded from options based on object');
 
     // Test the $opt_group parameter.
     $expected_opt_groups = array();
@@ -211,14 +212,14 @@ public function testLoadFunctions() {
           $expected_opt_groups[$view->id()][$view->id() . ':' . $display['id']] = t('@view : @display', array('@view' => $view->id(), '@display' => $display['id']));
       }
     }
-    $this->assertIdentical($expected_opt_groups, views_get_views_as_options(FALSE, 'all', NULL, TRUE), 'Expected option array for an option group returned.');
+    $this->assertIdentical($expected_opt_groups, Views::getViewsAsOptions(FALSE, 'all', NULL, TRUE), 'Expected option array for an option group returned.');
   }
 
   /**
    * Tests view enable and disable procedural wrapper functions.
    */
   function testStatusFunctions() {
-    $view = views_get_view('test_view_status')->storage;
+    $view = Views::getView('test_view_status')->storage;
 
     $this->assertFalse($view->status(), 'The view status is disabled.');
 
@@ -232,11 +233,11 @@ function testStatusFunctions() {
   }
 
   /**
-   * Tests the views_fetch_plugin_names() function.
+   * Tests the \Drupal\views\Views::fetchPluginNames() method.
    */
   public function testViewsFetchPluginNames() {
     // All style plugins should be returned, as we have not specified a type.
-    $plugins = views_fetch_plugin_names('style');
+    $plugins = Views::fetchPluginNames('style');
     $definitions = $this->container->get('plugin.manager.views.style')->getDefinitions();
     $expected = array();
     foreach ($definitions as $id =>$definition) {
@@ -247,19 +248,19 @@ public function testViewsFetchPluginNames() {
 
     // Test using the 'test' style plugin type only returns the test_style and
     // mapping_test plugins.
-    $plugins = views_fetch_plugin_names('style', 'test');
+    $plugins = Views::fetchPluginNames('style', 'test');
     $this->assertIdentical(array_keys($plugins), array('mapping_test', 'test_style', 'test_template_style'));
 
     // Test a non existent style plugin type returns no plugins.
-    $plugins = views_fetch_plugin_names('style', $this->randomString());
+    $plugins = Views::fetchPluginNames('style', $this->randomString());
     $this->assertIdentical($plugins, array());
   }
 
   /**
-   * Tests the views_plugin_list() function.
+   * Tests the \Drupal\views\Views::pluginList() method.
    */
   public function testViewsPluginList() {
-    $plugin_list = views_plugin_list();
+    $plugin_list = Views::pluginList();
     // Only plugins used by 'test_view' should be in the plugin list.
     foreach (array('display:default', 'pager:none') as $key) {
       list($plugin_type, $plugin_id) = explode(':', $key);
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/AccessTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/AccessTest.php
index ca6c8ec..eaff047 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/AccessTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/AccessTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests\Plugin;
 
 use Drupal\views\Tests\ViewTestData;
+use Drupal\views\Views;
 
 /**
  * Basic test for pluggable access.
@@ -62,7 +63,7 @@ protected function setUp() {
    * Tests none access plugin.
    */
   function testAccessNone() {
-    $view = views_get_view('test_access_none');
+    $view = Views::getView('test_access_none');
     $view->setDisplay();
 
     $this->assertTrue($view->display_handler->access($this->admin_user), 'Admin-Account should be able to access the view everytime');
@@ -80,7 +81,7 @@ function testAccessNone() {
    * @see \Drupal\views_test\Plugin\views\access\StaticTest
    */
   function testStaticAccessPlugin() {
-    $view = views_get_view('test_access_static');
+    $view = Views::getView('test_access_static');
     $view->setDisplay();
 
     $access_plugin = $view->display_handler->getPlugin('access');
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php
index d849320..6f50fa3 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\views\Tests\Plugin;
 
+use Drupal\views\Views;
 use Drupal\views_test_data\Plugin\views\argument_default\ArgumentDefaultTest as ArgumentDefaultTestPlugin;
 
 
@@ -49,7 +50,7 @@ protected function setUp() {
    * @see \Drupal\views_test_data\Plugin\views\argument_default\ArgumentDefaultTest
    */
   public function testArgumentDefaultPlugin() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
 
     // Add a new argument and set the test plugin for the argument_default.
     $options = array(
@@ -111,7 +112,7 @@ function testArgumentDefaultNoOptions() {
    */
   function testArgumentDefaultFixed() {
     $random = $this->randomName();
-    $view = views_get_view('test_argument_default_fixed');
+    $view = Views::getView('test_argument_default_fixed');
     $view->setDisplay();
     $options = $view->display_handler->getOption('arguments');
     $options['null']['default_argument_options']['argument'] = $random;
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php
index 8544990..2035cce 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests\Plugin;
 
 use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Views;
 
 /**
  * Tests Views argument validators.
@@ -30,7 +31,7 @@ public static function getInfo() {
   }
 
   function testArgumentValidateNumeric() {
-    $view = views_get_view('test_view_argument_validate_numeric');
+    $view = Views::getView('test_view_argument_validate_numeric');
     $view->initHandlers();
     $this->assertFalse($view->argument['null']->validateArgument($this->randomString()));
     // Reset safed argument validation.
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/CacheTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/CacheTest.php
index dca282f..5bdf6c1 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/CacheTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/CacheTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\views\Tests\Plugin;
 
+use Drupal\views\Views;
 use Drupal\views\ViewExecutable;
 
 /**
@@ -44,7 +45,7 @@ protected function setUp() {
    */
   public function testTimeCaching() {
     // Create a basic result which just 2 results.
-    $view = views_get_view('test_cache');
+    $view = Views::getView('test_cache');
     $view->setDisplay();
     $view->display_handler->overrideOption('cache', array(
       'type' => 'time',
@@ -67,7 +68,7 @@ public function testTimeCaching() {
     drupal_write_record('views_test_data', $record);
 
     // The Result should be the same as before, because of the caching.
-    $view = views_get_view('test_cache');
+    $view = Views::getView('test_cache');
     $view->setDisplay();
     $view->display_handler->overrideOption('cache', array(
       'type' => 'time',
@@ -89,7 +90,7 @@ public function testTimeCaching() {
    */
   function testNoneCaching() {
     // Create a basic result which just 2 results.
-    $view = views_get_view('test_cache');
+    $view = Views::getView('test_cache');
     $view->setDisplay();
     $view->display_handler->overrideOption('cache', array(
       'type' => 'none',
@@ -110,7 +111,7 @@ function testNoneCaching() {
     drupal_write_record('views_test_data', $record);
 
     // The Result changes, because the view is not cached.
-    $view = views_get_view('test_cache');
+    $view = Views::getView('test_cache');
     $view->setDisplay();
     $view->display_handler->overrideOption('cache', array(
       'type' => 'none',
@@ -129,7 +130,7 @@ function testHeaderStorage() {
     // Create a view with output caching enabled.
     // Some hook_views_pre_render in views_test_data.module adds the test css/js file.
     // so they should be added to the css/js storage.
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
     $view->storage->set('id', 'test_cache_header_storage');
     $view->display_handler->overrideOption('cache', array(
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayExtenderTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayExtenderTest.php
index 40114264..e646b0a 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayExtenderTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayExtenderTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests\Plugin;
 
 use Drupal\views\Tests\Plugin\PluginTestBase;
+use Drupal\views\Views;
 
 /**
  * Tests the display extender plugins.
@@ -42,9 +43,9 @@ protected function setUp() {
    */
   public function testDisplayExtenders() {
     \Drupal::config('views.settings')->set('display_extenders', array('display_extender_test'))->save();
-    $this->assertEqual(count(views_get_enabled_display_extenders()), 1, 'Make sure that there is only one enabled display extender.');
+    $this->assertEqual(count(Views::getEnabledDisplayExtenders()), 1, 'Make sure that there is only one enabled display extender.');
 
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->initDisplay();
 
     $this->assertEqual(count($view->display_handler->extender), 1, 'Make sure that only one extender is initialized.');
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayPageTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayPageTest.php
index 48ad3f2..a7d4418 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayPageTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayPageTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\views\Tests\Plugin;
 
+use Drupal\views\Views;
 use Drupal\views\Tests\ViewUnitTestBase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -78,7 +79,7 @@ public function testPageResponses() {
     \Drupal::getContainer()->set('request', $subrequest);
 
     // Test accessing a disabled page for a view.
-    $view = views_get_view('test_page_display');
+    $view = Views::getView('test_page_display');
     // Disable the view, rebuild menu, and request the page again.
     $view->storage->disable()->save();
     // Router rebuild would occur in a kernel terminate event so we need to
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayTest.php
index 61d2611..5a284d8 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayTest.php
@@ -57,7 +57,7 @@ public function setUp() {
    * @see \Drupal\views_test_data\Plugin\views\display\DisplayTest
    */
   public function testDisplayPlugin() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
 
     // Add a new 'display_test' display and test it's there.
     $view->storage->addDisplay('display_test');
@@ -146,7 +146,7 @@ public function testDisplayPlugin() {
    * Tests the overriding of filter_groups.
    */
   public function testFilterGroupsOverriding() {
-    $view = views_get_view('test_filter_groups');
+    $view = Views::getView('test_filter_groups');
     $view->initDisplay();
 
     // mark is as overridden, yes FALSE, means overridden.
@@ -159,7 +159,7 @@ public function testFilterGroupsOverriding() {
    * Tests the getAttachedDisplays method.
    */
   public function testGetAttachedDisplays() {
-    $view = views_get_view('test_get_attach_displays');
+    $view = Views::getView('test_get_attach_displays');
 
     // Both the feed_1 and the feed_2 display are attached to the page display.
     $view->setDisplay('page_1');
@@ -175,7 +175,7 @@ public function testGetAttachedDisplays() {
   public function testReadMore() {
     $expected_more_text = 'custom more text';
 
-    $view = views_get_view('test_display_more');
+    $view = Views::getView('test_display_more');
     $this->executeView($view);
 
     $output = $view->preview();
@@ -200,7 +200,7 @@ public function testReadMore() {
     $more_text = $view->display_handler->useMoreText();
     $this->assertEqual($more_text, $expected_more_text, 'The right more text is chosen.');
 
-    $view = views_get_view('test_display_more');
+    $view = Views::getView('test_display_more');
     $view->setDisplay();
     $view->display_handler->setOption('use_more', 0);
     $this->executeView($view);
@@ -210,7 +210,7 @@ public function testReadMore() {
     $result = $this->xpath('//div[@class=:class]/a', array(':class' => 'more-link'));
     $this->assertTrue(empty($result), 'The more link is not shown.');
 
-    $view = views_get_view('test_display_more');
+    $view = Views::getView('test_display_more');
     $view->setDisplay();
     $view->display_handler->setOption('use_more', 0);
     $view->display_handler->setOption('use_more_always', 0);
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayUnitTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayUnitTest.php
index aa7306c..0a36d53 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayUnitTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayUnitTest.php
@@ -6,6 +6,7 @@
 
 namespace Drupal\views\Tests\Plugin;
 
+use Drupal\views\Views;
 use Drupal\views\Tests\ViewUnitTestBase;
 use Drupal\views\Plugin\views\style\StylePluginBase;
 use Drupal\views\Plugin\views\access\AccessPluginBase;
@@ -72,12 +73,12 @@ public static function getInfo() {
    */
   public function testDefaultOptions() {
     // Save the view.
-    $view = views_get_view('test_display_defaults');
+    $view = Views::getView('test_display_defaults');
     $view->mergeDefaults();
     $view->save();
 
     // Reload to get saved storage values.
-    $view = views_get_view('test_display_defaults');
+    $view = Views::getView('test_display_defaults');
     $view->initDisplay();
     $display_data = $view->storage->get('display');
 
@@ -99,7 +100,7 @@ public function testDefaultOptions() {
    * Tests the \Drupal\views\Plugin\views\display\DisplayPluginBase::getPlugin() method.
    */
   public function testGetPlugin() {
-    $view = views_get_view('test_display_defaults');
+    $view = Views::getView('test_display_defaults');
     $view->initDisplay();
     $display_handler = $view->display_handler;
 
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php
index 4f70653..3a41e77 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php
@@ -127,7 +127,7 @@ public function testResetButton() {
    * Tests the exposed form markup.
    */
   public function testExposedFormRender() {
-    $view = views_get_view('test_exposed_form_buttons');
+    $view = Views::getView('test_exposed_form_buttons');
     $this->executeView($view);
     $exposed_form = $view->display_handler->getPlugin('exposed_form');
     $output = $exposed_form->renderExposedForm();
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/FilterTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/FilterTest.php
index 3f0f8a2..77ad92e 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/FilterTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/FilterTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\views\Tests\Plugin;
 
+use Drupal\views\Views;
 use Drupal\views_test_data\Plugin\views\filter\FilterTest as FilterPlugin;
 
 /**
@@ -62,7 +63,7 @@ public function testFilterQuery() {
     $plugin = $this->container->get('plugin.manager.views.filter')->createInstance('test_filter');
     $this->assertTrue($plugin instanceof FilterPlugin, 'Test filter plugin found.');
 
-    $view = views_get_view('test_filter');
+    $view = Views::getView('test_filter');
     $view->initDisplay();
 
     // Change the filtering.
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/JoinTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/JoinTest.php
index 793e062..dfb470e 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/JoinTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/JoinTest.php
@@ -9,6 +9,7 @@
 
 use Drupal\views_test_data\Plugin\views\join\JoinTest as JoinTestPlugin;
 use Drupal\views\Plugin\views\join\JoinPluginBase;
+use Drupal\views\Views;
 
 
 /**
@@ -54,7 +55,7 @@ protected function setUp() {
   public function testExamplePlugin() {
 
     // Setup a simple join and test the result sql.
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->initDisplay();
     $view->initQuery();
 
@@ -85,7 +86,7 @@ public function testExamplePlugin() {
   public function testBasePlugin() {
 
     // Setup a simple join and test the result sql.
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->initDisplay();
     $view->initQuery();
 
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/MiniPagerTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/MiniPagerTest.php
index 62961d6..e5f684a 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/MiniPagerTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/MiniPagerTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\views\Tests\Plugin;
 
+use Drupal\views\Views;
+
 /**
  * Tests the mini pager plugin
  *
@@ -115,7 +117,7 @@ public function testMiniPagerRender() {
     $this->assertNoText('‹‹ test', 'The previous link does not appear on the page.');
     $this->assertText($this->nodes[19]->label());
 
-    $view = views_get_view('test_mini_pager');
+    $view = Views::getView('test_mini_pager');
     $this->executeView($view);
     $this->assertIdentical($view->get_total_rows, NULL, 'The query was not forced to calculate the total number of results.');
     $this->assertIdentical($view->total_rows, 1, 'The pager calculated the total number of rows.');
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/PagerTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/PagerTest.php
index 9b4a20c..9ba46d8 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/PagerTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/PagerTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\views\Tests\Plugin;
 
+use Drupal\views\Views;
+
 /**
  * Tests the pluggable pager system.
  */
@@ -65,7 +67,7 @@ public function testStorePagerSettings() {
     $this->assertText('Mini', 'Changed pager plugin, should change some text');
 
     // Test behavior described in http://drupal.org/node/652712#comment-2354400
-    $view = views_get_view('test_store_pager_settings');
+    $view = Views::getView('test_store_pager_settings');
     // Make it editable in the admin interface.
     $view->save();
 
@@ -118,12 +120,12 @@ public function testNoLimit() {
     for ($i = 0; $i < 11; $i++) {
       $this->drupalCreateNode();
     }
-    $view = views_get_view('test_pager_none');
+    $view = Views::getView('test_pager_none');
     $this->executeView($view);
     $this->assertEqual(count($view->result), 11, 'Make sure that every item is returned in the result');
 
     // Setup and test a offset.
-    $view = views_get_view('test_pager_none');
+    $view = Views::getView('test_pager_none');
     $view->setDisplay();
     $pager = array(
       'type' => 'none',
@@ -147,7 +149,7 @@ public function testViewTotalRowsWithoutPager() {
       $this->drupalCreateNode();
     }
 
-    $view = views_get_view('test_pager_none');
+    $view = Views::getView('test_pager_none');
     $view->get_total_rows = TRUE;
     $this->executeView($view);
 
@@ -164,12 +166,12 @@ public function testLimit() {
       $this->drupalCreateNode();
     }
 
-    $view = views_get_view('test_pager_some');
+    $view = Views::getView('test_pager_some');
     $this->executeView($view);
     $this->assertEqual(count($view->result), 5, 'Make sure that only a certain count of items is returned');
 
     // Setup and test a offset.
-    $view = views_get_view('test_pager_some');
+    $view = Views::getView('test_pager_some');
     $view->setDisplay();
     $pager = array(
       'type' => 'none',
@@ -197,12 +199,12 @@ public function testNormalPager() {
       $this->drupalCreateNode();
     }
 
-    $view = views_get_view('test_pager_full');
+    $view = Views::getView('test_pager_full');
     $this->executeView($view);
     $this->assertEqual(count($view->result), 5, 'Make sure that only a certain count of items is returned');
 
     // Setup and test a offset.
-    $view = views_get_view('test_pager_full');
+    $view = Views::getView('test_pager_full');
     $view->setDisplay();
     $pager = array(
       'type' => 'full',
@@ -216,7 +218,7 @@ public function testNormalPager() {
     $this->assertEqual(count($view->result), 3, 'Make sure that only a certain count of items is returned');
 
     // Test items per page = 0
-    $view = views_get_view('test_view_pager_full_zero_items_per_page');
+    $view = Views::getView('test_view_pager_full_zero_items_per_page');
     $this->executeView($view);
 
     $this->assertEqual(count($view->result), 11, 'All items are return');
@@ -225,7 +227,7 @@ public function testNormalPager() {
 
     // Test items per page = 0.
     // Setup and test a offset.
-    $view = views_get_view('test_pager_full');
+    $view = Views::getView('test_pager_full');
     $view->setDisplay();
     $pager = array(
       'type' => 'full',
@@ -250,7 +252,7 @@ public function testRenderNullPager() {
     for ($i = 0; $i < 11; $i++) {
       $this->drupalCreateNode();
     }
-    $view = views_get_view('test_pager_full');
+    $view = Views::getView('test_pager_full');
     $this->executeView($view);
     // Force the value again here.
     $view->setAjaxEnabled(TRUE);
@@ -264,7 +266,7 @@ public function testRenderNullPager() {
    * Test the api functions on the view object.
    */
   function testPagerApi() {
-    $view = views_get_view('test_pager_full');
+    $view = Views::getView('test_pager_full');
     $view->setDisplay();
     // On the first round don't initialize the pager.
 
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/QueryTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/QueryTest.php
index 7da2672..ac3513b 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/QueryTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/QueryTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\views\Tests\Plugin;
 
+use Drupal\views\Views;
 use Drupal\views\Tests\ViewUnitTestBase;
 use Drupal\views_test_data\Plugin\views\query\QueryTest as QueryTestPlugin;
 
@@ -50,7 +51,7 @@ public function testQuery() {
    * Tests the ViewExecutable::initQuery method.
    */
   public function _testInitQuery() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     $view->initQuery();
@@ -58,7 +59,7 @@ public function _testInitQuery() {
   }
 
   public function _testQueryExecute() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     $view->initQuery();
@@ -74,7 +75,7 @@ public function _testQueryExecute() {
    * @see \Drupal\views\Plugin\views\query\QueryPluginBase
    */
   protected function queryMethodsTests() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     $view->initQuery();
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/RowEntityTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/RowEntityTest.php
index 5efa290..177fdea 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/RowEntityTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/RowEntityTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\views\Tests\Plugin;
 
+use Drupal\views\Views;
 use Drupal\views\Tests\ViewUnitTestBase;
 
 /**
@@ -65,7 +66,7 @@ public function testEntityRow() {
     $term = entity_create('taxonomy_term', array('name' => $this->randomName(), 'vid' => $vocab->id() ));
     $term->save();
 
-    $view = views_get_view('test_entity_row');
+    $view = Views::getView('test_entity_row');
     $this->content = $view->preview();
     $this->content = drupal_render($this->content);
 
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleGridTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleGridTest.php
index cd913da..e9132b1 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleGridTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleGridTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\views\Tests\Plugin;
 
+use Drupal\views\Views;
 use Drupal\views\ViewExecutable;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -52,7 +53,7 @@ protected function setUp() {
    * Tests the grid style.
    */
   public function testGrid() {
-    $view = views_get_view('test_grid');
+    $view = Views::getView('test_grid');
     foreach (array('horizontal', 'vertical') as $alignment) {
       $this->assertGrid($view, $alignment, 5);
       $this->assertGrid($view, $alignment, 4);
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleMappingTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleMappingTest.php
index 7020458..eb3fdea 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleMappingTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleMappingTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\views\Tests\Plugin;
 
+use Drupal\views\Views;
+
 /**
  * Tests the default/mapping row style.
  */
@@ -33,7 +35,7 @@ public static function getInfo() {
    * Verifies that the fields were mapped correctly.
    */
   public function testMappedOutput() {
-    $view = views_get_view('test_style_mapping');
+    $view = Views::getView('test_style_mapping');
     $output = $this->mappedOutputHelper($view);
     $this->assertTrue(strpos($output, 'job') === FALSE, 'The job field is added to the view but not in the mapping.');
     $view->destroy();
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTableUnitTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTableUnitTest.php
index f5548f7..c7d0345 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTableUnitTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTableUnitTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\views\Tests\Plugin;
 
+use Drupal\views\Views;
 use Drupal\views\ViewExecutable;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -36,7 +37,7 @@ public static function getInfo() {
    * Tests the table style.
    */
   public function testTable() {
-    $view = views_get_view('test_table');
+    $view = Views::getView('test_table');
 
     $view->setDisplay('default');
     $view->initStyle();
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTest.php
index 57427ca..b20afb6 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\views\Tests\Plugin;
 
+use Drupal\views\Views;
 use Drupal\views\Tests\ViewTestBase;
 use Drupal\views_test_data\Plugin\views\row\RowTest;
 use Drupal\views\Plugin\views\row\Fields;
@@ -53,7 +54,7 @@ protected function setUp() {
    */
   public function testStyle() {
     // This run use the test row plugin and render with it.
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
     $style = $view->display_handler->getOption('style');
     $style['type'] = 'test_style';
@@ -75,7 +76,7 @@ public function testStyle() {
     $this->assertTrue(strpos($output, $random_text) !== FALSE, 'Make sure that the rendering of the row plugin appears in the output of the view.');
 
     // Test without row plugin support.
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
     $style = $view->display_handler->getOption('style');
     $style['type'] = 'test_style';
@@ -104,7 +105,7 @@ function testGrouping() {
    * Tests the grouping features of styles.
    */
   function _testGrouping($stripped = FALSE) {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
     // Setup grouping by the job and the age field.
     $view->initStyle();
@@ -223,7 +224,7 @@ function _testGrouping($stripped = FALSE) {
    * Tests custom css classes.
    */
   function testCustomRowClasses() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Setup some random css class.
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleUnformattedTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleUnformattedTest.php
index cc1785c..b8a6735 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleUnformattedTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleUnformattedTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\views\Tests\Plugin;
 
+use Drupal\views\Views;
+
 /**
  * Tests the default/unformatted row style.
  */
@@ -31,7 +33,7 @@ public static function getInfo() {
    * Make sure that the default css classes works as expected.
    */
   function testDefaultRowClasses() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
     $output = $view->preview();
     $this->storeViewPreview(drupal_render($output));
diff --git a/core/modules/views/lib/Drupal/views/Tests/PluginInstanceTest.php b/core/modules/views/lib/Drupal/views/Tests/PluginInstanceTest.php
index de571a2..e70bd1d 100644
--- a/core/modules/views/lib/Drupal/views/Tests/PluginInstanceTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/PluginInstanceTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\views\Tests;
 
+use Drupal\views\Views;
+
 /**
  * Checks general plugin data and instances for all plugin types.
  */
@@ -57,7 +59,7 @@ public static function getInfo() {
   protected function setUp() {
     parent::setUp();
 
-    $this->definitions = views_get_plugin_definitions();
+    $this->definitions = Views::getPluginDefinitions();
   }
 
   /**
diff --git a/core/modules/views/lib/Drupal/views/Tests/QueryGroupByTest.php b/core/modules/views/lib/Drupal/views/Tests/QueryGroupByTest.php
index 4ce4bac..b35f020 100644
--- a/core/modules/views/lib/Drupal/views/Tests/QueryGroupByTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/QueryGroupByTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\views\Tests;
 
+use Drupal\views\Views;
+
 /**
  * Tests aggregate functionality of views, for example count.
  */
@@ -59,7 +61,7 @@ protected function setUp() {
   public function testAggregateCount() {
     $this->setupTestEntities();
 
-    $view = views_get_view('test_aggregate_count');
+    $view = Views::getView('test_aggregate_count');
     $this->executeView($view);
 
     $this->assertEqual(count($view->result), 2, 'Make sure the count of items is right.');
@@ -85,7 +87,7 @@ public function testAggregateCount() {
   public function groupByTestHelper($aggregation_function, $values) {
     $this->setupTestEntities();
 
-    $view = views_get_view('test_group_by_count');
+    $view = Views::getView('test_group_by_count');
     $view->setDisplay();
     $view->displayHandlers->get('default')->options['fields']['id']['group_type'] = $aggregation_function;
     $this->executeView($view);
@@ -168,7 +170,7 @@ public function testGroupByCountOnlyFilters() {
       $this->storageController->create(array('name' => 'name1'))->save();
     }
 
-    $view = views_get_view('test_group_by_in_filters');
+    $view = Views::getView('test_group_by_in_filters');
     $this->executeView($view);
 
     $this->assertTrue(strpos($view->build_info['query'], 'GROUP BY'), 'Make sure that GROUP BY is in the query');
diff --git a/core/modules/views/lib/Drupal/views/Tests/TokenReplaceTest.php b/core/modules/views/lib/Drupal/views/Tests/TokenReplaceTest.php
index 6bea043..4b58fe0 100644
--- a/core/modules/views/lib/Drupal/views/Tests/TokenReplaceTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/TokenReplaceTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\views\Tests;
 
+use Drupal\views\Views;
+
 /**
  * Tests core view token replacement.
  */
@@ -39,7 +41,7 @@ function setUp() {
    */
   function testTokenReplacement() {
     $token_handler = \Drupal::token();
-    $view = views_get_view('test_tokens');
+    $view = Views::getView('test_tokens');
     $view->setDisplay('page_1');
     $this->executeView($view);
 
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewElementTest.php b/core/modules/views/lib/Drupal/views/Tests/ViewElementTest.php
index 5a13f9e..c7ca56d 100644
--- a/core/modules/views/lib/Drupal/views/Tests/ViewElementTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/ViewElementTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\views\Tests;
 
+use Drupal\views\Views;
+
 /**
  * Tests the 'view' element type.
  */
@@ -55,7 +57,7 @@ protected function setUp() {
    * Tests the rendered output and form output of a view element.
    */
   public function testViewElement() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Set the content as our rendered array.
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php b/core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php
index fadc421..0d7f19e 100644
--- a/core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php
@@ -108,7 +108,7 @@ public function testFactoryService() {
    * Tests the initDisplay() and initHandlers() methods.
    */
   public function testInitMethods() {
-    $view = views_get_view('test_destroy');
+    $view = Views::getView('test_destroy');
     $view->initDisplay();
 
     $this->assertTrue($view->display_handler instanceof DefaultDisplay, 'Make sure a reference to the current display handler is set.');
@@ -176,14 +176,14 @@ public function testInitMethods() {
    * Tests the generation of the executable object.
    */
   public function testConstructing() {
-    views_get_view('test_destroy');
+    Views::getView('test_destroy');
   }
 
   /**
    * Tests the accessing of values on the object.
    */
   public function testProperties() {
-    $view = views_get_view('test_destroy');
+    $view = Views::getView('test_destroy');
     foreach ($this->executableProperties as $property) {
       $this->assertTrue(isset($view->{$property}));
     }
@@ -193,7 +193,7 @@ public function testProperties() {
    * Tests the display related methods and properties.
    */
   public function testDisplays() {
-    $view = views_get_view('test_executable_displays');
+    $view = Views::getView('test_executable_displays');
 
     // Tests Drupal\views\ViewExecutable::initDisplay().
     $view->initDisplay();
@@ -271,7 +271,7 @@ public function testDisplays() {
    * Tests the setting/getting of properties.
    */
   public function testPropertyMethods() {
-    $view = views_get_view('test_executable_displays');
+    $view = Views::getView('test_executable_displays');
 
     // Test the setAjaxEnabled() method.
     $this->assertFalse($view->ajaxEnabled());
@@ -345,7 +345,7 @@ public function testPropertyMethods() {
    * Tests the deconstructor to be sure that necessary objects are removed.
    */
   public function testDestroy() {
-    $view = views_get_view('test_destroy');
+    $view = Views::getView('test_destroy');
 
     $view->preview();
     $view->destroy();
@@ -410,7 +410,7 @@ public function testViewsHandlerTypes() {
    * Tests the validation of display handlers.
    */
   public function testValidate() {
-    $view = views_get_view('test_executable_displays');
+    $view = Views::getView('test_executable_displays');
     $view->setDisplay('page_1');
 
     $validate = $view->validate();
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewRenderTest.php b/core/modules/views/lib/Drupal/views/Tests/ViewRenderTest.php
index 02ab62d..aee849b 100644
--- a/core/modules/views/lib/Drupal/views/Tests/ViewRenderTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/ViewRenderTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests;
 
 use Drupal\views\Tests\ViewTestBase;
+use Drupal\views\Views;
 
 class ViewRenderTest extends ViewTestBase {
 
@@ -40,7 +41,7 @@ public function testRender() {
     \Drupal::state()->set('views_render.test', 0);
 
     // Make sure that the rendering just calls the preprocess function once.
-    $view = views_get_view('test_view_render');
+    $view = Views::getView('test_view_render');
     $output = $view->preview();
     drupal_render($output);
 
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php b/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php
index ba67b0a..d0cea34 100644
--- a/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php
@@ -13,6 +13,7 @@
 use Drupal\views\Plugin\views\display\Page;
 use Drupal\views\Plugin\views\display\DefaultDisplay;
 use Drupal\views\Plugin\views\display\Feed;
+use Drupal\views\Views;
 
 /**
  * Tests the functionality of View and ViewStorageController.
@@ -123,7 +124,7 @@ protected function loadTests() {
     }
 
     // Make sure that loaded default views get a UUID.
-    $view = views_get_view('test_view_storage');
+    $view = Views::getView('test_view_storage');
     $this->assertTrue($view->storage->uuid());
   }
 
@@ -312,7 +313,7 @@ protected function displayMethodTests() {
    * Tests the createDuplicate() View method.
    */
   public function testCreateDuplicate() {
-    $view = views_get_view('test_view_storage');
+    $view = Views::getView('test_view_storage');
     $copy = $view->storage->createDuplicate();
 
     $this->assertTrue($copy instanceof View, 'The copied object is a View.');
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewsHooksTest.php b/core/modules/views/lib/Drupal/views/Tests/ViewsHooksTest.php
index ad98fa6..2a90d11 100644
--- a/core/modules/views/lib/Drupal/views/Tests/ViewsHooksTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/ViewsHooksTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\views\Tests;
 
+use Drupal\views\Views;
+
 /**
  * Tests that views hooks are registered when defined in $module.views.inc.
  *
@@ -69,7 +71,7 @@ protected function setUp() {
    * Tests the hooks.
    */
   public function testHooks() {
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
 
     // Test each hook is found in the implementations array and is invoked.
     foreach (static::$hooks as $hook => $type) {
diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/BasicTest.php b/core/modules/views/lib/Drupal/views/Tests/Wizard/BasicTest.php
index 987e9a8..be30330 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Wizard/BasicTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Wizard/BasicTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests\Wizard;
 
 use Drupal\Component\Utility\String;
+use Drupal\views\Views;
 
 /**
  * Tests creating views with the wizard and viewing them on the listing page.
@@ -170,7 +171,7 @@ public function testWizardDefaultValues() {
     // Make sure the plugin types that should not have empty options don't have.
     // Test against all values is unit tested.
     // @see \Drupal\views\Tests\Plugin\DisplayUnitTest
-    $view = views_get_view($random_id);
+    $view = Views::getView($random_id);
     $displays = $view->storage->get('display');
 
     foreach ($displays as $display) {
diff --git a/core/modules/views/tests/Drupal/views/Tests/Plugin/display/PathPluginBaseTest.php b/core/modules/views/tests/Drupal/views/Tests/Plugin/display/PathPluginBaseTest.php
index 96ab152..245bb9e 100644
--- a/core/modules/views/tests/Drupal/views/Tests/Plugin/display/PathPluginBaseTest.php
+++ b/core/modules/views/tests/Drupal/views/Tests/Plugin/display/PathPluginBaseTest.php
@@ -5,7 +5,7 @@
  * Contains \Drupal\views\Tests\Plugin\display\PathPluginBaseTest.
  */
 
-namespace Drupal\views\Tests\Plugin\display {
+namespace Drupal\views\Tests\Plugin\display;
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Tests\UnitTestCase;
@@ -281,13 +281,3 @@ protected function setupViewExecutableAccessPlugin() {
   }
 
 }
-
-}
-
-namespace {
-  if (!function_exists('views_get_enabled_display_extenders')) {
-    function views_get_enabled_display_extenders() {
-      return array();
-    }
-  }
-}
diff --git a/core/modules/views/views.module b/core/modules/views/views.module
index 944c0c9..7ab132d 100644
--- a/core/modules/views/views.module
+++ b/core/modules/views/views.module
@@ -62,7 +62,7 @@ function views_element_info() {
 function views_pre_render_view_element($element) {
   $element['#attributes']['class'][] = 'views-element-container';
 
-  $view = views_get_view($element['#name']);
+  $view = Views::getView($element['#name']);
   if ($view && $view->access($element['#display_id'])) {
     $element['view'] = $view->preview($element['#display_id'], $element['#arguments']);
   }
@@ -113,7 +113,7 @@ function views_theme($existing, $type, $theme, $path) {
     'template' => 'views-view-grouping',
   );
 
-  $plugins = views_get_plugin_definitions();
+  $plugins = Views::getPluginDefinitions();
   $module_handler = \Drupal::moduleHandler();
 
   // Register theme functions for all style plugins. It provides a basic auto
@@ -966,7 +966,7 @@ function views_embed_view($name, $display_id = 'default') {
   // Remove $name and $display_id from the arguments.
   unset($args[0], $args[1]);
 
-  $view = views_get_view($name);
+  $view = Views::getView($name);
   if (!$view || !$view->access($display_id)) {
     return;
   }
@@ -996,7 +996,7 @@ function views_get_view_result($name, $display_id = NULL) {
   // Remove $name and $display_id from the arguments.
   unset($args[0], $args[1]);
 
-  $view = views_get_view($name);
+  $view = Views::getView($name);
   if (is_object($view)) {
     if (is_array($args)) {
       $view->setArguments($args);
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php b/core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php
index c68759a..df9aff3 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php
@@ -11,6 +11,7 @@
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\views\ViewExecutable;
 use Drupal\views\ViewStorageInterface;
+use Drupal\views\Views;
 use Drupal\views_ui\ViewUI;
 use Drupal\views\ViewsData;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -113,7 +114,7 @@ public function reportFields() {
    *   The Views plugins report page.
    */
   public function reportPlugins() {
-    $rows = views_plugin_list();
+    $rows = Views::pluginList();
     foreach ($rows as &$row) {
       // Link each view name to the view itself.
       foreach ($row['views'] as $row_name => $view) {
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/AdvancedSettingsForm.php b/core/modules/views_ui/lib/Drupal/views_ui/Form/AdvancedSettingsForm.php
index daaee70..3ef9653 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Form/AdvancedSettingsForm.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Form/AdvancedSettingsForm.php
@@ -8,6 +8,7 @@
 namespace Drupal\views_ui\Form;
 
 use Drupal\Core\Form\ConfigFormBase;
+use Drupal\views\Views;
 
 /**
  * Form builder for the advanced admin settings page.
@@ -68,7 +69,7 @@ public function buildForm(array $form, array &$form_state) {
       '#default_value' => $config->get('no_javascript'),
     );
 
-    $options = views_fetch_plugin_names('display_extender');
+    $options = Views::fetchPluginNames('display_extender');
     if (!empty($options)) {
       $form['extenders'] = array(
         '#type' => 'details',
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/CustomBooleanTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/CustomBooleanTest.php
index 75aed9d..1b40d9f 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/CustomBooleanTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/CustomBooleanTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\views_ui\Tests;
 
+use Drupal\views\Views;
+
 /**
  * Tests the UI and functionality for the Custom boolean field handler options.
  *
@@ -53,7 +55,7 @@ public function dataSet() {
    */
   public function testCustomOption() {
     // Add the boolean field handler to the test view.
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->setDisplay();
 
     $view->displayHandlers->get('default')->overrideOption('fields', array(
@@ -101,7 +103,7 @@ public function testCustomOption() {
       // Save the view.
       $this->drupalPostForm('admin/structure/views/view/test_view', array(), 'Save');
 
-      $view = views_get_view('test_view');
+      $view = Views::getView('test_view');
       $output = $view->preview();
       $output = drupal_render($output);
 
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayAttachmentTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayAttachmentTest.php
index 61e534b..5d71210 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayAttachmentTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayAttachmentTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\views_ui\Tests;
 
+use Drupal\views\Views;
+
 /**
  * Tests the UI for the attachment display plugin.
  *
@@ -49,7 +51,7 @@ public function testAttachmentUI() {
     $this->assertEqual($result[0]->attributes()->title, t('Page'));
     $this->drupalPostForm(NULL, array(), t('Save'));
 
-    $view = views_get_view('test_attachment_ui');
+    $view = Views::getView('test_attachment_ui');
     $view->initDisplay();
     $this->assertEqual(array_keys(array_filter($view->displayHandlers->get('attachment_1')->getOption('displays'))), array('page_1'), 'The attached displays got saved as expected');
 
@@ -58,7 +60,7 @@ public function testAttachmentUI() {
     $this->assertEqual($result[0]->attributes()->title, t('Multiple displays'));
     $this->drupalPostForm(NULL, array(), t('Save'));
 
-    $view = views_get_view('test_attachment_ui');
+    $view = Views::getView('test_attachment_ui');
     $view->initDisplay();
     $this->assertEqual(array_keys($view->displayHandlers->get('attachment_1')->getOption('displays')), array('default', 'page_1'), 'The attached displays got saved as expected');
   }
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayExtenderUITest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayExtenderUITest.php
index 9515b4b..388eb38 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayExtenderUITest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayExtenderUITest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\views_ui\Tests;
 
+use Drupal\views\Views;
+
 /**
  * Tests the display extender UI.
  */
@@ -33,7 +35,7 @@ public static function getInfo() {
   public function testDisplayExtenderUI() {
     \Drupal::config('views.settings')->set('display_extenders', array('display_extender_test'))->save();
 
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view_edit_url = "admin/structure/views/view/{$view->storage->id()}/edit";
     $display_option_url = 'admin/structure/views/nojs/display/test_view/default/test_extender_test_option';
 
@@ -44,7 +46,7 @@ public function testDisplayExtenderUI() {
     $this->drupalPostForm($display_option_url, array('test_extender_test_option' => $random_text), t('Apply'));
     $this->assertLink($random_text);
     $this->drupalPostForm(NULL, array(), t('Save'));
-    $view = views_get_view($view->storage->id());
+    $view = Views::getView($view->storage->id());
     $view->initDisplay();
     $this->assertEqual($view->display_handler->getOption('test_extender_test_option'), $random_text, 'Make sure that the display extender option got saved.');
   }
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php
index b0aebc2..f355412 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php
@@ -62,7 +62,7 @@ public function testReorderDisplay() {
     $this->drupalPostForm(NULL, $edit, t('Apply'));
     $this->drupalPostForm(NULL, array(), t('Save'));
 
-    $view = views_get_view($view['id']);
+    $view = Views::getView($view['id']);
     $displays = $view->storage->get('display');
     $this->assertEqual($displays['default']['position'], 0, 'Make sure the master display comes first.');
     $this->assertEqual($displays['block_1']['position'], 1, 'Make sure the block display comes before the page display.');
@@ -115,7 +115,7 @@ public function testDisplayAreas() {
     \Drupal::config('views.settings')->set('ui.show.advanced_column', TRUE)->save();
 
     // Add a new data display to the view.
-    $view = views_get_view('test_display');
+    $view = Views::getView('test_display');
     $view->storage->addDisplay('display_no_area_test');
     $view->save();
 
@@ -205,7 +205,7 @@ public function testViewStatus() {
     $elements = $this->xpath('//div[contains(@class, :edit) and contains(@class, :status)]', array(':edit' => 'views-edit-view', ':status' => 'enabled'));
     $this->assertTrue($elements, 'The enabled class was found on the form wrapper');
 
-    $view = views_get_view($id);
+    $view = Views::getView($id);
     $view->storage->disable()->save();
 
     $this->drupalGet('admin/structure/views/view/' . $id);
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTestCRUD.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTestCRUD.php
index 95f3790..c027167 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTestCRUD.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTestCRUD.php
@@ -134,7 +134,7 @@ public function testCloneDisplay() {
     $this->assertNoText(t('Page settings'));
 
     $this->drupalPostForm(NULL, array(), t('Save'));
-    $view = views_get_view($view['id']);
+    $view = Views::getView($view['id']);
     $view->initDisplay();
 
     $page_2 = $view->displayHandlers->get('page_2');
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/QueryTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/QueryTest.php
index 64d9a72..0013b78 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/QueryTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/QueryTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\views_ui\Tests;
 
+use Drupal\views\Views;
 use Drupal\views\Tests\ViewTestBase;
 use Drupal\views_test_data\Plugin\views\query\QueryTest as QueryTestPlugin;
 
@@ -51,7 +52,7 @@ public function testQueryUI() {
     $this->drupalPostForm(NULL, array(), t('Save'));
 
     // Check that the settings are saved into the view itself.
-    $view = views_get_view('test_view');
+    $view = Views::getView('test_view');
     $view->initDisplay();
     $view->initQuery();
     $this->assertEqual($random_value, $view->query->options['test_setting'], 'Query settings got saved');
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/RearrangeFieldsTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/RearrangeFieldsTest.php
index 58d20a9..b7bd570 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/RearrangeFieldsTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/RearrangeFieldsTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\views_ui\Tests;
 
+use Drupal\views\Views;
+
 /**
  * Tests the reordering of fields via AJAX.
  *
@@ -33,7 +35,7 @@ public static function getInfo() {
    * Gets the fields from the View.
    */
   protected function getViewFields($view_name = 'test_view', $display_id = 'default') {
-    $view = views_get_view($view_name);
+    $view = Views::getView($view_name);
     $view->setDisplay($display_id);
     $fields = array();
     foreach ($view->displayHandlers->get('default')->getHandlers('field') as $field => $handler) {
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/RowUITest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/RowUITest.php
index 9ff327a..cc8c5c3 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/RowUITest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/RowUITest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\views_ui\Tests;
 
+use Drupal\views\Views;
+
 /**
  * Tests the UI of row plugins.
  *
@@ -58,7 +60,7 @@ public function testRowUI() {
     $this->drupalPostForm($view_edit_url, array(), t('Save'));
     $this->assertLink(t('Test row plugin'), 0, 'Make sure the test row plugin is shown in the UI');
 
-    $view = views_get_view($view_name);
+    $view = Views::getView($view_name);
     $view->initDisplay();
     $row = $view->display_handler->getOption('row');
     $this->assertEqual($row['type'], 'test_row', 'Make sure that the test_row got saved as used row plugin.');
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/StorageTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/StorageTest.php
index 8466e40..4a99d2a 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/StorageTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/StorageTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views_ui\Tests;
 
 use Drupal\Core\Language\Language;
+use Drupal\views\Views;
 
 /**
  * Tests the UI of storage properties of views.
@@ -57,7 +58,7 @@ public function testDetails() {
     $this->drupalPostForm("admin/structure/views/nojs/edit-details/$view_name/default", $edit, t('Apply'));
     $this->drupalPostForm(NULL, array(), t('Save'));
 
-    $view = views_get_view($view_name);
+    $view = Views::getView($view_name);
 
     foreach (array('label', 'tag', 'description', 'langcode') as $property) {
       $this->assertEqual($view->storage->get($property), $edit[$property], format_string('Make sure the property @property got probably saved.', array('@property' => $property)));
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/StyleUITest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/StyleUITest.php
index 9af6469..c58d1a5 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/StyleUITest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/StyleUITest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\views_ui\Tests;
 
+use Drupal\views\Views;
+
 /**
  * Tests the UI of style plugins.
  *
@@ -58,7 +60,7 @@ public function testStyleUI() {
     $this->drupalPostForm($view_edit_url, array(), t('Save'));
     $this->assertLink(t('Test style plugin'), 0, 'Make sure the test style plugin is shown in the UI');
 
-    $view = views_get_view($view_name);
+    $view = Views::getView($view_name);
     $view->initDisplay();
     $style = $view->display_handler->getOption('style');
     $this->assertEqual($style['type'], 'test_style', 'Make sure that the test_style got saved as used style plugin.');
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewAddFormController.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewAddFormController.php
index 7477184..1f0b23b 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/ViewAddFormController.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewAddFormController.php
@@ -76,7 +76,7 @@ public function form(array $form, array &$form_state) {
       '#type' => 'machine_name',
       '#maxlength' => 128,
       '#machine_name' => array(
-        'exists' => 'views_get_view',
+        'exists' => '\Drupal\views\Views::getView',
         'source' => array('name', 'label'),
       ),
       '#description' => $this->t('A unique machine-readable name for this View. It must only contain lowercase letters, numbers, and underscores.'),
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewCloneFormController.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewCloneFormController.php
index 6d9e85b..f03eda4 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/ViewCloneFormController.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewCloneFormController.php
@@ -39,7 +39,7 @@ public function form(array $form, array &$form_state) {
       '#type' => 'machine_name',
       '#maxlength' => 128,
       '#machine_name' => array(
-        'exists' => 'views_get_view',
+        'exists' => '\Drupal\views\Views::getView',
         'source' => array('label'),
       ),
       '#default_value' => '',
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
index 0373116..3616281 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
@@ -13,6 +13,7 @@
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Component\Utility\String;
 use Drupal\user\TempStoreFactory;
+use Drupal\views\Views;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -293,7 +294,7 @@ public function submit(array $form, array &$form_state) {
 
     if (!empty($destination)) {
       // Find out the first display which has a changed path and redirect to this url.
-      $old_view = views_get_view($view->id());
+      $old_view = Views::getView($view->id());
       $old_view->initDisplay();
       foreach ($old_view->displayHandlers as $id => $display) {
         // Only check for displays with a path.
@@ -436,7 +437,7 @@ public function getDisplayDetails($view, $display) {
           "#suffix" => '</li>',
         );
 
-        foreach (views_fetch_plugin_names('display', NULL, array($view->get('storage')->get('base_table'))) as $type => $label) {
+        foreach (Views::fetchPluginNames('display', NULL, array($view->get('storage')->get('base_table'))) as $type => $label) {
           if ($type == $display['display_plugin']) {
             continue;
           }
@@ -733,7 +734,7 @@ public function renderDisplayTop(ViewUI $view) {
     }
 
     // Buttons for adding a new display.
-    foreach (views_fetch_plugin_names('display', NULL, array($view->get('base_table'))) as $type => $label) {
+    foreach (Views::fetchPluginNames('display', NULL, array($view->get('base_table'))) as $type => $label) {
       $element['add_display'][$type] = array(
         '#type' => 'submit',
         '#value' => $this->t('Add !display', array('!display' => $label)),
diff --git a/core/modules/views_ui/views_ui.module b/core/modules/views_ui/views_ui.module
index 1d4a598..7f140d3 100644
--- a/core/modules/views_ui/views_ui.module
+++ b/core/modules/views_ui/views_ui.module
@@ -5,6 +5,7 @@
  * Provide structure for the administrative interface to Views.
  */
 
+use Drupal\views\Views;
 use Drupal\views\ViewExecutable;
 use Drupal\views\ViewStorageInterface;
 use Drupal\views_ui\ViewUI;
@@ -372,5 +373,5 @@ function views_ui_truncate($string, $length) {
  * Magic load function. Wrapper to load a view.
  */
 function views_ui_load($name) {
-  return views_get_view($name);
+  return Views::getView($name);
 }