diff --git a/pus_tm/factory_hook.py b/pus_tm/factory_hook.py
index 38f9005..5a2de0f 100644
--- a/pus_tm/factory_hook.py
+++ b/pus_tm/factory_hook.py
@@ -3,17 +3,16 @@
 @details    Template configuration file. Copy this folder to the TMTC commander root and adapt
             it to your needs.
 """
-from tmtccmd.tm.service_8_functional_cmd import Service8TM
+from tmtccmd.tm.service_8_fsfw_functional_cmd import Service8FsfwTm
 from spacepackets.ecss.tm import PusTelemetry
 from tmtccmd.utility.logger import get_console_logger
 
 from tmtccmd.pus.service_1_verification import Service1TMExtended
 from tmtccmd.pus.service_17_test import Service17TMExtended
-from tmtccmd.tm.service_3_housekeeping import Service3TM
-from tmtccmd.tm.service_200_mode import Service200TM
-from tmtccmd.tm.service_20_parameters import Service20TM
-from tmtccmd.tm.service_5_event import Service5TM
-from tmtccmd.tm.service_200_mode import Service200TM
+from tmtccmd.tm.service_3_fsfw_housekeeping import Service3FsfwTm
+from tmtccmd.tm.service_20_fsfw_parameters import Service20FsfwTm
+from tmtccmd.tm.service_5_event import Service5Tm
+from tmtccmd.tm.service_200_mode import Service200Tm
 from tmtccmd.utility.tmtc_printer import TmTcPrinter, PrintFormats
 
 from config.definitions import PUS_APID
@@ -38,19 +37,19 @@ def pus_factory_hook(raw_tm_packet: bytearray, tmtc_printer: TmTcPrinter):
         if service_type == 1:
             tm_packet = Service1TMExtended.unpack(raw_telemetry=raw_tm_packet)
         if service_type == 3:
-            tm_packet = Service3TM.unpack(
+            tm_packet = Service3FsfwTm.unpack(
                 raw_telemetry=raw_tm_packet, custom_hk_handling=False
             )
         if service_type == 5:
-            tm_packet = Service5TM.unpack(raw_telemetry=raw_tm_packet)
+            tm_packet = Service5Tm.unpack(raw_telemetry=raw_tm_packet)
         if service_type == 8:
-            tm_packet = Service8TM.unpack(raw_telemetry=raw_tm_packet)
+            tm_packet = Service8FsfwTm.unpack(raw_telemetry=raw_tm_packet)
         if service_type == 17:
             tm_packet = Service17TMExtended.unpack(raw_telemetry=raw_tm_packet)
         if service_type == 20:
-            tm_packet = Service20TM.unpack(raw_telemetry=raw_tm_packet)
+            tm_packet = Service20FsfwTm.unpack(raw_telemetry=raw_tm_packet)
         if service_type == 200:
-            tm_packet = Service200TM.unpack(raw_telemetry=raw_tm_packet)
+            tm_packet = Service200Tm.unpack(raw_telemetry=raw_tm_packet)
         if tm_packet is None:
             LOGGER.info(
                 f"The service {service_type} is not implemented in Telemetry Factory"
diff --git a/pus_tm/hk_handling.py b/pus_tm/hk_handling.py
index 3691026..6cac660 100644
--- a/pus_tm/hk_handling.py
+++ b/pus_tm/hk_handling.py
@@ -4,7 +4,7 @@ import os
 import datetime
 
 from tmtccmd.config.definitions import HkReplyUnpacked
-from tmtccmd.tm.service_3_housekeeping import Service3Base
+from tmtccmd.tm.service_3_fsfw_housekeeping import Service3Base
 from tmtccmd.utility.logger import get_console_logger
 from pus_tc.bpx_batt import BpxSetIds
 from pus_tc.syrlinks_hk_handler import SetIds
diff --git a/tmtccmd b/tmtccmd
index efa1e66..027225b 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit efa1e6636e3577579564ce496b66136a009bfa94
+Subproject commit 027225b83a86123d23e16966fe0d3881e7ee8d64