diff --git a/core/lib/Drupal/Core/Entity/FieldableNullStorage.php b/core/lib/Drupal/Core/Entity/ContentEntityNullStorage.php
similarity index 94%
rename from core/lib/Drupal/Core/Entity/FieldableNullStorage.php
rename to core/lib/Drupal/Core/Entity/ContentEntityNullStorage.php
index e874ff5..3a7e7e5 100644
--- a/core/lib/Drupal/Core/Entity/FieldableNullStorage.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityNullStorage.php
@@ -11,11 +11,11 @@
 use Drupal\field\FieldInstanceConfigInterface;
 
 /**
- * Defines a null entity controller class.
+ * Defines a null entity storage.
  *
  * Used for content entity types that have no storage.
  */
-class FieldableNullStorage extends ContentEntityStorageBase {
+class ContentEntityNullStorage extends ContentEntityStorageBase {
 
   /**
    * {@inheritdoc}
diff --git a/core/lib/Drupal/Core/Entity/FieldableEntityStorageBase.php b/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
similarity index 100%
rename from core/lib/Drupal/Core/Entity/FieldableEntityStorageBase.php
rename to core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php