diff --git a/core/modules/book/book.module b/core/modules/book/book.module
index fe60ede..6763dbf 100644
--- a/core/modules/book/book.module
+++ b/core/modules/book/book.module
@@ -57,7 +57,7 @@ function book_menu_link_load($entities) {
   foreach ($entities as $entity) {
     // Change the bundle of menu links related to a book.
     if (strpos($entity->menu_name, 'book-toc-') !== FALSE) {
-      $entity->type = 'book-toc';
+      $entity->bundle = 'book-toc';
     }
   }
 }
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php
index 6c0a180..6a3eddb 100644
--- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php
+++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php
@@ -105,7 +105,7 @@ protected function attachLoad(&$menu_links, $load_revision = FALSE) {
       $menu_link->router_item['weight'] = $menu_link->weight;
 
       // By default use the menu_name as type.
-      $menu_link->type = $menu_link->menu_name;
+      $menu_link->bundle = $menu_link->menu_name;
 
       // For all links that have an associated route, load the route object now
       // and save it on the object. That way we avoid a select N+1 problem later.
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php b/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php
index ac548e1..13fa79a 100644
--- a/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php
+++ b/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php
@@ -36,10 +36,10 @@
  *     "id" = "mlid",
  *     "label" = "link_title",
  *     "uuid" = "uuid",
- *     "bundle" = "type"
+ *     "bundle" = "bundle"
  *   },
  *   bundle_keys = {
- *     "bundle" = "type"
+ *     "bundle" = "bundle"
  *   }
  * )
  */
@@ -53,11 +53,11 @@ class MenuLink extends Entity implements \ArrayAccess, MenuLinkInterface {
   public $menu_name = 'tools';
 
   /**
-   * The link's type.
+   * The link's bundle.
    *
    * @var string
    */
-  public $type = 'tools';
+  public $bundle = 'tools';
 
   /**
    * The menu link ID.
diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module
index 58fc192..39411f4 100644
--- a/core/modules/shortcut/shortcut.module
+++ b/core/modules/shortcut/shortcut.module
@@ -56,7 +56,7 @@ function shortcut_menu_link_load($entities) {
   foreach ($entities as $entity) {
     // Change the bundle of menu links related to a shortcut.
     if (strpos($entity->menu_name, 'shortcut-') !== FALSE) {
-      $entity->type = 'shortcut';
+      $entity->bundle = 'shortcut';
     }
   }
 }