diff --git a/core/modules/field_ui/src/FieldStorageConfigListBuilder.php b/core/modules/field_ui/src/FieldStorageConfigListBuilder.php
index 97403c5..6b30ff4 100644
--- a/core/modules/field_ui/src/FieldStorageConfigListBuilder.php
+++ b/core/modules/field_ui/src/FieldStorageConfigListBuilder.php
@@ -111,7 +111,7 @@ public function buildRow(EntityInterface $field_storage) {
 
     $usage = array();
     foreach ($field_storage->getBundles() as $bundle) {
-      $entity_type_id = $field_storage->getEntityTypeId();
+      $entity_type_id = $field_storage->getTargetEntityTypeId();
       if ($route_info = FieldUI::getOverviewRouteInfo($entity_type_id, $bundle)) {
         $usage[] = \Drupal::l($this->bundles[$entity_type_id][$bundle]['label'], $route_info);
       }
diff --git a/core/modules/file/file.views.inc b/core/modules/file/file.views.inc
index 308812c..356692a 100644
--- a/core/modules/file/file.views.inc
+++ b/core/modules/file/file.views.inc
@@ -37,7 +37,7 @@ function file_field_views_data(FieldStorageConfigInterface $field_storage) {
  * Views integration to provide reverse relationships on file fields.
  */
 function file_field_views_data_views_data_alter(array &$data, FieldStorageConfigInterface $field_storage) {
-  $entity_type_id = $field_storage->getEntityTypeId();
+  $entity_type_id = $field_storage->getTargetEntityTypeId();
   $entity_manager = \Drupal::entityManager();
   $entity_type = $entity_manager->getDefinition($entity_type_id);
   $field_name = $field_storage->getName();
diff --git a/core/modules/views/views.api.php b/core/modules/views/views.api.php
index 78ae8e0..b24f40e 100644
--- a/core/modules/views/views.api.php
+++ b/core/modules/views/views.api.php
@@ -478,7 +478,7 @@ function hook_field_views_data(\Drupal\field\FieldStorageConfigInterface $field_
  * @see hook_field_views_data_views_data_alter()
  */
 function hook_field_views_data_alter(array &$data, \Drupal\field\FieldStorageConfigInterface $field_storage) {
-  $entity_type_id = $field_storage->getEntityTypeId();
+  $entity_type_id = $field_storage->getTargetEntityTypeId();
   $field_name = $field_storage->getName();
   $entity_type = \Drupal::entityManager()->getDefinition($entity_type_id);
   $pseudo_field_name = 'reverse_' . $field_name . '_' . $entity_type_id;