diff --git a/config/views.view.archive.yml b/config/views.view.archive.yml
index b5ef6a0..f2b3a62 100644
--- a/config/views.view.archive.yml
+++ b/config/views.view.archive.yml
@@ -64,8 +64,8 @@ display:
         type: default
       row:
         type: node
-  page:
-    id: page
+  page_1:
+    id: page_1
     display_title: Page
     display_plugin: page
     position: '2'
@@ -74,8 +74,8 @@ display:
         type: views_query
         options: {  }
       path: archive
-  block:
-    id: block
+  block_1:
+    id: block_1
     display_title: Block
     display_plugin: block
     position: '3'
diff --git a/config/views.view.backlinks.yml b/config/views.view.backlinks.yml
index c3739e8..8c1f2a7 100644
--- a/config/views.view.backlinks.yml
+++ b/config/views.view.backlinks.yml
@@ -72,8 +72,8 @@ display:
           type: ol
       row:
         type: fields
-  page:
-    id: page
+  page_1:
+    id: page_1
     display_title: Page
     display_plugin: page
     position: '2'
@@ -86,7 +86,7 @@ display:
         type: tab
         title: 'What links here'
         weight: '0'
-  block:
+  block_1:
     id: block
     display_title: 'What links here'
     display_plugin: block
diff --git a/config/views.view.comments_recent.yml b/config/views.view.comments_recent.yml
index 337c356..6e86a0c 100644
--- a/config/views.view.comments_recent.yml
+++ b/config/views.view.comments_recent.yml
@@ -65,8 +65,8 @@ display:
         type: html_list
       row:
         type: fields
-  page:
-    id: page
+  page_1:
+    id: page_1
     display_title: Page
     display_plugin: page
     position: '2'
@@ -115,8 +115,8 @@ display:
             title: title
             timestamp: timestamp
             separator: ' '
-  block:
-    id: block
+  block_1:
+    id: block_1
     display_title: Block
     display_plugin: block
     position: '3'
diff --git a/config/views.view.frontpage.yml b/config/views.view.frontpage.yml
index 4ad6164..a635a0e 100644
--- a/config/views.view.frontpage.yml
+++ b/config/views.view.frontpage.yml
@@ -60,8 +60,8 @@ display:
           group: 0
           expose:
             operator: false
-  page:
-    id: page
+  page_1:
+    id: page_1
     display_title: Page
     display_plugin: page
     position: '2'
@@ -70,8 +70,8 @@ display:
         type: views_query
         options: {  }
       path: frontpage
-  feed:
-    id: feed
+  feed_1:
+    id: feed_1
     display_title: Feed
     display_plugin: feed
     position: '3'
diff --git a/config/views.view.glossary.yml b/config/views.view.glossary.yml
index 88de699..966da7c 100644
--- a/config/views.view.glossary.yml
+++ b/config/views.view.glossary.yml
@@ -92,8 +92,8 @@ display:
               separator: ''
           override: 1
           sticky: 0
-  page:
-    id: page
+  page_1:
+    id: page_1
     display_title: Page
     display_plugin: page
     position: '2'
@@ -106,8 +106,8 @@ display:
         type: normal
         title: Glossary
         weight: '0'
-  attachment:
-    id: attachment
+  attachment_1:
+    id: attachment_1
     display_title: Attachment
     display_plugin: attachment
     position: '3'
@@ -146,5 +146,5 @@ display:
           transform_dash: 0
       displays:
         default: default
-        page: page
+        page: page_1
       inherit_arguments: 0
diff --git a/config/views.view.taxonomy_term.yml b/config/views.view.taxonomy_term.yml
index 8cd3c79..742c5d7 100644
--- a/config/views.view.taxonomy_term.yml
+++ b/config/views.view.taxonomy_term.yml
@@ -77,8 +77,8 @@ display:
         type: default
       row:
         type: node
-  page:
-    id: page
+  page_1:
+    id: page_1
     display_title: Page
     display_plugin: page
     position: '2'
@@ -87,8 +87,8 @@ display:
         type: views_query
         options: {  }
       path: taxonomy/term/%
-  feed:
-    id: feed
+  feed_1:
+    id: feed_1
     display_title: Feed
     display_plugin: feed
     position: '3'
