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 abef195..7fd628f 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
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\Core\Entity\View.
+ * Contains \Drupal\views\Plugin\Core\Entity\View.
  */
 
 namespace Drupal\views\Plugin\Core\Entity;
@@ -10,9 +10,7 @@
 use Drupal\Core\Config\Entity\ConfigEntityBase;
 use Drupal\Core\Entity\EntityStorageControllerInterface;
 use Drupal\views\Views;
-use Drupal\views_ui\ViewUI;
-use Drupal\views\ViewStorageInterface;
-use Drupal\views\ViewExecutable;
+use Drupal\views\ViewInterface;
 use Drupal\Core\Entity\Annotation\EntityType;
 use Drupal\Core\Annotation\Translation;
 
@@ -36,7 +34,7 @@
  *   }
  * )
  */
-class View extends ConfigEntityBase implements ViewStorageInterface {
+class View extends ConfigEntityBase implements ViewInterface {
 
   /**
    * The name of the base table this view will use.
@@ -75,9 +73,9 @@ class View extends ConfigEntityBase implements ViewStorageInterface {
   protected $tag = '';
 
   /**
-   * The core version the view was created for.
+   * The core version this view was created for.
    *
-   * @var int
+   * @var string
    */
   protected $core = DRUPAL_CORE_COMPATIBILITY;
 
@@ -108,7 +106,7 @@ class View extends ConfigEntityBase implements ViewStorageInterface {
   /**
    * Stores a reference to the executable version of this view.
    *
-   * @var Drupal\views\ViewExecutable
+   * @var \Drupal\views\ViewExecutable
    */
   protected $executable;
 
@@ -120,7 +118,7 @@ class View extends ConfigEntityBase implements ViewStorageInterface {
   protected $module = 'views';
 
   /**
-   * Overrides Drupal\Core\Entity\EntityInterface::get().
+   * {@inheritdoc}
    */
   public function get($property_name, $langcode = NULL) {
     // Ensure that an executable View is available.
@@ -132,7 +130,7 @@ public function get($property_name, $langcode = NULL) {
   }
 
   /**
-   * Overrides Drupal\Core\Entity\EntityInterface::uri().
+   * {@inheritdoc}
    */
   public function uri() {
     return array(
@@ -145,7 +143,7 @@ public function uri() {
   }
 
   /**
-   * Overrides Drupal\Core\Config\Entity\ConfigEntityBase::createDuplicate().
+   * {@inheritdoc}
    */
   public function createDuplicate() {
     $duplicate = parent::createDuplicate();
@@ -154,9 +152,7 @@ public function createDuplicate() {
   }
 
   /**
-   * Overrides \Drupal\Core\Entity\Entity::label().
-   *
-   * When a certain view doesn't have a label return the ID.
+   * {@inheritdoc}
    */
   public function label($langcode = NULL) {
     if (!$label = $this->get('label')) {
@@ -166,20 +162,7 @@ public function label($langcode = NULL) {
   }
 
   /**
-   * Adds a new display handler to the view, automatically creating an ID.
-   *
-   * @param string $plugin_id
-   *   (optional) The plugin type from the Views plugin annotation. Defaults to
-   *   'page'.
-   * @param string $title
-   *   (optional) The title of the display. Defaults to NULL.
-   * @param string $id
-   *   (optional) The ID to use, e.g., 'default', 'page_1', 'block_2'. Defaults
-   *   to NULL.
-   *
-   * @return string|false
-   *   The key to the display in $view->display, or FALSE if no plugin ID was
-   *   provided.
+   * {@inheritdoc}
    */
   public function addDisplay($plugin_id = 'page', $title = NULL, $id = NULL) {
     if (empty($plugin_id)) {
@@ -232,6 +215,8 @@ public function addDisplay($plugin_id = 'page', $title = NULL, $id = NULL) {
    *
    * @param string $plugin_id
    *   Which plugin should be used for the new display ID.
+   *
+   * @return string
    */
   protected function generateDisplayId($plugin_id) {
     // 'default' is singular and is unique, so just go with 'default'
@@ -253,20 +238,7 @@ protected function generateDisplayId($plugin_id) {
   }
 
   /**
-   * Creates a new display and a display handler instance for it.
-   *
-   * @param string $plugin_id
-   *   (optional) The plugin type from the Views plugin annotation. Defaults to
-   *   'page'.
-   * @param string $title
-   *   (optional) The title of the display. Defaults to NULL.
-   * @param string $id
-   *   (optional) The ID to use, e.g., 'default', 'page_1', 'block_2'. Defaults
-   *   to NULL.
-   *
-   * @return string|\Drupal\views\Plugin\views\display\DisplayPluginBase
-   *   A new display plugin instance if executable is set, the new display ID
-   *   otherwise.
+   * {@inheritdoc}
    */
   public function newDisplay($plugin_id = 'page', $title = NULL, $id = NULL) {
     $id = $this->addDisplay($plugin_id, $title, $id);
@@ -291,7 +263,7 @@ public function &getDisplay($display_id) {
   }
 
   /**
-   * Overrides \Drupal\Core\Config\Entity\ConfigEntityBase::getExportProperties();
+   * {@inheritdoc}
    */
   public function getExportProperties() {
     $names = array(
@@ -384,4 +356,54 @@ public function mergeDefaultDisplaysOptions() {
     $this->set('display', $displays);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getBaseTableName() {
+    return $this->base_table;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getBaseFieldName() {
+    return $this->base_field;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDescription() {
+    return $this->description;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getTags() {
+    return $this->tag;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCoreVersion() {
+    return $this->core;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getViewExecutable() {
+    // Re-use the lazy instantiation logic for the ViewExecutable in $this->get().
+    return $this->get('executable');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getModuleName() {
+    return $this->module;
+  }
+
 }
diff --git a/core/modules/views/lib/Drupal/views/ViewExecutable.php b/core/modules/views/lib/Drupal/views/ViewExecutable.php
index 80ddc1c..dcbc124 100644
--- a/core/modules/views/lib/Drupal/views/ViewExecutable.php
+++ b/core/modules/views/lib/Drupal/views/ViewExecutable.php
@@ -9,7 +9,7 @@
 
 use Drupal;
 use Drupal\views\Plugin\views\query\QueryPluginBase;
-use Drupal\views\ViewStorageInterface;
+use Drupal\views\ViewInterface;
 use Drupal\Component\Utility\Tags;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -417,10 +417,10 @@ class ViewExecutable {
   /**
    * Constructs a new ViewExecutable object.
    *
-   * @param \Drupal\views\ViewStorageInterface $storage
+   * @param \Drupal\views\ViewInterface $storage
    *   The view config entity the actual information is stored on.
    */
-  public function __construct(ViewStorageInterface $storage) {
+  public function __construct(ViewInterface $storage) {
     // Reference the storage and the executable to each other.
     $this->storage = $storage;
     $this->storage->set('executable', $this);
diff --git a/core/modules/views/lib/Drupal/views/ViewExecutableFactory.php b/core/modules/views/lib/Drupal/views/ViewExecutableFactory.php
index 5b33f57..5b10f65 100644
--- a/core/modules/views/lib/Drupal/views/ViewExecutableFactory.php
+++ b/core/modules/views/lib/Drupal/views/ViewExecutableFactory.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views;
 
-use Drupal\views\ViewStorageInterface;
+use Drupal\views\ViewInterface;
 
 /**
  * Defines the cache backend factory.
@@ -17,13 +17,13 @@ class ViewExecutableFactory {
   /**
    * Instantiates a ViewExecutable class.
    *
-   * @param \Drupal\views\ViewStorageInterface $view
+   * @param \Drupal\views\ViewInterface $view
    *   A view entity instance.
    *
    * @return \Drupal\views\ViewExecutable
    *   A ViewExecutable instance.
    */
-  public static function get(ViewStorageInterface $view) {
+  public static function get(ViewInterface $view) {
     return new ViewExecutable($view);
   }
 
diff --git a/core/modules/views/lib/Drupal/views/ViewInterface.php b/core/modules/views/lib/Drupal/views/ViewInterface.php
new file mode 100644
index 0000000..ac211c2
--- /dev/null
+++ b/core/modules/views/lib/Drupal/views/ViewInterface.php
@@ -0,0 +1,129 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\views\ViewInterface.
+ */
+
+namespace Drupal\views;
+
+use Drupal\Core\Config\Entity\ConfigEntityInterface;
+
+/**
+ * Defines an interface for View storage classes.
+ */
+interface ViewInterface extends \IteratorAggregate, ConfigEntityInterface {
+
+  /**
+   * Adds a new display handler to the view, automatically creating an ID.
+   *
+   * @param string $plugin_id
+   *   (optional) The plugin type from the Views plugin annotation. Defaults to
+   *   'page'.
+   * @param string $title
+   *   (optional) The title of the display. Defaults to NULL.
+   * @param string $id
+   *   (optional) The ID to use, e.g., 'default', 'page_1', 'block_2'. Defaults
+   *   to NULL.
+   *
+   * @return string|bool
+   *   The key to the display in $view->display, or FALSE if no plugin ID was
+   *   provided.
+   */
+  public function addDisplay($plugin_id = 'page', $title = NULL, $id = NULL);
+
+  /**
+   * Creates a new display and a display handler instance for it.
+   *
+   * @param string $plugin_id
+   *   (optional) The plugin type from the Views plugin annotation. Defaults to
+   *   'page'.
+   * @param string $title
+   *   (optional) The title of the display. Defaults to NULL.
+   * @param string $id
+   *   (optional) The ID to use, e.g., 'default', 'page_1', 'block_2'. Defaults
+   *   to NULL.
+   *
+   * @return string|\Drupal\views\Plugin\views\display\DisplayPluginBase
+   *   A new display plugin instance if executable is set, the new display ID
+   *   otherwise.
+   */
+  public function newDisplay($plugin_id = 'page', $title = NULL, $id = NULL);
+
+  /**
+   * Retrieves a specific display's configuration by reference.
+   *
+   * @param string $display_id
+   *   The display ID to retrieve, e.g., 'default', 'page_1', 'block_2'.
+   *
+   * @return array
+   *   A reference to the specified display configuration.
+   */
+  public function &getDisplay($display_id);
+
+  /**
+   * Add defaults to the display options.
+   */
+  public function mergeDefaultDisplaysOptions();
+
+  /**
+   * Returns the name of the base table this view will use.
+   *
+   * @return string
+   *   The name of the base table for this view.
+   */
+  public function getBaseTableName();
+
+  /**
+   * Returns the name of the base field to use.
+   *
+   * @return string
+   *   The name of the base field for this view.
+   */
+  public function getBaseFieldName();
+
+  /**
+   * Returns the description of the view, which is used only in the interface.
+   *
+   * @return string
+   *   The description of this view used in the interface.
+   */
+  public function getDescription();
+
+  /**
+   * Returns the "tags" of a view.
+   *
+   * The tags are stored as a single string, though it is used as multiple tags
+   * for example in the views overview.
+   *
+   * @return string
+   *   A single string of multiple tags added to this view.
+   */
+  public function getTags();
+
+  /**
+   * Returns the core version this view was created for.
+   *
+   * @return int
+   *   A drupal core version string such as DRUPAL_CORE_COMPATIBILITY (8.x)
+   */
+  public function getCoreVersion();
+
+  /**
+   * Returns a reference to the executable version of this view.
+   * If none was set previously, it is created before returning it.
+   *
+   * @return \Drupal\views\ViewExecutable
+   *   A reference to the executable version of this view.
+   */
+  public function getViewExecutable();
+
+  /**
+   * Returns the name of module implementing this view.
+   *
+   * @return string
+   *   The name of the module implementing this view.
+   */
+  public function getModuleName();
+
+}
diff --git a/core/modules/views/lib/Drupal/views/ViewStorageInterface.php b/core/modules/views/lib/Drupal/views/ViewStorageInterface.php
deleted file mode 100644
index 7009bae..0000000
--- a/core/modules/views/lib/Drupal/views/ViewStorageInterface.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\views\ViewStorageInterface.
- */
-
-namespace Drupal\views;
-
-use Drupal\Core\Config\Entity\ConfigEntityInterface;
-
-/**
- * Defines an interface for View storage classes.
- */
-interface ViewStorageInterface extends \IteratorAggregate, ConfigEntityInterface {
-
-  /**
-   * Retrieves a specific display's configuration by reference.
-   *
-   * @param string $display_id
-   *   The display ID to retrieve, e.g., 'default', 'page_1', 'block_2'.
-   *
-   * @return array
-   *   A reference to the specified display configuration.
-   */
-  public function &getDisplay($display_id);
-
-  /**
-   * Add defaults to the display options.
-   */
-  public function mergeDefaultDisplaysOptions();
-}
diff --git a/core/modules/views/tests/modules/views_test_data/views_test_data.views_execution.inc b/core/modules/views/tests/modules/views_test_data/views_test_data.views_execution.inc
index e5a4277..ba91918 100644
--- a/core/modules/views/tests/modules/views_test_data/views_test_data.views_execution.inc
+++ b/core/modules/views/tests/modules/views_test_data/views_test_data.views_execution.inc
@@ -6,7 +6,7 @@
  */
 
 use Drupal\views\ViewExecutable;
-use Drupal\views\ViewStorageInterface;
+use Drupal\views\ViewInterface;
 
 /**
  * Implements hook_views_query_substitutions().
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php b/core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php
index c9887f9..5ba71fc 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php
@@ -8,7 +8,7 @@
 namespace Drupal\views_ui\Controller;
 
 use Drupal\views\ViewExecutable;
-use Drupal\views\ViewStorageInterface;
+use Drupal\views\ViewInterface;
 use Drupal\views_ui\ViewUI;
 use Drupal\views\ViewsData;
 use Drupal\user\TempStore;
@@ -160,7 +160,7 @@ public function reportPlugins() {
   /**
    * Calls a method on a view and reloads the listing page.
    *
-   * @param \Drupal\views\ViewStorageInterface $view
+   * @param \Drupal\views\ViewInterface $view
    *   The view being acted upon.
    * @param string $op
    *   The operation to perform, e.g., 'enable' or 'disable'.
@@ -169,7 +169,7 @@ public function reportPlugins() {
    *   Either returns a rebuilt listing page as an AJAX response, or redirects
    *   back to the listing page.
    */
-  public function ajaxOperation(ViewStorageInterface $view, $op, Request $request) {
+  public function ajaxOperation(ViewInterface $view, $op, Request $request) {
     // Perform the operation.
     $view->$op()->save();
 
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/AddItem.php b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/AddItem.php
index a1907ab..6e646a1 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/AddItem.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/AddItem.php
@@ -8,7 +8,7 @@
 namespace Drupal\views_ui\Form\Ajax;
 
 use Drupal\views\ViewExecutable;
-use Drupal\views\ViewStorageInterface;
+use Drupal\views\ViewInterface;
 use Drupal\views\Views;
 
 /**
@@ -33,7 +33,7 @@ public function getFormKey() {
   /**
    * Overrides \Drupal\views_ui\Form\Ajax\ViewsFormBase::getForm().
    */
-  public function getForm(ViewStorageInterface $view, $display_id, $js, $type = NULL) {
+  public function getForm(ViewInterface $view, $display_id, $js, $type = NULL) {
     $this->setType($type);
     return parent::getForm($view, $display_id, $js);
   }
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItem.php b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItem.php
index aeb5295..6b58117 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItem.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItem.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views_ui\Form\Ajax;
 
-use Drupal\views\ViewStorageInterface;
+use Drupal\views\ViewInterface;
 use Drupal\views\ViewExecutable;
 use Drupal\views\Views;
 
@@ -34,7 +34,7 @@ public function getFormKey() {
   /**
    * Overrides \Drupal\views_ui\Form\Ajax\ViewsFormBase::getForm().
    */
-  public function getForm(ViewStorageInterface $view, $display_id, $js, $type = NULL, $id = NULL) {
+  public function getForm(ViewInterface $view, $display_id, $js, $type = NULL, $id = NULL) {
     $this->setType($type);
     $this->setID($id);
     return parent::getForm($view, $display_id, $js);
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItemExtra.php b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItemExtra.php
index 14895f8..a744bee 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItemExtra.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItemExtra.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views_ui\Form\Ajax;
 
-use Drupal\views\ViewStorageInterface;
+use Drupal\views\ViewInterface;
 use Drupal\views\ViewExecutable;
 
 /**
@@ -33,7 +33,7 @@ public function getFormKey() {
   /**
    * Overrides \Drupal\views_ui\Form\Ajax\ViewsFormBase::getForm().
    */
-  public function getForm(ViewStorageInterface $view, $display_id, $js, $type = NULL, $id = NULL) {
+  public function getForm(ViewInterface $view, $display_id, $js, $type = NULL, $id = NULL) {
     $this->setType($type);
     $this->setID($id);
     return parent::getForm($view, $display_id, $js);
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItemGroup.php b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItemGroup.php
index 4df211b..cbf8178 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItemGroup.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItemGroup.php
@@ -8,7 +8,7 @@
 namespace Drupal\views_ui\Form\Ajax;
 
 use Drupal\views\Views;
-use Drupal\views\ViewStorageInterface;
+use Drupal\views\ViewInterface;
 use Drupal\views\ViewExecutable;
 
 /**
@@ -34,7 +34,7 @@ public function getFormKey() {
   /**
    * Overrides \Drupal\views_ui\Form\Ajax\ViewsFormBase::getForm().
    */
-  public function getForm(ViewStorageInterface $view, $display_id, $js, $type = NULL, $id = NULL) {
+  public function getForm(ViewInterface $view, $display_id, $js, $type = NULL, $id = NULL) {
     $this->setType($type);
     $this->setID($id);
     return parent::getForm($view, $display_id, $js);
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/Display.php b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/Display.php
index d8c1e9a..d38b3ff 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/Display.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/Display.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views_ui\Form\Ajax;
 
-use Drupal\views\ViewStorageInterface;
+use Drupal\views\ViewInterface;
 
 /**
  * Provides a form for editing the Views display.
@@ -34,7 +34,7 @@ public function getFormKey() {
    * @todo Remove this and switch all usage of $form_state['section'] to
    *   $form_state['type'].
    */
-  public function getFormState(ViewStorageInterface $view, $display_id, $js) {
+  public function getFormState(ViewInterface $view, $display_id, $js) {
     return array(
       'section' => $this->type,
     ) + parent::getFormState($view, $display_id, $js);
@@ -43,7 +43,7 @@ public function getFormState(ViewStorageInterface $view, $display_id, $js) {
   /**
    * Overrides \Drupal\views_ui\Form\Ajax\ViewsFormBase::getForm().
    */
-  public function getForm(ViewStorageInterface $view, $display_id, $js, $type = NULL) {
+  public function getForm(ViewInterface $view, $display_id, $js, $type = NULL) {
     $this->setType($type);
     return parent::getForm($view, $display_id, $js);
   }
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/Rearrange.php b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/Rearrange.php
index 170182b..b093b8a 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/Rearrange.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/Rearrange.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views_ui\Form\Ajax;
 
-use Drupal\views\ViewStorageInterface;
+use Drupal\views\ViewInterface;
 use Drupal\views\ViewExecutable;
 
 /**
@@ -32,7 +32,7 @@ public function getFormKey() {
   /**
    * Overrides \Drupal\views_ui\Form\Ajax\ViewsFormBase::getForm().
    */
-  public function getForm(ViewStorageInterface $view, $display_id, $js, $type = NULL) {
+  public function getForm(ViewInterface $view, $display_id, $js, $type = NULL) {
     $this->setType($type);
     return parent::getForm($view, $display_id, $js);
   }
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormBase.php b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormBase.php
index 3b75a36..1f7e528 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormBase.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormBase.php
@@ -8,7 +8,7 @@
 namespace Drupal\views_ui\Form\Ajax;
 
 use Drupal\views_ui\ViewUI;
-use Drupal\views\ViewStorageInterface;
+use Drupal\views\ViewInterface;
 use Drupal\views\Ajax;
 use Drupal\Core\Ajax\AjaxResponse;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -59,7 +59,7 @@ protected function setType($type) {
   /**
    * Implements \Drupal\views_ui\Form\Ajax\ViewsFormInterface::getFormState().
    */
-  public function getFormState(ViewStorageInterface $view, $display_id, $js) {
+  public function getFormState(ViewInterface $view, $display_id, $js) {
     // $js may already have been converted to a Boolean.
     $ajax = is_string($js) ? $js === 'ajax' : $js;
     return array(
@@ -81,7 +81,7 @@ public function getFormState(ViewStorageInterface $view, $display_id, $js) {
   /**
    * Implements \Drupal\views_ui\Form\Ajax\ViewsFormInterface::getForm().
    */
-  public function getForm(ViewStorageInterface $view, $display_id, $js) {
+  public function getForm(ViewInterface $view, $display_id, $js) {
     $form_state = $this->getFormState($view, $display_id, $js);
     $view = $form_state['view'];
     $key = $form_state['form_key'];
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormInterface.php b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormInterface.php
index ad134af..b6746a2 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormInterface.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormInterface.php
@@ -8,7 +8,7 @@
 namespace Drupal\views_ui\Form\Ajax;
 
 use Drupal\Core\Form\FormInterface;
-use Drupal\views\ViewStorageInterface;
+use Drupal\views\ViewInterface;
 
 interface ViewsFormInterface extends FormInterface {
 
@@ -24,7 +24,7 @@ public function getFormKey();
   /**
    * Gets the form state for this form.
    *
-   * @param \Drupal\views\ViewStorageInterface $view
+   * @param \Drupal\views\ViewInterface $view
    *   The view being edited.
    * @param string|null $display_id
    *   The display ID being edited, or NULL to load the first available display.
@@ -35,12 +35,12 @@ public function getFormKey();
    * @return array
    *   An associative array containing the current state of the form.
    */
-  public function getFormState(ViewStorageInterface $view, $display_id, $js);
+  public function getFormState(ViewInterface $view, $display_id, $js);
 
   /**
    * Creates a new instance of this form.
    *
-   * @param \Drupal\views\ViewStorageInterface $view
+   * @param \Drupal\views\ViewInterface $view
    *   The view being edited.
    * @param string|null $display_id
    *   The display ID being edited, or NULL to load the first available display.
@@ -55,6 +55,6 @@ public function getFormState(ViewStorageInterface $view, $display_id, $js);
    * @todo When http://drupal.org/node/1843224 is in, this will return
    *   \Drupal\Core\Ajax\AjaxResponse instead of the array of AJAX commands.
    */
-  public function getForm(ViewStorageInterface $view, $display_id, $js);
+  public function getForm(ViewInterface $view, $display_id, $js);
 
 }
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ParamConverter/ViewUIConverter.php b/core/modules/views_ui/lib/Drupal/views_ui/ParamConverter/ViewUIConverter.php
index f828de1..55cbdf6 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/ParamConverter/ViewUIConverter.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/ParamConverter/ViewUIConverter.php
@@ -10,7 +10,7 @@
 use Symfony\Component\Routing\Route;
 use Drupal\Core\ParamConverter\ParamConverterInterface;
 use Drupal\user\TempStoreFactory;
-use Drupal\views\ViewStorageInterface;
+use Drupal\views\ViewInterface;
 use Drupal\views_ui\ViewUI;
 
 /**
@@ -79,7 +79,7 @@ public function process(array &$variables, Route $route, array &$converted) {
 
     foreach ($options['tempstore'] as $name => $collection) {
       // Only convert if the variable is a view.
-      if ($variables[$name] instanceof ViewStorageInterface) {
+      if ($variables[$name] instanceof ViewInterface) {
         // Get the temp store for this variable if it needs one.
         // Attempt to load the view from the temp store, synchronize its
         // status with the existing view, and store the lock metadata.
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php
index e3538e6..c7c0de6 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php
@@ -15,12 +15,12 @@
 use Drupal\Core\Session\AccountInterface;
 use Drupal\views\Plugin\views\query\Sql;
 use Drupal\views\Plugin\Core\Entity\View;
-use Drupal\views\ViewStorageInterface;
+use Drupal\views\ViewInterface;
 
 /**
  * Stores UI related temporary settings.
  */
-class ViewUI implements ViewStorageInterface {
+class ViewUI implements ViewInterface {
 
   /**
    * Indicates if a view is currently being edited.
@@ -141,10 +141,10 @@ class ViewUI implements ViewStorageInterface {
   /**
    * Constructs a View UI object.
    *
-   * @param \Drupal\views\ViewStorageInterface $storage
+   * @param \Drupal\views\ViewInterface $storage
    *   The View storage object to wrap.
    */
-  public function __construct(ViewStorageInterface $storage, ViewExecutable $executable = NULL) {
+  public function __construct(ViewInterface $storage, ViewExecutable $executable = NULL) {
     $this->entityType = 'view';
     $this->storage = $storage;
     if (!isset($executable)) {
diff --git a/core/modules/views_ui/views_ui.module b/core/modules/views_ui/views_ui.module
index 4d039c3..bdb3729 100644
--- a/core/modules/views_ui/views_ui.module
+++ b/core/modules/views_ui/views_ui.module
@@ -6,7 +6,7 @@
  */
 
 use Drupal\views\ViewExecutable;
-use Drupal\views\ViewStorageInterface;
+use Drupal\views\ViewInterface;
 use Drupal\views_ui\ViewUI;
 use Drupal\views\Analyzer;
 use Drupal\Core\Ajax\AjaxResponse;