diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php
index b355cb5..badf3c0 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php
@@ -109,9 +109,10 @@ public function isSyncing();
    * entity change is part of an uninstall process, and skip executing your code
    * if that is the case.
    *
-   * For example, \Drupal\language\Entity\Language::preDelete() prevents the API
-   * from deleting the default language. However during an uninstall of the
-   * language module it is expected that the default language should be deleted.
+   * For example, \Drupal\language\Entity\ConfigurableLanguage::preDelete()
+   * prevents the API from deleting the default language. However during an
+   * uninstall of the language module it is expected that the default language
+   * should be deleted.
    *
    * @return bool
    */
diff --git a/core/modules/block/block.module b/core/modules/block/block.module
index 4681b8a..609b0fa 100644
--- a/core/modules/block/block.module
+++ b/core/modules/block/block.module
@@ -7,7 +7,7 @@
 
 use Drupal\block\BlockInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\language\Entity\Language;
+use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\system\Entity\Menu;
 
 /**
@@ -328,11 +328,11 @@ function block_menu_delete(Menu $menu) {
 }
 
 /**
- * Implements hook_ENTITY_TYPE_delete() for 'language_entity'.
+ * Implements hook_ENTITY_TYPE_delete() for 'configurable_language_entity'.
  *
  * Delete the potential block visibility settings of the deleted language.
  */
