diff --git a/eive_tmtc/tmtc/common.py b/eive_tmtc/tmtc/common.py
index 1d8fb1a..5ae4b15 100644
--- a/eive_tmtc/tmtc/common.py
+++ b/eive_tmtc/tmtc/common.py
@@ -2,7 +2,7 @@ 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, Mode, Subservices
+from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode, Subservice
 from tmtccmd.util import ObjectIdU32
 
 
@@ -27,6 +27,6 @@ def pack_mode_cmd_with_info(
     )
     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/tmtc/payload/pl_subsystem.py b/eive_tmtc/tmtc/payload/pl_subsystem.py
index 0db622a..d309e29 100644
--- a/eive_tmtc/tmtc/payload/pl_subsystem.py
+++ b/eive_tmtc/tmtc/payload/pl_subsystem.py
@@ -9,7 +9,7 @@ from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
-from tmtccmd.tc.pus_200_fsfw_modes import Subservices as ModeSubservices
+from tmtccmd.tc.pus_200_fsfw_modes import Subservice as ModeSubservice
 
 
 class OpCode(str, enum.Enum):
@@ -41,7 +41,7 @@ def build_acs_subsystem_cmd(p: ServiceProviderParams):
         q.add_pus_tc(
             PusTelecommand(
                 service=200,
-                subservice=ModeSubservices.TC_MODE_ANNOUNCE_RECURSIVE,
+                subservice=ModeSubservice.TC_MODE_ANNOUNCE_RECURSIVE,
                 app_data=PL_SUBSYSTEM_ID,
             )
         )