diff --git a/core/lib/Drupal/Core/Entity/DatabaseStorageController.php b/core/lib/Drupal/Core/Entity/DatabaseStorageController.php
index 44ea24b..3cdf898 100644
--- a/core/lib/Drupal/Core/Entity/DatabaseStorageController.php
+++ b/core/lib/Drupal/Core/Entity/DatabaseStorageController.php
@@ -16,8 +16,8 @@
 use Drupal\Component\Uuid\Uuid;
 use Drupal\field\FieldInfo;
 use Drupal\field\FieldUpdateForbiddenException;
-use Drupal\field\FieldInterface;
-use Drupal\field\FieldInstanceInterface;
+use Drupal\field\FieldConfigInterface;
+use Drupal\field\FieldInstanceConfigInterface;
 use Drupal\field\Entity\FieldConfig;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
diff --git a/core/lib/Drupal/Core/Entity/FieldableDatabaseStorageController.php b/core/lib/Drupal/Core/Entity/FieldableDatabaseStorageController.php
index 6a1c8f8..65e166d 100644
--- a/core/lib/Drupal/Core/Entity/FieldableDatabaseStorageController.php
+++ b/core/lib/Drupal/Core/Entity/FieldableDatabaseStorageController.php
@@ -15,8 +15,8 @@
 use Drupal\Component\Uuid\Uuid;
 use Drupal\field\FieldInfo;
 use Drupal\field\FieldUpdateForbiddenException;
-use Drupal\field\FieldInterface;
-use Drupal\field\FieldInstanceInterface;
+use Drupal\field\FieldConfigInterface;
+use Drupal\field\FieldInstanceConfigInterface;
 use Drupal\field\Entity\FieldConfig;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -820,7 +820,7 @@ protected function doLoadFieldItems($entities, $age) {
             $delta_count[$row->entity_id][$row->langcode] = 0;
           }
 
