Index: dialin/hd/dialysate_outlet_flow.py
===================================================================
diff -u -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 -r3116ee473ee0da1ee31f8993e7a055071301c815
--- dialin/hd/dialysate_outlet_flow.py	(.../dialysate_outlet_flow.py)	(revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4)
+++ dialin/hd/dialysate_outlet_flow.py	(.../dialysate_outlet_flow.py)	(revision 3116ee473ee0da1ee31f8993e7a055071301c815)
@@ -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_SET_PT_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.")
@@ -449,7 +449,7 @@
         payload = rst + mis
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_DIAL_OUT_FLOW_PUBLISH_INTERVAL_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_DIAL_IN_FLOW_SEND_INTERVAL_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override dialysate outlet flow broadcast interval to " + str(ms) + " ms.")
@@ -497,7 +497,7 @@
         payload = rst + spd + sen
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_DIAL_OUT_LOAD_CELL_WEIGHT_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_DIAL_OUT_LOAD_CELL_WEIGHT_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured load cell weight to " + str(weight) + " grams for load cell # " + str(sensor))