3 files changed, 3 insertions, 3 deletions

diff --git a/coreutils/rmdir.c b/coreutils/rmdir.c
index 0751808c0..c88f42cf5 100644
--- a/coreutils/rmdir.c
+++ b/coreutils/rmdir.c
@@ -40,7 +40,7 @@ extern int rmdir_main(int argc, char **argv)
 
         while (--argc > 0) {
                 if (rmdir(*(++argv)) == -1) {
-                        fprintf(stderr, "%s: %s\n", *argv, strerror(errno));
+                        fprintf(stderr, "%s: %s\n", applet_name, strerror(errno));
                         exit(FALSE);
                 }
         }
diff --git a/coreutils/test.c b/coreutils/test.c
index 36da4db0b..d7b34a6a4 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -183,7 +183,7 @@ test_main(int argc, char** argv)
 {
         int     res;
 
-        if (strcmp(argv[0], "[") == 0) {
+        if (strcmp(applet_name, "[") == 0) {
                 if (strcmp(argv[--argc], "]"))
                         fatalError("missing ]\n");
                 argv[argc] = NULL;
diff --git a/coreutils/whoami.c b/coreutils/whoami.c
index 950f52fb2..983c6725d 100644
--- a/coreutils/whoami.c
+++ b/coreutils/whoami.c
@@ -43,7 +43,7 @@ extern int whoami_main(int argc, char **argv)
                 puts(user);
                 exit(TRUE);
         }
-        fprintf(stderr, "%s: cannot find username for UID %u\n", argv[0],
+        fprintf(stderr, "%s: cannot find username for UID %u\n", applet_name,
                         (unsigned) uid);
         return(FALSE);
 }