Index: dialin/dg/alarms.py
===================================================================
diff -u -rd490b41a0158d5d0f97b3c1c646c7045bfc4db27 -r912a57cb9d300f872aa771ffe2a197e87aaff4d6
--- dialin/dg/alarms.py	(.../alarms.py)	(revision d490b41a0158d5d0f97b3c1c646c7045bfc4db27)
+++ dialin/dg/alarms.py	(.../alarms.py)	(revision 912a57cb9d300f872aa771ffe2a197e87aaff4d6)
@@ -22,18 +22,14 @@
 import struct
 from logging import Logger
 from ..common.alarm_defs import AlarmList
+from ..common.msg_defs import MsgIds
 
 
 class DGAlarms(_AbstractSubSystem):
     """
     DG interface containing alarm related commands.
     """
 
-    # alarms message IDs
-    MSG_ID_ALARM_ACTIVATE = 0x0003
-    MSG_ID_ALARM_CLEAR = 0x0004
-    MSG_ID_DG_ALARM_STATE_OVERRIDE = 0xA001
-
     START_POS_ALARM_ID = DenaliMessage.PAYLOAD_START_INDEX
     END_POS_ALARM_ID = START_POS_ALARM_ID + 2
 
@@ -47,11 +43,11 @@
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.dg_alarm_broadcast_ch_id
-            msg_id = self.MSG_ID_ALARM_ACTIVATE
+            msg_id = MsgIds.MSG_ID_ALARM_TRIGGERED.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_alarm_activate)
 
             channel_id = DenaliChannels.dg_alarm_broadcast_ch_id
-            msg_id = self.MSG_ID_ALARM_CLEAR
+            msg_id = MsgIds.MSG_ID_ALARM_CLEARED.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_alarm_clear)
 
         # alarm states based on received DG alarm activation and alarm clear messages
@@ -131,7 +127,7 @@
         payload = rst + sta + alm
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
-                                              message_id=self.MSG_ID_DG_ALARM_STATE_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_DG_ALARM_STATE_OVERRIDE.value,
                                               payload=payload)
 
         # Send message
Index: dialin/dg/dialysate_generator.py
===================================================================
diff -u -rd490b41a0158d5d0f97b3c1c646c7045bfc4db27 -r912a57cb9d300f872aa771ffe2a197e87aaff4d6
--- dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision d490b41a0158d5d0f97b3c1c646c7045bfc4db27)
+++ dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision 912a57cb9d300f872aa771ffe2a197e87aaff4d6)
@@ -25,10 +25,7 @@
 from .heaters import Heaters
 from .temperature_sensors import TemperatureSensors
 from .conductivity_sensors import ConductivitySensors
-from ..protocols.CAN import (DenaliCanMessenger,
-                             DenaliMessage,
-                             DenaliChannels)
-
+from ..protocols.CAN import (DenaliCanMessenger, DenaliMessage, DenaliChannels)
 from ..utils.base import _AbstractSubSystem, _publish, _LogManager