diff --git a/pus_tc/tmtcc_pus_tc_utility.py b/pus_tc/tmtcc_pus_tc_utility.py
index 2585a89e0598eb932c394742f01fc88ca003b8df..989389fc9c721c11f72f9cb82522c24db25711f3 100644
--- a/pus_tc/tmtcc_pus_tc_utility.py
+++ b/pus_tc/tmtcc_pus_tc_utility.py
@@ -1,7 +1,7 @@
 from typing import Union
 
 from tmtc_core.pus_tc.tmtcc_pus_tc_base import TcQueueT
-from tmtc_core.pus_tc.tmtcc_tc_service8_functional import generate_action_command
+from tmtc_core.pus_tc.tmtcc_tc_service8_functional_cmd import generate_action_command
 from config.tmtcc_config import LED_TASK_ID
 
 
diff --git a/pus_tc/tmtcc_tc_core.py b/pus_tc/tmtcc_tc_core.py
index c4d298afbbd45b3fc56362536e35393136f94704..e427ddfe865cf6946c4eb248f110148ed7617735 100644
--- a/pus_tc/tmtcc_tc_core.py
+++ b/pus_tc/tmtcc_tc_core.py
@@ -1,7 +1,7 @@
 from typing import Deque
 
 from config.tmtcc_config import CORE_CONTROLLER_ID
-from tmtc_core.pus_tc.tmtcc_tc_service8_functional import make_action_id
+from tmtc_core.pus_tc.tmtcc_tc_service8_functional_cmd import make_action_id
 from tmtc_core.pus_tc.tmtcc_pus_tc_base import PusTelecommand
 
 
diff --git a/pus_tc/tmtcc_tc_gps.py b/pus_tc/tmtcc_tc_gps.py
index ed1d3afd68891ff06c36dcc94c47c43c2a1a1033..73a8b1d702a729ac68f853921feb33d1480589b8 100644
--- a/pus_tc/tmtcc_tc_gps.py
+++ b/pus_tc/tmtcc_tc_gps.py
@@ -8,7 +8,7 @@
 
 from tmtc_core.pus_tc.tmtcc_pus_tc_packer import TcQueueT
 from tmtc_core.pus_tc.tmtcc_pus_tc_base import PusTelecommand
-from pus_tc.tmtcc_tc_service2_raw_commanding import pack_mode_data
+from pus_tc.tmtcc_tc_service2_raw_cmd import pack_mode_data
 
 import config.tmtcc_config as g
 
diff --git a/pus_tc/tmtcc_tc_image_handler.py b/pus_tc/tmtcc_tc_image_handler.py
index 7b0d42d03b245e37bb7c36438e1f53ae84f0f4c5..e2dd6cf60f15bf0baeba050e4f233002517f346f 100644
--- a/pus_tc/tmtcc_tc_image_handler.py
+++ b/pus_tc/tmtcc_tc_image_handler.py
@@ -1,7 +1,7 @@
 from typing import Union
 
 from tmtc_core.pus_tc.tmtcc_pus_tc_base import PusTelecommand, Deque
-from tmtc_core.pus_tc.tmtcc_tc_service8_functional import make_action_id
+from tmtc_core.pus_tc.tmtcc_tc_service8_functional_cmd import make_action_id
 from pus_tc.tmtcc_tc_service20_parameter import pack_boolean_parameter_setting
 from tmtc_core.utility.obsw_logger import get_logger
 from config.tmtcc_config import SW_IMAGE_HANDLER_ID
diff --git a/pus_tc/tmtcc_tc_packer_hook.py b/pus_tc/tmtcc_tc_packer_hook.py
index 01e804248f638892ca76ad9f8b4b2724ce0799e5..c78a10584fa95b982a36edc3f76818c0076038f6 100644
--- a/pus_tc/tmtcc_tc_packer_hook.py
+++ b/pus_tc/tmtcc_tc_packer_hook.py
@@ -6,9 +6,9 @@ import config.tmtcc_config as g
 from tmtc_core.utility.obsw_logger import get_logger
 from tmtc_core.pus_tc.tmtcc_pus_tc_base import TcQueueT, PusTelecommand
 
