diff --git a/core/modules/config/config.admin.inc b/core/modules/config/config.admin.inc
index a961286..36ffb8f 100644
--- a/core/modules/config/config.admin.inc
+++ b/core/modules/config/config.admin.inc
@@ -35,8 +35,8 @@ function config_admin_sync_form(array &$form, array &$form_state, StorageInterfa
     return $form;
   }
 
-  $config_comparer = new StorageComparerManifest(Drupal::service('config.storage.staging'), Drupal::service('config.storage'));
-  if (!$config_comparer->createChangelist()->hasChanges()) {
+  $storage_comparer = new StorageComparerManifest(Drupal::service('config.storage.staging'), Drupal::service('config.storage'));
+  if (!$storage_comparer->createChangelist()->hasChanges()) {
     $form['no_changes'] = array(
       '#markup' => t('There are no configuration changes.'),
     );
@@ -45,13 +45,13 @@ function config_admin_sync_form(array &$form, array &$form_state, StorageInterfa
   }
   else {
     // Store the comparer for use in the submit.
-    $form_state['storage_comparer'] = $config_comparer;
+    $form_state['storage_comparer'] = $storage_comparer;
   }
 
   // Add the AJAX library to the form for dialog support.
   $form['#attached']['library'][] = array('system', 'drupal.ajax');
 
-  foreach ($config_comparer->getChangelist() as $config_change_type => $config_files) {
+  foreach ($storage_comparer->getChangelist() as $config_change_type => $config_files) {
     if (empty($config_files)) {
       continue;
     }
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigImporterTest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigImporterTest.php
index 0160ee3..9ea03a0 100644
--- a/core/modules/config/lib/Drupal/config/Tests/ConfigImporterTest.php
+++ b/core/modules/config/lib/Drupal/config/Tests/ConfigImporterTest.php
@@ -50,11 +50,11 @@ function setUp() {
     unset($GLOBALS['hook_config_test']);
 
     // Set up the ConfigImporter object for testing.
-    $config_comparer = new StorageComparerManifest(
+    $storage_comparer = new StorageComparerManifest(
       $this->container->get('config.storage.staging'),
       $this->container->get('config.storage'));
     $this->configImporter = new ConfigImporter(
-      $config_comparer->createChangelist(),
+      $storage_comparer->createChangelist(),
       $this->container->get('event_dispatcher'),
       $this->container->get('config.factory'),
       $this->container->get('plugin.manager.entity'),
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
index f07e249..01f77d4 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
@@ -1292,11 +1292,11 @@
   public function configImporter() {
     if (!$this->configImporter) {
       // Set up the ConfigImporter object for testing.
-      $config_comparer = new StorageComparerManifest(
+      $storage_comparer = new StorageComparerManifest(
         $this->container->get('config.storage.staging'),
         $this->container->get('config.storage'));
       $this->configImporter = new ConfigImporter(
-        $config_comparer,
+        $storage_comparer,
         $this->container->get('event_dispatcher'),
         $this->container->get('config.factory'),
         $this->container->get('plugin.manager.entity'),