diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index edd20a0..f7fc9c2 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -669,7 +669,7 @@ function template_preprocess_comment(&$variables) {
   }
 
   if (theme_get_setting('features.comment_user_picture')) {
-    // To change user picture settings (e.g., image style), edit the 'compact'
+    // To change avatar settings (e.g., image style), edit the 'compact'
     // view mode on the User entity.
     $variables['user_picture'] = user_view($account, 'compact');
   }
diff --git a/core/modules/comment/src/Tests/CommentPreviewTest.php b/core/modules/comment/src/Tests/CommentPreviewTest.php
index a1d0804..fdfe555 100644
--- a/core/modules/comment/src/Tests/CommentPreviewTest.php
+++ b/core/modules/comment/src/Tests/CommentPreviewTest.php
@@ -21,7 +21,7 @@ class CommentPreviewTest extends CommentTestBase {
   /**
    * The profile to install as a basis for testing.
    *
-   * Using the standard profile to test user picture display in comments.
+   * Using the standard profile to test avatar display in comments.
    *
    * @var string
    */
@@ -39,7 +39,7 @@ function testCommentPreview() {
     $this->setCommentSettings('default_mode', CommentManagerInterface::COMMENT_MODE_THREADED, 'Comment paging changed.');
     $this->drupalLogout();
 
-    // Login as web user and add a user picture.
+    // Login as web user and add a avatar.
     $this->drupalLogin($this->webUser);
     $image = current($this->drupalGetTestFiles('image'));
     $edit['files[user_picture_0]'] = drupal_realpath($image->uri);
@@ -60,8 +60,8 @@ function testCommentPreview() {
     $this->assertFieldByName('subject[0][value]', $edit['subject[0][value]'], 'Subject field displayed.');
     $this->assertFieldByName('comment_body[0][value]', $edit['comment_body[0][value]'], 'Comment field displayed.');
 
-    // Check that the user picture is displayed.
-    $this->assertFieldByXPath("//article[contains(@class, 'preview')]//div[contains(@class, 'user-picture')]//img", NULL, 'User picture displayed.');
+    // Check that the avatar is displayed.
+    $this->assertFieldByXPath("//article[contains(@class, 'preview')]//div[contains(@class, 'user-picture')]//img", NULL, 'Avatar displayed.');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/MenuLinks.php b/core/modules/migrate_drupal/src/Tests/Table/d6/MenuLinks.php
index 7e43676..9a1138f 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/MenuLinks.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/MenuLinks.php
@@ -2197,7 +2197,7 @@ public function load() {
       'link_path' => 'admin/user/settings',
       'router_path' => 'admin/user/settings',
       'link_title' => 'User settings',
-      'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:101:"Configure default behavior of users, including registration requirements, e-mails, and user pictures.";}}',
+      'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:101:"Configure default behavior of users, including registration requirements, e-mails, and avatars.";}}',
       'module' => 'system',
       'hidden' => '0',
       'external' => '0',
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/MenuRouter.php b/core/modules/migrate_drupal/src/Tests/Table/d6/MenuRouter.php
index 6bc0602..a7938eb 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/MenuRouter.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/MenuRouter.php
@@ -5683,7 +5683,7 @@ public function load() {
       'title_arguments' => '',
       'type' => '6',
       'block_callback' => '',
-      'description' => 'Configure default behavior of users, including registration requirements, e-mails, and user pictures.',
+      'description' => 'Configure default behavior of users, including registration requirements, e-mails, and avatars.',
       'position' => '',
       'weight' => '0',
       'file' => 'modules/user/user.admin.inc',
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/MenuLinks.php b/core/modules/migrate_drupal/src/Tests/Table/d7/MenuLinks.php
index 6b7a90e..18c1dfc 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/MenuLinks.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/MenuLinks.php
@@ -1729,7 +1729,7 @@ public function load() {
       'link_path' => 'admin/config/people/accounts',
       'router_path' => 'admin/config/people/accounts',
       'link_title' => 'Account settings',
-      'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:109:"Configure default behavior of users, including registration requirements, e-mails, fields, and user pictures.";}}',
+      'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:109:"Configure default behavior of users, including registration requirements, e-mails, fields, and avatars.";}}',
       'module' => 'system',
       'hidden' => '0',
       'external' => '0',
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/MenuRouter.php b/core/modules/migrate_drupal/src/Tests/Table/d7/MenuRouter.php
index 6cd37d4..90155fc 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/MenuRouter.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/MenuRouter.php
@@ -1285,7 +1285,7 @@ public function load() {
       'theme_callback' => '',
       'theme_arguments' => 'a:0:{}',
       'type' => '6',
-      'description' => 'Configure default behavior of users, including registration requirements, e-mails, fields, and user pictures.',
+      'description' => 'Configure default behavior of users, including registration requirements, e-mails, fields, and avatars.',
       'position' => '',
       'weight' => '-10',
       'include_file' => 'modules/user/user.admin.inc',
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 7c371d6..6d72b98 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -606,7 +606,7 @@ function template_preprocess_node(&$variables) {
   $variables['display_submitted'] = $node_type->displaySubmitted();
   if ($variables['display_submitted']) {
     if (theme_get_setting('features.node_user_picture')) {
-      // To change user picture settings (e.g. image style), edit the 'compact'
+      // To change avatar settings (e.g. image style), edit the 'compact'
       // view mode on the User entity. Note that the 'compact' view mode might
       // not be configured, so remember to always check the theme setting first.
       $variables['author_picture'] = user_view($node->getOwner(), 'compact');
diff --git a/core/modules/user/config/schema/user.source.schema.yml b/core/modules/user/config/schema/user.source.schema.yml
index 19990aa..007558c 100644
--- a/core/modules/user/config/schema/user.source.schema.yml
+++ b/core/modules/user/config/schema/user.source.schema.yml
@@ -17,7 +17,7 @@ migrate.source.d6_user:
 
 migrate.source.d6_user_picture_file:
   type: migrate_source_sql
-  label: 'Drupal 6 user picure display'
+  label: 'Drupal 6 avatar display'
   mapping:
     constants:
       type: mapping
@@ -29,7 +29,7 @@ migrate.source.d6_user_picture_file:
 
 migrate.source.d6_user_picture_instance:
   type: migrate_source_sql
-  label: 'Drupal 6 user picure display'
+  label: 'Drupal 6 avatar display'
   mapping:
     provider:
       type: string
diff --git a/core/modules/user/src/Plugin/migrate/source/d6/UserPicture.php b/core/modules/user/src/Plugin/migrate/source/d6/UserPicture.php
index e4658d8..ac6e593 100644
--- a/core/modules/user/src/Plugin/migrate/source/d6/UserPicture.php
+++ b/core/modules/user/src/Plugin/migrate/source/d6/UserPicture.php
@@ -10,7 +10,7 @@
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
 /**
- * Drupal 6 user picture source from database.
+ * Drupal 6 avatar source from database.
  *
  * @todo Support default picture?
  *
diff --git a/core/modules/user/src/Plugin/migrate/source/d6/UserPictureFile.php b/core/modules/user/src/Plugin/migrate/source/d6/UserPictureFile.php
index ff0d1ae..e7503fa 100644
--- a/core/modules/user/src/Plugin/migrate/source/d6/UserPictureFile.php
+++ b/core/modules/user/src/Plugin/migrate/source/d6/UserPictureFile.php
@@ -11,7 +11,7 @@
 use Drupal\migrate\Row;
 
 /**
- * Drupal 6 user picture source from database.
+ * Drupal 6 avatar source from database.
  *
  * @MigrateSource(
  *   id = "d6_user_picture_file"
diff --git a/core/modules/user/src/Tests/Migrate/MigrateUserPictureEntityDisplayTest.php b/core/modules/user/src/Tests/Migrate/MigrateUserPictureEntityDisplayTest.php
index 0613261..658d217 100644
--- a/core/modules/user/src/Tests/Migrate/MigrateUserPictureEntityDisplayTest.php
+++ b/core/modules/user/src/Tests/Migrate/MigrateUserPictureEntityDisplayTest.php
@@ -10,7 +10,7 @@
 use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
 
 /**
- * User picture entity display.
+ * Avatar entity display.
  *
  * @group user
  */
@@ -35,7 +35,7 @@ protected function setUp() {
   }
 
   /**
-   * Tests the Drupal 7 user picture to Drupal 8 entity display migration.
+   * Tests the Drupal 7 avatar to Drupal 8 entity display migration.
    */
   public function testUserPictureEntityDisplay() {
     $component = entity_get_display('user', 'user', 'default')->getComponent('user_picture');
diff --git a/core/modules/user/src/Tests/Migrate/MigrateUserPictureFieldInstanceTest.php b/core/modules/user/src/Tests/Migrate/MigrateUserPictureFieldInstanceTest.php
index 45367f9..e81c728 100644
--- a/core/modules/user/src/Tests/Migrate/MigrateUserPictureFieldInstanceTest.php
+++ b/core/modules/user/src/Tests/Migrate/MigrateUserPictureFieldInstanceTest.php
@@ -12,7 +12,7 @@
 use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
 
 /**
- * User picture field instance migration.
+ * Avatar field instance migration.
  *
  * @group user
  */
@@ -30,7 +30,7 @@ protected function setUp() {
   }
 
   /**
-   * Test the user picture field migration.
+   * Test the avatar field migration.
    */
   public function testUserPictureField() {
     /** @var \Drupal\field\FieldConfigInterface $field */
diff --git a/core/modules/user/src/Tests/Migrate/MigrateUserPictureFieldTest.php b/core/modules/user/src/Tests/Migrate/MigrateUserPictureFieldTest.php
index cf4120f..90f8995 100644
--- a/core/modules/user/src/Tests/Migrate/MigrateUserPictureFieldTest.php
+++ b/core/modules/user/src/Tests/Migrate/MigrateUserPictureFieldTest.php
@@ -12,7 +12,7 @@
 use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
 
 /**
- * User picture field migration.
+ * Avatar field migration.
  *
  * @group user
  */
@@ -29,7 +29,7 @@ protected function setUp() {
   }
 
   /**
-   * Test the user picture field migration.
+   * Test the avatar field migration.
    */
   public function testUserPictureField() {
     /** @var \Drupal\field\FieldStorageConfigInterface $field_storage */
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureFileTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureFileTest.php
index 2e1d428..c18addf 100644
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureFileTest.php
+++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureFileTest.php
@@ -11,7 +11,7 @@
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
- * User pictures migration.
+ * Avatars migration.
  *
  * @group migrate_drupal_6
  */
@@ -41,7 +41,7 @@ protected function setUp() {
   }
 
   /**
-   * Tests the Drupal 6 user pictures to Drupal 8 migration.
+   * Tests the Drupal 6 avatars to Drupal 8 migration.
    */
   public function testUserPictures() {
     $file_ids = array();
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php
index 9980ba0..72a091a 100644
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php
+++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php
@@ -51,7 +51,7 @@ protected function setUp() {
       'translatable' => '0',
     ))->save();
     entity_create('field_config', array(
-      'label' => 'User Picture',
+      'label' => 'Avatar',
       'description' => '',
       'field_name' => 'user_picture',
       'entity_type' => 'user',
@@ -158,7 +158,7 @@ public function testUser() {
 
       // We have one empty picture in the data so don't try load that.
       if (!empty($source->picture)) {
-        // Test the user picture.
+        // Test the avatar.
         $file = File::load($user->user_picture->target_id);
         $this->assertIdentical(basename($source->picture), $file->getFilename());
       }
diff --git a/core/modules/user/src/Tests/Migrate/d7/MigrateUserTest.php b/core/modules/user/src/Tests/Migrate/d7/MigrateUserTest.php
index c6c2cbb..8bdd04a 100644
--- a/core/modules/user/src/Tests/Migrate/d7/MigrateUserTest.php
+++ b/core/modules/user/src/Tests/Migrate/d7/MigrateUserTest.php
@@ -32,7 +32,7 @@ class MigrateUserTest extends MigrateDrupal7TestBase {
   protected function setUp() {
     parent::setUp();
 
-    // Prepare to migrate user pictures as well.
+    // Prepare to migrate user avatars as well.
     $this->installEntitySchema('file');
     $this->executeMigration('user_picture_field');
     $this->executeMigration('user_picture_field_instance');
diff --git a/core/modules/user/src/Tests/UserPasswordResetTest.php b/core/modules/user/src/Tests/UserPasswordResetTest.php
index f5bd131..d6f5bf8 100644
--- a/core/modules/user/src/Tests/UserPasswordResetTest.php
+++ b/core/modules/user/src/Tests/UserPasswordResetTest.php
@@ -21,7 +21,7 @@ class UserPasswordResetTest extends PageCacheTagsTestBase {
    * The profile to install as a basis for testing.
    *
    * This test uses the standard profile to test the password reset in
-   * combination with an ajax request provided by the user picture configuration
+   * combination with an ajax request provided by the avatar configuration
    * in the standard profile.
    *
    * @var string
@@ -109,7 +109,7 @@ function testUserPasswordReset() {
     $this->assertLink(t('Log out'));
     $this->assertTitle(t('@name | @site', array('@name' => $this->account->getUsername(), '@site' => $this->config('system.site')->get('name'))), 'Logged in using password reset link.');
 
-    // Make sure the ajax request from uploading a user picture does not
+    // Make sure the ajax request from uploading a avatar does not
     // invalidate the reset token.
     $image = current($this->drupalGetTestFiles('image'));
     $edit = array(
diff --git a/core/modules/user/src/Tests/UserPictureTest.php b/core/modules/user/src/Tests/UserPictureTest.php
index bd28934..82bd9d2 100644
--- a/core/modules/user/src/Tests/UserPictureTest.php
+++ b/core/modules/user/src/Tests/UserPictureTest.php
@@ -12,7 +12,7 @@
 use Drupal\file\Entity\File;
 
 /**
- * Tests user picture functionality.
+ * Tests avatar functionality.
  *
  * @group user
  */
@@ -21,7 +21,7 @@ class UserPictureTest extends WebTestBase {
   /**
    * The profile to install as a basis for testing.
    *
-   * Using the standard profile to test user picture config provided by the
+   * Using the standard profile to test avatar config provided by the
    * standard profile.
    *
    * @var string
@@ -47,7 +47,7 @@ protected function setUp() {
   }
 
   /**
-   * Tests creation, display, and deletion of user pictures.
+   * Tests creation, display, and deletion of avatars.
    */
   function testCreateDeletePicture() {
     $this->drupalLogin($this->webUser);
@@ -58,7 +58,7 @@ function testCreateDeletePicture() {
 
     // Verify that the image is displayed on the user account page.
     $this->drupalGet('user');
-    $this->assertRaw(file_uri_target($file->getFileUri()), 'User picture found on user account page.');
+    $this->assertRaw(file_uri_target($file->getFileUri()), 'Avatar found on user account page.');
 
     // Delete the picture.
     $edit = array();
@@ -95,7 +95,7 @@ function testPictureOnNodeComment() {
 
     $node = $this->drupalCreateNode(array('type' => 'article'));
 
-    // Enable user pictures on nodes.
+    // Enable avatars on nodes.
     $this->config('system.theme.global')->set('features.node_user_picture', TRUE)->save();
 
     $image_style_id = $this->config('core.entity_view_display.user.user.compact')->get('content.user_picture.settings.image_style');
@@ -106,9 +106,9 @@ function testPictureOnNodeComment() {
     // Verify that the image is displayed on the node page.
     $this->drupalGet('node/' . $node->id());
     $elements = $this->cssSelect('.node__meta .field--name-user-picture img[alt="' . $alt_text . '"][src="' . $image_url . '"]');
-    $this->assertEqual(count($elements), 1, 'User picture with alt text found on node page.');
+    $this->assertEqual(count($elements), 1, 'Avatar with alt text found on node page.');
 
-    // Enable user pictures on comments, instead of nodes.
+    // Enable avatars on comments, instead of nodes.
     $this->config('system.theme.global')
       ->set('features.node_user_picture', FALSE)
       ->set('features.comment_user_picture', TRUE)
@@ -119,20 +119,20 @@ function testPictureOnNodeComment() {
     );
     $this->drupalPostForm('comment/reply/node/' . $node->id() . '/comment', $edit, t('Save'));
     $elements = $this->cssSelect('.comment__meta .field--name-user-picture img[alt="' . $alt_text . '"][src="' . $image_url . '"]');
-    $this->assertEqual(count($elements), 1, 'User picture with alt text found on the comment.');
+    $this->assertEqual(count($elements), 1, 'Avatar with alt text found on the comment.');
 
-    // Disable user pictures on comments and nodes.
+    // Disable avatars on comments and nodes.
     $this->config('system.theme.global')
       ->set('features.node_user_picture', FALSE)
       ->set('features.comment_user_picture', FALSE)
       ->save();
 
     $this->drupalGet('node/' . $node->id());
-    $this->assertNoRaw(file_uri_target($file->getFileUri()), 'User picture not found on node and comment.');
+    $this->assertNoRaw(file_uri_target($file->getFileUri()), 'Avatar not found on node and comment.');
   }
 
   /**
-   * Edits the user picture for the test user.
+   * Edits the avatar for the test user.
    */
   function saveUserPicture($image) {
     $edit = array('files[user_picture_0]' => drupal_realpath($image->uri));
diff --git a/core/modules/user/tests/src/Unit/Migrate/d6/UserPictureTest.php b/core/modules/user/tests/src/Unit/Migrate/d6/UserPictureTest.php
index a1304c4..a4a02b7 100644
--- a/core/modules/user/tests/src/Unit/Migrate/d6/UserPictureTest.php
+++ b/core/modules/user/tests/src/Unit/Migrate/d6/UserPictureTest.php
@@ -10,7 +10,7 @@
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
- * Tests D6 user picture source plugin.
+ * Tests D6 avatar source plugin.
  *
  * @group user
  */
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 4f8289b..21b23e4 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -119,10 +119,10 @@ function user_js_settings_alter(&$settings, AttachedAssetsInterface $assets) {
 }
 
 /**
- * Returns whether this site supports the default user picture feature.
+ * Returns whether this site supports the default avatar feature.
  *
  * This approach preserves compatibility with node/comment templates. Alternate
- * user picture implementations (e.g., Gravatar) should provide their own
+ * avatar implementations (e.g., Gravatar) should provide their own
  * add/edit/delete forms and populate the 'picture' variable during the
  * preprocess stage.
  */
diff --git a/core/profiles/minimal/minimal.install b/core/profiles/minimal/minimal.install
index d30cb3b..dca3b12 100644
--- a/core/profiles/minimal/minimal.install
+++ b/core/profiles/minimal/minimal.install
@@ -12,7 +12,7 @@
  * @see system_install()
  */
 function minimal_install() {
-  // Disable the user pictures on nodes.
+  // Disable the avatars on nodes.
   \Drupal::configFactory()->getEditable('system.theme.global')->set('features.node_user_picture', FALSE)->save(TRUE);
 
   // Allow visitor account creation, but with administrative approval.