Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -ra3a396aa37fb562327f05e54990f06538c7617ed -rf5baeac6a5f000705cd51e4779a967acf4088981
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision a3a396aa37fb562327f05e54990f06538c7617ed)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision f5baeac6a5f000705cd51e4779a967acf4088981)
@@ -140,8 +140,8 @@
 {
     // Read temperature and conducitivity
     //F32 hydChamberTemperature     = getTemperatureValue( TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER );
-    //F32 biCarbConductivity        = getConductivityValue( CONDUCTIVITYSENSORS_CD1_SENSOR );
-    //F32 acidBicarbMixConductivity = getConductivityValue( CONDUCTIVITYSENSORS_CD3_SENSOR );
+    //F32 biCarbConductivity        = getConductivityValue( D17_COND );
+    //F32 acidBicarbMixConductivity = getConductivityValue( D29_COND );
 
     // Monitor critical parameter while balancing chamber fill is in progress
     if ( TRUE == getBalancingChamberFillinProgressStatus() )
@@ -176,7 +176,7 @@
             valveControlForBCClosedState();
             setHydValvesStatetoClosedState();
             setUFValvesStatetoClosedState();
-            setValveState( VWI, VALVE_STATE_OPEN );   //M4
+            setValveState( M4_VALV, VALVE_STATE_OPEN );   //M4
 
             // Get the target temperature from TD
             targetHydChamberFluidTemp.data = getTDTargetDialysateTemperature();
@@ -189,7 +189,7 @@
 
         case DD_GEND_HYD_CHAMBER_PRESSURE_CHECK_STATE:
             // Open up VHo valve
-            setValveState( VHO, VALVE_STATE_OPEN );   //D14
+            setValveState( D14_VALV, VALVE_STATE_OPEN );   //D14
             // Start timer for hyd chamber negative pressure check state
             hydChamberPressureCheckStartTimeMS = getMSTimerCount();
             // Start D12/DGP pump
@@ -209,23 +209,23 @@
             //valveControlForBCOpenState();
 
             // Open fresh balancing chamber valves D19,D20,D21,D22
-            setValveState( BCV2, VALVE_STATE_OPEN );
-            setValveState( BCV6, VALVE_STATE_OPEN );
-            setValveState( BCV4, VALVE_STATE_OPEN );
-            setValveState( BCV8, VALVE_STATE_OPEN );
+            setValveState( D19_VALV, VALVE_STATE_OPEN );
+            setValveState( D20_VALV, VALVE_STATE_OPEN );
+            setValveState( D21_VALV, VALVE_STATE_OPEN );
+            setValveState( D22_VALV, VALVE_STATE_OPEN );
 
             // Close spent side valves D23,D24,D25,D26
-            setValveState( BCV1, VALVE_STATE_CLOSED );
-            setValveState( BCV3, VALVE_STATE_CLOSED );
-            setValveState( BCV5, VALVE_STATE_CLOSED );
-            setValveState( BCV7, VALVE_STATE_CLOSED );
+            setValveState( D23_VALV, VALVE_STATE_CLOSED );
+            setValveState( D25_VALV, VALVE_STATE_CLOSED );
+            setValveState( D24_VALV, VALVE_STATE_CLOSED );
+            setValveState( D26_VALV, VALVE_STATE_CLOSED );
 
 
             // Make sure valves are in correct position
-            setValveState( VDR, VALVE_STATE_OPEN );   // Drain valve : D53
-            setValveState( VDI, VALVE_STATE_CLOSED );
-            setValveState( VDO, VALVE_STATE_CLOSED );
-            setValveState( VDB2, VALVE_STATE_OPEN );
+            setValveState( D53_VALV, VALVE_STATE_OPEN );   // Drain valve : D53
+            setValveState( D35_VALV, VALVE_STATE_CLOSED ); // VDI
+            setValveState( D40_VALV, VALVE_STATE_CLOSED ); // VDO
+            setValveState( D34_VALV, VALVE_STATE_OPEN );   // Bypass valve
 
             // Start D48/SDP pump
             setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_INITIAL_RPM );
@@ -236,16 +236,16 @@
             valveControlForBCClosedState();
 
             // Make sure bypass valve open condition
-            setValveState( VDI, VALVE_STATE_CLOSED );
-            setValveState( VDO, VALVE_STATE_CLOSED );
-            setValveState( VDB2, VALVE_STATE_OPEN );
+            setValveState( D35_VALV, VALVE_STATE_CLOSED );  // VDI
+            setValveState( D40_VALV, VALVE_STATE_CLOSED );  // VDO
+            setValveState( D34_VALV, VALVE_STATE_OPEN );    // Bypass valve
             break;
 
         case DD_GEND_DIALYSATE_DELIVERY_STATE:
             // Disable bypass valve
