Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -r58c82eeb7e6113e610babd4e36b3968552b35260 -rf3a26c402a2ec88f5ee7dbb8eb7127ab5b4692aa
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 58c82eeb7e6113e610babd4e36b3968552b35260)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision f3a26c402a2ec88f5ee7dbb8eb7127ab5b4692aa)
@@ -151,7 +151,7 @@
     if ( TRUE == isAirTrapControlling() )
     {
         pendingStopAirTrapController = TRUE;
-        set2WayValveState( VALVE_2_WAY_VBT, STATE_CLOSED );     // Always exit air trap valve control w/ valve closed.
+        set2WayValveState( H13, STATE_CLOSED );     // Always exit air trap valve control w/ valve closed.
         SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_AIR_TRAP_FILL, STATE_CLOSED, 0 );
         signalLowVenousPressureCheck();                         // Venous pressure check should continue even after ending auto air trap control
     }
@@ -202,8 +202,8 @@
     }
     else
     {
-        lowerAirTrap         = getLevelSensorState( AIR_TRAP_LEVEL_SENSOR_LOWER );
-        upperAirTrap         = getLevelSensorState( AIR_TRAP_LEVEL_SENSOR_UPPER );
+        lowerAirTrap         = getLevelSensorState( H17 );
+        upperAirTrap         = getLevelSensorState( H16 );
         isAirTrapLevelsValid = ( ( ( AIR_TRAP_LEVEL_AIR   == lowerAirTrap ) && ( AIR_TRAP_LEVEL_FLUID == upperAirTrap ) ) ? TRUE : FALSE );
 
 #ifndef _RELEASE_
@@ -258,7 +258,7 @@
     if ( MODE_FAUL == getCurrentOperationMode() )
     {
         airTrapControllerState = AIR_TRAP_MANUAL_CONTROL_STATE;
-        set2WayValveState( VALVE_2_WAY_VBT, STATE_CLOSED );
+        set2WayValveState( H13, STATE_CLOSED );
         SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_AIR_TRAP_FILL, STATE_CLOSED, 0 );
         pendingStartAirTrapController = FALSE;
     }
@@ -308,7 +308,7 @@
     if ( TRUE == pendingStartAirTrapController )
     {
         pendingStartAirTrapController = FALSE;
-        set2WayValveState( VALVE_2_WAY_VBT, STATE_CLOSED );
+        set2WayValveState( H13, STATE_CLOSED );
         SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_AIR_TRAP_FILL, STATE_CLOSED, 0 );
         result = AIR_TRAP_VALVE_CLOSED_STATE;
     }
@@ -355,7 +355,7 @@
             setAirPumpState( AIR_PUMP_STATE_OFF );
         }
 
-        set2WayValveState( VALVE_2_WAY_VBT, STATE_OPEN );
+        set2WayValveState( H13, STATE_OPEN );
         fillStartTime = getMSTimerCount();
         SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_AIR_TRAP_FILL, STATE_OPEN, 0 );
         result = AIR_TRAP_VALVE_OPEN_STATE;
@@ -364,16 +364,16 @@
     // Turn air pump off after defined time or air detected at upper level
     else if ( ( AIR_PUMP_STATE_ON == getAirPumpState() ) &&
               ( ( TRUE == didTimeout( stopAirPumpStartTime, airPumpStopTime ) ) ||
-                ( ( AIR_TRAP_LEVEL_AIR   == getRawLevelSensorState( AIR_TRAP_LEVEL_SENSOR_UPPER ) ) &&
-                  ( AIR_TRAP_LEVEL_FLUID == getLevelSensorState( AIR_TRAP_LEVEL_SENSOR_LOWER ) ) ) ) )
+                ( ( AIR_TRAP_LEVEL_AIR   == getRawLevelSensorState( H16 ) ) &&
+                  ( AIR_TRAP_LEVEL_FLUID == getLevelSensorState( H17 ) ) ) ) )
 
     {
         setAirPumpState( AIR_PUMP_STATE_OFF );
         airPumpOnDelayStartTime = getMSTimerCount();
     }
 
     // Turn on air pump if fluid reaches upper level.
