diff --git a/core/modules/user/src/ToolbarHandler.php b/core/modules/user/src/ToolbarLinkBuilder.php
similarity index 94%
rename from core/modules/user/src/ToolbarHandler.php
rename to core/modules/user/src/ToolbarLinkBuilder.php
index b738174c93..4f7dedd53c 100644
--- a/core/modules/user/src/ToolbarHandler.php
+++ b/core/modules/user/src/ToolbarLinkBuilder.php
@@ -7,9 +7,9 @@
 use Drupal\Core\Url;
 
 /**
- * Toolbar integration handler.
+ * ToolbarLinkBuilder fills out the placeholders generated in user_toolbar().
  */
-class ToolbarHandler {
+class ToolbarLinkBuilder {
 
   use StringTranslationTrait;
 
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 9994916632..cabe189e5a 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -1370,11 +1370,11 @@ function user_toolbar() {
   }
   else {
     $items['user']['tab']['#title'] = [
-      '#lazy_builder' => ['user.toolbar_handler:renderDisplayName', []],
+      '#lazy_builder' => ['user.toolbar_link_builder:renderDisplayName', []],
       '#create_placeholder' => TRUE,
     ];
     $items['user']['tray']['user_links'] = [
-      '#lazy_builder' => ['user.toolbar_handler:renderToolbarLinks', []],
+      '#lazy_builder' => ['user.toolbar_link_builder:renderToolbarLinks', []],
       '#create_placeholder' => TRUE,
     ];
   }
diff --git a/core/modules/user/user.services.yml b/core/modules/user/user.services.yml
index 2ef921049c..058daa03bb 100644
--- a/core/modules/user/user.services.yml
+++ b/core/modules/user/user.services.yml
@@ -68,6 +68,6 @@ services:
     arguments: ['@current_user', '@entity.manager']
     tags:
       - { name: 'context_provider' }
-  user.toolbar_handler:
-    class: Drupal\user\ToolbarHandler
+  user.toolbar_link_builder:
+    class: Drupal\user\ToolbarLinkBuilder
     arguments: ['@current_user']