8 files changed, 29 insertions, 28 deletions
diff --git a/Completion/Base/_command_names b/Completion/Base/_command_names
index 5ec984bdc..889b330bd 100644
--- a/Completion/Base/_command_names
+++ b/Completion/Base/_command_names
@@ -28,7 +28,7 @@ if [[ -z "$ext" ]]; then
   _description expl 'shell function'
   compadd "$expl[@]" "$@" - "${(k@)functions}" && ret=0
   _description expl 'alias'
-  compadd "$expl[@]" "$@" - "${(k@)raliases}" && ret=0
+  compadd "$expl[@]" "$@" - "${(k@)aliases}" && ret=0
   _description expl 'reserved word'
   compadd "$expl[@]" "$@" - "${(k@)reswords}" && ret=0
 fi
diff --git a/Completion/Builtins/_aliases b/Completion/Builtins/_aliases
index 5f2a8ec84..8764f7f66 100644
--- a/Completion/Builtins/_aliases
+++ b/Completion/Builtins/_aliases
@@ -3,6 +3,6 @@
 local expl
 
 _description expl 'regular alias'
-compadd "$expl[@]" - "${(@k)raliases}"
+compadd "$expl[@]" - "${(@k)aliases}"
 _description expl 'global alias'
 compadd "$expl[@]" - "${(@k)galiases}"
diff --git a/Completion/Builtins/_enable b/Completion/Builtins/_enable
index 07077abd6..7d15e9121 100644
--- a/Completion/Builtins/_enable
+++ b/Completion/Builtins/_enable
@@ -4,19 +4,19 @@ local prev="$words[CURRENT-1]" ret=1 expl
 
 if [[ "$prev" = -*a* ]]; then
   _description expl alias
-  compadd "$expl[@]" "$@" - "${(k@)disaliases}" && ret=0
+  compadd "$expl[@]" "$@" - "${(k@)dis_aliases}" "${(k@)dis_galiases}" && ret=0
 fi
 if [[ "$prev" = -*f* ]]; then
   _description expl 'shell function'
-  compadd "$expl[@]" "$@" - "${(k@)disfunctions}" && ret=0
+  compadd "$expl[@]" "$@" - "${(k@)dis_functions}" && ret=0
 fi
 if [[ "$prev" = -*r* ]]; then
   _description expl 'reserved word'
-  compadd "$expl[@]" "$@" - "${(k@)disreswords}" && ret=0
+  compadd "$expl[@]" "$@" - "${(k@)dis_reswords}" && ret=0
 fi
 if [[ "$prev" != -* ]]; then
   _description expl 'builtin command'
-  compadd "$expl[@]" "$@" - "${(k@)disbuiltins}" && ret=0
+  compadd "$expl[@]" "$@" - "${(k@)dis_builtins}" && ret=0
 fi
 
 return ret
diff --git a/Completion/Builtins/_unhash b/Completion/Builtins/_unhash
index 1209f68af..a23fd9025 100644
--- a/Completion/Builtins/_unhash
+++ b/Completion/Builtins/_unhash
@@ -8,11 +8,12 @@ if [[ "$fl" = -*d* ]]; then
 fi
 if [[ "$fl" = -*a* ]]; then
   _description expl alias
-  compadd "$expl[@]" - "${(@k)aliases}" "${(@k)disaliases}" && ret=0
+  compadd "$expl[@]" - "${(@k)aliases}" "${(@k)dis_aliases}" \
+                       "${(@k)galiases}" "${(@k)dis_galiases}" && ret=0
 fi
 if [[ "$fl" = -*f* ]]; then
   _description expl 'shell function'
-  compadd "$expl[@]" - "${(@k)functions}" "${(@k)disfunctions}" && ret=0
+  compadd "$expl[@]" - "${(@k)functions}" "${(@k)dis_functions}" && ret=0
 fi
 if [[ "$fl" != -* ]]; then
   _command_names -e && ret=0
diff --git a/Completion/Builtins/_which b/Completion/Builtins/_which
index 328f7730c..41e7d20fd 100644
--- a/Completion/Builtins/_which
+++ b/Completion/Builtins/_which
@@ -9,6 +9,6 @@ compadd "$expl[@]" "$@" - "${(k@)builtins}" && ret=0
 _description expl 'shell function'
 compadd "$expl[@]" "$@" - "${(k@)functions}" && ret=0
 _description expl 'alias'
-compadd "$expl[@]" "$@" - "${(k@)raliases}" && ret=0
+compadd "$expl[@]" "$@" - "${(k@)aliases}" && ret=0
 _description expl 'reserved word'
 compadd "$expl[@]" "$@" - "${(k@)reswords}" && ret=0
diff --git a/Doc/Zsh/mod_parameter.yo b/Doc/Zsh/mod_parameter.yo
index 3d30d6926..a66f2002d 100644
--- a/Doc/Zsh/mod_parameter.yo
+++ b/Doc/Zsh/mod_parameter.yo
@@ -32,8 +32,8 @@ definitions. Setting a key in it is like defining a function with the
 name given by the key and the body given by the value. Unsetting a key
 removes the definition for the function named by the key.
 )
