Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -rc48a99d2d1c852adcc986253b6c420a90dab7bfe -r2496e9225fa1b2c627d625def02515a0f0dd5793
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision c48a99d2d1c852adcc986253b6c420a90dab7bfe)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 2496e9225fa1b2c627d625def02515a0f0dd5793)
@@ -97,7 +97,7 @@
  * @param resID : ID of reservoir to set as active.
  * @return TRUE if set active reservoir command successful, FALSE if not.
  *************************************************************************/
-BOOL setActiveReservoir( RESERVOIR_ID_T resID )
+BOOL setActiveReservoirCmd( RESERVOIR_ID_T resID )
 {
     BOOL result = FALSE;
 
@@ -124,7 +124,7 @@
  * @param fillToVolMl : Target volume (in mL) to fill reservoir to.
  * @return TRUE if fill command successful, FALSE if not.
  *************************************************************************/
-BOOL startFill( U32 fillToVolMl )
+BOOL startFillCmd( U32 fillToVolMl )
 {
     BOOL result = FALSE;
 
@@ -151,7 +151,7 @@
  * Outputs : move to standby mode
  * @return TRUE if stop fill command successful, FALSE if not.
  *************************************************************************/
-BOOL stopFill( void )
+BOOL stopFillCmd( void )
 {
     BOOL result = FALSE;
 
@@ -174,7 +174,7 @@
  * @param drainToVolMl : Target volume (in mL) to drain reservoir to.
  * @return TRUE if drain command successful, FALSE if not.
  *************************************************************************/
-BOOL startDrain( U32 drainToVolMl )
+BOOL startDrainCmd( U32 drainToVolMl )
 {
     BOOL result = FALSE;
 
@@ -200,7 +200,7 @@
  * Outputs : move to standby mode
  * @return TRUE if stop drain command successful, FALSE if not.
  *************************************************************************/
-BOOL stopDrain( void )
+BOOL stopDrainCmd( void )
 {
     BOOL result = FALSE;
 
@@ -223,7 +223,7 @@
  * Outputs : start trimmer heater
  * @return TRUE if stop drain command successful, FALSE if not.
  *************************************************************************/
-BOOL startTrimmerHeater( void )
+BOOL startTrimmerHeaterCmd( void )
 {
     BOOL result = FALSE;
     // TODO
@@ -239,7 +239,7 @@
  * Outputs : stop trimmer heater
  * @return TRUE if stop drain command successful, FALSE if not.
  *************************************************************************/
-BOOL stopTrimmerHeater( void )
+BOOL stopTrimmerHeaterCmd( void )
 {
     BOOL result = FALSE;
     // TODO