-            setValveState( VDB2, VALVE_STATE_CLOSED );
-            setValveState( VDI, VALVE_STATE_OPEN );
-            setValveState( VDO, VALVE_STATE_OPEN );
+            setValveState( D34_VALV, VALVE_STATE_CLOSED );  // Bypass valve
+            setValveState( D35_VALV, VALVE_STATE_OPEN );    // VDI
+            setValveState( D40_VALV, VALVE_STATE_OPEN );    // VDO
             break;
 
         case DD_GEND_DIALYSATE_DELIVERY_PAUSE:
@@ -365,7 +365,7 @@
         F32 targetTemperature = getGenDilaysateTargetTemperature();
 
         //turn off inlet water valve
-        setValveState( VHI, VALVE_STATE_CLOSED );
+        setValveState( D3_VALV, VALVE_STATE_CLOSED );
 
         if ( lastDialTargetTemperatureSet != targetTemperature )
         {
@@ -380,7 +380,7 @@
     else
     {
         // if level is not met,allow inlet water to hydraulics chamber
-        setValveState( VHI, VALVE_STATE_OPEN );
+        setValveState( D3_VALV, VALVE_STATE_OPEN );
     }
 
     return result;
@@ -420,7 +420,7 @@
 static DD_GEND_MODE_STATE_T handleGenDHydChamberPressureCheckState( void )
 {
     DD_GEND_MODE_STATE_T state  = DD_GEND_HYD_CHAMBER_PRESSURE_CHECK_STATE;
-    F32 hydPressure = getFilteredPressure( PRESSURE_SENSOR_HYDRAULICS_OUTLET );
+    F32 hydPressure = getFilteredPressure( D9_PRES );
 
     // Hydraulics chamber negative pressure is in range ( -24 to -25 inHg )
     if ( ( hydPressure <= HYD_CHAMBER_TARGET_NEG_PRESS_MIN_PSI ) && ( hydPressure >= HYD_CHAMBER_TARGET_NEG_PRESS_MAX_PSI ) )
@@ -451,7 +451,7 @@
 static DD_GEND_MODE_STATE_T handleGenDFreshDialysatePressureCheckState( void )
 {
     DD_GEND_MODE_STATE_T state  = DD_GEND_FRESH_DIALYSATE_PRESSURE_CHECK_STATE;
-    F32 hydPressure = getFilteredPressure( PRESSURE_SENSOR_FRESH_DIALYSATE );
+    F32 hydPressure = getFilteredPressure( D18_PRES );
 
     // Hydraulics chamber postive pressure is in range
     if ( ( hydPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( hydPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) )
@@ -482,7 +482,7 @@
 static DD_GEND_MODE_STATE_T handleGenDSpentDialysatePressureCheckState( void )
 {
     DD_GEND_MODE_STATE_T state  = DD_GEND_SPENT_DIALYSATE_PRESSURE_CHECK_STATE;
-    F32 spentdialPressure = getFilteredPressure( PRESSURE_SENSOR_SPENT_DIALYSATE );
+    F32 spentdialPressure = getFilteredPressure( D51_PRES );
 
     // Spent dialysate pressure is in range
     if ( ( spentdialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentdialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG ) )
@@ -687,9 +687,9 @@
         data.floaterLevel                       = (U32)getLevelStatus( FLOATER_LEVEL );
         data.BiCarbLevel                        = (U32)getLevelStatus( BICARB_LEVEL );
         data.SpentChamberLevel                  = (U32)getLevelStatus( SPENT_DIALYSATE_LEVEL );
-        data.hydNegativePressure                = getFilteredPressure( PRESSURE_SENSOR_HYDRAULICS_OUTLET );
-        data.hydPositivePressure                = getFilteredPressure( PRESSURE_SENSOR_FRESH_DIALYSATE );
-        data.spentDialysatePressure             = getFilteredPressure( PRESSURE_SENSOR_SPENT_DIALYSATE );
+        data.hydNegativePressure                = getFilteredPressure( D9_PRES );
+        data.hydPositivePressure                = getFilteredPressure( D18_PRES );
+        data.spentDialysatePressure             = getFilteredPressure( D51_PRES );
         data.isDialysateGoodtoDeliver           = (BOOL)getDialGoodToDeliverStatus();
 
         broadcastData( MSG_ID_DD_GEN_DIALYSATE_MODE_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( GEN_DIALYSATE_MODE_DATA_T ) );