Index: dialin/hd/blood_flow.py
===================================================================
diff -u -r70fb122058d520cbbbe922518d8d50b2dec5e2e4 -r06515ea1c17e2b78da360b78c7919a25deae2e73
--- dialin/hd/blood_flow.py	(.../blood_flow.py)	(revision 70fb122058d520cbbbe922518d8d50b2dec5e2e4)
+++ dialin/hd/blood_flow.py	(.../blood_flow.py)	(revision 06515ea1c17e2b78da360b78c7919a25deae2e73)
@@ -176,7 +176,7 @@
         payload = rst + flo + mod
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_BLOOD_FLOW_SET_RATE_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_BLOOD_FLOW_SET_PT_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override blood flow set point")
@@ -220,7 +220,7 @@
         payload = rst + flo
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_BLOOD_FLOW_MEAS_RATE_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_BLOOD_FLOW_MEAS_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured blood flow")
@@ -260,7 +260,7 @@
         payload = rst + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_BLOOD_PUMP_MC_MEAS_SPEED_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_BLOOD_PUMP_MC_MEAS_SPEED_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured blood pump motor controller speed")
@@ -299,7 +299,7 @@
         payload = rst + cur
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_BLOOD_PUMP_MC_MEAS_CURRENT_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_BLOOD_PUMP_MC_MEAS_CURR_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured blood pump motor controller current")
@@ -339,7 +339,7 @@
         payload = rst + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_BLOOD_PUMP_MEAS_SPEED_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_BLOOD_PUMP_MC_MEAS_SPEED_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured blood pump speed")
@@ -379,7 +379,7 @@
         payload = rst + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_BLOOD_PUMP_ROTOR_MEAS_SPEED_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_BLOOD_PUMP_MEAS_ROTOR_SPEED_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured blood pump rotor speed")
@@ -459,7 +459,7 @@
         payload = rst + mis
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_BLOOD_FLOW_PUBLISH_INTERVAL_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_BLOOD_FLOW_SEND_INTERVAL_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override blood flow broadcast interval")
Index: dialin/hd/dialysate_inlet_flow.py
===================================================================
diff -u -r489e164ebd17d2a6134c4eccd65383928fb8dc63 -r06515ea1c17e2b78da360b78c7919a25deae2e73
--- dialin/hd/dialysate_inlet_flow.py	(.../dialysate_inlet_flow.py)	(revision 489e164ebd17d2a6134c4eccd65383928fb8dc63)
+++ dialin/hd/dialysate_inlet_flow.py	(.../dialysate_inlet_flow.py)	(revision 06515ea1c17e2b78da360b78c7919a25deae2e73)
@@ -85,19 +85,19 @@
         """
         return self.measured_dialysate_inlet_pump_speed
 
-    def get_measured_dialysate_inlet_pump_mc_speed(self):
+    def get_measured_dialysate_inlet_pump_motor_controller_speed(self):
         """
-        Gets the measured dialysate inlet pump mc speed
+        Gets the measured dialysate inlet pump motor controller speed
 
-        @return: the measured dialysate inlet pump mc speed
+        @return: the measured dialysate inlet pump motor controller speed
         """
         return self.measured_dialysate_inlet_pump_mc_speed
 
-    def get_measured_dialysate_inlet_pump_mc_current(self):
+    def get_measured_dialysate_inlet_pump_motor_controller_current(self):
         """
-        Gets the measured dialysate inlet pump mc current
+        Gets the measured dialysate inlet pump motor controller current
 
-        @return: the measured dialysate inlet pump mc current
+        @return: the measured dialysate inlet pump motor controller current
         """
         return self.measured_dialysate_inlet_pump_mc_current
 
@@ -248,7 +248,7 @@
             self.logger.debug("Timeout!!!!")
             return False
 
-    def cmd_dialysate_inlet_pump_mc_measured_speed_override(self, speed, reset=NO_RESET):
+    def cmd_dialysate_inlet_pump_motor_controller_measured_speed_override(self, speed, reset=NO_RESET):
         """
         Constructs and sends the measured dialysate inlet pump motor controller speed \n
         override command.
Index: dialin/hd/dialysate_outlet_flow.py
===================================================================
diff -u -r3116ee473ee0da1ee31f8993e7a055071301c815 -r06515ea1c17e2b78da360b78c7919a25deae2e73
--- dialin/hd/dialysate_outlet_flow.py	(.../dialysate_outlet_flow.py)	(revision 3116ee473ee0da1ee31f8993e7a055071301c815)
+++ dialin/hd/dialysate_outlet_flow.py	(.../dialysate_outlet_flow.py)	(revision 06515ea1c17e2b78da360b78c7919a25deae2e73)
@@ -82,27 +82,27 @@
         """
         return self.measured_dialysate_outlet_pump_speed
 
-    def get_measured_dialysate_outlet_pump_mc_speed(self):
+    def get_measured_dialysate_outlet_pump_motor_controller_speed(self):
         """
-        Gets the measured dialysate outlet pump mc speed
+        Gets the measured dialysate outlet pump motor controller speed
 
-        @return: the measured dialysate outlet pump mc speed
+        @return: the measured dialysate outlet pump motor controller speed
         """
         return self.measured_dialysate_outlet_pump_mc_speed
 
-    def get_measured_dialysate_outlet_pump_mc_current(self):
+    def get_measured_dialysate_outlet_pump_motor_controller_current(self):
         """
-        Gets the measured dialysate outlet pump mc current
+        Gets the measured dialysate outlet pump motor controller current
 
-        @return: Gets the measured dialysate outlet pump mc current
+        @return: Gets the measured dialysate outlet pump motor controller current
         """
         return self.measured_dialysate_outlet_pump_mc_current
 
     def get_pwm_duty_cycle_pct(self):
         """
-        Gets the pwm duty cycle pct
+        Gets the pwm duty cycle percent
 
-        @return: the pwm duty cycle pct
+        @return: the pwm duty cycle percent
         """
         return self.pwm_duty_cycle_pct
 
@@ -273,9 +273,9 @@
             self.logger.debug("Timeout!!!!")
             return False
 
-    def cmd_dialysate_outlet_pump_mc_measured_speed_override(self, speed, reset=NO_RESET):
+    def cmd_dialysate_outlet_pump_motor_controller_measured_speed_override(self, speed, reset=NO_RESET):
         """
-        Constructs and sends the measured dialysate outlet pump motor controller speed \n
+        Constructs and sends the measured dialysate outlet pump motor controller measured speed \n
         override command.
         Constraints:
             Must be logged into HD.