core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php   | 4 ++--
 core/modules/taxonomy/src/Plugin/views/relationship/NodeTermData.php | 4 ++--
 core/modules/views/src/Plugin/views/row/EntityRow.php                | 2 +-
 core/modules/views/src/Plugin/views/row/RssPluginBase.php            | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php b/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php
index 2bb81be..9905272 100644
--- a/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php
+++ b/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php
@@ -380,8 +380,8 @@ public function getCacheContexts() {
   public function calculateDependencies() {
     $dependencies = parent::calculateDependencies();
 
-    $role_storage = \Drupal::entityManager()->getStorage('taxonomy_vocabulary');
-    $vocabulary = $role_storage->load($this->options['vid']);
+    $vocabulary = \Drupal::entityManager()->getStorage('taxonomy_vocabulary')
+      ->load($this->options['vid']);
     $dependencies['config'][] = $vocabulary->getConfigDependencyName();
 
     return $dependencies;
diff --git a/core/modules/taxonomy/src/Plugin/views/relationship/NodeTermData.php b/core/modules/taxonomy/src/Plugin/views/relationship/NodeTermData.php
index 0236007..dc05411 100644
--- a/core/modules/taxonomy/src/Plugin/views/relationship/NodeTermData.php
+++ b/core/modules/taxonomy/src/Plugin/views/relationship/NodeTermData.php
@@ -109,9 +109,9 @@ public function query() {
   public function calculateDependencies() {
     $dependencies = parent::calculateDependencies();
 
-    $role_storage = \Drupal::entityManager()->getStorage('taxonomy_vocabulary');
+    $vocabulary_storage = \Drupal::entityManager()->getStorage('taxonomy_vocabulary');
     foreach (array_keys($this->options['vid']) as $vocabulary_id) {
-      if ($vocabulary = $role_storage->load($vocabulary_id)) {
+      if ($vocabulary = $vocabulary_storage->load($vocabulary_id)) {
         $dependencies['config'][] = $vocabulary->getConfigDependencyName();
       }
     }
diff --git a/core/modules/views/src/Plugin/views/row/EntityRow.php b/core/modules/views/src/Plugin/views/row/EntityRow.php
index af12083..f36cb10 100644
--- a/core/modules/views/src/Plugin/views/row/EntityRow.php
+++ b/core/modules/views/src/Plugin/views/row/EntityRow.php
@@ -220,7 +220,7 @@ public function calculateDependencies() {
     $dependencies = parent::calculateDependencies();
 
     $view_mode = \Drupal::entityManager()
-      ->getStorage('entity_view_display')
+      ->getStorage('entity_view_mode')
       ->load($this->entityTypeId . '.' . $this->options['view_mode']);
     if ($view_mode) {
       $dependencies['config'][] = $view_mode->getConfigDependencyName();
diff --git a/core/modules/views/src/Plugin/views/row/RssPluginBase.php b/core/modules/views/src/Plugin/views/row/RssPluginBase.php
index 5ca3f6b..7ed7f7c 100644
--- a/core/modules/views/src/Plugin/views/row/RssPluginBase.php
+++ b/core/modules/views/src/Plugin/views/row/RssPluginBase.php
@@ -50,7 +50,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
    * Return the main options, which are shown in the summary title.
    */
   public function buildOptionsForm_summary_options() {
-    $view_modes = \Drupal::entityManager()->getViewModes('node');
+    $view_modes = \Drupal::entityManager()->getViewModes($this->entityTypeId);
     $options = array();
     foreach ($view_modes as $mode => $settings) {
       $options[$mode] = $settings['label'];