diff --git a/core/modules/menu/lib/Drupal/menu/MenuFormController.php b/core/modules/menu/lib/Drupal/menu/MenuFormController.php
index 246de38..35832e8 100644
--- a/core/modules/menu/lib/Drupal/menu/MenuFormController.php
+++ b/core/modules/menu/lib/Drupal/menu/MenuFormController.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\menu;
 
-use Drupal;
 use Drupal\Core\Entity\EntityFormController;
 use Drupal\Core\Language\Language;
 
@@ -75,7 +74,7 @@ public function form(array $form, array &$form_state) {
       '#languages' => Language::STATE_ALL,
       '#default_value' => $menu->langcode,
     );
-    if (Drupal::moduleHandler()->moduleExists('language')) {
+    if (\Drupal::moduleHandler()->moduleExists('language')) {
       $form['default_menu_links_language'] = array(
         '#type' => 'details',
         '#title' => t('Menu links language'),
@@ -105,14 +104,14 @@ protected function actions(array $form, array &$form_state) {
 
     // Add the language configuration submit handler. This is needed because the
     // submit button has custom submit handlers.
-    if (Drupal::moduleHandler()->moduleExists('language')) {
+    if (\Drupal::moduleHandler()->moduleExists('language')) {
       array_unshift($actions['submit']['#submit'],'language_configuration_element_submit');
       array_unshift($actions['submit']['#submit'], array($this, 'languageConfigurationSubmit'));
     }
     // We cannot leverage the regular submit handler definition because we have
     // button-specific ones here. Hence we need to explicitly set it for the
     // submit action, otherwise it would be ignored.
-    if (Drupal::moduleHandler()->moduleExists('translation_entity')) {
+    if (\Drupal::moduleHandler()->moduleExists('translation_entity')) {
       array_unshift($actions['submit']['#submit'], 'translation_entity_language_configuration_element_submit');
     }
     return $actions;
@@ -122,7 +121,7 @@ protected function actions(array $form, array &$form_state) {
    * Submit handler to update the bundle for the default language configuration.
    */
   public function languageConfigurationSubmit(array &$form, array &$form_state) {
-    $menu = $this->getEntity($form_state);
+    $menu = $this->entity;
     // Delete the old language settings for the menu, if the machine name
     // is changed.
     if ($menu && $menu->id() && $menu->id() != $form_state['values']['id']) {
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php
index fda9bee..5fcf540 100644
--- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php
+++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\menu_link;
 
-use Drupal;
 use Drupal\Core\Entity\EntityFormController;
 use Drupal\Core\Language\Language;
 use Drupal\Core\Entity\EntityControllerInterface;
@@ -160,7 +159,7 @@ public function form(array $form, array &$form_state) {
     // Get the default langcode and show language select value.
     // @todo Make this work with bundle instead of menu_name. Uses menu_name
     //   right now to get around ->bundle being 'tools' for all new menu items.
-    $language_configuration = Drupal::moduleHandler()->invoke('language', 'get_default_configuration', array('menu_link', $menu_link->menu_name));
+    $language_configuration = \Drupal::moduleHandler()->invoke('language', 'get_default_configuration', array('menu_link', $menu_link->menu_name));
 
     if ($menu_link->isNew()) {
       // Adding a new menu link, use the default from language settings config.