diff --git a/pus_tc/tmtcc_pus_tc_utility.py b/pus_tc/tmtcc_pus_tc_utility.py
index 9f410961e3c8450f5778b665a6a9fc30a588710e..2585a89e0598eb932c394742f01fc88ca003b8df 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_pus_tc_service8 import generate_action_command
+from tmtc_core.pus_tc.tmtcc_tc_service8_functional import generate_action_command
 from config.tmtcc_config import LED_TASK_ID
 
 
diff --git a/pus_tc/tmtcc_pus_service17.py b/pus_tc/tmtcc_service17_test.py
similarity index 96%
rename from pus_tc/tmtcc_pus_service17.py
rename to pus_tc/tmtcc_service17_test.py
index 1b174c36269a73a1e1f4b30c3e21ac83137c7abe..17171c6eff7a4ddf3d80866f5e87d79ccc9dd32a 100644
--- a/pus_tc/tmtcc_pus_service17.py
+++ b/pus_tc/tmtcc_service17_test.py
@@ -1,5 +1,5 @@
 from tmtc_core.pus_tc.tmtcc_pus_tc_base import TcQueueT, PusTelecommand
-from tmtc_core.pus_tc.tmtcc_pus_tc_service17 import pack_service17_ping_command
+from tmtc_core.pus_tc.tmtcc_tc_service17_test import pack_service17_ping_command
 
 
 def pack_service17_test_into(tc_queue: TcQueueT, op_code: int = 0):
diff --git a/pus_tc/tmtcc_tc_core.py b/pus_tc/tmtcc_tc_core.py
index dc418378519a50506d152fb9dec47cd4e0566dc3..c4d298afbbd45b3fc56362536e35393136f94704 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_pus_tc_service8 import make_action_id
+from tmtc_core.pus_tc.tmtcc_tc_service8_functional import make_action_id
 from tmtc_core.pus_tc.tmtcc_pus_tc_base import PusTelecommand
 
 
diff --git a/pus_tc/obsw_tc_gps.py b/pus_tc/tmtcc_tc_gps.py
similarity index 96%
rename from pus_tc/obsw_tc_gps.py
rename to pus_tc/tmtcc_tc_gps.py
index cb98a13af4ef3671d1826ae9f1f2b1d551f9e387..ed1d3afd68891ff06c36dcc94c47c43c2a1a1033 100644
--- a/pus_tc/obsw_tc_gps.py
+++ b/pus_tc/tmtcc_tc_gps.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-@file   obsw_tc_gps.py
+@file   tmtcc_tc_gps.py
 @brief  GPS Device: GPS device testing
 @author R. Mueller
 @date   02.05.2020
@@ -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.obsw_tc_service2 import pack_mode_data
+from pus_tc.tmtcc_tc_service2_raw_commanding import pack_mode_data
 
 import config.tmtcc_config as g
 
diff --git a/pus_tc/tmtcc_image_handler.py b/pus_tc/tmtcc_tc_image_handler.py
similarity index 94%
rename from pus_tc/tmtcc_image_handler.py
rename to pus_tc/tmtcc_tc_image_handler.py
index 9c22ffe853aec98f832d1bbced98d111db9f89fa..7b0d42d03b245e37bb7c36438e1f53ae84f0f4c5 100644
--- a/pus_tc/tmtcc_image_handler.py
+++ b/pus_tc/tmtcc_tc_image_handler.py
@@ -1,8 +1,8 @@
 from typing import Union
 
 from tmtc_core.pus_tc.tmtcc_pus_tc_base import PusTelecommand, Deque
-from tmtc_core.pus_tc.tmtcc_pus_tc_service8 import make_action_id
-from pus_tc.tmtcc_tc_service20 import pack_boolean_parameter_setting
+from tmtc_core.pus_tc.tmtcc_tc_service8_functional 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 3baa62a34b7942835ad26ee1fcd39ad7b878b457..01e804248f638892ca76ad9f8b4b2724ce0799e5 100644
--- a/pus_tc/tmtcc_tc_packer_hook.py
+++ b/pus_tc/tmtcc_tc_packer_hook.py
@@ -6,18 +6,18 @@ 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.obsw_tc_service2 import pack_service2_test_into
-from pus_tc.obsw_tc_service3 import pack_service3_test_into
-from pus_tc.obsw_tc_service8 import pack_service8_test_into
-from pus_tc.obsw_tc_service9 import pack_service9_test_into
+from pus_tc.tmtcc_tc_service2_raw_commanding 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_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 import pack_service20_test_into
+from pus_tc.tmtcc_tc_service20_parameter import pack_service20_test_into
 from pus_tc.tmtcc_pus_tc_utility import pack_utility_command
