diff --git a/eive_tmtc/pus_tc/devs/bpx_batt.py b/eive_tmtc/pus_tc/devs/bpx_batt.py
index c974fe2..2849f66 100644
--- a/eive_tmtc/pus_tc/devs/bpx_batt.py
+++ b/eive_tmtc/pus_tc/devs/bpx_batt.py
@@ -12,7 +12,7 @@ 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, Mode
-from tmtccmd.tc.pus_200_fsfw_modes import Subservices as ModeSubservices
+from tmtccmd.tc.pus_200_fsfw_modes import Subservice as ModeSubservices
 
 
 class BpxSetId:
diff --git a/eive_tmtc/pus_tc/devs/heater.py b/eive_tmtc/pus_tc/devs/heater.py
index 821df2a..ff3e0ce 100644
--- a/eive_tmtc/pus_tc/devs/heater.py
+++ b/eive_tmtc/pus_tc/devs/heater.py
@@ -14,7 +14,7 @@ from tmtccmd.util.obj_id import ObjectIdU32
 from tmtccmd.tc.pus_201_fsfw_health import (
     pack_set_health_cmd_data,
     FsfwHealth,
-    Subservices,
+    Subservice,
 )
 from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
 from spacepackets.ecss.tc import PusTelecommand
@@ -183,7 +183,7 @@ def health_cmd(
     app_data = pack_set_health_cmd_data(object_id=object_id.as_bytes, health=health)
     q.add_pus_tc(
         PusTelecommand(
-            service=201, subservice=Subservices.TC_SET_HEALTH, app_data=app_data
+            service=201, subservice=Subservice.TC_SET_HEALTH, app_data=app_data
         )
     )
 
diff --git a/eive_tmtc/pus_tc/devs/plpcdu.py b/eive_tmtc/pus_tc/devs/plpcdu.py
index 72db431..36595f5 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, Mode, Subservices
+from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode, Subservice
 from tmtccmd.tc.pus_20_params import (
     pack_scalar_double_param_app_data,
     pack_fsfw_load_param_cmd,
@@ -251,12 +251,12 @@ def hpa_on_procedure(q: DefaultPusQueueHelper):
     )
     pl_pcdu_on = PusTelecommand(
         service=200,
-        subservice=Subservices.TC_MODE_COMMAND,
+        subservice=Subservice.TC_MODE_COMMAND,
         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,
+        subservice=Subservice.TC_MODE_COMMAND,
         app_data=pack_mode_data(
             object_id=PL_PCDU_ID,
             mode=Mode.NORMAL,
@@ -267,7 +267,7 @@ def hpa_on_procedure(q: DefaultPusQueueHelper):
     )
     dro_on = PusTelecommand(
         service=200,
-        subservice=Subservices.TC_MODE_COMMAND,
+        subservice=Subservice.TC_MODE_COMMAND,
         app_data=pack_mode_data(
             object_id=PL_PCDU_ID,
             mode=Mode.NORMAL,
@@ -276,7 +276,7 @@ def hpa_on_procedure(q: DefaultPusQueueHelper):
     )
     x8_on = PusTelecommand(
         service=200,
-        subservice=Subservices.TC_MODE_COMMAND,
+        subservice=Subservice.TC_MODE_COMMAND,
         app_data=pack_mode_data(
             object_id=PL_PCDU_ID,
             mode=Mode.NORMAL,
@@ -285,7 +285,7 @@ def hpa_on_procedure(q: DefaultPusQueueHelper):
     )
     tx_on = PusTelecommand(
         service=200,
-        subservice=Subservices.TC_MODE_COMMAND,
+        subservice=Subservice.TC_MODE_COMMAND,
         app_data=pack_mode_data(
             object_id=PL_PCDU_ID,
             mode=Mode.NORMAL,
@@ -294,7 +294,7 @@ def hpa_on_procedure(q: DefaultPusQueueHelper):
     )
     mpa_on = PusTelecommand(
         service=200,
-        subservice=Subservices.TC_MODE_COMMAND,
+        subservice=Subservice.TC_MODE_COMMAND,
         app_data=pack_mode_data(
             object_id=PL_PCDU_ID,
             mode=Mode.NORMAL,
@@ -303,7 +303,7 @@ def hpa_on_procedure(q: DefaultPusQueueHelper):
     )
     hpa_on = PusTelecommand(
         service=200,
-        subservice=Subservices.TC_MODE_COMMAND,
+        subservice=Subservice.TC_MODE_COMMAND,
         app_data=pack_mode_data(
             object_id=PL_PCDU_ID,
             mode=Mode.NORMAL,
@@ -445,6 +445,6 @@ def pack_pl_pcdu_mode_cmd(
     mode_data = pack_mode_data(object_id=PL_PCDU_ID, mode=mode, submode=submode)
     q.add_pus_tc(
         PusTelecommand(
-            service=200, subservice=Subservices.TC_MODE_COMMAND, app_data=mode_data
+            service=200, subservice=Subservice.TC_MODE_COMMAND, app_data=mode_data
         )
     )
diff --git a/eive_tmtc/pus_tc/devs/rtd.py b/eive_tmtc/pus_tc/devs/rtd.py
index 0b33bd2..450ced8 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 Mode, pack_mode_data, Subservices
+from tmtccmd.tc.pus_200_fsfw_modes import Mode, pack_mode_data, Subservice
 import eive_tmtc.config.object_ids as oids
 from eive_tmtc.config.object_ids import get_object_ids
 
@@ -71,7 +71,7 @@ def pack_rtd_commands(
         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
+                service=200, subservice=Subservice.TC_MODE_COMMAND, app_data=app_data
             )
         )
     if op_code in OpCode.NORMAL:
@@ -80,7 +80,7 @@ def pack_rtd_commands(
         )
         q.add_pus_tc(
             PusTelecommand(
-                service=200, subservice=Subservices.TC_MODE_COMMAND, app_data=app_data
+                service=200, subservice=Subservice.TC_MODE_COMMAND, app_data=app_data
             )
         )
     if op_code in OpCode.OFF:
@@ -89,7 +89,7 @@ def pack_rtd_commands(
         )
         q.add_pus_tc(
             PusTelecommand(
-                service=200, subservice=Subservices.TC_MODE_COMMAND, app_data=app_data
+                service=200, subservice=Subservice.TC_MODE_COMMAND, app_data=app_data
             )
         )
     if op_code in OpCode.CONFIG_CMD:
diff --git a/eive_tmtc/pus_tc/devs/scex.py b/eive_tmtc/pus_tc/devs/scex.py
index a5e1974..2bd7e23 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 Mode, pack_mode_data, Subservices
+from tmtccmd.tc.pus_200_fsfw_modes import Mode, pack_mode_data, Subservice
 from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
 from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
@@ -83,7 +83,7 @@ def pack_scex_cmds(p: ServiceProviderParams):
         q.add_pus_tc(
             PusTelecommand(
                 service=200,
-                subservice=Subservices.TC_MODE_COMMAND,
+                subservice=Subservice.TC_MODE_COMMAND,
                 app_data=pack_mode_data(SCEX_HANDLER_ID, Mode.ON, 0),
             )
         )
@@ -92,7 +92,7 @@ def pack_scex_cmds(p: ServiceProviderParams):
         q.add_pus_tc(
             PusTelecommand(
                 service=200,
-                subservice=Subservices.TC_MODE_COMMAND,
+                subservice=Subservice.TC_MODE_COMMAND,
                 app_data=pack_mode_data(SCEX_HANDLER_ID, Mode.OFF, 0),
             )
         )
diff --git a/eive_tmtc/tmtc/acs/acs_subsystem.py b/eive_tmtc/tmtc/acs/acs_subsystem.py
index 26d2ba2..7963a3a 100644
--- a/eive_tmtc/tmtc/acs/acs_subsystem.py
+++ b/eive_tmtc/tmtc/acs/acs_subsystem.py
@@ -10,7 +10,7 @@ from tmtccmd.config.tmtc import (
     TmtcDefinitionWrapper,
     OpCodeEntry,
 )
-from tmtccmd.tc.pus_200_fsfw_modes import Subservices as ModeSubservices
+from tmtccmd.tc.pus_200_fsfw_modes import Subservice as ModeSubservices
 from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
 
diff --git a/eive_tmtc/tmtc/acs/reaction_wheels.py b/eive_tmtc/tmtc/acs/reaction_wheels.py
index e63a3db..e0a832a 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, Mode, Subservices
+from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode, Subservice
 from eive_tmtc.config.definitions import CustomServiceList
 from tmtccmd.util import ObjectIdU32
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
@@ -197,21 +197,21 @@ def pack_rw_ass_cmds(q: DefaultPusQueueHelper, object_id: bytes, op_code: str):
         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
+                service=200, subservice=Subservice.TC_MODE_COMMAND, app_data=data
             )
         )
     if op_code in OpCodesAss.ON:
         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
+                service=200, subservice=Subservice.TC_MODE_COMMAND, app_data=data
             )
         )
     if op_code in OpCodesAss.NML:
         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
+                service=200, subservice=Subservice.TC_MODE_COMMAND, app_data=data
             )
         )
     if op_code in OpCodesAss.ALL_SPEED_UP:
diff --git a/setup.cfg b/setup.cfg
index 285817d..728485f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -28,7 +28,7 @@ classifiers =
 [options]
 install_requires =
 	# tmtccmd @ git+https://github.com/robamu-org/tmtccmd@v4.0.0a1
-	tmtccmd @ git+https://github.com/robamu-org/tmtccmd@85074210c083a8#egg=tmtccmd
+	tmtccmd @ git+https://github.com/robamu-org/tmtccmd@d776b1cf603#egg=tmtccmd
 packages = find:
 python_requires = >=3.10
 include_package_data = True