Index: isomaker.c
===================================================================
--- isomaker.c  (revision 2519)
+++ isomaker.c  (working copy)
@@ -86,12 +86,12 @@
        while (ptr != NULL) {
                gchar *xmltemplate = (gchar *)ptr->data;
                count++;
-               cmdline = g_strdup_printf("%s -c %s %s %s/mainmod/mainmod%d.
mod",
+               cmdline = g_strdup_printf("%s -c %s %s %s/mainmod/%s.mod",
                                          MMAKER_PATH,
                                          debtarball,
                                          xmltemplate,
                                          workdir,
-                                         count);
+                                         xmltemplate);
                if (!executeCommandMain(cmdline)) {
                        printf("Warning: mmaker returned an error when build
ing mainmodule, continuing...\n");
                }
                gchar *xmltemplate = (gchar *)ptr->data;
                count++;
-               cmdline = g_strdup_printf("%s %s %s/minimod/minimod%d.mod",
+               cmdline = g_strdup_printf("%s %s %s/minimod/%s.mod",
                                          MORPHMINI_PATH,
                                          xmltemplate,
                                          workdir,
-                                         count);
+                                         xmltemplate);
                if (!executeCommandMain(cmdline)) {
                        printf("Warning: morphmini returned an error when bu
ilding minimodule, continuing...\n");
                }

@@ -114,11 +114,11 @@
        while (ptr != NULL) {