-vindex(disfunctions)
-item(tt(disfunctions))(
+vindex(dis_functions)
+item(tt(dis_functions))(
 Like tt(functions) but for disabled functions.
 )
 vindex(builtins)
@@ -44,33 +44,33 @@ the values are either `tt(undefined)' for builtin commands that will
 automatically be loaded from a module if invoked or `tt(defined)' for
 builtin commands that are already loaded.
 )
-vindex(disbuiltins)
-item(tt(disbuiltins))(
+vindex(dis_builtins)
+item(tt(dis_builtins))(
 Like tt(builtins) but for disabled builtin commands.
 )
 vindex(reswords)
 item(tt(reswords))(
 This array contains the enabled reserved words.
 )
-vindex(disreswords)
-item(tt(disreswords))(
+vindex(dis_reswords)
+item(tt(dis_reswords))(
 Like tt(reswords) but for disabled reserved words.
 )
-vindex(raliases)
-item(tt(raliases))(
+vindex(aliases)
+item(tt(aliases))(
 This maps the names of the regular aliases currently enabled to their
 expansions.
 )
-vindex(disraliases)
-item(tt(disraliases))(
+vindex(dis_aliases)
+item(tt(dis_aliases))(
 Like tt(raliases) but for disabled regular aliases.
 )
 vindex(galiases)
 item(tt(galiases))(
 Like tt(raliases), but for global aliases.
 )
-vindex(disgaliases)
-item(tt(disgaliases))(
+vindex(dis_galiases)
+item(tt(dis_galiases))(
 Like tt(galiases) but for disabled global aliases.
 )
 vindex(parameters)
diff --git a/Src/Modules/parameter.c b/Src/Modules/parameter.c
index 6d57b672f..1482bedf2 100644
--- a/Src/Modules/parameter.c
+++ b/Src/Modules/parameter.c
@@ -1808,7 +1808,7 @@ static struct pardef partab[] = {
     { "functions", 0,
       getpmfunction, scanpmfunctions, setpmfunctions,
       NULL, NULL, stdunsetfn, NULL },
-    { "disfunctions", 0,
+    { "dis_functions", 0,
       getpmdisfunction, scanpmdisfunctions, setpmdisfunctions,
       NULL, NULL, stdunsetfn, NULL },
     { "funcstack", PM_ARRAY|PM_SPECIAL|PM_READONLY,
@@ -1817,13 +1817,13 @@ static struct pardef partab[] = {
     { "builtins", PM_READONLY,
       getpmbuiltin, scanpmbuiltins, hashsetfn,
       NULL, NULL, stdunsetfn, NULL },
-    { "disbuiltins", PM_READONLY,
+    { "dis_builtins", PM_READONLY,
       getpmdisbuiltin, scanpmdisbuiltins, hashsetfn,
       NULL, NULL, stdunsetfn, NULL },
     { "reswords", PM_ARRAY|PM_SPECIAL|PM_READONLY,
       NULL, NULL, NULL,
       arrsetfn, reswordsgetfn, stdunsetfn, NULL },
-    { "disreswords", PM_ARRAY|PM_SPECIAL|PM_READONLY,
+    { "dis_reswords", PM_ARRAY|PM_SPECIAL|PM_READONLY,
       NULL, NULL, NULL,
       arrsetfn, disreswordsgetfn, stdunsetfn, NULL },
     { "options", 0,
@@ -1853,16 +1853,16 @@ static struct pardef partab[] = {
     { "userdirs", PM_READONLY,
       getpmuserdir, scanpmuserdirs, hashsetfn,
       NULL, NULL, stdunsetfn, NULL },
-    { "raliases", 0,
+    { "aliases", 0,
       getpmralias, scanpmraliases, setpmraliases,
       NULL, NULL, stdunsetfn, NULL },
     { "galiases", 0,
       getpmgalias, scanpmgaliases, setpmgaliases,
       NULL, NULL, stdunsetfn, NULL },
-    { "disraliases", 0,
+    { "dis_aliases", 0,
       getpmdisralias, scanpmdisraliases, setpmdisraliases,
       NULL, NULL, stdunsetfn, NULL },
-    { "disgaliases", 0,
+    { "dis_galiases", 0,
       getpmdisgalias, scanpmdisgaliases, setpmdisgaliases,
       NULL, NULL, stdunsetfn, NULL },
     { NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
diff --git a/Src/Modules/parameter.mdd b/Src/Modules/parameter.mdd
index a020ba209..938eb0493 100644
--- a/Src/Modules/parameter.mdd
+++ b/Src/Modules/parameter.mdd
@@ -1,3 +1,3 @@
-autoparams="parameters commands functions disfunctions funcstack builtins disbuiltins reswords disreswords options modules dirstack history historywords jobtexts jobstates nameddirs userdirs raliases disraliases galiases disgaliases"
+autoparams="parameters commands functions dis_functions funcstack builtins dis_builtins reswords dis_reswords options modules dirstack history historywords jobtexts jobstates nameddirs userdirs aliases dis_aliases galiases dis_galiases"
 
 objects="parameter.o"