diff --git a/core/includes/module.inc b/core/includes/module.inc
index b5d189cc4a2982e8133ff52f05938fec55acde3e..18de4fcdb58511dcb78f5ff40a02cf2f0419e104 100644
--- a/core/includes/module.inc
+++ b/core/includes/module.inc
@@ -28,7 +28,7 @@
  * @todo There are too many layers/levels of caching involved for system_list()
  *   data. Consider to add a \Drupal::config($name, $cache = TRUE) argument to allow
  *   callers like system_list() to force-disable a possible configuration
- *   storage controller cache or some other way to circumvent it/take it over.
+ *   storage cache or some other way to circumvent it/take it over.
  */
 function system_list($type) {
   $lists = &drupal_static(__FUNCTION__);
diff --git a/core/lib/Drupal/Core/Config/CachedStorage.php b/core/lib/Drupal/Core/Config/CachedStorage.php
index 1ff404629e9e0f317b9c654d8bdbe8b81d9ea182..08dc5828f261c526b39bd0d57aa966df03ff56c1 100644
--- a/core/lib/Drupal/Core/Config/CachedStorage.php
+++ b/core/lib/Drupal/Core/Config/CachedStorage.php
@@ -11,7 +11,7 @@
 use Drupal\Core\Cache\CacheBackendInterface;
 
 /**
- * Defines the cached storage controller.
+ * Defines the cached storage.
  *
  * The class gets another storage and a cache backend injected. It reads from
  * the cache and delegates the read to the storage on a cache miss. It also
@@ -41,10 +41,10 @@ class CachedStorage implements StorageInterface, StorageCacheInterface {
   protected $findByPrefixCache = array();
 
   /**
-   * Constructs a new CachedStorage controller.
+   * Constructs a new CachedStorage.
    *
    * @param \Drupal\Core\Config\StorageInterface $storage
-   *   A configuration storage controller to be cached.
+   *   A configuration storage to be cached.
    * @param \Drupal\Core\Cache\CacheBackendInterface $cache
    *   A cache backend instance to use for caching.
    */
diff --git a/core/lib/Drupal/Core/Config/Config.php b/core/lib/Drupal/Core/Config/Config.php
index 19899a567ccac64bdf9609c71c05cfc30d445767..7cbe2eba6ccfb1b1a18cc5d92fe9e71021bfacf7 100644
--- a/core/lib/Drupal/Core/Config/Config.php
+++ b/core/lib/Drupal/Core/Config/Config.php
@@ -57,7 +57,7 @@ class Config extends StorableConfigBase {
    * @param string $name
    *   The name of the configuration object being constructed.
    * @param \Drupal\Core\Config\StorageInterface $storage
-   *   A storage controller object to use for reading and writing the
+   *   A storage object to use for reading and writing the
    *   configuration data.
    * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher
    *   An event dispatcher instance to use for configuration events.
diff --git a/core/lib/Drupal/Core/Config/ConfigFactory.php b/core/lib/Drupal/Core/Config/ConfigFactory.php
index 0e7826ede7adf9a0cec64f3ac3b3f99b23460328..5d3756e250875dcf114e674e5c602704290636df 100644
--- a/core/lib/Drupal/Core/Config/ConfigFactory.php
+++ b/core/lib/Drupal/Core/Config/ConfigFactory.php
@@ -19,7 +19,7 @@
  *
  * @see \Drupal\Core\Config\Config
  *
- * Each configuration object gets a storage controller object injected, which
+ * Each configuration object gets a storage object injected, which
  * is used for reading and writing the configuration data.
  *
  * @see \Drupal\Core\Config\StorageInterface
@@ -27,7 +27,7 @@
 class ConfigFactory implements ConfigFactoryInterface, EventSubscriberInterface {
 
   /**
-   * A storage controller instance for reading and writing configuration data.
+   * A storage instance for reading and writing configuration data.
    *
    * @var \Drupal\Core\Config\StorageInterface
    */
diff --git a/core/lib/Drupal/Core/Config/ConfigFactoryInterface.php b/core/lib/Drupal/Core/Config/ConfigFactoryInterface.php
index 639b483914eff47615c004c981e9fbec144c0aaa..55eb6f6aff0297f5032bcad8332a205ad9f5be19 100644
--- a/core/lib/Drupal/Core/Config/ConfigFactoryInterface.php
+++ b/core/lib/Drupal/Core/Config/ConfigFactoryInterface.php
@@ -70,7 +70,7 @@ public function loadMultiple(array $names);
   public function reset($name = NULL);
 
   /**
-   * Renames a configuration object using the storage controller.
+   * Renames a configuration object using the storage.
    *
    * @param string $old_name
    *   The old name of the configuration object.
diff --git a/core/lib/Drupal/Core/Config/DatabaseStorage.php b/core/lib/Drupal/Core/Config/DatabaseStorage.php
index fd8f2ee41464e2544d6319104e31fa8504115cfb..e1e7faca8180050bb8ce4f76e8714da12753518e 100644
--- a/core/lib/Drupal/Core/Config/DatabaseStorage.php
+++ b/core/lib/Drupal/Core/Config/DatabaseStorage.php
@@ -37,7 +37,7 @@ class DatabaseStorage implements StorageInterface {
   protected $options = array();
 
   /**
-   * Constructs a new DatabaseStorage controller.
+   * Constructs a new DatabaseStorage.
    *
    * @param \Drupal\Core\Database\Connection $connection
    *   A Database connection to use for reading and writing configuration data.
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
index 2d773dcd44ccced56f96e6458f355c8493445068..6a1fdb6860d5ec57e68b07dc6fd9119406c184fd 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
@@ -352,7 +352,7 @@ public function save(EntityInterface $entity) {
 
     if ($id !== $entity->id()) {
       // Renaming a config object needs to cater for:
-      // - Storage controller needs to access the original object.
+      // - Storage needs to access the original object.
       // - The object needs to be renamed/copied in ConfigFactory and reloaded.
       // - All instances of the object need to be renamed.
       $config = $this->configFactory->rename($prefix . $id, $prefix . $entity->id());
diff --git a/core/lib/Drupal/Core/Config/FileStorage.php b/core/lib/Drupal/Core/Config/FileStorage.php
index 14268e9c62dcbd9b94923f2ac5da783093e2f82e..fbb997051a83b21989e45b65c0659f86e7d6a5b0 100644
--- a/core/lib/Drupal/Core/Config/FileStorage.php
+++ b/core/lib/Drupal/Core/Config/FileStorage.php
@@ -13,7 +13,7 @@
 use Symfony\Component\Yaml\Parser;
 
 /**
- * Defines the file storage controller.
+ * Defines the file storage.
  */
 class FileStorage implements StorageInterface {
 
@@ -39,7 +39,7 @@ class FileStorage implements StorageInterface {
   protected $parser;
 
   /**
-   * Constructs a new FileStorage controller.
+   * Constructs a new FileStorage.
    *
    * @param string $directory
    *   A directory path to use for reading and writing of configuration files.
diff --git a/core/lib/Drupal/Core/Config/InstallStorage.php b/core/lib/Drupal/Core/Config/InstallStorage.php
index cdc1719d4b42dcdbf5698e0cfea1fa5dbef95069..1aa1bec2866405e98fa5e4973ddffa4845421a48 100644
--- a/core/lib/Drupal/Core/Config/InstallStorage.php
+++ b/core/lib/Drupal/Core/Config/InstallStorage.php
@@ -10,7 +10,7 @@
 use Drupal\Core\Extension\ExtensionDiscovery;
 
 /**
- * Storage controller used by the Drupal installer.
+ * Storage used by the Drupal installer.
  *
  * This storage performs a full filesystem scan to discover all available
  * extensions and reads from all default config directories that exist.
diff --git a/core/lib/Drupal/Core/Config/NullStorage.php b/core/lib/Drupal/Core/Config/NullStorage.php
index 2bf121d683e502c9d3c52de69fc083f7e48ce805..c66f718fcddcc07e37108b6fb622ac6964d47844 100644
--- a/core/lib/Drupal/Core/Config/NullStorage.php
+++ b/core/lib/Drupal/Core/Config/NullStorage.php
@@ -8,7 +8,7 @@
 namespace Drupal\Core\Config;
 
 /**
- * Defines a stub storage controller.
+ * Defines a stub storage.
  *
  * This storage is always empty; the controller reads and writes nothing.
  *
diff --git a/core/lib/Drupal/Core/Config/StorageCacheInterface.php b/core/lib/Drupal/Core/Config/StorageCacheInterface.php
index 8d864bbbf53fa6d01146aed3731b1aa449fa07ec..674547fd30f520616612355506cf3cb8797d1255 100644
--- a/core/lib/Drupal/Core/Config/StorageCacheInterface.php
+++ b/core/lib/Drupal/Core/Config/StorageCacheInterface.php
@@ -8,7 +8,7 @@
 namespace Drupal\Core\Config;
 
 /**
- * Defines an interface for cached configuration storage controllers.
+ * Defines an interface for cached configuration storage.
  */
 interface StorageCacheInterface {
 
diff --git a/core/lib/Drupal/Core/Config/StorageComparer.php b/core/lib/Drupal/Core/Config/StorageComparer.php
index ee467b6be8124d35fe688d8bd3a737d052ff4326..b30db17405ecf030bde69a0fe6642c198db6ddce 100644
--- a/core/lib/Drupal/Core/Config/StorageComparer.php
+++ b/core/lib/Drupal/Core/Config/StorageComparer.php
@@ -68,9 +68,9 @@ class StorageComparer implements StorageComparerInterface {
    * Constructs the Configuration storage comparer.
    *
    * @param \Drupal\Core\Config\StorageInterface $source_storage
-   *   Storage controller object used to read configuration.
+   *   Storage object used to read configuration.
    * @param \Drupal\Core\Config\StorageInterface $target_storage
-   *   Storage controller object used to write configuration.
+   *   Storage object used to write configuration.
    */
   public function __construct(StorageInterface $source_storage, StorageInterface $target_storage) {
     $this->sourceStorage = $source_storage;
diff --git a/core/lib/Drupal/Core/Config/StorageComparerInterface.php b/core/lib/Drupal/Core/Config/StorageComparerInterface.php
index 3c6c666118094492464dd057119446233a302c92..e8c597d7897db5d419a56edfbb88285fbed9d52f 100644
--- a/core/lib/Drupal/Core/Config/StorageComparerInterface.php
+++ b/core/lib/Drupal/Core/Config/StorageComparerInterface.php
@@ -16,7 +16,7 @@ interface StorageComparerInterface {
    * Gets the configuration source storage.
    *
    * @return \Drupal\Core\Config\StorageInterface
-   *   Storage controller object used to read configuration.
+   *   Storage object used to read configuration.
    */
   public function getSourceStorage();
 
@@ -24,7 +24,7 @@ public function getSourceStorage();
    * Gets the configuration target storage.
    *
    * @return \Drupal\Core\Config\StorageInterface
-   *   Storage controller object used to write configuration.
+   *   Storage object used to write configuration.
    */
   public function getTargetStorage();
 
diff --git a/core/lib/Drupal/Core/Config/StorageException.php b/core/lib/Drupal/Core/Config/StorageException.php
index b1e99a1b9f113f3e5df9ac3b75244ebd6e30e71c..a317d8b0672b27f81dc59c545a4a5ebc280d1a28 100644
--- a/core/lib/Drupal/Core/Config/StorageException.php
+++ b/core/lib/Drupal/Core/Config/StorageException.php
@@ -8,6 +8,6 @@
 namespace Drupal\Core\Config;
 
 /**
- * An exception thrown in case of storage controller operation errors.
+ * An exception thrown in case of storage operation errors.
  */
 class StorageException extends ConfigException {}
diff --git a/core/lib/Drupal/Core/Config/StorageInterface.php b/core/lib/Drupal/Core/Config/StorageInterface.php
index 9b45fa80ff1aacaf025209c84860ee7bd3583688..35cdf8aab9944789948b3e7da94ca41796385b94 100644
--- a/core/lib/Drupal/Core/Config/StorageInterface.php
+++ b/core/lib/Drupal/Core/Config/StorageInterface.php
@@ -8,7 +8,7 @@
 namespace Drupal\Core\Config;
 
 /**
- * Defines an interface for configuration storage controllers.
+ * Defines an interface for configuration storage.
  *
  * Classes implementing this interface allow reading and writing configuration
  * data from and to the storage.
diff --git a/core/lib/Drupal/Core/Config/TypedConfigManager.php b/core/lib/Drupal/Core/Config/TypedConfigManager.php
index 011be4d7e24bd43a62a970bc21dacc46b3067776..07b0384b3616373c06fc3a4c66aacffd7bf769f3 100644
--- a/core/lib/Drupal/Core/Config/TypedConfigManager.php
+++ b/core/lib/Drupal/Core/Config/TypedConfigManager.php
@@ -26,14 +26,14 @@ class TypedConfigManager extends PluginManagerBase implements TypedConfigManager
   const CACHE_ID = 'typed_config_definitions';
 
   /**
-   * A storage controller instance for reading configuration data.
+   * A storage instance for reading configuration data.
    *
    * @var \Drupal\Core\Config\StorageInterface
    */
   protected $configStorage;
 
   /**
-   * A storage controller instance for reading configuration schema data.
+   * A storage instance for reading configuration schema data.
    *
    * @var \Drupal\Core\Config\StorageInterface
    */
@@ -57,9 +57,9 @@ class TypedConfigManager extends PluginManagerBase implements TypedConfigManager
    * Creates a new typed configuration manager.
    *
    * @param \Drupal\Core\Config\StorageInterface $configStorage
-   *   The storage controller object to use for reading schema data
+   *   The storage object to use for reading schema data
    * @param \Drupal\Core\Config\StorageInterface $schemaStorage
-   *   The storage controller object to use for reading schema data
+   *   The storage object to use for reading schema data
    * @param \Drupal\Core\Cache\CacheBackendInterface $cache
    *   The cache backend to use for caching the definitions.
    */
diff --git a/core/modules/config/lib/Drupal/config/Tests/Storage/DatabaseStorageTest.php b/core/modules/config/lib/Drupal/config/Tests/Storage/DatabaseStorageTest.php
index 516bb9d756d97a76b1cb8a8cb5a71bcbfaab0d29..66cdb995d7d76c380c5ec1d3ca2594103cf11520 100644
--- a/core/modules/config/lib/Drupal/config/Tests/Storage/DatabaseStorageTest.php
+++ b/core/modules/config/lib/Drupal/config/Tests/Storage/DatabaseStorageTest.php
@@ -10,13 +10,13 @@
 use Drupal\Core\Config\DatabaseStorage;
 
 /**
- * Tests DatabaseStorage controller operations.
+ * Tests DatabaseStorage operations.
  */
 class DatabaseStorageTest extends ConfigStorageTestBase {
   public static function getInfo() {
     return array(
-      'name' => 'DatabaseStorage controller operations',
-      'description' => 'Tests DatabaseStorage controller operations.',
+      'name' => 'DatabaseStorage operations',
+      'description' => 'Tests DatabaseStorage operations.',
       'group' => 'Configuration',
     );
   }
diff --git a/core/modules/config/lib/Drupal/config/Tests/Storage/FileStorageTest.php b/core/modules/config/lib/Drupal/config/Tests/Storage/FileStorageTest.php
index d430bd388d46b22ce93c47c8a87832ca49e197c6..dd6c4009d12254982eb92978967cbc121ca9665e 100644
--- a/core/modules/config/lib/Drupal/config/Tests/Storage/FileStorageTest.php
+++ b/core/modules/config/lib/Drupal/config/Tests/Storage/FileStorageTest.php
@@ -11,13 +11,13 @@
 use Symfony\Component\Yaml\Yaml;
 
 /**
- * Tests FileStorage controller operations.
+ * Tests FileStorage operations.
  */
 class FileStorageTest extends ConfigStorageTestBase {
   public static function getInfo() {
     return array(
-      'name' => 'FileStorage controller operations',
-      'description' => 'Tests FileStorage controller operations.',
+      'name' => 'FileStorage operations',
+      'description' => 'Tests FileStorage operations.',
       'group' => 'Configuration',
     );
   }
diff --git a/core/modules/migrate/lib/Drupal/migrate/MigrationStorage.php b/core/modules/migrate/lib/Drupal/migrate/MigrationStorage.php
index 73a5f07615a345cca3c2462d57c0bf120f96f5ae..30c63fee76690f1c0e552c70bbc5389ece26ef56 100644
--- a/core/modules/migrate/lib/Drupal/migrate/MigrationStorage.php
+++ b/core/modules/migrate/lib/Drupal/migrate/MigrationStorage.php
@@ -11,7 +11,7 @@
 use Drupal\Core\Config\Entity\ConfigEntityStorage;
 
 /**
- * Storage controller for migration entities.
+ * Storage for migration entities.
  */
 class MigrationStorage extends ConfigEntityStorage implements MigrateBuildDependencyInterface {
 
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/MigrationStorage.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/MigrationStorage.php
index 5e65cf1fcdb0259645ec03f40ce0f003ed9e3538..28afe631465a28fe1b0cb18772fa6e877201256b 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/MigrationStorage.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/MigrationStorage.php
@@ -13,7 +13,7 @@
 use Drupal\migrate\MigrationStorage as BaseMigrationStorage;
 
 /**
- * Storage controller for migration entities.
+ * Storage for migration entities.
  */
 class MigrationStorage extends BaseMigrationStorage {
 
diff --git a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
index d6f5c9c6efe9d5e2603adbcd48aa5fbd41f0f071..10ba1a6cab7f22d541f1918718090ad0d575acfb 100644
--- a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
@@ -49,7 +49,7 @@ class ConfigEntityStorageTest extends UnitTestCase {
   protected $languageManager;
 
   /**
-   * The config storage controller.
+   * The config storage.
    *
    * @var \Drupal\Core\Config\Entity\ConfigEntityStorage
    */