Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -r55425a4c5370a6fa1faad61dc24fcd76b854d3ed -r484b185f0cf4b2ea0ba9de331573952b1b5124b4
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 55425a4c5370a6fa1faad61dc24fcd76b854d3ed)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 484b185f0cf4b2ea0ba9de331573952b1b5124b4)
@@ -33,15 +33,15 @@
 
 // ********** private definitions **********
 
-#define TARGET_DRAIN_PUMP_RPM           1800                                                ///< Target drain pump speed (in RPM).
-#define DRAIN_WEIGH_UNCHANGE_TIMEOUT    ( 2 * MS_PER_SECOND )                              ///< Time period of unchanged weight during draining before timeout.
+#define TARGET_DRAIN_PUMP_RPM           1800                                ///< Target drain pump speed (in RPM).
+#define DRAIN_WEIGH_UNCHANGE_TIMEOUT    ( 2 * MS_PER_SECOND )               ///< Time period of unchanged weight during draining before timeout.
 
-#define TARGET_RO_PRESSURE_PSI          130                    ///< Target pressure for RO pump.
-#define TARGET_RO_FLOW_RATE_L           0.5                    ///< Target flow rate for RO pump.
+#define TARGET_RO_PRESSURE_PSI          130                                 ///< Target pressure for RO pump.
+#define TARGET_RO_FLOW_RATE_L           0.5                                 ///< Target flow rate for RO pump.
 
 // ********** private data **********
 
-static DG_DRAIN_STATE_T drainState = DG_DRAIN_STATE_START;                                  ///< Currently active drain state.
+static DG_DRAIN_STATE_T drainState = DG_DRAIN_STATE_START;                  ///< Currently active drain state.
 
 // ********** private function prototypes **********
 
@@ -122,7 +122,7 @@
 static DG_DRAIN_STATE_T handleDrainState( void )
 {
     DG_DRAIN_STATE_T result = DG_DRAIN_STATE_DRAIN;
-    RESERVOIR_ID_T inactiveReservoir = getInactiveReservoir();
+    DG_RESERVOIR_ID_T inactiveReservoir = getInactiveReservoir();
 
     // if we have reached our target drain to volume (by weight) or cannot drain anymore, we are done draining - go back to re-circ mode
     if ( hasTargetDrainVolumeBeenReached( inactiveReservoir, DRAIN_WEIGH_UNCHANGE_TIMEOUT ) )