Index: leahi_dialin/common/td_defs.py
===================================================================
diff -u -r2a8cf0f2bb60b82bf059519526e0b15cd08af022 -r28a21f1f2ca4ef02e6d54bae30b738fddb7bdb3a
--- leahi_dialin/common/td_defs.py	(.../td_defs.py)	(revision 2a8cf0f2bb60b82bf059519526e0b15cd08af022)
+++ leahi_dialin/common/td_defs.py	(.../td_defs.py)	(revision 28a21f1f2ca4ef02e6d54bae30b738fddb7bdb3a)
@@ -972,6 +972,7 @@
     'NUM_OF_AIR_PUMP_ATTRIBUTES': [],
 }
 
+
 class TDAirPumpStates(DialinEnum):
     AIR_PUMP_STATE_INIT     = 0                                 # Air Pump Initialize state
     AIR_PUMP_STATE_OFF      = 1                                 # Air Pump Off state
@@ -1135,23 +1136,37 @@
 
 # Syringe pump operations
 @unique
-class SyringePumpOperations(DialinEnum):
+class TDSyringePumpStates(DialinEnum):
     SYRINGE_PUMP_OP_STOP       = 0                              # Stop syringe pump
     SYRINGE_PUMP_OP_RETRACT    = 1                              # Retract syringe pump
     SYRINGE_PUMP_OP_SEEK       = 2                              # Seek plunger
     SYRINGE_PUMP_OP_PRIME      = 3                              # Prime Heparin line
     SYRINGE_PUMP_OP_BOLUS      = 4                              # Deliver Heparin bolus of set volume over 5 minutes
     SYRINGE_PUMP_OP_CONTINUOUS = 5                              # Continuous dispense of Heparin at set rate
     SYRINGE_PUMP_OP_PRELOAD    = 6                              # Preload syringe pump
+    NUM_OF_SYRINGE_PUMP_STATES = 7                              # Number of Syringe pump States
 
+TDSyringePumpStates._str_list = {
+    # Official Name :       Accepted strings
+    'SYRINGE_PUMP_OP_STOP': ['stop'],
+    'SYRINGE_PUMP_OP_RETRACT': ['retract'],
+    'SYRINGE_PUMP_OP_SEEK': ['seek'],
+    'SYRINGE_PUMP_OP_PRIME': ['prime'],
+    'SYRINGE_PUMP_OP_BOLUS': ['bolus'],
+    'SYRINGE_PUMP_OP_CONTINUOUS': ['continuous'],
+    'SYRINGE_PUMP_OP_PRELOAD': ['preload'],
+    'NUM_OF_SYRINGE_PUMP_STATES': [],
+}
+
+
 @unique
 class TDValvePositions(DialinEnum):
     VALVE_POSITION_NOT_IN_POSITION  = 0                         # Valve not in Position
     VALVE_POSITION_A_INSERT_LOAD    = 1                         # Insert/Eject Valve Position
     VALVE_POSITION_B_OPEN_BLOOD     = 2                         # Open Valve Position
     VALVE_POSITION_C_CLOSE_SALINE   = 3                         # Closed Valve Position
     VALVE_POSITION_C_PARTIAL_CLOSE  = 4                         # Partial Close Valve Position
-    NUM_OF_VALVE_POSITIONS          = 5                         # Partial Close Valve Position
+    NUM_OF_VALVE_POSITIONS          = 5                         # Number of Valve Positions
 
 TDValvePositions._str_list = {
     # Official Name :       Accepted strings
Index: leahi_dialin/dd/modules/records.py
===================================================================
diff -u -rf65ed90f5f8af7672ae59bc5450d1a4f8935d041 -r28a21f1f2ca4ef02e6d54bae30b738fddb7bdb3a
--- leahi_dialin/dd/modules/records.py	(.../records.py)	(revision f65ed90f5f8af7672ae59bc5450d1a4f8935d041)
+++ leahi_dialin/dd/modules/records.py	(.../records.py)	(revision 28a21f1f2ca4ef02e6d54bae30b738fddb7bdb3a)
@@ -22,7 +22,7 @@
 # Project imports
 from leahi_dialin.common import dd_enum_repository, disp_enum_repository, fp_enum_repository
 from leahi_dialin.common.generic_defs import DataTypes
-from leahi_dialin.common.msg_defs import MsgIds
+from leahi_dialin.common.msg_ids import MsgIds
 from leahi_dialin.common.override_templates import cmd_generic_override
 from leahi_dialin.protocols.CAN import CanMessenger, CanChannels
 from leahi_dialin.utils.abstract_classes import AbstractSubSystem
Index: leahi_dialin/td/modules/records.py
===================================================================
diff -u -re3c60dd439b2f996b0392951fd4461e8e37b8692 -r28a21f1f2ca4ef02e6d54bae30b738fddb7bdb3a
--- leahi_dialin/td/modules/records.py	(.../records.py)	(revision e3c60dd439b2f996b0392951fd4461e8e37b8692)
+++ leahi_dialin/td/modules/records.py	(.../records.py)	(revision 28a21f1f2ca4ef02e6d54bae30b738fddb7bdb3a)
@@ -22,7 +22,7 @@
 # Project imports
 from leahi_dialin.common import td_enum_repository
 from leahi_dialin.common.generic_defs import DataTypes
-from leahi_dialin.common.msg_defs import MsgIds
+from leahi_dialin.common.msg_ids import MsgIds
 from leahi_dialin.common.override_templates import cmd_generic_override
 from leahi_dialin.protocols.CAN import CanMessenger, CanChannels
 from leahi_dialin.utils.abstract_classes import AbstractSubSystem
Index: leahi_dialin/td/modules/syringe_pump.py
===================================================================
diff -u -r3f4937e339925dde0b95f08e49969f8983c5cba4 -r28a21f1f2ca4ef02e6d54bae30b738fddb7bdb3a
--- leahi_dialin/td/modules/syringe_pump.py	(.../syringe_pump.py)	(revision 3f4937e339925dde0b95f08e49969f8983c5cba4)
+++ leahi_dialin/td/modules/syringe_pump.py	(.../syringe_pump.py)	(revision 28a21f1f2ca4ef02e6d54bae30b738fddb7bdb3a)
@@ -20,7 +20,7 @@
 # Project imports
 from leahi_dialin.common.constants import RESET, NO_RESET
 from leahi_dialin.common.generic_defs import DataTypes
-from leahi_dialin.common.td_defs import TDTreaHeparinStates, TDTreaSyringePumpStates, SyringePumpOperations
+from leahi_dialin.common.td_defs import TDTreaHeparinStates, TDTreaSyringePumpStates, TDSyringePumpStates
 from leahi_dialin.common.msg_ids import MsgIds
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
 from leahi_dialin.protocols.CAN import CanMessenger, CanChannels
@@ -276,7 +276,7 @@
 
 
 # ============================================================ Overrides and Requests ============================================================
-    def cmd_syringe_pump_operation(self, operation: int = SyringePumpOperations.SYRINGE_PUMP_OP_STOP.value,
+    def cmd_syringe_pump_operation(self, operation: int = TDSyringePumpStates.SYRINGE_PUMP_OP_STOP.value,
                                    rate: float = 0.0,
                                    volume: float = 0.0) -> int:
         """