diff -u b/core/lib/Drupal/Core/Config/DatabaseStorage.php b/core/lib/Drupal/Core/Config/DatabaseStorage.php
--- b/core/lib/Drupal/Core/Config/DatabaseStorage.php
+++ b/core/lib/Drupal/Core/Config/DatabaseStorage.php
@@ -11,7 +11,7 @@
 use Drupal\Core\Database\Connection;
 
 /**
- * Defines the Database storage controller.
+ * Defines the Database storage.
  */
 class DatabaseStorage implements StorageInterface {
 
only in patch2:
unchanged:
--- a/core/lib/Drupal/Core/Config/ConfigImporter.php
+++ b/core/lib/Drupal/Core/Config/ConfigImporter.php
@@ -283,7 +283,7 @@ protected function importConfig($op, $name) {
   }
 
   /**
-   * Invokes import* methods on configuration entity storage controllers.
+   * Invokes import* methods on configuration entity storage.
    *
    * Allow modules to take over configuration change operations for higher-level
    * configuration data.
@@ -321,7 +321,7 @@ protected function importInvokeOwner($op, $name) {
 
       $method = 'import' . ucfirst($op);
       $entity_storage = $this->configManager->getEntityManager()->getStorageController($entity_type);
-      // Call to the configuration entity's storage controller to handle the
+      // Call to the configuration entity's storage to handle the
       // configuration change.
       if (!($entity_storage instanceof ImportableEntityStorageInterface)) {
         throw new EntityStorageException(String::format('The entity storage "@storage" for the "@entity_type" entity type does not support imports', array('@storage' => get_class($entity_storage), '@entity_type' => $entity_type)));