diff --git a/core/lib/Drupal/Core/Language/LanguageManager.php b/core/lib/Drupal/Core/Language/LanguageManager.php
index cf450f7..b8f5aef 100644
--- a/core/lib/Drupal/Core/Language/LanguageManager.php
+++ b/core/lib/Drupal/Core/Language/LanguageManager.php
@@ -7,9 +7,7 @@
 
 namespace Drupal\Core\Language;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
-use Drupal\Core\StringTranslation\TranslationInterface;
 use Drupal\Core\StringTranslation\TranslatableString;
 use Drupal\Core\Url;
 
@@ -164,15 +162,15 @@ public function getLanguage($langcode) {
    */
   public function getLanguageName($langcode) {
     if ($langcode == LanguageInterface::LANGCODE_NOT_SPECIFIED) {
-      return new TranslationWrapper('None');
+      return new TranslatableString('None');
     }
     if ($language = $this->getLanguage($langcode)) {
       return $language->getName();
     }
     if (empty($langcode)) {
-      return new TranslationWrapper('Unknown');
+      return new TranslatableString('Unknown');
     }
-    return new TranslationWrapper('Unknown (@langcode)', array('@langcode' => $langcode));
+    return new TranslatableString('Unknown (@langcode)', array('@langcode' => $langcode));
   }
 
   /**
@@ -385,7 +383,7 @@ protected function filterLanguages(array $languages, $flags = LanguageInterface:
       $default = new Language(
         array(
           'id' => $defaultLanguage->getId(),
-          'name' => new TranslationWrapper("Site's default language (@lang_name)",
+          'name' => new TranslatableString("Site's default language (@lang_name)",
             array('@lang_name' => $defaultLanguage->getName())),
           'direction' => $defaultLanguage->getDirection(),
           'weight' => $defaultLanguage->getWeight(),
diff --git a/core/modules/language/src/ConfigurableLanguageManager.php b/core/modules/language/src/ConfigurableLanguageManager.php
index 7159f4e..26c6c13 100644
--- a/core/modules/language/src/ConfigurableLanguageManager.php
+++ b/core/modules/language/src/ConfigurableLanguageManager.php
@@ -13,7 +13,7 @@
 use Drupal\Core\Language\Language;
 use Drupal\Core\Language\LanguageDefault;
 use Drupal\Core\Language\LanguageManager;
-use Drupal\Core\StringTranslation\TranslationWrapper;
+use Drupal\Core\StringTranslation\TranslatableString;
 use Drupal\Core\Url;
 use Drupal\language\Config\LanguageConfigFactoryOverrideInterface;
 use Drupal\language\Entity\ConfigurableLanguage;
@@ -470,7 +470,7 @@ public function getStandardLanguageListWithoutConfigured() {
         unset($predefined[$key]);
         continue;
       }
-      $predefined[$key] = new TranslationWrapper($value[0]);
+      $predefined[$key] = new TranslatableString($value[0]);
     }
     asort($predefined);
     return $predefined;
diff --git a/core/tests/Drupal/KernelTests/Core/StringTranslation/TranslationWrapperTest.php b/core/tests/Drupal/KernelTests/Core/StringTranslation/TranslationStringTest.php
similarity index 92%
rename from core/tests/Drupal/KernelTests/Core/StringTranslation/TranslationWrapperTest.php
rename to core/tests/Drupal/KernelTests/Core/StringTranslation/TranslationStringTest.php
index d9775da..7624ac6 100644
--- a/core/tests/Drupal/KernelTests/Core/StringTranslation/TranslationWrapperTest.php
+++ b/core/tests/Drupal/KernelTests/Core/StringTranslation/TranslationStringTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\KernelTests\Core\StringTranslation\TranslationWrapperTest.
+ * Contains \Drupal\KernelTests\Core\StringTranslation\TranslationStringTest.
  */
 
 namespace Drupal\KernelTests\Core\StringTranslation;
@@ -12,11 +12,11 @@
 use Drupal\language\Entity\ConfigurableLanguage;
 
 /**
- * Tests the TranslationWrapper class.
+ * Tests the TranslatableString class.
  *
  * @group StringTranslation
  */
-class TranslationWrapperTest extends KernelTestBase {
+class TranslationStringTest extends KernelTestBase {
 
   /**
    * Modules to enable.
@@ -36,7 +36,7 @@ protected function setUp() {
   }
 
   /**
-   * Tests that TranslationWrappers can be compared.
+   * Tests that TranslatableString objects can be compared.
    */
   public function testComparison() {
     $this->rebootAndPrepareSettings();