diff --git a/core/lib/Drupal/Core/Language/LanguageManager.php b/core/lib/Drupal/Core/Language/LanguageManager.php
index c180847..7560949 100644
--- a/core/lib/Drupal/Core/Language/LanguageManager.php
+++ b/core/lib/Drupal/Core/Language/LanguageManager.php
@@ -96,8 +96,8 @@ public function getDefinedLanguageTypesInfo() {
     // access names and descriptions of the default language types.
     return array(
       LanguageInterface::TYPE_INTERFACE => array(
-        'name' => $this->t('User interface text'),
-        'description' => $this->t('Order of language detection methods for user interface text. If a translation of user interface text is available in the detected language, it will be displayed.'),
+        'name' => $this->t('Interface text'),
+        'description' => $this->t('Order of language detection methods for interface text. If a translation of interface text is available in the detected language, it will be displayed.'),
         'locked' => TRUE,
       ),
       LanguageInterface::TYPE_CONTENT => array(
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php b/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php
index 18e674c..c979c5b 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php
+++ b/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php
@@ -133,7 +133,7 @@ function testSettingsUI() {
 
     // Test that language settings are correctly stored.
     $language_configuration = ContentLanguageSettings::loadByEntityTypeBundle('comment', 'comment_article');
-    $this->assertEqual($language_configuration->getDefaultLangcode(), 'current_interface', 'The default language for article comments is set to the current interface language.');
+    $this->assertEqual($language_configuration->getDefaultLangcode(), 'current_interface', 'The default language for article comments is set to the interface text language selected for page.');
     $this->assertTrue($language_configuration->isLanguageAlterable(), 'The language selector for article comments is shown.');
 
     // Verify language widget appears on comment type form.
diff --git a/core/modules/language/language.admin.js b/core/modules/language/language.admin.js
index 0c14619..cea77c6 100644
--- a/core/modules/language/language.admin.js
+++ b/core/modules/language/language.admin.js
@@ -12,7 +12,7 @@
       // Given a customization checkbox derive the language type being changed.
       function toggleTable(checkbox) {
         var $checkbox = $(checkbox);
-        // Get the language detection type such as User interface text language
+        // Get the language detection type such as Interface text language
         // detection or Content language detection.
         $checkbox.closest('.table-language-group')
           .find('table, .tabledrag-toggle-weight')
diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index 4e7f017..d5aafb6 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -296,8 +296,8 @@ function language_get_default_langcode($entity_type, $bundle) {
 function language_language_types_info() {
   return array(
     LanguageInterface::TYPE_INTERFACE => array(
-      'name' => t('User interface text'),
-      'description' => t('Order of language detection methods for user interface text. If a translation of user interface text is available in the detected language, it will be displayed.'),
+      'name' => t('Interface text'),
+      'description' => t('Order of language detection methods for interface text. If a translation of interface text is available in the detected language, it will be displayed.'),
       'locked' => TRUE,
     ),
     LanguageInterface::TYPE_CONTENT => array(
diff --git a/core/modules/language/src/Element/LanguageConfiguration.php b/core/modules/language/src/Element/LanguageConfiguration.php
index 82c6f8f..fc5263e 100644
--- a/core/modules/language/src/Element/LanguageConfiguration.php
+++ b/core/modules/language/src/Element/LanguageConfiguration.php
@@ -97,7 +97,7 @@ public static function processLanguageConfiguration(&$element, FormStateInterfac
   protected static function getDefaultOptions() {
     $language_options = array(
       LanguageInterface::LANGCODE_SITE_DEFAULT => t("Site's default language (!language)", array('!language' => static::languageManager()->getDefaultLanguage()->getName())),
-      'current_interface' => t('!type language selected for page', array('!type' => t('User interface text'))),
+      'current_interface' => t('Interface text language selected for page'),
       'authors_default' => t("Author's preferred language"),
     );
 
diff --git a/core/modules/language/src/Form/NegotiationConfigureForm.php b/core/modules/language/src/Form/NegotiationConfigureForm.php
index da2574b..656fee0 100644
--- a/core/modules/language/src/Form/NegotiationConfigureForm.php
+++ b/core/modules/language/src/Form/NegotiationConfigureForm.php
@@ -236,7 +236,7 @@ protected function configureFormTable(array &$form, $type)  {
       $configurable = $this->languageTypes->get('configurable');
       $table_form['configurable'] = array(
         '#type' => 'checkbox',
-        '#title' => $this->t('Customize %language_name language detection to differ from User interface text language detection settings', array('%language_name' => $info['name'])),
+        '#title' => $this->t('Customize %language_name language detection to differ from Interface text language detection settings', array('%language_name' => $info['name'])),
         '#default_value' => in_array($type, $configurable),
         '#attributes' => array('class' => array('language-customization-checkbox')),
         '#attached' => array(
diff --git a/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationUI.php b/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationUI.php
index fd7eb75..0935d1e 100644
--- a/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationUI.php
+++ b/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationUI.php
@@ -11,7 +11,7 @@
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Class for identifying the language from the current interface language.
+ * Identifies the language from the interface text language selected for page.
  *
  * @Plugin(
  *   id = Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUI::METHOD_ID,
diff --git a/core/modules/language/tests/language_test/language_test.routing.yml b/core/modules/language/tests/language_test/language_test.routing.yml
index a0464c5..489a7fe 100644
--- a/core/modules/language/tests/language_test/language_test.routing.yml
+++ b/core/modules/language/tests/language_test/language_test.routing.yml
@@ -29,5 +29,5 @@ language_test.entity_using_current_language:
     parameters:
       configurable_language:
         type: entity:configurable_language
-        # Force load in current interface language.
+        # Force load in the interface text language selected for page.
         with_config_overrides: TRUE
diff --git a/core/modules/locale/src/Form/TranslateEditForm.php b/core/modules/locale/src/Form/TranslateEditForm.php
index d953dce..44e86e7 100644
--- a/core/modules/locale/src/Form/TranslateEditForm.php
+++ b/core/modules/locale/src/Form/TranslateEditForm.php
@@ -131,7 +131,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
             );
           }
           if ($plurals == 2) {
-            // Simplify user interface text for the most common case.
+            // Simplify interface text for the most common case.
             $form['strings'][$string->lid]['translations'][1]['#title'] = $this->t('Plural form');
           }
         }
diff --git a/core/modules/system/core.api.php b/core/modules/system/core.api.php
index dacffed..31a7985 100644
--- a/core/modules/system/core.api.php
+++ b/core/modules/system/core.api.php
@@ -384,7 +384,7 @@
  * - Define a Cache ID (cid) value for your data. A cid is a string, which must
  *   contain enough information to uniquely identify the data. For example, if
  *   your data contains translated strings, then your cid value must include the
- *   current interface language.
+ *   interface text language selected for page.
  * - Call the get() method to attempt a cache read, to see if the cache already
  *   contains your data.
  * - If your data is not already in the cache, compute it and add it to the
diff --git a/core/modules/views/src/Plugin/views/PluginBase.php b/core/modules/views/src/Plugin/views/PluginBase.php
index b36536d..8c1e31f 100644
--- a/core/modules/views/src/Plugin/views/PluginBase.php
+++ b/core/modules/views/src/Plugin/views/PluginBase.php
@@ -170,7 +170,7 @@ protected function defineOptions() { return array(); }
    *   An array which describes the options of a plugin. Each element is an
    *   associative array containing:
    *   - default: The default value of one option. Should be translated to the
-   *     current interface language if translatable.
+   *     interface text language selected for page if translatable.
    *   - (optional) contains: An array which describes the available options
    *     under the key. If contains is set, the default will be ignored and
    *     assumed to be an empty array.
diff --git a/core/modules/views/src/Plugin/views/field/NumericField.php b/core/modules/views/src/Plugin/views/field/NumericField.php
index 2034035..70622d1 100644
--- a/core/modules/views/src/Plugin/views/field/NumericField.php
+++ b/core/modules/views/src/Plugin/views/field/NumericField.php
@@ -113,7 +113,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
       );
     }
     if ($plurals == 2) {
-      // Simplify user interface text for the most common case.
+      // Simplify interface text for the most common case.
       $form['format_plural_values'][0]['#description'] = $this->t('Text to use for the singular form, @count will be replaced with the value.');
       $form['format_plural_values'][1]['#title'] = $this->t('Plural form');
       $form['format_plural_values'][1]['#description'] = $this->t('Text to use for the plural form, @count will be replaced with the value.');
diff --git a/core/modules/views_ui/src/Tests/ViewEditTest.php b/core/modules/views_ui/src/Tests/ViewEditTest.php
index 4d57245..c60c2e8 100644
--- a/core/modules/views_ui/src/Tests/ViewEditTest.php
+++ b/core/modules/views_ui/src/Tests/ViewEditTest.php
@@ -155,7 +155,7 @@ public function testEditFormLanguageOptions() {
         }
 
         // Check that the selected values are respected even we they are not
-        // suposed to be listed.
+        // supposed to be listed.
         // Give permission to edit languages to authenticated users.
         $edit = [
           'authenticated[administer languages]' => TRUE,