diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index b9c2197..9bbbd10 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -197,7 +197,8 @@ function language_configuration_element_submit(&$form, FormStateInterface $form_
  *   - language_show: if the language element should be hidden or not.
  */
 function language_save_default_configuration($entity_type, $bundle, $values = array()) {
-  \Drupal::config('language.settings')->set(language_get_default_configuration_settings_key($entity_type, $bundle), array('langcode' => $values['langcode'], 'language_show' => $values['language_show']))->save();
+  \Drupal::config('language.content_settings.' . String::checkPlain($entity_type))->set('entities.'. $bundle,
+      array('langcode' => $values['langcode'], 'language_show' => $values['language_show']))->save();
 }
 
 /**
@@ -231,7 +232,7 @@ function language_get_default_configuration($entity_type, $bundle) {
  *   A string representing the bundle.
  */
 function language_clear_default_configuration($entity_type, $bundle) {
-  \Drupal::config('language.settings')->clear(language_get_default_configuration_settings_key($entity_type, $bundle))->save();
+  \Drupal::config('language.content_settings.' . String::checkPlain($entity_type))->clear('entities.'. $bundle);
 }
 
 /**
diff --git a/core/modules/language/src/Tests/LanguageConfigSchemaTest.php b/core/modules/language/src/Tests/LanguageConfigSchemaTest.php
index aeddc2b..eb39614 100644
--- a/core/modules/language/src/Tests/LanguageConfigSchemaTest.php
+++ b/core/modules/language/src/Tests/LanguageConfigSchemaTest.php
@@ -65,11 +65,11 @@ function testValidLanguageConfigSchema() {
 
     $this->drupalPostForm($settings_path, $edit, t('Save configuration'));
 
-    $config_data = \Drupal::config('language.settings')->get();
+    $config_data = \Drupal::config('language.content_settings.menu_link_content')->get();
     // Make sure configuration saved correctly.
-    $this->assertTrue($config_data['entities']['menu_link_content']['menu_link_content']['language']['default_configuration']['language_show']);
+    $this->assertTrue($config_data['entities']['menu_link_content']['language_show']);
 
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'language.settings', $config_data);
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'language.content_settings.menu_link_content', $config_data);
   }
 
 }
diff --git a/core/modules/node/node.install b/core/modules/node/node.install
index 36c7d75..f1a645e 100644
--- a/core/modules/node/node.install
+++ b/core/modules/node/node.install
@@ -159,8 +159,7 @@ function node_uninstall() {
   foreach ($types as $config_name) {
     $type = \Drupal::config($config_name)->get('type');
     if (\Drupal::moduleHandler()->moduleExists('language')) {
-      $key = language_get_default_configuration_settings_key('node', $type);
-      \Drupal::config('language.settings')->clear($key)->save();
+      language_clear_default_configuration('node', $type);
     }
   }