-from pus_tc.tmtcc_tc_mode_service200 import pack_mode_data, pack_service200_test_into
-from pus_tc.tmtcc_tc_service5 import pack_service5_test_into
-from pus_tc.tmtcc_pus_service17 import pack_service17_test_into
-from pus_tc.tmtcc_image_handler import generate_img_handler_packet
-from pus_tc.obsw_tc_gps import pack_gps_test_into
+from pus_tc.tmtcc_tc_service200_mode import pack_mode_data, pack_service200_test_into
+from pus_tc.tmtcc_tc_service5_event import pack_service5_test_into
+from pus_tc.tmtcc_service17_test import pack_service17_test_into
+from pus_tc.tmtcc_tc_image_handler import generate_img_handler_packet
+from pus_tc.tmtcc_tc_gps import pack_gps_test_into
 from pus_tc.tmtcc_tc_core import pack_core_command
 
 
diff --git a/pus_tc/tmtcc_tc_mode_service200.py b/pus_tc/tmtcc_tc_service200_mode.py
similarity index 95%
rename from pus_tc/tmtcc_tc_mode_service200.py
rename to pus_tc/tmtcc_tc_service200_mode.py
index 88cc58202a972bbc9f761182d7cec6bd77d24e73..0e70d8fb35b72bf84b38238799bd3d07753fec1b 100644
--- a/pus_tc/tmtcc_tc_mode_service200.py
+++ b/pus_tc/tmtcc_tc_service200_mode.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-@file   tmtcc_tc_mode_service200.py
+@file   tmtcc_tc_service200_mode.py
 @brief  PUS Service 200:  PUS custom service 200: Mode commanding
 @author R. Mueller
 @date   02.05.2020
diff --git a/pus_tc/tmtcc_tc_service20.py b/pus_tc/tmtcc_tc_service20_parameter.py
similarity index 98%
rename from pus_tc/tmtcc_tc_service20.py
rename to pus_tc/tmtcc_tc_service20_parameter.py
index 58c7af3372287554403ae221389f8d732e01b9a4..75b028ad33a9281a4cb27a6f87b2de25e3a85395 100644
--- a/pus_tc/tmtcc_tc_service20.py
+++ b/pus_tc/tmtcc_tc_service20_parameter.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-@file   tmtcc_tc_service20.py
+@file   tmtcc_tc_service20_parameter.py
 @brief  PUS Service 20:  Parameter management.
 @author J. Gerhards
 @date   30.06.2020
@@ -11,7 +11,7 @@ from typing import Deque
 import config.tmtcc_config as g
 from tmtc_core.pus_tc.tmtcc_pus_tc_base import PusTelecommand, TcQueueT
 from tmtc_core.utility.obsw_logger import get_logger
-from pus_tc.tmtcc_tc_mode_service200 import pack_mode_data
+from pus_tc.tmtcc_tc_service200_mode import pack_mode_data
 
 LOGGER = get_logger()
 
diff --git a/pus_tc/tmtcc_tc_service23_sdcard.py b/pus_tc/tmtcc_tc_service23_sdcard.py
index 25ac7f6b6b92f46a42f68203ab9b2d4f13a2c185..ce88f22df9da72465e5c1d8ab4085d4d40d5249b 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_pus_tc_service8 import make_action_id
+from tmtc_core.pus_tc.tmtcc_tc_service8_functional import make_action_id
 from tmtc_core.utility.obsw_logger import get_logger
 
 LOGGER = get_logger()
diff --git a/pus_tc/obsw_tc_service2.py b/pus_tc/tmtcc_tc_service2_raw_commanding.py
similarity index 94%
rename from pus_tc/obsw_tc_service2.py
rename to pus_tc/tmtcc_tc_service2_raw_commanding.py
index 761d701d7dc6814784ece602fb0952bf073c9939..a8c24d2f4bd8e379e8e08bcfa8dc2bf419ca75ad 100644
--- a/pus_tc/obsw_tc_service2.py
+++ b/pus_tc/tmtcc_tc_service2_raw_commanding.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-@file   obsw_tc_service2.py
+@file   tmtcc_tc_service2_raw_commanding.py
 @brief  PUS Service 2: Device Access, Native low-level commanding
 @author R. Mueller
 @date   01.11.2019
@@ -9,7 +9,7 @@ import struct
 
 import config.tmtcc_config as g
 from tmtc_core.pus_tc.tmtcc_pus_tc_base import PusTelecommand, Deque
