diff --git a/tmtc/common_tmtc b/tmtc/common_tmtc
index 8554ab5..865ac05 160000
--- a/tmtc/common_tmtc
+++ b/tmtc/common_tmtc
@@ -1 +1 @@
-Subproject commit 8554ab57427c5bc3f62daa243939a26f41475099
+Subproject commit 865ac0574f89919e7740514fe78c0f8e949a06ab
diff --git a/tmtc/config/hook.py b/tmtc/config/hook.py
index 365411b..9e1ca7a 100644
--- a/tmtc/config/hook.py
+++ b/tmtc/config/hook.py
@@ -4,11 +4,11 @@ from common_tmtc.config.definitions import TM_SP_IDS
 from common_tmtc.config.hook_implementation import CommonFsfwHookBase
 from common_tmtc.pus_tc.cmd_definitions import common_fsfw_service_op_code_dict
 from tmtccmd.com_if import ComInterface
-from tmtccmd.config import TmTcDefWrapper
+from tmtccmd.config import TmtcDefinitionWrapper
 
 
 class FsfwHookBase(CommonFsfwHookBase):
-    def get_tmtc_definitions(self) -> TmTcDefWrapper:
+    def get_tmtc_definitions(self) -> TmtcDefinitionWrapper:
         return common_fsfw_service_op_code_dict()
 
     def assign_communication_interface(self, com_if_key: str) -> Optional[ComInterface]:
diff --git a/tmtc/deps/tmtccmd b/tmtc/deps/tmtccmd
index 4a54bff..e315c4c 160000
--- a/tmtc/deps/tmtccmd
+++ b/tmtc/deps/tmtccmd
@@ -1 +1 @@
-Subproject commit 4a54bffa6b54447a426e88d11dcfe1c3cdcccc10
+Subproject commit e315c4c5a541f3b3c7f9469b1cd0555e9ced0648