--- a/ntpd.c.orig	2015-01-08 10:43:16.834158734 +0100
+++ b/ntpd.c	2015-01-08 10:46:24.943458619 +0100
@@ -100,8 +100,9 @@ usage(void)
 {
 	extern char *__progname;
 
-	if (strcmp(__progname, "ntpctl") == 0)
-		fprintf(stderr, "usage: ntpctl [-s all | peers | Sensors | status]\n");
+	if (strcmp(__progname, "openntpctl") == 0)
+		fprintf(stderr, "usage: %s [-s all | peers | Sensors | status]\n",
+		    __progname);
 	else
 		fprintf(stderr, "usage: %s [-dnSsv] [-f file] [-p file]\n",
 		    __progname);
@@ -124,7 +125,7 @@ main(int argc, char *argv[])
 	extern char 		*__progname;
 	time_t			 start_time;
 
-	if (strcmp(__progname, "ntpctl") == 0) {
+	if (strcmp(__progname, "openntpctl") == 0) {
 		ctl_main (argc, argv);
 		/* NOTREACHED */
 	}
@@ -605,7 +606,7 @@ ctl_main(int argc, char *argv[])
 		usage();
 
 	if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
-		err(1, "ntpctl: socket");
+		err(1, "openntpctl: socket");
 
 	bzero(&sa, sizeof(sa));
 	sa.sun_family = AF_UNIX;
@@ -650,7 +651,7 @@ ctl_main(int argc, char *argv[])
 		if ((n = imsg_read(ibuf_ctl)) == -1)
 			err(1, "ibuf_ctl: imsg_read error");
 		if (n == 0)
-			errx(1, "ntpctl: pipe closed");
+			errx(1, "openntpctl: pipe closed");
 
 		while (!done) {
 			if ((n = imsg_get(ibuf_ctl, &imsg)) == -1)