-          if ($field->getCardinality() == FieldInterface::CARDINALITY_UNLIMITED || $delta_count[$row->entity_id][$row->langcode] < $field->getCardinality()) {
+          if ($field->getCardinality() == FieldConfigInterface::CARDINALITY_UNLIMITED || $delta_count[$row->entity_id][$row->langcode] < $field->getCardinality()) {
             $item = array();
             // For each column declared by the field, populate the item from the
             // prefixed database column.
@@ -906,7 +906,7 @@ protected function doSaveFieldItems(EntityInterface $entity, $update) {
           $query->values($record);
           $revision_query->values($record);
 
-          if ($field->getCardinality() != FieldInterface::CARDINALITY_UNLIMITED && ++$delta_count == $field->getCardinality()) {
+          if ($field->getCardinality() != FieldConfigInterface::CARDINALITY_UNLIMITED && ++$delta_count == $field->getCardinality()) {
             break;
           }
         }
@@ -960,7 +960,7 @@ protected function doDeleteFieldItemsRevision(EntityInterface $entity) {
   /**
    * {@inheritdoc}
    */
-  public function onFieldCreate(FieldInterface $field) {
+  public function onFieldCreate(FieldConfigInterface $field) {
     $schema = $this->_fieldSqlSchema($field);
     foreach ($schema as $name => $table) {
       $this->database->schema()->createTable($name, $table);
@@ -970,7 +970,7 @@ public function onFieldCreate(FieldInterface $field) {
   /**
    * {@inheritdoc}
    */
-  public function onFieldUpdate(FieldInterface $field) {
+  public function onFieldUpdate(FieldConfigInterface $field) {
     $original = $field->original;
 
     if (!$field->hasData()) {
@@ -1057,7 +1057,7 @@ public function onFieldUpdate(FieldInterface $field) {
   /**
    * {@inheritdoc}
    */
-  public function onFieldDelete(FieldInterface $field) {
+  public function onFieldDelete(FieldConfigInterface $field) {
     // Mark all data associated with the field for deletion.
     $table = static::_fieldTableName($field);
     $revision_table = static::_fieldRevisionTableName($field);
@@ -1078,7 +1078,7 @@ public function onFieldDelete(FieldInterface $field) {
   /**
    * {@inheritdoc}
    */
-  public function onInstanceDelete(FieldInstanceInterface $instance) {
+  public function onInstanceDelete(FieldInstanceConfigInterface $instance) {
     $field = $instance->getField();
     $table_name = static::_fieldTableName($field);
     $revision_name = static::_fieldRevisionTableName($field);
@@ -1118,7 +1118,7 @@ public function onBundleRename($bundle, $bundle_new) {
   /**
    * {@inheritdoc}
    */
-  protected function readFieldItemsToPurge(EntityInterface $entity, FieldInstanceInterface $instance) {
+  protected function readFieldItemsToPurge(EntityInterface $entity, FieldInstanceConfigInterface $instance) {
     $field = $instance->getField();
     $table_name = static::_fieldTableName($field);
     $query = $this->database->select($table_name, 't', array('fetch' => \PDO::FETCH_ASSOC))
@@ -1133,7 +1133,7 @@ protected function readFieldItemsToPurge(EntityInterface $entity, FieldInstanceI
   /**
    * {@inheritdoc}
    */
-  public function purgeFieldItems(EntityInterface $entity, FieldInstanceInterface $instance) {
+  public function purgeFieldItems(EntityInterface $entity, FieldInstanceConfigInterface $instance) {
     $field = $instance->getField();
     $table_name = static::_fieldTableName($field);
     $revision_name = static::_fieldRevisionTableName($field);
@@ -1148,7 +1148,7 @@ public function purgeFieldItems(EntityInterface $entity, FieldInstanceInterface
   /**
    * {@inheritdoc}
    */
-  public function onFieldPurge(FieldInterface $field) {
+  public function onFieldPurge(FieldConfigInterface $field) {
     $table_name = static::_fieldTableName($field);
     $revision_name = static::_fieldRevisionTableName($field);
     $this->database->schema()->dropTable($table_name);
@@ -1162,7 +1162,7 @@ public function onFieldPurge(FieldInterface $field) {
    * strongly discouraged. This function is not considered part of the public
    * API and modules relying on it might break even in minor releases.
    *
-   * @param \Drupal\field\FieldInterface $field
+   * @param \Drupal\field\FieldConfigInterface $field
    *   The field object
    * @param array $schema
    *   The field schema array. Mandatory for upgrades, omit otherwise.
@@ -1173,7 +1173,7 @@ public function onFieldPurge(FieldInterface $field) {
    *
    * @see hook_schema()
    */
-  public static function _fieldSqlSchema(FieldInterface $field, array $schema = NULL) {
+  public static function _fieldSqlSchema(FieldConfigInterface $field, array $schema = NULL) {
     if ($field->deleted) {
       $description_current = "Data storage for deleted field {$field->uuid()} ({$field->entity_type}, {$field->getName()}).";
       $description_revision = "Revision archive storage for deleted field {$field->uuid()} ({$field->entity_type}, {$field->getName()}).";
@@ -1331,14 +1331,14 @@ public static function _fieldSqlSchema(FieldInterface $field, array $schema = NU
    * support. Always call entity_load() before using the data found in the
    * table.
    *
-   * @param \Drupal\field\FieldInterface $field
+   * @param \Drupal\field\FieldConfigInterface $field
    *   The field object.
    *
    * @return string
    *   A string containing the generated name for the database table.
    *
    */
-  static public function _fieldTableName(FieldInterface $field) {
+  static public function _fieldTableName(FieldConfigInterface $field) {
     if ($field->deleted) {
       // When a field is a deleted, the table is renamed to
       // {field_deleted_data_FIELD_UUID}. To make sure we don't end up with
@@ -1361,13 +1361,13 @@ static public function _fieldTableName(FieldInterface $field) {
    * support. Always call entity_load() before using the data found in the
    * table.
    *
-   * @param \Drupal\field\FieldInterface $field
+   * @param \Drupal\field\FieldConfigInterface $field
    *   The field object.
    *
    * @return string
    *   A string containing the generated name for the database table.
    */
-  static public function _fieldRevisionTableName(FieldInterface $field) {
+  static public function _fieldRevisionTableName(FieldConfigInterface $field) {
     if ($field->deleted) {
       // When a field is a deleted, the table is renamed to
       // {field_deleted_revision_FIELD_UUID}. To make sure we don't end up with
@@ -1386,7 +1386,7 @@ static public function _fieldRevisionTableName(FieldInterface $field) {
    * The method accounts for a maximum table name length of 64 characters, and
    * takes care of disambiguation.
    *
-   * @param \Drupal\field\FieldInterface $field
+   * @param \Drupal\field\FieldConfigInterface $field
    *   The field object.
    * @param bool $revision
    *   TRUE for revision table, FALSE otherwise.
@@ -1394,7 +1394,7 @@ static public function _fieldRevisionTableName(FieldInterface $field) {
    * @return string
    *   The final table name.
    */
-  static protected function _generateFieldTableName(FieldInterface $field, $revision) {
+  static protected function _generateFieldTableName(FieldConfigInterface $field, $revision) {
     $separator = $revision ? '_revision__' : '__';
     $table_name = $field->entity_type . $separator .  $field->name;
     // Limit the string to 48 characters, keeping a 16 characters margin for db
@@ -1418,7 +1418,7 @@ static protected function _generateFieldTableName(FieldInterface $field, $revisi
    * strongly discouraged. This function is not considered part of the public
    * API and modules relying on it might break even in minor releases.
    *
-   * @param \Drupal\field\FieldInterface $field
+   * @param \Drupal\field\FieldConfigInterface $field
    *   The field structure
    * @param string $index
    *   The name of the index.
@@ -1427,7 +1427,7 @@ static protected function _generateFieldTableName(FieldInterface $field, $revisi
    *   A string containing a generated index name for a field data table that is
    *   unique among all other fields.
    */
-  static public function _fieldIndexName(FieldInterface $field, $index) {
+  static public function _fieldIndexName(FieldConfigInterface $field, $index) {
     return $field->getName() . '_' . $index;
   }
 
@@ -1441,7 +1441,7 @@ static public function _fieldIndexName(FieldInterface $field, $index) {
    * support. Always call entity_load() before using the data found in the
    * table.
    *
-   * @param \Drupal\field\FieldInterface $field
+   * @param \Drupal\field\FieldConfigInterface $field
    *   The field object.
    * @param string $column
    *   The name of the column.
@@ -1450,7 +1450,7 @@ static public function _fieldIndexName(FieldInterface $field, $index) {
    *   A string containing a generated column name for a field data table that is
    *   unique among all other fields.
    */
-  static public function _fieldColumnName(FieldInterface $field, $column) {
+  static public function _fieldColumnName(FieldConfigInterface $field, $column) {
     return in_array($column, FieldConfig::getReservedColumns()) ? $column : $field->getName() . '_' . $column;
   }
 
diff --git a/core/lib/Drupal/Core/Entity/FieldableEntityStorageControllerBase.php b/core/lib/Drupal/Core/Entity/FieldableEntityStorageControllerBase.php
index 17fd274..ec468b7 100644
--- a/core/lib/Drupal/Core/Entity/FieldableEntityStorageControllerBase.php
+++ b/core/lib/Drupal/Core/Entity/FieldableEntityStorageControllerBase.php
@@ -9,8 +9,8 @@
 
 use Drupal\Component\Utility\String;
 use Drupal\Core\Field\PrepareCacheInterface;
-use Drupal\field\FieldInterface;
-use Drupal\field\FieldInstanceInterface;
+use Drupal\field\FieldConfigInterface;
+use Drupal\field\FieldInstanceConfigInterface;
 use Drupal\Core\Field\ConfigFieldItemListInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -295,32 +295,32 @@ protected function deleteFieldItemsRevision(EntityInterface $entity) {
   /**
    * {@inheritdoc}
    */
-  public function onFieldCreate(FieldInterface $field) { }
+  public function onFieldCreate(FieldConfigInterface $field) { }
 
   /**
    * {@inheritdoc}
    */
-  public function onFieldUpdate(FieldInterface $field) { }
+  public function onFieldUpdate(FieldConfigInterface $field) { }
 
   /**
    * {@inheritdoc}
    */
-  public function onFieldDelete(FieldInterface $field) { }
+  public function onFieldDelete(FieldConfigInterface $field) { }
 
   /**
    * {@inheritdoc}
    */
-  public function onInstanceCreate(FieldInstanceInterface $instance) { }
+  public function onInstanceCreate(FieldInstanceConfigInterface $instance) { }
 
   /**
    * {@inheritdoc}
    */
-  public function onInstanceUpdate(FieldInstanceInterface $instance) { }
+  public function onInstanceUpdate(FieldInstanceConfigInterface $instance) { }
 
   /**
    * {@inheritdoc}
    */
-  public function onInstanceDelete(FieldInstanceInterface $instance) { }
+  public function onInstanceDelete(FieldInstanceConfigInterface $instance) { }
 
   /**
    * {@inheritdoc}
@@ -340,7 +340,7 @@ public function onBundleDelete($bundle) { }
   /**
    * {@inheritdoc}
    */
-  public function onFieldItemsPurge(EntityInterface $entity, FieldInstanceInterface $instance) {
+  public function onFieldItemsPurge(EntityInterface $entity, FieldInstanceConfigInterface $instance) {
     if ($values = $this->readFieldItemsToPurge($entity, $instance)) {
       $items = \Drupal::typedDataManager()->create($instance, $values, $instance->getName(), $entity);
       $items->delete();
@@ -356,29 +356,29 @@ public function onFieldItemsPurge(EntityInterface $entity, FieldInstanceInterfac
    *
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *   The entity.
-   * @param \Drupal\field\FieldInstanceInterface $instance
+   * @param \Drupal\field\FieldInstanceConfigInterface $instance
    *   The field instance.
    *
    * @return array
    *   The field values, in their canonical array format (numerically indexed
    *   array of items, each item being a property/value array).
    */
-  abstract protected function readFieldItemsToPurge(EntityInterface $entity, FieldInstanceInterface $instance);
+  abstract protected function readFieldItemsToPurge(EntityInterface $entity, FieldInstanceConfigInterface $instance);
 
   /**
    * Removes field data from storage during purge.
    *
    * @param EntityInterface $entity
    *   The entity whose values are being purged.
-   * @param FieldInstanceInterface $instance
+   * @param FieldInstanceConfigInterface $instance
    *   The field whose values are bing purged.
    */
-  abstract protected function purgeFieldItems(EntityInterface $entity, FieldInstanceInterface $instance);
+  abstract protected function purgeFieldItems(EntityInterface $entity, FieldInstanceConfigInterface $instance);
 
   /**
    * {@inheritdoc}
    */
-  public function onFieldPurge(FieldInterface $field) { }
+  public function onFieldPurge(FieldConfigInterface $field) { }
 
   /**
    * Checks translation statuses and invoke the related hooks if needed.
diff --git a/core/lib/Drupal/Core/Entity/FieldableEntityStorageControllerInterface.php b/core/lib/Drupal/Core/Entity/FieldableEntityStorageControllerInterface.php
index a52a5ad..c6c360f 100644
--- a/core/lib/Drupal/Core/Entity/FieldableEntityStorageControllerInterface.php
+++ b/core/lib/Drupal/Core/Entity/FieldableEntityStorageControllerInterface.php
@@ -7,26 +7,26 @@
 
 namespace Drupal\Core\Entity;
 
-use Drupal\field\FieldInterface;
-use Drupal\field\FieldInstanceInterface;
+use Drupal\field\FieldConfigInterface;
+use Drupal\field\FieldInstanceConfigInterface;
 
 interface FieldableEntityStorageControllerInterface extends EntityStorageControllerInterface {
 
   /**
    * Allows reaction to the creation of a configurable field.
    *
-   * @param \Drupal\field\FieldInterface $field
+   * @param \Drupal\field\FieldConfigInterface $field
    *   The field being created.
    */
-  public function onFieldCreate(FieldInterface $field);
+  public function onFieldCreate(FieldConfigInterface $field);
 
   /**
    * Allows reaction to the update of a configurable field.
    *
-   * @param \Drupal\field\FieldInterface $field
+   * @param \Drupal\field\FieldConfigInterface $field
    *   The field being updated.
    */
-  public function onFieldUpdate(FieldInterface $field);
+  public function onFieldUpdate(FieldConfigInterface $field);
 
   /**
    * Allows reaction to the deletion of a configurable field.
@@ -34,28 +34,28 @@ public function onFieldUpdate(FieldInterface $field);
    * Stored values should not be wiped at once, but marked as 'deleted' so that
    * they can go through a proper purge process later on.
    *
-   * @param \Drupal\field\FieldInterface $field
+   * @param \Drupal\field\FieldConfigInterface $field
    *   The field being deleted.
    *
    * @see fieldPurgeData()
    */
-  public function onFieldDelete(FieldInterface $field);
+  public function onFieldDelete(FieldConfigInterface $field);
 
   /**
    * Allows reaction to the creation of a configurable field instance.
    *
-   * @param \Drupal\field\FieldInstanceInterface $instance
+   * @param \Drupal\field\FieldInstanceConfigInterface $instance
    *   The instance being created.
    */
-  public function onInstanceCreate(FieldInstanceInterface $instance);
+  public function onInstanceCreate(FieldInstanceConfigInterface $instance);
 
   /**
    * Allows reaction to the update of a configurable field instance.
    *
-   * @param \Drupal\field\FieldInstanceInterface $instance
+   * @param \Drupal\field\FieldInstanceConfigInterface $instance
    *   The instance being updated.
    */
-  public function onInstanceUpdate(FieldInstanceInterface $instance);
+  public function onInstanceUpdate(FieldInstanceConfigInterface $instance);
 
   /**
    * Allows reaction to the deletion of a configurable field instance.
@@ -63,12 +63,12 @@ public function onInstanceUpdate(FieldInstanceInterface $instance);
    * Stored values should not be wiped at once, but marked as 'deleted' so that
    * they can go through a proper purge process later on.
    *
-   * @param \Drupal\field\FieldInstanceInterface $instance
+   * @param \Drupal\field\FieldInstanceConfigInterface $instance
    *   The instance being deleted.
    *
    * @see fieldPurgeData()
    */
-  public function onInstanceDelete(FieldInstanceInterface $instance);
+  public function onInstanceDelete(FieldInstanceConfigInterface $instance);
 
   /**
    * Allows reaction to a bundle being created.
@@ -109,17 +109,17 @@ public function onBundleDelete($bundle);
    *
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *   The entity whose field data is being purged.
-   * @param \Drupal\field\FieldInstanceInterface $instance
+   * @param \Drupal\field\FieldInstanceConfigInterface $instance
    *   The deleted field instance whose data is being purged.
    */
-  public function onFieldItemsPurge(EntityInterface $entity, FieldInstanceInterface $instance);
+  public function onFieldItemsPurge(EntityInterface $entity, FieldInstanceConfigInterface $instance);
 
   /**
    * Performs final cleanup after all data on all instances has been purged.
    *
-   * @param \Drupal\field\FieldInterface $instance
+   * @param \Drupal\field\FieldConfigInterface $instance
    *   The field being purged.
    */
-  public function onFieldPurge(FieldInterface $field);
+  public function onFieldPurge(FieldConfigInterface $field);
 
 }
diff --git a/core/lib/Drupal/Core/Entity/FieldableNullStorageController.php b/core/lib/Drupal/Core/Entity/FieldableNullStorageController.php
index 6f02884..fd6c6d3 100644
--- a/core/lib/Drupal/Core/Entity/FieldableNullStorageController.php
+++ b/core/lib/Drupal/Core/Entity/FieldableNullStorageController.php
@@ -8,7 +8,7 @@
 namespace Drupal\Core\Entity;
 
 use Drupal\Core\Entity\Query\QueryException;
-use Drupal\field\FieldInstanceInterface;
+use Drupal\field\FieldInstanceConfigInterface;
 
 /**
  * Defines a null entity controller class.
@@ -97,13 +97,13 @@ protected function doDeleteFieldItemsRevision(EntityInterface $entity) {
   /**
    * {@inheritdoc}
    */
-  protected function readFieldItemsToPurge(EntityInterface $entity, FieldInstanceInterface $instance) {
+  protected function readFieldItemsToPurge(EntityInterface $entity, FieldInstanceConfigInterface $instance) {
   }
 
   /**
    * {@inheritdoc}
    */
-  protected function purgeFieldItems(EntityInterface $entity, FieldInstanceInterface $instance) {
+  protected function purgeFieldItems(EntityInterface $entity, FieldInstanceConfigInterface $instance) {
   }
 
 }
diff --git a/core/lib/Drupal/Core/Field/ConfigFieldItemList.php b/core/lib/Drupal/Core/Field/ConfigFieldItemList.php
index 3c76be2..a33ef10 100644
--- a/core/lib/Drupal/Core/Field/ConfigFieldItemList.php
+++ b/core/lib/Drupal/Core/Field/ConfigFieldItemList.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\Core\Field;
 
-use Drupal\field\FieldInstanceInterface;
+use Drupal\field\FieldInstanceConfigInterface;
 use Drupal\Core\TypedData\TypedDataInterface;
 use Drupal\field\Field;
 
@@ -19,7 +19,7 @@ class ConfigFieldItemList extends FieldItemList implements ConfigFieldItemListIn
   /**
    * The Field instance definition.
    *
-   * @var \Drupal\field\FieldInstanceInterface
+   * @var \Drupal\field\FieldInstanceConfigInterface
    */
   protected $instance;
 
@@ -29,7 +29,7 @@ class ConfigFieldItemList extends FieldItemList implements ConfigFieldItemListIn
   public function __construct($definition, $name = NULL, TypedDataInterface $parent = NULL) {
     parent::__construct($definition, $name, $parent);
     // Definition can be the field config or field instance.
-    if ($definition instanceof FieldInstanceInterface) {
+    if ($definition instanceof FieldInstanceConfigInterface) {
       $this->instance = $definition;
     }
   }
diff --git a/core/lib/Drupal/Core/Field/FieldDefinitionInterface.php b/core/lib/Drupal/Core/Field/FieldDefinitionInterface.php
index 8146d9e..8661f49 100644
--- a/core/lib/Drupal/Core/Field/FieldDefinitionInterface.php
+++ b/core/lib/Drupal/Core/Field/FieldDefinitionInterface.php
@@ -300,7 +300,7 @@ public function getSchema();
    *   The array of field columns, keyed by column name, in the same format
    *   returned by getSchema().
    *
-   * @see \Drupal\field\Entity\FieldInterface::getSchema()
+   * @see \Drupal\Core\Field\FieldDefinitionInterface::getSchema()
    */
   public function getColumns();
 
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 6d7d9a5..c04a93a 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -14,8 +14,8 @@
 use Drupal\Core\Entity\EntityChangedInterface;
 use Drupal\comment\CommentInterface;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
-use Drupal\field\FieldInstanceInterface;
-use Drupal\field\FieldInterface;
+use Drupal\field\FieldInstanceConfigInterface;
+use Drupal\field\FieldConfigInterface;
 use Drupal\file\FileInterface;
 use Drupal\user\EntityOwnerInterface;
 
@@ -238,7 +238,7 @@ function comment_count_unpublished() {
 /**
  * Implements hook_ENTITY_TYPE_insert() for 'field_instance_config'.
  */
-function comment_field_instance_config_insert(FieldInstanceInterface $instance) {
+function comment_field_instance_config_insert(FieldInstanceConfigInterface $instance) {
   if ($instance->getType() == 'comment' && !$instance->isSyncing()) {
     \Drupal::service('comment.manager')->addBodyField($instance->entity_type, $instance->getName());
     \Drupal::cache()->delete('comment_entity_info');
@@ -248,7 +248,7 @@ function comment_field_instance_config_insert(FieldInstanceInterface $instance)
 /**
  * Implements hook_ENTITY_TYPE_create() for 'field_instance_config'.
  */
-function comment_field_instance_config_create(FieldInstanceInterface $instance) {
+function comment_field_instance_config_create(FieldInstanceConfigInterface $instance) {
   if ($instance->getType() == 'comment' && !$instance->isSyncing()) {
     // Assign default values for the field instance.
     if (!isset($instance->default_value)) {
@@ -269,7 +269,7 @@ function comment_field_instance_config_create(FieldInstanceInterface $instance)
 /**
  * Implements hook_ENTITY_TYPE_update() for 'field_instance_config'.
  */
-function comment_field_instance_config_update(FieldInstanceInterface $instance) {
+function comment_field_instance_config_update(FieldInstanceConfigInterface $instance) {
   if ($instance->getType() == 'comment') {
     \Drupal::entityManager()->getViewBuilder($instance->entity_type)->resetCache();
     // Comment field settings also affects the rendering of *comment* entities,
@@ -281,7 +281,7 @@ function comment_field_instance_config_update(FieldInstanceInterface $instance)
 /**
  * Implements hook_ENTITY_TYPE_delete() for 'field_config'.
  */
-function comment_field_config_delete(FieldInterface $field) {
+function comment_field_config_delete(FieldConfigInterface $field) {
   if ($field->getType() == 'comment') {
     // Delete all fields and displays attached to the comment bundle.
     entity_invoke_bundle_hook('delete', 'comment', $field->getName());
@@ -292,7 +292,7 @@ function comment_field_config_delete(FieldInterface $field) {
 /**
  * Implements hook_ENTITY_TYPE_delete() for 'field_instance_config'.
  */
-function comment_field_instance_config_delete(FieldInstanceInterface $instance) {
+function comment_field_instance_config_delete(FieldInstanceConfigInterface $instance) {
   if ($instance->getType() == 'comment') {
     // Delete all comments that used by the entity bundle.
     $comments = db_query("SELECT cid FROM {comment} WHERE entity_type = :entity_type AND field_id = :field_id", array(
diff --git a/core/modules/config_translation/lib/Drupal/config_translation/ConfigFieldInstanceMapper.php b/core/modules/config_translation/lib/Drupal/config_translation/ConfigFieldInstanceMapper.php
index 8323461..5eb2cfe 100644
--- a/core/modules/config_translation/lib/Drupal/config_translation/ConfigFieldInstanceMapper.php
+++ b/core/modules/config_translation/lib/Drupal/config_translation/ConfigFieldInstanceMapper.php
@@ -21,7 +21,7 @@ class ConfigFieldInstanceMapper extends ConfigEntityMapper {
   /**
    * Loaded entity instance to help produce the translation interface.
    *
-   * @var \Drupal\field\FieldInstanceInterface
+   * @var \Drupal\field\FieldInstanceConfigInterface
    */
   protected $entity;
 
diff --git a/core/modules/edit/tests/Drupal/edit/Tests/Access/EditEntityFieldAccessCheckTest.php b/core/modules/edit/tests/Drupal/edit/Tests/Access/EditEntityFieldAccessCheckTest.php
index cef17cf..1e33123 100644
--- a/core/modules/edit/tests/Drupal/edit/Tests/Access/EditEntityFieldAccessCheckTest.php
+++ b/core/modules/edit/tests/Drupal/edit/Tests/Access/EditEntityFieldAccessCheckTest.php
@@ -12,7 +12,7 @@
 use Drupal\Core\Access\AccessCheckInterface;
 use Drupal\edit\Access\EditEntityFieldAccessCheck;
 use Drupal\Tests\UnitTestCase;
-use Drupal\field\FieldInterface;
+use Drupal\field\FieldConfigInterface;
 use Drupal\Core\Language\Language;
 use Drupal\Core\Entity\EntityInterface;
 
@@ -110,14 +110,14 @@ public function providerTestAccess() {
    *
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *   A mocked entity.
-   * @param \Drupal\field\FieldInterface $field
+   * @param \Drupal\field\FieldConfigInterface $field
    *   A mocked field.
    * @param bool|null $expected_result
    *   The expected result of the access call.
    *
    * @dataProvider providerTestAccess
    */
-  public function testAccess(EntityInterface $entity, FieldInterface $field = NULL, $expected_result) {
+  public function testAccess(EntityInterface $entity, FieldConfigInterface $field = NULL, $expected_result) {
     $route = new Route('/edit/form/test_entity/1/body/und/full', array(), array('_access_edit_entity_field' => 'TRUE'));
     $request = new Request();
 
diff --git a/core/modules/entity_reference/entity_reference.module b/core/modules/entity_reference/entity_reference.module
index 3c10fee..4f15acd 100644
--- a/core/modules/entity_reference/entity_reference.module
+++ b/core/modules/entity_reference/entity_reference.module
@@ -9,7 +9,7 @@
 use Drupal\Core\Database\Query\AlterableInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
-use Drupal\field\FieldInterface;
+use Drupal\field\FieldConfigInterface;
 
 /**
  * Implements hook_help().
@@ -68,7 +68,7 @@ function entity_reference_field_widget_info_alter(&$info) {
  *
  * Reset the instance handler settings, when the target type is changed.
  */
-function entity_reference_field_config_update(FieldInterface $field) {
+function entity_reference_field_config_update(FieldConfigInterface $field) {
   if ($field->type != 'entity_reference') {
     // Only act on entity reference fields.
     return;
diff --git a/core/modules/field/field.deprecated.inc b/core/modules/field/field.deprecated.inc
index e74d8bd..0b4a6ac 100644
--- a/core/modules/field/field.deprecated.inc
+++ b/core/modules/field/field.deprecated.inc
@@ -52,7 +52,7 @@ function field_info_field_map() {
  *   non-deleted field. For deleted fields, use field_info_field_by_id().
  *
  * @return
- *   The \Drupal\field\FieldInterface field definition, as returned by
+ *   The \Drupal\field\FieldConfigInterface field definition, as returned by
  *   entity_load_multiple_by_properties(), NULL if the field was not found.
  *
  * @see field_info_field_by_id()
@@ -71,7 +71,7 @@ function field_info_field($entity_type, $field_name) {
  *   The ID of the field to retrieve. $field_id can refer to a deleted field.
  *
  * @return
- *   The \Drupal\field\FieldInterface field definition, as returned by
+ *   The \Drupal\field\FieldConfigInterface field definition, as returned by
  *   entity_load_multiple_by_properties(), NULL if the field was not found.
  *
  * @see field_info_field()
@@ -93,8 +93,8 @@ function field_info_field_by_id($field_id) {
  * field_info_instances($entity_type, $bundle), it is recommended to use the
  * getField() method on each $instance instead.
  *
- * @return \Drupal\field\FieldInterface[]
- *   An array of FieldInterface configuration entities, keyed by UUID.
+ * @return \Drupal\field\FieldConfigInterface[]
+ *   An array of FieldConfigInterface configuration entities, keyed by UUID.
  *
  * @see field_info_field()
  * @see field_info_field_by_id()
diff --git a/core/modules/field/field.views.inc b/core/modules/field/field.views.inc
index b9edf0d..c8b3a69 100644
--- a/core/modules/field/field.views.inc
+++ b/core/modules/field/field.views.inc
@@ -8,7 +8,7 @@
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Entity\FieldableDatabaseStorageController;
 use Drupal\Core\Entity\EntityStorageControllerInterface;
-use Drupal\field\FieldInterface;
+use Drupal\field\FieldConfigInterface;
 
 /**
  * Implements hook_views_data().
@@ -59,13 +59,13 @@ function field_views_data_alter(&$data) {
 /**
  * Determines whether the entity type the field appears in is SQL based.
  *
- * @param \Drupal\field\FieldInterface $field
+ * @param \Drupal\field\FieldConfigInterface $field
  *   The field definition.
  *
  * @return bool
  *   True if the entity type uses DatabaseStorageController.
  */
-function _field_views_is_sql_entity_type(FieldInterface $field) {
+function _field_views_is_sql_entity_type(FieldConfigInterface $field) {
   $entity_manager = \Drupal::entityManager();
   if ($entity_manager->getDefinition($field->entity_type) && $entity_manager->getStorageController($field->entity_type) instanceof FieldableDatabaseStorageController) {
     return TRUE;
@@ -102,13 +102,13 @@ function field_views_field_label($entity_type, $field_name) {
 /**
  * Default views data implementation for a field.
  *
- * @param \Drupal\field\FieldInterface $field
+ * @param \Drupal\field\FieldConfigInterface $field
  *   The field definition.
  *
  * @return array
  *   The default views data for the field.
  */
-function field_views_field_default_views_data(FieldInterface $field) {
+function field_views_field_default_views_data(FieldConfigInterface $field) {
   $data = array();
 
   // Check the field type is available.
diff --git a/core/modules/field/lib/Drupal/field/Entity/FieldConfig.php b/core/modules/field/lib/Drupal/field/Entity/FieldConfig.php
index cef84e5..c62979a 100644
--- a/core/modules/field/lib/Drupal/field/Entity/FieldConfig.php
+++ b/core/modules/field/lib/Drupal/field/Entity/FieldConfig.php
@@ -13,7 +13,7 @@
 use Drupal\Core\Entity\EntityStorageControllerInterface;
 use Drupal\Core\TypedData\DataDefinition;
 use Drupal\field\FieldException;
-use Drupal\field\FieldInterface;
+use Drupal\field\FieldConfigInterface;
 
 /**
  * Defines the Field entity.
@@ -32,7 +32,7 @@
  *   }
  * )
  */
-class FieldConfig extends ConfigEntityBase implements FieldInterface {
+class FieldConfig extends ConfigEntityBase implements FieldConfigInterface {
 
   /**
    * The maximum length of the field name, in characters.
diff --git a/core/modules/field/lib/Drupal/field/Entity/FieldInstanceConfig.php b/core/modules/field/lib/Drupal/field/Entity/FieldInstanceConfig.php
index acc01fa..c15ba23 100644
--- a/core/modules/field/lib/Drupal/field/Entity/FieldInstanceConfig.php
+++ b/core/modules/field/lib/Drupal/field/Entity/FieldInstanceConfig.php
@@ -12,7 +12,7 @@
 use Drupal\Core\Entity\EntityStorageControllerInterface;
 use Drupal\field\FieldException;
 use Drupal\Core\TypedData\DataDefinition;
-use Drupal\field\FieldInstanceInterface;
+use Drupal\field\FieldInstanceConfigInterface;
 
 /**
  * Defines the Field instance entity.
@@ -31,7 +31,7 @@
  *   }
  * )
  */
-class FieldInstanceConfig extends ConfigEntityBase implements FieldInstanceInterface {
+class FieldInstanceConfig extends ConfigEntityBase implements FieldInstanceConfigInterface {
 
   /**
    * The instance ID.
diff --git a/core/modules/field/lib/Drupal/field/FieldInterface.php b/core/modules/field/lib/Drupal/field/FieldConfigInterface.php
similarity index 79%
rename from core/modules/field/lib/Drupal/field/FieldInterface.php
rename to core/modules/field/lib/Drupal/field/FieldConfigInterface.php
index afa0eba..1b63629 100644
--- a/core/modules/field/lib/Drupal/field/FieldInterface.php
+++ b/core/modules/field/lib/Drupal/field/FieldConfigInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\field\FieldInterface.
+ * Contains \Drupal\field\FieldConfigInterface.
  */
 
 namespace Drupal\field;
@@ -13,7 +13,7 @@
 /**
  * Provides an interface defining a field entity.
  */
-interface FieldInterface extends ConfigEntityInterface, FieldDefinitionInterface {
+interface FieldConfigInterface extends ConfigEntityInterface, FieldDefinitionInterface {
 
   /**
    * Returns the list of bundles where the field has instances.
diff --git a/core/modules/field/lib/Drupal/field/FieldInfo.php b/core/modules/field/lib/Drupal/field/FieldInfo.php
index 86db989..9b33354 100644
--- a/core/modules/field/lib/Drupal/field/FieldInfo.php
+++ b/core/modules/field/lib/Drupal/field/FieldInfo.php
@@ -70,7 +70,7 @@ class FieldInfo {
   /**
    * List of $field structures keyed by ID. Includes deleted fields.
    *
-   * @var \Drupal\field\FieldInterface[]
+   * @var \Drupal\field\FieldConfigInterface[]
    */
   protected $fieldsById = array();
 
@@ -215,7 +215,7 @@ public function getFieldMap() {
   /**
    * Returns all fields, including deleted ones.
    *
-   * @return \Drupal\field\FieldInterface[]
+   * @return \Drupal\field\FieldConfigInterface[]
    *   An array of field entities, keyed by field ID.
    */
   public function getFields() {
@@ -306,7 +306,7 @@ public function getInstances($entity_type = NULL) {
    * @param string $field_name
    *   The field name.
    *
-   * @return \Drupal\field\FieldInterface|null
+   * @return \Drupal\field\FieldConfigInterface|null
    *   The field definition, or NULL if no field was found.
    */
   public function getField($entity_type, $field_name) {
@@ -342,7 +342,7 @@ public function getField($entity_type, $field_name) {
    * @param string $field_id
    *   The field ID.
    *
-   * @return \Drupal\field\FieldInterface|null
+   * @return \Drupal\field\FieldConfigInterface|null
    *   The field entity, or NULL if no field was found.
    */
   public function getFieldById($field_id) {
@@ -386,7 +386,7 @@ public function getFieldById($field_id) {
    * @param string $bundle
    *   The bundle name.
    *
-   * @return \Drupal\field\FieldInstanceInterface[]
+   * @return \Drupal\field\FieldInstanceConfigInterface[]
    *   An array of field instance entities, keyed by field name.
    */
   public function getBundleInstances($entity_type, $bundle) {
@@ -500,7 +500,7 @@ public function getBundleInstances($entity_type, $bundle) {
    * @param string $field_name
    *   The field name for the instance.
    *
-   * @return \Drupal\field\FieldInstanceInterface|null
+   * @return \Drupal\field\FieldInstanceConfigInterface|null
    *   The field instance entity, or NULL if it does not exist.
    */
   function getInstance($entity_type, $bundle, $field_name) {
@@ -551,13 +551,13 @@ public function getBundleExtraFields($entity_type, $bundle) {
   /**
    * Prepares a field for the current run-time context.
    *
-   * @param \Drupal\field\FieldInterface $field
+   * @param \Drupal\field\FieldConfigInterface $field
    *   The field entity to update.
    *
-   * @return \Drupal\field\FieldInterface
+   * @return \Drupal\field\FieldConfigInterface
    *   The field that was prepared.
    */
-  public function prepareField(FieldInterface $field) {
+  public function prepareField(FieldConfigInterface $field) {
     // Make sure all expected field settings are present.
     $field->settings += $this->fieldTypeManager->getDefaultSettings($field->getType());
 
@@ -567,13 +567,13 @@ public function prepareField(FieldInterface $field) {
   /**
    * Prepares a field instance for the current run-time context.
    *
-   * @param \Drupal\field\FieldInstanceInterface $instance
+   * @param \Drupal\field\FieldInstanceConfigInterface $instance
    *   The field instance entity to prepare.
    *
-   * @return \Drupal\field\FieldInstanceInterface
+   * @return \Drupal\field\FieldInstanceConfigInterface
    *   The field instance that was prepared.
    */
-  public function prepareInstance(FieldInstanceInterface $instance) {
+  public function prepareInstance(FieldInstanceConfigInterface $instance) {
     // Make sure all expected instance settings are present.
     $instance->settings += $this->fieldTypeManager->getDefaultInstanceSettings($instance->getType());
 
diff --git a/core/modules/field/lib/Drupal/field/FieldInstanceInterface.php b/core/modules/field/lib/Drupal/field/FieldInstanceConfigInterface.php
similarity index 80%
rename from core/modules/field/lib/Drupal/field/FieldInstanceInterface.php
rename to core/modules/field/lib/Drupal/field/FieldInstanceConfigInterface.php
index f5df93b..e796caa 100644
--- a/core/modules/field/lib/Drupal/field/FieldInstanceInterface.php
+++ b/core/modules/field/lib/Drupal/field/FieldInstanceConfigInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\field\FieldInstanceInterface.
+ * Contains \Drupal\field\FieldInstanceConfigInterface.
  */
 
 namespace Drupal\field;
@@ -13,12 +13,12 @@
 /**
  * Provides an interface defining a field instance entity.
  */
-interface FieldInstanceInterface extends ConfigEntityInterface, FieldDefinitionInterface {
+interface FieldInstanceConfigInterface extends ConfigEntityInterface, FieldDefinitionInterface {
 
   /**
    * Returns the field entity for this instance.
    *
-   * @return \Drupal\field\FieldInterface
+   * @return \Drupal\field\FieldConfigInterface
    *   The field entity for this instance.
    */
   public function getField();
diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php b/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php
index cc3dacc..7394c3f 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php
@@ -43,7 +43,7 @@ class Field extends FieldPluginBase {
   /**
    * The field information as returned by field_info_field().
    *
-   * @var \Drupal\field\FieldInterface
+   * @var \Drupal\field\FieldConfigInterface
    */
   public $field_info;
 
diff --git a/core/modules/field/lib/Drupal/field/Tests/BulkDeleteTest.php b/core/modules/field/lib/Drupal/field/Tests/BulkDeleteTest.php
index 145fab0..caac10c 100644
--- a/core/modules/field/lib/Drupal/field/Tests/BulkDeleteTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/BulkDeleteTest.php
@@ -9,7 +9,7 @@
 
 use Drupal\Core\Entity\FieldableDatabaseStorageController;
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\field\FieldInterface;
+use Drupal\field\FieldConfigInterface;
 
 
 /**
diff --git a/core/modules/field/tests/modules/field_test/field_test.module b/core/modules/field/tests/modules/field_test/field_test.module
index fb9d263..c386131 100644
--- a/core/modules/field/tests/modules/field_test/field_test.module
+++ b/core/modules/field/tests/modules/field_test/field_test.module
@@ -1,7 +1,7 @@
 <?php
 
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\field\FieldInterface;
+use Drupal\field\FieldConfigInterface;
 
 /**
  * @file
@@ -106,7 +106,7 @@ function field_test_memorize($key = NULL, $value = NULL) {
 /**
  * Memorize calls to field_test_field_config_create() for field creation.
  */
-function field_test_field_config_create(FieldInterface $field) {
+function field_test_field_config_create(FieldConfigInterface $field) {
   $args = func_get_args();
   field_test_memorize(__FUNCTION__, $args);
 }
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php
index 5d40f60..3739368 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php
@@ -11,7 +11,7 @@
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\TypedData\TypedDataManager;
 use Drupal\field\FieldInfo;
-use Drupal\field\FieldInstanceInterface;
+use Drupal\field\FieldInstanceConfigInterface;
 use Drupal\field_ui\FieldUI;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -23,7 +23,7 @@ class FieldEditForm extends FormBase {
   /**
    * The field instance being edited.
    *
-   * @var \Drupal\field\FieldInstanceInterface
+   * @var \Drupal\field\FieldInstanceConfigInterface
    */
   protected $instance;
 
@@ -85,7 +85,7 @@ public static function create(ContainerInterface $container) {
   /**
    * {@inheritdoc}
    */
-  public function buildForm(array $form, array &$form_state, FieldInstanceInterface $field_instance_config = NULL) {
+  public function buildForm(array $form, array &$form_state, FieldInstanceConfigInterface $field_instance_config = NULL) {
     $this->instance = $form_state['instance'] = $field_instance_config;
     $form['#title'] = $this->instance->label();
 
@@ -125,13 +125,13 @@ public function buildForm(array $form, array &$form_state, FieldInstanceInterfac
       '#title_display' => 'invisible',
       '#options' => array(
         'number' => $this->t('Limited'),
-        FieldInstanceInterface::CARDINALITY_UNLIMITED => $this->t('Unlimited'),
+        FieldInstanceConfigInterface::CARDINALITY_UNLIMITED => $this->t('Unlimited'),
       ),
-      '#default_value' => ($cardinality == FieldInstanceInterface::CARDINALITY_UNLIMITED) ? FieldInstanceInterface::CARDINALITY_UNLIMITED : 'number',
+      '#default_value' => ($cardinality == FieldInstanceConfigInterface::CARDINALITY_UNLIMITED) ? FieldInstanceConfigInterface::CARDINALITY_UNLIMITED : 'number',
     );
     $form['field']['cardinality_container']['cardinality_number'] = array(
       '#type' => 'number',
-      '#default_value' => $cardinality != FieldInstanceInterface::CARDINALITY_UNLIMITED ? $cardinality : 1,
+      '#default_value' => $cardinality != FieldInstanceConfigInterface::CARDINALITY_UNLIMITED ? $cardinality : 1,
       '#min' => 1,
       '#title' => $this->t('Limit'),
       '#title_display' => 'invisible',
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php
index 79aabe0..8cfd335 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php
@@ -10,7 +10,7 @@
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Form\FormBase;
 use Drupal\Component\Utility\String;
-use Drupal\field\FieldInstanceInterface;
+use Drupal\field\FieldInstanceConfigInterface;
 use Drupal\field_ui\FieldUI;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -22,7 +22,7 @@ class FieldInstanceEditForm extends FormBase {
   /**
    * The field instance being edited.
    *
-   * @var \Drupal\field\FieldInstanceInterface
+   * @var \Drupal\field\FieldInstanceConfigInterface
    */
   protected $instance;
 
@@ -62,7 +62,7 @@ public function getFormId() {
   /**
    * {@inheritdoc}
    */
-  public function buildForm(array $form, array &$form_state, FieldInstanceInterface $field_instance_config = NULL) {
+  public function buildForm(array $form, array &$form_state, FieldInstanceConfigInterface $field_instance_config = NULL) {
     $this->instance = $form_state['instance'] = $field_instance_config;
 
     $bundle = $this->instance->bundle;
@@ -231,13 +231,13 @@ public function delete(array &$form, array &$form_state) {
   /**
    * The _title_callback for the field instance settings form.
    *
-   * @param \Drupal\field\FieldInstanceInterface $field_instance_config
+   * @param \Drupal\field\FieldInstanceConfigInterface $field_instance_config
    *   The field instance.
    *
    * @return string
    *   The label of the field instance.
    */
-  public function getTitle(FieldInstanceInterface $field_instance_config) {
+  public function getTitle(FieldInstanceConfigInterface $field_instance_config) {
     return String::checkPlain($field_instance_config->label());
   }
 
diff --git a/core/modules/file/file.field.inc b/core/modules/file/file.field.inc
index 8a64332..ee80560 100644
--- a/core/modules/file/file.field.inc
+++ b/core/modules/file/file.field.inc
@@ -6,7 +6,7 @@
  */
 
 use Drupal\Component\Utility\Html;
-use Drupal\field\FieldInterface;
+use Drupal\field\FieldConfigInterface;
 
 /**
  * Implements hook_field_info_alter().
@@ -223,14 +223,14 @@ function theme_file_upload_help($variables) {
 /**
  * Determine whether a field references files stored in {file_managed}.
  *
- * @param Drupal\field\FieldInterface $field
+ * @param Drupal\field\FieldConfigInterface $field
  *   A field definition.
  *
  * @return
  *   The field column if the field references {file_managed}.fid, typically
  *   fid, FALSE if it doesn't.
  */
-function file_field_find_file_reference_column(FieldInterface $field) {
+function file_field_find_file_reference_column(FieldConfigInterface $field) {
   $schema = $field->getSchema();
   foreach ($schema['foreign keys'] as $data) {
     if ($data['table'] == 'file_managed') {
diff --git a/core/modules/file/file.views.inc b/core/modules/file/file.views.inc
index 2da65b7..bd90aef 100644
--- a/core/modules/file/file.views.inc
+++ b/core/modules/file/file.views.inc
@@ -6,7 +6,7 @@
  */
 
 use Drupal\Core\Entity\FieldableDatabaseStorageController;
-use Drupal\field\FieldInterface;
+use Drupal\field\FieldConfigInterface;
 
 /**
  * Implements hook_views_data().
@@ -480,7 +480,7 @@ function file_views_data() {
  *
  * @see field_views_field_default_views_data()
  */
-function file_field_views_data(FieldInterface $field) {
+function file_field_views_data(FieldConfigInterface $field) {
   $data = field_views_field_default_views_data($field);
   foreach ($data as $table_name => $table_data) {
     // Add the relationship only on the fid field.
@@ -501,7 +501,7 @@ function file_field_views_data(FieldInterface $field) {
  *
  * Views integration to provide reverse relationships on file fields.
  */
-function file_field_views_data_views_data_alter(array &$data, FieldInterface $field) {
+function file_field_views_data_views_data_alter(array &$data, FieldConfigInterface $field) {
   $entity_type_id = $field->entity_type;
   $entity_type = \Drupal::entityManager()->getDefinition($entity_type_id);
   $field_name = $field->getName();
diff --git a/core/modules/file/tests/file_module_test/file_module_test.module b/core/modules/file/tests/file_module_test/file_module_test.module
index 8d7015a..30a7664 100644
--- a/core/modules/file/tests/file_module_test/file_module_test.module
+++ b/core/modules/file/tests/file_module_test/file_module_test.module
@@ -7,7 +7,7 @@
 
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\file\Entity\File;
-use Drupal\field\FieldInterface;
+use Drupal\field\FieldConfigInterface;
 
 /**
  * Form constructor for testing a 'managed_file' element.
@@ -74,7 +74,7 @@ function file_module_test_form_submit($form, &$form_state) {
 /**
  * Implements hook_file_download_access().
  */
-function file_module_test_file_download_access(FieldInterface $field, EntityInterface $entity, File $file) {
+function file_module_test_file_download_access(FieldConfigInterface $field, EntityInterface $entity, File $file) {
   $instance = field_info_instance($entity->getEntityTypeId(), $field->getName(), $entity->bundle());
   // Allow the file to be downloaded only if the given arguments are correct.
   // If any are wrong, $instance will be NULL.
diff --git a/core/modules/image/image.module b/core/modules/image/image.module
index 7c203e1..4d9c5f8 100644
--- a/core/modules/image/image.module
+++ b/core/modules/image/image.module
@@ -10,8 +10,8 @@
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldInstanceConfig;
 use Drupal\file\Entity\File;
-use Drupal\field\FieldInterface;
-use Drupal\field\FieldInstanceInterface;
+use Drupal\field\FieldConfigInterface;
+use Drupal\field\FieldInstanceConfigInterface;
 
 /**
  * Image style constant for user presets in the database.
@@ -457,7 +457,7 @@ function image_entity_presave(EntityInterface $entity) {
 /**
  * Implements hook_ENTITY_TYPE_update() for 'field_config'.
  */
-function image_field_config_update(FieldInterface $field) {
+function image_field_config_update(FieldConfigInterface $field) {
   if ($field->type != 'image') {
     // Only act on image fields.
     return;
@@ -497,7 +497,7 @@ function image_field_config_update(FieldInterface $field) {
 /**
  * Implements hook_ENTITY_TYPE_update() for 'field_instance_config'.
  */
-function image_field_instance_config_update(FieldInstanceInterface $field_instance) {
+function image_field_instance_config_update(FieldInstanceConfigInterface $field_instance) {
   $field = $field_instance->getField();
   if ($field->type != 'image') {
     // Only act on image fields.
@@ -535,7 +535,7 @@ function image_field_instance_config_update(FieldInstanceInterface $field_instan
 /**
  * Implements hook_ENTITY_TYPE_delete() for 'field_config'.
  */
-function image_field_config_delete(FieldInterface $field) {
+function image_field_config_delete(FieldConfigInterface $field) {
   if ($field->type != 'image') {
     // Only act on image fields.
     return;
@@ -551,7 +551,7 @@ function image_field_config_delete(FieldInterface $field) {
 /**
  * Implements hook_ENTITY_TYPE_delete() for 'field_instance_config'.
  */
-function image_field_instance_config_delete(FieldInstanceInterface $field_instance) {
+function image_field_instance_config_delete(FieldInstanceConfigInterface $field_instance) {
   $field = $field_instance->getField();
   if ($field->type != 'image') {
     // Only act on image fields.
diff --git a/core/modules/image/image.views.inc b/core/modules/image/image.views.inc
index 81eaf16..57a3943 100644
--- a/core/modules/image/image.views.inc
+++ b/core/modules/image/image.views.inc
@@ -6,7 +6,7 @@
  */
 
 use Drupal\Core\Entity\FieldableDatabaseStorageController;
-use Drupal\field\FieldInterface;
+use Drupal\field\FieldConfigInterface;
 
 /**
  * Implements hook_field_views_data().
@@ -16,7 +16,7 @@
  *
  * @see field_views_field_default_views_data()
  */
-function image_field_views_data(FieldInterface $field) {
+function image_field_views_data(FieldConfigInterface $field) {
   $data = field_views_field_default_views_data($field);
   foreach ($data as $table_name => $table_data) {
     // Add the relationship only on the target_id field.
@@ -36,7 +36,7 @@ function image_field_views_data(FieldInterface $field) {
  *
  * Views integration to provide reverse relationships on image fields.
  */
-function image_field_views_data_views_data_alter(array &$data, FieldInterface $field) {
+function image_field_views_data_views_data_alter(array &$data, FieldConfigInterface $field) {
   $entity_type_id = $field->entity_type;
   $field_name = $field->getName();
   $entity_type = \Drupal::entityManager()->getDefinition($entity_type_id);
diff --git a/core/modules/image/lib/Drupal/image/Plugin/Field/FieldFormatter/ImageFormatterBase.php b/core/modules/image/lib/Drupal/image/Plugin/Field/FieldFormatter/ImageFormatterBase.php
index 6b91e37..9378441 100644
--- a/core/modules/image/lib/Drupal/image/Plugin/Field/FieldFormatter/ImageFormatterBase.php
+++ b/core/modules/image/lib/Drupal/image/Plugin/Field/FieldFormatter/ImageFormatterBase.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\image\Plugin\Field\FieldFormatter;
 
-use Drupal\field\FieldInstanceInterface;
+use Drupal\field\FieldInstanceConfigInterface;
 use Drupal\file\Plugin\Field\FieldFormatter\FileFormatterBase;
 
 /**
@@ -28,7 +28,7 @@ public function prepareView(array $entities_items) {
         $default_image = $this->getFieldSetting('default_image');
         // If we are dealing with a configurable field, look in both
         // instance-level and field-level settings.
-        if (empty($default_image['fid']) && $this->fieldDefinition instanceof FieldInstanceInterface) {
+        if (empty($default_image['fid']) && $this->fieldDefinition instanceof FieldInstanceConfigInterface) {
           $default_image = $this->fieldDefinition->getField()->getSetting('default_image');
         }
 
diff --git a/core/modules/options/options.module b/core/modules/options/options.module
index c30a86e..51d568a 100644
--- a/core/modules/options/options.module
+++ b/core/modules/options/options.module
@@ -8,7 +8,7 @@
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
-use Drupal\field\FieldInterface;
+use Drupal\field\FieldConfigInterface;
 use Drupal\field\FieldUpdateForbiddenException;
 
 /**
@@ -45,14 +45,14 @@ function options_field_settings_form_value_boolean_allowed_values($element, $inp
 /**
  * Implements hook_ENTITY_TYPE_update() for 'field_config'.
  */
-function options_field_config_update(FieldInterface $field) {
+function options_field_config_update(FieldConfigInterface $field) {
   drupal_static_reset('options_allowed_values');
 }
 
 /**
  * Implements hook_ENTITY_TYPE_delete() for 'field_config'.
  */
-function options_field_config_delete(FieldInterface $field) {
+function options_field_config_delete(FieldConfigInterface $field) {
   drupal_static_reset('options_allowed_values');
 }
 
diff --git a/core/modules/system/tests/modules/entity_test/entity_test.module b/core/modules/system/tests/modules/entity_test/entity_test.module
index 7264cf8..c1d42bf 100644
--- a/core/modules/system/tests/modules/entity_test/entity_test.module
+++ b/core/modules/system/tests/modules/entity_test/entity_test.module
@@ -10,8 +10,8 @@
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\entity\Entity\EntityFormDisplay;
-use Drupal\field\FieldInterface;
-use Drupal\field\FieldInstanceInterface;
+use Drupal\field\FieldConfigInterface;
+use Drupal\field\FieldInstanceConfigInterface;
 
 /**
  * Filter that limits test entity list to revisable ones.
@@ -494,14 +494,14 @@ function entity_test_entity_test_mul_translation_delete(EntityInterface $transla
  *
  * @param \Drupal\Core\Entity\EntityInterface $entity
  *   The entity the field belongs to.
- * @param \Drupal\field\FieldInterface $field
+ * @param \Drupal\field\FieldConfigInterface $field
  *   The field for which default values should be provided.
- * @param \Drupal\field\FieldInstanceInterface $instance
+ * @param \Drupal\field\FieldInstanceConfigInterface $instance
  *   The field instance for which default values should be provided.
  * @param string $langcode
  *   The field language code to fill-in with the default value.
  */
-function entity_test_field_default_value(EntityInterface $entity, FieldInterface $field, FieldInstanceInterface $instance, $langcode) {
+function entity_test_field_default_value(EntityInterface $entity, FieldConfigInterface $field, FieldInstanceConfigInterface $instance, $langcode) {
   return array(array('value' => $field->getName() . '_' . $langcode));
 }
 
diff --git a/core/modules/taxonomy/taxonomy.views.inc b/core/modules/taxonomy/taxonomy.views.inc
index c43c364..e2eb59f 100644
--- a/core/modules/taxonomy/taxonomy.views.inc
+++ b/core/modules/taxonomy/taxonomy.views.inc
@@ -6,7 +6,7 @@
  */
 
 use Drupal\Core\Entity\FieldableDatabaseStorageController;
-use Drupal\field\FieldInterface;
+use Drupal\field\FieldConfigInterface;
 
 /**
  * Implements hook_views_data().
@@ -404,7 +404,7 @@ function taxonomy_views_data_alter(&$data) {
  *
  * @see field_views_field_default_views_data()
  */
-function taxonomy_field_views_data(FieldInterface $field) {
+function taxonomy_field_views_data(FieldConfigInterface $field) {
   $data = field_views_field_default_views_data($field);
   foreach ($data as $table_name => $table_data) {
     foreach ($table_data as $field_name => $field_data) {
@@ -434,7 +434,7 @@ function taxonomy_field_views_data(FieldInterface $field) {
  *
  * Views integration to provide reverse relationships on term references.
  */
-function taxonomy_field_views_data_views_data_alter(array &$data, FieldInterface $field) {
+function taxonomy_field_views_data_views_data_alter(array &$data, FieldConfigInterface $field) {
   $field_name = $field->getName();
   $entity_type_id = $field->entity_type;
   $entity_type = \Drupal::entityManager()->getDefinition($entity_type_id);
diff --git a/core/modules/views/views.module b/core/modules/views/views.module
index 6cb91a6..c8ccdec 100644
--- a/core/modules/views/views.module
+++ b/core/modules/views/views.module
@@ -18,7 +18,7 @@
 use Drupal\Component\Plugin\Exception\PluginException;
 use Drupal\views\Entity\View;
 use Drupal\views\Views;
-use Drupal\field\FieldInstanceInterface;
+use Drupal\field\FieldInstanceConfigInterface;
 
 /**
  * Implements hook_help().
@@ -536,7 +536,7 @@ function views_language_list($field = 'name', $flags = Language::STATE_ALL) {
 /**
  * Implements hook_ENTITY_TYPE_create() for 'field_instance_config'.
  */
-function views_field_instance_config_create(FieldInstanceInterface $field_instance) {
+function views_field_instance_config_create(FieldInstanceConfigInterface $field_instance) {
   \Drupal::cache('views_info')->deleteAll();
   \Drupal::cache('views_results')->deleteAll();
 }
@@ -544,7 +544,7 @@ function views_field_instance_config_create(FieldInstanceInterface $field_instan
 /**
  * Implements hook_ENTITY_TYPE_update() for 'field_instance_config'.
  */
-function views_field_instance_config_update(FieldInstanceInterface $field_instance) {
+function views_field_instance_config_update(FieldInstanceConfigInterface $field_instance) {
   \Drupal::cache('views_info')->deleteAll();
   \Drupal::cache('views_results')->deleteAll();
 }
@@ -552,7 +552,7 @@ function views_field_instance_config_update(FieldInstanceInterface $field_instan
 /**
  * Implements hook_ENTITY_TYPE_delete() for 'field_instance_config'.
  */
-function views_field_instance_config_delete(FieldInstanceInterface $field_instance) {
+function views_field_instance_config_delete(FieldInstanceConfigInterface $field_instance) {
   \Drupal::cache('views_info')->deleteAll();
   \Drupal::cache('views_results')->deleteAll();
 }
diff --git a/core/tests/Drupal/Tests/Core/Entity/FieldableDatabaseStorageControllerTest.php b/core/tests/Drupal/Tests/Core/Entity/FieldableDatabaseStorageControllerTest.php
index 9e8018b..bb65e87 100644
--- a/core/tests/Drupal/Tests/Core/Entity/FieldableDatabaseStorageControllerTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/FieldableDatabaseStorageControllerTest.php
@@ -82,7 +82,7 @@ public function testFieldSqlSchemaForEntityWithStringIdentifier() {
       ->will($this->returnValue($fields));
 
     // Define a field definition for a test_field field.
-    $field = $this->getMock('\Drupal\field\FieldInterface');
+    $field = $this->getMock('\Drupal\field\FieldConfigInterface');
     $field->deleted = FALSE;
     $field->entity_type = 'test_entity';
     $field->name = 'test_field';