diff --git a/core/config/schema/core.entity.schema.yml b/core/config/schema/core.entity.schema.yml
index 46099cd..fdb6e7d 100644
--- a/core/config/schema/core.entity.schema.yml
+++ b/core/config/schema/core.entity.schema.yml
@@ -235,7 +235,7 @@ field.formatter.settings.string:
 field.formatter.settings.language:
   type: field.formatter.settings.string
   mapping:
-    native_name:
+    native_language:
       type: boolean
       label: 'Display in native language'
 
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/LanguageFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/LanguageFormatter.php
index 8ccc047..2d814e4 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/LanguageFormatter.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/LanguageFormatter.php
@@ -30,7 +30,7 @@ class LanguageFormatter extends StringFormatter {
    */
   public static function defaultSettings() {
     $settings = parent::defaultSettings();
-    $settings['native_name'] = FALSE;
+    $settings['native_language'] = FALSE;
     return $settings;
   }
 
@@ -39,10 +39,10 @@ public static function defaultSettings() {
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $form = parent::settingsForm($form, $form_state);
-    $form['native_name'] = array(
+    $form['native_language'] = array(
       '#title' => $this->t('Display in native language'),
       '#type' => 'checkbox',
-      '#default_value' => $this->getSetting('native_name'),
+      '#default_value' => $this->getSetting('native_language'),
     );
     return $form;
   }
@@ -52,8 +52,8 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
    */
   public function settingsSummary() {
     $summary = parent::settingsSummary();
-    if ($this->getSetting('native_name')) {
-      $additional_summary = $this->t('Displayed in native name');
+    if ($this->getSetting('native_language')) {
+      $additional_summary = $this->t('Displayed in native language');
       if (!empty($summary['#markup'])) {
         $summary['#markup'] .= '; ' . $additional_summary;
       }
@@ -68,7 +68,7 @@ public function settingsSummary() {
    * {@inheritdoc}
    */
   protected function viewValue(FieldItemInterface $item) {
-    $languages = $languages = $this->getSetting('native_name') ? \Drupal::languageManager()->getNativeLanguages() : \Drupal::languageManager()->getLanguages();
+    $languages = $languages = $this->getSetting('native_language') ? \Drupal::languageManager()->getNativeLanguages() : \Drupal::languageManager()->getLanguages();
     return $item->language ? String::checkPlain($languages[$item->language->getId()]->getName()) : '';
   }
 
diff --git a/core/modules/node/src/Tests/Views/NodeLanguageTest.php b/core/modules/node/src/Tests/Views/NodeLanguageTest.php
index 9e8a332..fe71746 100644
--- a/core/modules/node/src/Tests/Views/NodeLanguageTest.php
+++ b/core/modules/node/src/Tests/Views/NodeLanguageTest.php
@@ -235,7 +235,7 @@ public function testNativeLanguageField() {
 
     // Modify test view to display native language names and set translations.
     $config = \Drupal::config('views.view.test_language');
-    $config->set('display.default.display_options.fields.langcode.settings.native_name', TRUE);
+    $config->set('display.default.display_options.fields.langcode.settings.native_language', TRUE);
     $config->save();
     \Drupal::languageManager()->getLanguageConfigOverride('fr', 'language.entity.fr')->set('label', 'Français')->save();
     \Drupal::languageManager()->getLanguageConfigOverride('es', 'language.entity.es')->set('label', 'Español')->save();
@@ -243,13 +243,13 @@ public function testNativeLanguageField() {
 
     // Modify test view to use the views built-in language field and test that.
     $config = \Drupal::config('views.view.test_language');
-    $config->set('display.default.display_options.fields.langcode.native_name', FALSE);
+    $config->set('display.default.display_options.fields.langcode.native_language', FALSE);
     $config->clear('display.default.display_options.fields.langcode.settings');
     $config->clear('display.default.display_options.fields.langcode.type');
     $config->set('display.default.display_options.fields.langcode.plugin_id', 'language');
     $config->save();
     $this->assertLanguageNames();
-    $config->set('display.default.display_options.fields.langcode.native_name', TRUE)->save();
+    $config->set('display.default.display_options.fields.langcode.native_language', TRUE)->save();
     $this->assertLanguageNames(TRUE);
   }
 
diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_language.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_language.yml
index e09f759..6909f44 100644
--- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_language.yml
+++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_language.yml
@@ -163,7 +163,7 @@ display:
           entity_type: node
           entity_field: langcode
           settings:
-            native_name: false
+            native_language: false
           type: language
       filters:
         status:
diff --git a/core/modules/views/config/schema/views.field.schema.yml b/core/modules/views/config/schema/views.field.schema.yml
index e911171..8a28f38 100644
--- a/core/modules/views/config/schema/views.field.schema.yml
+++ b/core/modules/views/config/schema/views.field.schema.yml
@@ -179,6 +179,6 @@ views.field.language:
   type: views_field
   label: 'Language'
   mapping:
-    native_name:
+    native_language:
       type: boolean
       label: 'Display in native language'
diff --git a/core/modules/views/src/Plugin/views/field/LanguageField.php b/core/modules/views/src/Plugin/views/field/LanguageField.php
index 68a5d26..bbc28ef 100644
--- a/core/modules/views/src/Plugin/views/field/LanguageField.php
+++ b/core/modules/views/src/Plugin/views/field/LanguageField.php
@@ -24,7 +24,7 @@ class LanguageField extends FieldPluginBase {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['native_name'] = array('default' => FALSE);
+    $options['native_language'] = array('default' => FALSE);
 
     return $options;
   }
@@ -34,10 +34,10 @@ protected function defineOptions() {
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
-    $form['native_name'] = array(
+    $form['native_language'] = array(
       '#title' => $this->t('Display in native language'),
       '#type' => 'checkbox',
-      '#default_value' => $this->options['native_name'],
+      '#default_value' => $this->options['native_language'],
     );
   }
 
@@ -46,7 +46,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
    */
   public function render(ResultRow $values) {
     $value = $this->getValue($values);
-    $languages = $this->options['native_name'] ? \Drupal::languageManager()->getNativeLanguages() : \Drupal::languageManager()->getLanguages();
+    $languages = $this->options['native_language'] ? \Drupal::languageManager()->getNativeLanguages() : \Drupal::languageManager()->getLanguages();
     return isset($languages[$value]) ? $languages[$value]->getName() : '';
   }