diff --git a/eive_tmtc/pus_tc/devs/bpx_batt.py b/eive_tmtc/pus_tc/devs/bpx_batt.py
index 2258021..c974fe2 100644
--- a/eive_tmtc/pus_tc/devs/bpx_batt.py
+++ b/eive_tmtc/pus_tc/devs/bpx_batt.py
@@ -11,7 +11,7 @@ from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
 from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
 from tmtccmd.tc.pus_3_fsfw_hk import generate_one_hk_command, make_sid
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes
+from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode
 from tmtccmd.tc.pus_200_fsfw_modes import Subservices as ModeSubservices
 
 
@@ -66,7 +66,7 @@ def pack_bpx_commands(p: ServiceProviderParams):
         q.add_pus_tc(generate_one_hk_command(sid=sid))
     if op_code in BpxOpCode.OFF:
         q.add_log_cmd("Off mode")
-        mode_cmd = pack_mode_data(BPX_HANDLER_ID, Modes.OFF, 0)
+        mode_cmd = pack_mode_data(BPX_HANDLER_ID, Mode.OFF, 0)
         q.add_pus_tc(
             PusTelecommand(
                 service=200,
@@ -76,7 +76,7 @@ def pack_bpx_commands(p: ServiceProviderParams):
         )
     if op_code in BpxOpCode.ON:
         q.add_log_cmd("On mode")
-        mode_cmd = pack_mode_data(BPX_HANDLER_ID, Modes.ON, 0)
+        mode_cmd = pack_mode_data(BPX_HANDLER_ID, Mode.ON, 0)
         q.add_pus_tc(
             PusTelecommand(
                 service=200,
diff --git a/eive_tmtc/pus_tc/devs/plpcdu.py b/eive_tmtc/pus_tc/devs/plpcdu.py
index ee13348..72db431 100644
--- a/eive_tmtc/pus_tc/devs/plpcdu.py
+++ b/eive_tmtc/pus_tc/devs/plpcdu.py
@@ -18,7 +18,7 @@ from tmtccmd.tc.pus_11_tc_sched import (
     generate_enable_tc_sched_cmd,
     generate_time_tagged_cmd,
 )
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes, Subservices
+from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode, Subservices
 from tmtccmd.tc.pus_20_params import (
     pack_scalar_double_param_app_data,
     pack_fsfw_load_param_cmd,
@@ -161,9 +161,9 @@ def add_pl_pcdu_cmds(defs: TmtcDefinitionWrapper):
 
 def pack_pl_pcdu_commands(q: DefaultPusQueueHelper, op_code: str):
     if op_code in OpCode.SWITCH_ON:
-        pack_pl_pcdu_mode_cmd(q=q, info=Info.SWITCH_ON, mode=Modes.ON, submode=0)
+        pack_pl_pcdu_mode_cmd(q=q, info=Info.SWITCH_ON, mode=Mode.ON, submode=0)
     if op_code in OpCode.SWITCH_OFF:
-        pack_pl_pcdu_mode_cmd(q=q, info=Info.SWITCH_OFF, mode=Modes.OFF, submode=0)
+        pack_pl_pcdu_mode_cmd(q=q, info=Info.SWITCH_OFF, mode=Mode.OFF, submode=0)
     if op_code in OpCode.ENABLE_HK:
         interval = float(
             input("Please enter HK collection interval in floating point seconds: ")
@@ -184,7 +184,7 @@ def pack_pl_pcdu_commands(q: DefaultPusQueueHelper, op_code: str):
         pack_pl_pcdu_mode_cmd(
             q=q,
             info=Info.NORMAL_SSR,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
             submode=submode_mask_to_submode(
                 NormalSubmodesMask.SOLID_STATE_RELAYS_ADC_ON
             ),
@@ -193,35 +193,35 @@ def pack_pl_pcdu_commands(q: DefaultPusQueueHelper, op_code: str):
         pack_pl_pcdu_mode_cmd(
             q=q,
             info=Info.NORMAL_DRO,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
             submode=submode_mask_to_submode(NormalSubmodesMask.DRO_ON),
         )
     if op_code in OpCode.NORMAL_X8:
         pack_pl_pcdu_mode_cmd(
             q=q,
             info=Info.NORMAL_X8,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
             submode=submode_mask_to_submode(NormalSubmodesMask.X8_ON),
         )
     if op_code in OpCode.NORMAL_TX:
         pack_pl_pcdu_mode_cmd(
             q=q,
             info=Info.NORMAL_TX,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
             submode=submode_mask_to_submode(NormalSubmodesMask.TX_ON),
         )
     if op_code in OpCode.NORMAL_MPA:
         pack_pl_pcdu_mode_cmd(
             q=q,
             info=Info.NORMAL_MPA,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
             submode=submode_mask_to_submode(NormalSubmodesMask.MPA_ON),
         )
     if op_code in OpCode.NORMAL_HPA:
         pack_pl_pcdu_mode_cmd(
             q=q,
             info=Info.NORMAL_HPA,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
             submode=submode_mask_to_submode(NormalSubmodesMask.HPA_ON),
         )
     if op_code in OpCode.REQ_OS_HK:
@@ -252,14 +252,14 @@ def hpa_on_procedure(q: DefaultPusQueueHelper):
     pl_pcdu_on = PusTelecommand(
         service=200,
         subservice=Subservices.TC_MODE_COMMAND,
-        app_data=pack_mode_data(object_id=PL_PCDU_ID, mode=Modes.ON, submode=0),
+        app_data=pack_mode_data(object_id=PL_PCDU_ID, mode=Mode.ON, submode=0),
     )
     ssr_on = PusTelecommand(
         service=200,
         subservice=Subservices.TC_MODE_COMMAND,
         app_data=pack_mode_data(
             object_id=PL_PCDU_ID,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
             submode=submode_mask_to_submode(
                 NormalSubmodesMask.SOLID_STATE_RELAYS_ADC_ON
             ),
@@ -270,7 +270,7 @@ def hpa_on_procedure(q: DefaultPusQueueHelper):
         subservice=Subservices.TC_MODE_COMMAND,
         app_data=pack_mode_data(
             object_id=PL_PCDU_ID,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
             submode=submode_mask_to_submode(NormalSubmodesMask.DRO_ON),
         ),
     )
@@ -279,7 +279,7 @@ def hpa_on_procedure(q: DefaultPusQueueHelper):
         subservice=Subservices.TC_MODE_COMMAND,
         app_data=pack_mode_data(
             object_id=PL_PCDU_ID,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
             submode=submode_mask_to_submode(NormalSubmodesMask.X8_ON),
         ),
     )
@@ -288,7 +288,7 @@ def hpa_on_procedure(q: DefaultPusQueueHelper):
         subservice=Subservices.TC_MODE_COMMAND,
         app_data=pack_mode_data(
             object_id=PL_PCDU_ID,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
             submode=submode_mask_to_submode(NormalSubmodesMask.TX_ON),
         ),
     )
@@ -297,7 +297,7 @@ def hpa_on_procedure(q: DefaultPusQueueHelper):
         subservice=Subservices.TC_MODE_COMMAND,
         app_data=pack_mode_data(
             object_id=PL_PCDU_ID,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
             submode=submode_mask_to_submode(NormalSubmodesMask.MPA_ON),
         ),
     )
@@ -306,7 +306,7 @@ def hpa_on_procedure(q: DefaultPusQueueHelper):
         subservice=Subservices.TC_MODE_COMMAND,
         app_data=pack_mode_data(
             object_id=PL_PCDU_ID,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
             submode=submode_mask_to_submode(NormalSubmodesMask.HPA_ON),
         ),
     )
@@ -439,7 +439,7 @@ def pack_failure_injection_cmd(q: DefaultPusQueueHelper, param_id: int, print_st
 
 
 def pack_pl_pcdu_mode_cmd(
-    q: DefaultPusQueueHelper, info: str, mode: Modes, submode: int
+    q: DefaultPusQueueHelper, info: str, mode: Mode, submode: int
 ):
     q.add_log_cmd(info)
     mode_data = pack_mode_data(object_id=PL_PCDU_ID, mode=mode, submode=submode)
diff --git a/eive_tmtc/pus_tc/devs/rad_sensor.py b/eive_tmtc/pus_tc/devs/rad_sensor.py
index d42c10e..74eecb8 100644
--- a/eive_tmtc/pus_tc/devs/rad_sensor.py
+++ b/eive_tmtc/pus_tc/devs/rad_sensor.py
@@ -10,7 +10,7 @@ import struct
 from eive_tmtc.config.definitions import CustomServiceList
 
 from spacepackets.ecss.tc import PusTelecommand
-from eive_tmtc.pus_tc.service_200_mode import pack_mode_data, Modes
+from eive_tmtc.pus_tc.service_200_mode import pack_mode_data, Mode
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import DefaultPusQueueHelper
@@ -69,11 +69,11 @@ def pack_rad_sensor_test_into(
     q.add_log_cmd(f"Commanding Radiation sensor handler {object_id}")
 
     if op_code in OpCode.ON:
-        rad_sensor_mode_cmd(object_id, Modes.ON, Info.ON, q)
+        rad_sensor_mode_cmd(object_id, Mode.ON, Info.ON, q)
     if op_code in OpCode.NORMAL:
-        rad_sensor_mode_cmd(object_id, Modes.NORMAL, Info.NORMAL, q)
+        rad_sensor_mode_cmd(object_id, Mode.NORMAL, Info.NORMAL, q)
     if op_code in OpCode.OFF:
-        rad_sensor_mode_cmd(object_id, Modes.OFF, Info.OFF, q)
+        rad_sensor_mode_cmd(object_id, Mode.OFF, Info.OFF, q)
     if op_code in OpCode.REQ_HK_ONCE:
         q.add_log_cmd(f"Rad sensor: {Info.REQ_OS_HK}")
         q.add_pus_tc(
@@ -90,7 +90,7 @@ def pack_rad_sensor_test_into(
 
 
 def rad_sensor_mode_cmd(
-    object_id: ObjectIdU32, mode: Modes, info: str, q: DefaultPusQueueHelper
+    object_id: ObjectIdU32, mode: Mode, info: str, q: DefaultPusQueueHelper
 ):
     q.add_log_cmd(f"Rad sensor: {info}")
     mode_data = pack_mode_data(object_id.as_bytes, mode, 0)
diff --git a/eive_tmtc/pus_tc/devs/rtd.py b/eive_tmtc/pus_tc/devs/rtd.py
index e62869f..0b33bd2 100644
--- a/eive_tmtc/pus_tc/devs/rtd.py
+++ b/eive_tmtc/pus_tc/devs/rtd.py
@@ -8,7 +8,7 @@ from tmtccmd.config.tmtc import tmtc_definitions_provider
 
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.util import ObjectIdU32
-from tmtccmd.tc.pus_200_fsfw_modes import Modes, pack_mode_data, Subservices
+from tmtccmd.tc.pus_200_fsfw_modes import Mode, pack_mode_data, Subservices
 import eive_tmtc.config.object_ids as oids
 from eive_tmtc.config.object_ids import get_object_ids
 
@@ -68,9 +68,7 @@ def pack_rtd_commands(
         object_id_dict = get_object_ids()
         object_id = object_id_dict.get(RTD_IDS[tgt_rtd_idx])
     if op_code in OpCode.ON:
-        app_data = pack_mode_data(
-            object_id=object_id.as_bytes, mode=Modes.ON, submode=0
-        )
+        app_data = pack_mode_data(object_id=object_id.as_bytes, mode=Mode.ON, submode=0)
         q.add_pus_tc(
             PusTelecommand(
                 service=200, subservice=Subservices.TC_MODE_COMMAND, app_data=app_data
@@ -78,7 +76,7 @@ def pack_rtd_commands(
         )
     if op_code in OpCode.NORMAL:
         app_data = pack_mode_data(
-            object_id=object_id.as_bytes, mode=Modes.NORMAL, submode=0
+            object_id=object_id.as_bytes, mode=Mode.NORMAL, submode=0
         )
         q.add_pus_tc(
             PusTelecommand(
@@ -87,7 +85,7 @@ def pack_rtd_commands(
         )
     if op_code in OpCode.OFF:
         app_data = pack_mode_data(
-            object_id=object_id.as_bytes, mode=Modes.OFF, submode=0
+            object_id=object_id.as_bytes, mode=Mode.OFF, submode=0
         )
         q.add_pus_tc(
             PusTelecommand(
diff --git a/eive_tmtc/pus_tc/devs/scex.py b/eive_tmtc/pus_tc/devs/scex.py
index 871b5b7..a5e1974 100644
--- a/eive_tmtc/pus_tc/devs/scex.py
+++ b/eive_tmtc/pus_tc/devs/scex.py
@@ -5,7 +5,7 @@ from spacepackets.ecss import PusTelecommand
 
 from eive_tmtc.config.definitions import CustomServiceList
 from tmtccmd.config.tmtc import tmtc_definitions_provider
-from tmtccmd.tc.pus_200_fsfw_modes import Modes, pack_mode_data, Subservices
+from tmtccmd.tc.pus_200_fsfw_modes import Mode, pack_mode_data, Subservices
 from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
 from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
@@ -84,7 +84,7 @@ def pack_scex_cmds(p: ServiceProviderParams):
             PusTelecommand(
                 service=200,
                 subservice=Subservices.TC_MODE_COMMAND,
-                app_data=pack_mode_data(SCEX_HANDLER_ID, Modes.ON, 0),
+                app_data=pack_mode_data(SCEX_HANDLER_ID, Mode.ON, 0),
             )
         )
     if op_code in OpCode.SWITCH_OFF:
@@ -93,7 +93,7 @@ def pack_scex_cmds(p: ServiceProviderParams):
             PusTelecommand(
                 service=200,
                 subservice=Subservices.TC_MODE_COMMAND,
-                app_data=pack_mode_data(SCEX_HANDLER_ID, Modes.OFF, 0),
+                app_data=pack_mode_data(SCEX_HANDLER_ID, Mode.OFF, 0),
             )
         )
     if op_code in OpCode.PING:
diff --git a/eive_tmtc/pus_tc/devs/star_tracker.py b/eive_tmtc/pus_tc/devs/star_tracker.py
index cf86ad1..167595f 100644
--- a/eive_tmtc/pus_tc/devs/star_tracker.py
+++ b/eive_tmtc/pus_tc/devs/star_tracker.py
@@ -9,7 +9,7 @@ import enum
 import struct
 
 from spacepackets.ecss.tc import PusTelecommand
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes
+from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode
 from tmtccmd.logging import get_console_logger
 
 from tmtccmd.tc import DefaultPusQueueHelper
@@ -164,23 +164,23 @@ def pack_star_tracker_commands(
     obyt = object_id.as_bytes
     if op_code == "0":
         q.add_log_cmd("Star tracker: Mode On, Submode Bootloader")
-        data = pack_mode_data(obyt, Modes.ON, Submode.BOOTLOADER)
+        data = pack_mode_data(obyt, Mode.ON, Submode.BOOTLOADER)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
     if op_code == "1":
         q.add_log_cmd("Star tracker: Mode On, Submode Firmware")
-        data = pack_mode_data(obyt, Modes.ON, Submode.FIRMWARE)
+        data = pack_mode_data(obyt, Mode.ON, Submode.FIRMWARE)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
     if op_code == "2":
         q.add_log_cmd("Star tracker: Mode Normal")
-        data = pack_mode_data(obyt, Modes.NORMAL, 0)
+        data = pack_mode_data(obyt, Mode.NORMAL, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
     if op_code == "3":
         q.add_log_cmd("Star tracker: Mode Off")
-        data = pack_mode_data(obyt, Modes.OFF, 0)
+        data = pack_mode_data(obyt, Mode.OFF, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
     if op_code == "4":
         q.add_log_cmd("Star tracker: Mode Raw")
-        data = pack_mode_data(obyt, Modes.RAW, 0)
+        data = pack_mode_data(obyt, Mode.RAW, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
     if op_code == "5":
         q.add_log_cmd("Star tracker: Ping")
diff --git a/eive_tmtc/pus_tc/devs/syrlinks_hk_handler.py b/eive_tmtc/pus_tc/devs/syrlinks_hk_handler.py
index bf9d03f..84cd894 100644
--- a/eive_tmtc/pus_tc/devs/syrlinks_hk_handler.py
+++ b/eive_tmtc/pus_tc/devs/syrlinks_hk_handler.py
@@ -16,7 +16,7 @@ from tmtccmd.config.tmtc import (
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.tc.pus_3_fsfw_hk import make_sid, generate_one_hk_command
 from spacepackets.ecss.tc import PusTelecommand
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes
+from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode
 import struct
 
 from tmtccmd.util import ObjectIdU32
@@ -100,15 +100,15 @@ def pack_syrlinks_command(
     q.add_log_cmd(f"Testing Syrlinks with object id: {object_id.as_hex_string}")
     if op_code == OpCode.OFF:
         q.add_log_cmd(f"{prefix}: Set mode off")
-        data = pack_mode_data(obyt, Modes.OFF, 0)
+        data = pack_mode_data(obyt, Mode.OFF, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
     if op_code == OpCode.ON:
         q.add_log_cmd(f"{prefix}: Set mode on")
-        data = pack_mode_data(obyt, Modes.ON, 0)
+        data = pack_mode_data(obyt, Mode.ON, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
     if op_code == OpCode.NORMAL:
         q.add_log_cmd(f"{prefix}: Mode Normal")
-        data = pack_mode_data(obyt, Modes.NORMAL, 0)
+        data = pack_mode_data(obyt, Mode.NORMAL, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
     if op_code == OpCode.STANDBY:
         q.add_log_cmd(f"{prefix}: Set TX mode standby")
diff --git a/eive_tmtc/pus_tc/devs/tmp1075.py b/eive_tmtc/pus_tc/devs/tmp1075.py
index d9139ff..0f6f403 100644
--- a/eive_tmtc/pus_tc/devs/tmp1075.py
+++ b/eive_tmtc/pus_tc/devs/tmp1075.py
@@ -8,7 +8,7 @@
 from spacepackets.ecss.tc import PusTelecommand
 from eive_tmtc.pus_tc.service_200_mode import pack_mode_data
 from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_200_fsfw_modes import Modes
+from tmtccmd.tc.pus_200_fsfw_modes import Mode
 from tmtccmd.util import ObjectIdU32
 
 
@@ -51,12 +51,12 @@ def pack_tmp1075_test_into(
 
     if Tmp1075TestProcedure.set_mode_normal:
         q.add_log_cmd("TMP1075: Set Mode Normal")
-        mode_data = pack_mode_data(obyt, Modes.NORMAL, 0)
+        mode_data = pack_mode_data(obyt, Mode.NORMAL, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=mode_data))
 
     if Tmp1075TestProcedure.set_mode_on:
         q.add_log_cmd("TMP1075: Set Mode On")
-        mode_data = pack_mode_data(obyt, Modes.ON, 0)
+        mode_data = pack_mode_data(obyt, Mode.ON, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=mode_data))
 
     return q
diff --git a/eive_tmtc/pus_tc/service_200_mode.py b/eive_tmtc/pus_tc/service_200_mode.py
index 3158af0..a13eb6b 100644
--- a/eive_tmtc/pus_tc/service_200_mode.py
+++ b/eive_tmtc/pus_tc/service_200_mode.py
@@ -7,7 +7,7 @@
 """
 from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes
+from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode
 from eive_tmtc.config.object_ids import TEST_DEVICE_ID
 
 TEST_DEVICE_OBJ_ID = TEST_DEVICE_ID
@@ -19,17 +19,17 @@ def pack_service_200_test_into(q: DefaultPusQueueHelper):
     obj_id = TEST_DEVICE_OBJ_ID
     # Set On Mode
     q.add_log_cmd("Testing Service 200: Set Mode On")
-    mode_data = pack_mode_data(obj_id, Modes.ON, 0)
+    mode_data = pack_mode_data(obj_id, Mode.ON, 0)
     q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=mode_data))
     # Set Normal mode
     q.add_log_cmd("Testing Service 200: Set Mode Normal")
-    mode_data = pack_mode_data(obj_id, Modes.NORMAL, 0)
+    mode_data = pack_mode_data(obj_id, Mode.NORMAL, 0)
     q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=mode_data))
     # Set Raw Mode
     q.add_log_cmd("Testing Service 200: Set Mode Raw")
-    mode_data = pack_mode_data(obj_id, Modes.RAW, 0)
+    mode_data = pack_mode_data(obj_id, Mode.RAW, 0)
     q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=mode_data))
     # Set Off Mode
     q.add_log_cmd("Testing Service 200: Set Mode Off")
-    mode_data = pack_mode_data(obj_id, Modes.OFF, 0)
+    mode_data = pack_mode_data(obj_id, Mode.OFF, 0)
     q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=mode_data))
diff --git a/eive_tmtc/pus_tc/system/controllers.py b/eive_tmtc/pus_tc/system/controllers.py
index d595f08..cabccf9 100644
--- a/eive_tmtc/pus_tc/system/controllers.py
+++ b/eive_tmtc/pus_tc/system/controllers.py
@@ -1,7 +1,7 @@
 from typing import Union
 
 from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_200_fsfw_modes import Modes
+from tmtccmd.tc.pus_200_fsfw_modes import Mode
 from tmtccmd.util import ObjectIdU32, ObjectIdBase
 
 from eive_tmtc.tmtc.common import pack_mode_cmd_with_info
@@ -54,7 +54,7 @@ def pack_cmd_ctrl_to_off(
 ):
     pack_mode_cmd_with_info(
         object_id=object_id.as_bytes,
-        mode=Modes.OFF,
+        mode=Mode.OFF,
         submode=0,
         q=q,
         info=f"Commanding {object_id} OFF",
@@ -64,7 +64,7 @@ def pack_cmd_ctrl_to_off(
 def pack_cmd_ctrl_to_on(q: DefaultPusQueueHelper, object_id: ObjectIdU32):
     pack_mode_cmd_with_info(
         object_id=object_id.as_bytes,
-        mode=Modes.ON,
+        mode=Mode.ON,
         submode=0,
         q=q,
         info=f"Commanding {object_id} ON",
@@ -76,7 +76,7 @@ def pack_cmd_ctrl_to_nml(
 ):
     pack_mode_cmd_with_info(
         object_id=object_id.as_bytes,
-        mode=Modes.NORMAL,
+        mode=Mode.NORMAL,
         submode=0,
         q=q,
         info=f"Commanding {object_id} NORMAL",
diff --git a/eive_tmtc/pus_tc/system/tcs.py b/eive_tmtc/pus_tc/system/tcs.py
index 6b3e67e..cdd4353 100644
--- a/eive_tmtc/pus_tc/system/tcs.py
+++ b/eive_tmtc/pus_tc/system/tcs.py
@@ -4,7 +4,7 @@ from eive_tmtc.config.definitions import CustomServiceList
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_200_fsfw_modes import Modes
+from tmtccmd.tc.pus_200_fsfw_modes import Mode
 from tmtccmd.tc.pus_3_fsfw_hk import (
     make_sid,
     generate_one_hk_command,
@@ -63,7 +63,7 @@ def pack_tcs_ass_cmds(q: DefaultPusQueueHelper, op_code: str):
     if op_code in OpCode.TCS_BOARD_ASS_NORMAL:
         pack_mode_cmd_with_info(
             object_id=TCS_BOARD_ASS_ID,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
             submode=0,
             q=q,
             info=Info.TCS_BOARD_ASS_NORMAL,
@@ -71,7 +71,7 @@ def pack_tcs_ass_cmds(q: DefaultPusQueueHelper, op_code: str):
     if op_code in OpCode.TCS_BOARD_ASS_OFF:
         pack_mode_cmd_with_info(
             object_id=TCS_BOARD_ASS_ID,
-            mode=Modes.OFF,
+            mode=Mode.OFF,
             submode=0,
             q=q,
             info=Info.TCS_BOARD_ASS_OFF,
diff --git a/eive_tmtc/pus_tm/event_handler.py b/eive_tmtc/pus_tm/event_handler.py
index c212a7d..b60cfae 100644
--- a/eive_tmtc/pus_tm/event_handler.py
+++ b/eive_tmtc/pus_tm/event_handler.py
@@ -5,7 +5,7 @@ from eive_tmtc.config.object_ids import get_object_ids
 from eive_tmtc.pus_tm.defs import PrintWrapper
 from eive_tmtc.pus_tm.verification_handler import generic_retval_printout
 from eive_tmtc.tmtc.acs.acs_subsystem import AcsMode
-from tmtccmd.tc.pus_200_fsfw_modes import Modes
+from tmtccmd.tc.pus_200_fsfw_modes import Mode
 
 from tmtccmd.tm import Service5Tm
 from tmtccmd.logging import get_console_logger
@@ -55,7 +55,7 @@ def handle_event_packet(raw_tm: bytes, printer: FsfwTmTcPrinter):
     if info.name == "MODE_INFO":
         mode_name = "Unknown"
         if obj_name == "ACS_SUBSYSTEM":
-            if tm.param_1 == Modes.OFF:
+            if tm.param_1 == Mode.OFF:
                 mode_name = "Off"
             elif tm.param_1 == AcsMode.IDLE:
                 mode_name = "Idle"
@@ -66,13 +66,13 @@ def handle_event_packet(raw_tm: bytes, printer: FsfwTmTcPrinter):
             elif tm.param_1 == AcsMode.TARGET_PT:
                 mode_name = "Target Pointing"
         else:
-            if tm.param_1 == Modes.OFF:
+            if tm.param_1 == Mode.OFF:
                 mode_name = "Off"
-            elif tm.param_1 == Modes.ON:
+            elif tm.param_1 == Mode.ON:
                 mode_name = "On"
-            elif tm.param_1 == Modes.NORMAL:
+            elif tm.param_1 == Mode.NORMAL:
                 mode_name = "Normal"
-            elif tm.param_1 == Modes.RAW:
+            elif tm.param_1 == Mode.RAW:
                 mode_name = "Raw"
         pw.dlog(f"Mode Number {tm.param_1}, Mode Name {mode_name}")
         pw.dlog(f"Submode: {tm.param_2}")
diff --git a/eive_tmtc/tmtc/acs/acs_board.py b/eive_tmtc/tmtc/acs/acs_board.py
index 5b44c8a..37fe840 100644
--- a/eive_tmtc/tmtc/acs/acs_board.py
+++ b/eive_tmtc/tmtc/acs/acs_board.py
@@ -8,7 +8,7 @@ from tmtccmd.config.tmtc import (
 )
 from tmtccmd.tc import service_provider, DefaultPusQueueHelper
 from tmtccmd.tc.decorator import ServiceProviderParams
-from tmtccmd.tc.pus_200_fsfw_modes import Modes
+from tmtccmd.tc.pus_200_fsfw_modes import Mode
 from eive_tmtc.config.object_ids import ACS_BOARD_ASS_ID
 
 from eive_tmtc.tmtc.common import pack_mode_cmd_with_info
@@ -34,7 +34,7 @@ def pack_acs_command(q: DefaultPusQueueHelper, op_code: str):
     if op_code in AcsOpCodes.ACS_ASS_A_SIDE:
         pack_mode_cmd_with_info(
             object_id=ACS_BOARD_ASS_ID,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
             submode=DualSideSubmode.A_SIDE,
             q=q,
             info="Switching to ACS board assembly A side",
@@ -42,7 +42,7 @@ def pack_acs_command(q: DefaultPusQueueHelper, op_code: str):
     if op_code in AcsOpCodes.ACS_ASS_B_SIDE:
         pack_mode_cmd_with_info(
             object_id=ACS_BOARD_ASS_ID,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
             submode=DualSideSubmode.B_SIDE,
             q=q,
             info="Switching to ACS board assembly B side",
@@ -50,7 +50,7 @@ def pack_acs_command(q: DefaultPusQueueHelper, op_code: str):
     if op_code in AcsOpCodes.ACS_ASS_DUAL_MODE:
         pack_mode_cmd_with_info(
             object_id=ACS_BOARD_ASS_ID,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
             submode=DualSideSubmode.DUAL_SIDE,
             q=q,
             info="Switching to ACS board assembly dual mode",
@@ -58,7 +58,7 @@ def pack_acs_command(q: DefaultPusQueueHelper, op_code: str):
     if op_code in AcsOpCodes.ACS_ASS_A_ON:
         pack_mode_cmd_with_info(
             object_id=ACS_BOARD_ASS_ID,
-            mode=Modes.ON,
+            mode=Mode.ON,
             submode=DualSideSubmode.A_SIDE,
             q=q,
             info="Switching ACS board assembly A side on",
@@ -66,7 +66,7 @@ def pack_acs_command(q: DefaultPusQueueHelper, op_code: str):
     if op_code in AcsOpCodes.ACS_ASS_B_ON:
         pack_mode_cmd_with_info(
             object_id=ACS_BOARD_ASS_ID,
-            mode=Modes.ON,
+            mode=Mode.ON,
             submode=DualSideSubmode.B_SIDE,
             q=q,
             info="Switching ACS board assembly B side on",
@@ -74,7 +74,7 @@ def pack_acs_command(q: DefaultPusQueueHelper, op_code: str):
     if op_code in AcsOpCodes.ACS_ASS_DUAL_ON:
         pack_mode_cmd_with_info(
             object_id=ACS_BOARD_ASS_ID,
-            mode=Modes.ON,
+            mode=Mode.ON,
             submode=DualSideSubmode.B_SIDE,
             q=q,
             info="Switching ACS board assembly dual side on",
@@ -82,7 +82,7 @@ def pack_acs_command(q: DefaultPusQueueHelper, op_code: str):
     if op_code in AcsOpCodes.ACS_ASS_OFF:
         pack_mode_cmd_with_info(
             object_id=ACS_BOARD_ASS_ID,
-            mode=Modes.OFF,
+            mode=Mode.OFF,
             submode=0,
             q=q,
             info="Switching to ACS board assembly off",
diff --git a/eive_tmtc/tmtc/acs/acs_ctrl.py b/eive_tmtc/tmtc/acs/acs_ctrl.py
index 3921d6c..3e0c955 100644
--- a/eive_tmtc/tmtc/acs/acs_ctrl.py
+++ b/eive_tmtc/tmtc/acs/acs_ctrl.py
@@ -15,7 +15,7 @@ from tmtccmd.config.tmtc import (
 )
 from tmtccmd.tc.pus_20_params import pack_scalar_boolean_parameter_app_data
 from tmtccmd.tc import service_provider
-from tmtccmd.tc.pus_200_fsfw_modes import Modes, pack_mode_data, Subservices
+from tmtccmd.tc.pus_200_fsfw_modes import Mode, pack_mode_command
 from tmtccmd.tc.decorator import ServiceProviderParams
 from tmtccmd.tc.pus_3_fsfw_hk import (
     generate_one_hk_command,
@@ -43,7 +43,7 @@ class SetId(enum.IntEnum):
 
 
 class OpCodes:
-    OFF = ["off"] 
+    OFF = ["off"]
     NML = ["normal"]
     REQUEST_RAW_MGM_HK = ["0", "mgm_raw_hk"]
     ENABLE_RAW_MGM_HK = ["1", "enable_mgm_raw_hk"]
@@ -169,9 +169,11 @@ def pack_acs_ctrl_command(p: ServiceProviderParams):
     op_code = p.op_code
     q = p.queue_helper
     if op_code in OpCodes.OFF:
-        pass
+        q.add_log_cmd(f"{Info.OFF}")
+        q.add_pus_tc(pack_mode_command(ACS_CONTROLLER, Mode.OFF, 0))
     if op_code in OpCodes.NML:
-        pass
+        q.add_log_cmd(f"{Info.NML}")
+        q.add_pus_tc(pack_mode_command(ACS_CONTROLLER, Mode.NORMAL, 0))
     if op_code in OpCodes.REQUEST_RAW_MGM_HK:
         q.add_log_cmd(Info.REQUEST_RAW_MGM_HK)
         q.add_pus_tc(
diff --git a/eive_tmtc/tmtc/acs/imtq.py b/eive_tmtc/tmtc/acs/imtq.py
index 6cef46d..6d22c40 100644
--- a/eive_tmtc/tmtc/acs/imtq.py
+++ b/eive_tmtc/tmtc/acs/imtq.py
@@ -22,7 +22,7 @@ from tmtccmd.tc.pus_3_fsfw_hk import (
     generate_one_diag_command,
     generate_one_hk_command,
 )
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes
+from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode
 from tmtccmd.util import ObjectIdU32
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 
@@ -87,15 +87,15 @@ def pack_imtq_test_into(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_cod
 
     if op_code in OpCode.OFF:
         q.add_log_cmd("IMTQ: Set mode off")
-        command = pack_mode_data(object_id.as_bytes, Modes.OFF, 0)
+        command = pack_mode_data(object_id.as_bytes, Mode.OFF, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=command))
     if op_code in OpCode.ON:
         q.add_log_cmd("IMTQ: Set mode on")
-        command = pack_mode_data(object_id.as_bytes, Modes.ON, 0)
+        command = pack_mode_data(object_id.as_bytes, Mode.ON, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=command))
     if op_code in OpCode.NORMAL:
         q.add_log_cmd("IMTQ: Mode Normal")
-        command = pack_mode_data(object_id.as_bytes, Modes.NORMAL, 0)
+        command = pack_mode_data(object_id.as_bytes, Mode.NORMAL, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=command))
     if op_code == "3":
         q.add_log_cmd("IMTQ: Perform positive x self test")
diff --git a/eive_tmtc/tmtc/acs/reaction_wheels.py b/eive_tmtc/tmtc/acs/reaction_wheels.py
index 1fb5189..e63a3db 100644
--- a/eive_tmtc/tmtc/acs/reaction_wheels.py
+++ b/eive_tmtc/tmtc/acs/reaction_wheels.py
@@ -20,7 +20,7 @@ from tmtccmd.tc.pus_3_fsfw_hk import (
     disable_periodic_hk_command,
 )
 from spacepackets.ecss.tc import PusTelecommand
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes, Subservices
+from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode, Subservices
 from eive_tmtc.config.definitions import CustomServiceList
 from tmtccmd.util import ObjectIdU32
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
@@ -148,17 +148,17 @@ def pack_single_rw_test_into(
 
     if op_code in OpCodesDev.ON:
         q.add_log_cmd(f"RW {rw_idx}: {InfoDev.ON}")
-        mode_data = pack_mode_data(object_id, Modes.ON, 0)
+        mode_data = pack_mode_data(object_id, Mode.ON, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=mode_data))
 
     if op_code in OpCodesDev.NML:
         q.add_log_cmd(f"RW {rw_idx}: {InfoDev.NML}")
-        mode_data = pack_mode_data(object_id, Modes.NORMAL, 0)
+        mode_data = pack_mode_data(object_id, Mode.NORMAL, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=mode_data))
 
     if op_code in OpCodesDev.OFF:
         q.add_log_cmd(f"RW {rw_idx}: {InfoDev.OFF}")
-        mode_data = pack_mode_data(object_id, Modes.OFF, 0)
+        mode_data = pack_mode_data(object_id, Mode.OFF, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=mode_data))
 
     if op_code in OpCodesDev.GET_TM:
@@ -194,21 +194,21 @@ def pack_single_rw_test_into(
 
 def pack_rw_ass_cmds(q: DefaultPusQueueHelper, object_id: bytes, op_code: str):
     if op_code in OpCodesAss.OFF:
-        data = pack_mode_data(object_id=object_id, mode=Modes.OFF, submode=0)
+        data = pack_mode_data(object_id=object_id, mode=Mode.OFF, submode=0)
         q.add_pus_tc(
             PusTelecommand(
                 service=200, subservice=Subservices.TC_MODE_COMMAND, app_data=data
             )
         )
     if op_code in OpCodesAss.ON:
-        data = pack_mode_data(object_id=object_id, mode=Modes.ON, submode=0)
+        data = pack_mode_data(object_id=object_id, mode=Mode.ON, submode=0)
         q.add_pus_tc(
             PusTelecommand(
                 service=200, subservice=Subservices.TC_MODE_COMMAND, app_data=data
             )
         )
     if op_code in OpCodesAss.NML:
-        data = pack_mode_data(object_id=object_id, mode=Modes.NORMAL, submode=0)
+        data = pack_mode_data(object_id=object_id, mode=Mode.NORMAL, submode=0)
         q.add_pus_tc(
             PusTelecommand(
                 service=200, subservice=Subservices.TC_MODE_COMMAND, app_data=data
diff --git a/eive_tmtc/tmtc/acs/sus_board.py b/eive_tmtc/tmtc/acs/sus_board.py
index 9cdf4c9..6520a5e 100644
--- a/eive_tmtc/tmtc/acs/sus_board.py
+++ b/eive_tmtc/tmtc/acs/sus_board.py
@@ -9,7 +9,7 @@ from tmtccmd.config.tmtc import (
 )
 from tmtccmd.tc import service_provider, DefaultPusQueueHelper
 from tmtccmd.tc.decorator import ServiceProviderParams
-from tmtccmd.tc.pus_200_fsfw_modes import Modes
+from tmtccmd.tc.pus_200_fsfw_modes import Mode
 
 
 class SusOpCode:
@@ -23,7 +23,7 @@ def pack_sus_cmds(q: DefaultPusQueueHelper, op_code: str):
     if op_code in SusOpCode.SUS_ASS_NOM_SIDE:
         pack_mode_cmd_with_info(
             object_id=SUS_BOARD_ASS_ID,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
             submode=DualSideSubmode.A_SIDE,
             q=q,
             info="Switching to SUS board to nominal side",
@@ -31,7 +31,7 @@ def pack_sus_cmds(q: DefaultPusQueueHelper, op_code: str):
     if op_code in SusOpCode.SUS_ASS_RED_SIDE:
         pack_mode_cmd_with_info(
             object_id=SUS_BOARD_ASS_ID,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
             submode=DualSideSubmode.B_SIDE,
             q=q,
             info="Switching to SUS board to redundant side",
@@ -39,7 +39,7 @@ def pack_sus_cmds(q: DefaultPusQueueHelper, op_code: str):
     if op_code in SusOpCode.SUS_ASS_OFF:
         pack_mode_cmd_with_info(
             object_id=SUS_BOARD_ASS_ID,
-            mode=Modes.OFF,
+            mode=Mode.OFF,
             submode=0,
             q=q,
             info="Switching SUS board off",
@@ -47,7 +47,7 @@ def pack_sus_cmds(q: DefaultPusQueueHelper, op_code: str):
     if op_code in SusOpCode.SUS_ASS_DUAL_MODE:
         pack_mode_cmd_with_info(
             object_id=SUS_BOARD_ASS_ID,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
             submode=DualSideSubmode.DUAL_SIDE,
             q=q,
             info="Switching to SUS board to dual side",
diff --git a/eive_tmtc/tmtc/common.py b/eive_tmtc/tmtc/common.py
index e078ce5..1d8fb1a 100644
--- a/eive_tmtc/tmtc/common.py
+++ b/eive_tmtc/tmtc/common.py
@@ -2,13 +2,13 @@ from typing import Union
 
 from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes, Subservices
+from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode, Subservices
 from tmtccmd.util import ObjectIdU32
 
 
 def pack_mode_cmd_with_info(
     object_id: Union[ObjectIdU32, bytes],
-    mode: Union[int, Modes],
+    mode: Union[int, Mode],
     submode: int,
     q: DefaultPusQueueHelper,
     info: str,
diff --git a/eive_tmtc/tmtc/payload/ploc_mpsoc.py b/eive_tmtc/tmtc/payload/ploc_mpsoc.py
index 900d6d7..671de0e 100644
--- a/eive_tmtc/tmtc/payload/ploc_mpsoc.py
+++ b/eive_tmtc/tmtc/payload/ploc_mpsoc.py
@@ -21,7 +21,7 @@ from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
 from eive_tmtc.utility.input_helper import InputHelper
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes
+from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode
 
 
 LOGGER = get_console_logger()
@@ -138,15 +138,15 @@ def pack_ploc_mpsoc_commands(p: ServiceProviderParams):
     obyt = object_id.as_bytes
     if op_code in OpCode.OFF:
         q.add_log_cmd(f"{prefix}: {Info.OFF}")
-        command = pack_mode_data(obyt, Modes.OFF, 0)
+        command = pack_mode_data(obyt, Mode.OFF, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=command))
     if op_code in OpCode.ON:
         q.add_log_cmd(f"{prefix}: {Info.ON}")
-        data = pack_mode_data(obyt, Modes.ON, 0)
+        data = pack_mode_data(obyt, Mode.ON, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
     if op_code in OpCode.NORMAL:
         q.add_log_cmd(f"{prefix}: {Info.NORMAL}")
-        data = pack_mode_data(object_id.as_bytes, Modes.NORMAL, 0)
+        data = pack_mode_data(object_id.as_bytes, Mode.NORMAL, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
     if op_code == "3":
         q.add_log_cmd("PLOC MPSoC: TC mem write test")
diff --git a/eive_tmtc/tmtc/payload/ploc_supervisor.py b/eive_tmtc/tmtc/payload/ploc_supervisor.py
index 4746a59..1d7617a 100644
--- a/eive_tmtc/tmtc/payload/ploc_supervisor.py
+++ b/eive_tmtc/tmtc/payload/ploc_supervisor.py
@@ -19,7 +19,7 @@ from tmtccmd.config.tmtc import tmtc_definitions_provider, OpCodeEntry
 from tmtccmd.logging import get_console_logger
 from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes
+from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode
 from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 from eive_tmtc.utility.input_helper import InputHelper
@@ -232,15 +232,15 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):
     prefix = "PLOC Supervisor"
     if op_code in OpCodes.OFF:
         q.add_log_cmd(f"{prefix}: {Info.OFF}")
-        command = pack_mode_data(object_id.as_bytes, Modes.OFF, 0)
+        command = pack_mode_data(object_id.as_bytes, Mode.OFF, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=command))
     if op_code in OpCodes.ON:
         q.add_log_cmd(f"{prefix}: {Info.ON}")
-        command = pack_mode_data(object_id.as_bytes, Modes.ON, 0)
+        command = pack_mode_data(object_id.as_bytes, Mode.ON, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=command))
     if op_code in OpCodes.NORMAL:
         q.add_log_cmd(f"{prefix}: {Info.NML}")
-        command = pack_mode_data(object_id.as_bytes, Modes.NORMAL, 0)
+        command = pack_mode_data(object_id.as_bytes, Mode.NORMAL, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=command))
     if op_code in OpCodes.HK_TO_OBC:
         q.add_log_cmd(f"{prefix}: {Info.HK_TO_OBC}")
diff --git a/eive_tmtc/tmtc/test.py b/eive_tmtc/tmtc/test.py
index 87f6b6b..39f589f 100644
--- a/eive_tmtc/tmtc/test.py
+++ b/eive_tmtc/tmtc/test.py
@@ -1,4 +1,4 @@
-from spacepackets.ecss import PusTelecommand, PusServices
+from spacepackets.ecss import PusTelecommand, PusService
 from tmtccmd.config import CoreServiceList
 from tmtccmd.config.tmtc import (
     tmtc_definitions_provider,
@@ -45,7 +45,7 @@ def pack_test_command(p: ServiceProviderParams):
         q.add_pus_tc(pack_service_17_ping_command())
     if info.op_code == OpCodes.TRIGGER_EVENT:
         q.add_log_cmd("Sending PUS TC Event Trigger [17, 128]")
-        q.add_pus_tc(PusTelecommand(service=PusServices.S17_TEST, subservice=128))
+        q.add_pus_tc(PusTelecommand(service=PusService.S17_TEST, subservice=128))
     if info.op_code == OpCodes.PING_WITH_DATA:
         q.add_log_cmd("Sending Ping With Data, Size Reported Back [17, 129]")
         while True:
@@ -60,6 +60,6 @@ def pack_test_command(p: ServiceProviderParams):
             next_byte = not next_byte
         q.add_pus_tc(
             PusTelecommand(
-                service=PusServices.S17_TEST, subservice=130, app_data=dummy_data
+                service=PusService.S17_TEST, subservice=130, app_data=dummy_data
             )
         )