diff --git a/core/modules/config/src/Tests/ConfigLanguageOverrideTest.php b/core/modules/config/src/Tests/ConfigLanguageOverrideTest.php
index 308b524..1e7d3cd 100644
--- a/core/modules/config/src/Tests/ConfigLanguageOverrideTest.php
+++ b/core/modules/config/src/Tests/ConfigLanguageOverrideTest.php
@@ -85,50 +85,51 @@ function testConfigLanguageOverride() {
 
     // Test how overrides react to base configuration changes. Set up some base
     // values.
+    \Drupal::config('config_test.foo')
+      ->set('value', array('key' => 'original'))
+      ->set('label', 'Original')
+      ->save();
     \Drupal::languageManager()
-      ->getLanguageConfigOverride('de', 'config_test.overide')
+      ->getLanguageConfigOverride('de', 'config_test.foo')
       ->set('value', array('key' => 'override'))
       ->set('label', 'Override')
       ->save();
     \Drupal::languageManager()
-      ->getLanguageConfigOverride('fr', 'config_test.overide')
+      ->getLanguageConfigOverride('fr', 'config_test.foo')
       ->set('value', array('key' => 'override'))
       ->save();
-    \Drupal::config('config_test.overide')
-      ->set('value', array('key' => 'original'))
-      ->set('label', 'Original')
-      ->save();
-    $config = \Drupal::config('config_test.overide');
+    \Drupal::configFactory()->clearStaticCache();
+    $config = \Drupal::config('config_test.foo');
     $this->assertIdentical($config->get('value'), array('key' => 'override'));
 
     // Ensure renaming the config will rename the override.
-    \Drupal::configFactory()->rename('config_test.overide', 'config_test.override');
-    $config = \Drupal::config('config_test.override');
+    \Drupal::configFactory()->rename('config_test.foo', 'config_test.bar');
+    $config = \Drupal::config('config_test.bar');
     $this->assertEqual($config->get('value'), array('key' => 'original'));
-    $override = \Drupal::languageManager()->getLanguageConfigOverride('de', 'config_test.overide');
+    $override = \Drupal::languageManager()->getLanguageConfigOverride('de', 'config_test.foo');
     $this->assertTrue($override->isNew());
     $this->assertEqual($override->get('value'), NULL);
-    $override = \Drupal::languageManager()->getLanguageConfigOverride('de', 'config_test.override');
+    $override = \Drupal::languageManager()->getLanguageConfigOverride('de', 'config_test.bar');
     $this->assertFalse($override->isNew());
     $this->assertEqual($override->get('value'), array('key' => 'override'));
-    $override = \Drupal::languageManager()->getLanguageConfigOverride('fr', 'config_test.override');
+    $override = \Drupal::languageManager()->getLanguageConfigOverride('fr', 'config_test.bar');
     $this->assertFalse($override->isNew());
     $this->assertEqual($override->get('value'), array('key' => 'override'));
 
     // Ensure changing data in the config will update the overrides.
-    $config = \Drupal::config('config_test.override')->clear('value.key')->save();
+    $config = \Drupal::config('config_test.bar')->clear('value.key')->save();
     $this->assertEqual($config->get('value'), array());
-    $override = \Drupal::languageManager()->getLanguageConfigOverride('de', 'config_test.override');
+    $override = \Drupal::languageManager()->getLanguageConfigOverride('de', 'config_test.bar');
     $this->assertFalse($override->isNew());
     $this->assertEqual($override->get('value'), NULL);
     // The French override will become empty and therefore removed.
-    $override = \Drupal::languageManager()->getLanguageConfigOverride('fr', 'config_test.override');
+    $override = \Drupal::languageManager()->getLanguageConfigOverride('fr', 'config_test.bar');
     $this->assertTrue($override->isNew());
     $this->assertEqual($override->get('value'), NULL);
 
     // Ensure deleting the config will delete the override.
-    \Drupal::configFactory()->get('config_test.override')->delete();
-    $override = \Drupal::languageManager()->getLanguageConfigOverride('de', 'config_test.override');
+    \Drupal::configFactory()->get('config_test.bar')->delete();
+    $override = \Drupal::languageManager()->getLanguageConfigOverride('de', 'config_test.bar');
     $this->assertTrue($override->isNew());
     $this->assertEqual($override->get('value'), NULL);
   }
diff --git a/core/modules/language/src/Config/LanguageConfigFactoryOverride.php b/core/modules/language/src/Config/LanguageConfigFactoryOverride.php
index ea48920..24c4bf5 100644
--- a/core/modules/language/src/Config/LanguageConfigFactoryOverride.php
+++ b/core/modules/language/src/Config/LanguageConfigFactoryOverride.php
@@ -10,7 +10,6 @@
 use Drupal\Component\Utility\String;
 use Drupal\Core\Config\ConfigCollectionInfo;
 use Drupal\Core\Config\ConfigCrudEvent;
-use Drupal\Core\Config\ConfigEvents;
 use Drupal\Core\Config\ConfigFactoryOverrideBase;
 use Drupal\Core\Config\ConfigRenameEvent;
 use Drupal\Core\Config\StorageInterface;