diff --git a/yaesu/ft100.c b/yaesu/ft100.c
index e5b838445..fcf40dcd9 100644
--- a/yaesu/ft100.c
+++ b/yaesu/ft100.c
@@ -7,7 +7,7 @@
  * The starting point for this code was Frank's ft847 implementation.
  *
  *
- *    $Id: ft100.c,v 1.7 2003-02-14 15:23:00 avflinsch Exp $  
+ *    $Id: ft100.c,v 1.8 2003-03-10 08:26:20 fillods Exp $  
  *
  *
  *  This library is free software; you can redistribute it and/or
@@ -325,7 +325,7 @@ int ft100_init(RIG *rig) {
 
   memcpy(p->pcs,ncmd,sizeof(ncmd));
 
-  p->current_vfo = RIG_VFO1;	/* no clue which VFO is active, so guess VFO 1 */
+  p->current_vfo = RIG_VFO_A;	/* no clue which VFO is active, so guess VFO 1 */
   rig->state.priv = (void*)p;
   
   return RIG_OK;
@@ -416,8 +416,8 @@ int ft100_set_freq(RIG *rig, vfo_t vfo, freq_t freq) {
  
   switch( vfo ) {
   case RIG_VFO_CURR:
-  case RIG_VFO1:
-  case RIG_VFO2:
+  case RIG_VFO_A:
+  case RIG_VFO_B:
     cmd_index = FT100_NATIVE_CAT_SET_FREQ;
     break;
   default:
@@ -580,8 +580,8 @@ int ft100_set_vfo(RIG *rig, vfo_t vfo) {
   if (!rig)  return -RIG_EINVAL;
 
   switch(vfo) {
-  case RIG_VFO1:
-  case RIG_VFO2:
+  case RIG_VFO_A:
+  case RIG_VFO_B:
     if( p->current_vfo != vfo ) {
       if( ft100_send_priv_cmd( rig, FT100_NATIVE_CAT_SET_VFOAB ) == RIG_OK ) {
         p->current_vfo = vfo;
@@ -757,8 +757,8 @@ int ft100_set_dcs_code(RIG *rig, vfo_t vfo, tone_t code) {
   
   switch( vfo ) {
   case RIG_VFO_CURR:
-  case RIG_VFO1:
-  case RIG_VFO2:
+  case RIG_VFO_A:
+  case RIG_VFO_B:
     cmd_index = FT100_NATIVE_CAT_SET_DCS_CODE;
     break;
   default:
@@ -798,8 +798,8 @@ int ft100_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone) {
  
   switch( vfo ) {
   case RIG_VFO_CURR:
-  case RIG_VFO1:
-  case RIG_VFO2:
+  case RIG_VFO_A:
+  case RIG_VFO_B:
     cmd_index = FT100_NATIVE_CAT_SET_CTCSS_FREQ;
     break;
   default:
diff --git a/yaesu/ft817.c b/yaesu/ft817.c
index 922319f6b..5d3d7eafd 100644
--- a/yaesu/ft817.c
+++ b/yaesu/ft817.c
@@ -7,7 +7,7 @@
  * The starting point for this code was Frank's ft847 implementation.
  *
  *
- *    $Id: ft817.c,v 1.5 2002-12-01 03:08:05 n0nb Exp $  
+ *    $Id: ft817.c,v 1.6 2003-03-10 08:26:20 fillods Exp $  
  *
  *
  *  This library is free software; you can redistribute it and/or
@@ -273,7 +273,7 @@ int ft817_init(RIG *rig) {
 
   memcpy(p->pcs,ncmd,sizeof(ncmd));
 
-  p->current_vfo = RIG_VFO1;	/* no clue which VFO is active, so guess VFO 1 */
+  p->current_vfo = RIG_VFO_A;	/* no clue which VFO is active, so guess VFO 1 */
   rig->state.priv = (void*)p;
   
   return RIG_OK;
@@ -355,8 +355,8 @@ int ft817_set_freq(RIG *rig, vfo_t vfo, freq_t freq) {
  
   switch( vfo ) {
   case RIG_VFO_CURR:
-  case RIG_VFO1:
-  case RIG_VFO2:
+  case RIG_VFO_A:
+  case RIG_VFO_B:
     cmd_index = FT817_NATIVE_CAT_SET_FREQ;
     break;
   default:
@@ -501,8 +501,8 @@ int ft817_set_vfo(RIG *rig, vfo_t vfo) {
   if (!rig)  return -RIG_EINVAL;
 
   switch(vfo) {
-  case RIG_VFO1:
-  case RIG_VFO2:
+  case RIG_VFO_A:
+  case RIG_VFO_B:
     if( p->current_vfo != vfo ) {
       if( ft817_send_priv_cmd( rig, FT817_NATIVE_CAT_SET_VFOAB ) == RIG_OK ) {
         p->current_vfo = vfo;
diff --git a/yaesu/ft847.h b/yaesu/ft847.h
index a58ce9f32..fc87f0c1a 100644
--- a/yaesu/ft847.h
+++ b/yaesu/ft847.h
@@ -6,7 +6,7 @@
  * via serial interface to an FT-847 using the "CAT" interface.
  *
  *
- *    $Id: ft847.h,v 1.4 2002-12-01 03:08:05 n0nb Exp $  
+ *    $Id: ft847.h,v 1.5 2003-03-10 08:26:20 fillods Exp $  
  *
  *
  *  This library is free software; you can redistribute it and/or
@@ -150,7 +150,7 @@ typedef enum ft847_native_cmd_e ft847_native_cmd_t;
  */
 
 struct ft847_priv_data {
-  unsigned char current_vfo;	/* active VFO from last cmd , can be either RIG_VFO_A, SAT_RX, SAT_TX */
+  vfo_t current_vfo;	/* active VFO from last cmd , can be either RIG_VFO_A, SAT_RX, SAT_TX */
   unsigned char p_cmd[YAESU_CMD_LENGTH]; /* private copy of 1 constructed CAT cmd */
   yaesu_cmd_set_t pcs[FT_847_NATIVE_SIZE];		/* private cmd set */
   unsigned char rx_status;	/* tx returned data */