diff --git a/lib/argmatch.c b/lib/argmatch.c
index 6ae76ac1b..9ac9bdbfc 100644
--- a/lib/argmatch.c
+++ b/lib/argmatch.c
@@ -67,7 +67,7 @@ __argmatch_die (void)
   ARGMATCH_DIE;
 }
 
-argmatch_exit_fn argmatch_exit_failure = __argmatch_exit_failure;
+argmatch_exit_fn argmatch_die = __argmatch_die;
 
 /* If ARG is an unambiguous match for an element of the
    null-terminated array ARGLIST, return the index in ARGLIST
diff --git a/lib/argmatch.h b/lib/argmatch.h
index cb54fd6f3..669a0e30e 100644
--- a/lib/argmatch.h
+++ b/lib/argmatch.h
@@ -57,7 +57,7 @@ int argcasematch
    default, set to a function calling the macro ARGMATCH_EXIT_FAILURE
    which, by default is `exit (2)'.*/
 typedef void (*argmatch_exit_fn) PARAMS ((void));
-extern argmatch_exit_fn argmatch_exit_failure;
+extern argmatch_exit_fn argmatch_die;
 
 /* Report on stderr why argmatch failed.  Report correct values. */
 
@@ -97,13 +97,13 @@ int __xargmatch_internal
   (Vallist [__xargmatch_internal ((Context), (Arg), (Arglist),	\
                                   (const char *) (Vallist),	\
 				  sizeof (*(Vallist)),		\
-				  1, argmatch_exit_failure)])
+				  1, argmatch_die)])
 
 # define XARGCASEMATCH(Context, Arg, Arglist, Vallist)		\
   (Vallist [__xargmatch_internal ((Context), (Arg), (Arglist),	\
                                   (const char *) (Vallist),	\
 				  sizeof (*(Vallist)),		\
-				  0, argmatch_exit_failure)])
+				  0, argmatch_die)])
 
 /* Convert a value into a corresponding argument. */