diff --git a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigStorageControllerTest.php b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
similarity index 98%
rename from core/tests/Drupal/Tests/Core/Config/Entity/ConfigStorageControllerTest.php
rename to core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
index 24cd7b7..918e596 100644
--- a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigStorageControllerTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\Core\Config\Entity\ConfigStorageControllerTest.
+ * Contains \Drupal\Tests\Core\Config\Entity\ConfigEntityStorageTest.
  */
 
 namespace Drupal\Tests\Core\Config\Entity {
@@ -13,11 +13,11 @@
 use Drupal\Tests\UnitTestCase;
 
 /**
- * @coversDefaultClass \Drupal\Core\Config\Entity\ConfigStorageController
+ * @coversDefaultClass \Drupal\Core\Config\Entity\ConfigEntityStorage
  *
  * @group Drupal
  */
-class ConfigStorageControllerTest extends UnitTestCase {
+class ConfigEntityStorageTest extends UnitTestCase {
 
   /**
    * The entity type.
@@ -50,7 +50,7 @@ class ConfigStorageControllerTest extends UnitTestCase {
   /**
    * The config storage controller.
    *
-   * @var \Drupal\Core\Config\Entity\ConfigStorageController
+   * @var \Drupal\Core\Config\Entity\ConfigEntityStorage
    */
   protected $entityStorage;
 
@@ -80,8 +80,8 @@ class ConfigStorageControllerTest extends UnitTestCase {
    */
   public static function getInfo() {
     return array(
-      'name' => 'ConfigStorageController unit test',
-      'description' => 'Tests \Drupal\Core\Config\Entity\ConfigStorageController',
+      'name' => 'ConfigEntityStorage unit test',
+      'description' => 'Tests \Drupal\Core\Config\Entity\ConfigEntityStorage',
       'group' => 'Configuration',
     );
   }
@@ -121,7 +121,7 @@ protected function setUp() {
 
     $this->entityQuery = $this->getMock('Drupal\Core\Entity\Query\QueryInterface');
 
-    $this->entityStorage = $this->getMockBuilder('Drupal\Core\Config\Entity\ConfigStorageController')
+    $this->entityStorage = $this->getMockBuilder('Drupal\Core\Config\Entity\ConfigEntityStorage')
       ->setConstructorArgs(array($this->entityType, $this->configFactory, $this->configStorage, $this->uuidService, $this->languageManager))
       ->setMethods(array('getQuery'))
       ->getMock();