diff -u b/core/lib/Drupal/Core/Entity/ContentEntityDatabaseStorage.php b/core/lib/Drupal/Core/Entity/ContentEntityDatabaseStorage.php
--- b/core/lib/Drupal/Core/Entity/ContentEntityDatabaseStorage.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityDatabaseStorage.php
@@ -104,7 +104,7 @@
   /**
    * The entity schema handler.
    *
-   * @var \Drupal\Core\Entity\EntityTypeListenerInterface
+   * @var \Drupal\Core\Entity\Schema\EntitySchemaHandlerInterface
    */
   protected $schemaHandler;
 
diff -u b/core/lib/Drupal/Core/Entity/EntityTypeListenerInterface.php b/core/lib/Drupal/Core/Entity/EntityTypeListenerInterface.php
--- b/core/lib/Drupal/Core/Entity/EntityTypeListenerInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityTypeListenerInterface.php
@@ -9,6 +9,8 @@
 
 /**
  * Defines an interface for reacting to entity type creation, deletion, and updates.
+ *
+ * @todo Convert to Symfony events: https://www.drupal.org/node/2332935
  */
 interface EntityTypeListenerInterface {
 
diff -u /dev/null b/core/lib/Drupal/Core/Entity/Schema/EntitySchemaHandlerInterface.php
--- /dev/null
+++ b/core/lib/Drupal/Core/Entity/Schema/EntitySchemaHandlerInterface.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Entity\Schema\EntitySchemaHandlerInterface.
+ */
+
+namespace Drupal\Core\Entity\Schema;
+use Drupal\Core\Entity\EntityTypeListenerInterface;
+
+/**
+ * Defines an interface for handling the storage schema of entities.
+ */
+interface EntitySchemaHandlerInterface extends EntityTypeListenerInterface {
+}
diff -u b/core/lib/Drupal/Core/Entity/Schema/SqlContentEntityStorageSchema.php b/core/lib/Drupal/Core/Entity/Schema/SqlContentEntityStorageSchema.php
--- b/core/lib/Drupal/Core/Entity/Schema/SqlContentEntityStorageSchema.php
+++ b/core/lib/Drupal/Core/Entity/Schema/SqlContentEntityStorageSchema.php
@@ -12,12 +12,11 @@
 use Drupal\Core\Entity\ContentEntityTypeInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Entity\EntityTypeListenerInterface;
 
 /**
  * Defines a schema handler that supports revisionable, translatable entities.
  */
-class SqlContentEntityStorageSchema implements EntityTypeListenerInterface {
+class SqlContentEntityStorageSchema implements EntitySchemaHandlerInterface {
 
   /**
    * The entity type this schema builder is responsible for.