diff --git a/config/views.view.tracker.yml b/config/views.view.tracker.yml
index 6d4d4a4..5d31e2f 100644
--- a/config/views.view.tracker.yml
+++ b/config/views.view.tracker.yml
@@ -135,8 +135,8 @@ display:
               separator: ''
           override: 1
           order: desc
-  page:
-    id: page
+  page_1:
+    id: page_1
     display_title: Page
     display_plugin: page
     position: '2'
diff --git a/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php b/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
index 03f62ee..0219788 100644
--- a/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
@@ -628,7 +628,7 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
 
     // Display: Page
     if (isset($display_options['page'])) {
-      $display = $view->newDisplay('page', 'Page', 'page');
+      $display = $view->newDisplay('page', 'Page', 'page_1');
       // The page display is usually the main one (from the user's point of
       // view). Its options should therefore become the overall view defaults,
       // so that new displays which are added later automatically inherit them.
@@ -636,14 +636,14 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
 
       // Display: Feed (attached to the page).
       if (isset($display_options['feed'])) {
-        $display = $view->newDisplay('feed', 'Feed', 'feed');
+        $display = $view->newDisplay('feed', 'Feed', 'feed_1');
         $this->set_override_options($display_options['feed'], $display, $default_display);
       }
     }
 
     // Display: Block.
     if (isset($display_options['block'])) {
-      $display = $view->newDisplay('block', 'Block', 'block');
+      $display = $view->newDisplay('block', 'Block', 'block_1');
       // When there is no page, the block display options should become the
       // overall view defaults.
       if (!isset($display_options['page'])) {
@@ -946,7 +946,7 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
     $display_options['title'] = $form_state['values']['page']['title'];
     $display_options['displays'] = array(
       'default' => 'default',
-      'page' => 'page',
+      'page_1' => 'page_1',
     );
     return $display_options;
   }
diff --git a/lib/Drupal/views/Tests/GlossaryTest.php b/lib/Drupal/views/Tests/GlossaryTest.php
index 1b45265..ad0dfe3 100644
--- a/lib/Drupal/views/Tests/GlossaryTest.php
+++ b/lib/Drupal/views/Tests/GlossaryTest.php
@@ -47,8 +47,8 @@ class GlossaryTest extends ViewTestBase {
 
     // Execute glossary view
     $view = views_get_view('glossary');
-    $view->setDisplay('attachment');
-    $view->executeDisplay('attachment');
+    $view->setDisplay('attachment_1');
+    $view->executeDisplay('attachment_1');
 
     // Check that the amount of nodes per char.
     $result_nodes_per_char = array();
diff --git a/lib/Drupal/views/Tests/UI/DefaultViewsTest.php b/lib/Drupal/views/Tests/UI/DefaultViewsTest.php
index 9142a32..73d6184 100644
--- a/lib/Drupal/views/Tests/UI/DefaultViewsTest.php
+++ b/lib/Drupal/views/Tests/UI/DefaultViewsTest.php
@@ -49,15 +49,15 @@ class DefaultViewsTest extends UITestBase {
     // displayed.
     $new_title = $this->randomName(16);
     $edit = array('title' => $new_title);
-    $this->drupalPost('admin/structure/views/nojs/display/frontpage/page/title', $edit, t('Apply'));
-    $this->drupalPost('admin/structure/views/view/frontpage/edit/page', array(), t('Save'));
+    $this->drupalPost('admin/structure/views/nojs/display/frontpage/page_1/title', $edit, t('Apply'));
+    $this->drupalPost('admin/structure/views/view/frontpage/edit/page_1', array(), t('Save'));
     $this->drupalGet('frontpage');
     $this->assertResponse(200);
     $this->assertText($new_title);
 
     // Save another view in the UI.
-    $this->drupalPost('admin/structure/views/nojs/display/archive/page/title', array(), t('Apply'));
-    $this->drupalPost('admin/structure/views/view/archive/page', array(), t('Save'));
+    $this->drupalPost('admin/structure/views/nojs/display/archive/page_1/title', array(), t('Apply'));
+    $this->drupalPost('admin/structure/views/view/archive/page_1', array(), t('Save'));
 
     // Check there is an enable link. i.e. The view has not been enabled after
     // editing.
diff --git a/lib/Drupal/views/Tests/UI/DisplayTest.php b/lib/Drupal/views/Tests/UI/DisplayTest.php
index cf24c74..42cae46 100644
--- a/lib/Drupal/views/Tests/UI/DisplayTest.php
+++ b/lib/Drupal/views/Tests/UI/DisplayTest.php
@@ -49,21 +49,21 @@ class DisplayTest extends UITestBase {
     $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.');
 
-    $this->drupalGet($path_prefix . '/page');
+    $this->drupalGet($path_prefix . '/page_1');
     $this->assertFieldById('edit-displays-settings-settings-content-tab-content-details-top-actions-delete', 'delete Page', 'Make sure there is a delete button on the page display.');
 
     // Delete the page, so we can test the undo process.
-    $this->drupalPost($path_prefix . '/page', array(), 'delete Page');
+    $this->drupalPost($path_prefix . '/page_1', array(), 'delete Page');
     $this->assertFieldById('edit-displays-settings-settings-content-tab-content-details-top-actions-undo-delete', 'undo delete of Page', 'Make sure there a undo button on the page display after deleting.');
     $this->assertTrue($this->xpath('//div[contains(@class, views-display-deleted-link)]'). 'Make sure the display link is marked as to be deleted.');
 
     // Undo the deleting of the display.
-    $this->drupalPost($path_prefix . '/page', array(), 'undo delete of Page');
+    $this->drupalPost($path_prefix . '/page_1', array(), 'undo delete of Page');
     $this->assertNoFieldById('edit-displays-settings-settings-content-tab-content-details-top-actions-undo-delete', 'undo delete of Page', 'Make sure there is no undo button on the page display after reverting.');
     $this->assertFieldById('edit-displays-settings-settings-content-tab-content-details-top-actions-delete', 'delete Page', 'Make sure there is a delete button on the page display after the reverting.');
 
     // Now delete again and save the view.
-    $this->drupalPost($path_prefix . '/page', array(), 'delete Page');
+    $this->drupalPost($path_prefix . '/page_1', array(), 'delete Page');
     $this->drupalPost(NULL, array(), t('Save'));
 
     $this->assertNoLinkByHref($path_prefix . '/page', 'Make sure there is no display tab for the deleted display.');
@@ -85,7 +85,6 @@ class DisplayTest extends UITestBase {
 
     // Add a new display.
     $this->drupalPost(NULL, array(), 'Add Page');
-    // @todo Revising this after http://drupal.org/node/1793700 got in.
     $this->assertLinkByHref($path_prefix . '/page_1', 0, 'Make sure after adding a display the new display appears in the UI');
 
     $this->assertNoLink('Master*', 0, 'Make sure the master display is not marked as changed.');
@@ -106,21 +105,21 @@ class DisplayTest extends UITestBase {
     $this->drupalPost($path_prefix, $edit, t('Save'));
     $this->clickLink(t('reorder displays'));
     $this->assertTrue($this->xpath('//tr[@id="display-row-default"]'), 'Make sure the default display appears on the reorder listing');
-    $this->assertTrue($this->xpath('//tr[@id="display-row-page"]'), 'Make sure the page display appears on the reorder listing');
-    $this->assertTrue($this->xpath('//tr[@id="display-row-block"]'), 'Make sure the block display appears on the reorder listing');
+    $this->assertTrue($this->xpath('//tr[@id="display-row-page_1"]'), 'Make sure the page display appears on the reorder listing');
+    $this->assertTrue($this->xpath('//tr[@id="display-row-block_1"]'), 'Make sure the block display appears on the reorder listing');
 
     // Put the block display in front of the page display.
     $edit = array(
-      'page[weight]' => 2,
-      'block[weight]' => 1
+      'page_1[weight]' => 2,
+      'block_1[weight]' => 1
     );
     $this->drupalPost(NULL, $edit, t('Apply'));
     $this->drupalPost(NULL, array(), t('Save'));
 
     $view = views_get_view($view['name']);
     $this->assertEqual($view->storage->display['default']['position'], 0, 'Make sure the master display comes first.');
-    $this->assertEqual($view->storage->display['block']['position'], 1, 'Make sure the block display comes before the page display.');
-    $this->assertEqual($view->storage->display['page']['position'], 2, 'Make sure the page display comes after the block display.');
+    $this->assertEqual($view->storage->display['block_1']['position'], 1, 'Make sure the block display comes before the page display.');
+    $this->assertEqual($view->storage->display['page_1']['position'], 2, 'Make sure the page display comes after the block display.');
   }
 
   /**
@@ -141,7 +140,6 @@ class DisplayTest extends UITestBase {
 
     $this->drupalGet($path_prefix);
     $this->drupalPost(NULL, array(), 'clone Page');
-    // @todo Revising this after http://drupal.org/node/1793700 got in.
     $this->assertLinkByHref($path_prefix . '/page_1', 0, 'Make sure after cloning the new display appears in the UI');
   }
 
diff --git a/lib/Drupal/views/Tests/UI/OverrideDisplaysTest.php b/lib/Drupal/views/Tests/UI/OverrideDisplaysTest.php
index 3c7e6cc..35ff022 100644
--- a/lib/Drupal/views/Tests/UI/OverrideDisplaysTest.php
+++ b/lib/Drupal/views/Tests/UI/OverrideDisplaysTest.php
@@ -41,20 +41,20 @@ 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/title", $edit, t('Apply'));
-    $this->drupalPost("admin/structure/views/view/{$view['name']}/edit/page", array(), t('Save'));
+    $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'));
 
     // Put the block into the first sidebar region, and make sure it will not
     // display on the view's page display (since we will be searching for the
     // presence/absence of the view's title in both the page and the block).
     $this->drupalGet('admin/structure/block');
     $edit = array();
-    $edit["blocks[views_{$view['name']}-block][region]"] = 'sidebar_first';
+    $edit["blocks[views_{$view['name']}-block_1][region]"] = 'sidebar_first';
     $this->drupalPost('admin/structure/block', $edit, t('Save blocks'));
     $edit = array();
     $edit['visibility'] = BLOCK_VISIBILITY_NOTLISTED;
     $edit['pages'] = $view_path;
-    $this->drupalPost("admin/structure/block/manage/views/{$view['name']}-block/configure", $edit, t('Save block'));
+    $this->drupalPost("admin/structure/block/manage/views/{$view['name']}-block_1/configure", $edit, t('Save block'));
 
     // Add a node that will appear in the view, so that the block will actually
     // be displayed.
@@ -71,9 +71,9 @@ class OverrideDisplaysTest extends UITestBase {
     // only one that is changed.
     $edit = array();
     $edit['title'] = $new_title = $this->randomName(16);
-    $edit['override[dropdown]'] = 'page';
-    $this->drupalPost("admin/structure/views/nojs/display/{$view['name']}/page/title", $edit, t('Apply'));
-    $this->drupalPost("admin/structure/views/view/{$view['name']}/edit/page", array(), t('Save'));
+    $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->drupalGet($view_path);
     $this->assertResponse(200);
     $this->assertText($new_title);
@@ -107,12 +107,12 @@ class OverrideDisplaysTest extends UITestBase {
     // presence/absence of the view's title in both the page and the block).
     $this->drupalGet('admin/structure/block');
     $edit = array();
-    $edit["blocks[views_{$view['name']}-block][region]"] = 'sidebar_first';
+    $edit["blocks[views_{$view['name']}-block_1][region]"] = 'sidebar_first';
     $this->drupalPost('admin/structure/block', $edit, t('Save blocks'));
     $edit = array();
     $edit['visibility'] = BLOCK_VISIBILITY_NOTLISTED;
     $edit['pages'] = $view['page[path]'];
-    $this->drupalPost("admin/structure/block/manage/views/{$view['name']}-block/configure", $edit, t('Save block'));
+    $this->drupalPost("admin/structure/block/manage/views/{$view['name']}-block_1/configure", $edit, t('Save block'));
 
     // Add a node that will appear in the view, so that the block will actually
     // be displayed.
@@ -136,8 +136,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/title", $edit, t('Apply'));
-    $this->drupalPost("admin/structure/views/view/{$view['name']}/edit/page", array(), t('Save'));
+    $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->drupalGet($view['page[path]']);
     $this->assertResponse(200);
     $this->assertText($new_default_title);
@@ -157,8 +157,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/title", $edit, t('Apply'));
-    $this->drupalPost("admin/structure/views/view/{$view['name']}/edit/block", array(), t('Save'));
+    $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->drupalGet($view['page[path]']);
     $this->assertResponse(200);
     $this->assertText($new_default_title);
@@ -194,8 +194,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/title", $edit, t('Apply'));
-    $this->drupalPost("admin/structure/views/view/{$view['name']}/edit/block", array(), t('Save'));
+    $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->assertText($view['page[title]']);
   }
 
diff --git a/lib/Drupal/views/Tests/ViewStorageTest.php b/lib/Drupal/views/Tests/ViewStorageTest.php
index 30cdd4c..2c0e1c2 100644
--- a/lib/Drupal/views/Tests/ViewStorageTest.php
+++ b/lib/Drupal/views/Tests/ViewStorageTest.php
@@ -109,7 +109,7 @@ class ViewStorageTest extends ViewTestBase {
     }
 
     // Check the displays have been loaded correctly from config display data.
-    $expected_displays = array('default', 'page', 'block');
+    $expected_displays = array('default', 'page_1', 'block_1');
     $this->assertEqual(array_keys($view->display), $expected_displays, 'The correct display names are present.');
 
     // Check each ViewDisplay object and confirm that it has the correct key and
@@ -305,14 +305,14 @@ class ViewStorageTest extends ViewTestBase {
    */
   protected function displayMethodTests() {
     $config['display'] = array(
-      'page' => array(
+      'page_1' => array(
         'display_options' => array('path' => 'test'),
         'display_plugin' => 'page',
         'id' => 'page_2',
-        'display_title' => 'Page 2',
+        'display_title' => 'Page 1',
         'position' => 1
       ),
-      'feed' => array(
+      'feed_1' => array(
         'display_options' => array('path' => 'test.xml'),
         'display_plugin' => 'feed',
         'id' => 'feed',
diff --git a/lib/Drupal/views/Tests/Wizard/BasicTest.php b/lib/Drupal/views/Tests/Wizard/BasicTest.php
index 965e8cb..dbf48ff 100644
--- a/lib/Drupal/views/Tests/Wizard/BasicTest.php
+++ b/lib/Drupal/views/Tests/Wizard/BasicTest.php
@@ -124,7 +124,7 @@ class BasicTest extends WizardTestBase {
     $this->drupalGet('admin/structure/block');
     $this->assertText('View: ' . $view3['human_name']);
     $edit = array();
-    $edit["blocks[views_{$view3['name']}-block][region]"] = 'sidebar_first';
+    $edit["blocks[views_{$view3['name']}-block_1][region]"] = 'sidebar_first';
     $this->drupalPost('admin/structure/block', $edit, t('Save blocks'));
 
     // Visit a random page (not the one that displays the view itself) and look
diff --git a/lib/Drupal/views/Tests/Wizard/ItemsPerPageTest.php b/lib/Drupal/views/Tests/Wizard/ItemsPerPageTest.php
index 3759e5b..3e69105 100644
--- a/lib/Drupal/views/Tests/Wizard/ItemsPerPageTest.php
+++ b/lib/Drupal/views/Tests/Wizard/ItemsPerPageTest.php
@@ -79,7 +79,7 @@ class ItemsPerPageTest extends WizardTestBase {
     $this->drupalGet('admin/structure/block');
     $this->assertText('View: ' . $view['human_name']);
     $edit = array();
-    $edit["blocks[views_{$view['name']}-block][region]"] = 'sidebar_first';
+    $edit["blocks[views_{$view['name']}-block_1][region]"] = 'sidebar_first';
     $this->drupalPost('admin/structure/block', $edit, t('Save blocks'));
     $this->drupalGet('user');
     $content = $this->drupalGetContent();
diff --git a/views_ui/admin.inc b/views_ui/admin.inc
index 378e04a..91a1539 100644
--- a/views_ui/admin.inc
+++ b/views_ui/admin.inc
@@ -332,8 +332,8 @@ function views_ui_add_form_save_submit($form, &$form_state) {
   $view->save();
 
   $form_state['redirect'] = 'admin/structure/views';
-  if (!empty($view->displayHandlers['page'])) {
-    $display = $view->displayHandlers['page'];
+  if (!empty($view->displayHandlers['page_1'])) {
+    $display = $view->displayHandlers['page_1'];
     if ($display->hasPath()) {
       $one_path = $display->getOption('path');
       if (strpos($one_path, '%') === FALSE) {