Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -rdd8d00b02a7565f3c5ce70040ae3b1bc40b4fe37 -r187df13234966f412631385a0bb7e76d1d3b69aa
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision dd8d00b02a7565f3c5ce70040ae3b1bc40b4fe37)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 187df13234966f412631385a0bb7e76d1d3b69aa)
@@ -158,10 +158,10 @@
 #define DIR_CAN3_PORT_MASK              0x00000002  ///< (Rx - re-purposed as output GPIO for blood pump direction signal)
 #define BP_ROTOR_HALL_SENSOR_NHET_ID    0x0000000C  ///< NHET pin number associated with BP rotor hall sensor input
 // Blood pump stop and direction macros
-#define SET_BP_DIR()                    {canREG3->RIOC |= DIR_CAN3_PORT_MASK;}     ///< Macro to set blood pump direction signal high.
-#define CLR_BP_DIR()                    {canREG3->RIOC &= ~DIR_CAN3_PORT_MASK;}    ///< Macro to set blood pump direction signal low.
-#define SET_BP_STOP()                   {canREG3->TIOC &= ~STOP_CAN3_PORT_MASK;}   ///< Macro to set blood pump stop signal (active low).
-#define CLR_BP_STOP()                   {canREG3->TIOC |= STOP_CAN3_PORT_MASK;}    ///< Macro to clear blood pump stop signal (active low).
+#define SET_BP_DIR()                    {canREG3->RIOC |= DIR_CAN3_PORT_MASK;}     ///< Macro to set blood pump direction signal high (forward).
+#define CLR_BP_DIR()                    {canREG3->RIOC &= ~DIR_CAN3_PORT_MASK;}    ///< Macro to set blood pump direction signal low (reverse).
+#define SET_BP_STOP()                   {canREG3->TIOC &= ~STOP_CAN3_PORT_MASK;}   ///< Macro to set blood pump disable signal low (active low).
+#define CLR_BP_STOP()                   {canREG3->TIOC |= STOP_CAN3_PORT_MASK;}    ///< Macro to set blood pump disable signal high (active low).
 
 // ********** private data **********
 
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -ra56db4650fe5652d633e0c51b29da32d5d708608 -r187df13234966f412631385a0bb7e76d1d3b69aa
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision a56db4650fe5652d633e0c51b29da32d5d708608)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 187df13234966f412631385a0bb7e76d1d3b69aa)
@@ -166,10 +166,10 @@
 #define DIR_DI_PUMP_SPI5_PORT_MASK       0x00000100     ///< Pin on unused SPI5 peripheral (ENA) - re-purposed as output GPIO to set dialysate inlet pump direction.
 #define DIP_ROTOR_HALL_SENSOR_NHET_ID    0x0000001E     ///< NHET pin number associated with DPi rotor hall sensor input
 // DialIn pump stop and direction macros
-#define SET_DIP_DIR()                    {mibspiREG5->PC3 |= DIR_DI_PUMP_SPI5_PORT_MASK;}       ///< Macro for setting the dialysate inlet pump direction pin high.
-#define CLR_DIP_DIR()                    {mibspiREG5->PC3 &= ~DIR_DI_PUMP_SPI5_PORT_MASK;}      ///< Macro for setting the dialysate inlet pump direction pin low.
-#define SET_DIP_STOP()                   gioSetBit( gioPORTA, STOP_DI_PUMP_GIO_PORT_PIN, PIN_SIGNAL_LOW )   ///< Macro for setting the dialysate inlet pump stop pin low.
-#define CLR_DIP_STOP()                   gioSetBit( gioPORTA, STOP_DI_PUMP_GIO_PORT_PIN, PIN_SIGNAL_HIGH )  ///< Macro for setting the dialysate inlet pump stop pin high.
+#define SET_DIP_DIR()                    {mibspiREG5->PC3 |= DIR_DI_PUMP_SPI5_PORT_MASK;}       ///< Macro for setting the dialysate inlet pump direction pin high (forward).
+#define CLR_DIP_DIR()                    {mibspiREG5->PC3 &= ~DIR_DI_PUMP_SPI5_PORT_MASK;}      ///< Macro for setting the dialysate inlet pump direction pin low (reverse).
+#define SET_DIP_STOP()                   gioSetBit( gioPORTA, STOP_DI_PUMP_GIO_PORT_PIN, PIN_SIGNAL_LOW )   ///< Macro for setting the dialysate inlet pump disable pin low (disable).
+#define CLR_DIP_STOP()                   gioSetBit( gioPORTA, STOP_DI_PUMP_GIO_PORT_PIN, PIN_SIGNAL_HIGH )  ///< Macro for setting the dialysate inlet pump disable pin high (enable).
 
 // ********** private data **********
 
Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -rd611c5eeaee076a6fbf79cf94f80fff05fd5d9a9 -r187df13234966f412631385a0bb7e76d1d3b69aa
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision d611c5eeaee076a6fbf79cf94f80fff05fd5d9a9)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 187df13234966f412631385a0bb7e76d1d3b69aa)
@@ -152,10 +152,10 @@
 #define STOP_DO_PUMP_GIO_PORT_PIN               6U           ///< GIO port A pin used for pump controller direction pin.
 #define DOP_ROTOR_HALL_SENSOR_NHET_ID           0x0000000E   ///< NHET pin number associated with DPo rotor hall sensor input
 // Dialysate outlet pump stop and direction macros
-#define SET_DOP_STOP()                          {mibspiREG1->PC3 &= ~STOP_DO_PUMP_MIBSPI1_PORT_MASK;}               ///< Macro sets pump controller run/stop signal to stop.
-#define CLR_DOP_STOP()                          {mibspiREG1->PC3 |= STOP_DO_PUMP_MIBSPI1_PORT_MASK;}                ///< Macro sets pump controller run/stop signal to run.
-#define SET_DOP_DIR()                           gioSetBit( gioPORTA, STOP_DO_PUMP_GIO_PORT_PIN, PIN_SIGNAL_HIGH )   ///< Macro sets pump controller direction to forward direction.
-#define CLR_DOP_DIR()                           gioSetBit( gioPORTA, STOP_DO_PUMP_GIO_PORT_PIN, PIN_SIGNAL_LOW )    ///< Macro sets pump controller direction to reverse direction.
+#define SET_DOP_STOP()                          {mibspiREG1->PC3 &= ~STOP_DO_PUMP_MIBSPI1_PORT_MASK;}               ///< Macro sets pump controller disable signal low (active low).
+#define CLR_DOP_STOP()                          {mibspiREG1->PC3 |= STOP_DO_PUMP_MIBSPI1_PORT_MASK;}                ///< Macro sets pump controller disable signal high (active low).
+#define SET_DOP_DIR()                           gioSetBit( gioPORTA, STOP_DO_PUMP_GIO_PORT_PIN, PIN_SIGNAL_HIGH )   ///< Macro sets pump controller direction to high (forward direction).
+#define CLR_DOP_DIR()                           gioSetBit( gioPORTA, STOP_DO_PUMP_GIO_PORT_PIN, PIN_SIGNAL_LOW )    ///< Macro sets pump controller direction to low (reverse direction).
 
 // ********** private data **********