diff --git a/core/modules/comment/tests/src/Functional/CommentInterfaceTest.php b/core/modules/comment/tests/src/Functional/CommentInterfaceTest.php
index b84ff3dbdb..203639d5d4 100644
--- a/core/modules/comment/tests/src/Functional/CommentInterfaceTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentInterfaceTest.php
@@ -66,7 +66,7 @@ public function testCommentInterface() {
     $comment = $this->postComment($this->node, $comment_text, $subject_text, TRUE);
     $this->assertTrue($this->commentExists($comment), 'Comment found.');
 
-    // Comment as anonymous with preview required.
+    // Comment as visitor with preview required.
     $this->drupalLogout();
     user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['access content', 'access comments', 'post comments', 'skip comment approval']);
     $anonymous_comment = $this->postComment($this->node, $this->randomMachineName(), $this->randomMachineName(), TRUE);
@@ -96,9 +96,9 @@ public function testCommentInterface() {
       '@title' => $comment->getSubject(),
     ]));
 
-    // Test changing the comment author to "Anonymous".
+    // Test changing the comment author to "Visitor".
     $comment = $this->postComment(NULL, $comment->comment_body->value, $comment->getSubject(), ['uid' => '']);
-    $this->assertTrue($comment->getAuthorName() == t('Anonymous') && $comment->getOwnerId() == 0, 'Comment author successfully changed to anonymous.');
+    $this->assertTrue($comment->getAuthorName() == t('Visitor') && $comment->getOwnerId() == 0, 'Comment author successfully changed to Visitor.');
 
     // Test changing the comment author to an unverified user.
     $random_name = $this->randomMachineName();
diff --git a/core/modules/locale/tests/src/Functional/LocaleImportFunctionalTest.php b/core/modules/locale/tests/src/Functional/LocaleImportFunctionalTest.php
index 1005c5c234..4e176eb481 100644
--- a/core/modules/locale/tests/src/Functional/LocaleImportFunctionalTest.php
+++ b/core/modules/locale/tests/src/Functional/LocaleImportFunctionalTest.php
@@ -351,9 +351,9 @@ public function testConfigtranslationImportingPoFile() {
       'langcode' => $langcode,
     ]);
 
-    // Check that the 'Anonymous' string is translated.
+    // Check that the 'Visitor' string is translated.
     $config = \Drupal::languageManager()->getLanguageConfigOverride($langcode, 'user.settings');
-    $this->assertEqual($config->get('anonymous'), 'Anonymous German');
+    $this->assertEqual($config->get('anonymous'), 'Visitor German');
   }
 
   /**
diff --git a/core/modules/user/config/install/user.role.anonymous.yml b/core/modules/user/config/install/user.role.anonymous.yml
index c89e023b03..1f3f67b258 100644
--- a/core/modules/user/config/install/user.role.anonymous.yml
+++ b/core/modules/user/config/install/user.role.anonymous.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies: {  }
 id: anonymous
-label: 'Anonymous user'
+label: 'Visitor'
 weight: 0
 is_admin: false
 permissions: {  }
diff --git a/core/modules/user/config/install/user.role.authenticated.yml b/core/modules/user/config/install/user.role.authenticated.yml
index 5da2abdd93..a753ad09c9 100644
--- a/core/modules/user/config/install/user.role.authenticated.yml
+++ b/core/modules/user/config/install/user.role.authenticated.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies: {  }
 id: authenticated
-label: 'Authenticated user'
+label: 'Registered user'
 weight: 1
 is_admin: false
 permissions: {  }
diff --git a/core/modules/user/config/install/user.settings.yml b/core/modules/user/config/install/user.settings.yml
index 8372ccdb73..a47ac414ff 100644
--- a/core/modules/user/config/install/user.settings.yml
+++ b/core/modules/user/config/install/user.settings.yml
@@ -1,4 +1,4 @@
-anonymous: Anonymous
+anonymous: Visitor
 verify_mail: true
 notify:
   cancel_confirm: true
diff --git a/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationMultipleLanguageTest.php b/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationMultipleLanguageTest.php
index dcd112ae19..ceace93210 100644
--- a/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationMultipleLanguageTest.php
+++ b/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationMultipleLanguageTest.php
@@ -108,14 +108,14 @@ public function testTranslationsLoaded() {
     if ($this->langcode == 'de') {
       // Active configuration should be in German and no German override should
       // exist.
-      $this->assertEqual($config->get('anonymous'), 'Anonymous de');
+      $this->assertEqual($config->get('anonymous'), 'Visitor de');
       $this->assertEqual($config->get('langcode'), 'de');
       $this->assertTrue($override_de->isNew());
 
       if ($this->profile == 'testing_multilingual_with_english') {
         // English is already added in this profile. Should make the override
         // available.
-        $this->assertEqual($override_en->get('anonymous'), 'Anonymous');
+        $this->assertEqual($override_en->get('anonymous'), 'Visitor');
       }
       else {
         // English is not yet available.
@@ -125,7 +125,7 @@ public function testTranslationsLoaded() {
         $edit = ['predefined_langcode' => 'en'];
         $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
         $override_en = $language_manager->getLanguageConfigOverride('en', 'user.settings');
-        $this->assertEqual($override_en->get('anonymous'), 'Anonymous');
+        $this->assertEqual($override_en->get('anonymous'), 'Visitor');
       }
 
       // Activate a module, to make sure that config is not overridden by module
@@ -141,16 +141,16 @@ public function testTranslationsLoaded() {
     }
     else {
       // Active configuration should be English.
-      $this->assertEqual($config->get('anonymous'), 'Anonymous');
+      $this->assertEqual($config->get('anonymous'), 'Visitor');
       $this->assertEqual($config->get('langcode'), 'en');
       // There should not be an English override.
       $this->assertTrue($override_en->isNew());
       // German should be an override.
-      $this->assertEqual($override_de->get('anonymous'), 'Anonymous de');
+      $this->assertEqual($override_de->get('anonymous'), 'Visitor de');
     }
 
     // Spanish is always an override (never used as installation language).
-    $this->assertEqual($override_es->get('anonymous'), 'Anonymous es');
+    $this->assertEqual($override_es->get('anonymous'), 'Visitor es');
 
   }
 
@@ -158,7 +158,7 @@ public function testTranslationsLoaded() {
    * Helper function to verify that the expected strings are translated.
    */
   protected function verifyImportedStringsTranslated() {
-    $test_samples = ['Save and continue', 'Anonymous', 'Language'];
+    $test_samples = ['Save and continue', 'Visitor', 'Language'];
     $langcodes = ['de', 'es'];
 
     foreach ($test_samples as $sample) {