diff --git a/tests/src/Kernel/LanguageTest.php b/tests/src/Kernel/LanguageTest.php
index c8d092d..d3b002d 100644
--- a/tests/src/Kernel/LanguageTest.php
+++ b/tests/src/Kernel/LanguageTest.php
@@ -245,7 +245,7 @@ class LanguageTest extends KernelTestBase {
       [
         // Test the replacement of the language name token, taken from the
         // interface language of the current page.
-        '[current-page:language-interface:name]',
+        '[current-page:interface-language:name]',
         // We are not overriding the language by passing a language code as an
         // option. This means that the language should be taken from the
         // interface language which has been set to Dutch.
@@ -255,48 +255,48 @@ class LanguageTest extends KernelTestBase {
       ],
       // Test the token name in the content language.
       [
-        '[current-page:language-content:name]',
+        '[current-page:content-language:name]',
         NULL,
         'Hungarian',
       ],
       // Test the other tokens both for the content and interface languages.
       [
-        '[current-page:language-interface:langcode]',
+        '[current-page:interface-language:langcode]',
         NULL,
         'nl',
       ],
       [
-        '[current-page:language-content:langcode]',
+        '[current-page:content-language:langcode]',
         NULL,
         'hu',
       ],
       [
-        '[current-page:language-interface:direction]',
+        '[current-page:interface-language:direction]',
         NULL,
         'ltr',
       ],
       [
-        '[current-page:language-content:direction]',
+        '[current-page:content-language:direction]',
         NULL,
         'ltr',
       ],
       [
-        '[current-page:language-interface:domain]',
+        '[current-page:interface-language:domain]',
         NULL,
         'nl.example.com',
       ],
       [
-        '[current-page:language-content:domain]',
+        '[current-page:content-language:domain]',
         NULL,
         'hu.example.com',
       ],
       [
-        '[current-page:language-interface:prefix]',
+        '[current-page:interface-language:prefix]',
         NULL,
         'nl-prefix',
       ],
       [
-        '[current-page:language-content:prefix]',
+        '[current-page:content-language:prefix]',
         NULL,
         'hu-prefix',
       ],
@@ -306,7 +306,7 @@ class LanguageTest extends KernelTestBase {
       [
         // Test the replacement of the language name token, taken from the
         // interface language of the current page.
-        '[current-page:language-interface:name]',
+        '[current-page:interface-language:name]',
         // We are not overriding the language by passing a language code as an
         // option. This means that the language should be taken from the
         // interface language which has been set to Dutch.
@@ -316,48 +316,48 @@ class LanguageTest extends KernelTestBase {
       ],
       // Test the token name in the content language.
       [
-        '[current-page:language-content:name]',
+        '[current-page:content-language:name]',
         'bg',
         'Hungarian',
       ],
       // Test the other tokens both for the content and interface languages.
       [
-        '[current-page:language-interface:langcode]',
+        '[current-page:interface-language:langcode]',
         'bg',
         'nl',
       ],
       [
-        '[current-page:language-content:langcode]',
+        '[current-page:content-language:langcode]',
         'bg',
         'hu',
       ],
       [
-        '[current-page:language-interface:direction]',
+        '[current-page:interface-language:direction]',
         'bg',
         'ltr',
       ],
       [
-        '[current-page:language-content:direction]',
+        '[current-page:content-language:direction]',
         'bg',
         'ltr',
       ],
       [
-        '[current-page:language-interface:domain]',
+        '[current-page:interface-language:domain]',
         'bg',
         'nl.example.com',
       ],
       [
-        '[current-page:language-content:domain]',
+        '[current-page:content-language:domain]',
         'bg',
         'hu.example.com',
       ],
       [
-        '[current-page:language-interface:prefix]',
+        '[current-page:interface-language:prefix]',
         'bg',
         'nl-prefix',
       ],
       [
-        '[current-page:language-content:prefix]',
+        '[current-page:content-language:prefix]',
         'bg',
         'hu-prefix',
       ],
diff --git a/token.tokens.inc b/token.tokens.inc
index 2cc0779..14b8a9e 100644
--- a/token.tokens.inc
+++ b/token.tokens.inc
@@ -286,10 +286,6 @@ function token_token_info() {
     'name' => t('Direction'),
     'description' => t('Whether the language is written left-to-right (ltr) or right-to-left (rtl).'),
   ];
-  $info['tokens']['language']['native'] = [
-    'name' => t('Native name'),
-    'description' => t('The language native name.'),
-  ];
   $info['tokens']['language']['domain'] = [
     'name' => t('Domain'),
     'description' => t('The domain name to use for the language.'),
@@ -322,13 +318,13 @@ function token_token_info() {
     'description' => t('The value of a specific query string field of the current page.'),
     'dynamic' => TRUE,
   ];
-  $info['tokens']['current-page']['language-interface'] = [
-    'name' => t('Language UI'),
+  $info['tokens']['current-page']['interface-language'] = [
+    'name' => t('Interface language'),
     'description' => t('The active user interface language.'),
     'type' => 'language',
   ];
-  $info['tokens']['current-page']['language-content'] = [
-    'name' => t('Language content'),
+  $info['tokens']['current-page']['content-language'] = [
+    'name' => t('Content language'),
     'description' => t('The active content language.'),
     'type' => 'language',
   ];
@@ -796,9 +792,6 @@ function token_tokens($type, array $tokens, array $data = [], array $options = [
           case 'direction':
             $replacements[$original] = $language->getDirection();
             break;
-          case 'native':
-            $replacements[$original] = $language->native;
-            break;
           case 'domain':
             if (!isset($language_url_domains)) {
               $language_url_domains = \Drupal::config('language.negotiation')->get('url.domains');
@@ -862,14 +855,14 @@ function token_tokens($type, array $tokens, array $data = [], array $options = [
           $replacements[$original] = (int) $page + 1;
           break;
       }
-      // [current-page:language-interface:*] chained tokens.
-      if ($language_interface_tokens = \Drupal::token()->findWithPrefix($tokens, 'language-interface')) {
+      // [current-page:interface-language:*] chained tokens.
+      if ($language_interface_tokens = \Drupal::token()->findWithPrefix($tokens, 'interface-language')) {
         $language_interface = $language_manager->getCurrentLanguage(LanguageInterface::TYPE_INTERFACE);
         $langcode = $language_interface->getId();
         $replacements += \Drupal::token()->generate('language', $language_interface_tokens, $data, ['langcode' => $langcode] + $options, $bubbleable_metadata);
       }
-      // [current-page:language-content:*] chained tokens.
-      if ($language_content_tokens = \Drupal::token()->findWithPrefix($tokens, 'language-content')) {
+      // [current-page:content-language:*] chained tokens.
+      if ($language_content_tokens = \Drupal::token()->findWithPrefix($tokens, 'content-language')) {
         $language_content = $language_manager->getCurrentLanguage(LanguageInterface::TYPE_CONTENT);
         $langcode = $language_content->getId();
         $replacements += \Drupal::token()->generate('language', $language_content_tokens, $data, ['langcode' => $langcode] + $options, $bubbleable_metadata);