Index: dialin/hd/alarms.py
===================================================================
diff -u -r65277463eda63686c6132b6716aaa997b6df1861 -r58978bb37c4767cc43fc5e3913dc8095a34e1556
--- dialin/hd/alarms.py	(.../alarms.py)	(revision 65277463eda63686c6132b6716aaa997b6df1861)
+++ dialin/hd/alarms.py	(.../alarms.py)	(revision 58978bb37c4767cc43fc5e3913dc8095a34e1556)
@@ -70,16 +70,16 @@
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.hd_alarm_broadcast_ch_id
-            msg_id = MsgIds.MSG_ID_HD_ALARMS_PUBLISHED_STATUS
+            msg_id = MsgIds.MSG_ID_ALARM_STATUS
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_alarms_status_sync)
 
             channel_id = DenaliChannels.hd_alarm_broadcast_ch_id
-            msg_id = MsgIds.MSG_ID_HD_ALARM_ACTIVATE
+            msg_id = MsgIds.MSG_ID_ALARM_TRIGGERED
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_alarm_activate)
             channel_id = DenaliChannels.hd_alarm_broadcast_ch_id
-            msg_id = MsgIds.MSG_ID_HD_ALARM_CLEAR
+            msg_id = MsgIds.MSG_ID_ALARM_CLEARED
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_alarm_clear)
 
@@ -94,10 +94,10 @@
         self.alarm_states = [False] * 500
 
         self.ids = OrderedDict()
-        for attr in dir(AlarmList):
-            if not callable(getattr(AlarmList, attr)) and attr.startswith("ALARM_ID"):
-                self.ids[attr] = getattr(AlarmList, attr)
-        self.ids = OrderedDict(sorted(self.ids.items(), key=lambda key: key[1].value))
+#        for attr in dir(AlarmList):
+#            if not callable(getattr(AlarmList, attr)) and attr.startswith("ALARM_ID"):
+#                self.ids[attr] = getattr(AlarmList, attr)
+#        self.ids = OrderedDict(sorted(self.ids.items(), key=lambda key: key[1].value))
 
     def get_alarm_states(self):
         """
Index: dialin/hd/blood_flow.py
===================================================================
diff -u -r65277463eda63686c6132b6716aaa997b6df1861 -r58978bb37c4767cc43fc5e3913dc8095a34e1556
--- dialin/hd/blood_flow.py	(.../blood_flow.py)	(revision 65277463eda63686c6132b6716aaa997b6df1861)
+++ dialin/hd/blood_flow.py	(.../blood_flow.py)	(revision 58978bb37c4767cc43fc5e3913dc8095a34e1556)
@@ -42,7 +42,7 @@
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.hd_sync_broadcast_ch_id
-            msg_id = MsgIds.MSG_ID_HD_BLOOD_FLOW_PUBLISHED_DATA
+            msg_id = MsgIds.MSG_ID_BLOOD_FLOW_DATA.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_blood_flow_sync)
 
Index: dialin/hd/dialysate_inlet_flow.py
===================================================================
diff -u -r65277463eda63686c6132b6716aaa997b6df1861 -r58978bb37c4767cc43fc5e3913dc8095a34e1556
--- dialin/hd/dialysate_inlet_flow.py	(.../dialysate_inlet_flow.py)	(revision 65277463eda63686c6132b6716aaa997b6df1861)
+++ dialin/hd/dialysate_inlet_flow.py	(.../dialysate_inlet_flow.py)	(revision 58978bb37c4767cc43fc5e3913dc8095a34e1556)
@@ -42,7 +42,7 @@
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.hd_sync_broadcast_ch_id
-            msg_id = MsgIds.MSG_ID_HD_DIAL_IN_FLOW_PUBLISHED_DATA
+            msg_id = MsgIds.MSG_ID_DIALYSATE_FLOW_DATA.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_dialysate_inlet_flow_sync)
 
Index: dialin/hd/dialysate_outlet_flow.py
===================================================================
diff -u -r65277463eda63686c6132b6716aaa997b6df1861 -r58978bb37c4767cc43fc5e3913dc8095a34e1556
--- dialin/hd/dialysate_outlet_flow.py	(.../dialysate_outlet_flow.py)	(revision 65277463eda63686c6132b6716aaa997b6df1861)
+++ dialin/hd/dialysate_outlet_flow.py	(.../dialysate_outlet_flow.py)	(revision 58978bb37c4767cc43fc5e3913dc8095a34e1556)
@@ -40,7 +40,7 @@
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.hd_sync_broadcast_ch_id
-            msg_id = MsgIds.MSG_ID_HD_DIAL_OUT_FLOW_PUBLISHED_DATA
+            msg_id = MsgIds.MSG_ID_DIALYSATE_OUT_FLOW_DATA.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_dialysate_outlet_flow_sync)
 
Index: dialin/hd/hemodialysis_device.py
===================================================================
diff -u -r65277463eda63686c6132b6716aaa997b6df1861 -r58978bb37c4767cc43fc5e3913dc8095a34e1556
--- dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision 65277463eda63686c6132b6716aaa997b6df1861)
+++ dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision 58978bb37c4767cc43fc5e3913dc8095a34e1556)
@@ -82,7 +82,7 @@
         # register handler for HD operation mode broadcast messages
         if self.can_interface is not None:
             channel_id = DenaliChannels.hd_sync_broadcast_ch_id
-            msg_id = MsgIds.MSG_ID_HD_OPERATION_MODE_BROADCAST
+            msg_id = MsgIds.MSG_ID_HD_OP_MODE
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_hd_op_mode_sync)
 
Index: dialin/hd/treatment.py
===================================================================
diff -u -r65277463eda63686c6132b6716aaa997b6df1861 -r58978bb37c4767cc43fc5e3913dc8095a34e1556
--- dialin/hd/treatment.py	(.../treatment.py)	(revision 65277463eda63686c6132b6716aaa997b6df1861)
+++ dialin/hd/treatment.py	(.../treatment.py)	(revision 58978bb37c4767cc43fc5e3913dc8095a34e1556)
@@ -87,7 +87,7 @@
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.hd_sync_broadcast_ch_id
-            msg_id = MsgIds.MSG_ID_HD_TREATMENT_TIME_PUBLISHED_DATA
+            msg_id = MsgIds.MSG_ID_TREATMENT_TIME.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_treatment_time_sync)
             msg_id = MsgIds.MSG_ID_HD_TREATMENT_STATE_PUBLISHED_DATA