Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -rf5baeac6a5f000705cd51e4779a967acf4088981 -r3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision f5baeac6a5f000705cd51e4779a967acf4088981)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546)
@@ -139,7 +139,7 @@
 void execGenDialysateMonitor( void )
 {
     // Read temperature and conducitivity
-    //F32 hydChamberTemperature     = getTemperatureValue( TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER );
+    //F32 hydChamberTemperature     = getTemperatureValue( D4_TEMP );
     //F32 biCarbConductivity        = getConductivityValue( D17_COND );
     //F32 acidBicarbMixConductivity = getConductivityValue( D29_COND );
 
@@ -352,8 +352,8 @@
 {
     // Read floater switch
     BOOL result                 = FALSE;
-    LEVEL_STATE_T floaterLevel  = getLevelStatus( FLOATER_LEVEL );
-    //LEVEL_STATE_T spentDialLevel = getLevelStatus( SPENT_DIALYSATE_LEVEL );
+    LEVEL_STATE_T floaterLevel  = getLevelStatus( D6_LEVL );
+    //LEVEL_STATE_T spentDialLevel = getLevelStatus( D46_LEVL );
 
     // Get the target temperature from TD
     targetHydChamberFluidTemp.data = getTDTargetDialysateTemperature();
@@ -684,12 +684,12 @@
 
         data.genDialysateExecState              = (U32)getCurrentGenDialysateState();
         data.isDialDelInProgress                = (BOOL)getDialDeliveryProgressStatus();
-        data.floaterLevel                       = (U32)getLevelStatus( FLOATER_LEVEL );
-        data.BiCarbLevel                        = (U32)getLevelStatus( BICARB_LEVEL );
-        data.SpentChamberLevel                  = (U32)getLevelStatus( SPENT_DIALYSATE_LEVEL );
-        data.hydNegativePressure                = getFilteredPressure( D9_PRES );
-        data.hydPositivePressure                = getFilteredPressure( D18_PRES );
-        data.spentDialysatePressure             = getFilteredPressure( D51_PRES );
+        data.d6Level                            = (U32)getLevelStatus( D6_LEVL );
+        data.d63Level                           = (U32)getLevelStatus( D63_LEVL );
+        data.d46Level                           = (U32)getLevelStatus( D46_LEVL );
+        data.d9Pressure                         = getFilteredPressure( D9_PRES );
+        data.d18Pressure                        = getFilteredPressure( D18_PRES );
+        data.d51Pressure                        = 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 ) );