diff --git a/src/arduino.c b/src/arduino.c
index 033cb562..59f97566 100644
--- a/src/arduino.c
+++ b/src/arduino.c
@@ -113,7 +113,7 @@ static int arduino_read_sig_bytes(const PROGRAMMER *pgm, const AVRPART *p, const
 
 static int arduino_open(PROGRAMMER *pgm, const char *port) {
   if(pgm->bitclock)
-    pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
+    pmsg_warning("-c %s does not support adjustable bitclock speed; ignoring -B\n", pgmid);
 
   pgm->port = port;
   union pinfo pinfo;
diff --git a/src/avr910.c b/src/avr910.c
index 84219f4e..1507e959 100644
--- a/src/avr910.c
+++ b/src/avr910.c
@@ -322,7 +322,7 @@ static int avr910_parseextparms(const PROGRAMMER *pgm, const LISTID extparms) {
 
 static int avr910_open(PROGRAMMER *pgm, const char *port) {
   if(pgm->bitclock)
-    pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
+    pmsg_warning("-c %s does not support adjustable bitclock speed; ignoring -B\n", pgmid);
 
   union pinfo pinfo;
   if(pgm->baudrate == 0)
diff --git a/src/buspirate.c b/src/buspirate.c
index c43d6efe..275079ed 100644
--- a/src/buspirate.c
+++ b/src/buspirate.c
@@ -443,9 +443,9 @@ static int buspirate_verifyconfig(const PROGRAMMER *pgm) {
 static int buspirate_open(PROGRAMMER *pgm, const char *port) {
   if(pgm->bitclock) {
     if(str_caseeq(pgm->type, "BusPirate_BB"))
-      pmsg_warning("programmer type %s does not support adjustable bitclock speed using -B; use -i instead\n", pgm->type);
+      pmsg_warning("-c %s does not support adjustable bitclock speed using -B; use -i instead\n", pgmid);
     else {
-      pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
+      pmsg_warning("-c %s does not support adjustable bitclock speed; ignoring -B\n", pgmid);
       imsg_warning("use -x help to view alternative SPI clock options\n");
     }
   }
diff --git a/src/butterfly.c b/src/butterfly.c
index cedefb37..f61a02b9 100644
--- a/src/butterfly.c
+++ b/src/butterfly.c
@@ -322,7 +322,7 @@ static void butterfly_enable(PROGRAMMER *pgm, const AVRPART *p) {
 
 static int butterfly_open(PROGRAMMER *pgm, const char *port) {
   if(pgm->bitclock)
-    pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
+    pmsg_warning("-c %s does not support adjustable bitclock speed; ignoring -B\n", pgmid);
 
   pgm->port = port;
 
diff --git a/src/ch341a.c b/src/ch341a.c
index a7134dab..653ffb1a 100644
--- a/src/ch341a.c
+++ b/src/ch341a.c
@@ -252,7 +252,7 @@ static int ch341a_open(PROGRAMMER *pgm, const char *port) {
   }
 
   if(pgm->bitclock)
-    pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
+    pmsg_warning("-c %s does not support adjustable bitclock speed; ignoring -B\n", pgmid);
 
   return 0;
 }
diff --git a/src/dryrun.c b/src/dryrun.c
index e7143f69..dd1968ca 100644
--- a/src/dryrun.c
+++ b/src/dryrun.c
@@ -729,7 +729,7 @@ static void dryrun_disable(const PROGRAMMER *pgm) {
 
 static int dryrun_open(PROGRAMMER *pgm, const char *port) {
   if(pgm->bitclock)
-    pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
+    pmsg_warning("-c %s does not support adjustable bitclock speed; ignoring -B\n", pgmid);
 
   pmsg_debug("%s(%s)\n", __func__, port? port: "NULL");
 
diff --git a/src/flip1.c b/src/flip1.c
index 27ab8ab7..d6f6c25b 100644
--- a/src/flip1.c
+++ b/src/flip1.c
@@ -181,7 +181,7 @@ void flip1_initpgm(PROGRAMMER *pgm) {
 
 static int flip1_open(PROGRAMMER *pgm, const char *port_spec) {
   if(pgm->bitclock)
-    pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
+    pmsg_warning("-c %s does not support adjustable bitclock speed; ignoring -B\n", pgmid);
 
   FLIP1(pgm)->dfu = dfu_open(port_spec);
   return (FLIP1(pgm)->dfu != NULL)? 0: -1;
diff --git a/src/flip2.c b/src/flip2.c
index 594a2845..3d35cae0 100644
--- a/src/flip2.c
+++ b/src/flip2.c
@@ -179,7 +179,7 @@ void flip2_initpgm(PROGRAMMER *pgm) {
 
 static int flip2_open(PROGRAMMER *pgm, const char *port_spec) {
   if(pgm->bitclock)
-    pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
+    pmsg_warning("-c %s does not support adjustable bitclock speed; ignoring -B\n", pgmid);
 
   FLIP2(pgm)->dfu = dfu_open(port_spec);
   return (FLIP2(pgm)->dfu != NULL)? 0: -1;
diff --git a/src/jtagmkII.c b/src/jtagmkII.c
index e130b254..a3050b69 100644
--- a/src/jtagmkII.c
+++ b/src/jtagmkII.c
@@ -1205,7 +1205,7 @@ static int jtagmkII_initialize(const PROGRAMMER *pgm, const AVRPART *p) {
       if(jtagmkII_set_sck_period(pgm, pgm->bitclock) != 0)
         return -1;
     } else {
-      pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
+      pmsg_warning("-c %s is not known to support adjustable bitclock speed; ignoring -B\n", pgmid);
     }
   }
 
diff --git a/src/linuxgpio.c b/src/linuxgpio.c
index 5c15ef86..aea88c5e 100644
--- a/src/linuxgpio.c
+++ b/src/linuxgpio.c
@@ -562,7 +562,7 @@ static void linuxgpio_libgpiod_display(const PROGRAMMER *pgm, const char *p) {
 
 static int linuxgpio_libgpiod_open(PROGRAMMER *pgm, const char *port) {
   if(pgm->bitclock)
-    pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
+    pmsg_warning("-c %s does not support adjustable bitclock speed; ignoring -B\n", pgmid);
 
   if(bitbang_check_prerequisites(pgm) < 0)
     return -1;
diff --git a/src/micronucleus.c b/src/micronucleus.c
index 12317df6..7f015c20 100644
--- a/src/micronucleus.c
+++ b/src/micronucleus.c
@@ -580,7 +580,7 @@ static int micronucleus_open(PROGRAMMER *pgm, const char *port) {
   pmsg_debug("micronucleus_open(\"%s\")\n", port);
 
   if(pgm->bitclock)
-    pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
+    pmsg_warning("-c %s does not support adjustable bitclock speed; ignoring -B\n", pgmid);
 
   struct pdata *pdata = &my;
   const char *bus_name = NULL;
diff --git a/src/par.c b/src/par.c
index 39152a13..bc232a25 100644
--- a/src/par.c
+++ b/src/par.c
@@ -226,9 +226,8 @@ static void par_enable(PROGRAMMER *pgm, const AVRPART *p) {
 }
 
 static int par_open(PROGRAMMER *pgm, const char *port) {
-
   if(pgm->bitclock)
-    pmsg_warning("programmer type %s does not support adjustable bitclock speed using -B. Use -i instead\n", pgm->type);
+    pmsg_warning("-c %s does not support adjustable bitclock speed using -B; use -i instead\n", pgmid);
 
   if(bitbang_check_prerequisites(pgm) < 0)
     return -1;
diff --git a/src/serbb_posix.c b/src/serbb_posix.c
index a3dd5a1e..dbcf6536 100644
--- a/src/serbb_posix.c
+++ b/src/serbb_posix.c
@@ -221,7 +221,7 @@ static int serbb_open(PROGRAMMER *pgm, const char *port) {
   int r;
 
   if(pgm->bitclock)
-    pmsg_warning("programmer type %s does not support adjustable bitclock speed using -B. Use -i instead\n", pgm->type);
+    pmsg_warning("-c %s does not support adjustable bitclock speed using -B; use -i instead\n", pgmid);
 
   if(bitbang_check_prerequisites(pgm) < 0)
     return -1;
diff --git a/src/serbb_win32.c b/src/serbb_win32.c
index 372fa4be..a5a15857 100644
--- a/src/serbb_win32.c
+++ b/src/serbb_win32.c
@@ -230,7 +230,7 @@ static int serbb_open(PROGRAMMER *pgm, const char *port) {
   HANDLE hComPort = INVALID_HANDLE_VALUE;
 
   if(pgm->bitclock)
-    pmsg_warning("programmer type %s does not support adjustable bitclock speed using -B. Use -i instead\n", pgm->type);
+    pmsg_warning("-c %s does not support adjustable bitclock speed using -B; use -i instead\n", pgmid);
 
   if(bitbang_check_prerequisites(pgm) < 0)
     return -1;
diff --git a/src/serialupdi.c b/src/serialupdi.c
index 149507c8..ddcefc6f 100644
--- a/src/serialupdi.c
+++ b/src/serialupdi.c
@@ -59,7 +59,7 @@ static void serialupdi_teardown(PROGRAMMER *pgm) {
 
 static int serialupdi_open(PROGRAMMER *pgm, const char *port) {
   if(pgm->bitclock)
-    pmsg_warning("programmer type %s sets its UPDI speed using -b [baudrate]. Ignoring -B\n", pgm->type);
+    pmsg_warning("-c %s sets its UPDI speed using -b baudrate; ignoring -B\n", pgmid);
 
   pgm->port = port;
   return updi_link_open(pgm);
diff --git a/src/stk500.c b/src/stk500.c
index ce63a4ce..bf7a3127 100644
--- a/src/stk500.c
+++ b/src/stk500.c
@@ -861,7 +861,7 @@ static int stk500_open(PROGRAMMER *pgm, const char *port) {
 
   if(pgm->bitclock) {
     if(str_eq(pgm->type, "arduino_as_isp")) // The Arduino as ISP will crash if we change the bitclock
-      pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
+      pmsg_warning("-c %s does not support adjustable bitclock speed; ignoring -B\n", pgmid);
     else {
       if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))
         pmsg_warning("setting bitclock despite HAS_BITCLOCK_ADJ missing in pgm->extra_features\n");
diff --git a/src/teensy.c b/src/teensy.c
index 4618258c..ef6bdc76 100644
--- a/src/teensy.c
+++ b/src/teensy.c
@@ -308,7 +308,7 @@ static int teensy_open(PROGRAMMER *pgm, const char *port) {
   pmsg_debug("teensy_open(\"%s\")\n", port);
 
   if(pgm->bitclock)
-    pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
+    pmsg_warning("-c %s does not support adjustable bitclock speed; ignoring -B\n", pgmid);
 
   struct pdata *pdata = &my;
   const char *bus_name = NULL;
diff --git a/src/urclock.c b/src/urclock.c
index 4583eb16..cb1f838b 100644
--- a/src/urclock.c
+++ b/src/urclock.c
@@ -2228,7 +2228,7 @@ static void urclock_disable(const PROGRAMMER *pgm) {
 
 static int urclock_open(PROGRAMMER *pgm, const char *port) {
   if(pgm->bitclock)
-    pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
+    pmsg_warning("-c %s does not support adjustable bitclock speed; ignoring -B\n", pgmid);
 
   union pinfo pinfo;
   pgm->port = port;
diff --git a/src/wiring.c b/src/wiring.c
index 23c7458b..b8e24597 100644
--- a/src/wiring.c
+++ b/src/wiring.c
@@ -136,7 +136,7 @@ static int wiring_parseextparms(const PROGRAMMER *pgm, const LISTID extparms) {
 
 static int wiring_open(PROGRAMMER *pgm, const char *port) {
   if(pgm->bitclock)
-    pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
+    pmsg_warning("-c %s does not support adjustable bitclock speed; ignoring -B\n", pgmid);
 
   int timetosnooze;
   union pinfo pinfo;
diff --git a/src/xbee.c b/src/xbee.c
index fdbda6fb..75f8a330 100644
--- a/src/xbee.c
+++ b/src/xbee.c
@@ -1417,7 +1417,7 @@ static int xbee_getsync(const PROGRAMMER *pgm) {
 
 static int xbee_open(PROGRAMMER *pgm, const char *port) {
   if(pgm->bitclock)
-    pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
+    pmsg_warning("-c %s does not support adjustable bitclock speed; ignoring -B\n", pgmid);
 
   union pinfo pinfo;