diff --git a/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php b/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
index adc5c76..0c2bfe4 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
@@ -13,7 +13,7 @@
 use Drupal\field\FieldInstanceConfigInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
-abstract class ContentEntityStorageBase extends EntityStorageBase implements ExtendableEntityStorageInterface {
+abstract class ContentEntityStorageBase extends EntityStorageBase implements FieldableEntityStorageInterface {
 
   /**
    * The entity bundle key.
diff --git a/core/lib/Drupal/Core/Entity/ExtendableEntityStorageInterface.php b/core/lib/Drupal/Core/Entity/FieldableEntityStorageInterface.php
similarity index 96%
rename from core/lib/Drupal/Core/Entity/ExtendableEntityStorageInterface.php
rename to core/lib/Drupal/Core/Entity/FieldableEntityStorageInterface.php
index b58e0f3..2998c21 100644
--- a/core/lib/Drupal/Core/Entity/ExtendableEntityStorageInterface.php
+++ b/core/lib/Drupal/Core/Entity/FieldableEntityStorageInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Entity\ExtensibleEntityStorageInterface.
+ * Contains \Drupal\Core\Entity\FieldableEntityStorageInterface.
  */
 
 namespace Drupal\Core\Entity;
@@ -10,7 +10,7 @@
 use Drupal\field\FieldConfigInterface;
 use Drupal\field\FieldInstanceConfigInterface;
 
-interface ExtendableEntityStorageInterface extends EntityStorageInterface {
+interface FieldableEntityStorageInterface extends EntityStorageInterface {
 
   /**
    * Allows reaction to the creation of a configurable field.