diff --git a/core/includes/config.inc b/core/includes/config.inc
index 39094f8..db4dad3 100644
--- a/core/includes/config.inc
+++ b/core/includes/config.inc
@@ -28,7 +28,7 @@ function config_install_default_config($type, $name) {
     // Upon installation, only new config objects need to be created.
     // config_sync_get_changes() would potentially perform a diff of hundreds or
     // even thousands of config objects that happen to be contained in the
-    // active store. We leverage the NullStorage to avoid that needless
+    // active configuration. We leverage the NullStorage to avoid that needless
     // computation of differences.
     $config_changes = config_sync_get_changes($source_storage, $null_storage);
     if (empty($config_changes)) {
@@ -128,14 +128,14 @@ function config_sync_changes(array $config_changes, StorageInterface $source_sto
 }
 
 /**
- * Imports configuration into the active store.
+ * Imports configuration into the active configuration.
  *
  * @return bool|null
  *   TRUE if configuration was imported successfully, FALSE in case of a
  *   synchronization error, or NULL if there are no changes to synchronize.
  */
 function config_import() {
-  // Retrieve a list of differences between staging and the active store.
+  // Retrieve a list of differences between staging and the active configuration.
   $source_storage = drupal_container()->get('config.storage.staging');
   $target_storage = drupal_container()->get('config.storage');
 
@@ -213,10 +213,10 @@ function config_import_invoke_owner(array $config_changes, StorageInterface $sou
 }
 
 /**
- * Exports configuration from the active store to staging.
+ * Exports configuration from the active configuration to staging.
  */
 function config_export() {
-  // Retrieve a list of differences between the active store and staging.
+  // Retrieve a list of differences between the active configuration and staging.
   $source_storage = drupal_container()->get('config.storage');
   $target_storage = drupal_container()->get('config.storage.staging');
 
diff --git a/core/lib/Drupal/Core/Config/NullStorage.php b/core/lib/Drupal/Core/Config/NullStorage.php
index 94afba2..df7a190 100644
--- a/core/lib/Drupal/Core/Config/NullStorage.php
+++ b/core/lib/Drupal/Core/Config/NullStorage.php
@@ -15,7 +15,7 @@ namespace Drupal\Core\Config;
  * The stub implementation is needed for synchronizing configuration during
  * installation of a module, in which case all configuration being shipped with
  * the module is known to be new. Therefore, the module installation process is
- * able to short-circuit the full diff against the active store; the diff would
+ * able to short-circuit the full diff against the active configuration; the diff would
  * yield all currently available configuration as items to remove, since they do
  * not exist in the module's default configuration directory.
  *
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigCRUDTest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigCRUDTest.php
index 9eea495..1296a31 100644
--- a/core/modules/config/lib/Drupal/config/Tests/ConfigCRUDTest.php
+++ b/core/modules/config/lib/Drupal/config/Tests/ConfigCRUDTest.php
@@ -36,7 +36,7 @@ class ConfigCRUDTest extends WebTestBase {
     $config->save();
     $this->assertIdentical($config->isNew(), FALSE);
 
-    // Verify the active store contains the saved value.
+    // Verify the active configuration contains the saved value.
     $actual_data = $storage->read($name);
     $this->assertIdentical($actual_data, array('value' => 'initial'));
 
@@ -45,7 +45,7 @@ class ConfigCRUDTest extends WebTestBase {
     $config->save();
     $this->assertIdentical($config->isNew(), FALSE);
 
-    // Verify the active store contains the updated value.
+    // Verify the active configuration contains the updated value.
     $actual_data = $storage->read($name);
     $this->assertIdentical($actual_data, array('value' => 'instance-update'));
 
@@ -61,7 +61,7 @@ class ConfigCRUDTest extends WebTestBase {
     $this->assertIdentical($config->get(), array());
     $this->assertIdentical($config->isNew(), TRUE);
 
-    // Verify the active store contains no value.
+    // Verify the active configuration contains no value.
     $actual_data = $storage->read($name);
     $this->assertIdentical($actual_data, FALSE);
 
@@ -75,7 +75,7 @@ class ConfigCRUDTest extends WebTestBase {
     $config->save();
     $this->assertIdentical($config->isNew(), FALSE);
 
-    // Verify the active store contains the updated value.
+    // Verify the active configuration contains the updated value.
     $actual_data = $storage->read($name);
     $this->assertIdentical($actual_data, array('value' => 're-created'));
 
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigImportTest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigImportTest.php
index 9316962..310b895 100644
--- a/core/modules/config/lib/Drupal/config/Tests/ConfigImportTest.php
+++ b/core/modules/config/lib/Drupal/config/Tests/ConfigImportTest.php
@@ -10,7 +10,7 @@ namespace Drupal\config\Tests;
 use Drupal\simpletest\WebTestBase;
 
 /**
- * Tests importing configuration from files into active store.
+ * Tests importing configuration from files into active configuration.
  */
 class ConfigImportTest extends WebTestBase {
 
@@ -24,7 +24,7 @@ class ConfigImportTest extends WebTestBase {
   public static function getInfo() {
     return array(
       'name' => 'Import configuration',
-      'description' => 'Tests importing configuration from files into active store.',
+      'description' => 'Tests importing configuration from files into active configuration.',
       'group' => 'Configuration',
     );
   }
@@ -187,7 +187,7 @@ class ConfigImportTest extends WebTestBase {
     $original_dynamic_data['label'] = 'Updated';
     $staging->write($dynamic_name, $original_dynamic_data);
 
-    // Verify the active store still returns the default values.
+    // Verify the active configuration still returns the default values.
     $config = config($name);
     $this->assertIdentical($config->get('foo'), 'bar');
     $config = config($dynamic_name);
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 c8cd2d0..516bb9d 100644
--- a/core/modules/config/lib/Drupal/config/Tests/Storage/DatabaseStorageTest.php
+++ b/core/modules/config/lib/Drupal/config/Tests/Storage/DatabaseStorageTest.php
@@ -25,7 +25,7 @@ class DatabaseStorageTest extends ConfigStorageTestBase {
     parent::setUp();
 
     $schema['config'] = array(
-      'description' => 'Default active store for the configuration system.',
+      'description' => 'Database storage for the configuration system.',
       'fields' => array(
         'name' => array(
           'description' => 'The identifier for the configuration entry, such as module.example (the name of the file, minus the file extension).',
diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php
index 4a728f3..3cb32f8 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php
@@ -104,7 +104,7 @@ abstract class ModuleTestBase extends WebTestBase {
     // Verify that the config directory is not empty.
     $this->assertTrue($names);
 
-    // Look up each default configuration object name in the active store, and
+    // Look up each default configuration object name in the active configuration, and
     // if it exists, remove it from the stack.
     foreach ($names as $key => $name) {
       if (config($name)->get()) {