Index: firmware/App/Drivers/RotaryValve.c
===================================================================
diff -u -rb692af0986725e87431ca5e23c5721f1b242baac -r961784c895cb8f551a2623cd02dcbfe42d04b7c2
--- firmware/App/Drivers/RotaryValve.c	(.../RotaryValve.c)	(revision b692af0986725e87431ca5e23c5721f1b242baac)
+++ firmware/App/Drivers/RotaryValve.c	(.../RotaryValve.c)	(revision 961784c895cb8f551a2623cd02dcbfe42d04b7c2)
@@ -40,7 +40,7 @@
 /// Payload record structure for rotary valve set position request
 typedef struct
 {
-    U32 valve;                                                              ///< which rotary valve to set position for (0=VBA, 1=VBV)
+    U32 valve;                                                              ///< which rotary valve to set position for (0=H1, 1=H19)
     S16 stepChange;                                                         ///< number of steps to change position (pos indicates CW, neg indicates CCW)
 } VALVE_ROTARY_SET_CMD_PAYLOAD_T;
 #pragma pack(pop)
@@ -83,8 +83,8 @@
     }
 
     // set valve control bits once at startup
-    setVBAControl( valveControl[ VBA ] );
-    setVBVControl( valveControl[ VBV ] );
+    setH1Control( valveControl[ H1_VALV ] );
+    setH19Control( valveControl[ H19_VALV ] );
 }
 
 /*********************************************************************//**
@@ -105,12 +105,12 @@
     S16 cmdPos[ NUM_OF_VALVES ];
 
     // Get latest valve status and positions from FPGA
-    cmdPos[ VBV ]                       = getVBVCmdPosition();
-    currentValveEncPosition[ VBV ].data = (S32)getValveEncoderPosition( VBV );
-    valveStatus[ VBV ].data             = getVBVStatus();
-    cmdPos[ VBA ]                       = getVBACmdPosition();
-    currentValveEncPosition[ VBA ].data = (S32)getValveEncoderPosition( VBA );
-    valveStatus[ VBA ].data             = getVBAStatus();
+    cmdPos[ H19_VALV ]                       = getH19CmdPosition();
+    currentValveEncPosition[ H19_VALV ].data = (S32)getValveEncoderPosition( H19_VALV );
+    valveStatus[ H19_VALV ].data             = getH19Status();
+    cmdPos[ H1_VALV ]                        = getH1CmdPosition();
+    currentValveEncPosition[ H1_VALV ].data  = (S32)getValveEncoderPosition( H1_VALV );
+    valveStatus[ H1_VALV ].data              = getH1Status();
 
     // TODO check commanded position vs. commanded position read back from FPGA - alarm different for some persistent period of time
 
@@ -155,31 +155,31 @@
         mag = (S16)(abs(chg));
         // give FPGA valve change command
         commandValvePosChange[ valve ] = chg;
-        if ( VBA == valve )
+        if ( H1_VALV == valve )
         {
-            ctrl = getVBAControl();
+            ctrl = getH1Control();
             if ( MOTOR_DIR_REVERSE == dir )
             {
-                setVBAControl( ( ctrl | FPGA_PINCH_VALVES_REVERSE ) );
+                setH1Control( ( ctrl | FPGA_PINCH_VALVES_REVERSE ) );
             }
             else
             {
-                setVBAControl( ( ctrl & ~FPGA_PINCH_VALVES_REVERSE ) );
+                setH1Control( ( ctrl & ~FPGA_PINCH_VALVES_REVERSE ) );
             }
-            setVBAPosition( mag );
+            setH1Position( mag );
         }
         else
         {
-            ctrl = getVBVControl();
+            ctrl = getH19Control();
             if ( MOTOR_DIR_REVERSE == dir )
             {
-                setVBVControl( ( ctrl | FPGA_PINCH_VALVES_REVERSE ) );
+                setH19Control( ( ctrl | FPGA_PINCH_VALVES_REVERSE ) );
             }
             else
             {
-                setVBVControl( ( ctrl & ~FPGA_PINCH_VALVES_REVERSE ) );
+                setH19Control( ( ctrl & ~FPGA_PINCH_VALVES_REVERSE ) );
             }
-            setVBVPosition( mag );
+            setH19Position( mag );
         }
     }
     else