diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigEntityReferenceItemBase.php b/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigEntityReferenceItemBase.php
index 4535159..7406134 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigEntityReferenceItemBase.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigEntityReferenceItemBase.php
@@ -93,7 +93,7 @@ public function getPropertyDefinitions() {
    * since we cannot extend it.
    */
   public static function schema(Field $field) {
-    $definition = \Drupal::typedData()->getDefinition('field_item:' . $field->type);
+    $definition = \Drupal::service('plugin.manager.entity.field.field_type')->getDefinition($field->type);
     $module = $definition['module'];
     module_load_install($module);
     $callback = "{$module}_field_schema";
diff --git a/core/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/Tables.php b/core/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/Tables.php
index 11aebc0..8a18f49 100644
--- a/core/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/Tables.php
+++ b/core/modules/field_sql_storage/lib/Drupal/field_sql_storage/Entity/Tables.php
@@ -129,7 +129,7 @@ function addField($field, $type, $langcode) {
           // relationship. Either the field name followed by a relationship
           // specifier, for example $node->field_image->entity. Or a field
           // column followed by a relationship specifier, for example
-          // $node->field_image->fid->entity. In both cases, prepare the
+          // $node->field_image->target_id->entity. In both cases, prepare the
           // property definitions for the relationship. In the first case,
           // also use the property definitions for column.
           if ($key < $count) {
diff --git a/core/modules/file/file.install b/core/modules/file/file.install
index 8df6b3a..a56fc03 100644
--- a/core/modules/file/file.install
+++ b/core/modules/file/file.install
@@ -248,7 +248,7 @@ function file_update_dependencies() {
 
   // Convert the 'fid' column of file fields to 'target_id' after fields and
   // instances have been moved to the config system.
-  $dependencies['file'][8002] = array(
+  $dependencies['file'][8003] = array(
     'field' => 8003,
   );
   return $dependencies;
diff --git a/core/modules/image/image.views.inc b/core/modules/image/image.views.inc
index 0d3ab9b..2e70c08 100644
--- a/core/modules/image/image.views.inc
+++ b/core/modules/image/image.views.inc
@@ -18,8 +18,8 @@
 function image_field_views_data($field) {
   $data = field_views_field_default_views_data($field);
   foreach ($data as $table_name => $table_data) {
-    // Add the relationship only on the fid field.
-    $data[$table_name][$field['field_name'] . '_fid']['relationship'] = array(
+    // Add the relationship only on the target_id field.
+    $data[$table_name][$field['field_name'] . '_target_id']['relationship'] = array(
       'id' => 'standard',
       'base' => 'file_managed',
       'base field' => 'target_id',
@@ -52,7 +52,7 @@ function image_field_views_data_views_data_alter(&$data, $field) {
       'id' => 'entity_reverse',
       'field_name' => $field['field_name'],
       'field table' => _field_sql_storage_tablename($field),
-      'field field' => $field['field_name'] . '_fid',
+      'field field' => $field['field_name'] . '_target_id',
       'base' => $entity_info['base_table'],
       'base field' => $entity_info['entity_keys']['id'],
       'label' => t('!field_name', array('!field_name' => $field['field_name'])),
diff --git a/core/profiles/standard/config/field.field.field_image.yml b/core/profiles/standard/config/field.field.field_image.yml
index e60c96e..0fc032a 100644
--- a/core/profiles/standard/config/field.field.field_image.yml
+++ b/core/profiles/standard/config/field.field.field_image.yml
@@ -9,7 +9,7 @@ settings:
     file:
       label: File
       columns:
-        - fid
+        - target_id
         - width
         - height
     alt: