diff --git a/share/functions/isatty.fish b/share/functions/isatty.fish
index f1f87a21c..4d91f9b5c 100644
--- a/share/functions/isatty.fish
+++ b/share/functions/isatty.fish
@@ -1,6 +1,6 @@
 function isatty -d "Tests if a file descriptor is a tty"
     set -l options 'h/help'
-    argparse $options -- $argv
+    argparse -n isatty $options -- $argv
     or return
 
     if set -q _flag_help
diff --git a/share/functions/nextd.fish b/share/functions/nextd.fish
index 7f61223bd..f0696a52d 100644
--- a/share/functions/nextd.fish
+++ b/share/functions/nextd.fish
@@ -1,6 +1,6 @@
 function nextd --description "Move forward in the directory history"
     set -l options 'h/help' 'l/list'
-    argparse $options -- $argv
+    argparse -n nextd $options -- $argv
     or return
 
     if set -q _flag_help
diff --git a/share/functions/trap.fish b/share/functions/trap.fish
index 7dbd476a3..d6f32c7b2 100644
--- a/share/functions/trap.fish
+++ b/share/functions/trap.fish
@@ -17,7 +17,7 @@ end
 
 function trap -d 'Perform an action when the shell receives a signal'
     set -l options 'h/help' 'l/list-signals' 'p/print'
-    argparse $options -- $argv
+    argparse -n trap $options -- $argv
     or return
 
     if set -q _flag_help
diff --git a/share/functions/umask.fish b/share/functions/umask.fish
index db10b0458..1ae450372 100644
--- a/share/functions/umask.fish
+++ b/share/functions/umask.fish
@@ -150,7 +150,7 @@ end
 
 function umask --description "Set default file permission mask"
     set -l options 'h/help' 'p/as-command' 'S/symbolic'
-    argparse $options -- $argv
+    argparse -n umask $options -- $argv
     or return
 
     if set -q _flag_help