diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index 2a8eb4c..f20ada7 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -1673,7 +1673,7 @@ function drupal_get_messages($type = NULL, $clear_queue = TRUE) {
  *   The current page's title.
  */
 function drupal_get_title() {
-  return drupal_set_title();
+  return drupal_set_title() ?: '';
 }
 
 /**
diff --git a/core/includes/menu.inc b/core/includes/menu.inc
index fe4635a..c458e12 100644
--- a/core/includes/menu.inc
+++ b/core/includes/menu.inc
@@ -1859,7 +1859,7 @@ function menu_navigation_links($menu_name, $level = 0) {
     if (!$item['link']['hidden']) {
       $class = '';
       $l = $item['link']['localized_options'];
-      $l['href'] = $item['link']['href'];
+      $l['href'] = $item['link']['link_path'];
       $l['title'] = $item['link']['title'];
       if ($item['link']['in_active_trail']) {
         $class = ' active-trail';
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 1fd5370..9a28d9b 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -3042,7 +3042,7 @@ function system_get_module_admin_tasks($module, $info) {
     $links = array();
     $menu_links = entity_get_controller('menu_link')->loadModuleAdminTasks();
     foreach ($menu_links as $link) {
-      _menu_link_translate($link);
+      _menu_link_prepare($link);
       if ($link['access']) {
         $links[$link['router_path']] = $link;
       }
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 1eb0e36..e36da3b 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -893,9 +893,9 @@ function user_menu_breadcrumb_alter(&$active_trail, $item) {
 }
 
 /**
- * Implements hook_translated_menu_link_alter().
+ * Implements hook_prepared_menu_link_alter().
  */
-function user_translated_menu_link_alter(MenuLink &$menu_link) {
+function user_prepared_menu_link_alter(MenuLink &$menu_link) {
   // Hide the "User account" link for anonymous users.
   if ($menu_link->link_path == 'user' && $menu_link->module == 'system' && \Drupal::currentUser()->isAnonymous()) {
     $menu_link->hidden = 1;