diff --git a/core/modules/menu/lib/Drupal/menu/MenuFormController.php b/core/modules/menu/lib/Drupal/menu/MenuFormController.php
index ace88c7..399e1a0 100644
--- a/core/modules/menu/lib/Drupal/menu/MenuFormController.php
+++ b/core/modules/menu/lib/Drupal/menu/MenuFormController.php
@@ -8,6 +8,7 @@
 namespace Drupal\menu;
 
 use Drupal\Core\Entity\EntityFormController;
+use Drupal\Core\Language\Language;
 
 /**
  * Base form controller for menu edit forms.
@@ -69,21 +70,21 @@ public function form(array $form, array &$form_state) {
     $form['langcode'] = array(
       '#type' => 'language_select',
       '#title' => t('Menu language'),
-      '#languages' => LANGUAGE_ALL,
+      '#languages' => Language::STATE_ALL,
       '#default_value' => $menu->langcode,
     );
     if (module_exists('language')) {
-      $form['default_menu_items_language'] = array(
+      $form['default_menu_links_language'] = array(
         '#type' => 'details',
-        '#title' => t('Menu items language'),
+        '#title' => t('Menu links language'),
       );
-      $form['default_menu_items_language']['default_language'] = array(
+      $form['default_menu_links_language']['default_language'] = array(
         '#type' => 'language_configuration',
         '#entity_information' => array(
-          'entity_type' => 'menu_item',
+          'entity_type' => 'menu_link',
           'bundle' => $menu->id(),
         ),
-        '#default_value' => language_get_default_configuration('menu_item', $menu->id()),
+        '#default_value' => language_get_default_configuration('menu_link', $menu->id()),
       );
     }
 
@@ -104,7 +105,6 @@ protected function actions(array $form, array &$form_state) {
     // submit button has custom submit handlers.
     if (module_exists('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
@@ -117,22 +117,6 @@ 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->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']) {
-      language_clear_default_configuration('menu_item', $menu->id());
-    }
-    // Since the machine name is not known yet, and it can be changed anytime,
-    // we have to also update the bundle property for the default language
-    // configuration in order to have the correct bundle value.
-    $form_state['language']['default_language']['bundle'] = $form_state['values']['id'];
-  }
-
-  /**
    * Overrides Drupal\Core\Entity\EntityFormController::save().
    */
   public function save(array $form, array &$form_state) {