diff --git a/core/core.services.yml b/core/core.services.yml
index 92b4e95..4d2e55d 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -169,7 +169,7 @@ services:
   plugin.manager.action:
     class: Drupal\Core\Action\ActionManager
     arguments: ['@container.namespaces']
-  plugin.manager.local_task:
+  plugin.manager.menu.local_task:
     class: Drupal\Core\Menu\LocalTaskManager
     arguments: ['@container.namespaces', '@controller_resolver', '@request', '@router.route_provider', '@module_handler']
   request:
diff --git a/core/includes/menu.inc b/core/includes/menu.inc
index e299b1a..7404acb 100644
--- a/core/includes/menu.inc
+++ b/core/includes/menu.inc
@@ -2124,8 +2124,7 @@ function menu_local_tasks($level = 0) {
     // Look for route-based tabs.
     $route_name = Drupal::request()->attributes->get('_route');
     if (!empty($route_name)) {
-      // The default manager class is \Drupal\Core\Menu\LocalTaskManager.
-      $manager = Drupal::service('plugin.manager.local_task');
+      $manager = Drupal::service('plugin.manager.menu.local_task');
       $local_tasks = $manager->getTasksBuild($route_name);
       foreach ($local_tasks as $level => $items) {
         $data['tabs'][$level] = empty($data['tabs'][$level]) ? $items : array_merge($data['tabs'][$level], $items);
diff --git a/core/lib/Drupal/Core/Annotation/Menu/LocalTask.php b/core/lib/Drupal/Core/Annotation/Menu/LocalTask.php
index d64b159..52ef6a1 100644
--- a/core/lib/Drupal/Core/Annotation/Menu/LocalTask.php
+++ b/core/lib/Drupal/Core/Annotation/Menu/LocalTask.php
@@ -49,7 +49,7 @@ class LocalTask extends Plugin {
   /**
    * The plugin ID of the parent tab (or NULL for a top-level tab).
    *
-   * @var array
+   * @var array|NULL
    */
   public $tab_parent_id;
 
@@ -63,7 +63,7 @@ class LocalTask extends Plugin {
   /**
    * The default link options.
    *
-   * @var array
+   * @var array (optional)
    */
   public $options = array();
 
diff --git a/core/lib/Drupal/Core/Menu/LocalTaskInterface.php b/core/lib/Drupal/Core/Menu/LocalTaskInterface.php
index 0df07ea..b7f581d 100644
--- a/core/lib/Drupal/Core/Menu/LocalTaskInterface.php
+++ b/core/lib/Drupal/Core/Menu/LocalTaskInterface.php
@@ -25,6 +25,9 @@ public function getRouteName();
    *
    * Subclasses may add optional arguments like NodeInterface $node = NULL that
    * will be supplied by the ControllerResolver.
+   *
+   * @return string
+   *   The title of the local task.
    */
   public function getTitle();
 
@@ -33,6 +36,9 @@ public function getTitle();
    *
    * Subclasses may add optional arguments like NodeInterface $node = NULL that
    * will be supplied by the ControllerResolver.
+   *
+   * @return string
+   *   The path of this local task.
    */
   public function getPath();
 
@@ -50,7 +56,7 @@ public function getWeight();
    * @return array
    *   Associative array of options.
    *
-   * @see l().
+   * @see l()
    */
   public function getOptions();
 
@@ -60,7 +66,7 @@ public function getOptions();
    * @param bool $active
    *   Sets whether this tab is active (e.g. a parent of the current tab).
    *
-   * @return \Drupal\system\Plugin\MenuLocalTaskInterface
+   * @return \Drupal\Core\Menu\LocalTaskInterface
    *   The called object for chaining.
    */
   public function setActive($active = TRUE);