Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -rf49295a21525d5d1b88ec52eb4fcac72e7a526b7 -ra3a396aa37fb562327f05e54990f06538c7617ed
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision f49295a21525d5d1b88ec52eb4fcac72e7a526b7)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision a3a396aa37fb562327f05e54990f06538c7617ed)
@@ -182,8 +182,8 @@
             targetHydChamberFluidTemp.data = getTDTargetDialysateTemperature();
 
             // Turn on the primary heater
-            setHeaterTargetTemperature( DD_PRIMARY_HEATER, getGenDilaysateTargetTemperature() );
-            startHeater( DD_PRIMARY_HEATER );
+            setHeaterTargetTemperature( D5_HEAT, getGenDilaysateTargetTemperature() );
+            startHeater( D5_HEAT );
             lastDialTargetTemperatureSet = getGenDilaysateTargetTemperature();
             break;
 
@@ -193,7 +193,7 @@
             // Start timer for hyd chamber negative pressure check state
             hydChamberPressureCheckStartTimeMS = getMSTimerCount();
             // Start D12/DGP pump
-            setDialysatePumpTargetRPM( FRESH_DIALYSATE_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM );
+            setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM );
             break;
 
         case DD_GEND_FRESH_DIALYSATE_PRESSURE_CHECK_STATE:
@@ -228,7 +228,7 @@
             setValveState( VDB2, VALVE_STATE_OPEN );
 
             // Start D48/SDP pump
-            setDialysatePumpTargetRPM( SPENT_DIALYSATE_PUMP, SPENT_DIAL_PUMP_INITIAL_RPM );
+            setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_INITIAL_RPM );
             break;
 
         case DD_GEND_PRODUCE_DIALYSATE_STATE:
@@ -250,13 +250,13 @@
 
         case DD_GEND_DIALYSATE_DELIVERY_PAUSE:
             // stop the motor during pause conditions
-            signalDialysatePumpHardStop( FRESH_DIALYSATE_PUMP );
-            signalDialysatePumpHardStop( SPENT_DIALYSATE_PUMP );
+            signalDialysatePumpHardStop( D12_PUMP );
+            signalDialysatePumpHardStop( D48_PUMP );
             requestConcentratePumpOff( D11_PUMP, FALSE );
             requestConcentratePumpOff( D10_PUMP, FALSE );
 
-            stopHeater( DD_PRIMARY_HEATER );
-            stopHeater( DD_TRIMMER_HEATER );
+            stopHeater( D5_HEAT );
+            stopHeater( D45_HEAT );
 
             //close the DD - water inlet and drain valves?
             break;
@@ -370,7 +370,7 @@
         if ( lastDialTargetTemperatureSet != targetTemperature )
         {
             // Update the target temperature for heater control
-            setHeaterTargetTemperature( DD_PRIMARY_HEATER, targetTemperature );
+            setHeaterTargetTemperature( D5_HEAT, targetTemperature );
             lastDialTargetTemperatureSet = targetTemperature;
         }