diff --git a/core/modules/action/tests/action_bulk_test/config/views.view.test_bulk_form.yml b/core/modules/action/tests/action_bulk_test/config/views.view.test_bulk_form.yml
index ea8f7012663..c89b2702951 100644
--- a/core/modules/action/tests/action_bulk_test/config/views.view.test_bulk_form.yml
+++ b/core/modules/action/tests/action_bulk_test/config/views.view.test_bulk_form.yml
@@ -1,5 +1,5 @@
 base_table: node
-name: test_bulk_form
+id: test_bulk_form
 description: ''
 tag: ''
 human_name: form
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 02a6d23f923..f84cf64f89a 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/Views/WizardTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/Views/WizardTest.php
@@ -38,7 +38,7 @@ class WizardTest extends WizardTestBase {
   public function testCommentWizard() {
     $view = array();
     $view['human_name'] = $this->randomName(16);
-    $view['name'] = strtolower($this->randomName(16));
+    $view['id'] = strtolower($this->randomName(16));
     $view['show[wizard_key]'] = 'comment';
     $view['page[create]'] = TRUE;
     $view['page[path]'] = $this->randomName(16);
@@ -46,7 +46,7 @@ class WizardTest extends WizardTestBase {
     // Just triggering the saving should automatically choose a proper row
     // plugin.
     $this->drupalPost('admin/structure/views/add', $view, t('Save and edit'));
-    $this->assertUrl('admin/structure/views/view/' . $view['name'], array(), 'Make sure the view saving was successful and the browser got redirected to the edit page.');
+    $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.');
 
     // If we update the type first we should get a selection of comment valid
     // row plugins as the select field.
@@ -67,11 +67,11 @@ class WizardTest extends WizardTestBase {
     $expected_options = array('comment', 'fields');
     $this->assertEqual($options, $expected_options);
 
-    $view['name'] = strtolower($this->randomName(16));
+    $view['id'] = strtolower($this->randomName(16));
     $this->drupalPost(NULL, $view, t('Save and edit'));
-    $this->assertUrl('admin/structure/views/view/' . $view['name'], array(), 'Make sure the view saving was successful and the browser got redirected to the edit page.');
+    $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['name']);
+    $view = views_get_view($view['id']);
     $view->initHandlers();
     $row = $view->display_handler->getOption('row');
     $this->assertEqual($row['type'], 'comment');
diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml
index 3dc8c4da776..81e31154786 100644
--- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml
+++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml
@@ -60,6 +60,6 @@ display:
       path: test-comment-rss
 human_name: test_comment_rss
 module: views
-name: test_comment_rss
+id: test_comment_rss
 tag: ''
 uuid: 9b1b1e58-d41b-468a-9d04-4e6bde742c29
diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_user_uid.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_user_uid.yml
index 4dca1cd32d7..8dc20d72bb7 100644
--- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_user_uid.yml
+++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_user_uid.yml
@@ -44,5 +44,5 @@ display:
     id: default
     position: '0'
 human_name: test_comment_user_uid
-name: test_comment_user_uid
+id: test_comment_user_uid
 tag: default
diff --git a/core/modules/field/tests/modules/field_test_views/test_views/views.view.test_view_fieldapi.yml b/core/modules/field/tests/modules/field_test_views/test_views/views.view.test_view_fieldapi.yml
index 2c961d76d95..d3446aa821a 100644
--- a/core/modules/field/tests/modules/field_test_views/test_views/views.view.test_view_fieldapi.yml
+++ b/core/modules/field/tests/modules/field_test_views/test_views/views.view.test_view_fieldapi.yml
@@ -34,5 +34,5 @@ display:
     id: default
     position: '0'
 human_name: test_view_fieldapi
-name: test_view_fieldapi
+id: test_view_fieldapi
 tag: default
diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_type.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_type.yml
index c9172bc550a..459c3adc323 100644
--- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_type.yml
+++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_type.yml
@@ -16,5 +16,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_field_type
+id: test_field_type
 tag: ''
diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_filter_node_uid_revision.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_filter_node_uid_revision.yml
index 69000ec69d1..ac0ebd69c81 100644
--- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_filter_node_uid_revision.yml
+++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_filter_node_uid_revision.yml
@@ -46,5 +46,5 @@ display:
     id: default
     position: '0'
 human_name: test_filter_node_uid_revision
-name: test_filter_node_uid_revision
+id: test_filter_node_uid_revision
 tag: default
diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_nid.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_nid.yml
index cefeddab9fc..15d7a0450a2 100644
--- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_nid.yml
+++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_nid.yml
@@ -1,4 +1,4 @@
-name: test_node_revision_nid
+id: test_node_revision_nid
 base_table: node_revision
 core: 8
 api_version: 3
diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_vid.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_vid.yml
index b36f54967dc..d84faad7f66 100644
--- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_vid.yml
+++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_vid.yml
@@ -1,4 +1,4 @@
-name: test_node_revision_vid
+id: test_node_revision_vid
 base_table: node_revision
 core: 8
 api_version: 3
diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_status_extra.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_status_extra.yml
index c0c582bd3d5..5a193603ed7 100644
--- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_status_extra.yml
+++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_status_extra.yml
@@ -1,5 +1,5 @@
 base_table: node
-name: test_status_extra
+id: test_status_extra
 description: ''
 tag: ''
 human_name: test_status_extra
diff --git a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_entity.yml b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_entity.yml
index 4ac8e4b759d..4f3b28a8a57 100644
--- a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_entity.yml
+++ b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_entity.yml
@@ -1,5 +1,5 @@
 base_table: entity_test
-name: test_serializer_display_entity
+id: test_serializer_display_entity
 description: ''
 tag: ''
 human_name: 'Test serialize display entity rows'
diff --git a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_field.yml b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_field.yml
index 8349e74f824..269c4251f97 100644
--- a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_field.yml
+++ b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_field.yml
@@ -1,5 +1,5 @@
 base_table: views_test_data
-name: test_serializer_display_field
+id: test_serializer_display_field
 description: ''
 tag: ''
 human_name: 'Test serializer display field rows'
diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_groupwise_term.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_groupwise_term.yml
index 5240f0c50a0..890747a1694 100644
--- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_groupwise_term.yml
+++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_groupwise_term.yml
@@ -62,5 +62,5 @@ display:
 human_name: test_groupwise
 langcode: und
 module: views
-name: test_groupwise_term
+id: test_groupwise_term
 tag: default
diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_node_term_data.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_node_term_data.yml
index 383766a9e99..72c1e356d6b 100644
--- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_node_term_data.yml
+++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_node_term_data.yml
@@ -69,5 +69,5 @@ display:
     id: default
     position: '0'
 human_name: test_taxonomy_node_term_data
-name: test_taxonomy_node_term_data
+id: test_taxonomy_node_term_data
 tag: ''
diff --git a/core/modules/user/tests/user_test_views/test_views/views.view.test_access_perm.yml b/core/modules/user/tests/user_test_views/test_views/views.view.test_access_perm.yml
index f509323b434..11277f0831d 100644
--- a/core/modules/user/tests/user_test_views/test_views/views.view.test_access_perm.yml
+++ b/core/modules/user/tests/user_test_views/test_views/views.view.test_access_perm.yml
@@ -25,5 +25,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_access_perm
+id: test_access_perm
 tag: ''
diff --git a/core/modules/user/tests/user_test_views/test_views/views.view.test_access_role.yml b/core/modules/user/tests/user_test_views/test_views/views.view.test_access_role.yml
index 3d2b4d98fd4..a19dd1e269a 100644
--- a/core/modules/user/tests/user_test_views/test_views/views.view.test_access_role.yml
+++ b/core/modules/user/tests/user_test_views/test_views/views.view.test_access_role.yml
@@ -23,5 +23,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_access_role
+id: test_access_role
 tag: ''
diff --git a/core/modules/user/tests/user_test_views/test_views/views.view.test_groupwise_user.yml b/core/modules/user/tests/user_test_views/test_views/views.view.test_groupwise_user.yml
index 7d79d1123d5..afed03743f8 100644
--- a/core/modules/user/tests/user_test_views/test_views/views.view.test_groupwise_user.yml
+++ b/core/modules/user/tests/user_test_views/test_views/views.view.test_groupwise_user.yml
@@ -72,5 +72,5 @@ display:
 human_name: test_groupwise_user
 langcode: und
 module: views
-name: test_groupwise_user
+id: test_groupwise_user
 tag: default
diff --git a/core/modules/user/tests/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml b/core/modules/user/tests/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml
index 54180b6612d..a2a2154bd7f 100644
--- a/core/modules/user/tests/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml
+++ b/core/modules/user/tests/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml
@@ -52,5 +52,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_plugin_argument_default_current_user
+id: test_plugin_argument_default_current_user
 tag: ''
diff --git a/core/modules/user/tests/user_test_views/test_views/views.view.test_user_name.yml b/core/modules/user/tests/user_test_views/test_views/views.view.test_user_name.yml
index ab243bc6fe8..933c170013a 100644
--- a/core/modules/user/tests/user_test_views/test_views/views.view.test_user_name.yml
+++ b/core/modules/user/tests/user_test_views/test_views/views.view.test_user_name.yml
@@ -49,5 +49,5 @@ display:
     id: page_1
     position: '0'
 human_name: ''
-name: test_user_name
+id: test_user_name
 tag: ''
diff --git a/core/modules/user/tests/user_test_views/test_views/views.view.test_user_relationship.yml b/core/modules/user/tests/user_test_views/test_views/views.view.test_user_relationship.yml
index 096fa162421..fef675616bf 100644
--- a/core/modules/user/tests/user_test_views/test_views/views.view.test_user_relationship.yml
+++ b/core/modules/user/tests/user_test_views/test_views/views.view.test_user_relationship.yml
@@ -98,5 +98,5 @@ display:
     id: default
     position: '0'
 human_name: test_user_relationship
-name: test_user_relationship
+id: test_user_relationship
 tag: default
diff --git a/core/modules/user/tests/user_test_views/test_views/views.view.test_user_uid_argument.yml b/core/modules/user/tests/user_test_views/test_views/views.view.test_user_uid_argument.yml
index 7dfce3efb26..21f7bf54756 100644
--- a/core/modules/user/tests/user_test_views/test_views/views.view.test_user_uid_argument.yml
+++ b/core/modules/user/tests/user_test_views/test_views/views.view.test_user_uid_argument.yml
@@ -23,4 +23,4 @@ display:
     id: default
     position: '0'
 human_name:
-name: test_user_uid_argument
+id: test_user_uid_argument
diff --git a/core/modules/user/tests/user_test_views/test_views/views.view.test_view_argument_validate_user.yml b/core/modules/user/tests/user_test_views/test_views/views.view.test_view_argument_validate_user.yml
index 2750f437e44..eca2cce6765 100644
--- a/core/modules/user/tests/user_test_views/test_views/views.view.test_view_argument_validate_user.yml
+++ b/core/modules/user/tests/user_test_views/test_views/views.view.test_view_argument_validate_user.yml
@@ -33,5 +33,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_view_argument_validate_user
+id: test_view_argument_validate_user
 tag: ''
diff --git a/core/modules/user/tests/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml b/core/modules/user/tests/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml
index 48522e05f15..3af8ca1a3e3 100644
--- a/core/modules/user/tests/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml
+++ b/core/modules/user/tests/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml
@@ -46,5 +46,5 @@ display:
     id: default
     position: '0'
 human_name: test_views_handler_field_user_name
-name: test_views_handler_field_user_name
+id: test_views_handler_field_user_name
 tag: default
diff --git a/core/modules/views/config/views.view.archive.yml b/core/modules/views/config/views.view.archive.yml
index f018c57c6b0..f5bbc5687d2 100644
--- a/core/modules/views/config/views.view.archive.yml
+++ b/core/modules/views/config/views.view.archive.yml
@@ -1,7 +1,7 @@
 disabled: true
 api_version: '3.0'
 module: node
-name: archive
+id: archive
 description: 'A list of months that link to content for that month.'
 tag: default
 base_table: node
diff --git a/core/modules/views/config/views.view.backlinks.yml b/core/modules/views/config/views.view.backlinks.yml
index 3d9011bfcc0..7c1d1434419 100644
--- a/core/modules/views/config/views.view.backlinks.yml
+++ b/core/modules/views/config/views.view.backlinks.yml
@@ -1,7 +1,7 @@
 disabled: true
 api_version: '3.0'
 module: search
-name: backlinks
+id: backlinks
 description: 'A list of other content items which have a link to the content item.'
 tag: default
 base_table: node
diff --git a/core/modules/views/config/views.view.comments_recent.yml b/core/modules/views/config/views.view.comments_recent.yml
index 336f0dafaea..d1fdc04584d 100644
--- a/core/modules/views/config/views.view.comments_recent.yml
+++ b/core/modules/views/config/views.view.comments_recent.yml
@@ -1,7 +1,7 @@
 disabled: true
 api_version: '3.0'
 module: comment
-name: comments_recent
+id: comments_recent
 description: 'A block and a page with recent comments.'
 tag: default
 base_table: comment
diff --git a/core/modules/views/config/views.view.frontpage.yml b/core/modules/views/config/views.view.frontpage.yml
index a635a0ec671..bdc98fed681 100644
--- a/core/modules/views/config/views.view.frontpage.yml
+++ b/core/modules/views/config/views.view.frontpage.yml
@@ -1,7 +1,7 @@
 disabled: true
 api_version: '3.0'
 module: node
-name: frontpage
+id: frontpage
 description: 'Emulates the default Drupal front page; you may set the default home page path to this view to make it your front page.'
 tag: default
 base_table: node
diff --git a/core/modules/views/config/views.view.glossary.yml b/core/modules/views/config/views.view.glossary.yml
index 18f059c5090..20c3fef9a97 100644
--- a/core/modules/views/config/views.view.glossary.yml
+++ b/core/modules/views/config/views.view.glossary.yml
@@ -1,7 +1,7 @@
 disabled: true
 api_version: '3.0'
 module: node
-name: glossary
+id: glossary
 description: 'A list of all content, by letter.'
 tag: default
 base_table: node
diff --git a/core/modules/views/config/views.view.taxonomy_term.yml b/core/modules/views/config/views.view.taxonomy_term.yml
index 40d85ed5f2b..0a2411a50d5 100644
--- a/core/modules/views/config/views.view.taxonomy_term.yml
+++ b/core/modules/views/config/views.view.taxonomy_term.yml
@@ -1,7 +1,7 @@
 disabled: true
 api_version: '3.0'
 module: taxonomy
-name: taxonomy_term
+id: taxonomy_term
 description: 'Customize the default taxonomy/term display.'
 tag: default
 base_table: node
diff --git a/core/modules/views/config/views.view.tracker.yml b/core/modules/views/config/views.view.tracker.yml
index e9c903d70d3..58e1e218bb0 100644
--- a/core/modules/views/config/views.view.tracker.yml
+++ b/core/modules/views/config/views.view.tracker.yml
@@ -1,7 +1,7 @@
 disabled: true
 api_version: '3.0'
 module: node
-name: tracker
+id: tracker
 description: 'Shows all new activity on the system.'
 tag: default
 base_table: node
diff --git a/core/modules/views/includes/ajax.inc b/core/modules/views/includes/ajax.inc
index 61f913cd880..5cf0caf5cad 100644
--- a/core/modules/views/includes/ajax.inc
+++ b/core/modules/views/includes/ajax.inc
@@ -208,7 +208,7 @@ function views_ajax_command_replace_title($title) {
   $command = array(
     'command' => 'viewsReplaceTitle',
     'title' => $title,
-    'siteName' => config('system.site')->get('name'),
+    'siteName' => config('system.site')->id(),
   );
   return $command;
 }
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Core/Entity/View.php b/core/modules/views/lib/Drupal/views/Plugin/Core/Entity/View.php
index 4434cab70ff..e7af1e3f71b 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/Core/Entity/View.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/Core/Entity/View.php
@@ -32,7 +32,7 @@ use Drupal\Core\Annotation\Translation;
  *   config_prefix = "views.view",
  *   fieldable = FALSE,
  *   entity_keys = {
- *     "id" = "name",
+ *     "id" = "id",
  *     "label" = "human_name",
  *     "uuid" = "uuid"
  *   }
@@ -48,11 +48,11 @@ class View extends ConfigEntityBase implements ViewStorageInterface {
   protected $base_table = 'node';
 
   /**
-   * The name of the view.
+   * The unique ID of the view.
    *
    * @var string
    */
-  public $name = NULL;
+  public $id = NULL;
 
   /**
    * The description of the view, which is used only in the interface.
@@ -161,13 +161,6 @@ class View extends ConfigEntityBase implements ViewStorageInterface {
     );
   }
 
-  /**
-   * Overrides Drupal\Core\Entity\EntityInterface::id().
-   */
-  public function id() {
-    return $this->get('name');
-  }
-
   /**
    * Overrides Drupal\Core\Config\Entity\ConfigEntityBase::createDuplicate().
    */
@@ -207,7 +200,7 @@ class View extends ConfigEntityBase implements ViewStorageInterface {
    */
   public function getHumanName() {
     if (!$human_name = $this->get('human_name')) {
-      $human_name = $this->get('name');
+      $human_name = $this->id();
     }
     return $human_name;
   }
@@ -405,7 +398,7 @@ class View extends ConfigEntityBase implements ViewStorageInterface {
       'display',
       'human_name',
       'module',
-      'name',
+      'id',
       'tag',
       'uuid',
     );
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsBlock.php b/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsBlock.php
index 1bb7cfeaf4b..ade4e8cdfe8 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsBlock.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsBlock.php
@@ -49,7 +49,7 @@ class ViewsBlock implements DerivativeInterface {
       foreach ($executable->displayHandlers as $display) {
         // Add a block plugin definition for each block display.
         if (isset($display) && !empty($display->definition['uses_hook_block'])) {
-          $delta = $view->get('name') . '-' . $display->display['id'];
+          $delta = $view->id() . '-' . $display->display['id'];
           $desc = $display->getOption('block_description');
 
           if (empty($desc)) {
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsExposedFilterBlock.php b/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsExposedFilterBlock.php
index c537184b67c..e1ceb24a0e1 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsExposedFilterBlock.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsExposedFilterBlock.php
@@ -50,8 +50,8 @@ class ViewsExposedFilterBlock implements DerivativeInterface {
         if (isset($display) && $display->getOption('exposed_block')) {
           // Add a block definition for the block.
           if ($display->usesExposedFormInBlock()) {
-            $delta = $view->get('name') . '-' . $display->display['id'];
-            $desc = t('Exposed form: @view-@display_id', array('@view' => $view->get('name'), '@display_id' => $display->display['id']));
+            $delta = $view->id() . '-' . $display->display['id'];
+            $desc = t('Exposed form: @view-@display_id', array('@view' => $view->id(), '@display_id' => $display->display['id']));
             $this->derivatives[$delta] = array(
               'subject' => $desc,
               'cache' => DRUPAL_NO_CACHE,
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php
index 7c789e62b06..ad0798b7170 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php
@@ -821,7 +821,7 @@ abstract class HandlerBase extends PluginBase {
       return $views_data['table']['entity type'];
     }
     else {
-      throw new \Exception(format_string('No entity type for field @field on view @view', array('@field' => $this->options['id'], '@view' => $this->view->storage->get('name'))));
+      throw new \Exception(format_string('No entity type for field @field on view @view', array('@field' => $this->options['id'], '@view' => $this->view->storage->id())));
     }
   }
 
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 1da8146484f..a766c5def88 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
@@ -35,7 +35,7 @@ class View extends AreaPluginBase {
   public function buildOptionsForm(&$form, &$form_state) {
     parent::buildOptionsForm($form, $form_state);
 
-    $view_display = $this->view->storage->get('name') . ':' . $this->view->current_display;
+    $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);
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php
index 6cce4b0ee7b..7df986eedb8 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php
@@ -180,7 +180,7 @@ abstract class CachePluginBase extends PluginBase {
    * to be sure that we catch everything. Maybe that's a bad idea.
    */
   function cache_flush() {
-    cache($this->table)->deleteTags(array($this->view->storage->get('name') => TRUE));
+    cache($this->table)->deleteTags(array($this->view->storage->id() => TRUE));
   }
 
   /**
@@ -295,7 +295,7 @@ abstract class CachePluginBase extends PluginBase {
         }
       }
 
-      $this->resultsKey = $this->view->storage->get('name') . ':' . $this->displayHandler->display['id'] . ':results:' . hash('sha256', serialize($key_data));
+      $this->resultsKey = $this->view->storage->id() . ':' . $this->displayHandler->display['id'] . ':results:' . hash('sha256', serialize($key_data));
     }
 
     return $this->resultsKey;
@@ -319,7 +319,7 @@ abstract class CachePluginBase extends PluginBase {
         'base_url' => $GLOBALS['base_url'],
       );
 
-      $this->outputKey = $this->view->storage->get('name') . ':' . $this->displayHandler->display['id'] . ':output:' . hash('sha256', serialize($key_data));
+      $this->outputKey = $this->view->storage->id() . ':' . $this->displayHandler->display['id'] . ':output:' . hash('sha256', serialize($key_data));
     }
 
     return $this->outputKey;
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 7ad5d41fa05..b0c6511e970 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
@@ -977,7 +977,7 @@ abstract class DisplayPluginBase extends PluginBase {
       $title = $text;
     }
 
-    return l($text, 'admin/structure/views/nojs/display/' . $this->view->storage->get('name') . '/' . $this->display['id'] . '/' . $section, array('attributes' => array('class' => 'views-ajax-link ' . $class, 'title' => $title, 'id' => drupal_html_id('views-' . $this->display['id'] . '-' . $section)), 'html' => TRUE));
+    return l($text, 'admin/structure/views/nojs/display/' . $this->view->storage->id() . '/' . $this->display['id'] . '/' . $section, array('attributes' => array('class' => 'views-ajax-link ' . $class, 'title' => $title, 'id' => drupal_html_id('views-' . $this->display['id'] . '-' . $section)), 'html' => TRUE));
   }
 
   /**
@@ -2627,8 +2627,8 @@ abstract class DisplayPluginBase extends PluginBase {
     $blocks = array();
 
     if ($this->usesExposedFormInBlock()) {
-      $delta = '-exp-' . $this->view->storage->get('name') . '-' . $this->display['id'];
-      $desc = t('Exposed form: @view-@display_id', array('@view' => $this->view->storage->get('name'), '@display_id' => $this->display['id']));
+      $delta = '-exp-' . $this->view->storage->id() . '-' . $this->display['id'];
+      $desc = t('Exposed form: @view-@display_id', array('@view' => $this->view->storage->id(), '@display_id' => $this->display['id']));
 
       $blocks[$delta] = array(
         'info' => $desc,
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php
index 8136f389ab6..8a0a85e3b3f 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php
@@ -41,7 +41,7 @@ abstract class PathPluginBase extends DisplayPluginBase {
     // views_arg_load -- which lives in views.module.
 
     $bits = explode('/', $this->getOption('path'));
-    $page_arguments = array($this->view->storage->name, $this->display['id']);
+    $page_arguments = array($this->view->storage->id(), $this->display['id']);
     $this->view->initHandlers();
     $view_arguments = $this->view->argument;
 
@@ -103,7 +103,7 @@ abstract class PathPluginBase extends DisplayPluginBase {
         'access callback' => 'views_access',
         'access arguments' => $access_arguments,
         // Identify URL embedded arguments and correlate them to a handler.
-        'load arguments'  => array($this->view->storage->name, $this->display['id'], '%index'),
+        'load arguments'  => array($this->view->storage->id(), $this->display['id'], '%index'),
       );
       $menu = $this->getOption('menu');
       if (empty($menu)) {
@@ -165,7 +165,7 @@ abstract class PathPluginBase extends DisplayPluginBase {
               'access arguments' => $access_arguments,
               // Identify URL embedded arguments and correlate them to a
               // handler.
-              'load arguments'  => array($this->view->storage->name, $this->display['id'], '%index'),
+              'load arguments'  => array($this->view->storage->id(), $this->display['id'], '%index'),
               'title' => $tab_options['title'],
               'description' => $tab_options['description'],
               'menu_name' => $tab_options['name'],
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php
index 1c35081074d..1c611471f34 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php
@@ -284,8 +284,8 @@ abstract class ExposedFormPluginBase extends PluginBase {
     // remember settings.
     $display_id = ($this->view->display_handler->isDefaulted('filters')) ? 'default' : $this->view->current_display;
 
-    if (isset($_SESSION['views'][$this->view->storage->get('name')][$display_id])) {
-      unset($_SESSION['views'][$this->view->storage->get('name')][$display_id]);
+    if (isset($_SESSION['views'][$this->view->storage->id()][$display_id])) {
+      unset($_SESSION['views'][$this->view->storage->id()][$display_id]);
     }
 
     // Set the form to allow redirect.
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
index 2c866d315f3..329254011f8 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
@@ -1611,19 +1611,19 @@ If you would like to have the characters \'[\' and \']\' please use the html ent
     $display = $this->view->display_handler->display;
 
     if (!empty($display)) {
-      $themes[] = $hook . '__' . $this->view->storage->get('name')  . '__' . $display['id'] . '__' . $this->options['id'];
-      $themes[] = $hook . '__' . $this->view->storage->get('name')  . '__' . $display['id'];
+      $themes[] = $hook . '__' . $this->view->storage->id()  . '__' . $display['id'] . '__' . $this->options['id'];
+      $themes[] = $hook . '__' . $this->view->storage->id()  . '__' . $display['id'];
       $themes[] = $hook . '__' . $display['id'] . '__' . $this->options['id'];
       $themes[] = $hook . '__' . $display['id'];
       if ($display['id'] != $display['display_plugin']) {
-        $themes[] = $hook . '__' . $this->view->storage->get('name')  . '__' . $display['display_plugin'] . '__' . $this->options['id'];
-        $themes[] = $hook . '__' . $this->view->storage->get('name')  . '__' . $display['display_plugin'];
+        $themes[] = $hook . '__' . $this->view->storage->id()  . '__' . $display['display_plugin'] . '__' . $this->options['id'];
+        $themes[] = $hook . '__' . $this->view->storage->id()  . '__' . $display['display_plugin'];
         $themes[] = $hook . '__' . $display['display_plugin'] . '__' . $this->options['id'];
         $themes[] = $hook . '__' . $display['display_plugin'];
       }
     }
-    $themes[] = $hook . '__' . $this->view->storage->get('name') . '__' . $this->options['id'];
-    $themes[] = $hook . '__' . $this->view->storage->get('name');
+    $themes[] = $hook . '__' . $this->view->storage->id() . '__' . $this->options['id'];
+    $themes[] = $hook . '__' . $this->view->storage->id();
     $themes[] = $hook . '__' . $this->options['id'];
     $themes[] = $hook;
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
index c7771c07032..fbd618415ac 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
@@ -1244,8 +1244,8 @@ abstract class FilterPluginBase extends HandlerBase {
 
     // false means that we got a setting that means to recuse ourselves,
     // so we should erase whatever happened to be there.
-    if ($status === FALSE && isset($_SESSION['views'][$this->view->storage->get('name')][$display_id])) {
-      $session = &$_SESSION['views'][$this->view->storage->get('name')][$display_id];
+    if ($status === FALSE && isset($_SESSION['views'][$this->view->storage->id()][$display_id])) {
+      $session = &$_SESSION['views'][$this->view->storage->id()][$display_id];
 
       if (isset($session[$this->options['group_info']['identifier']])) {
         unset($session[$this->options['group_info']['identifier']]);
@@ -1253,11 +1253,11 @@ abstract class FilterPluginBase extends HandlerBase {
     }
 
     if ($status !== FALSE) {
-      if (!isset($_SESSION['views'][$this->view->storage->get('name')][$display_id])) {
-        $_SESSION['views'][$this->view->storage->get('name')][$display_id] = array();
+      if (!isset($_SESSION['views'][$this->view->storage->id()][$display_id])) {
+        $_SESSION['views'][$this->view->storage->id()][$display_id] = array();
       }
 
-      $session = &$_SESSION['views'][$this->view->storage->get('name')][$display_id];
+      $session = &$_SESSION['views'][$this->view->storage->id()][$display_id];
 
       $session[$this->options['group_info']['identifier']] = $input[$this->options['group_info']['identifier']];
     }
@@ -1338,8 +1338,8 @@ abstract class FilterPluginBase extends HandlerBase {
 
     // false means that we got a setting that means to recuse ourselves,
     // so we should erase whatever happened to be there.
-    if (!$status && isset($_SESSION['views'][$this->view->storage->get('name')][$display_id])) {
-      $session = &$_SESSION['views'][$this->view->storage->get('name')][$display_id];
+    if (!$status && isset($_SESSION['views'][$this->view->storage->id()][$display_id])) {
+      $session = &$_SESSION['views'][$this->view->storage->id()][$display_id];
       if ($operator && isset($session[$this->options['expose']['operator_id']])) {
         unset($session[$this->options['expose']['operator_id']]);
       }
@@ -1350,11 +1350,11 @@ abstract class FilterPluginBase extends HandlerBase {
     }
 
     if ($status) {
-      if (!isset($_SESSION['views'][$this->view->storage->get('name')][$display_id])) {
-        $_SESSION['views'][$this->view->storage->get('name')][$display_id] = array();
+      if (!isset($_SESSION['views'][$this->view->storage->id()][$display_id])) {
+        $_SESSION['views'][$this->view->storage->id()][$display_id] = array();
       }
 
-      $session = &$_SESSION['views'][$this->view->storage->get('name')][$display_id];
+      $session = &$_SESSION['views'][$this->view->storage->id()][$display_id];
 
       if ($operator && isset($input[$this->options['expose']['operator_id']])) {
         $session[$this->options['expose']['operator_id']] = $input[$this->options['expose']['operator_id']];
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php b/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php
index 12b97956c9c..55785d278ab 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php
@@ -1283,7 +1283,7 @@ class Sql extends QueryPluginBase {
     $query = Database::getConnection($target, $key)
       ->select($this->view->storage->get('base_table'), $this->view->storage->get('base_table'), $options)
       ->addTag('views')
-      ->addTag('views_' . $this->view->storage->get('name'));
+      ->addTag('views_' . $this->view->storage->id());
 
     // Add the tags added to the view itself.
     foreach ($this->tags as $tag) {
@@ -1514,7 +1514,7 @@ class Sql extends QueryPluginBase {
           drupal_set_message($e->getMessage(), 'error');
         }
         else {
-          throw new DatabaseExceptionWrapper(format_string('Exception in @human_name[@view_name]: @message', array('@human_name' => $view->storage->getHumanName(), '@view_name' => $view->storage->get('name'), '@message' => $e->getMessage())));
+          throw new DatabaseExceptionWrapper(format_string('Exception in @human_name[@view_name]: @message', array('@human_name' => $view->storage->getHumanName(), '@view_name' => $view->storage->id(), '@message' => $e->getMessage())));
         }
       }
 
@@ -1646,7 +1646,7 @@ class Sql extends QueryPluginBase {
   }
 
   function add_signature(ViewExecutable $view) {
-    $view->query->add_field(NULL, "'" . $view->storage->get('name') . ':' . $view->current_display . "'", 'view_name');
+    $view->query->add_field(NULL, "'" . $view->storage->id() . ':' . $view->current_display . "'", 'view_name');
   }
 
   function get_aggregation_info() {
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 0b085c6eed3..cd2a73f86da 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
@@ -132,10 +132,10 @@ class GroupwiseMax extends RelationshipPluginBase {
         // TODO: check the field is the correct sort?
         // or let users hang themselves at this stage and check later?
         if ($view->type == 'Default') {
-          $views[t('Default Views')][$view->storage->get('name')] = $view->storage->get('name');
+          $views[t('Default Views')][$view->storage->id()] = $view->storage->id();
         }
         else {
-          $views[t('Existing Views')][$view->storage->get('name')] = $view->storage->get('name');
+          $views[t('Existing Views')][$view->storage->id()] = $view->storage->id();
         }
       }
     }
@@ -171,7 +171,7 @@ class GroupwiseMax extends RelationshipPluginBase {
    * When the form is submitted, take sure to clear the subquery string cache.
    */
   public function submitOptionsForm(&$form, &$form_state) {
-    $cid = 'views_relationship_groupwise_max:' . $this->view->storage->get('name') . ':' . $this->view->current_display . ':' . $this->options['id'];
+    $cid = 'views_relationship_groupwise_max:' . $this->view->storage->id() . ':' . $this->view->current_display . ':' . $this->options['id'];
     cache('views_results')->delete($cid);
   }
 
@@ -362,7 +362,7 @@ class GroupwiseMax extends RelationshipPluginBase {
     }
     else {
       // Get the stored subquery SQL string.
-      $cid = 'views_relationship_groupwise_max:' . $this->view->storage->get('name') . ':' . $this->view->current_display . ':' . $this->options['id'];
+      $cid = 'views_relationship_groupwise_max:' . $this->view->storage->id() . ':' . $this->view->current_display . ':' . $this->options['id'];
       $cache = cache('views_results')->get($cid);
       if (isset($cache->data)) {
         $def['left_query'] = $cache->data;
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 7df19f3b27a..91da4d7ca7f 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
@@ -621,7 +621,7 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
   protected function instantiate_view($form, &$form_state) {
     // Build the basic view properties and create the view.
     $values = array(
-      'name' => $form_state['values']['name'],
+      'id' => $form_state['values']['id'],
       'human_name' => $form_state['values']['human_name'],
       'description' => $form_state['values']['description'],
       'base_table' => $this->base_table,
diff --git a/core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php b/core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php
index d2ed1bf1a65..a075b6a3dfb 100644
--- a/core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php
@@ -133,7 +133,7 @@ class DefaultViewsTest extends WebTestBase {
           $view->preExecute($this->viewArgMap[$name]);
         }
 
-        $this->assert(TRUE, format_string('View @view will be executed.', array('@view' => $view->storage->get('name'))));
+        $this->assert(TRUE, format_string('View @view will be executed.', array('@view' => $view->storage->id())));
         $view->execute();
 
         $tokens = array('@name' => $name, '@display_id' => $display_id);
diff --git a/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php b/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php
index 8d47419f2fb..5b9b6cded60 100644
--- a/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php
@@ -208,7 +208,7 @@ class ModuleTest extends ViewUnitTestBase {
     foreach ($views as $id => $view) {
       foreach ($view->get('display') as $display_id => $display) {
         $expected_options[$view->id() . ':' . $display['id']] = t('View: @view - Display: @display',
-          array('@view' => $view->name, '@display' => $display['id']));
+          array('@view' => $view->id(), '@display' => $display['id']));
       }
     }
 
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 0f32a60ffe9..6ac76d7d20f 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/CacheTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/CacheTest.php
@@ -131,7 +131,7 @@ class CacheTest extends PluginTestBase {
     // so they should be added to the css/js storage.
     $view = views_get_view('test_view');
     $view->setDisplay();
-    $view->storage->set('name', 'test_cache_header_storage');
+    $view->storage->set('id', 'test_cache_header_storage');
     $view->display_handler->overrideOption('cache', array(
       'type' => 'time',
       'options' => array(
@@ -158,7 +158,7 @@ class CacheTest extends PluginTestBase {
 
     // Now add some css/jss before running the view.
     // Make sure that this css is not added when running the cached view.
-    $view->storage->set('name', 'test_cache_header_storage_2');
+    $view->storage->set('id', 'test_cache_header_storage_2');
 
     $system_css_path = drupal_get_path('module', 'system') . '/system.maintenance.css';
     drupal_add_css($system_css_path);
diff --git a/core/modules/views/lib/Drupal/views/Tests/TokenReplaceTest.php b/core/modules/views/lib/Drupal/views/Tests/TokenReplaceTest.php
index c3c24b1267f..632504fc351 100644
--- a/core/modules/views/lib/Drupal/views/Tests/TokenReplaceTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/TokenReplaceTest.php
@@ -44,7 +44,7 @@ class TokenReplaceTest extends ViewUnitTestBase {
     $expected = array(
       '[view:name]' => 'Test tokens',
       '[view:description]' => 'Test view to token replacement tests.',
-      '[view:machine-name]' => 'test_tokens',
+      '[view:id]' => 'test_tokens',
       '[view:title]' => 'Test token page',
       '[view:url]' => url('test_tokens', array('absolute' => TRUE)),
       '[view:total-rows]' => (string) $view->total_rows,
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/DefaultViewsTest.php b/core/modules/views/lib/Drupal/views/Tests/UI/DefaultViewsTest.php
index a96172bfccf..3ce171bf3d9 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/DefaultViewsTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/UI/DefaultViewsTest.php
@@ -84,7 +84,7 @@ class DefaultViewsTest extends UITestBase {
     $this->drupalGet('admin/structure/views');
     $this->clickViewsOperationLink(t('Clone'), '/frontpage');
     $edit = array(
-      'name' => 'clone_of_frontpage',
+      'id' => 'clone_of_frontpage',
     );
     $this->assertTitle(t('Clone of @human_name | @site-name', array('@human_name' => 'Front page', '@site-name' => config('system.site')->get('name'))));
     $this->drupalPost(NULL, $edit, t('Clone'));
@@ -94,7 +94,7 @@ class DefaultViewsTest extends UITestBase {
     $this->drupalGet('admin/structure/views');
     $this->clickViewsOperationLink(t('Clone'), '/frontpage');
     $random_name = strtolower($this->randomName());
-    $this->drupalPost(NULL, array('name' => $random_name), t('Clone'));
+    $this->drupalPost(NULL, array('id' => $random_name), t('Clone'));
     $this->assertUrl("admin/structure/views/view/$random_name/edit", array(), 'The custom view name got saved.');
 
     // Now disable the view, and make sure it stops appearing on the main view
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/DisplayExtenderUITest.php b/core/modules/views/lib/Drupal/views/Tests/UI/DisplayExtenderUITest.php
index c56e59c6105..7f11dec22ed 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/DisplayExtenderUITest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/UI/DisplayExtenderUITest.php
@@ -34,7 +34,7 @@ class DisplayExtenderUITest extends UITestBase {
     config('views.settings')->set('display_extenders', array('display_extender_test'))->save();
 
     $view = views_get_view('test_view');
-    $view_edit_url = "admin/structure/views/view/{$view->storage->get('name')}/edit";
+    $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';
 
     $this->drupalGet($view_edit_url);
@@ -44,7 +44,7 @@ class DisplayExtenderUITest extends UITestBase {
     $this->drupalPost($display_option_url, array('test_extender_test_option' => $random_text), t('Apply'));
     $this->assertLink($random_text);
     $this->drupalPost(NULL, array(), t('Save'));
-    $view = views_get_view($view->storage->get('name'));
+    $view = views_get_view($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/lib/Drupal/views/Tests/UI/DisplayTest.php b/core/modules/views/lib/Drupal/views/Tests/UI/DisplayTest.php
index 3ed56ce638e..c5b38e46ca9 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/DisplayTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/UI/DisplayTest.php
@@ -34,10 +34,10 @@ class DisplayTest extends UITestBase {
     // Create a new view in the UI.
     $default = array();
     $default['human_name'] = $this->randomName(16);
-    $default['name'] = strtolower($this->randomName(16));
+    $default['id'] = strtolower($this->randomName(16));
     $default['description'] = $this->randomName(16);
     $default['page[create]'] = TRUE;
-    $default['page[path]'] = $default['name'];
+    $default['page[path]'] = $default['id'];
 
     $view += $default;
 
@@ -51,7 +51,7 @@ class DisplayTest extends UITestBase {
    */
   public function testRemoveDisplay() {
     $view = $this->randomView();
-    $path_prefix = 'admin/structure/views/view/' . $view['name'] .'/edit';
+    $path_prefix = 'admin/structure/views/view/' . $view['id'] .'/edit';
 
     $this->drupalGet($path_prefix . '/default');
     $this->assertNoFieldById('edit-displays-settings-settings-content-tab-content-details-top-actions-delete', 'delete Page', 'Make sure there is no delete button on the default display.');
@@ -90,7 +90,7 @@ class DisplayTest extends UITestBase {
     $settings['page[create]'] = FALSE;
     $view = $this->randomView($settings);
 
-    $path_prefix = 'admin/structure/views/view/' . $view['name'] .'/edit';
+    $path_prefix = 'admin/structure/views/view/' . $view['id'] .'/edit';
     $this->drupalGet($path_prefix);
 
     // Add a new display.
@@ -109,7 +109,7 @@ class DisplayTest extends UITestBase {
       'block[create]' => TRUE
     );
     $view = $this->randomView($view);
-    $path_prefix = 'admin/structure/views/view/' . $view['name'] .'/edit';
+    $path_prefix = 'admin/structure/views/view/' . $view['id'] .'/edit';
 
     $this->clickLink(t('reorder displays'));
     $this->assertTrue($this->xpath('//tr[@id="display-row-default"]'), 'Make sure the default display appears on the reorder listing');
@@ -124,7 +124,7 @@ class DisplayTest extends UITestBase {
     $this->drupalPost(NULL, $edit, t('Apply'));
     $this->drupalPost(NULL, array(), t('Save'));
 
-    $view = views_get_view($view['name']);
+    $view = views_get_view($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.');
@@ -145,7 +145,7 @@ class DisplayTest extends UITestBase {
    */
   public function testCloneDisplay() {
     $view = $this->randomView();
-    $path_prefix = 'admin/structure/views/view/' . $view['name'] .'/edit';
+    $path_prefix = 'admin/structure/views/view/' . $view['id'] .'/edit';
 
     $this->drupalGet($path_prefix);
     $this->drupalPost(NULL, array(), 'clone Page');
@@ -157,7 +157,7 @@ class DisplayTest extends UITestBase {
    */
   public function testDisableDisplay() {
     $view = $this->randomView();
-    $path_prefix = 'admin/structure/views/view/' . $view['name'] .'/edit';
+    $path_prefix = 'admin/structure/views/view/' . $view['id'] .'/edit';
 
     $this->drupalGet($path_prefix);
     $this->assertFalse($this->xpath('//div[contains(@class, :class)]', array(':class' => 'views-display-disabled')), 'Make sure the disabled display css class does not appear after initial adding of a view.');
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/OverrideDisplaysTest.php b/core/modules/views/lib/Drupal/views/Tests/UI/OverrideDisplaysTest.php
index be4868e723d..b60f9d49a71 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/OverrideDisplaysTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/UI/OverrideDisplaysTest.php
@@ -27,7 +27,7 @@ class OverrideDisplaysTest extends UITestBase {
     // Create a basic view that shows all content, with a page and a block
     // display.
     $view['human_name'] = $this->randomName(16);
-    $view['name'] = strtolower($this->randomName(16));
+    $view['id'] = strtolower($this->randomName(16));
     $view['page[create]'] = 1;
     $view['page[path]'] = $this->randomName(16);
     $view['block[create]'] = 1;
@@ -41,8 +41,8 @@ class OverrideDisplaysTest extends UITestBase {
     $edit = array();
     $edit['title'] = $original_title = $this->randomName(16);
     $edit['override[dropdown]'] = 'default';
-    $this->drupalPost("admin/structure/views/nojs/display/{$view['name']}/page_1/title", $edit, t('Apply'));
-    $this->drupalPost("admin/structure/views/view/{$view['name']}/edit/page_1", array(), t('Save'));
+    $this->drupalPost("admin/structure/views/nojs/display/{$view['id']}/page_1/title", $edit, t('Apply'));
+    $this->drupalPost("admin/structure/views/view/{$view['id']}/edit/page_1", array(), t('Save'));
 
     // Add a node that will appear in the view, so that the block will actually
     // be displayed.
@@ -58,7 +58,7 @@ class OverrideDisplaysTest extends UITestBase {
     $this->assertText('View: ' . $view['human_name']);
 
     // Place the block.
-    $this->drupalPlaceBlock("views_block:{$view['name']}-block_1");
+    $this->drupalPlaceBlock("views_block:{$view['id']}-block_1");
 
     // Make sure the title appears in the block.
     $this->drupalGet('');
@@ -69,8 +69,8 @@ class OverrideDisplaysTest extends UITestBase {
     $edit = array();
     $edit['title'] = $new_title = $this->randomName(16);
     $edit['override[dropdown]'] = 'page_1';
-    $this->drupalPost("admin/structure/views/nojs/display/{$view['name']}/page_1/title", $edit, t('Apply'));
-    $this->drupalPost("admin/structure/views/view/{$view['name']}/edit/page_1", array(), t('Save'));
+    $this->drupalPost("admin/structure/views/nojs/display/{$view['id']}/page_1/title", $edit, t('Apply'));
+    $this->drupalPost("admin/structure/views/view/{$view['id']}/edit/page_1", array(), t('Save'));
     $this->drupalGet($view_path);
     $this->assertResponse(200);
     $this->assertText($new_title);
@@ -86,7 +86,7 @@ class OverrideDisplaysTest extends UITestBase {
     // page and feed to inherit their titles from the default display, but the
     // block to override it.
     $view['human_name'] = $this->randomName(16);
-    $view['name'] = strtolower($this->randomName(16));
+    $view['id'] = strtolower($this->randomName(16));
     $view['page[create]'] = 1;
     $view['page[title]'] = $this->randomName(16);
     $view['page[path]'] = $this->randomName(16);
@@ -117,7 +117,7 @@ class OverrideDisplaysTest extends UITestBase {
     $this->assertText('View: ' . $view['human_name']);
 
     // Place the block.
-    $this->drupalPlaceBlock("views_block:{$view['name']}-block_1");
+    $this->drupalPlaceBlock("views_block:{$view['id']}-block_1");
     $this->drupalGet('');
     $this->assertText($view['block[title]']);
     $this->assertNoText($view['page[title]']);
@@ -126,8 +126,8 @@ class OverrideDisplaysTest extends UITestBase {
     // the feed's title also, but not the block.
     $edit = array();
     $edit['title'] = $new_default_title = $this->randomName(16);
-    $this->drupalPost("admin/structure/views/nojs/display/{$view['name']}/page_1/title", $edit, t('Apply'));
-    $this->drupalPost("admin/structure/views/view/{$view['name']}/edit/page_1", array(), t('Save'));
+    $this->drupalPost("admin/structure/views/nojs/display/{$view['id']}/page_1/title", $edit, t('Apply'));
+    $this->drupalPost("admin/structure/views/view/{$view['id']}/edit/page_1", array(), t('Save'));
     $this->drupalGet($view['page[path]']);
     $this->assertResponse(200);
     $this->assertText($new_default_title);
@@ -146,8 +146,8 @@ class OverrideDisplaysTest extends UITestBase {
     // the block title only, and leave the defaults alone.
     $edit = array();
     $edit['title'] = $new_block_title = $this->randomName(16);
-    $this->drupalPost("admin/structure/views/nojs/display/{$view['name']}/block_1/title", $edit, t('Apply'));
-    $this->drupalPost("admin/structure/views/view/{$view['name']}/edit/block_1", array(), t('Save'));
+    $this->drupalPost("admin/structure/views/nojs/display/{$view['id']}/block_1/title", $edit, t('Apply'));
+    $this->drupalPost("admin/structure/views/view/{$view['id']}/edit/block_1", array(), t('Save'));
     $this->drupalGet($view['page[path]']);
     $this->assertResponse(200);
     $this->assertText($new_default_title);
@@ -168,7 +168,7 @@ class OverrideDisplaysTest extends UITestBase {
     // Because there is both a title on page and block we expect the title on
     // the block be overriden.
     $view['human_name'] = $this->randomName(16);
-    $view['name'] = strtolower($this->randomName(16));
+    $view['id'] = strtolower($this->randomName(16));
     $view['page[create]'] = 1;
     $view['page[title]'] = $this->randomName(16);
     $view['page[path]'] = $this->randomName(16);
@@ -182,8 +182,8 @@ class OverrideDisplaysTest extends UITestBase {
     $edit['title'] = $new_block_title = $this->randomName();
     $edit['override[dropdown]'] = 'default_revert';
 
-    $this->drupalPost("admin/structure/views/nojs/display/{$view['name']}/block_1/title", $edit, t('Apply'));
-    $this->drupalPost("admin/structure/views/view/{$view['name']}/edit/block_1", array(), t('Save'));
+    $this->drupalPost("admin/structure/views/nojs/display/{$view['id']}/block_1/title", $edit, t('Apply'));
+    $this->drupalPost("admin/structure/views/view/{$view['id']}/edit/block_1", array(), t('Save'));
     $this->assertText($view['page[title]']);
   }
 
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/SettingsTest.php b/core/modules/views/lib/Drupal/views/Tests/UI/SettingsTest.php
index a97a9e8eaf9..28978d602ed 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/SettingsTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/UI/SettingsTest.php
@@ -45,7 +45,7 @@ class SettingsTest extends UITestBase {
 
     $view = array();
     $view['human_name'] = $this->randomName(16);
-    $view['name'] = strtolower($this->randomName(16));
+    $view['id'] = strtolower($this->randomName(16));
     $view['description'] = $this->randomName(16);
     $view['page[create]'] = TRUE;
     $view['page[title]'] = $this->randomName(16);
@@ -65,7 +65,7 @@ class SettingsTest extends UITestBase {
 
     // Create a view with an additional display, so master should be hidden.
     $view['page[create]'] = TRUE;
-    $view['name'] = strtolower($this->randomName());
+    $view['id'] = strtolower($this->randomName());
     $this->drupalPost('admin/structure/views/add', $view, t('Save and edit'));
 
     $this->assertNoLink(t('Master'));
@@ -79,7 +79,7 @@ class SettingsTest extends UITestBase {
     );
     $this->drupalPost('admin/structure/views/settings', $edit, t('Save configuration'));
 
-    $view['name'] = strtolower($this->randomName());
+    $view['id'] = strtolower($this->randomName());
     $this->drupalPost('admin/structure/views/add', $view, t('Save and edit'));
     $this->assertFieldById('edit-displays-top-add-display-embed');
 
@@ -97,7 +97,7 @@ class SettingsTest extends UITestBase {
     );
     $this->drupalPost('admin/structure/views/settings', $edit, t('Save configuration'));
 
-    $view['name'] = strtolower($this->randomName());
+    $view['id'] = strtolower($this->randomName());
     $this->drupalPost('admin/structure/views/add', $view, t('Save and edit'));
 
     $this->drupalPost(NULL, array(), t('Update preview'));
@@ -109,7 +109,7 @@ class SettingsTest extends UITestBase {
     );
     $this->drupalPost('admin/structure/views/settings', $edit, t('Save configuration'));
 
-    $view['name'] = strtolower($this->randomName());
+    $view['id'] = strtolower($this->randomName());
     $this->drupalPost('admin/structure/views/add', $view, t('Save and edit'));
 
     $this->drupalPost(NULL, array(), t('Update preview'));
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/TagTest.php b/core/modules/views/lib/Drupal/views/Tests/UI/TagTest.php
index 6c874236eee..e5cac154e5a 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/TagTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/UI/TagTest.php
@@ -34,7 +34,7 @@ class TagTest extends ViewUnitTestBase {
       $suffix = $i % 2 ? 'odd' : 'even';
       $tag = 'autocomplete_tag_test_' . $suffix . $this->randomName();
       $tags[] = $tag;
-      entity_create('view', array('tag' => $tag, 'name' => $this->randomName()))->save();
+      entity_create('view', array('tag' => $tag, 'id' => $this->randomName()))->save();
     }
 
     // Make sure just ten results are returns.
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php b/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php
index f2064bd9e5b..27f47ea6766 100644
--- a/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php
@@ -30,7 +30,7 @@ class ViewStorageTest extends ViewUnitTestBase {
     'disabled',
     'api_version',
     'module',
-    'name',
+    'id',
     'description',
     'tag',
     'base_table',
@@ -158,7 +158,7 @@ class ViewStorageTest extends ViewUnitTestBase {
     }
 
     // Check the UUID of the loaded View.
-    $created->set('name', 'test_view_storage_new');
+    $created->set('id', 'test_view_storage_new');
     $created->save();
     $created_loaded = entity_load('view', 'test_view_storage_new');
     $this->assertIdentical($created->uuid(), $created_loaded->uuid(), 'The created UUID has been saved correctly.');
@@ -181,7 +181,7 @@ class ViewStorageTest extends ViewUnitTestBase {
     $executable->initDisplay();
     $this->assertTrue($executable->displayHandlers->get($new_id) instanceof Page, 'New page display "test" uses the right display plugin.');
 
-    $view->set('name', 'test_view_storage_new_new2');
+    $view->set('id', 'test_view_storage_new_new2');
     $view->save();
     $values = config('views.view.test_view_storage_new_new2')->get();
 
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 aff9227418e..07ba15ed27e 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Wizard/BasicTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Wizard/BasicTest.php
@@ -31,7 +31,7 @@ class BasicTest extends WizardTestBase {
     // Create a simple and not at all useful view.
     $view1 = array();
     $view1['human_name'] = $this->randomName(16);
-    $view1['name'] = strtolower($this->randomName(16));
+    $view1['id'] = strtolower($this->randomName(16));
     $view1['description'] = $this->randomName(16);
     $view1['page[create]'] = FALSE;
     $this->drupalPost('admin/structure/views/add', $view1, t('Save and edit'));
@@ -41,7 +41,7 @@ class BasicTest extends WizardTestBase {
     $this->assertText($view1['description']);
     // @todo For now, clone is being left to config.module to solve.
     foreach (array('delete', 'edit') as $operation) {
-      $this->assertLinkByHref(url('admin/structure/views/view/' . $view1['name'] . '/' . $operation));
+      $this->assertLinkByHref(url('admin/structure/views/view/' . $view1['id'] . '/' . $operation));
     }
 
     // This view should not have a block.
@@ -55,7 +55,7 @@ class BasicTest extends WizardTestBase {
     // Now create a page with simple node listing and an attached feed.
     $view2 = array();
     $view2['human_name'] = $this->randomName(16);
-    $view2['name'] = strtolower($this->randomName(16));
+    $view2['id'] = strtolower($this->randomName(16));
     $view2['description'] = $this->randomName(16);
     $view2['page[create]'] = 1;
     $view2['page[title]'] = $this->randomName(16);
@@ -97,7 +97,7 @@ class BasicTest extends WizardTestBase {
     // Create a view with a page and a block, and filter the listing.
     $view3 = array();
     $view3['human_name'] = $this->randomName(16);
-    $view3['name'] = strtolower($this->randomName(16));
+    $view3['id'] = strtolower($this->randomName(16));
     $view3['description'] = $this->randomName(16);
     $view3['show[wizard_key]'] = 'node';
     $view3['show[type]'] = 'page';
@@ -127,7 +127,7 @@ class BasicTest extends WizardTestBase {
     $this->assertText('View: ' . $view3['human_name']);
 
     // Place the block.
-    $this->drupalPlaceBlock("views_block:{$view3['name']}-block_1");
+    $this->drupalPlaceBlock("views_block:{$view3['id']}-block_1");
 
     // Visit a random page (not the one that displays the view itself) and look
     // for the expected node title in the block.
diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/ItemsPerPageTest.php b/core/modules/views/lib/Drupal/views/Tests/Wizard/ItemsPerPageTest.php
index 95f4709dc58..16e86fa5a4d 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Wizard/ItemsPerPageTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Wizard/ItemsPerPageTest.php
@@ -41,7 +41,7 @@ class ItemsPerPageTest extends WizardTestBase {
     // 3 in the block.
     $view = array();
     $view['human_name'] = $this->randomName(16);
-    $view['name'] = strtolower($this->randomName(16));
+    $view['id'] = strtolower($this->randomName(16));
     $view['description'] = $this->randomName(16);
     $view['show[wizard_key]'] = 'node';
     $view['show[type]'] = 'article';
@@ -79,7 +79,7 @@ class ItemsPerPageTest extends WizardTestBase {
     $this->assertText('View: ' . $view['human_name']);
     // Place the block, visit a page that displays the block, and check that the
     // nodes we expect appear in the correct order.
-    $this->drupalPlaceBlock("views_block:{$view['name']}-block_1");
+    $this->drupalPlaceBlock("views_block:{$view['id']}-block_1");
 
     $this->drupalGet('user');
     $content = $this->drupalGetContent();
diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/MenuTest.php b/core/modules/views/lib/Drupal/views/Tests/Wizard/MenuTest.php
index 7b4bd2c7d66..9c9ab60b031 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Wizard/MenuTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Wizard/MenuTest.php
@@ -27,7 +27,7 @@ class MenuTest extends WizardTestBase {
     // Create a view with a page display and a menu link in the Main Menu.
     $view = array();
     $view['human_name'] = $this->randomName(16);
-    $view['name'] = strtolower($this->randomName(16));
+    $view['id'] = strtolower($this->randomName(16));
     $view['description'] = $this->randomName(16);
     $view['page[create]'] = 1;
     $view['page[title]'] = $this->randomName(16);
diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/SortingTest.php b/core/modules/views/lib/Drupal/views/Tests/Wizard/SortingTest.php
index 54929041ce9..0813353482a 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Wizard/SortingTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Wizard/SortingTest.php
@@ -33,7 +33,7 @@ class SortingTest extends WizardTestBase {
     // Create a view that sorts oldest first.
     $view1 = array();
     $view1['human_name'] = $this->randomName(16);
-    $view1['name'] = strtolower($this->randomName(16));
+    $view1['id'] = strtolower($this->randomName(16));
     $view1['description'] = $this->randomName(16);
     $view1['show[sort]'] = 'created:ASC';
     $view1['page[create]'] = 1;
@@ -58,7 +58,7 @@ class SortingTest extends WizardTestBase {
     // Create a view that sorts newest first.
     $view2 = array();
     $view2['human_name'] = $this->randomName(16);
-    $view2['name'] = strtolower($this->randomName(16));
+    $view2['id'] = strtolower($this->randomName(16));
     $view2['description'] = $this->randomName(16);
     $view2['show[sort]'] = 'created:DESC';
     $view2['page[create]'] = 1;
diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/TaggedWithTest.php b/core/modules/views/lib/Drupal/views/Tests/Wizard/TaggedWithTest.php
index 693ed68c56d..641619300d7 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Wizard/TaggedWithTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Wizard/TaggedWithTest.php
@@ -125,7 +125,7 @@ class TaggedWithTest extends WizardTestBase {
     $this->drupalPost('admin/structure/views/add', $view1, t('Update "of type" choice'));
     // Now resubmit the entire form to the same URL.
     $view1['human_name'] = $this->randomName(16);
-    $view1['name'] = strtolower($this->randomName(16));
+    $view1['id'] = strtolower($this->randomName(16));
     $view1['description'] = $this->randomName(16);
     $view1['show[tagged_with]'] = 'tag1';
     $view1['page[create]'] = 1;
@@ -147,7 +147,7 @@ class TaggedWithTest extends WizardTestBase {
     $this->drupalPost('admin/structure/views/add', $view2, t('Update "of type" choice'));
     $this->assertResponse(200);
     $view2['human_name'] = $this->randomName(16);
-    $view2['name'] = strtolower($this->randomName(16));
+    $view2['id'] = strtolower($this->randomName(16));
     $view2['description'] = $this->randomName(16);
     $view2['show[tagged_with]'] = 'tag2';
     $view2['page[create]'] = 1;
diff --git a/core/modules/views/lib/Drupal/views/ViewExecutable.php b/core/modules/views/lib/Drupal/views/ViewExecutable.php
index 62cacd1938c..7447488eb8a 100644
--- a/core/modules/views/lib/Drupal/views/ViewExecutable.php
+++ b/core/modules/views/lib/Drupal/views/ViewExecutable.php
@@ -572,8 +572,8 @@ class ViewExecutable {
       // remember settings.
       $display_id = ($this->display_handler->isDefaulted('filters')) ? 'default' : $this->current_display;
 
-      if (empty($this->exposed_input) && !empty($_SESSION['views'][$this->storage->get('name')][$display_id])) {
-        $this->exposed_input = $_SESSION['views'][$this->storage->get('name')][$display_id];
+      if (empty($this->exposed_input) && !empty($_SESSION['views'][$this->storage->id()][$display_id])) {
+        $this->exposed_input = $_SESSION['views'][$this->storage->id()][$display_id];
       }
     }
 
@@ -1415,7 +1415,7 @@ class ViewExecutable {
     }
 
     // Allow hook_views_pre_view() to set the dom_id, then ensure it is set.
-    $this->dom_id = !empty($this->dom_id) ? $this->dom_id : hash('sha256', $this->storage->get('name') . REQUEST_TIME . mt_rand());
+    $this->dom_id = !empty($this->dom_id) ? $this->dom_id : hash('sha256', $this->storage->id() . REQUEST_TIME . mt_rand());
 
     // Allow the display handler to set up for execution
     $this->display_handler->preExecute();
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_access_dynamic.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_access_dynamic.yml
index a78537d44b2..fa9cd3afe51 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_access_dynamic.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_access_dynamic.yml
@@ -30,5 +30,5 @@ display:
     id: page_1
     position: '0'
 human_name: ''
-name: test_access_dynamic
+id: test_access_dynamic
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_access_none.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_access_none.yml
index 79019ef9f79..87b27b481e6 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_access_none.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_access_none.yml
@@ -23,5 +23,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_access_none
+id: test_access_none
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_access_static.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_access_static.yml
index cd3a94c5df0..4be908933a9 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_access_static.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_access_static.yml
@@ -30,5 +30,5 @@ display:
     id: page_1
     position: '0'
 human_name: ''
-name: test_access_static
+id: test_access_static
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_aggregate_count.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_aggregate_count.yml
index 7a4224790a4..5c854da682b 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_aggregate_count.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_aggregate_count.yml
@@ -53,5 +53,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_aggregate_count
+id: test_aggregate_count
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_alias.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_alias.yml
index 3755f24f3c8..bd337073198 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_alias.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_alias.yml
@@ -83,6 +83,6 @@ display:
     position: '0'
 human_name: test_alias
 module: views
-name: test_alias
+id: test_alias
 tag: default
 uuid: 3bdfd3e6-15aa-4324-9005-5ad8b321d265
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_argument_default_current_user.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_argument_default_current_user.yml
index 3cf754dfb7e..a0431d2c227 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_argument_default_current_user.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_argument_default_current_user.yml
@@ -49,5 +49,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_argument_default_current_user
+id: test_argument_default_current_user
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_argument_default_fixed.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_argument_default_fixed.yml
index 061b2097c62..fa0d2aeb902 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_argument_default_fixed.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_argument_default_fixed.yml
@@ -52,5 +52,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_argument_default_fixed
+id: test_argument_default_fixed
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_attachment_ui.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_attachment_ui.yml
index 3d3702e4a5b..6613ac90ab0 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_attachment_ui.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_attachment_ui.yml
@@ -64,5 +64,5 @@ display:
             guid_field_is_permalink: '0'
       path: test_attachment_ui_feed
     position: '3'
-name: test_attachment_ui
+id: test_attachment_ui
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_cache.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_cache.yml
index b15a64a5374..a0020e9ea9a 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_cache.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_cache.yml
@@ -37,6 +37,6 @@ display:
           field: id
           relationship: none
 human_name: ''
-name: test_cache
+id: test_cache
 tag: ''
 base_field: nid
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_click_sort.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_click_sort.yml
index 8aa2eb247ab..2e566cc3a72 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_click_sort.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_click_sort.yml
@@ -48,5 +48,5 @@ display:
     id: page_1
     position: '0'
 human_name: {  }
-name: test_click_sort
+id: test_click_sort
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_destroy.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_destroy.yml
index a28c6b11550..57791eddeb2 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_destroy.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_destroy.yml
@@ -156,5 +156,5 @@ display:
     id: page_1
     position: '0'
 human_name: ''
-name: test_destroy
+id: test_destroy
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_display.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_display.yml
index d18b24f6332..fa5a3e834be 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_display.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_display.yml
@@ -83,5 +83,5 @@ display:
     id: page_1
     position: '1'
 human_name: ''
-name: test_display
+id: test_display
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_display_attachment.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_display_attachment.yml
index 82a87fc2235..3b4ffef95e1 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_display_attachment.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_display_attachment.yml
@@ -63,5 +63,5 @@ display:
         page_1: page_1
 human_name: test_display_attachment
 module: views
-name: test_display_attachment
+id: test_display_attachment
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_dropbutton.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_dropbutton.yml
index 2d4fe32988c..f391c5f1051 100755
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_dropbutton.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_dropbutton.yml
@@ -223,5 +223,5 @@ display:
           link_to_node: '0'
 human_name: test_dropbutton
 module: views
-name: test_dropbutton
+id: test_dropbutton
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_example_area.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_example_area.yml
index 2a8fb0bd316..73f583d974f 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_example_area.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_example_area.yml
@@ -30,5 +30,5 @@ display:
     id: default
     position: '0'
 human_name: {  }
-name: test_example_area
+id: test_example_area
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_executable_displays.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_executable_displays.yml
index f4645c4e62a..98a661f78b7 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_executable_displays.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_executable_displays.yml
@@ -20,5 +20,5 @@ display:
     id: page_2
     position: '2'
 human_name: ''
-name: test_executable_displays
+id: test_executable_displays
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_exposed_admin_ui.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_exposed_admin_ui.yml
index d73dfb87975..1662dd9f0ef 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_exposed_admin_ui.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_exposed_admin_ui.yml
@@ -49,5 +49,5 @@ display:
     id: page_1
     position: '0'
 human_name: ''
-name: test_exposed_admin_ui
+id: test_exposed_admin_ui
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_exposed_form.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_exposed_form.yml
index 736ba039e2a..df3cc55a58a 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_exposed_form.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_exposed_form.yml
@@ -23,5 +23,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_exposed_form
+id: test_exposed_form
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_feed_display.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_feed_display.yml
index 6ba9d11c9c6..7ba3399a5a3 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_feed_display.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_feed_display.yml
@@ -87,5 +87,5 @@ display:
     position: '0'
 human_name: test_feed_display
 module: views
-name: test_feed_display
+id: test_feed_display
 tag: default
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_field_classes.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_field_classes.yml
index d2fe5b2a7e0..9e59587e812 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_field_classes.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_field_classes.yml
@@ -29,5 +29,5 @@ display:
     id: page_1
     position: '0'
 human_name: {  }
-name: test_field_classes
+id: test_field_classes
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_field_get_entity.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_field_get_entity.yml
index 5ba2fc94b07..e5a55d65d96 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_field_get_entity.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_field_get_entity.yml
@@ -60,5 +60,5 @@ display:
     id: default
     position: '0'
 human_name: test_field_get_entity
-name: test_field_get_entity
+id: test_field_get_entity
 tag: default
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_field_output.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_field_output.yml
index 6d0d73f1055..0cd7c2cd7fc 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_field_output.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_field_output.yml
@@ -22,5 +22,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_field_output
+id: test_field_output
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_field_tokens.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_field_tokens.yml
index 01431a6b702..230a97d9883 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_field_tokens.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_field_tokens.yml
@@ -41,5 +41,5 @@ display:
     display_title: Defaults
     id: default
     position: '0'
-name: test_field_tokens
+id: test_field_tokens
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_field_type.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_field_type.yml
index c9172bc550a..459c3adc323 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_field_type.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_field_type.yml
@@ -16,5 +16,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_field_type
+id: test_field_type
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_filter.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_filter.yml
index 3f11e837802..227ae9e0c90 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_filter.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_filter.yml
@@ -37,4 +37,4 @@ display:
     id: default
     position: '0'
 human_name: 'Test filters'
-name: test_filter
+id: test_filter
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_date_between.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_date_between.yml
index 71f4b2f2565..dde802af364 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_date_between.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_date_between.yml
@@ -37,5 +37,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_filter_date_between
+id: test_filter_date_between
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_group_override.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_group_override.yml
index 379eff630c8..a4ac6a8f7be 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_group_override.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_group_override.yml
@@ -50,5 +50,5 @@ display:
     id: page_1
     position: '0'
 human_name: test_filter_group_override
-name: test_filter_group_override
+id: test_filter_group_override
 tag: default
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_groups.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_groups.yml
index d71c02e1c80..5cbae1c3ad0 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_groups.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_groups.yml
@@ -107,5 +107,5 @@ display:
     id: page
     position: '0'
 human_name: test_filter_groups
-name: test_filter_groups
+id: test_filter_groups
 tag: default
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml
index a68c7905633..4857963b31d 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml
@@ -35,5 +35,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_filter_in_operator_ui
+id: test_filter_in_operator_ui
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_get_attach_displays.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_get_attach_displays.yml
index 96a1be7c39f..3993ae8b226 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_get_attach_displays.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_get_attach_displays.yml
@@ -1,5 +1,5 @@
 base_table: node
-name: test_get_attach_displays
+id: test_get_attach_displays
 description: ''
 tag: ''
 human_name: test_get_attach_displays
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_glossary.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_glossary.yml
index 33045e575a7..7d8554c77f3 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_glossary.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_glossary.yml
@@ -44,5 +44,5 @@ display:
     id: default
     position: '0'
 human_name: test_glossary
-name: test_glossary
+id: test_glossary
 tag: default
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_group_by_count.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_group_by_count.yml
index 7ea0ab80c7d..e00ab3d2ddb 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_group_by_count.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_group_by_count.yml
@@ -56,5 +56,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_group_by_count
+id: test_group_by_count
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_group_by_in_filters.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_group_by_in_filters.yml
index c494b095e9e..a100bb73972 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_group_by_in_filters.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_group_by_in_filters.yml
@@ -49,5 +49,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_group_by_in_filters
+id: test_group_by_in_filters
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_handler_relationships.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_handler_relationships.yml
index 409fb2c0c37..53bc643927f 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_handler_relationships.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_handler_relationships.yml
@@ -26,5 +26,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_handler_relationships
+id: test_handler_relationships
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_handler_test_access.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_handler_test_access.yml
index f7cbce55c91..ec58edb25af 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_handler_test_access.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_handler_test_access.yml
@@ -44,4 +44,4 @@ display:
     display_title: Master
     id: default
     position: '0'
-name: test_handler_test_access
+id: test_handler_test_access
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_history.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_history.yml
index ee816effd94..9502cf5f51e 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_history.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_history.yml
@@ -204,5 +204,5 @@ display:
           1: AND
 human_name: test_history
 module: views
-name: test_history
+id: test_history
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_page_display.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_page_display.yml
index 92ed6c70d79..d81195089c0 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_page_display.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_page_display.yml
@@ -29,5 +29,5 @@ display:
     id: page_2
     position: '0'
 human_name: ''
-name: test_page_display
+id: test_page_display
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_pager_full.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_pager_full.yml
index 08be354c67c..a8b4a31979b 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_pager_full.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_pager_full.yml
@@ -27,5 +27,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_pager_full
+id: test_pager_full
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_pager_none.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_pager_none.yml
index 7b203161198..aa691042a56 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_pager_none.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_pager_none.yml
@@ -23,5 +23,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_pager_none
+id: test_pager_none
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_pager_some.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_pager_some.yml
index d9ecda50f46..12d3c9b5a46 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_pager_some.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_pager_some.yml
@@ -26,5 +26,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_pager_some
+id: test_pager_some
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_preview.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_preview.yml
index 91ba6905f3b..9ce5d2107bb 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_preview.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_preview.yml
@@ -57,5 +57,5 @@ display:
           title: ''
 human_name: test_preview
 module: views
-name: test_preview
+id: test_preview
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_redirect_view.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_redirect_view.yml
index 121769301b4..189e23a6744 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_redirect_view.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_redirect_view.yml
@@ -1,5 +1,5 @@
 base_table: node
-name: test_redirect_view
+id: test_redirect_view
 description: ''
 tag: ''
 human_name: test_redirect_view
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_reset_button.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_reset_button.yml
index e01c83e959d..c9890a95f9d 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_reset_button.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_reset_button.yml
@@ -50,5 +50,5 @@ display:
     id: page_1
     position: '0'
 human_name: ''
-name: test_reset_button
+id: test_reset_button
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_simple_argument.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_simple_argument.yml
index 8f1e259be5f..2c0630921c2 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_simple_argument.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_simple_argument.yml
@@ -82,5 +82,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_simple_argument
+id: test_simple_argument
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_store_pager_settings.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_store_pager_settings.yml
index 0c4acfe11cb..23fac1130b1 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_store_pager_settings.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_store_pager_settings.yml
@@ -23,5 +23,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_store_pager_settings
+id: test_store_pager_settings
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_style_mapping.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_style_mapping.yml
index 30d4dd92838..975d2fd51fa 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_style_mapping.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_style_mapping.yml
@@ -54,5 +54,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_style_mapping
+id: test_style_mapping
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_tokens.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_tokens.yml
index f6e640c6bf4..86e03833bcc 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_tokens.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_tokens.yml
@@ -1,5 +1,5 @@
 base_table: views_test_data
-name: test_tokens
+id: test_tokens
 description: 'Test view to token replacement tests.'
 tag: ''
 human_name: 'Test tokens'
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_view.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_view.yml
index 57dd103698c..1e626a8654f 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_view.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_view.yml
@@ -44,5 +44,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_view
+id: test_view
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml
index 446aa63bd4b..5210f63b83d 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml
@@ -33,5 +33,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_view_argument_validate_numeric
+id: test_view_argument_validate_numeric
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_argument_validate_php.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_argument_validate_php.yml
index 1b4dc28609f..f23e0822033 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_argument_validate_php.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_argument_validate_php.yml
@@ -33,5 +33,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_view_argument_validate_php
+id: test_view_argument_validate_php
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_delete.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_delete.yml
index ca28db84c29..16ea033a245 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_delete.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_delete.yml
@@ -25,5 +25,5 @@ display:
     id: default
     position: '0'
 human_name: test_view_delete
-name: test_view_delete
+id: test_view_delete
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_handler_weight.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_handler_weight.yml
index cf47d54e271..d0ccc81bdec 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_handler_weight.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_handler_weight.yml
@@ -59,5 +59,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_view_handler_weight
+id: test_view_handler_weight
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_pager_full_zero_items_per_page.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_pager_full_zero_items_per_page.yml
index 5b909ea4c62..e86ba17d886 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_pager_full_zero_items_per_page.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_pager_full_zero_items_per_page.yml
@@ -43,5 +43,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_view_pager_full_zero_items_per_page
+id: test_view_pager_full_zero_items_per_page
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_render.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_render.yml
index e3ad2284a06..dd95690dbb1 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_render.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_render.yml
@@ -46,5 +46,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_view_render
+id: test_view_render
 tag: ''
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_status.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_status.yml
index 08261f55df3..9aeaeb9cdce 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_status.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_status.yml
@@ -1,5 +1,5 @@
 base_table: views_test_data
-name: test_view_status
+id: test_view_status
 description: ''
 tag: ''
 human_name: test_view_status
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_storage.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_storage.yml
index c28829fbca2..74266fc4d6b 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_storage.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_view_storage.yml
@@ -49,5 +49,5 @@ display:
         type: views_query
         options: {  }
 human_name: 'Storage Test View'
-name: test_view_storage
+id: test_view_storage
 tag: 'test'
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_views_groupby_save.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_views_groupby_save.yml
index 05f9b5cc861..87f2e310fcc 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_views_groupby_save.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_views_groupby_save.yml
@@ -23,5 +23,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_views_groupby_save
+id: test_views_groupby_save
 tag: ''
diff --git a/core/modules/views/tests/views_test_data/views_test_data.module b/core/modules/views/tests/views_test_data/views_test_data.module
index 324a446ad09..9e239929c95 100644
--- a/core/modules/views/tests/views_test_data/views_test_data.module
+++ b/core/modules/views/tests/views_test_data/views_test_data.module
@@ -78,7 +78,7 @@ function views_test_data_handler_test_access_callback_argument($argument = FALSE
  * @see \Drupal\views\Tests\Plugin\RenderTest
  */
 function views_test_data_views_pre_render(ViewExecutable $view) {
-  if ($view->storage->get('name') == 'test_cache_header_storage') {
+  if ($view->storage->id() == 'test_cache_header_storage') {
     $path = drupal_get_path('module', 'views_test_data');
     $view->element['#attached']['js'][] = "$path/views_cache.test.js";
     $view->element['#attached']['css'][] = "$path/views_cache.test.css";
@@ -91,7 +91,7 @@ function views_test_data_views_pre_render(ViewExecutable $view) {
  * Implements hook_preprocess_HOOK() for views-view-table.tpl.php.
  */
 function views_test_data_preprocess_views_view_table(&$variables) {
-  if ($variables['view']->storage->get('name') == 'test_view_render') {
+  if ($variables['view']->storage->id() == 'test_view_render') {
     $views_render_test = state()->get('views_render.test');
     $views_render_test++;
     state()->set('views_render.test', $views_render_test);
@@ -102,7 +102,7 @@ function views_test_data_preprocess_views_view_table(&$variables) {
  * Implements hook_views_post_build().
  */
 function views_test_data_views_post_build(ViewExecutable $view) {
-  if ($view->storage->get('name') == 'test_page_display') {
+  if ($view->storage->id() == 'test_page_display') {
     if ($view->current_display == 'page_1') {
       $view->build_info['denied'] = TRUE;
     }
diff --git a/core/modules/views/views.module b/core/modules/views/views.module
index 4bdd29aada6..535f8140a1a 100644
--- a/core/modules/views/views.module
+++ b/core/modules/views/views.module
@@ -43,7 +43,7 @@ function views_forms($form_id, $args) {
 function views_form_id($view) {
   $parts = array(
     'views_form',
-    $view->storage->get('name'),
+    $view->storage->id(),
     $view->current_display,
   );
 
@@ -223,7 +223,7 @@ function views_plugin_list() {
         }
 
         // Add this view to the list for this plugin.
-        $plugins[$key]['views'][$view->get('name')] = $view->get('name');
+        $plugins[$key]['views'][$view->id()] = $view->id();
       }
     }
   }
@@ -240,11 +240,11 @@ function views_plugin_list() {
  */
 function views_preprocess_node(&$vars) {
   // The 'view' attribute of the node is added in views_preprocess_node()
-  if (!empty($vars['node']->view) && $vars['node']->view->storage->get('name')) {
+  if (!empty($vars['node']->view) && $vars['node']->view->storage->id()) {
     $vars['view'] = $vars['node']->view;
-    $vars['theme_hook_suggestions'][] = 'node__view__' . $vars['node']->view->storage->get('name');
+    $vars['theme_hook_suggestions'][] = 'node__view__' . $vars['node']->view->storage->id();
     if (!empty($vars['node']->view->current_display)) {
-      $vars['theme_hook_suggestions'][] = 'node__view__' . $vars['node']->view->storage->get('name') . '__' . $vars['node']->view->current_display;
+      $vars['theme_hook_suggestions'][] = 'node__view__' . $vars['node']->view->storage->id() . '__' . $vars['node']->view->current_display;
 
       // If a node is being rendered in a view, and the view does not have a path,
       // prevent drupal from accidentally setting the $page variable:
@@ -266,11 +266,11 @@ function views_preprocess_node(&$vars) {
  */
 function views_preprocess_comment(&$vars) {
   // The 'view' attribute of the node is added in template_preprocess_views_view_row_comment()
-  if (!empty($vars['comment']->view) && $vars['comment']->view->storage->get('name')) {
+  if (!empty($vars['comment']->view) && $vars['comment']->view->storage->id()) {
     $vars['view'] = &$vars['comment']->view;
-    $vars['theme_hook_suggestions'][] = 'comment__view__' . $vars['comment']->view->storage->get('name');
+    $vars['theme_hook_suggestions'][] = 'comment__view__' . $vars['comment']->view->storage->id();
     if (!empty($vars['node']->view->current_display)) {
-      $vars['theme_hook_suggestions'][] = 'comment__view__' . $vars['comment']->view->storage->get('name') . '__' . $vars['comment']->view->current_display;
+      $vars['theme_hook_suggestions'][] = 'comment__view__' . $vars['comment']->view->storage->id() . '__' . $vars['comment']->view->current_display;
     }
   }
 }
@@ -663,7 +663,7 @@ function views_add_contextual_links(&$render_element, $location, ViewExecutable
           $render_element['#views_contextual_links_info'][$module] = array(
             'location' => $location,
             'view' => $view,
-            'view_name' => $view->storage->get('name'),
+            'view_name' => $view->storage->id(),
             'view_display_id' => $display_id,
           );
         }
@@ -1527,7 +1527,7 @@ function views_exposed_form($form, &$form_state) {
   // Let form plugins know this is for exposed widgets.
   $form_state['exposed'] = TRUE;
   // Check if the form was already created
-  if ($cache = views_exposed_form_cache($view->storage->get('name'), $view->current_display)) {
+  if ($cache = views_exposed_form_cache($view->storage->id(), $view->current_display)) {
     return $cache;
   }
 
@@ -1561,19 +1561,19 @@ function views_exposed_form($form, &$form_state) {
     '#name' => '',
     '#type' => 'submit',
     '#value' => t('Apply'),
-    '#id' => drupal_html_id('edit-submit-' . $view->storage->get('name')),
+    '#id' => drupal_html_id('edit-submit-' . $view->storage->id()),
   );
 
   $form['#action'] = url($view->display_handler->getUrl());
   $form['#theme'] = views_theme_functions('views_exposed_form', $view, $display);
-  $form['#id'] = drupal_clean_css_identifier('views_exposed_form-' . check_plain($view->storage->get('name')) . '-' . check_plain($display['id']));
+  $form['#id'] = drupal_clean_css_identifier('views_exposed_form-' . check_plain($view->storage->id()) . '-' . check_plain($display['id']));
 //  $form['#attributes']['class'] = array('views-exposed-form');
 
   $exposed_form_plugin = $form_state['exposed_form_plugin'];
   $exposed_form_plugin->exposed_form_alter($form, $form_state);
 
   // Save the form
-  views_exposed_form_cache($view->storage->get('name'), $view->current_display, $form);
+  views_exposed_form_cache($view->storage->id(), $view->current_display, $form);
 
   return $form;
 }
diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc
index 23dc731b02a..4be8a017dc2 100644
--- a/core/modules/views/views.theme.inc
+++ b/core/modules/views/views.theme.inc
@@ -22,7 +22,7 @@ function _views_theme_functions($hook, ViewExecutable $view, $display = NULL) {
   $themes = array();
 
   if ($display) {
-    $themes[] = $hook . '__' . $view->storage->get('name') . '__' . $display['id'];
+    $themes[] = $hook . '__' . $view->storage->id() . '__' . $display['id'];
     $themes[] = $hook . '__' . $display['id'];
     // Add theme suggestions for each single tag.
     foreach (drupal_explode_tags($view->storage->get('tag')) as $tag) {
@@ -30,11 +30,11 @@ function _views_theme_functions($hook, ViewExecutable $view, $display = NULL) {
     }
 
     if ($display['id'] != $display['display_plugin']) {
-      $themes[] = $hook . '__' . $view->storage->get('name') . '__' . $display['display_plugin'];
+      $themes[] = $hook . '__' . $view->storage->id() . '__' . $display['display_plugin'];
       $themes[] = $hook . '__' . $display['display_plugin'];
     }
   }
-  $themes[] = $hook . '__' . $view->storage->get('name');
+  $themes[] = $hook . '__' . $view->storage->id();
   $themes[] = $hook;
   return $themes;
 }
@@ -53,8 +53,8 @@ function template_preprocess_views_view(&$vars) {
     $vars['rows'] = array('#markup' => $vars['rows']);
   }
 
-  $vars['css_name']   = drupal_clean_css_identifier($view->storage->get('name'));
-  $vars['name']       = $view->storage->get('name');
+  $vars['css_name'] = drupal_clean_css_identifier($view->storage->id());
+  $vars['id'] = $view->storage->id();
   $vars['display_id'] = $view->current_display;
 
   // Basic classes
@@ -62,8 +62,8 @@ function template_preprocess_views_view(&$vars) {
 
   $vars['attributes']['class'] = array();
   $vars['attributes']['class'][] = 'view';
-  $vars['attributes']['class'][] = 'view-' . drupal_clean_css_identifier($vars['name']);
-  $vars['attributes']['class'][] = 'view-id-' . $vars['name'];
+  $vars['attributes']['class'][] = 'view-' . drupal_clean_css_identifier($vars['id']);
+  $vars['attributes']['class'][] = 'view-id-' . $vars['id'];
   $vars['attributes']['class'][] = 'view-display-id-' . $vars['display_id'];
 
   $css_class = $view->display_handler->getOption('css_class');
@@ -136,7 +136,7 @@ function template_preprocess_views_view(&$vars) {
         'ajax_path' => url('views/ajax'),
         'ajaxViews' => array(
           'views_dom_id:' . $vars['dom_id'] => array(
-            'view_name' => $view->storage->get('name'),
+            'view_name' => $view->storage->id(),
             'view_display_id' => $view->current_display,
             'view_args' => check_plain(implode('/', $view->args)),
             'view_path' => check_plain(current_path()),
@@ -877,7 +877,7 @@ function template_preprocess_views_view_rss(&$vars) {
   $vars['description'] = check_plain(decode_entities(strip_tags($style->get_description())));
 
   if ($view->display_handler->getOption('sitename_title')) {
-    $title = $config->get('name');
+    $title = $config->id();
     if ($slogan = $config->get('slogan')) {
       $title .= ' - ' . $slogan;
     }
diff --git a/core/modules/views/views.tokens.inc b/core/modules/views/views.tokens.inc
index 4674d1b7867..9ca541a49df 100644
--- a/core/modules/views/views.tokens.inc
+++ b/core/modules/views/views.tokens.inc
@@ -22,9 +22,9 @@ function views_token_info() {
     'name' => t('Description'),
     'description' => t('The description of the view.'),
   );
-  $info['tokens']['view']['machine-name'] = array(
-    'name' => t('Machine name'),
-    'description' => t('The machine-readable name of the view.'),
+  $info['tokens']['view']['id'] = array(
+    'name' => t('ID'),
+    'description' => t('The machine-readable ID of the view.'),
   );
   $info['tokens']['view']['title'] = array(
     'name' => t('Title'),
@@ -89,8 +89,8 @@ function views_tokens($type, $tokens, array $data = array(), array $options = ar
           $replacements[$original] = $sanitize ? check_plain($view->storage->get('description')) : $view->storage->get('description');
           break;
 
-        case 'machine-name':
-          $replacements[$original] = $view->storage->get('name');
+        case 'id':
+          $replacements[$original] = $view->storage->id();
           break;
 
         case 'title':
diff --git a/core/modules/views/views_ui/admin.inc b/core/modules/views/views_ui/admin.inc
index ac917d12fd5..e6215af134a 100644
--- a/core/modules/views/views_ui/admin.inc
+++ b/core/modules/views/views_ui/admin.inc
@@ -285,19 +285,19 @@ function views_ui_break_lock_confirm($form, &$form_state, ViewUI $view) {
   $form = array();
 
   if (empty($view->locked)) {
-    $form['message']['#markup'] = t('There is no lock on view %name to break.', array('%name' => $view->get('name')));
+    $form['message']['#markup'] = t('There is no lock on view %name to break.', array('%name' => $view->id()));
     return $form;
   }
 
   $cancel = drupal_container()->get('request')->query->get('cancel');
   if (empty($cancel)) {
-    $cancel = 'admin/structure/views/view/' . $view->get('name') . '/edit';
+    $cancel = 'admin/structure/views/view/' . $view->id() . '/edit';
   }
 
   $account = user_load($view->locked->owner);
   $form = confirm_form($form,
                   t('Do you want to break the lock on view %name?',
-                  array('%name' => $view->get('name'))),
+                  array('%name' => $view->id())),
                   $cancel,
                   t('By breaking this lock, any unsaved changes made by !user will be lost.', array('!user' => theme('username', array('account' => $account)))),
                   t('Break lock'),
@@ -540,7 +540,7 @@ function views_ui_ajax_forms($key = NULL) {
 function views_ui_build_form_url($form_state) {
   $form = views_ui_ajax_forms($form_state['form_key']);
   $ajax = empty($form_state['ajax']) ? 'nojs' : 'ajax';
-  $name = $form_state['view']->get('name');
+  $name = $form_state['view']->id();
   $url = "admin/structure/views/$ajax/$form_state[form_key]/$name/$form_state[display_id]";
   foreach ($form['args'] as $arg) {
     $url .= '/' . $form_state[$arg];
@@ -621,7 +621,7 @@ function views_ui_ajax_form($js, $key, ViewUI $view, $display_id = '') {
     }
     elseif (!$js) {
       // if nothing on the stack, non-js forms just go back to the main view editor.
-      return drupal_goto("admin/structure/views/view/{$view->get('name')}/edit");
+      return drupal_goto("admin/structure/views/view/{$view->id()}/edit");
     }
     else {
       $output = array();
@@ -672,7 +672,7 @@ function views_ui_analyze_view_form($form, &$form_state) {
  * Submit handler for views_ui_analyze_view_form
  */
 function views_ui_analyze_view_form_submit($form, &$form_state) {
-  $form_state['redirect'] = 'admin/structure/views/view/' . $form_state['view']->get('name') . '/edit';
+  $form_state['redirect'] = 'admin/structure/views/view/' . $form_state['view']->id() . '/edit';
 }
 
 /**
@@ -2274,7 +2274,7 @@ function views_ui_field_list() {
               && $field_data = $table_data[$item['field']][$type]) {
               // The final check that we have a fieldapi field now.
               if (isset($field_data['field_name'])) {
-                $fields[$field_data['field_name']][$view->get('name')] = $view->get('name');
+                $fields[$field_data['field_name']][$view->id()] = $view->id();
               }
             }
           }
diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewAddFormController.php b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewAddFormController.php
index ea0bf11e059..e878f0b7a62 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewAddFormController.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewAddFormController.php
@@ -44,12 +44,12 @@ class ViewAddFormController extends ViewFormControllerBase {
       '#default_value' => '',
       '#maxlength' => 255,
     );
-    $form['name']['name'] = array(
+    $form['name']['id'] = array(
       '#type' => 'machine_name',
       '#maxlength' => 128,
       '#machine_name' => array(
         'exists' => 'views_get_view',
-        'source' => array('name', 'human_name'),
+        'source' => array('id', 'human_name'),
       ),
       '#description' => t('A unique machine-readable name for this View. It must only contain lowercase letters, numbers, and underscores.'),
     );
@@ -160,7 +160,7 @@ class ViewAddFormController extends ViewFormControllerBase {
     }
     $view->save();
 
-    $form_state['redirect'] = array('admin/structure/views/view/' . $view->get('name'));
+    $form_state['redirect'] = array('admin/structure/views/view/' . $view->id());
   }
 
   /**
diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewCloneFormController.php b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewCloneFormController.php
index 70f18a932ff..dcf319a0965 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewCloneFormController.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewCloneFormController.php
@@ -36,7 +36,7 @@ class ViewCloneFormController extends ViewFormControllerBase {
       '#maxlength' => 255,
       '#default_value' => t('Clone of @human_name', array('@human_name' => $entity->getHumanName())),
     );
-    $form['name'] = array(
+    $form['id'] = array(
       '#type' => 'machine_name',
       '#maxlength' => 128,
       '#machine_name' => array(
diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewEditFormController.php b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
index 4e6a74690a3..09008cf6ff4 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
@@ -87,7 +87,7 @@ class ViewEditFormController extends ViewFormControllerBase {
       $form['locked'] = array(
         '#type' => 'container',
         '#attributes' => array('class' => array('view-locked', 'messages', 'warning')),
-        '#children' => t('This view is being edited by user !user, and is therefore locked from editing by others. This lock is !age old. Click here to <a href="!break">break this lock</a>.', array('!user' => theme('username', array('account' => user_load($view->locked->owner))), '!age' => format_interval(REQUEST_TIME - $view->locked->updated), '!break' => url('admin/structure/views/view/' . $view->get('name') . '/break-lock'))),
+        '#children' => t('This view is being edited by user !user, and is therefore locked from editing by others. This lock is !age old. Click here to <a href="!break">break this lock</a>.', array('!user' => theme('username', array('account' => user_load($view->locked->owner))), '!age' => format_interval(REQUEST_TIME - $view->locked->updated), '!break' => url('admin/structure/views/view/' . $view->id() . '/break-lock'))),
         '#weight' => -10,
       );
     }
@@ -239,7 +239,7 @@ class ViewEditFormController extends ViewFormControllerBase {
         $displays[$new_id] = $displays[$id];
         unset($displays[$id]);
         // Redirect the user to the renamed display to be sure that the page itself exists and doesn't throw errors.
-        $form_state['redirect'] = 'admin/structure/views/view/' . $view->get('name') . '/edit/' . $new_id;
+        $form_state['redirect'] = 'admin/structure/views/view/' . $view->id() . '/edit/' . $new_id;
       }
     }
     $view->set('display', $displays);
@@ -250,7 +250,7 @@ class ViewEditFormController extends ViewFormControllerBase {
     $destination = $query->get('destination');
     if (!empty($destination)) {
       // Find out the first display which has a changed path and redirect to this url.
-      $old_view = views_get_view($view->get('name'));
+      $old_view = views_get_view($view->id());
       $old_view->initDisplay();
       foreach ($old_view->displayHandlers as $id => $display) {
         // Only check for displays with a path.
@@ -274,7 +274,7 @@ class ViewEditFormController extends ViewFormControllerBase {
     drupal_set_message(t('The view %name has been saved.', array('%name' => $view->getHumanName())));
 
     // Remove this view from cache so we can edit it properly.
-    drupal_container()->get('user.tempstore')->get('views')->delete($view->get('name'));
+    drupal_container()->get('user.tempstore')->get('views')->delete($view->id());
   }
 
   /**
@@ -288,7 +288,7 @@ class ViewEditFormController extends ViewFormControllerBase {
   public function cancel(array $form, array &$form_state) {
     // Remove this view from cache so edits will be lost.
     $view = $this->getEntity($form_state);
-    drupal_container()->get('user.tempstore')->get('views')->delete($view->get('name'));
+    drupal_container()->get('user.tempstore')->get('views')->delete($view->id());
     $form_state['redirect'] = 'admin/structure/views';
   }
 
@@ -538,7 +538,7 @@ class ViewEditFormController extends ViewFormControllerBase {
     views_ui_cache_set($view);
 
     // Redirect to the top-level edit page.
-    $form_state['redirect'] = 'admin/structure/views/view/' . $view->get('name') . '/edit/' . $id;
+    $form_state['redirect'] = 'admin/structure/views/view/' . $view->id() . '/edit/' . $id;
   }
 
   /**
@@ -554,7 +554,7 @@ class ViewEditFormController extends ViewFormControllerBase {
     views_ui_cache_set($view);
 
     // Redirect to the top-level edit page.
-    $form_state['redirect'] = 'admin/structure/views/view/' . $view->get('name') . '/edit/' . $id;
+    $form_state['redirect'] = 'admin/structure/views/view/' . $view->id() . '/edit/' . $id;
   }
 
   /**
@@ -569,7 +569,7 @@ class ViewEditFormController extends ViewFormControllerBase {
     views_ui_cache_set($view);
 
     // Redirect to the top-level edit page.
-    $form_state['redirect'] = 'admin/structure/views/view/' . $view->get('name') . '/edit/' . $id;
+    $form_state['redirect'] = 'admin/structure/views/view/' . $view->id() . '/edit/' . $id;
   }
 
   /**
@@ -587,7 +587,7 @@ class ViewEditFormController extends ViewFormControllerBase {
 
     // Redirect to the top-level edit page. The first remaining display will
     // become the active display.
-    $form_state['redirect'] = 'admin/structure/views/view/' . $view->get('name');
+    $form_state['redirect'] = 'admin/structure/views/view/' . $view->id();
   }
 
   /**
@@ -628,21 +628,21 @@ class ViewEditFormController extends ViewFormControllerBase {
       '#links' => array(
         'edit-details' => array(
           'title' => t('edit view name/description'),
-          'href' => "admin/structure/views/nojs/edit-details/{$view->get('name')}",
+          'href' => "admin/structure/views/nojs/edit-details/{$view->id()}",
           'attributes' => array('class' => array('views-ajax-link')),
         ),
         'analyze' => array(
           'title' => t('analyze view'),
-          'href' => "admin/structure/views/nojs/analyze/{$view->get('name')}/$display_id",
+          'href' => "admin/structure/views/nojs/analyze/{$view->id()}/$display_id",
           'attributes' => array('class' => array('views-ajax-link')),
         ),
         'clone' => array(
           'title' => t('clone view'),
-          'href' => "admin/structure/views/view/{$view->get('name')}/clone",
+          'href' => "admin/structure/views/view/{$view->id()}/clone",
         ),
         'reorder' => array(
           'title' => t('reorder displays'),
-          'href' => "admin/structure/views/nojs/reorder-displays/{$view->get('name')}/$display_id",
+          'href' => "admin/structure/views/nojs/reorder-displays/{$view->id()}/$display_id",
           'attributes' => array('class' => array('views-ajax-link')),
         ),
       ),
@@ -655,14 +655,14 @@ class ViewEditFormController extends ViewFormControllerBase {
       if ($view->type == t('Overridden')) {
         $element['extra_actions']['#links']['revert'] = array(
           'title' => t('revert view'),
-          'href' => "admin/structure/views/view/{$view->get('name')}/revert",
-          'query' => array('destination' => "admin/structure/views/view/{$view->get('name')}"),
+          'href' => "admin/structure/views/view/{$view->id()}/revert",
+          'query' => array('destination' => "admin/structure/views/view/{$view->id()}"),
         );
       }
       else {
         $element['extra_actions']['#links']['delete'] = array(
           'title' => t('delete view'),
-          'href' => "admin/structure/views/view/{$view->get('name')}/delete",
+          'href' => "admin/structure/views/view/{$view->id()}/delete",
         );
       }
     }
@@ -745,7 +745,7 @@ class ViewEditFormController extends ViewFormControllerBase {
     views_ui_cache_set($view);
 
     // Redirect to the new display's edit page.
-    $form_state['redirect'] = 'admin/structure/views/view/' . $view->get('name') . '/edit/' . $new_display_id;
+    $form_state['redirect'] = 'admin/structure/views/view/' . $view->id() . '/edit/' . $new_display_id;
   }
 
   /**
@@ -763,7 +763,7 @@ class ViewEditFormController extends ViewFormControllerBase {
     views_ui_cache_set($view);
 
     // Redirect to the new display's edit page.
-    $form_state['redirect'] = 'admin/structure/views/view/' . $view->get('name') . '/edit/' . $display_id;
+    $form_state['redirect'] = 'admin/structure/views/view/' . $view->id() . '/edit/' . $display_id;
   }
 
   /**
@@ -817,7 +817,7 @@ class ViewEditFormController extends ViewFormControllerBase {
 
     $build['#name'] = $build['#title'] = $types[$type]['title'];
 
-    $rearrange_url = "admin/structure/views/nojs/rearrange/{$view->get('name')}/{$display['id']}/$type";
+    $rearrange_url = "admin/structure/views/nojs/rearrange/{$view->id()}/{$display['id']}/$type";
     $rearrange_text = t('Rearrange');
     $class = 'icon compact rearrange';
 
@@ -827,7 +827,7 @@ class ViewEditFormController extends ViewFormControllerBase {
       case 'filter':
         // The rearrange form for filters contains the and/or UI, so override
         // the used path.
-        $rearrange_url = "admin/structure/views/nojs/rearrange-$type/{$view->get('name')}/{$display['id']}/$type";
+        $rearrange_url = "admin/structure/views/nojs/rearrange-$type/{$view->id()}/{$display['id']}/$type";
         $rearrange_text = t('And/Or, Rearrange');
         // TODO: Add another class to have another symbol for filter rearrange.
         $class = 'icon compact rearrange';
@@ -864,7 +864,7 @@ class ViewEditFormController extends ViewFormControllerBase {
     $count_handlers = count($view->get('executable')->displayHandlers->get($display['id'])->getHandlers($type));
     $actions['add'] = array(
       'title' => t('Add'),
-      'href' => "admin/structure/views/nojs/add-item/{$view->get('name')}/{$display['id']}/$type",
+      'href' => "admin/structure/views/nojs/add-item/{$view->id()}/{$display['id']}/$type",
       'attributes' => array('class' => array('icon compact add', 'views-ajax-link'), 'title' => t('Add'), 'id' => 'views-add-' . $type),
       'html' => TRUE,
     );
@@ -929,7 +929,7 @@ class ViewEditFormController extends ViewFormControllerBase {
       if (empty($handler)) {
         $build['fields'][$id]['#class'][] = 'broken';
         $field_name = t('Broken/missing handler: @table > @field', array('@table' => $field['table'], '@field' => $field['field']));
-        $build['fields'][$id]['#link'] = l($field_name, "admin/structure/views/nojs/config-item/{$view->get('name')}/{$display['id']}/$type/$id", array('attributes' => array('class' => array('views-ajax-link')), 'html' => TRUE));
+        $build['fields'][$id]['#link'] = l($field_name, "admin/structure/views/nojs/config-item/{$view->id()}/{$display['id']}/$type/$id", array('attributes' => array('class' => array('views-ajax-link')), 'html' => TRUE));
         continue;
       }
 
@@ -944,15 +944,15 @@ class ViewEditFormController extends ViewFormControllerBase {
       if (!empty($field['exclude'])) {
         $link_attributes['class'][] = 'views-field-excluded';
       }
-      $build['fields'][$id]['#link'] = l($link_text, "admin/structure/views/nojs/config-item/{$view->get('name')}/{$display['id']}/$type/$id", array('attributes' => $link_attributes, 'html' => TRUE));
+      $build['fields'][$id]['#link'] = l($link_text, "admin/structure/views/nojs/config-item/{$view->id()}/{$display['id']}/$type/$id", array('attributes' => $link_attributes, 'html' => TRUE));
       $build['fields'][$id]['#class'][] = drupal_clean_css_identifier($display['id']. '-' . $type . '-' . $id);
 
       if ($view->get('executable')->displayHandlers->get($display['id'])->useGroupBy() && $handler->usesGroupBy()) {
-        $build['fields'][$id]['#settings_links'][] = l('<span class="label">' . t('Aggregation settings') . '</span>', "admin/structure/views/nojs/config-item-group/{$view->get('name')}/{$display['id']}/$type/$id", array('attributes' => array('class' => 'views-button-configure views-ajax-link', 'title' => t('Aggregation settings')), 'html' => TRUE));
+        $build['fields'][$id]['#settings_links'][] = l('<span class="label">' . t('Aggregation settings') . '</span>', "admin/structure/views/nojs/config-item-group/{$view->id()}/{$display['id']}/$type/$id", array('attributes' => array('class' => 'views-button-configure views-ajax-link', 'title' => t('Aggregation settings')), 'html' => TRUE));
       }
 
       if ($handler->hasExtraOptions()) {
-        $build['fields'][$id]['#settings_links'][] = l('<span class="label">' . t('Settings') . '</span>', "admin/structure/views/nojs/config-item-extra/{$view->get('name')}/{$display['id']}/$type/$id", array('attributes' => array('class' => array('views-button-configure', 'views-ajax-link'), 'title' => t('Settings')), 'html' => TRUE));
+        $build['fields'][$id]['#settings_links'][] = l('<span class="label">' . t('Settings') . '</span>', "admin/structure/views/nojs/config-item-extra/{$view->id()}/{$display['id']}/$type/$id", array('attributes' => array('class' => array('views-button-configure', 'views-ajax-link'), 'title' => t('Settings')), 'html' => TRUE));
       }
 
       if ($grouping) {
diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewFormControllerBase.php b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewFormControllerBase.php
index 3683875a2dd..e9ed64f2be2 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewFormControllerBase.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewFormControllerBase.php
@@ -92,7 +92,7 @@ abstract class ViewFormControllerBase extends EntityFormController {
         '#theme' => 'menu_local_task',
         '#link' => array(
           'title' => $this->getDisplayLabel($view, $id),
-          'href' => 'admin/structure/views/view/' . $view->get('name') . '/edit/' . $id,
+          'href' => 'admin/structure/views/view/' . $view->id() . '/edit/' . $id,
           'localized_options' => array(),
         ),
       );
diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php
index a710ab48c0d..f6798fea99b 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php
@@ -61,7 +61,7 @@ class ViewPreviewFormController extends ViewFormControllerBase {
         '#markup' => $view->renderPreview($view->displayID, $args),
       );
     }
-    $form['#action'] = url('admin/structure/views/view/' . $view->get('name') .'/preview/' . $view->displayID);
+    $form['#action'] = url('admin/structure/views/view/' . $view->id() .'/preview/' . $view->displayID);
 
     return $form;
   }
@@ -82,7 +82,7 @@ class ViewPreviewFormController extends ViewFormControllerBase {
         '#submit' => array(array($this, 'submitPreview')),
         '#id' => 'preview-submit',
         '#ajax' => array(
-          'path' => 'admin/structure/views/view/' . $view->get('name') . '/preview/' . $view->displayID . '/ajax',
+          'path' => 'admin/structure/views/view/' . $view->id() . '/preview/' . $view->displayID . '/ajax',
           'wrapper' => 'views-preview-wrapper',
           'event' => 'click',
           'progress' => array('type' => 'throbber'),
@@ -98,7 +98,7 @@ class ViewPreviewFormController extends ViewFormControllerBase {
   public function submitPreview($form, &$form_state) {
     // Rebuild the form with a pristine $view object.
     $view = $this->getEntity($form_state);
-    $form_state['build_info']['args'][0] = views_ui_cache_load($view->get('name'));
+    $form_state['build_info']['args'][0] = views_ui_cache_load($view->id());
     $view->renderPreview = TRUE;
     $form_state['show_preview'] = TRUE;
     $form_state['rebuild'] = TRUE;
diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewUI.php b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewUI.php
index 0dead3b672b..d161c970019 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewUI.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewUI.php
@@ -215,7 +215,7 @@ class ViewUI implements ViewStorageInterface {
       views_ui_cache_set($this);
     }
 
-    $form_state['redirect'] = 'admin/structure/views/view/' . $this->get('name') . '/edit';
+    $form_state['redirect'] = 'admin/structure/views/view/' . $this->id() . '/edit';
   }
 
   /**
@@ -348,8 +348,8 @@ class ViewUI implements ViewStorageInterface {
    * Submit handler to break_lock a view.
    */
   public function submitBreakLock(&$form, &$form_state) {
-    drupal_container()->get('user.tempstore')->get('views')->delete($this->get('name'));
-    $form_state['redirect'] = 'admin/structure/views/view/' . $this->get('name') . '/edit';
+    drupal_container()->get('user.tempstore')->get('views')->delete($this->id());
+    $form_state['redirect'] = 'admin/structure/views/view/' . $this->id() . '/edit';
     drupal_set_message(t('The lock has been broken and you may now edit this view.'));
   }
 
@@ -411,7 +411,7 @@ class ViewUI implements ViewStorageInterface {
       'limit' => 0,
     );
 
-    $form['#action'] = url('admin/structure/views/nojs/reorder-displays/' . $this->get('name') . '/' . $display_id);
+    $form['#action'] = url('admin/structure/views/nojs/reorder-displays/' . $this->id() . '/' . $display_id);
 
     $this->getStandardButtons($form, $form_state, 'views_ui_reorder_displays_form');
     $form['buttons']['submit']['#submit'] = array(array($this, 'submitDisplaysReorderForm'));
@@ -463,7 +463,7 @@ class ViewUI implements ViewStorageInterface {
 
     // Store in cache
     views_ui_cache_set($this);
-    $form_state['redirect'] = array('admin/structure/views/view/' . $this->get('name') . '/edit', array('fragment' => 'views-tab-default'));
+    $form_state['redirect'] = array('admin/structure/views/view/' . $this->id() . '/edit', array('fragment' => 'views-tab-default'));
   }
 
   /**
@@ -630,7 +630,7 @@ class ViewUI implements ViewStorageInterface {
       }
 
       // Make view links come back to preview.
-      $this->override_path = 'admin/structure/views/nojs/preview/' . $this->get('name') . '/' . $display_id;
+      $this->override_path = 'admin/structure/views/nojs/preview/' . $this->id() . '/' . $display_id;
 
       // Also override the current path so we get the pager.
       $original_path = current_path();
@@ -795,7 +795,7 @@ class ViewUI implements ViewStorageInterface {
     $form = views_ui_ajax_forms($key);
     // Automatically remove the single-form cache if it exists and
     // does not match the key.
-    $identifier = implode('-', array($key, $this->get('name'), $display_id));
+    $identifier = implode('-', array($key, $this->id(), $display_id));
 
     foreach ($form['args'] as $id) {
       $arg = (!empty($args)) ? array_shift($args) : NULL;
diff --git a/core/modules/views/views_ui/templates/views-ui-edit-view.tpl.php b/core/modules/views/views_ui/templates/views-ui-edit-view.tpl.php
index 5f5e02ff99f..d651c4a03cb 100644
--- a/core/modules/views/views_ui/templates/views-ui-edit-view.tpl.php
+++ b/core/modules/views/views_ui/templates/views-ui-edit-view.tpl.php
@@ -21,7 +21,7 @@
       <?php print $quick_links ?>
     </div>
     <?php print t('View %name, displaying items of type <strong>@base</strong>.',
-        array('%name' => $view->get('name'), '@base' => $base_table)); ?>
+        array('%name' => $view->id(), '@base' => $base_table)); ?>
   </div>
 
   <?php print $tabs; ?>
diff --git a/core/modules/views/views_ui/views_ui.module b/core/modules/views/views_ui/views_ui.module
index 37a8edbf613..51571951d49 100644
--- a/core/modules/views/views_ui/views_ui.module
+++ b/core/modules/views/views_ui/views_ui.module
@@ -350,7 +350,7 @@ function views_ui_cache_load($name) {
   if (empty($view)) {
     return FALSE;
   }
-  $view->locked = $views_temp_store->getMetadata($view->get('name'));
+  $view->locked = $views_temp_store->getMetadata($view->id());
 
   return $view;
 }
@@ -379,7 +379,7 @@ function views_ui_cache_set(ViewUI $view) {
   unset($executable->default_display);
   $executable->query = NULL;
   unset($executable->displayHandlers);
-  drupal_container()->get('user.tempstore')->get('views')->set($view->get('name'), $view);
+  drupal_container()->get('user.tempstore')->get('views')->set($view->id(), $view);
 }
 
 /**
@@ -441,13 +441,13 @@ function views_ui_view_preview_section_handler_links(ViewExecutable $view, $type
     $field_name = $handler->adminLabel(TRUE);
     $links[$type . '-edit-' . $id] = array(
       'title' => t('Edit @section', array('@section' => $field_name)),
-      'href' => "admin/structure/views/nojs/config-item/{$view->storage->get('name')}/{$display['id']}/$type/$id",
+      'href' => "admin/structure/views/nojs/config-item/{$view->storage->id()}/{$display['id']}/$type/$id",
       'attributes' => array('class' => array('views-ajax-link')),
     );
   }
   $links[$type . '-add'] = array(
     'title' => t('Add new'),
-    'href' => "admin/structure/views/nojs/add-item/{$view->storage->get('name')}/{$display['id']}/$type",
+    'href' => "admin/structure/views/nojs/add-item/{$view->storage->id()}/{$display['id']}/$type",
     'attributes' => array('class' => array('views-ajax-link')),
   );
 
@@ -462,7 +462,7 @@ function views_ui_view_preview_section_display_category_links(ViewExecutable $vi
   $links = array(
     $type . '-edit' => array(
       'title' => t('Edit @section', array('@section' => $title)),
-      'href' => "admin/structure/views/nojs/display/{$view->storage->get('name')}/{$display['id']}/$type",
+      'href' => "admin/structure/views/nojs/display/{$view->storage->id()}/{$display['id']}/$type",
       'attributes' => array('class' => array('views-ajax-link')),
     ),
   );
@@ -490,7 +490,7 @@ function views_ui_view_preview_section_rows_links(ViewExecutable $view) {
  */
 function views_ui_views_plugins_display_alter(&$plugins) {
   // Attach contextual links to each display plugin. The links will point to
-  // paths underneath "admin/structure/views/view/{$view->get('name')}" (i.e., paths
+  // paths underneath "admin/structure/views/view/{$view->id()}" (i.e., paths
   // for editing and performing other contextual actions on the view).
   foreach ($plugins as &$display) {
     $display['contextual links']['views_ui'] = array(