-from pus_tc.tmtcc_tc_service2_raw_commanding import pack_service2_test_into
+from pus_tc.tmtcc_tc_service2_raw_cmd import pack_service2_test_into
 from pus_tc.tmtcc_tc_service3_housekeeping import pack_service3_test_into
-from pus_tc.tmtcc_tc_service8_func_commanding import pack_service8_test_into
+from pus_tc.tmtcc_tc_service8_func_cmd import pack_service8_test_into
 from pus_tc.tmtcc_tc_service9_time import pack_service9_test_into
 from pus_tc.tmtcc_tc_service23_sdcard import pack_service23_commands_into
 from pus_tc.tmtcc_tc_service20_parameter import pack_service20_test_into
diff --git a/pus_tc/tmtcc_tc_service23_sdcard.py b/pus_tc/tmtcc_tc_service23_sdcard.py
index ce88f22df9da72465e5c1d8ab4085d4d40d5249b..14814962d0dd1f70f5901a62ee1165639df03402 100644
--- a/pus_tc/tmtcc_tc_service23_sdcard.py
+++ b/pus_tc/tmtcc_tc_service23_sdcard.py
@@ -9,7 +9,7 @@ from typing import Deque, Union
 
 from tmtc_core.pus_tc.tmtcc_pus_tc_packer import TcQueueT
 from tmtc_core.pus_tc.tmtcc_pus_tc_base import PusTelecommand
-from tmtc_core.pus_tc.tmtcc_tc_service8_functional import make_action_id
+from tmtc_core.pus_tc.tmtcc_tc_service8_functional_cmd import make_action_id
 from tmtc_core.utility.obsw_logger import get_logger
 
 LOGGER = get_logger()
diff --git a/pus_tc/tmtcc_tc_service2_raw_commanding.py b/pus_tc/tmtcc_tc_service2_raw_cmd.py
similarity index 96%
rename from pus_tc/tmtcc_tc_service2_raw_commanding.py
rename to pus_tc/tmtcc_tc_service2_raw_cmd.py
index a8c24d2f4bd8e379e8e08bcfa8dc2bf419ca75ad..deee9e687d064c1c87f91dcdc74170c8e73ac29f 100644
--- a/pus_tc/tmtcc_tc_service2_raw_commanding.py
+++ b/pus_tc/tmtcc_tc_service2_raw_cmd.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-@file   tmtcc_tc_service2_raw_commanding.py
+@file   tmtcc_tc_service2_raw_cmd.py
 @brief  PUS Service 2: Device Access, Native low-level commanding
 @author R. Mueller
 @date   01.11.2019
diff --git a/pus_tc/tmtcc_tc_service8_func_commanding.py b/pus_tc/tmtcc_tc_service8_func_cmd.py
similarity index 96%
rename from pus_tc/tmtcc_tc_service8_func_commanding.py
rename to pus_tc/tmtcc_tc_service8_func_cmd.py
index 673a2e873b1f594bd2e88391f5387f145ee658a4..dfa52785db0e348f4bb31d7c9f149d1989f3c572 100644
--- a/pus_tc/tmtcc_tc_service8_func_commanding.py
+++ b/pus_tc/tmtcc_tc_service8_func_cmd.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-@file   tmtcc_tc_service8_func_commanding.py
+@file   tmtcc_tc_service8_func_cmd.py
 @brief  PUS Service 8:  High-level functional commanding.
 @author R. Mueller
 @date   01.11.2019
diff --git a/tmtc_core b/tmtc_core
index 82d405069bdfc1733f8e2133d15f1b77a86d73eb..b11f8fd92ab9a17b8f0e1db9dd8eea2b6fc16cc2 160000
--- a/tmtc_core
+++ b/tmtc_core
@@ -1 +1 @@
-Subproject commit 82d405069bdfc1733f8e2133d15f1b77a86d73eb
+Subproject commit b11f8fd92ab9a17b8f0e1db9dd8eea2b6fc16cc2