diff -u b/core/modules/field/field.install b/core/modules/field/field.install
--- b/core/modules/field/field.install
+++ b/core/modules/field/field.install
@@ -313,7 +313,8 @@
     $record['data'] = unserialize($record['data']);
 
     $config = array(
-      'id' => $record['field_name'],
+      'id' => $record['entity_type'] . '.' . $record['field_name'],
+      'name' => $record['field_name'],
       'uuid' => $uuid->generate(),
       'type' => $record['type'],
       'module' => $record['module'],
diff -u b/core/modules/field/lib/Drupal/field/FieldInstanceStorageController.php b/core/modules/field/lib/Drupal/field/FieldInstanceStorageController.php
--- b/core/modules/field/lib/Drupal/field/FieldInstanceStorageController.php
+++ b/core/modules/field/lib/Drupal/field/FieldInstanceStorageController.php
@@ -154,7 +154,7 @@
         // Extract the actual value against which the condition is checked.
         switch ($key) {
           case 'field_name':
-            $checked_value = $field->id;
+            $checked_value = $field->name;
             break;
 
           case 'field.active':
diff -u b/core/modules/field/lib/Drupal/field/FieldStorageController.php b/core/modules/field/lib/Drupal/field/FieldStorageController.php
--- b/core/modules/field/lib/Drupal/field/FieldStorageController.php
+++ b/core/modules/field/lib/Drupal/field/FieldStorageController.php
@@ -98,9 +98,10 @@
     unset($conditions['include_deleted']);
 
     // Get fields stored in configuration.
-    if (isset($conditions['field_name'])) {
+    if (isset($conditions['entity_type']) && isset($conditions['field_name'])) {
       // Optimize for the most frequent case where we do have a specific ID.
-      $fields = $this->entityManager->getStorageController($this->entityType)->loadMultiple(array($conditions['field_name']));
+      $id = $conditions['entity_type'] . $conditions['field_name'];
+      $fields = $this->entityManager->getStorageController($this->entityType)->loadMultiple(array($id));
     }
     else {
       // No specific ID, we need to examine all existing fields.