diff --git a/loader/i386/pc/chainloader.c b/loader/i386/pc/chainloader.c
index 935f5a6d1..502031d0e 100644
--- a/loader/i386/pc/chainloader.c
+++ b/loader/i386/pc/chainloader.c
@@ -105,7 +105,7 @@ grub_chainloader_cmd (const char *filename, grub_chainloader_flags_t flags)
 	{
 	  grub_partition_t p = disk->partition;
 
-	  if (p && grub_strcmp (p->partmap->name, "part_msdos") == 0)
+	  if (p && grub_strcmp (p->partmap->name, "msdos") == 0)
 	    {
 	      disk->partition = p->parent;
 	      grub_disk_read (disk, p->offset, 446, 64,
diff --git a/partmap/acorn.c b/partmap/acorn.c
index 12ef9c781..0c3abf11d 100644
--- a/partmap/acorn.c
+++ b/partmap/acorn.c
@@ -131,7 +131,7 @@ acorn_partition_map_iterate (grub_disk_t disk,
 /* Partition map type.  */
 static struct grub_partition_map grub_acorn_partition_map =
 {
-  .name = "part_acorn",
+  .name = "acorn",
   .iterate = acorn_partition_map_iterate,
 };
 
diff --git a/partmap/amiga.c b/partmap/amiga.c
index 2c6a5afa2..5b6a4598f 100644
--- a/partmap/amiga.c
+++ b/partmap/amiga.c
@@ -138,7 +138,7 @@ amiga_partition_map_iterate (grub_disk_t disk,
 /* Partition map type.  */
 static struct grub_partition_map grub_amiga_partition_map =
   {
-    .name = "part_amiga",
+    .name = "amiga",
     .iterate = amiga_partition_map_iterate,
   };
 
diff --git a/partmap/apple.c b/partmap/apple.c
index 40c59f517..35bdcc8d7 100644
--- a/partmap/apple.c
+++ b/partmap/apple.c
@@ -182,7 +182,7 @@ apple_partition_map_iterate (grub_disk_t disk,
 /* Partition map type.  */
 static struct grub_partition_map grub_apple_partition_map =
   {
-    .name = "part_apple",
+    .name = "apple",
     .iterate = apple_partition_map_iterate,
   };
 
diff --git a/partmap/bsdlabel.c b/partmap/bsdlabel.c
index 861388164..f4df7e1fa 100644
--- a/partmap/bsdlabel.c
+++ b/partmap/bsdlabel.c
@@ -82,7 +82,7 @@ bsdlabel_partition_map_iterate (grub_disk_t disk,
 /* Partition map type.  */
 static struct grub_partition_map grub_bsdlabel_partition_map =
   {
-    .name = "part_bsd",
+    .name = "bsd",
     .iterate = bsdlabel_partition_map_iterate,
   };
 
diff --git a/partmap/gpt.c b/partmap/gpt.c
index 922a7303b..2c942e164 100644
--- a/partmap/gpt.c
+++ b/partmap/gpt.c
@@ -119,7 +119,7 @@ gpt_partition_map_iterate (grub_disk_t disk,
 /* Partition map type.  */
 static struct grub_partition_map grub_gpt_partition_map =
   {
-    .name = "part_gpt",
+    .name = "gpt",
     .iterate = gpt_partition_map_iterate,
   };
 
diff --git a/partmap/msdos.c b/partmap/msdos.c
index 0fbf7ef3d..accf3fdba 100644
--- a/partmap/msdos.c
+++ b/partmap/msdos.c
@@ -138,7 +138,7 @@ pc_partition_map_iterate (grub_disk_t disk,
 /* Partition map type.  */
 static struct grub_partition_map grub_msdos_partition_map =
   {
-    .name = "part_msdos",
+    .name = "msdos",
     .iterate = pc_partition_map_iterate,
   };
 
diff --git a/partmap/sun.c b/partmap/sun.c
index ff01d1018..6f8945026 100644
--- a/partmap/sun.c
+++ b/partmap/sun.c
@@ -137,7 +137,7 @@ sun_partition_map_iterate (grub_disk_t disk,
 /* Partition map type.  */
 static struct grub_partition_map grub_sun_partition_map =
   {
-    .name = "part_sun",
+    .name = "sun",
     .iterate = sun_partition_map_iterate,
   };
 
diff --git a/parttool/msdospart.c b/parttool/msdospart.c
index b1fe689f4..57921f35f 100644
--- a/parttool/msdospart.c
+++ b/parttool/msdospart.c
@@ -140,10 +140,10 @@ static grub_err_t grub_pcpart_type (const grub_device_t dev,
 
 GRUB_MOD_INIT (pcpart)
 {
-  activate_table_handle = grub_parttool_register ("part_msdos",
+  activate_table_handle = grub_parttool_register ("msdos",
 						  grub_pcpart_boot,
 						  grub_pcpart_bootargs);
-  type_table_handle = grub_parttool_register ("part_msdos",
+  type_table_handle = grub_parttool_register ("msdos",
 					      grub_pcpart_type,
 					      grub_pcpart_typeargs);
 
diff --git a/util/grub-install.in b/util/grub-install.in
index bb323d706..6672067b7 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -287,7 +287,10 @@ fi
 # Then the partition map module.  In order to support partition-less media,
 # this command is allowed to fail (--target=fs already grants us that the
 # filesystem will be accessible).
-partmap_module=`$grub_probe --target=partmap --device ${grub_device} 2> /dev/null`
+partmap_module=
+for x in `$grub_probe --target=partmap --device ${grub_device} 2> /dev/null`; do
+   partmap_module="$partmap_module part_$x";
+done
 
 # Device abstraction module, if any (lvm, raid).
 devabstraction_module=`$grub_probe --target=abstraction --device ${grub_device}`
diff --git a/util/i386/efi/grub-install.in b/util/i386/efi/grub-install.in
index caa7be7e4..b04bc59bd 100644
--- a/util/i386/efi/grub-install.in
+++ b/util/i386/efi/grub-install.in
@@ -194,7 +194,10 @@ fi
 # Then the partition map module.  In order to support partition-less media,
 # this command is allowed to fail (--target=fs already grants us that the
 # filesystem will be accessible).
-partmap_module=`$grub_probe --target=partmap --device-map=${device_map} ${grubdir} 2> /dev/null`
+partmap_module=
+for x in `$grub_probe --target=partmap --device ${grub_device} 2> /dev/null`; do
+   partmap_module="$partmap_module part_$x";
+done
 
 # Device abstraction module, if any (lvm, raid).
 devabstraction_module=`$grub_probe --target=abstraction --device-map=${device_map} ${grubdir}`
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index 15351ca5a..27c9cd434 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -343,16 +343,16 @@ setup (const char *dir,
       goto unable_to_embed;
     }
 
-  if (strcmp (dest_partmap, "part_msdos") == 0)
+  if (strcmp (dest_partmap, "msdos") == 0)
     grub_partition_iterate (dest_dev->disk, find_usable_region_msdos);
-  else if (strcmp (dest_partmap, "part_gpt") == 0)
+  else if (strcmp (dest_partmap, "gpt") == 0)
     grub_partition_iterate (dest_dev->disk, find_usable_region_gpt);
   else
     grub_util_error (_("No DOS-style partitions found"));
 
   if (embed_region.end == embed_region.start)
     {
-      if (! strcmp (dest_partmap, "part_msdos"))
+      if (! strcmp (dest_partmap, "msdos"))
 	grub_util_warn (_("This msdos-style partition label has no post-MBR gap; embedding won't be possible!"));
       else
 	grub_util_warn (_("This GPT partition label has no BIOS Boot Partition; embedding won't be possible!"));
diff --git a/util/ieee1275/grub-install.in b/util/ieee1275/grub-install.in
index 97c485d55..be4053542 100644
--- a/util/ieee1275/grub-install.in
+++ b/util/ieee1275/grub-install.in
@@ -179,7 +179,10 @@ fi
 # Then the partition map module.  In order to support partition-less media,
 # this command is allowed to fail (--target=fs already grants us that the
 # filesystem will be accessible).
-partmap_module=`$grub_probe --target=partmap --device-map=${device_map} ${grubdir} 2> /dev/null`
+partmap_module=
+for x in `$grub_probe --target=partmap --device ${grub_device} 2> /dev/null`; do
+   partmap_module="$partmap_module part_$x";
+done
 
 # Device abstraction module, if any (lvm, raid).
 devabstraction_module=`$grub_probe --target=abstraction --device-map=${device_map} ${grubdir}`