diff --git a/core/lib/Drupal/Core/Entity/Display/EntityDisplayInterface.php b/core/lib/Drupal/Core/Entity/Display/EntityDisplayInterface.php
index d346080..dbc4741 100644
--- a/core/lib/Drupal/Core/Entity/Display/EntityDisplayInterface.php
+++ b/core/lib/Drupal/Core/Entity/Display/EntityDisplayInterface.php
@@ -14,7 +14,7 @@
 /**
  * Provides a common interface for entity displays.
  */
-interface EntityDisplayInterface extends EntityWithPluginCollectionInterface, ThirdPartySettingsInterface, ConfigEntityInterface {
+interface EntityDisplayInterface extends ConfigEntityInterface, EntityWithPluginCollectionInterface, ThirdPartySettingsInterface {
 
   /**
    * Creates a duplicate of the entity display object on a different view mode.
diff --git a/core/lib/Drupal/Core/Field/FieldItemBase.php b/core/lib/Drupal/Core/Field/FieldItemBase.php
index ed4124a..db8601c 100644
--- a/core/lib/Drupal/Core/Field/FieldItemBase.php
+++ b/core/lib/Drupal/Core/Field/FieldItemBase.php
@@ -292,7 +292,7 @@ public static function fieldSettingsFromConfigData(array $settings) {
   /**
    * {@inheritdoc}
    */
-  public static function calculateDependencies(FieldDefinitionInterface $definition) {
+  public static function calculateDependencies(FieldDefinitionInterface $field_definition) {
     return array();
   }
 
diff --git a/core/lib/Drupal/Core/Field/FieldItemInterface.php b/core/lib/Drupal/Core/Field/FieldItemInterface.php
index 62aecbc..862b9e5 100644
--- a/core/lib/Drupal/Core/Field/FieldItemInterface.php
+++ b/core/lib/Drupal/Core/Field/FieldItemInterface.php
@@ -380,7 +380,7 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state);
    * type's default value is a content entity, this method should return an
    * array of dependencies listing the content entities.
    *
-   * @param \Drupal\Core\Field\FieldDefinitionInterface $definition
+   * @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
    *   The field definition.
    *
    * @return array
@@ -398,6 +398,6 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state);
    * @see \Drupal\Core\Config\Entity\ConfigDependencyManager
    * @see \Drupal\Core\Config\Entity\ConfigEntityInterface::getConfigDependencyName()
    */
-  public static function calculateDependencies(FieldDefinitionInterface $definition);
+  public static function calculateDependencies(FieldDefinitionInterface $field_definition);
 
 }
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php
index 1e71c38..3d258b2 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php
@@ -246,13 +246,13 @@ public function hasUnsavedEntity() {
   /**
    * {@inheritdoc}
    */
-  public static function calculateDependencies(FieldDefinitionInterface $definition) {
+  public static function calculateDependencies(FieldDefinitionInterface $field_definition) {
     $dependencies = [];
 
-    if (is_array($definition->default_value) && count($definition->default_value)) {
-      $target_entity_type = \Drupal::entityManager()->getDefinition($definition->getFieldStorageDefinition()->getSetting('target_type'));
+    if (is_array($field_definition->default_value) && count($field_definition->default_value)) {
+      $target_entity_type = \Drupal::entityManager()->getDefinition($field_definition->getFieldStorageDefinition()->getSetting('target_type'));
       $key = $target_entity_type instanceof ConfigEntityType ? 'config' : 'content';
-      foreach ($definition->default_value as $default_value) {
+      foreach ($field_definition->default_value as $default_value) {
         if (is_array($default_value) && isset($default_value['target_uuid'])) {
           $entity = \Drupal::entityManager()->loadEntityByUuid($target_entity_type->id(), $default_value['target_uuid']);
           $dependencies[$key][] = $entity->getConfigDependencyName();
diff --git a/core/lib/Drupal/Core/Plugin/PluginDependencyTrait.php b/core/lib/Drupal/Core/Plugin/PluginDependencyTrait.php
index 434cd69..f9e1ad3 100644
--- a/core/lib/Drupal/Core/Plugin/PluginDependencyTrait.php
+++ b/core/lib/Drupal/Core/Plugin/PluginDependencyTrait.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\Core\Plugin;
 
-use Drupal\Component\Plugin\ConfigurablePluginInterface;
 use Drupal\Component\Plugin\DependentPluginInterface;
 use Drupal\Component\Plugin\PluginInspectionInterface;
 use Drupal\Core\Entity\DependencyTrait;
@@ -25,7 +24,7 @@
    * Dependencies are added for the module that provides the plugin, as well
    * as any dependencies declared by the instance's calculateDependencies()
    * method, if it implements
-   * \Drupal\Component\Plugin\ConfigurablePluginInterface.
+   * \Drupal\Component\Plugin\DependentPluginInterface.
    *
    * @param \Drupal\Component\Plugin\PluginInspectionInterface $instance
    *   The plugin instance.
diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItemWithDependencies.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItemWithDependencies.php
index 49181a2..c1fa21a 100644
--- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItemWithDependencies.php
+++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItemWithDependencies.php
@@ -32,7 +32,7 @@ class TestItemWithDependencies extends TestItem {
   /**
    * {inheritdoc}
    */
-  public static function calculateDependencies(FieldDefinitionInterface $definition) {
+  public static function calculateDependencies(FieldDefinitionInterface $field_definition) {
     return ['content' => ['node:article:uuid']];
   }