diff --git a/kenwood/kenwood.c b/kenwood/kenwood.c
index 3196af7fc..5cf171d7c 100644
--- a/kenwood/kenwood.c
+++ b/kenwood/kenwood.c
@@ -756,7 +756,7 @@ int kenwood_set_vfo(RIG *rig, vfo_t vfo)
     return RIG_OK;
 
   default:
-    rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %d\n", __func__, vfo);
+    rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %s\n", __func__, rig_strvfo(vfo));
     return -RIG_EINVAL;
   }
 
@@ -831,7 +831,7 @@ int kenwood_set_vfo_main_sub(RIG *rig, vfo_t vfo)
     return RIG_OK;
 
   default:
-    rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %d\n", __func__, vfo);
+    rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %s\n", __func__, rig_strvfo(vfo));
     return -RIG_EINVAL;
   }
 
@@ -896,7 +896,7 @@ int kenwood_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo)
     case RIG_VFO_B: vfo_function = '1'; break;
     case RIG_VFO_MEM: vfo_function = '2'; break;
     default:
-      rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %d\n", __func__, vfo);
+      rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %s\n", __func__, rig_strvfo(vfo));
       return -RIG_EINVAL;
     }
     /* set RX VFO */
@@ -922,7 +922,7 @@ int kenwood_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo)
   case RIG_VFO_B: vfo_function = '1'; break;
   case RIG_VFO_MEM: vfo_function = '2'; break;
   default:
-    rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %d\n", __func__, txvfo);
+    rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %s\n", __func__, rig_strvfo(txvfo));
     return -RIG_EINVAL;
   }
   if (RIG_MODEL_K2 == rig->caps->rig_model
@@ -1144,7 +1144,7 @@ int kenwood_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
     vfo_letter = 'C';
     break;
   default:
-    rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %d\n", __func__, vfo);
+    rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %s\n", __func__, rig_strvfo(vfo));
     return -RIG_EINVAL;
   }
   snprintf(freqbuf, sizeof (freqbuf), "F%c%011"PRIll, vfo_letter, (int64_t)freq);
@@ -1255,7 +1255,7 @@ int kenwood_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
     vfo_letter = 'C';
     break;
   default:
-    rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %d\n", __func__, vfo);
+    rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %s\n", __func__, rig_strvfo(vfo));
     return -RIG_EINVAL;
   }
 
@@ -1609,7 +1609,7 @@ int kenwood_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
         case RIG_VFO_MAIN: c = '0'; break;
         case RIG_VFO_SUB: c = '1'; break;
         default:
-          rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %d\n", __func__, vfo);
+          rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %s\n", __func__, rig_strvfo(vfo));
           return -RIG_EINVAL;
         }
       snprintf(cmd, sizeof (cmd), "OM%c", c);
@@ -2312,7 +2312,7 @@ int kenwood_set_ctcss_tone_tn(RIG *rig, vfo_t vfo, tone_t tone)
         case RIG_VFO_MAIN: c = '0'; break;
         case RIG_VFO_SUB: c = '1'; break;
         default:
-          rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %d\n", __func__, vfo);
+          rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %s\n", __func__, rig_strvfo(vfo));
           return -RIG_EINVAL;
         }
       snprintf(buf, sizeof (buf), "TN%c%02d", c, i + 1);
@@ -2362,7 +2362,7 @@ int kenwood_get_ctcss_tone(RIG *rig, vfo_t vfo, tone_t *tone)
         case RIG_VFO_MAIN: c = '0'; break;
         case RIG_VFO_SUB: c = '1'; break;
         default:
-          rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %d\n", __func__, vfo);
+          rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %s\n", __func__, rig_strvfo(vfo));
           return -RIG_EINVAL;
         }
       snprintf(cmd, sizeof (cmd), "TN%c", c);
@@ -2436,7 +2436,7 @@ int kenwood_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone)
         case RIG_VFO_MAIN: c = '0'; break;
         case RIG_VFO_SUB: c = '1'; break;
         default:
-          rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %d\n", __func__, vfo);
+          rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %s\n", __func__, rig_strvfo(vfo));
           return -RIG_EINVAL;
         }
       snprintf(buf, sizeof (buf), "CN%c%02d", c, i + 1);
@@ -2480,7 +2480,7 @@ int kenwood_get_ctcss_sql(RIG *rig, vfo_t vfo, tone_t *tone)
         case RIG_VFO_MAIN: c = '0'; break;
         case RIG_VFO_SUB: c = '1'; break;
         default:
-          rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %d\n", __func__, vfo);
+          rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %s\n", __func__, rig_strvfo(vfo));
           return -RIG_EINVAL;
         }
       snprintf(cmd, sizeof (cmd), "CN%c", c);
@@ -2557,7 +2557,7 @@ int kenwood_set_ant(RIG * rig, vfo_t vfo, ant_t ant)
         case RIG_VFO_MAIN: c = '0'; break;
         case RIG_VFO_SUB: c = '1'; break;
         default:
-          rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %d\n", __func__, vfo);
+          rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %s\n", __func__, rig_strvfo(vfo));
           return -RIG_EINVAL;
         }
       snprintf (cmd, sizeof (cmd), "AN0%c%c99", c, a);
@@ -3008,7 +3008,7 @@ int kenwood_set_mem(RIG *rig, vfo_t vfo, int ch)
         case RIG_VFO_MAIN: c = '0'; break;
         case RIG_VFO_SUB: c = '1'; break;
         default:
-          rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %d\n", __func__, vfo);
+          rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %s\n", __func__, rig_strvfo(vfo));
           return -RIG_EINVAL;
         }
       snprintf (buf, sizeof (buf), "MN%c%03d", c, ch);
@@ -3056,7 +3056,7 @@ int kenwood_get_mem(RIG *rig, vfo_t vfo, int *ch)
         case RIG_VFO_MAIN: c = '0'; break;
         case RIG_VFO_SUB: c = '1'; break;
         default:
-          rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %d\n", __func__, vfo);
+          rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %s\n", __func__, rig_strvfo(vfo));
           return -RIG_EINVAL;
         }
       snprintf (cmd, sizeof (cmd), "MN%c", c);