diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c
index 4610dfd93a..4dc5a57661 100644
--- a/bin/dnssec/dnssec-keygen.c
+++ b/bin/dnssec/dnssec-keygen.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THE SOFTWARE.
  */
 
-/* $Id: dnssec-keygen.c,v 1.20 2000/05/17 22:47:56 bwelling Exp $ */
+/* $Id: dnssec-keygen.c,v 1.21 2000/05/18 22:03:58 bwelling Exp $ */
 
 #include <config.h>
 
@@ -33,7 +33,7 @@
 #include <dst/dst.h>
 #include <dst/result.h>
 
-#define PROGRAM "keygen"
+#define PROGRAM "dnssec-keygen"
 
 #define MAX_RSA 2048 /* XXX ogud update this when rsa library is updated */
 
@@ -82,9 +82,9 @@ dsa_size_ok(int size) {
 }
 
 static void
-usage(char *prog) {
+usage() {
 	printf("Usage:\n");
-	printf("    %s [options] name\n\n", prog);
+	printf("    %s [options] name\n\n", PROGRAM);
 	printf("Required options:\n");
 	printf("    -a algorithm: RSA | RSAMD5 | DH | DSA | HMAC-MD5\n");
 	printf("    -b key size, in bits:\n");
@@ -136,7 +136,7 @@ main(int argc, char **argv) {
 		fatal("out of memory");
 
 	if (argc == 1)
-		usage(prog);
+		usage();
 
 	while ((ch = isc_commandline_parse(argc, argv,
 					   "a:b:eg:n:t:p:s:hv:")) != -1)
@@ -193,10 +193,11 @@ main(int argc, char **argv) {
 			break;
 
 		case 'h':
-			usage(prog);
+			usage();
 		default:
-			fprintf(stderr, "keygen: invalid argument -%c\n", ch);
-			usage(prog);
+			fprintf(stderr, "%s: invalid argument -%c\n",
+				PROGRAM, ch);
+			usage();
 		} 
 	}
 
@@ -300,8 +301,8 @@ main(int argc, char **argv) {
 	if (name[strlen(name) - 1] != '.') {
 		strcat(name, ".");
 		fprintf(stderr,
-			"keygen: added a trailing dot to fully qualify "
-			"the name\n");
+			"%s: added a trailing dot to fully qualify the name\n",
+			PROGRAM);
 	}
 
 	switch(alg) {
diff --git a/bin/dnssec/dnssec-makekeyset.c b/bin/dnssec/dnssec-makekeyset.c
index 0fc1133a09..fd55ec1577 100644
--- a/bin/dnssec/dnssec-makekeyset.c
+++ b/bin/dnssec/dnssec-makekeyset.c
@@ -35,7 +35,7 @@
 #include <dns/secalg.h>
 #include <dns/time.h>
 
-#define PROGRAM "keysettool"
+#define PROGRAM "dnssec-makekeyset"
 
 #define BUFSIZE 2048
 
@@ -135,7 +135,7 @@ strtotime(char *str, isc_int64_t now, isc_int64_t base) {
 static void
 usage() {
 	fprintf(stderr, "Usage:\n");
-	fprintf(stderr, "\tkeysettool [options] keys\n");
+	fprintf(stderr, "\t%s [options] keys\n", PROGRAM);
 
 	fprintf(stderr, "\n");
 
diff --git a/bin/dnssec/dnssec-signkey.c b/bin/dnssec/dnssec-signkey.c
index 1db76670ea..7d11fe5ccc 100644
--- a/bin/dnssec/dnssec-signkey.c
+++ b/bin/dnssec/dnssec-signkey.c
@@ -34,7 +34,7 @@
 #include <dns/result.h>
 #include <dns/secalg.h>
 
-#define PROGRAM "keysigner"
+#define PROGRAM "dnssec-signkey"
 
 #define BUFSIZE 2048
 
@@ -109,7 +109,7 @@ algtostr(const dns_secalg_t alg) {
 static void
 usage() {
 	fprintf(stderr, "Usage:\n");
-	fprintf(stderr, "\tkeysigner [options] keyset keys\n");
+	fprintf(stderr, "\t%s [options] keyset keys\n", PROGRAM);
 
 	fprintf(stderr, "\n");
 
diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index 5f5a2dae62..27e423d16d 100644
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -42,7 +42,7 @@
 
 #include <dst/result.h>
 
-#define PROGRAM "signer"
+#define PROGRAM "dnssec-signzone"
 
 /*#define USE_ZONESTATUS*/
 
@@ -1253,7 +1253,7 @@ strtotime(char *str, isc_int64_t now, isc_int64_t base) {
 static void
 usage() {
 	fprintf(stderr, "Usage:\n");
-	fprintf(stderr, "\tsigner [options] zonefile [keys]\n");
+	fprintf(stderr, "\t%s [options] zonefile [keys]\n", PROGRAM);
 
 	fprintf(stderr, "\n");