diff --git a/core/modules/config/config.module b/core/modules/config/config.module
index 58e8a4e..7b4432c 100644
--- a/core/modules/config/config.module
+++ b/core/modules/config/config.module
@@ -1,7 +1,7 @@
 <?php
 
 use Drupal\config\EntityListControllerInterface;
-use Drupal\entity\EntityInterface;
+use Drupal\Core\Entity\EntityInterface;
 
 /**
  * Implements hook_menu().
@@ -20,7 +20,7 @@ function config_menu() {
 /**
  * Gets the entity list controller class for an entity type.
  *
- * @return Drupal\entity\EntityListControllerInterface
+ * @return Drupal\config\EntityListControllerInterface
  */
 function config_get_list_controller($entity_type) {
   $controllers = &drupal_static(__FUNCTION__, array());
@@ -50,7 +50,7 @@ function config_entity_listing_page($controller) {
  *
  * @param Drupal\config\EntityListControllerInterface $controller
  *   The list controller for this entity.
- * @param Drupal\entity\EntityInterface $entity
+ * @param Drupal\Core\Entity\EntityInterface $entity
  *   The config entity being acted upon.
  * @param string $op
  *   The operation to perform, e.g., 'enable' or 'disable'.
diff --git a/core/modules/config/lib/Drupal/config/EntityListControllerBase.php b/core/modules/config/lib/Drupal/config/EntityListControllerBase.php
index 63f771c..4601ecf 100644
--- a/core/modules/config/lib/Drupal/config/EntityListControllerBase.php
+++ b/core/modules/config/lib/Drupal/config/EntityListControllerBase.php
@@ -6,7 +6,7 @@
 
 namespace Drupal\config;
 
-use Drupal\entity\EntityInterface;
+use Drupal\Core\Entity\EntityInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
 
 /**
diff --git a/core/modules/config/lib/Drupal/config/EntityListControllerInterface.php b/core/modules/config/lib/Drupal/config/EntityListControllerInterface.php
index b22143e..6b4ea1e 100644
--- a/core/modules/config/lib/Drupal/config/EntityListControllerInterface.php
+++ b/core/modules/config/lib/Drupal/config/EntityListControllerInterface.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\config;
 
-use Drupal\entity\EntityInterface;
+use Drupal\Core\Entity\EntityInterface;
 
 /**
  * Defines an interface for Configuration entity listing plugins.
@@ -18,7 +18,7 @@
    * Returns a list of all available config entites of this type.
    *
    * @return array
-   *   An array of entities implementing Drupal\entity\EntityInterface.
+   *   An array of entities implementing Drupal\Core\Entity\EntityInterface.
    */
   public function getList();
 
diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestListController.php b/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestListController.php
index 4794145..462359f 100644
--- a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestListController.php
+++ b/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestListController.php
@@ -7,7 +7,7 @@
 namespace Drupal\config_test;
 
 use Drupal\config\EntityListControllerBase;
-use Drupal\entity\EntityInterface;
+use Drupal\Core\Entity\EntityInterface;
 
 /**
  * Views config entity listing controller.