diff --git a/core/lib/Drupal/Core/ConfigEntity/ConfigEntityBase.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
similarity index 96%
rename from core/lib/Drupal/Core/ConfigEntity/ConfigEntityBase.php
rename to core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
index 981a348..216b459 100644
--- a/core/lib/Drupal/Core/ConfigEntity/ConfigEntityBase.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\Core\ConfigEntity\ConfigEntityBase.
+ * Definition of Drupal\Core\Config\Entity\ConfigEntityBase.
  */
 
-namespace Drupal\Core\ConfigEntity;
+namespace Drupal\Core\Config\Entity;
 
 use Drupal\Core\Entity\Entity;
 
diff --git a/core/lib/Drupal/Core/ConfigEntity/ConfigEntityInterface.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php
similarity index 76%
rename from core/lib/Drupal/Core/ConfigEntity/ConfigEntityInterface.php
rename to core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php
index 7d80643..a8b78e1 100644
--- a/core/lib/Drupal/Core/ConfigEntity/ConfigEntityInterface.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\Core\ConfigEntity\ConfigEntityInterface.
+ * Definition of Drupal\Core\Config\Entity\ConfigEntityInterface.
  */
 
-namespace Drupal\Core\ConfigEntity;
+namespace Drupal\Core\Config\Entity;
 
 use Drupal\Core\Entity\EntityInterface;
 
diff --git a/core/lib/Drupal/Core/ConfigEntity/ConfigStorageController.php b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
similarity index 98%
rename from core/lib/Drupal/Core/ConfigEntity/ConfigStorageController.php
rename to core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
index 21682d1..f208053 100644
--- a/core/lib/Drupal/Core/ConfigEntity/ConfigStorageController.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\Core\ConfigEntity\ConfigStorageController.
+ * Definition of Drupal\Core\Config\Entity\ConfigStorageController.
  */
 
-namespace Drupal\Core\ConfigEntity;
+namespace Drupal\Core\Config\Entity;
 
 use Drupal\Component\Uuid\Uuid;
 use Drupal\Core\Entity\EntityInterface;
@@ -35,7 +35,7 @@ class ConfigStorageController implements EntityStorageControllerInterface {
   /**
    * Additional arguments to pass to hook_TYPE_load().
    *
-   * Set before calling Drupal\Core\ConfigEntity\ConfigStorageController::attachLoad().
+   * Set before calling Drupal\Core\Config\Entity\ConfigStorageController::attachLoad().
    *
    * @var array
    */
diff --git a/core/modules/config/tests/config_test/config_test.module b/core/modules/config/tests/config_test/config_test.module
index 4df7a14..61d92df 100644
--- a/core/modules/config/tests/config_test/config_test.module
+++ b/core/modules/config/tests/config_test/config_test.module
@@ -80,7 +80,7 @@ function config_test_config_import_delete($name, $new_config, $old_config) {
 function config_test_entity_info() {
   $types['config_test'] = array(
     'label' => 'Test configuration',
-    'controller class' => 'Drupal\Core\ConfigEntity\ConfigStorageController',
+    'controller class' => 'Drupal\Core\Config\Entity\ConfigStorageController',
     'entity class' => 'Drupal\config_test\ConfigTest',
     'uri callback' => 'config_test_uri',
     'config prefix' => 'config_test.dynamic',
@@ -177,7 +177,7 @@ function config_test_delete($id) {
  */
 function config_test_list_page() {
   $entities = entity_load_multiple('config_test');
-  uasort($entities, 'Drupal\Core\ConfigEntity\ConfigEntityBase::sort');
+  uasort($entities, 'Drupal\Core\Config\Entity\ConfigEntityBase::sort');
 
   $rows = array();
   foreach ($entities as $config_test) {
diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTest.php b/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTest.php
index fd6e34d..e1df5c4 100644
--- a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTest.php
+++ b/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\config_test;
 
-use Drupal\Core\ConfigEntity\ConfigEntityBase;
+use Drupal\Core\Config\Entity\ConfigEntityBase;
 
 /**
  * Defines the ConfigTest configuration entity.