diff --git a/core/modules/views/src/Views.php b/core/modules/views/src/Views.php
index 4689479..3bcdceb 100644
--- a/core/modules/views/src/Views.php
+++ b/core/modules/views/src/Views.php
@@ -285,9 +285,9 @@ public static function getDisabledViews() {
    * @param mixed $exclude_view
    *   view or current display to exclude
    *   either a
-   *   - views object (containing $exclude_view->storage->name and $exclude_view->current_display)
-   *   - views name as string:  e.g. my_view
-   *   - views name and display id (separated by ':'): e.g. my_view:default
+   *   - views object (containing $exclude_view->storage->id() and $exclude_view->current_display)
+   *   - views id as string:  e.g. my_view
+   *   - views id and display id (separated by ':'): e.g. my_view:default
    * @param bool $optgroup
    *   If TRUE, returns an array with optgroups for each view (will be ignored for
    *   $views_only = TRUE). Can be used by select
@@ -296,7 +296,7 @@ public static function getDisabledViews() {
    *
    * @return array
    *   An associative array for use in select.
-   *   - key: view name and display id separated by ':', or the view name only.
+   *   - key: view id and display id separated by ':', or the view id only.
    */
   public static function getViewsAsOptions($views_only = FALSE, $filter = 'all', $exclude_view = NULL, $optgroup = FALSE, $sort = FALSE) {
 
@@ -314,35 +314,37 @@ public static function getViewsAsOptions($views_only = FALSE, $filter = 'all', $
 
     // Prepare exclude view strings for comparison.
     if (empty($exclude_view)) {
-      $exclude_view_name = '';
+      $exclude_view_id = '';
       $exclude_view_display = '';
     }
     elseif (is_object($exclude_view)) {
-      $exclude_view_name = $exclude_view->storage->id();
+      $exclude_view_id = $exclude_view->storage->id();
       $exclude_view_display = $exclude_view->current_display;
     }
     else {
       // Append a ':' to the $exclude_view string so we always have more than one
       // item to explode.
-      list($exclude_view_name, $exclude_view_display) = explode(':', "$exclude_view:");
+      list($exclude_view_id, $exclude_view_display) = explode(':', "$exclude_view:");
     }
 
     $options = array();
     foreach ($views as $view) {
       $id = $view->id();
       // Return only views.
-      if ($views_only && $id != $exclude_view_name) {
+      if ($views_only && $id != $exclude_view_id) {
         $options[$id] = $view->label();
       }
       // Return views with display ids.
       else {
         foreach ($view->get('display') as $display_id => $display) {
-          if (!($id == $exclude_view_name && $display_id == $exclude_view_display)) {
+          if (!($id == $exclude_view_id && $display_id == $exclude_view_display)) {
+            $view_and_display = $id . ':' . $display['id'];
+            $params = array('@view' => $id, '@display' => $display['id']);
             if ($optgroup) {
-              $options[$id][$id . ':' . $display['id']] = t('@view : @display', array('@view' => $id, '@display' => $display['id']));
+              $options[$id][$view_and_display] = t('@view : @display', $params);
             }
             else {
-              $options[$id . ':' . $display['id']] = t('View: @view - Display: @display', array('@view' => $id, '@display' => $display['id']));
+              $options[$view_and_display] = t('View: @view - Display: @display', $params);
             }
           }
         }