Index: dialin/hd/blood_flow.py
===================================================================
diff -u -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 -r0b0c4e54daebd92984808ca943981cccf26bb318
--- dialin/hd/blood_flow.py	(.../blood_flow.py)	(revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4)
+++ dialin/hd/blood_flow.py	(.../blood_flow.py)	(revision 0b0c4e54daebd92984808ca943981cccf26bb318)
@@ -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_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 -raa82eecbb273ad3d797b6148c470f31ec2baf762 -r0b0c4e54daebd92984808ca943981cccf26bb318
--- dialin/hd/dialysate_inlet_flow.py	(.../dialysate_inlet_flow.py)	(revision aa82eecbb273ad3d797b6148c470f31ec2baf762)
+++ dialin/hd/dialysate_inlet_flow.py	(.../dialysate_inlet_flow.py)	(revision 0b0c4e54daebd92984808ca943981cccf26bb318)
@@ -183,7 +183,7 @@
         payload = rst + flo + mod
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_DIAL_IN_FLOW_SET_RATE_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_DIAL_IN_FLOW_SET_PT_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override dialysate flow set point")
@@ -227,7 +227,7 @@
         payload = rst + flo
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_DIAL_IN_FLOW_MEAS_RATE_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_DIAL_IN_FLOW_MEAS_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured dialysate flow")
@@ -267,7 +267,7 @@
         payload = rst + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_DIAL_IN_PUMP_MC_MEAS_SPEED_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_DIAL_IN_PUMP_MC_MEAS_SPEED_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured dialysate inlet pump motor controller speed")
@@ -306,7 +306,7 @@
         payload = rst + cur
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_DIAL_IN_PUMP_MC_MEAS_CURRENT_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_DIAL_IN_PUMP_MC_MEAS_CURR_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured dialysate inlet pump motor controller current")
@@ -346,7 +346,7 @@
         payload = rst + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_DIAL_IN_PUMP_MEAS_SPEED_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_DIAL_IN_PUMP_MEAS_SPEED_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured dialysate inlet pump speed")
@@ -386,7 +386,7 @@
         payload = rst + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_DIAL_IN_PUMP_ROTOR_MEAS_SPEED_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_DIAL_IN_PUMP_MEAS_ROTOR_SPEED_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured dialysate inlet pump rotor speed")
@@ -466,7 +466,7 @@
         payload = rst + mis
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_DIAL_IN_FLOW_PUBLISH_INTERVAL_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_DIAL_IN_FLOW_SEND_INTERVAL_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override dialysate inlet flow broadcast interval")
Index: dialin/hd/dialysate_outlet_flow.py
===================================================================
diff -u -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 -r0b0c4e54daebd92984808ca943981cccf26bb318
--- dialin/hd/dialysate_outlet_flow.py	(.../dialysate_outlet_flow.py)	(revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4)
+++ dialin/hd/dialysate_outlet_flow.py	(.../dialysate_outlet_flow.py)	(revision 0b0c4e54daebd92984808ca943981cccf26bb318)
@@ -166,7 +166,7 @@
         payload = rst + flo + mod
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_DIAL_OUT_FLOW_SET_RATE_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_DIAL_OUT_FLOW_SEND_INTERVAL_OVERRIDE.value,
                                               payload=payload)
 
         print("override dialysate outlet pump set point")
@@ -210,7 +210,7 @@
         payload = rst + vol
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_DIAL_OUT_UF_REF_VOLUME_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_DIAL_OUT_UF_REF_VOLUME_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override UF reference volume with " + str(refvol) + "mL.")
@@ -250,7 +250,7 @@
         payload = rst + vol
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_DIAL_OUT_UF_MEAS_VOLUME_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_DIAL_OUT_UF_MEAS_VOLUME_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured UF volume with " + str(measvol) + " mL.")
@@ -329,7 +329,7 @@
         payload = rst + cur
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_DIAL_OUT_PUMP_MC_MEAS_CURRENT_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_DIAL_OUT_PUMP_MC_MEAS_CURR_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured dialysate outlet pump motor controller current")
@@ -369,7 +369,7 @@
         payload = rst + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_DIAL_OUT_PUMP_MEAS_SPEED_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_DIAL_OUT_PUMP_MEAS_SPEED_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured dialysate outlet pump speed to " + str(speed) + " RPM.")
@@ -409,7 +409,7 @@
         payload = rst + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_DIAL_OUT_PUMP_ROTOR_MEAS_SPEED_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_DIAL_OUT_PUMP_MEAS_ROTOR_SPEED_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured dialysate outlet pump rotor speed to " + str(speed) + " RPM.")