diff --git a/busybox/fdisk_gpt.c b/busybox/fdisk_gpt.c
index f170a70..9eb3f8f 100644
--- a/busybox/fdisk_gpt.c
+++ b/busybox/fdisk_gpt.c
@@ -123,12 +123,12 @@ gpt_list_table(int xtra UNUSED_PARAM)
    {
        if (multiboot_partition == 1)
        {
-           strcpy(kernel_name, "linuxkernel");
-           strcpy(rootfs_name, "linuxrootfs");
+           strcpy(kernel_name, "kernel");
+           strcpy(rootfs_name, "rootfs");
        }
        else
        {
-           sprintf(kernel_name, "linuxkernel%d", multiboot_partition);
+           sprintf(kernel_name, "kernel%d", multiboot_partition);
            strcpy(rootfs_name, "userdata");
        }
        sprintf(rootfs_sub_dir, "linuxrootfs%d", multiboot_partition);
@@ -241,8 +241,8 @@ gpt_list_table(int xtra UNUSED_PARAM)
    {
        if (multiboot_partition == 1)
        {
-           strcpy(kernel_name, "linuxkernel");
-           strcpy(rootfs_name, "linuxrootfs");
+           strcpy(kernel_name, "kernel");
+           strcpy(rootfs_name, "rootfs");
        }
        else
        {
diff --git a/cmdline_parser.c b/cmdline_parser.c
index 97b6fad..8b4a3b4 100644
--- a/cmdline_parser.c
+++ b/cmdline_parser.c
@@ -19,14 +19,16 @@ int search_via_part_names(char* device_table)
        strcpy(cmp_kernel_name, "(kernel)");
        strcpy(cmp_rootfs_name, "(rootfs)");
    }
+#if 0
    else if (strstr(device_table, "(linuxkernel)") != NULL && strstr(device_table, "(linuxrootfs)") != NULL)
    {
        strcpy(cmp_kernel_name, "(linuxkernel)");
        strcpy(cmp_rootfs_name, "(linuxrootfs)");
    }
+#endif
    else if (current_rootfs_sub_dir[0] != '\0') // box with rootSubDir feature
    {
-       sprintf(cmp_kernel_name, "(linuxkernel%d)", multiboot_partition);
+       sprintf(cmp_kernel_name, "(kernel%d)", multiboot_partition);
        strcpy(cmp_rootfs_name, "(userdata)");
        sprintf(rootfs_sub_dir, "linuxrootfs%d", multiboot_partition);
    }
@@ -107,7 +109,7 @@ int search_current_used_partitions(char* device_table)
        if ((pos = strstr(device_table, ",")) != NULL)
            *pos = '\0';
        sprintf(part_name, "%s%d", device_name, partition_number);
-       if (strstr(part_name, current_kernel_device) != NULL && strstr(device_table, "(linuxkernel") != NULL && current_kernel_device[0] != '\0')
+       if (strstr(part_name, current_kernel_device) != NULL && strstr(device_table, "(kernel") != NULL && current_kernel_device[0] != '\0')
        {
            found_kernel_device = 1;
            kernel_flash_mode = TARBZ2;
diff --git a/ofgwrite.c b/ofgwrite.c
index 4d1cc1f..a938843 100644
--- a/ofgwrite.c
+++ b/ofgwrite.c
@@ -955,6 +955,7 @@ int umount_rootfs(int steps)

    // move mount which includes the image files
    if ((strncmp(rootfs_mount_point, "/media/", 7) == 0 && ret != 0)
+    || (strncmp(rootfs_mount_point, "/mnt/", 5) == 0 && ret != 0)
     ||  strncmp(rootfs_mount_point, "/var/volatile/", 14) != 0)
    {
        my_printf("Move mountpoint of image files\n");