diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_menu_links.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_menu_links.yml
index 4eb3ae2..6b59fa3 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_menu_links.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_menu_links.yml
@@ -4,21 +4,25 @@ migration_groups:
   - Drupal 6
 source:
   plugin: d6_menu_link
+  constants:
+    bundle: menu_link_content
 process:
   mlid: mlid
   menu_name:
     plugin: migration
     migration: d6_menu
-    source:
-      - menu_name
+    source: menu_name
+  bundle: 'constants/bundle'
   plid:
-    plugin: migration
-    migration: d6_menu_link
-    source:
-      - plid
+    -
+      plugin: skip_process_on_empty
+      source: plid
+    -
+      plugin: migration
+      migration: d6_menu_links
   link_path: link_path
   router_path: router_path
-  link_title: link_title
+  title: title
   options: options
   module: module
   hidden: hidden
@@ -42,7 +46,7 @@ process:
 #  route_name
 #  route_parameters
 destination:
-  plugin: entity:menu_link
+  plugin: entity:menu_link_content
 migration_dependencies:
   required:
     - d6_menu
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuLinkTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuLinkTest.php
index 5fad145..47093ee 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuLinkTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuLinkTest.php
@@ -56,7 +56,7 @@ public function testMenuLinks() {
     $destination_ids = $migration->getIdMap()->lookupDestinationId(array(138));
     $parent_mlid = $destination_ids[0];
     /** @var MenuLink $menu_link */
-    $menu_link= entity_load('menu_link', $parent_mlid);
+    $menu_link = entity_load('menu_link_content', $parent_mlid);
     $this->assertEqual($menu_link->label(), 'Test 1');
     $this->assertEqual($menu_link->menu_name, 'menu-test-menu');
     $this->assertEqual($menu_link->plid, 0);
@@ -76,7 +76,7 @@ public function testMenuLinks() {
     $destination_ids = $migration->getIdMap()->lookupDestinationId(array(139));
     $mlid = $destination_ids[0];
     /** @var MenuLink $menu_link */
-    $menu_link= entity_load('menu_link', $mlid);
+    $menu_link = entity_load('menu_link_content', $mlid);
     $this->assertEqual($menu_link->label(), 'Test 2');
     $this->assertEqual($menu_link->menu_name, 'menu-test-menu');
     $this->assertEqual($menu_link->plid, 0);