-function block_language_entity_delete(Language $language) {
+function block_language_entity_delete(ConfigurableLanguage $language) {
   // Remove the block visibility settings for the deleted language.
   foreach (entity_load_multiple('block') as $block) {
     /** @var $block \Drupal\block\BlockInterface */
diff --git a/core/modules/config_translation/tests/src/ConfigEntityMapperTest.php b/core/modules/config_translation/tests/src/ConfigEntityMapperTest.php
index bdc04f8..6886083 100644
--- a/core/modules/config_translation/tests/src/ConfigEntityMapperTest.php
+++ b/core/modules/config_translation/tests/src/ConfigEntityMapperTest.php
@@ -69,14 +69,14 @@ public function setUp() {
       ->expects($this->any())
       ->method('getRouteByName')
       ->with('language.edit')
-      ->will($this->returnValue(new Route('/admin/config/regional/language/edit/{language_entity}')));
+      ->will($this->returnValue(new Route('/admin/config/regional/language/edit/{configurable_language_entity}')));
 
     $definition = array(
       'class' => '\Drupal\config_translation\ConfigEntityMapper',
       'base_route_name' => 'language.edit',
       'title' => '!label language',
       'names' => array(),
-      'entity_type' => 'language_entity',
+      'entity_type' => 'configurable_language_entity',
       'route_name' => 'config_translation.item.overview.language.edit',
     );
     $locale_config_manager = $this->getMockBuilder('Drupal\locale\LocaleConfigManager')
@@ -84,7 +84,7 @@ public function setUp() {
       ->getMock();
 
     $this->configEntityMapper = new ConfigEntityMapper(
-      'language_entity',
+      'configurable_language_entity',
       $definition,
       $this->getConfigFactoryStub(),
       $locale_config_manager,
@@ -109,7 +109,7 @@ public function testSetEntity() {
     $this->entityManager
       ->expects($this->once())
       ->method('getDefinition')
-      ->with('language_entity')
+      ->with('configurable_language_entity')
       ->will($this->returnValue($entity_type));
 
     $result = $this->configEntityMapper->setEntity($this->entity);
@@ -128,7 +128,7 @@ public function testGetOverviewRouteParameters() {
     $this->entityManager
       ->expects($this->once())
       ->method('getDefinition')
-      ->with('language_entity')
+      ->with('configurable_language_entity')
       ->will($this->returnValue($entity_type));
     $this->configEntityMapper->setEntity($this->entity);
 
@@ -140,7 +140,7 @@ public function testGetOverviewRouteParameters() {
 
     $result = $this->configEntityMapper->getOverviewRouteParameters();
 
-    $this->assertSame(array('language_entity' => 'entity_id'), $result);
+    $this->assertSame(array('configurable_language_entity' => 'entity_id'), $result);
   }
 
   /**
@@ -148,7 +148,7 @@ public function testGetOverviewRouteParameters() {
    */
   public function testGetType() {
     $result = $this->configEntityMapper->getType();
-    $this->assertSame('language_entity', $result);
+    $this->assertSame('configurable_language_entity', $result);
   }
 
   /**
@@ -162,7 +162,7 @@ public function testGetTypeName() {
     $this->entityManager
       ->expects($this->once())
       ->method('getDefinition')
-      ->with('language_entity')
+      ->with('configurable_language_entity')
       ->will($this->returnValue($entity_type));
 
     $result = $this->configEntityMapper->getTypeName();
@@ -180,7 +180,7 @@ public function testGetTypeLabel() {
     $this->entityManager
       ->expects($this->once())
       ->method('getDefinition')
-      ->with('language_entity')
+      ->with('configurable_language_entity')
       ->will($this->returnValue($entity_type));
 
     $result = $this->configEntityMapper->getTypeLabel();
@@ -196,7 +196,7 @@ public function testGetOperations() {
     $expected = array(
       'list' => array(
         'title' => 'List',
-        'href' => 'admin/config/regional/config-translation/language_entity',
+        'href' => 'admin/config/regional/config-translation/configurable_language_entity',
       )
     );
 
diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index 26f2529..4c013a2 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -10,7 +10,7 @@
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\language\ConfigurableLanguageManager;
 use Drupal\language\ConfigurableLanguageManagerInterface;
-use Drupal\language\Entity\Language as LanguageEntity;
+use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUI;
 use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl;
 use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrlFallback;
@@ -423,21 +423,21 @@ function language_get_default_langcode($entity_type, $bundle) {
  *   configuration properties.
  */
 function language_save($language) {
-  $language_entity = entity_load('language_entity', $language->id);
-  if (!$language_entity) {
-    $language_entity = entity_create('language_entity', array(
+  $configurable_language_entity = entity_load('configurable_language_entity', $language->id);
+  if (!$configurable_language_entity) {
+    $configurable_language_entity = entity_create('configurable_language_entity', array(
       'id' => $language->id,
     ));
   }
-  $language->is_new = $language_entity->isNew();
+  $language->is_new = $configurable_language_entity->isNew();
 
   // Assign language properties to language entity.
-  $language_entity->label = isset($language->name) ? $language->name : '';
-  $language_entity->direction = isset($language->direction) ? $language->direction : '0';
-  $language_entity->locked = !empty($language->locked);
-  $language_entity->weight = isset($language->weight) ? $language->weight : 0;
-  $language_entity->setDefault(!empty($language->default));
-  $language_entity->save();
+  $configurable_language_entity->label = isset($language->name) ? $language->name : '';
+  $configurable_language_entity->direction = isset($language->direction) ? $language->direction : '0';
+  $configurable_language_entity->locked = !empty($language->locked);
+  $configurable_language_entity->weight = isset($language->weight) ? $language->weight : 0;
+  $configurable_language_entity->setDefault(!empty($language->default));
+  $configurable_language_entity->save();
   $t_args = array('%language' => $language->name, '%langcode' => $language->id);
   if ($language->is_new) {
     // Install any available language configuration overrides for the language.
@@ -466,7 +466,7 @@ function language_delete($langcode) {
     $language = $languages[$langcode];
 
     // Remove the language.
-    entity_delete_multiple('language_entity', array($language->id));
+    entity_delete_multiple('configurable_language_entity', array($language->id));
 
     $language_manager = \Drupal::languageManager();
     $language_manager->reset();
@@ -590,9 +590,9 @@ function language_modules_uninstalled($modules) {
 }
 
 /**
- * Implements hook_ENTITY_TYPE_insert() for 'language_entity'.
+ * Implements hook_ENTITY_TYPE_insert() for 'configurable_language_entity'.
  */
-function language_language_entity_insert(LanguageEntity $language) {
+function language_language_entity_insert(ConfigurableLanguage $language) {
   if (!empty($language->locked)) {
     return;
   }
@@ -604,9 +604,9 @@ function language_language_entity_insert(LanguageEntity $language) {
 }
 
 /**
- * Implements hook_ENTITY_TYPE_delete() for 'language_entity'.
+ * Implements hook_ENTITY_TYPE_delete() for 'configurable_language_entity'.
  */
-function language_language_entity_delete(LanguageEntity $language) {
+function language_language_entity_delete(ConfigurableLanguage $language) {
   // Remove language from language prefix list.
   $prefixes = language_negotiation_url_prefixes();
   unset($prefixes[$language->id()]);
diff --git a/core/modules/language/language.routing.yml b/core/modules/language/language.routing.yml
index 75ca759..4720b07 100644
--- a/core/modules/language/language.routing.yml
+++ b/core/modules/language/language.routing.yml
@@ -25,34 +25,34 @@ language.negotiation_selected:
 language.add:
   path: '/admin/config/regional/language/add'
   defaults:
-    _entity_form: 'language_entity.add'
+    _entity_form: 'configurable_language_entity.add'
     _title: 'Add language'
   requirements:
-    _entity_create_access: 'language_entity'
+    _entity_create_access: 'configurable_language_entity'
 
 language.edit:
-  path: '/admin/config/regional/language/edit/{language_entity}'
+  path: '/admin/config/regional/language/edit/{configurable_language_entity}'
   defaults:
-    _entity_form: 'language_entity.edit'
+    _entity_form: 'configurable_language_entity.edit'
     _title: 'Edit language'
   requirements:
-    _entity_access: 'language_entity.update'
+    _entity_access: 'configurable_language_entity.update'
 
 language.admin_overview:
   path: '/admin/config/regional/language'
   defaults:
-    _entity_list: 'language_entity'
+    _entity_list: 'configurable_language_entity'
     _title: 'Languages'
   requirements:
     _permission: 'administer languages'
 
 language.delete:
-  path: '/admin/config/regional/language/delete/{language_entity}'
+  path: '/admin/config/regional/language/delete/{configurable_language_entity}'
   defaults:
-    _entity_form: 'language_entity.delete'
+    _entity_form: 'configurable_language_entity.delete'
     _title: 'Delete language'
   requirements:
-    _entity_access: 'language_entity.delete'
+    _entity_access: 'configurable_language_entity.delete'
 
 language.negotiation:
   path: '/admin/config/regional/language/detection'
diff --git a/core/modules/language/src/LanguageInterface.php b/core/modules/language/src/ConfigurableLanguageInterface.php
similarity index 56%
rename from core/modules/language/src/LanguageInterface.php
rename to core/modules/language/src/ConfigurableLanguageInterface.php
index b2bfe26..03cd14d 100644
--- a/core/modules/language/src/LanguageInterface.php
+++ b/core/modules/language/src/ConfigurableLanguageInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\language\LanguageInterface.
+ * Contains \Drupal\language\ConfigurableLanguageInterface.
  */
 
 namespace Drupal\language;
@@ -12,6 +12,6 @@
 /**
  * Provides an interface defining a language entity.
  */
-interface LanguageInterface extends ConfigEntityInterface {
+interface ConfigurableLanguageInterface extends ConfigEntityInterface {
 
 }
diff --git a/core/modules/language/src/Entity/Language.php b/core/modules/language/src/Entity/ConfigurableLanguage.php
similarity index 88%
rename from core/modules/language/src/Entity/Language.php
rename to core/modules/language/src/Entity/ConfigurableLanguage.php
index bdb3d78..1da5811 100644
--- a/core/modules/language/src/Entity/Language.php
+++ b/core/modules/language/src/Entity/ConfigurableLanguage.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\language\Entity\Language.
+ * Contains \Drupal\language\Entity\ConfigurableLanguage.
  */
 
 namespace Drupal\language\Entity;
@@ -12,13 +12,13 @@
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\language\ConfigurableLanguageManagerInterface;
 use Drupal\language\Exception\DeleteDefaultLanguageException;
-use Drupal\language\LanguageInterface;
+use Drupal\language\ConfigurableLanguageInterface;
 
 /**
- * Defines the Language entity.
+ * Defines the ConfigurableLanguage entity.
  *
  * @ConfigEntityType(
- *   id = "language_entity",
+ *   id = "configurable_language_entity",
  *   label = @Translation("Language"),
  *   controllers = {
  *     "list_builder" = "Drupal\language\LanguageListBuilder",
@@ -42,7 +42,7 @@
  *   }
  * )
  */
-class Language extends ConfigEntityBase implements LanguageInterface {
+class ConfigurableLanguage extends ConfigEntityBase implements ConfigurableLanguageInterface {
 
   /**
    * The language ID (machine name).
@@ -87,9 +87,9 @@ class Language extends ConfigEntityBase implements LanguageInterface {
    * container using the language.default service in when the entity is saved.
    * The value is set correctly when a language entity is created or loaded.
    *
-   * @see \Drupal\language\Entity\Language::postSave()
-   * @see \Drupal\language\Entity\Language::isDefault()
-   * @see \Drupal\language\Entity\Language::setDefault()
+   * @see \Drupal\language\Entity\ConfigurableLanguage::postSave()
+   * @see \Drupal\language\Entity\ConfigurableLanguage::isDefault()
+   * @see \Drupal\language\Entity\ConfigurableLanguage::setDefault()
    *
    * @var bool
    */
@@ -101,8 +101,8 @@ class Language extends ConfigEntityBase implements LanguageInterface {
    * This property is not saved to the language entity, but is needed for
    * detecting when to rebuild the services.
    *
-   * @see \Drupal\language\Entity\Language::preSave()
-   * @see \Drupal\language\Entity\Language::postSave()
+   * @see \Drupal\language\Entity\ConfigurableLanguage::preSave()
+   * @see \Drupal\language\Entity\ConfigurableLanguage::postSave()
    *
    * @var bool
    */
@@ -137,7 +137,7 @@ public function preSave(EntityStorageInterface $storage) {
     parent::preSave($storage);
     // Store whether or not the site is already multilingual so that we can
     // rebuild services if necessary during
-    // \Drupal\language\Entity\Language::postSave().
+    // \Drupal\language\Entity\ConfigurableLanguage::postSave().
     $this->preSaveMultilingual = \Drupal::languageManager()->isMultilingual();
     // Languages are picked from a predefined list which is given in English.
     // For the uncommon case of custom languages the label should be given in
@@ -179,7 +179,7 @@ public function postSave(EntityStorageInterface $storage, $update = TRUE) {
   }
 
   /**
-   * Converts the Language entity to a Language value object.
+   * Converts the ConfigurableLanguage entity to a Core Language value object.
    *
    * @todo fix return type hint after https://drupal.org/node/2246665 and
    *   https://drupal.org/node/2246679.
diff --git a/core/modules/language/src/LanguageListBuilder.php b/core/modules/language/src/LanguageListBuilder.php
index c5bd66a..9076f60 100644
--- a/core/modules/language/src/LanguageListBuilder.php
+++ b/core/modules/language/src/LanguageListBuilder.php
@@ -13,7 +13,7 @@
 /**
  * Defines a class to build a listing of language entities.
  *
- * @see \Drupal\language\Entity\Language
+ * @see \Drupal\language\Entity\ConfigurableLanguage
  */
 class LanguageListBuilder extends DraggableListBuilder {
 
diff --git a/core/modules/language/src/Tests/LanguageConfigurationElementTest.php b/core/modules/language/src/Tests/LanguageConfigurationElementTest.php
index c7c85f1..9abdf53 100644
--- a/core/modules/language/src/Tests/LanguageConfigurationElementTest.php
+++ b/core/modules/language/src/Tests/LanguageConfigurationElementTest.php
@@ -89,8 +89,8 @@ public function testDefaultLangcode() {
     // Site's default.
     $old_default = \Drupal::languageManager()->getDefaultLanguage();
     // Ensure the language entity default value is correct.
-    $language_entity = entity_load('language_entity', $old_default->getId());
-    $this->assertTrue($language_entity->get('default'), 'The en language entity is flagged as the default language.');
+    $configurable_language_entity = entity_load('configurable_language_entity', $old_default->getId());
+    $this->assertTrue($configurable_language_entity->get('default'), 'The en language entity is flagged as the default language.');
     $old_default->default = FALSE;
     language_save($old_default);
     $new_default = \Drupal::languageManager()->getLanguage('cc');
@@ -101,12 +101,13 @@ public function testDefaultLangcode() {
     $this->assertEqual($langcode, 'cc');
 
     // Ensure the language entity default value is correct.
-    $language_entity = entity_load('language_entity', $old_default->getId());
-    $this->assertFalse($language_entity->get('default'), 'The en language entity is not flagged as the default language.');
-    $language_entity = entity_load('language_entity', 'cc');
-    // Check calling the Drupal\language\Entity\Language::isDefault() method
+    $configurable_language_entity = entity_load('configurable_language_entity', $old_default->getId());
+    $this->assertFalse($configurable_language_entity->get('default'), 'The en language entity is not flagged as the default language.');
+    $configurable_language_entity = entity_load('configurable_language_entity', 'cc');
+    // Check calling the
+    // \Drupal\language\Entity\ConfigurableLanguage::isDefault() method
     // directly.
-    $this->assertTrue($language_entity->isDefault(), 'The cc language entity is flagged as the default language.');
+    $this->assertTrue($configurable_language_entity->isDefault(), 'The cc language entity is flagged as the default language.');
 
     // Check the default value of a language field when authors preferred option
     // is selected.
diff --git a/core/modules/language/src/Tests/LanguageConfigurationTest.php b/core/modules/language/src/Tests/LanguageConfigurationTest.php
index 3ca6528..e0d8dd1 100644
--- a/core/modules/language/src/Tests/LanguageConfigurationTest.php
+++ b/core/modules/language/src/Tests/LanguageConfigurationTest.php
@@ -174,7 +174,7 @@ protected function checkConfigurableLanguageWeight($state = 'by default') {
   protected function getHighestConfigurableLanguageWeight(){
     $max_weight = 0;
 
-    $languages = entity_load_multiple('language_entity', NULL, TRUE);
+    $languages = entity_load_multiple('configurable_language_entity', NULL, TRUE);
     foreach ($languages as $language) {
       if (!$language->locked && $language->weight > $max_weight) {
         $max_weight = $language->weight;
diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module
index ea0ec44..2d66b96 100644
--- a/core/modules/locale/locale.module
+++ b/core/modules/locale/locale.module
@@ -18,7 +18,7 @@
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\StringTranslation\TranslationWrapper;
 use Drupal\Core\Language\LanguageInterface;
-use Drupal\language\Entity\Language as LanguageEntity;
+use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\Component\Utility\Crypt;
 
 /**
@@ -221,9 +221,9 @@ function locale_stream_wrappers() {
 }
 
 /**
- * Implements hook_ENTITY_TYPE_insert() for 'language_entity'.
+ * Implements hook_ENTITY_TYPE_insert() for 'configurable_language_entity'.
  */
-function locale_language_entity_insert(LanguageEntity $language) {
+function locale_language_entity_insert(ConfigurableLanguage $language) {
   // @todo move these two cache clears out. See http://drupal.org/node/1293252
   // Changing the language settings impacts the interface: clear render cache.
   \Drupal::cache('render')->deleteAll();
@@ -232,9 +232,9 @@ function locale_language_entity_insert(LanguageEntity $language) {
 }
 
 /**
- * Implements hook_ENTITY_TYPE_update() for 'language_entity'.
+ * Implements hook_ENTITY_TYPE_update() for 'configurable_language_entity'.
  */
-function locale_language_entity_update(LanguageEntity $language) {
+function locale_language_entity_update(ConfigurableLanguage $language) {
   // @todo move these two cache clears out. See http://drupal.org/node/1293252
   // Changing the language settings impacts the interface: clear render cache.
   \Drupal::cache('render')->deleteAll();
@@ -243,9 +243,9 @@ function locale_language_entity_update(LanguageEntity $language) {
 }
 
 /**
- * Implements hook_ENTITY_TYPE_delete() for 'language_entity'.
+ * Implements hook_ENTITY_TYPE_delete() for 'configurable_language_entity'.
  */
-function locale_language_entity_delete(LanguageEntity $language) {
+function locale_language_entity_delete(ConfigurableLanguage $language) {
   // Remove translations.
   \Drupal::service('locale.storage')->deleteTranslations(array('language' => $language->id()));
 
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index fc8b713..ab17ec3 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -27,7 +27,7 @@
 use Drupal\Core\Entity\Display\EntityFormDisplayInterface;
 use Drupal\Core\Template\Attribute;
 use Drupal\file\Entity\File;
-use Drupal\language\Entity\Language as LanguageEntity;
+use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\block\Entity\Block;
 use Drupal\Core\Session\AccountInterface;
 
@@ -1624,9 +1624,9 @@ function node_file_download_access($field, EntityInterface $entity, File $file)
 }
 
 /**
- * Implements hook_ENTITY_TYPE_delete() for 'language_entity'.
+ * Implements hook_ENTITY_TYPE_delete() for 'configurable_language_entity'.
  */
-function node_language_entity_delete(LanguageEntity $language) {
+function node_language_entity_delete(ConfigurableLanguage $language) {
   // On nodes with this language, unset the language.
   \Drupal::entityManager()->getStorage('node')->clearRevisionsLanguage($language);
 }