Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r6145c5d1a645646587fb077df3c61eef2354f744 -r484b185f0cf4b2ea0ba9de331573952b1b5124b4
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 6145c5d1a645646587fb077df3c61eef2354f744)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 484b185f0cf4b2ea0ba9de331573952b1b5124b4)
@@ -925,12 +925,12 @@
 
     if ( message->hdr.payloadLen == sizeof( U32 ) )
     {
-        RESERVOIR_ID_T reservoirID;
+        DG_RESERVOIR_ID_T reservoirID;
         U32 resID;
 
         result = TRUE;
         memcpy( &resID, message->payload, sizeof( U32 ) );
-        reservoirID = (RESERVOIR_ID_T)resID;
+        reservoirID = (DG_RESERVOIR_ID_T)resID;
         setActiveReservoirCmd( reservoirID );
     }
 
@@ -953,7 +953,7 @@
 
     if ( message->hdr.payloadLen == sizeof( U32 ) )
     {
-        VALVE_SETTING_ID_T valveSettingID;
+        DG_VALVE_SETTING_ID_T valveSettingID;
 
         result = TRUE;
         memcpy( &valveSettingID, message->payload, sizeof( U32 ) );