diff --git a/core/modules/migrate_drupal/migration_templates/d6_menu_links.yml b/core/modules/menu_link_content/migration_templates/d6_menu_links.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d6_menu_links.yml
rename to core/modules/menu_link_content/migration_templates/d6_menu_links.yml
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/MenuLink.php b/core/modules/menu_link_content/src/Plugin/migrate/source/d6/MenuLink.php
similarity index 96%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/MenuLink.php
rename to core/modules/menu_link_content/src/Plugin/migrate/source/d6/MenuLink.php
index 4711477..8e285ad 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/MenuLink.php
+++ b/core/modules/menu_link_content/src/Plugin/migrate/source/d6/MenuLink.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\MenuLink.
+ * Contains \Drupal\menu_link_content\Plugin\migrate\source\d6\MenuLink.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\menu_link_content\Plugin\migrate\source\d6;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 use Drupal\migrate\Row;
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuLinkTest.php b/core/modules/menu_link_content/src/Tests/d6/MigrateMenuLinkTest.php
similarity index 95%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateMenuLinkTest.php
rename to core/modules/menu_link_content/src/Tests/d6/MigrateMenuLinkTest.php
index e68dc8a..e5a46c3 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuLinkTest.php
+++ b/core/modules/menu_link_content/src/Tests/d6/MigrateMenuLinkTest.php
@@ -2,15 +2,15 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateMenuLinkTest.
+ * Contains \Drupal\menu_link_content\Tests\d6\MigrateMenuLinkTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\menu_link_content\Tests\d6;
 
 /**
  * Menu link migration.
  *
- * @group migrate_drupal
+ * @group menu_link_content
  */
 class MigrateMenuLinkTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/MenuLinkSourceTest.php b/core/modules/menu_link_content/tests/src/Unit/Plugin/migrate/source/d6/MenuLinkSourceTest.php
similarity index 91%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/MenuLinkSourceTest.php
rename to core/modules/menu_link_content/tests/src/Unit/Plugin/migrate/source/d6/MenuLinkSourceTest.php
index fb9e0e7..e641c09 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/MenuLinkSourceTest.php
+++ b/core/modules/menu_link_content/tests/src/Unit/Plugin/migrate/source/d6/MenuLinkSourceTest.php
@@ -2,23 +2,23 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\MenuLinkSourceTest.
+ * Contains \Drupal\Tests\menu_link_content\Unit\Plugin\migrate\source\d6\MenuLinkSourceTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\menu_link_content\Unit\Plugin\migrate\source\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests D6 menu link source plugin.
  *
- * @group migrate_drupal
+ * @group menu_link_content
  */
 class MenuLinkSourceTest extends MigrateSqlSourceTestCase {
 
   // The plugin system is not working during unit testing so the source plugin
   // class needs to be manually specified.
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\MenuLink';
+  const PLUGIN_CLASS = 'Drupal\menu_link_content\Plugin\migrate\source\d6\MenuLink';
 
   // The fake Migration configuration entity.
   protected $migrationConfiguration = array(