-from pus_tc.tmtcc_tc_mode_service200 import pack_mode_data
+from pus_tc.tmtcc_tc_service200_mode import pack_mode_data
 
 
 def pack_service2_test_into(tc_queue: Deque, called_externally: bool = False) -> Deque:
diff --git a/pus_tc/obsw_tc_service3.py b/pus_tc/tmtcc_tc_service3_housekeeping.py
similarity index 96%
rename from pus_tc/obsw_tc_service3.py
rename to pus_tc/tmtcc_tc_service3_housekeeping.py
index 5a8906aab9f5c007438e07d851f3c9bfeb0335fb..1dd9f831462be182ab286d279fc0aacb1cb5e9ed 100644
--- a/pus_tc/obsw_tc_service3.py
+++ b/pus_tc/tmtcc_tc_service3_housekeeping.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-@file   obsw_tc_service3.py
+@file   tmtcc_tc_service3_housekeeping.py
 @brief  PUS Service 3:  Housekeeping Service.
 @author R. Mueller
 @date   02.05.2020
diff --git a/pus_tc/tmtcc_tc_service5.py b/pus_tc/tmtcc_tc_service5_event.py
similarity index 92%
rename from pus_tc/tmtcc_tc_service5.py
rename to pus_tc/tmtcc_tc_service5_event.py
index 9f04908a240c5b14f593e9ded637f7c5f7118c9e..4d8bb4d1df0152b91cd3f04591e8b85bc6f95e41 100644
--- a/pus_tc/tmtcc_tc_service5.py
+++ b/pus_tc/tmtcc_tc_service5_event.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-@file   tmtcc_tc_service5.py
+@file   tmtcc_tc_service5_event.py
 @brief  PUS Service 5: Event Service
         PUS Service 17: Test Service
 @author R. Mueller
@@ -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 tmtc_core.pus_tc.tmtcc_pus_tc_service17 import pack_service17_ping_command
+from tmtc_core.pus_tc.tmtcc_tc_service17_test import pack_service17_ping_command
 
 
 def pack_service5_test_into(tc_queue: TcQueueT):
diff --git a/pus_tc/obsw_tc_service8.py b/pus_tc/tmtcc_tc_service8_func_commanding.py
similarity index 94%
rename from pus_tc/obsw_tc_service8.py
rename to pus_tc/tmtcc_tc_service8_func_commanding.py
index 62193ce55c89e6271cdc42aa8d808b5089fd9d28..673a2e873b1f594bd2e88391f5387f145ee658a4 100644
--- a/pus_tc/obsw_tc_service8.py
+++ b/pus_tc/tmtcc_tc_service8_func_commanding.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-@file   obsw_tc_service8.py
+@file   tmtcc_tc_service8_func_commanding.py
 @brief  PUS Service 8:  High-level functional commanding.
 @author R. Mueller
 @date   01.11.2019
@@ -9,7 +9,7 @@ from typing import Deque
 
 import config.tmtcc_config as g
 from tmtc_core.pus_tc.tmtcc_pus_tc_base import PusTelecommand
-from pus_tc.tmtcc_tc_mode_service200 import pack_mode_data
+from pus_tc.tmtcc_tc_service200_mode import pack_mode_data
 
 
 def pack_service8_test_into(tc_queue: Deque, called_externally: bool = False) -> Deque:
diff --git a/pus_tc/obsw_tc_service9.py b/pus_tc/tmtcc_tc_service9_time.py
similarity index 98%
rename from pus_tc/obsw_tc_service9.py
rename to pus_tc/tmtcc_tc_service9_time.py
index 03c31040fe692142a4ade21a0eb73b689a551185..63456e6071eba534e1c0471ea07436b80e9128ab 100644
--- a/pus_tc/obsw_tc_service9.py
+++ b/pus_tc/tmtcc_tc_service9_time.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-@file   obsw_tc_service9.py
+@file   tmtcc_tc_service9_time.py
 @brief  PUS Service 9:  Time management.
 @author R. Mueller
 @date   01.11.2019
diff --git a/tmtc_core b/tmtc_core
index 5e48f63eceb7a44ad9f9cf82fff238f862a707f1..82d405069bdfc1733f8e2133d15f1b77a86d73eb 160000
--- a/tmtc_core
+++ b/tmtc_core
@@ -1 +1 @@
-Subproject commit 5e48f63eceb7a44ad9f9cf82fff238f862a707f1
+Subproject commit 82d405069bdfc1733f8e2133d15f1b77a86d73eb