-    else if ( AIR_TRAP_LEVEL_FLUID == getLevelSensorState( AIR_TRAP_LEVEL_SENSOR_UPPER ) )
+    else if ( AIR_TRAP_LEVEL_FLUID == getLevelSensorState( H16 ) )
     {
         if ( ( AIR_PUMP_STATE_OFF == getAirPumpState() ) &&
              ( TRUE == didTimeout( airPumpOnDelayStartTime, AIR_PUMP_ON_DELAY_TIME_MS ) ) )
@@ -385,15 +385,15 @@
     }
 
     // Transition to open valve state when air detected at lower level
-    else if ( ( AIR_TRAP_LEVEL_AIR == getLevelSensorState( AIR_TRAP_LEVEL_SENSOR_UPPER ) ) &&
-              ( AIR_TRAP_LEVEL_AIR == getLevelSensorState( AIR_TRAP_LEVEL_SENSOR_LOWER ) ) )
+    else if ( ( AIR_TRAP_LEVEL_AIR == getLevelSensorState( H16 ) ) &&
+              ( AIR_TRAP_LEVEL_AIR == getLevelSensorState( H17 ) ) )
     {
         if ( AIR_PUMP_STATE_ON == getAirPumpState() )
         {
             setAirPumpState( AIR_PUMP_STATE_OFF );
         }
 
-        set2WayValveState( VALVE_2_WAY_VBT, STATE_OPEN );
+        set2WayValveState( H13, STATE_OPEN );
         fillStartTime = getMSTimerCount();
         SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_AIR_TRAP_FILL, STATE_OPEN, 0 );
         result = AIR_TRAP_VALVE_OPEN_STATE;
@@ -422,9 +422,9 @@
         result = AIR_TRAP_MANUAL_CONTROL_STATE;
     }
     // Transition to closed valve state when fluid detected at upper level
-    else if ( AIR_TRAP_LEVEL_FLUID == getRawLevelSensorState( AIR_TRAP_LEVEL_SENSOR_UPPER ) )
+    else if ( AIR_TRAP_LEVEL_FLUID == getRawLevelSensorState( H16 ) )
     {
-        set2WayValveState( VALVE_2_WAY_VBT, STATE_CLOSED );
+        set2WayValveState( H13, STATE_CLOSED );
         airPumpOnDelayStartTime = u32DiffWithWrap( AIR_PUMP_ON_DELAY_ADJUST_AFTER_FILL, getMSTimerCount() );
         signalLowVenousPressureCheck();
         SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_AIR_TRAP_FILL, STATE_CLOSED, 0 );
@@ -450,11 +450,11 @@
     {
         AIR_TRAP_PAYLOAD_T data;
 
-        data.lowerLevel     = getLevelSensorState( AIR_TRAP_LEVEL_SENSOR_LOWER );
-        data.upperLevel     = getLevelSensorState( AIR_TRAP_LEVEL_SENSOR_UPPER );
-        data.rawLowerLevel  = getRawLevelSensorState( AIR_TRAP_LEVEL_SENSOR_LOWER );
-        data.rawUpperLevel  = getRawLevelSensorState( AIR_TRAP_LEVEL_SENSOR_UPPER );
-        data.valveState     = get2WayValveState( VALVE_2_WAY_VBT );
+        data.h17State     = getLevelSensorState( H17 );
+        data.h16State     = getLevelSensorState( H16 );
+        data.h17RawState  = getRawLevelSensorState( H17 );
+        data.h16RawState  = getRawLevelSensorState( H16 );
+        data.h13State     = get2WayValveState( H13 );
         data.controlling    = isAirTrapControlling();
 
         broadcastData( MSG_ID_TD_AIR_TRAP_DATA, COMM_BUFFER_OUT_CAN_TD_BROADCAST, (U08*)&data, sizeof( AIR_TRAP_PAYLOAD_T ) );