diff --git a/product/totalcompute/tc4/include/clock_soc.h b/product/totalcompute/tc4/include/clock_soc.h
index 7cb6897e9a649564b7977cc206976143aaf3abe3..7e74999beef1d538adad06d46cc71fb078689853 100644
--- a/product/totalcompute/tc4/include/clock_soc.h
+++ b/product/totalcompute/tc4/include/clock_soc.h
@@ -88,9 +88,9 @@ enum clock_css_idx {
  * Clock indexes.
  */
 enum clock_idx {
-    CLOCK_IDX_CPU_GROUP_GROUP_LITTLE,
-    CLOCK_IDX_CPU_GROUP_GROUP_MID,
-    CLOCK_IDX_CPU_GROUP_GROUP_BIG,
+    CLOCK_IDX_CPU_GROUP_LITTLE,
+    CLOCK_IDX_CPU_GROUP_MID,
+    CLOCK_IDX_CPU_GROUP_BIG,
     CLOCK_IDX_DPU,
     CLOCK_IDX_PIXEL_0,
     CLOCK_IDX_PIXEL_1,
diff --git a/product/totalcompute/tc4/include/tc4_core.h b/product/totalcompute/tc4/include/tc4_core.h
index e55eeb0a1e3aa4eba008beb9b679b7adca5d4de8..004fccc802c8fe4c0dca846692aebb8af1ebd7b6 100644
--- a/product/totalcompute/tc4/include/tc4_core.h
+++ b/product/totalcompute/tc4/include/tc4_core.h
@@ -10,9 +10,9 @@
 
 #include <fwk_assert.h>
 
-#define TC4_GROUP_LITTLE_NAME "GROUP_LITTLE"
-#define TC4_GROUP_MID_NAME    "GROUP_MID"
-#define TC4_GROUP_BIG_NAME    "GROUP_BIG"
+#define TC4_GROUP_LITTLE_NAME "NEVIS"
+#define TC4_GROUP_MID_NAME    "GELAS"
+#define TC4_GROUP_BIG_NAME    "TRAVIS"
 
 #define TC4_CORES_PER_CLUSTER  (8)
 #define TC4_CMES_PER_CLUSTER   (2)
diff --git a/product/totalcompute/tc4/scp_css/config_clock.c b/product/totalcompute/tc4/scp_css/config_clock.c
index 0254fdbbf38667682ad471fe5ccd2b8ea42992d1..3618130bc7512ce6b5f6da33df27b9ce993f2b10 100644
--- a/product/totalcompute/tc4/scp_css/config_clock.c
+++ b/product/totalcompute/tc4/scp_css/config_clock.c
@@ -20,7 +20,7 @@
 #include <fwk_module_idx.h>
 
 static const struct fwk_element clock_dev_desc_table[CLOCK_IDX_COUNT + 1] = {
-    [CLOCK_IDX_CPU_GROUP_GROUP_LITTLE] =
+    [CLOCK_IDX_CPU_GROUP_LITTLE] =
         {
             .name = "CPU_GROUP_" TC4_GROUP_LITTLE_NAME,
             .data = &((struct mod_clock_dev_config){
@@ -32,7 +32,7 @@ static const struct fwk_element clock_dev_desc_table[CLOCK_IDX_COUNT + 1] = {
                     MOD_CSS_CLOCK_API_TYPE_CLOCK),
             }),
         },
-    [CLOCK_IDX_CPU_GROUP_GROUP_MID] =
+    [CLOCK_IDX_CPU_GROUP_MID] =
         {
             .name = "CPU_GROUP_" TC4_GROUP_MID_NAME,
             .data = &((struct mod_clock_dev_config){
@@ -44,7 +44,7 @@ static const struct fwk_element clock_dev_desc_table[CLOCK_IDX_COUNT + 1] = {
                     MOD_CSS_CLOCK_API_TYPE_CLOCK),
             }),
         },
-    [CLOCK_IDX_CPU_GROUP_GROUP_BIG] =
+    [CLOCK_IDX_CPU_GROUP_BIG] =
         {
             .name = "CPU_GROUP_" TC4_GROUP_BIG_NAME,
             .data = &((struct mod_clock_dev_config){
diff --git a/product/totalcompute/tc4/scp_css/config_dvfs.c b/product/totalcompute/tc4/scp_css/config_dvfs.c
index 95446dfe6dc9bcf2e850b1dafd97365c53d21f4d..4954f2c482780195e828480c07af6e1e72be51cd 100644
--- a/product/totalcompute/tc4/scp_css/config_dvfs.c
+++ b/product/totalcompute/tc4/scp_css/config_dvfs.c
@@ -165,9 +165,8 @@ static struct mod_dvfs_opp operating_points_gpu[5] = {
 static const struct mod_dvfs_domain_config cpu_group_little = {
     .psu_id =
         FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PSU, PSU_ELEMENT_IDX_GROUP_LITTLE),
-    .clock_id = FWK_ID_ELEMENT_INIT(
-        FWK_MODULE_IDX_CLOCK,
-        CLOCK_IDX_CPU_GROUP_GROUP_LITTLE),
+    .clock_id =
+        FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_CLOCK, CLOCK_IDX_CPU_GROUP_LITTLE),
     .alarm_id = FWK_ID_SUB_ELEMENT_INIT(
         FWK_MODULE_IDX_TIMER,
         0,
@@ -181,9 +180,8 @@ static const struct mod_dvfs_domain_config cpu_group_little = {
 static const struct mod_dvfs_domain_config cpu_group_mid = {
     .psu_id =
         FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PSU, PSU_ELEMENT_IDX_GROUP_MID),
-    .clock_id = FWK_ID_ELEMENT_INIT(
-        FWK_MODULE_IDX_CLOCK,
-        CLOCK_IDX_CPU_GROUP_GROUP_MID),
+    .clock_id =
+        FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_CLOCK, CLOCK_IDX_CPU_GROUP_MID),
     .alarm_id = FWK_ID_SUB_ELEMENT_INIT(
         FWK_MODULE_IDX_TIMER,
         0,
@@ -197,9 +195,8 @@ static const struct mod_dvfs_domain_config cpu_group_mid = {
 static const struct mod_dvfs_domain_config cpu_group_big = {
     .psu_id =
         FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PSU, PSU_ELEMENT_IDX_GROUP_BIG),
-    .clock_id = FWK_ID_ELEMENT_INIT(
-        FWK_MODULE_IDX_CLOCK,
-        CLOCK_IDX_CPU_GROUP_GROUP_BIG),
+    .clock_id =
+        FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_CLOCK, CLOCK_IDX_CPU_GROUP_BIG),
     .alarm_id = FWK_ID_SUB_ELEMENT_INIT(
         FWK_MODULE_IDX_TIMER,
         0,
diff --git a/product/totalcompute/tc4/scp_css/config_gtimer.c b/product/totalcompute/tc4/scp_css/config_gtimer.c
index 0178079737c4f8b60ad4c78464a3617bd1994b62..f4d4faacf8d93cc3590b828f18a9a6f19a310807 100644
--- a/product/totalcompute/tc4/scp_css/config_gtimer.c
+++ b/product/totalcompute/tc4/scp_css/config_gtimer.c
@@ -28,7 +28,7 @@ static const struct fwk_element gtimer_dev_table[2] = {
                 .frequency = CLOCK_RATE_GTCLK,
                 .clock_id = FWK_ID_ELEMENT_INIT(
                    FWK_MODULE_IDX_CLOCK,
-                   CLOCK_IDX_CPU_GROUP_GROUP_LITTLE),
+                   CLOCK_IDX_CPU_GROUP_LITTLE),
         }),
     },
     [1] = { 0 },
diff --git a/product/totalcompute/tc4/scp_css/config_sds.c b/product/totalcompute/tc4/scp_css/config_sds.c
index 99df859e42e66f041baec592fbd35217d068750c..13280b8ceee3acf23366ace50fb395ad71311357 100644
--- a/product/totalcompute/tc4/scp_css/config_sds.c
+++ b/product/totalcompute/tc4/scp_css/config_sds.c
@@ -39,9 +39,8 @@ static_assert(
 const struct mod_sds_config sds_module_config = {
     .regions = sds_module_regions,
     .region_count = TC_SDS_REGION_COUNT,
-    .clock_id = FWK_ID_ELEMENT_INIT(
-        FWK_MODULE_IDX_CLOCK,
-        CLOCK_IDX_CPU_GROUP_GROUP_LITTLE)
+    .clock_id =
+        FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_CLOCK, CLOCK_IDX_CPU_GROUP_LITTLE)
 };
 
 static struct fwk_element sds_element_table[3] = {