15 files changed, 50 insertions, 36 deletions
diff --git a/Src/Zle/compctl.c b/Src/Zle/compctl.c
index d13bc2252..69db9e04a 100644
--- a/Src/Zle/compctl.c
+++ b/Src/Zle/compctl.c
@@ -3732,7 +3732,7 @@ static struct builtin bintab[] = {
 
 /**/
 int
-setup_compctl(Module m)
+setup_(Module m)
 {
     compctlreadptr = compctlread;
     createcompctltable();
@@ -3752,7 +3752,7 @@ setup_compctl(Module m)
 
 /**/
 int
-boot_compctl(Module m)
+boot_(Module m)
 {
     addhookfunc("compctl_make", (Hookfn) ccmakehookfn);
     addhookfunc("compctl_before", (Hookfn) ccbeforehookfn);
@@ -3762,7 +3762,7 @@ boot_compctl(Module m)
 
 /**/
 int
-cleanup_compctl(Module m)
+cleanup_(Module m)
 {
     deletehookfunc("compctl_make", (Hookfn) ccmakehookfn);
     deletehookfunc("compctl_before", (Hookfn) ccbeforehookfn);
@@ -3773,7 +3773,7 @@ cleanup_compctl(Module m)
 
 /**/
 int
-finish_compctl(Module m)
+finish_(Module m)
 {
     deletehashtable(compctltab);
 
diff --git a/Src/Zle/compctl.mdd b/Src/Zle/compctl.mdd
index a76fef3a0..6da7e002b 100644
--- a/Src/Zle/compctl.mdd
+++ b/Src/Zle/compctl.mdd
@@ -1,4 +1,6 @@
-moddeps="complete zle"
+name=zsh/compctl
+
+moddeps="zsh/complete zsh/zle"
 
 autobins="compctl"
 
diff --git a/Src/Zle/complete.c b/Src/Zle/complete.c
index a78a12058..bf3102972 100644
--- a/Src/Zle/complete.c
+++ b/Src/Zle/complete.c
@@ -1350,7 +1350,7 @@ struct hookdef comphooks[] = {
 
 /**/
 int
-setup_complete(Module m)
+setup_(Module m)
 {
     hasperm = 0;
 
@@ -1371,7 +1371,7 @@ setup_complete(Module m)
 
 /**/
 int
-boot_complete(Module m)
+boot_(Module m)
 {
     addhookfunc("complete", (Hookfn) do_completion);
     addhookfunc("before_complete", (Hookfn) before_complete);
@@ -1391,7 +1391,7 @@ boot_complete(Module m)
 
 /**/
 int
-cleanup_complete(Module m)
+cleanup_(Module m)
 {
     deletehookfunc("complete", (Hookfn) do_completion);
     deletehookfunc("before_complete", (Hookfn) before_complete);
@@ -1410,7 +1410,7 @@ cleanup_complete(Module m)
 
 /**/
 int
-finish_complete(Module m)
+finish_(Module m)
 {
     if (compwords)
 	freearray(compwords);
diff --git a/Src/Zle/complete.mdd b/Src/Zle/complete.mdd
index 70e275b4e..8e9796d86 100644
--- a/Src/Zle/complete.mdd
+++ b/Src/Zle/complete.mdd
@@ -1,6 +1,8 @@
-moddeps="zle"
+name=zsh/complete
 
-autobins="compgen compadd compset"
+moddeps="zsh/zle"
+
+autobins="compadd compset"
 
 autoprefixconds="prefix suffix between after"
 
diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c
index 32a2d99f3..ce00ed240 100644
--- a/Src/Zle/complist.c
+++ b/Src/Zle/complist.c
@@ -1196,14 +1196,14 @@ menuselect(char **args)
 
 /**/
 int
-setup_complist(Module m)
+setup_(Module m)
 {
     return 0;
 }
 
 /**/
 int
-boot_complist(Module m)
+boot_(Module m)
 {
     mtab = NULL;
     mgtab = NULL;
@@ -1237,7 +1237,7 @@ boot_complist(Module m)
 
 /**/
 int
-cleanup_complist(Module m)
+cleanup_(Module m)
 {
     free(mtab);
     free(mgtab);
@@ -1251,7 +1251,7 @@ cleanup_complist(Module m)
 
 /**/
 int
-finish_complist(Module m)
+finish_(Module m)
 {
     return 0;
 }
diff --git a/Src/Zle/complist.mdd b/Src/Zle/complist.mdd
index 4b6a5afe8..a7d85fad7 100644
--- a/Src/Zle/complist.mdd
+++ b/Src/Zle/complist.mdd
@@ -1,3 +1,5 @@
-moddeps="complete zle"
+name=zsh/complist
+
+moddeps="zsh/complete zsh/zle"
 
 objects="complist.o"
diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c
index 6254d9842..15212acd6 100644
--- a/Src/Zle/computil.c
+++ b/Src/Zle/computil.c
@@ -2408,7 +2408,7 @@ static struct builtin bintab[] = {
 
 /**/
 int
-setup_computil(Module m)
+setup_(Module m)
 {
     memset(cadef_cache, 0, sizeof(cadef_cache));
     memset(cvdef_cache, 0, sizeof(cvdef_cache));
@@ -2422,14 +2422,14 @@ setup_computil(Module m)
 
 /**/
 int
-boot_computil(Module m)
+boot_(Module m)
 {
     return !addbuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
 }
 
 /**/
 int
-cleanup_computil(Module m)
+cleanup_(Module m)
 {
     deletebuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
     return 0;
@@ -2437,7 +2437,7 @@ cleanup_computil(Module m)
 
 /**/
 int
-finish_computil(Module m)
+finish_(Module m)
 {
     int i;
 
diff --git a/Src/Zle/computil.mdd b/Src/Zle/computil.mdd
index cf2a13b60..d8190580b 100644
--- a/Src/Zle/computil.mdd
+++ b/Src/Zle/computil.mdd
@@ -1,4 +1,6 @@
-moddeps="complete zle"
+name=zsh/computil
+
+moddeps="zsh/complete zsh/zle"
 
 objects="computil.o"
 
diff --git a/Src/Zle/deltochar.c b/Src/Zle/deltochar.c
index e3f9def0c..5badca411 100644
--- a/Src/Zle/deltochar.c
+++ b/Src/Zle/deltochar.c
@@ -75,14 +75,14 @@ deltochar(char **args)
 
 /**/
 int
-setup_deltochar(Module m)
+setup_(Module m)
 {
     return 0;
 }
 
 /**/
 int
-boot_deltochar(Module m)
+boot_(Module m)
 {
     w_deletetochar = addzlefunction("delete-to-char", deltochar,
                                     ZLE_KILL | ZLE_KEEPSUFFIX);
@@ -100,7 +100,7 @@ boot_deltochar(Module m)
 
 /**/
 int
-cleanup_deltochar(Module m)
+cleanup_(Module m)
 {
     deletezlefunction(w_deletetochar);
     deletezlefunction(w_zaptochar);
@@ -109,7 +109,7 @@ cleanup_deltochar(Module m)
 
 /**/
 int
-finish_deltochar(Module m)
+finish_(Module m)
 {
     return 0;
 }
diff --git a/Src/Zle/deltochar.mdd b/Src/Zle/deltochar.mdd
index 4d1f89d1c..38cedb2a7 100644
--- a/Src/Zle/deltochar.mdd
+++ b/Src/Zle/deltochar.mdd
@@ -1,3 +1,5 @@
-moddeps="zle"
+name=zsh/deltochar
+
+moddeps="zsh/zle"
 
 objects="deltochar.o"
diff --git a/Src/Zle/zle.mdd b/Src/Zle/zle.mdd
index a5307084a..23292dfb3 100644
--- a/Src/Zle/zle.mdd
+++ b/Src/Zle/zle.mdd
@@ -1,3 +1,5 @@
+name=zsh/zle
+
 autobins="bindkey vared zle"
 
 objects="zle_bindings.o zle_hist.o zle_keymap.o zle_main.o \
diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c
index 095a9d171..11c106be5 100644
--- a/Src/Zle/zle_main.c
+++ b/Src/Zle/zle_main.c
@@ -1003,7 +1003,7 @@ mod_export struct hookdef zlehooks[] = {
 
 /**/
 int
-setup_zle(Module m)
+setup_(Module m)
 {
     /* Set up editor entry points */
     trashzleptr = trashzle;
@@ -1036,7 +1036,7 @@ setup_zle(Module m)
 
 /**/
 int
-boot_zle(Module m)
+boot_(Module m)
 {
     addbuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
     addhookdefs(m->nam, zlehooks, sizeof(zlehooks)/sizeof(*zlehooks));
@@ -1045,7 +1045,7 @@ boot_zle(Module m)
 
 /**/
 int
-cleanup_zle(Module m)
+cleanup_(Module m)
 {
     if(zleactive) {
 	zerrnam(m->nam, "can't unload the zle module while zle is active",
@@ -1059,7 +1059,7 @@ cleanup_zle(Module m)
 
 /**/
 int
-finish_zle(Module m)
+finish_(Module m)
 {
     int i;
 
diff --git a/Src/Zle/zle_thingy.c b/Src/Zle/zle_thingy.c
index 84555d20b..dd990cbdc 100644
--- a/Src/Zle/zle_thingy.c
+++ b/Src/Zle/zle_thingy.c
@@ -546,7 +546,7 @@ bin_zle_complete(char *name, char **args, char *ops, char func)
     Thingy t;
     Widget w, cw;
 
-    if (!require_module(name, "complete", 0, 0)) {
+    if (!require_module(name, "zsh/complete", 0, 0)) {
 	zerrnam(name, "can't load complete module", NULL, 0);
 	return 1;
     }
diff --git a/Src/Zle/zleparameter.c b/Src/Zle/zleparameter.c
index c4347de6b..d10fe99b1 100644
--- a/Src/Zle/zleparameter.c
+++ b/Src/Zle/zleparameter.c
@@ -198,14 +198,14 @@ static struct pardef partab[] = {
 
 /**/
 int
-setup_zleparameter(Module m)
+setup_(Module m)
 {
     return 0;
 }
 
 /**/
 int
-boot_zleparameter(Module m)
+boot_(Module m)
 {
     struct pardef *def;
 
@@ -232,7 +232,7 @@ boot_zleparameter(Module m)
 
 /**/
 int
-cleanup_zleparameter(Module m)
+cleanup_(Module m)
 {
     Param pm;
     struct pardef *def;
@@ -249,7 +249,7 @@ cleanup_zleparameter(Module m)
 
 /**/
 int
-finish_zleparameter(Module m)
+finish_(Module m)
 {
     return 0;
 }
diff --git a/Src/Zle/zleparameter.mdd b/Src/Zle/zleparameter.mdd
index d18b89662..6c88db966 100644
--- a/Src/Zle/zleparameter.mdd
+++ b/Src/Zle/zleparameter.mdd
@@ -1,4 +1,6 @@
-moddeps="zle"
+name=zsh/zleparameter
+
+moddeps="zsh/zle"
 
 autoparams="widgets keymaps"