diff --git a/core/config/schema/core.data_types.schema.yml b/core/config/schema/core.data_types.schema.yml
index 069ff09..0e589e1 100644
--- a/core/config/schema/core.data_types.schema.yml
+++ b/core/config/schema/core.data_types.schema.yml
@@ -211,9 +211,14 @@ route:
 config_dependencies_base:
   type: mapping
   mapping:
-    entity:
+    config:
       type: sequence
-      label: 'Entity dependencies'
+      label: 'Configuration entity dependencies'
+      sequence:
+        - type: string
+    content:
+      type: sequence
+      label: 'Content entity dependencies'
       sequence:
         - type: string
     module:
diff --git a/core/lib/Drupal/Component/Plugin/ConfigurablePluginInterface.php b/core/lib/Drupal/Component/Plugin/ConfigurablePluginInterface.php
index 2b095c1..e2ae59d 100644
--- a/core/lib/Drupal/Component/Plugin/ConfigurablePluginInterface.php
+++ b/core/lib/Drupal/Component/Plugin/ConfigurablePluginInterface.php
@@ -47,11 +47,12 @@ public function defaultConfiguration();
    * dependencies listing the specified roles.
    *
    * @return array
-   *   An array of dependencies grouped by type (module, theme, entity). For
-   *   example:
+   *   An array of dependencies grouped by type (config, content, module,
+   *   theme). For example:
    *   @code
    *   array(
-   *     'entity' => array('user.role.anonymous', 'user.role.authenticated'),
+   *     'config' => array('user.role.anonymous', 'user.role.authenticated'),
+   *     'content' => array('node:article:f0a189e6-55fb-47fb-8005-5bef81c44d6d'),
    *     'module' => array('node', 'user'),
    *     'theme' => array('seven'),
    *   );
