diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTypeInitialLanguageTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeTypeInitialLanguageTest.php
index bad6b86..be9f1b8 100644
--- a/core/modules/node/lib/Drupal/node/Tests/NodeTypeInitialLanguageTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeTypeInitialLanguageTest.php
@@ -76,15 +76,15 @@ function testNodeTypeInitialLanguageDefaults() {
     // Tests if the language field can be rearranged on the manage form display
     // tab.
     $this->drupalGet('admin/structure/types/manage/article/form-display');
-    $language_field = $this->xpath('//*[@id="language"]');
+    $language_field = $this->xpath('//*[@id="langcode"]');
     $this->assert(!empty($language_field), 'Language field is visible on manage form display tab.');
 
     // Tests if the language field can be rearranged on the manage display tab.
     $this->drupalGet('admin/structure/types/manage/article/display');
-    $language_display = $this->xpath('//*[@id="language"]');
+    $language_display = $this->xpath('//*[@id="langcode"]');
     $this->assert(!empty($language_display), 'Language field is visible on manage display tab.');
     // Tests if the language field is hidden by default.
-    $this->assertOptionSelected('edit-fields-language-type', 'hidden', 'Language is hidden by default on manage display tab.');
+    $this->assertOptionSelected('edit-fields-langcode-type', 'hidden', 'Language is hidden by default on manage display tab.');
 
     // Changes the inital language settings.
     $edit = array(
@@ -117,11 +117,11 @@ function testLanguageFieldVisibility() {
 
     // Changes Language field visibility to true and check if it is saved.
     $edit = array(
-      'fields[language][type]' => 'visible',
+      'fields[langcode][type]' => 'visible',
     );
     $this->drupalPostForm('admin/structure/types/manage/article/display', $edit, t('Save'));
     $this->drupalGet('admin/structure/types/manage/article/display');
-    $this->assertOptionSelected('edit-fields-language-type', 'visible', 'Language field has been set to visible.');
+    $this->assertOptionSelected('edit-fields-langcode-type', 'visible', 'Language field has been set to visible.');
 
     // Loads node page and check if Language field is shown.
     $this->drupalGet('node/' . $node->id());
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 511a494..acb12ca 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -462,14 +462,14 @@ function node_field_extra_fields() {
     if ($module_language_enabled) {
       $configuration = language_get_default_configuration('node', $bundle->type);
       if ($configuration['language_show']) {
-        $extra['node'][$bundle->type]['form']['language'] = array(
+        $extra['node'][$bundle->type]['form']['langcode'] = array(
           'label' => t('Language'),
           'description' => $description,
           'weight' => 0,
         );
       }
     }
-    $extra['node'][$bundle->type]['display']['language'] = array(
+    $extra['node'][$bundle->type]['display']['langcode'] = array(
       'label' => t('Language'),
       'description' => $description,
       'weight' => 0,