diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index 5ede5c1..e2e7cb3 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -1,5 +1,6 @@
 <?php
 
+use Drupal;
 use Drupal\Core\Config\FileStorage;
 use Drupal\Core\DrupalKernel;
 use Drupal\Core\CoreBundle;
diff --git a/core/modules/locale/lib/Drupal/locale/LocaleConfigManager.php b/core/modules/locale/lib/Drupal/locale/LocaleConfigManager.php
index 5e07673..525c43c 100644
--- a/core/modules/locale/lib/Drupal/locale/LocaleConfigManager.php
+++ b/core/modules/locale/lib/Drupal/locale/LocaleConfigManager.php
@@ -286,8 +286,8 @@ public function translateString($name, $langcode, $source, $context) {
    * @param string $langcode
    *   The language code.
    * @param string|NULL $name
-   *   The name of the configuration object. Set NULL to get all $langcode
-   *   overridden  configurations.
+   *   Name of the original configuration. Set to NULL to get the name prefix
+   *   for all $langcode overrides.
    *
    * @return string
    */
diff --git a/core/modules/locale/lib/Drupal/locale/Locale.php b/core/modules/locale/lib/Drupal/locale/LocaleModule.php
similarity index 82%
rename from core/modules/locale/lib/Drupal/locale/Locale.php
rename to core/modules/locale/lib/Drupal/locale/LocaleModule.php
index 46a4e3c..7183940 100644
--- a/core/modules/locale/lib/Drupal/locale/Locale.php
+++ b/core/modules/locale/lib/Drupal/locale/LocaleModule.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\locale\Locale.
+ * Contains \Drupal\locale\LocaleModule.
  */
 
 namespace Drupal\locale;
@@ -12,7 +12,7 @@
 /**
  * Static service container wrapper for locale.
  */
-class Locale {
+class LocaleModule {
 
   /**
    * Returns the locale configuration manager service.
@@ -24,7 +24,7 @@ class Locale {
    *
    * @return \Drupal\locale\LocaleConfigManager
    */
-  public static function storage() {
+  public static function config() {
     return Drupal::service('locale.config.typed');
   }
 }
diff --git a/core/modules/locale/locale.bulk.inc b/core/modules/locale/locale.bulk.inc
index ae1e75b..b95e352 100644
--- a/core/modules/locale/locale.bulk.inc
+++ b/core/modules/locale/locale.bulk.inc
@@ -5,6 +5,7 @@
  * Mass import-export and batch import functionality for Gettext .po files.
  */
 
+use Drupal;
 use Drupal\Component\Gettext\PoStreamWriter;
 use Drupal\locale\Gettext;
 use Drupal\locale\PoDatabaseReader;
@@ -595,7 +596,7 @@ function locale_translate_batch_refresh(array $options, array &$context) {
     // Clear cache and force refresh of JavaScript translations.
     _locale_refresh_translations($context['sandbox']['refresh']['languages'], $next);
     // Check whether we need to refresh configuration objects.
-    if (!empty($options['refresh_configuration']) && $names = Locale::storage()->getStringNames($next)) {
+    if (!empty($options['refresh_configuration']) && $names = LocaleModule::config()->getStringNames($next)) {
       $context['sandbox']['refresh']['names'] = $names;
     }
   }
@@ -770,7 +771,7 @@ function locale_translate_delete_translation_files($projects = array(), $langcod
  */
 function locale_config_batch_update_components(array $options, $langcodes = array(), $components = array()) {
   $langcodes = $langcodes ? $langcodes : array_keys(locale_translatable_language_list());
-  if ($langcodes && $names = Locale::storage()->getComponentNames($components)) {
+  if ($langcodes && $names = LocaleModule::config()->getComponentNames($components)) {
     return locale_config_batch_build($names, $langcodes, $options);
   }
 }
@@ -872,15 +873,15 @@ function locale_config_update_multiple(array $names, $langcodes = array()) {
   $langcodes = $langcodes ? $langcodes : array_keys(locale_translatable_language_list());
   $count = 0;
   foreach ($names as $name) {
-    $wrapper = Locale::storage()->get($name);
+    $wrapper = LocaleModule::config()->get($name);
     foreach ($langcodes as $langcode) {
       $translation = $wrapper->getValue() ? $wrapper->getTranslation($langcode, TRUE)->getValue() : NULL;
       if ($translation) {
-        Locale::storage()->saveTranslationData($name, $langcode, $translation);
+        LocaleModule::config()->saveTranslationData($name, $langcode, $translation);
         $count++;
       }
       else {
-        Locale::storage()->deleteTranslationData($name, $langcode);
+        LocaleModule::config()->deleteTranslationData($name, $langcode);
       }
     }
   }
diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module
index f81bc81..75c4fd7 100644
--- a/core/modules/locale/locale.module
+++ b/core/modules/locale/locale.module
@@ -10,6 +10,7 @@
  * object files are supported.
  */
 
+use Drupal;
 use Drupal\locale\LocaleLookup;
 use Drupal\locale\LocaleConfigSubscriber;
 use Drupal\locale\SourceString;
@@ -320,7 +321,7 @@ function locale_language_delete($language) {
   locale_translate_delete_translation_files(array(), array($language->langcode));
 
   // Remove translated configuration objects.
-  Locale::storage()->deleteLanguageTranslations($language->langcode);
+  LocaleModule::config()->deleteLanguageTranslations($language->langcode);
 
   // Changing the language settings impacts the interface:
   _locale_invalidate_js($language->langcode);
@@ -564,7 +565,7 @@ function locale_system_remove($components) {
     module_load_include('compare.inc', 'locale');
     Drupal::moduleHandler()->loadInclude('locale', 'inc', 'bulk');
     // Delete configuration translations.
-    Locale::storage()->deleteComponentTranslations($components, array_keys($language_list));
+    LocaleModule::config()->deleteComponentTranslations($components, array_keys($language_list));
 
     // Only when projects are removed, the translation files and records will be
     // deleted. Not each disabled module will remove a project. E.g. sub modules.
@@ -1088,7 +1089,7 @@ function _locale_refresh_translations($langcodes, $lids = array()) {
  *   List of string identifiers that have been updated / created.
  */
 function _locale_refresh_configuration(array $langcodes, array $lids) {
-  if ($lids && $langcodes && $names = Locale::storage()->getStringNames($lids)) {
+  if ($lids && $langcodes && $names = LocaleModule::config()->getStringNames($lids)) {
     Drupal::moduleHandler()->loadInclude('locale', 'inc', 'bulk');
     locale_config_update_multiple($names, $langcodes);
   }