diff --git a/core/includes/menu.inc b/core/includes/menu.inc
index 180933c..5023ce9 100644
--- a/core/includes/menu.inc
+++ b/core/includes/menu.inc
@@ -1090,7 +1090,7 @@ function menu_secondary_menu() {
  *   Returns menu name, if exist
  */
 function _menu_get_links_source($name, $default) {
-  $config = \Drupal::config('menu.settings');
+  $config = \Drupal::config('menu_ui.settings');
   return \Drupal::moduleHandler()->moduleExists('menu_ui') ? $config->get($name) : $default;
 }
 
diff --git a/core/modules/menu/lib/Drupal/menu_ui/Controller/MenuController.php b/core/modules/menu/lib/Drupal/menu_ui/Controller/MenuController.php
index 0576378..fd46114 100644
--- a/core/modules/menu/lib/Drupal/menu_ui/Controller/MenuController.php
+++ b/core/modules/menu/lib/Drupal/menu_ui/Controller/MenuController.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\menu\Controller\MenuController.
+ * Contains \Drupal\menu_ui\Controller\MenuController.
  */
 
 namespace Drupal\menu_ui\Controller;
diff --git a/core/modules/menu/lib/Drupal/menu_ui/MenuSettingsForm.php b/core/modules/menu/lib/Drupal/menu_ui/MenuSettingsForm.php
index c15b42f..48a12bd 100644
--- a/core/modules/menu/lib/Drupal/menu_ui/MenuSettingsForm.php
+++ b/core/modules/menu/lib/Drupal/menu_ui/MenuSettingsForm.php
@@ -25,7 +25,7 @@ public function getFormId() {
    * Implements \Drupal\Core\Form\FormInterface::buildForm().
    */
   public function buildForm(array $form, array &$form_state) {
-    $config = $this->configFactory->get('menu.settings');
+    $config = $this->configFactory->get('menu_ui.settings');
     $form['intro'] = array(
       '#type' => 'item',
       '#markup' => t('The menu module allows on-the-fly creation of menu links in the content authoring forms. To configure these settings for a particular content type, visit the <a href="@content-types">Content types</a> page, click the <em>edit</em> link for the content type, and go to the <em>Menu settings</em> section.', array('@content-types' => url('admin/structure/types'))),
@@ -61,7 +61,7 @@ public function buildForm(array $form, array &$form_state) {
    * Implements \Drupal\Core\Form\FormInterface::submitForm().
    */
   public function submitForm(array &$form, array &$form_state) {
-    $this->configFactory->get('menu.settings')
+    $this->configFactory->get('menu_ui.settings')
       ->set('main_links', $form_state['values']['menu_main_links_source'])
       ->set('secondary_links', $form_state['values']['menu_secondary_links_source'])
       ->save();
diff --git a/core/modules/menu/menu_ui.module b/core/modules/menu/menu_ui.module
index 67b4bcc..091a321 100644
--- a/core/modules/menu/menu_ui.module
+++ b/core/modules/menu/menu_ui.module
@@ -227,7 +227,7 @@ function menu_ui_parent_options(array $menus, MenuLink $menu_link = NULL, $type
   // allow contrib modules to provide more scalable pattern choosers.
   // hook_form_alter is too late in itself because all the possible parents are
   // retrieved here, unless override_parent_selector is set to TRUE.
-  if (\Drupal::config('menu.settings')->get('override_parent_selector')) {
+  if (\Drupal::config('menu_ui.settings')->get('override_parent_selector')) {
     return array();
   }
 
diff --git a/core/modules/menu/menu_ui.routing.yml b/core/modules/menu/menu_ui.routing.yml
index 2dbf5a4..345fd46 100644
--- a/core/modules/menu/menu_ui.routing.yml
+++ b/core/modules/menu/menu_ui.routing.yml
@@ -17,14 +17,14 @@ menu_ui.overview_page:
 menu_ui.parent_options_js:
   path: '/admin/structure/menu/parents'
   defaults:
-    _controller: '\Drupal\menu\Controller\MenuController::getParentOptions'
+    _controller: '\Drupal\menu_ui\Controller\MenuController::getParentOptions'
   requirements:
     _permission: 'administer menu'
 
 menu_ui.link_add:
   path: '/admin/structure/menu/manage/{menu}/add'
   defaults:
-    _content: '\Drupal\menu\Controller\MenuController::addLink'
+    _content: '\Drupal\menu_ui\Controller\MenuController::addLink'
     _title: 'Add menu link'
   requirements:
     _entity_create_access: 'menu_link'
@@ -65,7 +65,7 @@ menu_ui.menu_edit:
   path: '/admin/structure/menu/manage/{menu}'
   defaults:
     _entity_form: 'menu.edit'
-    _title_callback: '\Drupal\menu\Controller\MenuController::menuTitle'
+    _title_callback: '\Drupal_ui\menu\Controller\MenuController::menuTitle'
   requirements:
     _entity_access: 'menu.update'
 
diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_menu_settings.yml b/core/modules/migrate_drupal/config/migrate.migration.d6_menu_settings.yml
index b57bd3e..949f760 100644
--- a/core/modules/migrate_drupal/config/migrate.migration.d6_menu_settings.yml
+++ b/core/modules/migrate_drupal/config/migrate.migration.d6_menu_settings.yml
@@ -11,4 +11,4 @@ process:
     override_parent_selector: menu_override_parent_selector
 destination:
     plugin: d8_config
-    config_name: menu.settings
+    config_name: menu_ui.settings
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6MenuSettings.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6MenuSettings.php
index dc6fe2d..ee644e7 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6MenuSettings.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6MenuSettings.php
@@ -10,7 +10,7 @@
 use Drupal\Core\Database\Connection;
 
 /**
- * Database dump for testing menu.settings.yml migration.
+ * Database dump for testing menu_ui.settings.yml migration.
  */
 class Drupal6MenuSettings {
 
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateMenuConfigsTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateMenuConfigsTest.php
index ef71619..7d0584e 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateMenuConfigsTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateMenuConfigsTest.php
@@ -28,8 +28,8 @@ class MigrateMenuConfigsTest extends MigrateDrupalTestBase {
    */
   public static function getInfo() {
     return array(
-      'name'  => 'Migrate variables to menu.settings.yml',
-      'description'  => 'Upgrade variables to menu.settings.yml',
+      'name'  => 'Migrate variables to menu_ui.settings.yml',
+      'description'  => 'Upgrade variables to menu_ui.settings.yml',
       'group' => 'Migrate Drupal',
     );
   }
@@ -45,7 +45,7 @@ public function testMenuSettings() {
     $this->prepare($migration, $dumps);
     $executable = new MigrateExecutable($migration, new MigrateMessage());
     $executable->import();
-    $config = \Drupal::config('menu.settings');
+    $config = \Drupal::config('menu_ui.settings');
     $this->assertIdentical($config->get('main_links'), 'primary-links');
     $this->assertIdentical($config->get('secondary_links'), 'secondary-links');
     $this->assertIdentical($config->get('override_parent_selector'), FALSE);
diff --git a/core/modules/system/lib/Drupal/system/Tests/Cache/PageCacheTagsIntegrationTest.php b/core/modules/system/lib/Drupal/system/Tests/Cache/PageCacheTagsIntegrationTest.php
index b245c34..5e29222 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Cache/PageCacheTagsIntegrationTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Cache/PageCacheTagsIntegrationTest.php
@@ -15,7 +15,7 @@
  *
  * @see \Drupal\system\Tests\Bootstrap\PageCacheTest
  * @see \Drupal\node\Tests\NodePageCacheTest
- * @see \Drupal\menu\Tests\MenuTest::testMenuBlockPageCacheTags()
+ * @see \Drupal\menu_ui\Tests\MenuTest::testMenuBlockPageCacheTags()
  */
 class PageCacheTagsIntegrationTest extends WebTestBase {
 
diff --git a/core/modules/system/tests/modules/menu_test/menu_test.info.yml b/core/modules/system/tests/modules/menu_test/menu_test.info.yml
index cce904b..c927d5f 100644
--- a/core/modules/system/tests/modules/menu_test/menu_test.info.yml
+++ b/core/modules/system/tests/modules/menu_test/menu_test.info.yml
@@ -7,4 +7,4 @@ core: 8.x
 hidden: true
 dependencies:
   - test_page_test
-  - menu
+  - menu_ui