diff --git a/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php b/core/lib/Drupal/Core/Entity/DatabaseStorageHandlerNG.php
similarity index 100%
rename from core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php
rename to core/lib/Drupal/Core/Entity/DatabaseStorageHandlerNG.php
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestDefaultAccess.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestDefaultAccess.php
index 45d3821..bf30ef5 100644
--- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestDefaultAccess.php
+++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestDefaultAccess.php
@@ -20,7 +20,6 @@
  *   handlers = {
  *     "storage" = "Drupal\entity_test\EntityTestStorageHandler"
  *   },
- *   controller_class = "Drupal\entity_test\EntityTestStorageHandler",
  *   base_table = "entity_test",
  *   entity_keys = {
  *     "id" = "id"