diff --git a/config/hook_implementation.py b/config/hook_implementation.py
index 9f1be1b..c38cdef 100644
--- a/config/hook_implementation.py
+++ b/config/hook_implementation.py
@@ -3,7 +3,7 @@ from typing import Optional
 
 from tmtccmd import BackendBase
 from tmtccmd.com_if import ComInterface
-from tmtccmd.config import TmTcCfgHookBase, TmTcDefWrapper, default_json_path
+from tmtccmd.config import TmTcCfgHookBase, TmtcDefinitionWrapper, default_json_path
 from tmtccmd.util import ObjectIdDictT, RetvalDictT
 
 
@@ -14,7 +14,7 @@ class CommonFsfwHookBase(TmTcCfgHookBase):
         super().__init__(json_cfg_path=json_cfg_path)
 
     @abstractmethod
-    def get_tmtc_definitions(self) -> TmTcDefWrapper:
+    def get_tmtc_definitions(self) -> TmtcDefinitionWrapper:
         pass
 
     @abstractmethod
diff --git a/pus_tc/cmd_definitions.py b/pus_tc/cmd_definitions.py
index c3e03e7..cad6728 100644
--- a/pus_tc/cmd_definitions.py
+++ b/pus_tc/cmd_definitions.py
@@ -1,14 +1,12 @@
 from common_tmtc.pus_tc.service_20_parameters import add_param_cmds
 from common_tmtc.pus_tc.service_3_housekeeping import add_hk_cmds
-from tmtccmd.config import (
-    TmTcDefWrapper,
-)
+from tmtccmd.config import TmtcDefinitionWrapper
 from common_tmtc.pus_tc.pus_11_tc_sched import add_tc_sched_cmds
 from tmtccmd.config.globals import get_default_tmtc_defs
 from tmtccmd.config.tmtc import OpCodeEntry
 
 
-def common_fsfw_service_op_code_dict() -> TmTcDefWrapper:
+def common_fsfw_service_op_code_dict() -> TmtcDefinitionWrapper:
     def_wrapper = get_default_tmtc_defs()
     op_code_entry = OpCodeEntry()
     op_code_entry.add(keys="test", info="Mode CMD Test")
diff --git a/pus_tc/pus_11_tc_sched.py b/pus_tc/pus_11_tc_sched.py
index 7a938ab..98ec21a 100644
--- a/pus_tc/pus_11_tc_sched.py
+++ b/pus_tc/pus_11_tc_sched.py
@@ -4,7 +4,7 @@ from datetime import timedelta
 
 from spacepackets.ecss.tc import PusTelecommand
 
-from tmtccmd.config import TmTcDefWrapper
+from tmtccmd.config import TmtcDefinitionWrapper
 from tmtccmd.config.tmtc import OpCodeEntry
 from tmtccmd.pus.pus_17_test import pack_service_17_ping_command
 from tmtccmd.pus.pus_11_tc_sched import TypeOfTimeWindow, Subservices, TcSchedReqId
@@ -36,7 +36,7 @@ class Info:
     TEST_RESET = "Test TC scheduling reset command"
 
 
-def add_tc_sched_cmds(cmd_dict: TmTcDefWrapper):
+def add_tc_sched_cmds(cmd_dict: TmtcDefinitionWrapper):
     op_code_entry = OpCodeEntry()
     op_code_entry.add(keys=OpCodes.ENABLE, info=Info.ENABLE)
     op_code_entry.add(keys=OpCodes.DISABLE, info=Info.DISABLE)
diff --git a/pus_tc/service_20_parameters.py b/pus_tc/service_20_parameters.py
index 55f25ee..f2a2dd7 100644
--- a/pus_tc/service_20_parameters.py
+++ b/pus_tc/service_20_parameters.py
@@ -3,8 +3,7 @@ import struct
 from spacepackets.ecss.tc import PusTelecommand
 from spacepackets.ecss import PusServices
 
-from tmtccmd.config import TmTcDefWrapper, OpCodeEntry
-from tmtccmd.tc import QueueHelperBase
+from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.tc.pus_20_params import pack_type_and_matrix_data, pack_parameter_id
 from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes
 from tmtccmd.logging import get_console_logger
@@ -15,7 +14,7 @@ from tmtccmd.tc.queue import DefaultPusQueueHelper
 LOGGER = get_console_logger()
 
 
-def add_param_cmds(defs: TmTcDefWrapper):
+def add_param_cmds(defs: TmtcDefinitionWrapper):
     op_code_entry = OpCodeEntry()
     op_code_entry.add(keys=["0", "test"], info="Generic Test")
     defs.add_service(
diff --git a/pus_tc/service_3_housekeeping.py b/pus_tc/service_3_housekeeping.py
index cbe9beb..d009b0c 100644
--- a/pus_tc/service_3_housekeeping.py
+++ b/pus_tc/service_3_housekeeping.py
@@ -3,7 +3,7 @@ from datetime import timedelta
 from spacepackets.ecss.tc import PusTelecommand
 
 from deps.spacepackets.spacepackets.ecss import PusServices
-from tmtccmd.config import TmTcDefWrapper, OpCodeEntry
+from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes
 from tmtccmd.tc.pus_20_params import (
     pack_boolean_parameter_app_data,
@@ -28,7 +28,7 @@ TEST_NOTIFICATION_ACTION_ID = 3
 PARAM_ACTIVATE_CHANGING_DATASETS = 4
 
 
-def add_hk_cmds(defs: TmTcDefWrapper):
+def add_hk_cmds(defs: TmtcDefinitionWrapper):
     op_code_entry = OpCodeEntry()
     op_code_entry.add(keys=["0", "test"], info="Generic Test")
     defs.add_service(