diff --git a/core/lib/Drupal/Core/Config/ConfigManager.php b/core/lib/Drupal/Core/Config/ConfigManager.php
index 8b9707f..a97cf72 100644
--- a/core/lib/Drupal/Core/Config/ConfigManager.php
+++ b/core/lib/Drupal/Core/Config/ConfigManager.php
@@ -192,14 +192,14 @@ public function uninstall($type, $name) {
       // Work out if any of the entity's dependencies are going to be affected
       // by the uninstall.
       $affected_dependencies = array(
-        'entity' => array(),
+        'config' => array(),
         'module' => array(),
         'theme' => array(),
       );
-      if (isset($entity_dependencies['entity'])) {
+      if (isset($entity_dependencies['config'])) {
         foreach ($extension_dependent_entities as $extension_dependent_entity) {
-          if (in_array($extension_dependent_entity->getConfigDependencyName(), $entity_dependencies['entity'])) {
-            $affected_dependencies['entity'][] = $extension_dependent_entity;
+          if (in_array($extension_dependent_entity->getConfigDependencyName(), $entity_dependencies['config'])) {
+            $affected_dependencies['config'][] = $extension_dependent_entity;
           }
         }
       }
diff --git a/core/lib/Drupal/Core/Config/ConfigManagerInterface.php b/core/lib/Drupal/Core/Config/ConfigManagerInterface.php
index c0ea6cf..c5fdec1 100644
--- a/core/lib/Drupal/Core/Config/ConfigManagerInterface.php
+++ b/core/lib/Drupal/Core/Config/ConfigManagerInterface.php
@@ -86,7 +86,8 @@ public function uninstall($type, $name);
    * Finds config entities that are dependent on extensions or entities.
    *
    * @param string $type
-   *   The type of dependency being checked. Either 'module', 'theme', 'entity'.
+   *   The type of dependency being checked. Either 'module', 'theme', 'config'
+   *   or 'content'.
    * @param array $names
    *   The specific names to check. If $type equals 'module' or 'theme' then it
    *   should be a list of module names or theme names. In the case of entity it
@@ -101,7 +102,8 @@ public function findConfigEntityDependents($type, array $names);
    * Finds config entities that are dependent on extensions or entities.
    *
    * @param string $type
-   *   The type of dependency being checked. Either 'module', 'theme', 'entity'.
+   *   The type of dependency being checked. Either 'module', 'theme', 'config'
+   *   or 'content'.
    * @param array $names
    *   The specific names to check. If $type equals 'module' or 'theme' then it
    *   should be a list of module names or theme names. In the case of entity it
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php b/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php
index e7806bc..ef7f645 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php
@@ -22,9 +22,13 @@
  * The configuration dependency value is structured like this:
  * <code>
  * array(
- *   'entity => array(
+ *   'config => array(
  *     // An array of configuration entity object names. Recalculated on save.
  *   ),
+ *   'content => array(
+ *     // An array of content entity configuration dependency names. The default
+ *     // format is "ENTITY_TYPE_ID:BUNDLE:UUID". Recalculated on save.
+ *   ),
  *   'module' => array(
  *     // An array of module names. Recalculated on save.
  *   ),
@@ -35,7 +39,8 @@
  *     // An array of configuration dependencies that the config entity is
  *     // ensured to have regardless of the details of the configuration. These
  *     // dependencies are not recalculated on save.
- *     'entity' => array(),
+ *     'config' => array(),
+ *     'content' => array(),
  *     'module' => array(),
  *     'theme' => array(),
  *   ),
@@ -110,12 +115,12 @@
  * module dependency in the sub-module only.
  *
  * @see \Drupal\Core\Config\Entity\ConfigEntityInterface::calculateDependencies()
- * @see \Drupal\Core\Config\Entity\ConfigEntityInterface::getConfigDependencyName()
  * @see \Drupal\Core\Config\Entity\ConfigEntityInterface::onDependencyRemoval()
  * @see \Drupal\Core\Config\Entity\ConfigEntityBase::addDependency()
  * @see \Drupal\Core\Config\ConfigInstallerInterface::installDefaultConfig()
  * @see \Drupal\Core\Config\ConfigManagerInterface::uninstall()
  * @see \Drupal\Core\Config\Entity\ConfigEntityDependency
+ * @see \Drupal\Core\Entity\EntityInterface::getConfigDependencyName()
  * @see \Drupal\Core\Plugin\PluginDependencyTrait
  */
 class ConfigDependencyManager {
@@ -138,7 +143,8 @@ class ConfigDependencyManager {
    * Gets dependencies.
    *
    * @param string $type
-   *   The type of dependency being checked. Either 'module', 'theme', 'entity'.
+   *   The type of dependency being checked. Either 'module', 'theme', 'config'
+   *   or 'content'.
    * @param string $name
    *   The specific name to check. If $type equals 'module' or 'theme' then it
    *   should be a module name or theme name. In the case of entity it should be
@@ -151,17 +157,17 @@ public function getDependentEntities($type, $name) {
     $dependent_entities = array();
 
     $entities_to_check = array();
-    if ($type == 'entity') {
+    if ($type == 'config') {
       $entities_to_check[] = $name;
     }
     else {
-      if ($type == 'module' || $type ==  'theme') {
+      if ($type == 'module' || $type == 'theme' || $type == 'content') {
         $dependent_entities = array_filter($this->data, function (ConfigEntityDependency $entity) use ($type, $name) {
           return $entity->hasDependency($type, $name);
         });
       }
-      // If checking module or theme dependencies then discover which entities
-      // are dependent on the entities that have a direct dependency.
+      // If checking content, module, or theme dependencies, discover which
+      // entities are dependent on the entities that have a direct dependency.
       foreach ($dependent_entities as $entity) {
         $entities_to_check[] =  $entity->getConfigDependencyName();
       }
@@ -243,7 +249,7 @@ protected function getGraph() {
       foreach ($this->data as $entity) {
         $graph_key = $entity->getConfigDependencyName();
         $graph[$graph_key]['edges'] = array();
-        $dependencies = $entity->getDependencies('entity');
+        $dependencies = $entity->getDependencies('config');
         if (!empty($dependencies)) {
           foreach ($dependencies as $dependency) {
             $graph[$graph_key]['edges'][$dependency] = TRUE;
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityDependency.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityDependency.php
index 7da6ecb..680a3da 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityDependency.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityDependency.php
@@ -50,7 +50,8 @@ public function __construct($name, $values = array()) {
    * Gets the configuration entity's dependencies of the supplied type.
    *
    * @param string $type
-   *   The type of dependency to return. Either 'module', 'theme', 'entity'.
+   *   The type of dependency to return. Either 'module', 'theme', 'config' or
+   *   'content'.
    *
    * @return array
    *   The list of dependencies of the supplied type.
@@ -70,7 +71,8 @@ public function getDependencies($type) {
    * Determines if the entity is dependent on extensions or entities.
    *
    * @param string $type
-   *   The type of dependency being checked. Either 'module', 'theme', 'entity'.
+   *   The type of dependency being checked. Either 'module', 'theme', 'config'
+   *   or 'content'.
    * @param string $name
    *   The specific name to check. If $type equals 'module' or 'theme' then it
    *   should be a module name or theme name. In the case of entity it should be
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php
index b83df5d..15347e3 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php
@@ -152,16 +152,6 @@ public function set($property_name, $value);
   public function calculateDependencies();
 
   /**
-   * Gets the configuration dependency name.
-   *
-   * @return string
-   *   The configuration dependency name.
-   *
-   * @see \Drupal\Core\Config\Entity\ConfigDependencyManager
-   */
-  public function getConfigDependencyName();
-
-  /**
    * Informs the entity that entities it depends on will be deleted.
    *
    * This method allows configuration entities to remove dependencies instead
diff --git a/core/lib/Drupal/Core/Entity/Entity.php b/core/lib/Drupal/Core/Entity/Entity.php
index bd00ece..fa9626a 100644
--- a/core/lib/Drupal/Core/Entity/Entity.php
+++ b/core/lib/Drupal/Core/Entity/Entity.php
@@ -561,4 +561,11 @@ public function __sleep() {
     return $this->traitSleep();
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getConfigDependencyName() {
+    return $this->getEntityTypeId() . ':' . $this->bundle() . ':' . $this->uuid();
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Entity/EntityDisplayBase.php b/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
index 251bb00..e46dff0 100644
--- a/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
+++ b/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
@@ -162,7 +162,7 @@ public function calculateDependencies() {
       // If the target entity type uses entities to manage its bundles then
       // depend on the bundle entity.
       $bundle_entity = \Drupal::entityManager()->getStorage($bundle_entity_type_id)->load($this->bundle);
-      $this->addDependency('entity', $bundle_entity->getConfigDependencyName());
+      $this->addDependency('config', $bundle_entity->getConfigDependencyName());
     }
     else {
       // Depend on the provider of the entity type.
@@ -173,7 +173,7 @@ public function calculateDependencies() {
     foreach ($fields as $field_name => $component) {
       $field = FieldConfig::loadByName($this->targetEntityType, $this->bundle, $field_name);
       if ($field) {
-        $this->addDependency('entity', $field->getConfigDependencyName());
+        $this->addDependency('config', $field->getConfigDependencyName());
       }
       // Create a dependency on the module that provides the formatter or
       // widget.
@@ -190,7 +190,7 @@ public function calculateDependencies() {
     // Depend on configured modes.
     if ($this->mode != 'default') {
       $mode_entity = \Drupal::entityManager()->getStorage('entity_' . $this->displayContext . '_mode')->load($target_entity_type->id() . '.' . $this->mode);
-      $this->addDependency('entity', $mode_entity->getConfigDependencyName());
+      $this->addDependency('config', $mode_entity->getConfigDependencyName());
     }
     return $this->dependencies;
   }
@@ -387,7 +387,7 @@ private function fieldHasDisplayOptions(FieldDefinitionInterface $definition) {
    */
   public function onDependencyRemoval(array $dependencies) {
     $changed = FALSE;
-    foreach ($dependencies['entity'] as $entity) {
+    foreach ($dependencies['config'] as $entity) {
       if ($entity instanceof FieldConfigInterface) {
         // Remove components for fields that are being deleted.
         $this->removeComponent($entity->getName());
diff --git a/core/lib/Drupal/Core/Entity/EntityInterface.php b/core/lib/Drupal/Core/Entity/EntityInterface.php
index ae0e85e..98e258e 100644
--- a/core/lib/Drupal/Core/Entity/EntityInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityInterface.php
@@ -404,4 +404,14 @@ public function getTypedData();
    */
   public function getCacheTags();
 
+  /**
+   * Gets the configuration dependency name.
+   *
+   * @return string
+   *   The configuration dependency name.
+   *
+   * @see \Drupal\Core\Config\Entity\ConfigDependencyManager
+   */
+  public function getConfigDependencyName();
+
 }
diff --git a/core/lib/Drupal/Core/Field/FieldConfigBase.php b/core/lib/Drupal/Core/Field/FieldConfigBase.php
index 05fc94b..79eb14b 100644
--- a/core/lib/Drupal/Core/Field/FieldConfigBase.php
+++ b/core/lib/Drupal/Core/Field/FieldConfigBase.php
@@ -233,7 +233,7 @@ public function calculateDependencies() {
       // If the target entity type uses entities to manage its bundles then
       // depend on the bundle entity.
       $bundle_entity = $this->entityManager()->getStorage($bundle_entity_type_id)->load($this->bundle);
-      $this->addDependency('entity', $bundle_entity->getConfigDependencyName());
+      $this->addDependency('config', $bundle_entity->getConfigDependencyName());
     }
     return $this->dependencies;
   }
diff --git a/core/modules/aggregator/config/install/core.entity_view_display.aggregator_feed.aggregator_feed.summary.yml b/core/modules/aggregator/config/install/core.entity_view_display.aggregator_feed.aggregator_feed.summary.yml
index d775c94..4c840d5 100644
--- a/core/modules/aggregator/config/install/core.entity_view_display.aggregator_feed.aggregator_feed.summary.yml
+++ b/core/modules/aggregator/config/install/core.entity_view_display.aggregator_feed.aggregator_feed.summary.yml
@@ -16,7 +16,7 @@ hidden:
   feed_icon: true
 status: true
 dependencies:
-  entity:
+  config:
     - core.entity_view_mode.aggregator_feed.summary
   module:
     - aggregator
diff --git a/core/modules/aggregator/config/install/core.entity_view_display.aggregator_item.aggregator_item.summary.yml b/core/modules/aggregator/config/install/core.entity_view_display.aggregator_item.aggregator_item.summary.yml
index bc46892..6cb424d 100644
--- a/core/modules/aggregator/config/install/core.entity_view_display.aggregator_item.aggregator_item.summary.yml
+++ b/core/modules/aggregator/config/install/core.entity_view_display.aggregator_item.aggregator_item.summary.yml
@@ -13,7 +13,7 @@ hidden:
   description: true
 status: true
 dependencies:
-  entity:
+  config:
     - core.entity_view_mode.aggregator_item.summary
   module:
     - aggregator
diff --git a/core/modules/block_content/src/Plugin/Derivative/BlockContent.php b/core/modules/block_content/src/Plugin/Derivative/BlockContent.php
index f77a297..54ec325 100644
--- a/core/modules/block_content/src/Plugin/Derivative/BlockContent.php
+++ b/core/modules/block_content/src/Plugin/Derivative/BlockContent.php
@@ -18,9 +18,13 @@ class BlockContent extends DeriverBase {
    */
   public function getDerivativeDefinitions($base_plugin_definition) {
     $block_contents = entity_load_multiple('block_content');
+    /** @var $block_content \Drupal\block_content\Entity\BlockContent */
     foreach ($block_contents as $block_content) {
       $this->derivatives[$block_content->uuid()] = $base_plugin_definition;
       $this->derivatives[$block_content->uuid()]['admin_label'] = $block_content->label();
+      $this->derivatives[$block_content->uuid()]['config_dependencies']['content'] = array(
+        $block_content->getConfigDependencyName()
+      );
     }
     return parent::getDerivativeDefinitions($base_plugin_definition);
   }
diff --git a/core/modules/block_content/src/Tests/BlockContentCreationTest.php b/core/modules/block_content/src/Tests/BlockContentCreationTest.php
index 7956d1d..b8314d4 100644
--- a/core/modules/block_content/src/Tests/BlockContentCreationTest.php
+++ b/core/modules/block_content/src/Tests/BlockContentCreationTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\block_content\Tests;
 
+use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Database\Database;
 use Drupal\block_content\Entity\BlockContent;
 
@@ -210,4 +211,25 @@ public function testBlockDelete() {
     $this->assertNoText('This will also remove');
   }
 
+  /**
+   * Test that placed content blocks create a dependency in the block placement.
+   */
+  public function testConfigDependencies() {
+    $block = $this->createBlockContent();
+    // Place the block.
+    $block_placement_id = Unicode::strtolower($block->label());
+    $instance = array(
+      'id' => $block_placement_id,
+      'settings[label]' => $block->label(),
+      'region' => 'sidebar_first',
+    );
+    $block = entity_load('block_content', 1);
+    $url = 'admin/structure/block/add/block_content:' . $block->uuid() . '/' . \Drupal::config('system.theme')->get('default');
+    $this->drupalPostForm($url, $instance, t('Save block'));
+
+    $dependencies = \Drupal::service('config.manager')->findConfigEntityDependentsAsEntities('content', array($block->getConfigDependencyName()));
+    $block_placement = reset($dependencies);
+    $this->assertEqual($block_placement_id, $block_placement->id(), "The block placement config entity has a dependency on the block content entity.");
+  }
+
 }
diff --git a/core/modules/book/config/install/core.base_field_override.node.book.promote.yml b/core/modules/book/config/install/core.base_field_override.node.book.promote.yml
index 609d391..f747d77 100644
--- a/core/modules/book/config/install/core.base_field_override.node.book.promote.yml
+++ b/core/modules/book/config/install/core.base_field_override.node.book.promote.yml
@@ -2,7 +2,7 @@
 langcode: en
 status: true
 dependencies:
-  entity:
+  config:
     - node.type.book
 id: node.book.promote
 field_name: promote
diff --git a/core/modules/config/src/Tests/ConfigDependencyTest.php b/core/modules/config/src/Tests/ConfigDependencyTest.php
index 27f5a13..fa903b9 100644
--- a/core/modules/config/src/Tests/ConfigDependencyTest.php
+++ b/core/modules/config/src/Tests/ConfigDependencyTest.php
@@ -68,22 +68,22 @@ public function testDependencyMangement() {
     $this->assertTrue(array_search('node', $raw_config->get('dependencies.module')) !== FALSE, 'Node module is written to the dependencies array as this has to be explicit.');
 
     // Create additional entities to test dependencies on config entities.
-    $entity2 = $storage->create(array('id' => 'entity2', 'dependencies' => array('enforced' => array('entity' => array($entity1->getConfigDependencyName())))));
+    $entity2 = $storage->create(array('id' => 'entity2', 'dependencies' => array('enforced' => array('config' => array($entity1->getConfigDependencyName())))));
     $entity2->save();
-    $entity3 = $storage->create(array('id' => 'entity3', 'dependencies' => array('enforced' => array('entity' => array($entity2->getConfigDependencyName())))));
+    $entity3 = $storage->create(array('id' => 'entity3', 'dependencies' => array('enforced' => array('config' => array($entity2->getConfigDependencyName())))));
     $entity3->save();
-    $entity4 = $storage->create(array('id' => 'entity4', 'dependencies' => array('enforced' => array('entity' => array($entity3->getConfigDependencyName())))));
+    $entity4 = $storage->create(array('id' => 'entity4', 'dependencies' => array('enforced' => array('config' => array($entity3->getConfigDependencyName())))));
     $entity4->save();
 
     // Test getting $entity1's dependencies as configuration dependency objects.
-    $dependents = $config_manager->findConfigEntityDependents('entity', array($entity1->getConfigDependencyName()));
+    $dependents = $config_manager->findConfigEntityDependents('config', array($entity1->getConfigDependencyName()));
     $this->assertFalse(isset($dependents['config_test.dynamic.entity1']), 'config_test.dynamic.entity1 does not have a dependency on itself.');
     $this->assertTrue(isset($dependents['config_test.dynamic.entity2']), 'config_test.dynamic.entity2 has a dependency on config_test.dynamic.entity1.');
     $this->assertTrue(isset($dependents['config_test.dynamic.entity3']), 'config_test.dynamic.entity3 has a dependency on config_test.dynamic.entity1.');
     $this->assertTrue(isset($dependents['config_test.dynamic.entity4']), 'config_test.dynamic.entity4 has a dependency on config_test.dynamic.entity1.');
 
     // Test getting $entity2's dependencies as entities.
-    $dependents = $config_manager->findConfigEntityDependentsAsEntities('entity', array($entity2->getConfigDependencyName()));
+    $dependents = $config_manager->findConfigEntityDependentsAsEntities('config', array($entity2->getConfigDependencyName()));
     $dependent_ids = $this->getDependentIds($dependents);
     $this->assertFalse(in_array('config_test:entity1', $dependent_ids), 'config_test.dynamic.entity1 does not have a dependency on config_test.dynamic.entity1.');
     $this->assertFalse(in_array('config_test:entity2', $dependent_ids), 'config_test.dynamic.entity2 does not have a dependency on itself.');
@@ -102,20 +102,28 @@ public function testDependencyMangement() {
     // objects after making $entity3 also dependent on node module but $entity1
     // no longer depend on node module.
     $entity1->setEnforcedDependencies([])->save();
-    $entity3->setEnforcedDependencies(['module' => ['node'], 'entity' => [$entity2->getConfigDependencyName()]])->save();
+    $entity3->setEnforcedDependencies(['module' => ['node'], 'config' => [$entity2->getConfigDependencyName()]])->save();
     $dependents = $config_manager->findConfigEntityDependents('module', array('node'));
     $this->assertFalse(isset($dependents['config_test.dynamic.entity1']), 'config_test.dynamic.entity1 does not have a dependency on the Node module.');
     $this->assertFalse(isset($dependents['config_test.dynamic.entity2']), 'config_test.dynamic.entity2 does not have a dependency on the Node module.');
     $this->assertTrue(isset($dependents['config_test.dynamic.entity3']), 'config_test.dynamic.entity3 has a dependency on the Node module.');
     $this->assertTrue(isset($dependents['config_test.dynamic.entity4']), 'config_test.dynamic.entity4 has a dependency on the Node module.');
 
+    // Test dependency on a fake content entity.
+    $entity2->setEnforcedDependencies(['config' => [$entity1->getConfigDependencyName()], 'content' => ['node:page:uuid']])->save();;
+    $dependents = $config_manager->findConfigEntityDependents('content', array('node:page:uuid'));
+    $this->assertFalse(isset($dependents['config_test.dynamic.entity1']), 'config_test.dynamic.entity1 does not have a dependency on the content entity.');
+    $this->assertTrue(isset($dependents['config_test.dynamic.entity2']), 'config_test.dynamic.entity2 has a dependency on the content entity.');
+    $this->assertTrue(isset($dependents['config_test.dynamic.entity3']), 'config_test.dynamic.entity3 has a dependency on the content entity (via entity2).');
+    $this->assertTrue(isset($dependents['config_test.dynamic.entity4']), 'config_test.dynamic.entity4 has a dependency on the content entity (via entity3).');
+
     // Create a configuration entity of a different type with the same ID as one
     // of the entities already created.
     $alt_storage = $this->container->get('entity.manager')->getStorage('config_query_test');
-    $alt_storage->create(array('id' => 'entity1', 'dependencies' => array('enforced' => array('entity' => array($entity1->getConfigDependencyName())))))->save();
+    $alt_storage->create(array('id' => 'entity1', 'dependencies' => array('enforced' => array('config' => array($entity1->getConfigDependencyName())))))->save();
     $alt_storage->create(array('id' => 'entity2', 'dependencies' => array('enforced' => array('module' => array('views')))))->save();
 
-    $dependents = $config_manager->findConfigEntityDependentsAsEntities('entity', array($entity1->getConfigDependencyName()));
+    $dependents = $config_manager->findConfigEntityDependentsAsEntities('config', array($entity1->getConfigDependencyName()));
     $dependent_ids = $this->getDependentIds($dependents);
     $this->assertFalse(in_array('config_test:entity1', $dependent_ids), 'config_test.dynamic.entity1 does not have a dependency on itself.');
     $this->assertTrue(in_array('config_test:entity2', $dependent_ids), 'config_test.dynamic.entity2 has a dependency on config_test.dynamic.entity1.');
@@ -169,7 +177,7 @@ public function testConfigEntityUninstall() {
         'id' => 'entity2',
         'dependencies' => array(
           'enforced' => array(
-            'entity' => array($entity1->getConfigDependencyName()),
+            'config' => array($entity1->getConfigDependencyName()),
           ),
         ),
       )
@@ -197,7 +205,7 @@ public function testConfigEntityUninstall() {
         'id' => 'entity2',
         'dependencies' => array(
           'enforced' => array(
-            'entity' => array($entity1->getConfigDependencyName()),
+            'config' => array($entity1->getConfigDependencyName()),
           ),
         ),
       )
@@ -212,7 +220,7 @@ public function testConfigEntityUninstall() {
     $this->assertFalse($storage->load('entity1'), 'Entity 1 deleted');
     $entity2 = $storage->load('entity2');
     $this->assertTrue($entity2, 'Entity 2 not deleted');
-    $this->assertEqual($entity2->calculateDependencies()['entity'], array(), 'Entity 2 dependencies updated to remove dependency on Entity1.');
+    $this->assertEqual($entity2->calculateDependencies()['config'], array(), 'Entity 2 dependencies updated to remove dependency on Entity1.');
   }
 
   /**
diff --git a/core/modules/config/src/Tests/ConfigImportUITest.php b/core/modules/config/src/Tests/ConfigImportUITest.php
index 8285979..e2e2118 100644
--- a/core/modules/config/src/Tests/ConfigImportUITest.php
+++ b/core/modules/config/src/Tests/ConfigImportUITest.php
@@ -375,7 +375,7 @@ function testImportErrorLog() {
       'status' => TRUE,
       // Add a dependency on primary, to ensure that is synced first.
       'dependencies' => array(
-        'entity' => array($name_primary),
+        'config' => array($name_primary),
       ),
       'id' => 'secondary',
       'label' => 'Secondary Sync',
diff --git a/core/modules/config/src/Tests/ConfigImporterTest.php b/core/modules/config/src/Tests/ConfigImporterTest.php
index d8179d5..fd69055 100644
--- a/core/modules/config/src/Tests/ConfigImporterTest.php
+++ b/core/modules/config/src/Tests/ConfigImporterTest.php
@@ -226,7 +226,7 @@ function testSecondaryWritePrimaryFirst() {
       'uuid' => $uuid->generate(),
       // Add a dependency on primary, to ensure that is synced first.
       'dependencies' => array(
-        'entity' => array($name_primary),
+        'config' => array($name_primary),
       )
     );
     $staging->write($name_secondary, $values_secondary);
@@ -265,7 +265,7 @@ function testSecondaryWriteSecondaryFirst() {
       'uuid' => $uuid->generate(),
       // Add a dependency on secondary, so that is synced first.
       'dependencies' => array(
-        'entity' => array($name_secondary),
+        'config' => array($name_secondary),
       )
     );
     $staging->write($name_primary, $values_primary);
@@ -323,7 +323,7 @@ function testSecondaryUpdateDeletedDeleterFirst() {
       'uuid' => $uuid->generate(),
       // Add a dependency on deleter, to make sure that is synced first.
       'dependencies' => array(
-        'entity' => array($name_deleter),
+        'config' => array($name_deleter),
       )
     );
     $storage->write($name_deletee, $values_deletee);
@@ -339,7 +339,7 @@ function testSecondaryUpdateDeletedDeleterFirst() {
       // Add a dependency on deleter, to make sure that is synced first. This
       // will also be synced after the deletee due to alphabetical ordering.
       'dependencies' => array(
-        'entity' => array($name_deleter),
+        'config' => array($name_deleter),
       )
     );
     $storage->write($name_other, $values_other);
@@ -395,7 +395,7 @@ function testSecondaryUpdateDeletedDeleteeFirst() {
       'uuid' => $uuid->generate(),
       // Add a dependency on deletee, to make sure that is synced first.
       'dependencies' => array(
-        'entity' => array($name_deletee),
+        'config' => array($name_deletee),
       ),
     );
     $storage->write($name_deleter, $values_deleter);
@@ -444,7 +444,7 @@ function testSecondaryDeletedDeleteeSecond() {
       'uuid' => $uuid->generate(),
       // Add a dependency on deletee, to make sure this delete is synced first.
       'dependencies' => array(
-        'entity' => array($name_deletee),
+        'config' => array($name_deletee),
       ),
     );
     $storage->write($name_deleter, $values_deleter);
diff --git a/core/modules/config/tests/config_test/src/Entity/ConfigTest.php b/core/modules/config/tests/config_test/src/Entity/ConfigTest.php
index 67e88fc..ae56360 100644
--- a/core/modules/config/tests/config_test/src/Entity/ConfigTest.php
+++ b/core/modules/config/tests/config_test/src/Entity/ConfigTest.php
@@ -123,12 +123,12 @@ public static function postDelete(EntityStorageInterface $storage, array $entiti
   public function onDependencyRemoval(array $dependencies) {
     $changed = FALSE;
     $fix_deps = \Drupal::state()->get('config_test.fix_dependencies', array());
-    foreach ($dependencies['entity'] as $entity) {
+    foreach ($dependencies['config'] as $entity) {
       if (in_array($entity->getConfigDependencyName(), $fix_deps)) {
-        $key = array_search($entity->getConfigDependencyName(), $this->dependencies['enforced']['entity']);
+        $key = array_search($entity->getConfigDependencyName(), $this->dependencies['enforced']['config']);
         if ($key !== FALSE) {
           $changed = TRUE;
-          unset($this->dependencies['enforced']['entity'][$key]);
+          unset($this->dependencies['enforced']['config'][$key]);
         }
       }
     }
diff --git a/core/modules/editor/src/Entity/Editor.php b/core/modules/editor/src/Entity/Editor.php
index 83928cc..1c93a52 100644
--- a/core/modules/editor/src/Entity/Editor.php
+++ b/core/modules/editor/src/Entity/Editor.php
@@ -101,7 +101,7 @@ public function label() {
   public function calculateDependencies() {
     parent::calculateDependencies();
     // Create a dependency on the associated FilterFormat.
-    $this->addDependency('entity', $this->getFilterFormat()->getConfigDependencyName());
+    $this->addDependency('config', $this->getFilterFormat()->getConfigDependencyName());
     // @todo use EntityWithPluginCollectionInterface so configuration between
     //   config entity and dependency on provider is managed automatically.
     $definition = $this->editorPluginManager()->createInstance($this->editor)->getPluginDefinition();
diff --git a/core/modules/editor/tests/src/Unit/EditorConfigEntityUnitTest.php b/core/modules/editor/tests/src/Unit/EditorConfigEntityUnitTest.php
index 5036532..26a230a 100644
--- a/core/modules/editor/tests/src/Unit/EditorConfigEntityUnitTest.php
+++ b/core/modules/editor/tests/src/Unit/EditorConfigEntityUnitTest.php
@@ -152,7 +152,7 @@ public function testCalculateDependencies() {
 
     $dependencies = $entity->calculateDependencies();
     $this->assertContains('test_module', $dependencies['module']);
-    $this->assertContains('filter.format.test', $dependencies['entity']);
+    $this->assertContains('filter.format.test', $dependencies['config']);
   }
 
 }
diff --git a/core/modules/field/src/Entity/FieldConfig.php b/core/modules/field/src/Entity/FieldConfig.php
index 2e5f329..ec75234 100644
--- a/core/modules/field/src/Entity/FieldConfig.php
+++ b/core/modules/field/src/Entity/FieldConfig.php
@@ -170,7 +170,7 @@ public function preSave(EntityStorageInterface $storage) {
   public function calculateDependencies() {
     parent::calculateDependencies();
     // Mark the field_storage_config as a a dependency.
-    $this->addDependency('entity', $this->getFieldStorageDefinition()->getConfigDependencyName());
+    $this->addDependency('config', $this->getFieldStorageDefinition()->getConfigDependencyName());
     return $this->dependencies;
   }
 
diff --git a/core/modules/field/src/Plugin/views/field/Field.php b/core/modules/field/src/Plugin/views/field/Field.php
index 7c14b56..c05f6ed 100644
--- a/core/modules/field/src/Plugin/views/field/Field.php
+++ b/core/modules/field/src/Plugin/views/field/Field.php
@@ -944,7 +944,7 @@ function field_langcode(EntityInterface $entity) {
    */
   public function getDependencies() {
     // Add the module providing the configured field storage as a dependency.
-    return array('entity' => array($this->getFieldStorageConfig()->getConfigDependencyName()));
+    return array('config' => array($this->getFieldStorageConfig()->getConfigDependencyName()));
   }
 
   /**
diff --git a/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.entity_test.field_test_import.yml b/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.entity_test.field_test_import.yml
index b205693..bce6cf7 100644
--- a/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.entity_test.field_test_import.yml
+++ b/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.entity_test.field_test_import.yml
@@ -11,5 +11,5 @@ default_value_callback: ''
 settings: { }
 field_type: text
 dependencies:
-  entity:
+  config:
     - field.storage.entity_test.field_test_import
diff --git a/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.entity_test.field_test_import_2.yml b/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.entity_test.field_test_import_2.yml
index ce26663..f52930f 100644
--- a/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.entity_test.field_test_import_2.yml
+++ b/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.entity_test.field_test_import_2.yml
@@ -11,5 +11,5 @@ default_value_callback: ''
 settings: { }
 field_type: text
 dependencies:
-  entity:
+  config:
     - field.storage.entity_test.field_test_import_2
diff --git a/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.test_bundle.field_test_import_2.yml b/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.test_bundle.field_test_import_2.yml
index 37adede..e95266a 100644
--- a/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.test_bundle.field_test_import_2.yml
+++ b/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.test_bundle.field_test_import_2.yml
@@ -11,5 +11,5 @@ default_value_callback: ''
 settings: { }
 field_type: text
 dependencies:
-  entity:
+  config:
     - field.storage.entity_test.field_test_import_2
diff --git a/core/modules/field/tests/modules/field_test_config/staging/field.field.entity_test.entity_test.field_test_import_staging.yml b/core/modules/field/tests/modules/field_test_config/staging/field.field.entity_test.entity_test.field_test_import_staging.yml
index fe28921..30768c0 100644
--- a/core/modules/field/tests/modules/field_test_config/staging/field.field.entity_test.entity_test.field_test_import_staging.yml
+++ b/core/modules/field/tests/modules/field_test_config/staging/field.field.entity_test.entity_test.field_test_import_staging.yml
@@ -12,5 +12,5 @@ default_value_callback: ''
 settings: { }
 field_type: text
 dependencies:
-  entity:
+  config:
     - field.storage.entity_test.field_test_import_staging
diff --git a/core/modules/field/tests/modules/field_test_config/staging/field.field.entity_test.test_bundle.field_test_import_staging_2.yml b/core/modules/field/tests/modules/field_test_config/staging/field.field.entity_test.test_bundle.field_test_import_staging_2.yml
index d1db2b2..447205d 100644
--- a/core/modules/field/tests/modules/field_test_config/staging/field.field.entity_test.test_bundle.field_test_import_staging_2.yml
+++ b/core/modules/field/tests/modules/field_test_config/staging/field.field.entity_test.test_bundle.field_test_import_staging_2.yml
@@ -12,5 +12,5 @@ default_value_callback: ''
 settings: { }
 field_type: text
 dependencies:
-  entity:
+  config:
     - field.storage.entity_test.field_test_import_staging_2
diff --git a/core/modules/field/tests/modules/field_test_config/staging/field.field.entity_test.test_bundle_2.field_test_import_staging_2.yml b/core/modules/field/tests/modules/field_test_config/staging/field.field.entity_test.test_bundle_2.field_test_import_staging_2.yml
index 07953c9..282fc83 100644
--- a/core/modules/field/tests/modules/field_test_config/staging/field.field.entity_test.test_bundle_2.field_test_import_staging_2.yml
+++ b/core/modules/field/tests/modules/field_test_config/staging/field.field.entity_test.test_bundle_2.field_test_import_staging_2.yml
@@ -12,5 +12,5 @@ default_value_callback: ''
 settings: { }
 field_type: text
 dependencies:
-  entity:
+  config:
     - field.storage.entity_test.field_test_import_staging_2
diff --git a/core/modules/field/tests/src/Unit/FieldConfigEntityUnitTest.php b/core/modules/field/tests/src/Unit/FieldConfigEntityUnitTest.php
index eb516d7..63f2d4b 100644
--- a/core/modules/field/tests/src/Unit/FieldConfigEntityUnitTest.php
+++ b/core/modules/field/tests/src/Unit/FieldConfigEntityUnitTest.php
@@ -132,8 +132,8 @@ public function testCalculateDependencies() {
       'field_type' => 'test_field',
     ), $this->entityTypeId);
     $dependencies = $field->calculateDependencies();
-    $this->assertContains('field.storage.test_entity_type.test_field', $dependencies['entity']);
-    $this->assertContains('test.test_entity_type.id', $dependencies['entity']);
+    $this->assertContains('field.storage.test_entity_type.test_field', $dependencies['config']);
+    $this->assertContains('test.test_entity_type.id', $dependencies['config']);
   }
 
   /**
diff --git a/core/modules/field_ui/src/Tests/EntityDisplayTest.php b/core/modules/field_ui/src/Tests/EntityDisplayTest.php
index c2ef81c..3a76027 100644
--- a/core/modules/field_ui/src/Tests/EntityDisplayTest.php
+++ b/core/modules/field_ui/src/Tests/EntityDisplayTest.php
@@ -89,7 +89,7 @@ public function testEntityDisplayCRUD() {
     $new_display->save();
     $new_display = entity_load('entity_view_display', $new_display->id());
     $dependencies = $new_display->calculateDependencies();
-    $this->assertEqual(array('entity' => array('core.entity_view_mode.entity_test.other_view_mode'), 'module' => array('entity_test')), $dependencies);
+    $this->assertEqual(array('config' => array('core.entity_view_mode.entity_test.other_view_mode'), 'module' => array('entity_test')), $dependencies);
     $this->assertEqual($new_display->targetEntityType, $display->targetEntityType);
     $this->assertEqual($new_display->bundle, $display->bundle);
     $this->assertEqual($new_display->mode, 'other_view_mode');
@@ -200,7 +200,7 @@ public function testFieldComponent() {
     // Check that the display has dependencies on the field and the module that
     // provides the formatter.
     $dependencies = $display->calculateDependencies();
-    $this->assertEqual(array('entity' => array('field.field.entity_test.entity_test.test_field'), 'module' => array('entity_test', 'field_test')), $dependencies);
+    $this->assertEqual(array('config' => array('field.field.entity_test.entity_test.test_field'), 'module' => array('entity_test', 'field_test')), $dependencies);
   }
 
   /**
@@ -292,7 +292,7 @@ public function testRenameDeleteBundle() {
     $this->assertEqual('node.article_rename.default', $new_form_display->id);
 
     $expected_view_dependencies = array(
-      'entity' => array('field.field.node.article_rename.body', 'node.type.article_rename'),
+      'config' => array('field.field.node.article_rename.body', 'node.type.article_rename'),
       'module' => array('entity_test', 'text', 'user')
     );
     // Check that the display has dependencies on the bundle, fields and the
@@ -304,7 +304,7 @@ public function testRenameDeleteBundle() {
     // the modules that provide the formatters.
     $dependencies = $new_form_display->calculateDependencies();
     $expected_form_dependencies = array(
-      'entity' => array('field.field.node.article_rename.body', 'node.type.article_rename'),
+      'config' => array('field.field.node.article_rename.body', 'node.type.article_rename'),
       'module' => array('text')
     );
     $this->assertEqual($expected_form_dependencies, $dependencies);
diff --git a/core/modules/forum/config/install/core.base_field_override.node.forum.promote.yml b/core/modules/forum/config/install/core.base_field_override.node.forum.promote.yml
index 3f20b64..c265238 100644
--- a/core/modules/forum/config/install/core.base_field_override.node.forum.promote.yml
+++ b/core/modules/forum/config/install/core.base_field_override.node.forum.promote.yml
@@ -2,7 +2,7 @@
 langcode: en
 status: true
 dependencies:
-  entity:
+  config:
     - node.type.forum
 id: node.forum.promote
 field_name: promote
diff --git a/core/modules/forum/config/install/core.base_field_override.node.forum.title.yml b/core/modules/forum/config/install/core.base_field_override.node.forum.title.yml
index c956f34..3b7b222 100644
--- a/core/modules/forum/config/install/core.base_field_override.node.forum.title.yml
+++ b/core/modules/forum/config/install/core.base_field_override.node.forum.title.yml
@@ -2,7 +2,7 @@
 langcode: en
 status: true
 dependencies:
-  entity:
+  config:
     - node.type.forum
 id: node.forum.title
 field_name: title
diff --git a/core/modules/forum/config/install/core.entity_form_display.taxonomy_term.forums.default.yml b/core/modules/forum/config/install/core.entity_form_display.taxonomy_term.forums.default.yml
index 4e13510..1d8fb47 100644
--- a/core/modules/forum/config/install/core.entity_form_display.taxonomy_term.forums.default.yml
+++ b/core/modules/forum/config/install/core.entity_form_display.taxonomy_term.forums.default.yml
@@ -17,5 +17,5 @@ content:
     settings: { }
     third_party_settings: {  }
 dependencies:
-  entity:
+  config:
     - taxonomy.vocabulary.forums
diff --git a/core/modules/forum/config/install/core.entity_view_display.taxonomy_term.forums.default.yml b/core/modules/forum/config/install/core.entity_view_display.taxonomy_term.forums.default.yml
index f2f5b61..8984c3c 100644
--- a/core/modules/forum/config/install/core.entity_view_display.taxonomy_term.forums.default.yml
+++ b/core/modules/forum/config/install/core.entity_view_display.taxonomy_term.forums.default.yml
@@ -13,5 +13,5 @@ content:
 hidden: {  }
 status: true
 dependencies:
-  entity:
+  config:
     - taxonomy.vocabulary.forums
diff --git a/core/modules/forum/config/install/field.field.taxonomy_term.forums.forum_container.yml b/core/modules/forum/config/install/field.field.taxonomy_term.forums.forum_container.yml
index 8056915..3f4cd1e 100644
--- a/core/modules/forum/config/install/field.field.taxonomy_term.forums.forum_container.yml
+++ b/core/modules/forum/config/install/field.field.taxonomy_term.forums.forum_container.yml
@@ -14,6 +14,6 @@ default_value_callback: ''
 settings: {  }
 field_type: boolean
 dependencies:
-  entity:
+  config:
     - field.storage.taxonomy_term.forum_container
     - taxonomy.vocabulary.forums
diff --git a/core/modules/forum/config/install/rdf.mapping.node.forum.yml b/core/modules/forum/config/install/rdf.mapping.node.forum.yml
index be874cd..4d159da 100644
--- a/core/modules/forum/config/install/rdf.mapping.node.forum.yml
+++ b/core/modules/forum/config/install/rdf.mapping.node.forum.yml
@@ -32,7 +32,7 @@ fieldMappings:
       arguments:
         interaction_type: 'UserComments'
 dependencies:
-  entity:
+  config:
     - node.type.forum
   module:
     - node
diff --git a/core/modules/forum/config/install/rdf.mapping.taxonomy_term.forums.yml b/core/modules/forum/config/install/rdf.mapping.taxonomy_term.forums.yml
index be766eb..78408d8 100644
--- a/core/modules/forum/config/install/rdf.mapping.taxonomy_term.forums.yml
+++ b/core/modules/forum/config/install/rdf.mapping.taxonomy_term.forums.yml
@@ -12,7 +12,7 @@ fieldMappings:
     properties:
       - 'schema:description'
 dependencies:
-  entity:
+  config:
     - taxonomy.vocabulary.forums
   module:
     - taxonomy
diff --git a/core/modules/options/tests/options_config_install_test/config/install/core.entity_form_display.node.options_install_test.default.yml b/core/modules/options/tests/options_config_install_test/config/install/core.entity_form_display.node.options_install_test.default.yml
index 3b96a57..b24ca9e 100644
--- a/core/modules/options/tests/options_config_install_test/config/install/core.entity_form_display.node.options_install_test.default.yml
+++ b/core/modules/options/tests/options_config_install_test/config/install/core.entity_form_display.node.options_install_test.default.yml
@@ -1,7 +1,7 @@
 langcode: en
 status: true
 dependencies:
-  entity:
+  config:
     - field.field.node.options_install_test.body
     - node.type.options_install_test
   module:
diff --git a/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.default.yml b/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.default.yml
index 506ee9d..d2a3b18 100644
--- a/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.default.yml
+++ b/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.default.yml
@@ -1,7 +1,7 @@
 langcode: en
 status: true
 dependencies:
-  entity:
+  config:
     - field.field.node.options_install_test.body
     - node.type.options_install_test
   module:
diff --git a/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.teaser.yml b/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.teaser.yml
index 356a6a2..a6a9b60 100644
--- a/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.teaser.yml
+++ b/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.teaser.yml
@@ -1,7 +1,7 @@
 langcode: en
 status: true
 dependencies:
-  entity:
+  config:
     - core.entity_view_mode.node.teaser
     - field.field.node.options_install_test.body
     - node.type.options_install_test
diff --git a/core/modules/options/tests/options_config_install_test/config/install/field.field.node.options_install_test.body.yml b/core/modules/options/tests/options_config_install_test/config/install/field.field.node.options_install_test.body.yml
index 20fd4d3..2078a84 100644
--- a/core/modules/options/tests/options_config_install_test/config/install/field.field.node.options_install_test.body.yml
+++ b/core/modules/options/tests/options_config_install_test/config/install/field.field.node.options_install_test.body.yml
@@ -1,7 +1,7 @@
 langcode: en
 status: true
 dependencies:
-  entity:
+  config:
     - field.storage.node.body
     - node.type.options_install_test
 id: node.options_install_test.body
diff --git a/core/modules/options/tests/options_config_install_test/config/install/field.field.node.options_install_test.field_options_float.yml b/core/modules/options/tests/options_config_install_test/config/install/field.field.node.options_install_test.field_options_float.yml
index 581f2b7..39fd25e 100644
--- a/core/modules/options/tests/options_config_install_test/config/install/field.field.node.options_install_test.field_options_float.yml
+++ b/core/modules/options/tests/options_config_install_test/config/install/field.field.node.options_install_test.field_options_float.yml
@@ -1,7 +1,7 @@
 langcode: en
 status: true
 dependencies:
-  entity:
+  config:
     - field.storage.node.field_options_float
     - node.type.options_install_test
 id: node.options_install_test.field_options_float
diff --git a/core/modules/rdf/src/Entity/RdfMapping.php b/core/modules/rdf/src/Entity/RdfMapping.php
index b842547..9f7915b 100644
--- a/core/modules/rdf/src/Entity/RdfMapping.php
+++ b/core/modules/rdf/src/Entity/RdfMapping.php
@@ -145,7 +145,7 @@ public function calculateDependencies() {
       // If the target entity type uses entities to manage its bundles then
       // depend on the bundle entity.
       $bundle_entity = \Drupal::entityManager()->getStorage($bundle_entity_type_id)->load($this->bundle);
-      $this->addDependency('entity', $bundle_entity->getConfigDependencyName());
+      $this->addDependency('config', $bundle_entity->getConfigDependencyName());
     }
     return $this->dependencies;
   }
diff --git a/core/modules/rdf/tests/src/Unit/RdfMappingConfigEntityUnitTest.php b/core/modules/rdf/tests/src/Unit/RdfMappingConfigEntityUnitTest.php
index 9420d65..52f1616 100644
--- a/core/modules/rdf/tests/src/Unit/RdfMappingConfigEntityUnitTest.php
+++ b/core/modules/rdf/tests/src/Unit/RdfMappingConfigEntityUnitTest.php
@@ -93,7 +93,7 @@ public function testCalculateDependencies() {
 
     $entity = new RdfMapping($values, $this->entityTypeId);
     $dependencies = $entity->calculateDependencies();
-    $this->assertArrayNotHasKey('entity', $dependencies);
+    $this->assertArrayNotHasKey('config', $dependencies);
     $this->assertContains('test_module', $dependencies['module']);
   }
 
@@ -142,7 +142,7 @@ public function testCalculateDependenciesWithEntityBundle() {
 
     $entity = new RdfMapping($values, $this->entityTypeId);
     $dependencies = $entity->calculateDependencies();
-    $this->assertContains('test_module.type.' . $bundle_id, $dependencies['entity']);
+    $this->assertContains('test_module.type.' . $bundle_id, $dependencies['config']);
     $this->assertContains('test_module', $dependencies['module']);
   }
 
diff --git a/core/modules/system/src/Plugin/Derivative/SystemMenuBlock.php b/core/modules/system/src/Plugin/Derivative/SystemMenuBlock.php
index 611ef2a..7936128 100644
--- a/core/modules/system/src/Plugin/Derivative/SystemMenuBlock.php
+++ b/core/modules/system/src/Plugin/Derivative/SystemMenuBlock.php
@@ -52,7 +52,7 @@ public function getDerivativeDefinitions($base_plugin_definition) {
     foreach ($this->menuStorage->loadMultiple() as $menu => $entity) {
       $this->derivatives[$menu] = $base_plugin_definition;
       $this->derivatives[$menu]['admin_label'] = $entity->label();
-      $this->derivatives[$menu]['config_dependencies']['entity'] = array($entity->getConfigDependencyName());
+      $this->derivatives[$menu]['config_dependencies']['config'] = array($entity->getConfigDependencyName());
     }
     return $this->derivatives;
   }
diff --git a/core/modules/system/src/Tests/Action/ActionUnitTest.php b/core/modules/system/src/Tests/Action/ActionUnitTest.php
index 937c6e0..3a0dce2 100644
--- a/core/modules/system/src/Tests/Action/ActionUnitTest.php
+++ b/core/modules/system/src/Tests/Action/ActionUnitTest.php
@@ -91,7 +91,7 @@ public function testDependencies() {
     $action->save();
 
     $expected = array(
-      'entity' => array(
+      'config' => array(
         'user.role.' . DRUPAL_ANONYMOUS_RID,
       ),
       'module' => array(
diff --git a/core/modules/system/src/Tests/Block/SystemMenuBlockTest.php b/core/modules/system/src/Tests/Block/SystemMenuBlockTest.php
index 8695f0e..ce5b81b 100644
--- a/core/modules/system/src/Tests/Block/SystemMenuBlockTest.php
+++ b/core/modules/system/src/Tests/Block/SystemMenuBlockTest.php
@@ -162,7 +162,7 @@ public function testSystemMenuBlockConfigDependencies() {
 
     $dependencies = $block->calculateDependencies();
     $expected = array(
-      'entity' => array(
+      'config' => array(
         'system.menu.' . $this->menu->id()
       ),
       'module' => array(
diff --git a/core/modules/user/src/Plugin/Action/ChangeUserRoleBase.php b/core/modules/user/src/Plugin/Action/ChangeUserRoleBase.php
index 62c4214..5e5c176 100644
--- a/core/modules/user/src/Plugin/Action/ChangeUserRoleBase.php
+++ b/core/modules/user/src/Plugin/Action/ChangeUserRoleBase.php
@@ -86,7 +86,7 @@ public function submitConfigurationForm(array &$form, FormStateInterface $form_s
   public function calculateDependencies() {
     if (!empty($this->configuration['rid'])) {
       $prefix = $this->entityType->getConfigPrefix() . '.';
-      $this->addDependency('entity', $prefix . $this->configuration['rid']);
+      $this->addDependency('config', $prefix . $this->configuration['rid']);
     }
     return $this->dependencies;
   }
diff --git a/core/modules/views/src/Plugin/Derivative/ViewsBlock.php b/core/modules/views/src/Plugin/Derivative/ViewsBlock.php
index cec9895..3ebfc5f 100644
--- a/core/modules/views/src/Plugin/Derivative/ViewsBlock.php
+++ b/core/modules/views/src/Plugin/Derivative/ViewsBlock.php
@@ -103,7 +103,7 @@ public function getDerivativeDefinitions($base_plugin_definition) {
             'category' => $display->getOption('block_category'),
             'admin_label' => $desc,
             'config_dependencies' => array(
-              'entity' => array(
+              'config' => array(
                 $view->getConfigDependencyName(),
               )
             )
diff --git a/core/modules/views/src/Plugin/Derivative/ViewsExposedFilterBlock.php b/core/modules/views/src/Plugin/Derivative/ViewsExposedFilterBlock.php
index 0ef5fcd..f405aed 100644
--- a/core/modules/views/src/Plugin/Derivative/ViewsExposedFilterBlock.php
+++ b/core/modules/views/src/Plugin/Derivative/ViewsExposedFilterBlock.php
@@ -94,7 +94,7 @@ public function getDerivativeDefinitions($base_plugin_definition) {
             $this->derivatives[$delta] = array(
               'admin_label' => $desc,
               'config_dependencies' => array(
-                'entity' => array(
+                'config' => array(
                   $view->getConfigDependencyName(),
                 )
               )
diff --git a/core/modules/views/src/Tests/Plugin/BlockDependenciesTest.php b/core/modules/views/src/Tests/Plugin/BlockDependenciesTest.php
index d7d25c3..d8a0b56 100644
--- a/core/modules/views/src/Tests/Plugin/BlockDependenciesTest.php
+++ b/core/modules/views/src/Tests/Plugin/BlockDependenciesTest.php
@@ -39,7 +39,7 @@ public function testExposedBlock() {
     $block = $this->createBlock('views_exposed_filter_block:test_exposed_block-page_1');
     $dependencies = $block->calculateDependencies();
     $expected = array(
-      'entity' => array('views.view.test_exposed_block'),
+      'config' => array('views.view.test_exposed_block'),
       'module' => array('views'),
       'theme' => array('stark')
     );
@@ -55,7 +55,7 @@ public function testViewsBlock() {
     $block = $this->createBlock('views_block:content_recent-block_1');
     $dependencies = $block->calculateDependencies();
     $expected = array(
-      'entity' => array('views.view.content_recent'),
+      'config' => array('views.view.content_recent'),
       'module' => array('views'),
       'theme' => array('stark')
     );
diff --git a/core/profiles/minimal/config/install/block.block.stark_admin.yml b/core/profiles/minimal/config/install/block.block.stark_admin.yml
index 0934049..0f3fdd5 100644
--- a/core/profiles/minimal/config/install/block.block.stark_admin.yml
+++ b/core/profiles/minimal/config/install/block.block.stark_admin.yml
@@ -16,7 +16,7 @@ settings:
   level: 1
   depth: 0
 dependencies:
-  entity:
+  config:
     - system.menu.admin
   module:
     - system
diff --git a/core/profiles/minimal/config/install/block.block.stark_tools.yml b/core/profiles/minimal/config/install/block.block.stark_tools.yml
index c8268bb..ef8442b 100644
--- a/core/profiles/minimal/config/install/block.block.stark_tools.yml
+++ b/core/profiles/minimal/config/install/block.block.stark_tools.yml
@@ -16,7 +16,7 @@ settings:
   level: 1
   depth: 0
 dependencies:
-  entity:
+  config:
     - system.menu.tools
   module:
     - system
diff --git a/core/profiles/standard/config/install/block.block.bartik_account_menu.yml b/core/profiles/standard/config/install/block.block.bartik_account_menu.yml
index 37ef707..1463759 100644
--- a/core/profiles/standard/config/install/block.block.bartik_account_menu.yml
+++ b/core/profiles/standard/config/install/block.block.bartik_account_menu.yml
@@ -17,7 +17,7 @@ settings:
   level: 1
   depth: 1
 dependencies:
-  entity:
+  config:
     - system.menu.account
   module:
     - system
diff --git a/core/profiles/standard/config/install/block.block.bartik_footer.yml b/core/profiles/standard/config/install/block.block.bartik_footer.yml
index 3074b3a..4132736 100644
--- a/core/profiles/standard/config/install/block.block.bartik_footer.yml
+++ b/core/profiles/standard/config/install/block.block.bartik_footer.yml
@@ -17,7 +17,7 @@ settings:
   level: 1
   depth: 0
 dependencies:
-  entity:
+  config:
     - system.menu.footer
   module:
     - system
diff --git a/core/profiles/standard/config/install/block.block.bartik_main_menu.yml b/core/profiles/standard/config/install/block.block.bartik_main_menu.yml
index 90a596f..7f847c2 100644
--- a/core/profiles/standard/config/install/block.block.bartik_main_menu.yml
+++ b/core/profiles/standard/config/install/block.block.bartik_main_menu.yml
@@ -17,7 +17,7 @@ settings:
   level: 1
   depth: 1
 dependencies:
-  entity:
+  config:
     - system.menu.main
   module:
     - system
diff --git a/core/profiles/standard/config/install/block.block.bartik_tools.yml b/core/profiles/standard/config/install/block.block.bartik_tools.yml
index 9a4b8b3..4b102eb 100644
--- a/core/profiles/standard/config/install/block.block.bartik_tools.yml
+++ b/core/profiles/standard/config/install/block.block.bartik_tools.yml
@@ -17,7 +17,7 @@ settings:
   level: 1
   depth: 0
 dependencies:
-  entity:
+  config:
     - system.menu.tools
   module:
     - system
diff --git a/core/profiles/standard/config/install/core.base_field_override.node.page.promote.yml b/core/profiles/standard/config/install/core.base_field_override.node.page.promote.yml
index 1555eed..d3a0923 100644
--- a/core/profiles/standard/config/install/core.base_field_override.node.page.promote.yml
+++ b/core/profiles/standard/config/install/core.base_field_override.node.page.promote.yml
@@ -2,7 +2,7 @@
 langcode: en
 status: true
 dependencies:
-  entity:
+  config:
     - node.type.page
 id: node.page.promote
 field_name: promote
diff --git a/core/profiles/standard/config/install/core.entity_form_display.node.article.default.yml b/core/profiles/standard/config/install/core.entity_form_display.node.article.default.yml
index e8d8733..4a74b69 100644
--- a/core/profiles/standard/config/install/core.entity_form_display.node.article.default.yml
+++ b/core/profiles/standard/config/install/core.entity_form_display.node.article.default.yml
@@ -38,7 +38,7 @@ content:
 hidden: {  }
 status: true
 dependencies:
-  entity:
+  config:
     - field.field.node.article.body
     - field.field.node.article.comment
     - field.field.node.article.field_image
diff --git a/core/profiles/standard/config/install/core.entity_view_display.node.article.default.yml b/core/profiles/standard/config/install/core.entity_view_display.node.article.default.yml
index a0da43b..fb6f75d 100644
--- a/core/profiles/standard/config/install/core.entity_view_display.node.article.default.yml
+++ b/core/profiles/standard/config/install/core.entity_view_display.node.article.default.yml
@@ -25,7 +25,7 @@ content:
     settings: {  }
     third_party_settings: {  }
 dependencies:
-  entity:
+  config:
     - field.field.node.article.body
     - field.field.node.article.field_image
     - field.field.node.article.field_tags
diff --git a/core/profiles/standard/config/install/core.entity_view_display.node.article.teaser.yml b/core/profiles/standard/config/install/core.entity_view_display.node.article.teaser.yml
index 5caa85c..7f8ed57 100644
--- a/core/profiles/standard/config/install/core.entity_view_display.node.article.teaser.yml
+++ b/core/profiles/standard/config/install/core.entity_view_display.node.article.teaser.yml
@@ -26,7 +26,7 @@ content:
     third_party_settings: {  }
     label: above
 dependencies:
-  entity:
+  config:
     - core.entity_view_mode.node.teaser
     - field.field.node.article.body
     - field.field.node.article.field_image
diff --git a/core/profiles/standard/config/install/core.entity_view_display.user.user.compact.yml b/core/profiles/standard/config/install/core.entity_view_display.user.user.compact.yml
index 410f3f3..a46bd1b 100644
--- a/core/profiles/standard/config/install/core.entity_view_display.user.user.compact.yml
+++ b/core/profiles/standard/config/install/core.entity_view_display.user.user.compact.yml
@@ -15,7 +15,7 @@ hidden:
   member_for: true
 status: true
 dependencies:
-  entity:
+  config:
     - core.entity_view_mode.user.compact
   module:
     - image
diff --git a/core/profiles/standard/config/install/editor.editor.basic_html.yml b/core/profiles/standard/config/install/editor.editor.basic_html.yml
index fdf6e96..54ad5b1 100644
--- a/core/profiles/standard/config/install/editor.editor.basic_html.yml
+++ b/core/profiles/standard/config/install/editor.editor.basic_html.yml
@@ -42,7 +42,7 @@ image_upload:
 status: true
 langcode: en
 dependencies:
-  entity:
+  config:
     - filter.format.basic_html
   module:
     - ckeditor
diff --git a/core/profiles/standard/config/install/editor.editor.full_html.yml b/core/profiles/standard/config/install/editor.editor.full_html.yml
index 66df850..80da28c 100644
--- a/core/profiles/standard/config/install/editor.editor.full_html.yml
+++ b/core/profiles/standard/config/install/editor.editor.full_html.yml
@@ -54,7 +54,7 @@ image_upload:
 status: true
 langcode: en
 dependencies:
-  entity:
+  config:
     - filter.format.full_html
   module:
     - ckeditor
diff --git a/core/profiles/standard/config/install/field.field.node.article.field_image.yml b/core/profiles/standard/config/install/field.field.node.article.field_image.yml
index efc110c..fc6a482 100644
--- a/core/profiles/standard/config/install/field.field.node.article.field_image.yml
+++ b/core/profiles/standard/config/install/field.field.node.article.field_image.yml
@@ -27,6 +27,6 @@ status: true
 langcode: en
 field_type: image
 dependencies:
-  entity:
+  config:
     - field.storage.node.field_image
     - node.type.article
diff --git a/core/profiles/standard/config/install/field.field.node.article.field_tags.yml b/core/profiles/standard/config/install/field.field.node.article.field_tags.yml
index 001f510..cfce273 100644
--- a/core/profiles/standard/config/install/field.field.node.article.field_tags.yml
+++ b/core/profiles/standard/config/install/field.field.node.article.field_tags.yml
@@ -12,6 +12,6 @@ settings: {  }
 status: true
 langcode: en
 dependencies:
-  entity:
+  config:
     - field.storage.node.field_tags
     - node.type.article
diff --git a/core/profiles/standard/config/install/field.field.user.user.user_picture.yml b/core/profiles/standard/config/install/field.field.user.user.user_picture.yml
index d6b31c2..a2c4faf 100644
--- a/core/profiles/standard/config/install/field.field.user.user.user_picture.yml
+++ b/core/profiles/standard/config/install/field.field.user.user.user_picture.yml
@@ -27,5 +27,5 @@ settings:
   title_field_required: false
 field_type: image
 dependencies:
-  entity:
+  config:
     - field.storage.user.user_picture
diff --git a/core/profiles/standard/config/install/rdf.mapping.comment.node__comment.yml b/core/profiles/standard/config/install/rdf.mapping.comment.node__comment.yml
index d8aa944..268eb80 100644
--- a/core/profiles/standard/config/install/rdf.mapping.comment.node__comment.yml
+++ b/core/profiles/standard/config/install/rdf.mapping.comment.node__comment.yml
@@ -27,5 +27,5 @@ fieldMappings:
 dependencies:
   module:
     - comment
-  entity:
+  config:
     - comment.type.comment
diff --git a/core/profiles/standard/config/install/rdf.mapping.node.article.yml b/core/profiles/standard/config/install/rdf.mapping.node.article.yml
index d1b7f80..f1b167e 100644
--- a/core/profiles/standard/config/install/rdf.mapping.node.article.yml
+++ b/core/profiles/standard/config/install/rdf.mapping.node.article.yml
@@ -41,7 +41,7 @@ fieldMappings:
     properties:
       - 'schema:about'
 dependencies:
-  entity:
+  config:
     - node.type.article
   module:
     - node
diff --git a/core/profiles/standard/config/install/rdf.mapping.node.page.yml b/core/profiles/standard/config/install/rdf.mapping.node.page.yml
index 38120ff..166bd2a 100644
--- a/core/profiles/standard/config/install/rdf.mapping.node.page.yml
+++ b/core/profiles/standard/config/install/rdf.mapping.node.page.yml
@@ -32,7 +32,7 @@ fieldMappings:
       arguments:
         interaction_type: 'UserComments'
 dependencies:
-  entity:
+  config:
     - node.type.page
   module:
     - node
diff --git a/core/profiles/standard/config/install/rdf.mapping.taxonomy_term.tags.yml b/core/profiles/standard/config/install/rdf.mapping.taxonomy_term.tags.yml
index 60bf174..9c7b4dc 100644
--- a/core/profiles/standard/config/install/rdf.mapping.taxonomy_term.tags.yml
+++ b/core/profiles/standard/config/install/rdf.mapping.taxonomy_term.tags.yml
@@ -11,7 +11,7 @@ fieldMappings:
     properties:
       - 'schema:description'
 dependencies:
-  entity:
+  config:
     - taxonomy.vocabulary.tags
   module:
     - taxonomy
diff --git a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigDependencyManagerTest.php b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigDependencyManagerTest.php
index ff50e9c..eeb7538 100644
--- a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigDependencyManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigDependencyManagerTest.php
@@ -19,7 +19,7 @@ class ConfigDependencyManagerTest extends UnitTestCase {
 
   public function testNoConfiguration() {
     $dep_manger = new ConfigDependencyManager();
-    $this->assertEmpty($dep_manger->getDependentEntities('entity', 'config_test.dynamic.entity_id:745b0ce0-aece-42dd-a800-ade5b8455e84'));
+    $this->assertEmpty($dep_manger->getDependentEntities('config', 'config_test.dynamic.entity_id:745b0ce0-aece-42dd-a800-ade5b8455e84'));
   }
 
   public function testNoConfigEntities() {
@@ -29,7 +29,7 @@ public function testNoConfigEntities() {
         'key' => 'value',
       ),
     ));
-    $this->assertEmpty($dep_manger->getDependentEntities('entity', 'config_test.dynamic.entity_id:745b0ce0-aece-42dd-a800-ade5b8455e84'));
+    $this->assertEmpty($dep_manger->getDependentEntities('config', 'config_test.dynamic.entity_id:745b0ce0-aece-42dd-a800-ade5b8455e84'));
 
     // Configuration is always dependent on its provider.
     $dependencies = $dep_manger->getDependentEntities('module', 'simple');
diff --git a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php
index 6676d5a..2da84fe 100644
--- a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php
@@ -275,12 +275,12 @@ public function providerCalculateDependenciesWithPluginCollections() {
         array(
           'provider' => 'test',
           'config_dependencies' => array(
-            'entity' => array($instance_dependency_1),
+            'config' => array($instance_dependency_1),
             'module' => array($instance_dependency_2),
           )
         ),
         array(
-          'entity' => array($instance_dependency_1),
+          'config' => array($instance_dependency_1),
           'module' => array($instance_dependency_2, 'test')
         )
       )
diff --git a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityDependencyTest.php b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityDependencyTest.php
index 98a9d31..4b2870f 100644
--- a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityDependencyTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityDependencyTest.php
@@ -22,7 +22,7 @@ public function testEmptyDependencies() {
 
     $this->assertEquals('config_test.dynamic.entity_id', $dep->getConfigDependencyName());
     $this->assertEquals(array(), $dep->getDependencies('theme'));
-    $this->assertEquals(array(), $dep->getDependencies('entity'));
+    $this->assertEquals(array(), $dep->getDependencies('config'));
     $this->assertEquals(array('config_test'), $dep->getDependencies('module'));
     $this->assertTrue($dep->hasDependency('module', 'config_test'));
     $this->assertFalse($dep->hasDependency('module', 'views'));
@@ -36,7 +36,7 @@ public function testWithDependencies() {
           'node',
           'views'
         ),
-        'entity' => array(
+        'config' => array(
           'config_test.dynamic.entity_id:745b0ce0-aece-42dd-a800-ade5b8455e84',
         ),
       ),
@@ -44,14 +44,14 @@ public function testWithDependencies() {
     $dep = new ConfigEntityDependency('config_test.dynamic.entity_id', $values);
 
     $this->assertEquals(array(), $dep->getDependencies('theme'));
-    $this->assertEquals(array('config_test.dynamic.entity_id:745b0ce0-aece-42dd-a800-ade5b8455e84'), $dep->getDependencies('entity'));
+    $this->assertEquals(array('config_test.dynamic.entity_id:745b0ce0-aece-42dd-a800-ade5b8455e84'), $dep->getDependencies('config'));
     $this->assertEquals(array('node', 'views', 'config_test'), $dep->getDependencies('module'));
     $this->assertTrue($dep->hasDependency('module', 'config_test'));
     $this->assertTrue($dep->hasDependency('module', 'views'));
     $this->assertTrue($dep->hasDependency('module', 'node'));
     $this->assertFalse($dep->hasDependency('module', 'block'));
-    $this->assertTrue($dep->hasDependency('entity', 'config_test.dynamic.entity_id:745b0ce0-aece-42dd-a800-ade5b8455e84'));
-    $this->assertFalse($dep->hasDependency('entity', 'config_test.dynamic.another_id:7dfa5cb7-2248-4d52-8c00-cd8e02d1e78e'));
+    $this->assertTrue($dep->hasDependency('config', 'config_test.dynamic.entity_id:745b0ce0-aece-42dd-a800-ade5b8455e84'));
+    $this->assertFalse($dep->hasDependency('config', 'config_test.dynamic.another_id:7dfa5cb7-2248-4d52-8c00-cd8e02d1e78e'));
   }
 
 }
diff --git a/core/tests/Drupal/Tests/Core/Config/StorageComparerTest.php b/core/tests/Drupal/Tests/Core/Config/StorageComparerTest.php
index 2263126..34a2016 100644
--- a/core/tests/Drupal/Tests/Core/Config/StorageComparerTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/StorageComparerTest.php
@@ -67,7 +67,7 @@ protected function getConfigData() {
         'id' => 'node.article.body',
         'uuid' => $uuid->generate(),
         'dependencies' => array(
-          'entity' => array(
+          'config' => array(
             'field.storage.node.body'
           ),
         ),