LED drivers: update keyboard LED configs (#23073)

* IS31FL3733: update keyboard LED config

* IS31FL3736: update keyboard LED config

* IS31FL3737: update keyboard LED config

* IS31FL3741: update keyboard LED config

* IS31FL3743A: update keyboard LED config

* AW20216S: update keyboard LED config

* SNLED27351: update keyboard LED config

4 files changed, 393 insertions, 393 deletions

diff --git a/keyboards/monsgeek/m1/m1.c b/keyboards/monsgeek/m1/m1.c
index a0375b2c0f..006eb66d7f 100644
--- a/keyboards/monsgeek/m1/m1.c
+++ b/keyboards/monsgeek/m1/m1.c
@@ -24,121 +24,121 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {1, A_1,   B_1,   C_1},
-    {1, A_2,   B_2,   C_2},
-    {1, A_3,   B_3,   C_3},
-    {1, A_4,   B_4,   C_4},
-    {1, A_5,   B_5,   C_5},
-    {1, A_6,   B_6,   C_6},
-    {1, A_7,   B_7,   C_7},
-    {1, A_8,   B_8,   C_8},
-    {1, A_9,   B_9,   C_9},
-    {1, A_10,  B_10,  C_10},
-    {1, A_11,  B_11,  C_11},
-    {1, A_12,  B_12,  C_12},
-    {1, A_13,  B_13,  C_13},
-    {1, A_14,  B_14,  C_14},
+    {1, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {1, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {1, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {1, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {1, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {1, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {1, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {1, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {1, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {1, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {1, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {1, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {1, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {1, CB1_CA14,  CB2_CA14,  CB3_CA14},
 
-    {0, A_1,   B_1,   C_1},
-    {0, A_2,   B_2,   C_2},
-    {0, A_3,   B_3,   C_3},
-    {0, A_4,   B_4,   C_4},
-    {0, A_5,   B_5,   C_5},
-    {0, A_6,   B_6,   C_6},
-    {0, A_7,   B_7,   C_7},
-    {0, A_8,   B_8,   C_8},
-    {0, A_9,   B_9,   C_9},
-    {0, A_10,  B_10,  C_10},
-    {0, A_11,  B_11,  C_11},
-    {0, A_12,  B_12,  C_12},
-    {0, A_13,  B_13,  C_13},
-    {0, A_14,  B_14,  C_14},
-    {1, D_1,   E_1,   F_1},
+    {0, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {0, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {0, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {0, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {0, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {0, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {0, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {0, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {0, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {0, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {0, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {0, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {0, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {0, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB4_CA1,   CB5_CA1,   CB6_CA1},
 
-    {0, D_1,   E_1,   F_1},
-    {0, D_2,   E_2,   F_2},
-    {0, D_3,   E_3,   F_3},
-    {0, D_4,   E_4,   F_4},
-    {0, D_5,   E_5,   F_5},
-    {0, D_6,   E_6,   F_6},
-    {0, D_7,   E_7,   F_7},
-    {0, D_8,   E_8,   F_8},
-    {0, D_9,   E_9,   F_9},
-    {0, D_10,  E_10,  F_10},
-    {0, D_11,  E_11,  F_11},
-    {0, D_12,  E_12,  F_12},
-    {0, D_13,  E_13,  F_13},
-    {0, D_14,  E_14,  F_14},
-    {1, D_2,   E_2,   F_2},
+    {0, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {0, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {0, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {0, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {0, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {0, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {0, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {0, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {0, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {0, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {0, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {0, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {0, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {0, CB4_CA14,  CB5_CA14,  CB6_CA14},
+    {1, CB4_CA2,   CB5_CA2,   CB6_CA2},
 
-    {0, G_1,   H_1,   I_1},
-    {0, G_2,   H_2,   I_2},
-    {0, G_3,   H_3,   I_3},
-    {0, G_4,   H_4,   I_4},
-    {0, G_5,   H_5,   I_5},
-    {0, G_6,   H_6,   I_6},
-    {0, G_7,   H_7,   I_7},
-    {0, G_8,   H_8,   I_8},
-    {0, G_9,   H_9,   I_9},
-    {0, G_10,  H_10,  I_10},
-    {0, G_11,  H_11,  I_11},
-    {0, G_12,  H_12,  I_12},
-    {0, A_15,  B_15,  C_15},
-    {0, G_13,  H_13,  I_13},
-    {1, D_3,   E_3,   F_3},
+    {0, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {0, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {0, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {0, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {0, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {0, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {0, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {0, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {0, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {0, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {0, CB7_CA11,  CB8_CA11,  CB9_CA11},
+    {0, CB7_CA12,  CB8_CA12,  CB9_CA12},
+    {0, CB1_CA15,  CB2_CA15,  CB3_CA15},
+    {0, CB7_CA13,  CB8_CA13,  CB9_CA13},
+    {1, CB4_CA3,   CB5_CA3,   CB6_CA3},
 
-    {0, J_1,   K_1,   L_1},
-    {0, A_16,  B_16,  C_16},
-    {0, J_2,   K_2,   L_2},
-    {0, J_3,   K_3,   L_3},
-    {0, J_4,   K_4,   L_4},
-    {0, J_5,   K_5,   L_5},
-    {0, J_6,   K_6,   L_6},
-    {0, J_7,   K_7,   L_7},
-    {0, J_8,   K_8,   L_8},
-    {0, J_9,   K_9,   L_9},
-    {0, J_10,  K_10,  L_10},
-    {0, J_11,  K_11,  L_11},
-    {0, J_12,  K_12,  L_12},
-    {1, D_7,   E_7,   F_7},
-    {1, D_4,   E_4,   F_4},
+    {0, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {0, CB1_CA16,  CB2_CA16,  CB3_CA16},
+    {0, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {0, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {0, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {0, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {0, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {0, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {0, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {0, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {0, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {0, CB10_CA11,  CB11_CA11,  CB12_CA11},
+    {0, CB10_CA12,  CB11_CA12,  CB12_CA12},
+    {1, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {1, CB4_CA4,   CB5_CA4,   CB6_CA4},
 
-    {0, J_13,  K_13,  L_13},
-    {0, J_14,  K_14,  L_14},
-    {0, J_15,  K_15,  L_15},
-    {0, J_16,  K_16,  L_16},
+    {0, CB10_CA13,  CB11_CA13,  CB12_CA13},
+    {0, CB10_CA14,  CB11_CA14,  CB12_CA14},
+    {0, CB10_CA15,  CB11_CA15,  CB12_CA15},
+    {0, CB10_CA16,  CB11_CA16,  CB12_CA16},
 
-    {0, G_14,  H_14,  I_14},
-    {0, G_15,  H_15,  I_15},
-    {0, G_16,  H_16,  I_16},
+    {0, CB7_CA14,  CB8_CA14,  CB9_CA14},
+    {0, CB7_CA15,  CB8_CA15,  CB9_CA15},
+    {0, CB7_CA16,  CB8_CA16,  CB9_CA16},
 
-    {0, D_15,  E_15,  F_15},
-    {1, D_6,   E_6,   F_6},
-    {1, D_5,   E_5,   F_5},
+    {0, CB4_CA15,  CB5_CA15,  CB6_CA15},
+    {1, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {1, CB4_CA5,   CB5_CA5,   CB6_CA5},
 
-    {1, G_1,   H_1,   I_1},
-    {1, G_2,   H_2,   I_2},
-    {1, G_3,   H_3,   I_3},
-    {1, G_4,   H_4,   I_4},
-    {1, G_5,   H_5,   I_5},
-    {1, G_6,   H_6,   I_6},
-    {1, G_7,   H_7,   I_7},
-    {1, G_8,   H_8,   I_8},
-    {1, G_9,   H_9,   I_9},
-    {1, G_10,  H_10,  I_10},
-    {1, G_11,  H_11,  I_11},
+    {1, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {1, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {1, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {1, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {1, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {1, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {1, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {1, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {1, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {1, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {1, CB7_CA11,  CB8_CA11,  CB9_CA11},
 
-    {1, J_1,   K_1,   L_1},
-    {1, J_2,   K_2,   L_2},
-    {1, J_3,   K_3,   L_3},
-    {1, J_4,   K_4,   L_4},
-    {1, J_5,   K_5,   L_5},
-    {1, J_6,   K_6,   L_6},
-    {1, J_7,   K_7,   L_7},
-    {1, J_8,   K_8,   L_8},
-    {1, J_9,   K_9,   L_9},
-    {1, J_10,  K_10,  L_10},
-    {1, J_11,  K_11,  L_11},
+    {1, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {1, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {1, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {1, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {1, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {1, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {1, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {1, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {1, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {1, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {1, CB10_CA11,  CB11_CA11,  CB12_CA11},
 };
 
 // clang-format on
diff --git a/keyboards/monsgeek/m3/m3.c b/keyboards/monsgeek/m3/m3.c
index 2bdba9fa31..9a93a7d7d4 100644
--- a/keyboards/monsgeek/m3/m3.c
+++ b/keyboards/monsgeek/m3/m3.c
@@ -25,103 +25,103 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       |       B location
  *   |  |       |       | */
     /*row0*/
-    {1, A_1,   B_1,   C_1},
-    {1, A_2,   B_2,   C_2},
-    {1, A_3,   B_3,   C_3},
-    {1, A_4,   B_4,   C_4},
-    {1, A_5,   B_5,   C_5},
-    {1, A_6,   B_6,   C_6},
-    {1, A_7,   B_7,   C_7},
-    {1, A_8,   B_8,   C_8},
-    {1, A_9,   B_9,   C_9},
-    {1, A_10,  B_10,  C_10},
-    {1, A_11,  B_11,  C_11},
-    {1, A_12,  B_12,  C_12},
-    {1, A_13,  B_13,  C_13},
-    {1, A_14,  B_14,  C_14},
-    {1, A_15,  B_15,  C_15},
-    {1, A_16,  B_16,  C_16},
+    {1, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {1, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {1, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {1, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {1, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {1, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {1, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {1, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {1, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {1, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {1, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {1, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {1, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {1, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB1_CA15,  CB2_CA15,  CB3_CA15},
+    {1, CB1_CA16,  CB2_CA16,  CB3_CA16},
 
     /*row1*/
-    {0, A_1,   B_1,   C_1},
-    {0, A_2,   B_2,   C_2},
-    {0, A_3,   B_3,   C_3},
-    {0, A_4,   B_4,   C_4},
-    {0, A_5,   B_5,   C_5},
-    {0, A_6,   B_6,   C_6},
-    {0, A_7,   B_7,   C_7},
-    {0, A_8,   B_8,   C_8},
-    {0, A_9,   B_9,   C_9},
-    {0, A_10,  B_10,  C_10},
-    {0, A_11,  B_11,  C_11},
-    {0, A_12,  B_12,  C_12},
-    {0, A_13,  B_13,  C_13},
-    {0, A_14,  B_14,  C_14},
-    {1, D_1,    E_1,   F_1},
-    {1, D_2,    E_2,   F_2},
-    {1, D_3,    E_3,   F_3},
+    {0, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {0, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {0, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {0, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {0, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {0, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {0, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {0, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {0, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {0, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {0, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {0, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {0, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {0, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB4_CA1,    CB5_CA1,   CB6_CA1},
+    {1, CB4_CA2,    CB5_CA2,   CB6_CA2},
+    {1, CB4_CA3,    CB5_CA3,   CB6_CA3},
 
     /*row2*/
-    {0, D_1,   E_1,   F_1},
-    {0, D_2,   E_2,   F_2},
-    {0, D_3,   E_3,   F_3},
-    {0, D_4,   E_4,   F_4},
-    {0, D_5,   E_5,   F_5},
-    {0, D_6,   E_6,   F_6},
-    {0, D_7,   E_7,   F_7},
-    {0, D_8,   E_8,   F_8},
-    {0, D_9,   E_9,   F_9},
-    {0, D_10,  E_10,  F_10},
-    {0, D_11,  E_11,  F_11},
-    {0, D_12,  E_12,  F_12},
-    {0, D_13,  E_13,  F_13},
-    {0, D_14,  E_14,  F_14},
-    {1, G_1,   H_1,   I_1},
-    {1, G_2,   H_2,   I_2},
-    {1, G_3,   H_3,   I_3},
+    {0, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {0, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {0, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {0, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {0, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {0, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {0, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {0, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {0, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {0, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {0, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {0, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {0, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {0, CB4_CA14,  CB5_CA14,  CB6_CA14},
+    {1, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {1, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {1, CB7_CA3,   CB8_CA3,   CB9_CA3},
 
     /*row3*/
-    {0, G_1,   H_1,   I_1},
-    {0, G_2,   H_2,   I_2},
-    {0, G_3,   H_3,   I_3},
-    {0, G_4,   H_4,   I_4},
-    {0, G_5,   H_5,   I_5},
-    {0, G_6,   H_6,   I_6},
-    {0, G_7,   H_7,   I_7},
-    {0, G_8,   H_8,   I_8},
-    {0, G_9,   H_9,   I_9},
-    {0, G_10,  H_10,  I_10},
-    {0, G_11,  H_11,  I_11},
-    {0, G_12,  H_12,  I_12},
-    {0, G_13,  H_13,  I_13},
+    {0, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {0, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {0, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {0, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {0, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {0, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {0, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {0, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {0, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {0, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {0, CB7_CA11,  CB8_CA11,  CB9_CA11},
+    {0, CB7_CA12,  CB8_CA12,  CB9_CA12},
+    {0, CB7_CA13,  CB8_CA13,  CB9_CA13},
 
     /*row4*/
-    {0, J_1,   K_1,   L_1},
-    {0, J_2,   K_2,   L_2},
-    {0, J_3,   K_3,   L_3},
-    {0, J_4,   K_4,   L_4},
-    {0, J_5,   K_5,   L_5},
-    {0, J_6,   K_6,   L_6},
-    {0, J_7,   K_7,   L_7},
-    {0, J_8,   K_8,   L_8},
-    {0, J_9,   K_9,   L_9},
-    {0, J_10,  K_10,  L_10},
-    {0, J_11,  K_11,  L_11},
-    {0, J_12,  K_12,  L_12},
-    {1,  J_4,   K_4,  L_4},
+    {0, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {0, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {0, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {0, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {0, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {0, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {0, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {0, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {0, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {0, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {0, CB10_CA11,  CB11_CA11,  CB12_CA11},
+    {0, CB10_CA12,  CB11_CA12,  CB12_CA12},
+    {1,  CB10_CA4,   CB11_CA4,  CB12_CA4},
 
     /*row5*/
-    {0, J_13,  K_13,  L_13},
-    {0, J_14,  K_14,  L_14},
-    {0, J_15,  K_15,  L_15},
-    {0, J_16,  K_16,  L_16},
-    {0, G_14,  H_14,  I_14},
-    {0, G_15,  H_15,  I_15},
-    {0, G_16,  H_16,  I_16},
-    {0, D_15,  E_15,  F_15},
-    {1,  J_1,   K_1,  L_1},
-    {1,  J_2,   K_2,  L_2},
-    {1,  J_3,   K_3,  L_3},
+    {0, CB10_CA13,  CB11_CA13,  CB12_CA13},
+    {0, CB10_CA14,  CB11_CA14,  CB12_CA14},
+    {0, CB10_CA15,  CB11_CA15,  CB12_CA15},
+    {0, CB10_CA16,  CB11_CA16,  CB12_CA16},
+    {0, CB7_CA14,  CB8_CA14,  CB9_CA14},
+    {0, CB7_CA15,  CB8_CA15,  CB9_CA15},
+    {0, CB7_CA16,  CB8_CA16,  CB9_CA16},
+    {0, CB4_CA15,  CB5_CA15,  CB6_CA15},
+    {1,  CB10_CA1,   CB11_CA1,  CB12_CA1},
+    {1,  CB10_CA2,   CB11_CA2,  CB12_CA2},
+    {1,  CB10_CA3,   CB11_CA3,  CB12_CA3},
 };
 #endif // RGB_MATRIX_ENABLE
 
diff --git a/keyboards/monsgeek/m5/m5.c b/keyboards/monsgeek/m5/m5.c
index 2e244542ef..822214a05c 100644
--- a/keyboards/monsgeek/m5/m5.c
+++ b/keyboards/monsgeek/m5/m5.c
@@ -25,125 +25,125 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       |       B location
  *   |  |       |       | */
     /*row0*/
-    {1, A_1,   B_1,   C_1},
-    {1, A_2,   B_2,   C_2},
-    {1, A_3,   B_3,   C_3},
-    {1, A_4,   B_4,   C_4},
-    {1, A_5,   B_5,   C_5},
-    {1, A_6,   B_6,   C_6},
-    {1, A_7,   B_7,   C_7},
-    {1, A_8,   B_8,   C_8},
-    {1, A_9,   B_9,   C_9},
-    {1, A_10,  B_10,  C_10},
-    {1, A_11,  B_11,  C_11},
-    {1, A_12,  B_12,  C_12},
-    {1, A_13,  B_13,  C_13},
-    {1, A_14,  B_14,  C_14},
-    {1, A_15,  B_15,  C_15},
-    {1, A_16,  B_16,  C_16},
-    {1, D_11,  E_11,  F_11},
-    {1, D_12,  E_12,  F_12},
-    {1, D_13,  E_13,  F_13},
-    {1, D_14,  E_14,  F_14},
+    {1, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {1, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {1, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {1, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {1, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {1, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {1, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {1, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {1, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {1, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {1, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {1, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {1, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {1, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB1_CA15,  CB2_CA15,  CB3_CA15},
+    {1, CB1_CA16,  CB2_CA16,  CB3_CA16},
+    {1, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {1, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {1, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {1, CB4_CA14,  CB5_CA14,  CB6_CA14},
 
     /*row1*/
-    {0, A_1,   B_1,   C_1},
-    {0, A_2,   B_2,   C_2},
-    {0, A_3,   B_3,   C_3},
-    {0, A_4,   B_4,   C_4},
-    {0, A_5,   B_5,   C_5},
-    {0, A_6,   B_6,   C_6},
-    {0, A_7,   B_7,   C_7},
-    {0, A_8,   B_8,   C_8},
-    {0, A_9,   B_9,   C_9},
-    {0, A_10,  B_10,  C_10},
-    {0, A_11,  B_11,  C_11},
-    {0, A_12,  B_12,  C_12},
-    {0, A_13,  B_13,  C_13},
-    {0, A_14,  B_14,  C_14},
-    {1, D_1,   E_1,   F_1 },
-    {1, D_2,   E_2,   F_2},
-    {1, D_3,   E_3,   F_3},
-    {1, D_4,   E_4,   F_4},
-    {1, D_5,   E_5,   F_5},
-    {1, D_6,   E_6,   F_6},
-    {1, D_7,   E_7,   F_7},
+    {0, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {0, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {0, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {0, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {0, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {0, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {0, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {0, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {0, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {0, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {0, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {0, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {0, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {0, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB4_CA1,   CB5_CA1,   CB6_CA1 },
+    {1, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {1, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {1, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {1, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {1, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {1, CB4_CA7,   CB5_CA7,   CB6_CA7},
 
     /*row2*/
-    {0, D_1,   E_1,   F_1},
-    {0, D_2,   E_2,   F_2},
-    {0, D_3,   E_3,   F_3},
-    {0, D_4,   E_4,   F_4},
-    {0, D_5,   E_5,   F_5},
-    {0, D_6,   E_6,   F_6},
-    {0, D_7,   E_7,   F_7},
-    {0, D_8,   E_8,   F_8},
-    {0, D_9,   E_9,   F_9},
-    {0, D_10,  E_10,  F_10},
-    {0, D_11,  E_11,  F_11},
-    {0, D_12,  E_12,  F_12},
-    {0, D_13,  E_13,  F_13},
-    {0, D_14,  E_14,  F_14},
-    {1, G_1,   H_1,   I_1},
-    {1, G_2,   H_2,   I_2},
-    {1, G_3,   H_3,   I_3},
-    {1, D_8,   E_8,   F_8},
-    {1, D_9,   E_9,   F_9},
-    {1, D_10,  E_10,  F_10},
-    {1, G_7,   H_7,   I_7},
+    {0, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {0, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {0, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {0, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {0, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {0, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {0, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {0, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {0, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {0, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {0, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {0, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {0, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {0, CB4_CA14,  CB5_CA14,  CB6_CA14},
+    {1, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {1, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {1, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {1, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {1, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {1, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {1, CB7_CA7,   CB8_CA7,   CB9_CA7},
 
     /*row3*/
-    {0, G_1,   H_1,   I_1},
-    {0, G_2,   H_2,   I_2},
-    {0, G_3,   H_3,   I_3},
-    {0, G_4,   H_4,   I_4},
-    {0, G_5,   H_5,   I_5},
-    {0, G_6,   H_6,   I_6},
-    {0, G_7,   H_7,   I_7},
-    {0, G_8,   H_8,   I_8},
-    {0, G_9,   H_9,   I_9},
-    {0, G_10,  H_10,  I_10},
-    {0, G_11,  H_11,  I_11},
-    {0, G_12,  H_12,  I_12},
-    {0, G_13,  H_13,  I_13},
-    {1, G_4,   H_4,   I_4},
-    {1, G_5,   H_5,   I_5},
-    {1, G_6,   H_6,   I_6},
+    {0, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {0, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {0, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {0, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {0, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {0, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {0, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {0, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {0, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {0, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {0, CB7_CA11,  CB8_CA11,  CB9_CA11},
+    {0, CB7_CA12,  CB8_CA12,  CB9_CA12},
+    {0, CB7_CA13,  CB8_CA13,  CB9_CA13},
+    {1, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {1, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {1, CB7_CA6,   CB8_CA6,   CB9_CA6},
 
 
     /*row4*/
-    {0, J_1,   K_1,   L_1},
-    {0, J_2,   K_2,   L_2},
-    {0, J_3,   K_3,   L_3},
-    {0, J_4,   K_4,   L_4},
-    {0, J_5,   K_5,   L_5},
-    {0, J_6,   K_6,   L_6},
-    {0, J_7,   K_7,   L_7},
-    {0, J_8,   K_8,   L_8},
-    {0, J_9,   K_9,   L_9},
-    {0, J_10,  K_10,  L_10},
-    {0, J_11,  K_11,  L_11},
-    {0, J_12,  K_12,  L_12},
-    {1,  J_4,   K_4,  L_4},
-    {1,  J_7,   K_7,  L_7},
-    {1,  J_8,   K_8,  L_8},
-    {1,  J_9,   K_9,  L_9},
-    {1,  J_10,  K_10, L_10},
+    {0, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {0, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {0, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {0, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {0, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {0, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {0, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {0, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {0, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {0, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {0, CB10_CA11,  CB11_CA11,  CB12_CA11},
+    {0, CB10_CA12,  CB11_CA12,  CB12_CA12},
+    {1,  CB10_CA4,   CB11_CA4,  CB12_CA4},
+    {1,  CB10_CA7,   CB11_CA7,  CB12_CA7},
+    {1,  CB10_CA8,   CB11_CA8,  CB12_CA8},
+    {1,  CB10_CA9,   CB11_CA9,  CB12_CA9},
+    {1,  CB10_CA10,  CB11_CA10, CB12_CA10},
 
     /*row5*/
-    {0, J_13,  K_13,  L_13},
-    {0, J_14,  K_14,  L_14},
-    {0, J_15,  K_15,  L_15},
-    {0, J_16,  K_16,  L_16},
-    {0, G_14,  H_14,  I_14},
-    {0, G_15,  H_15,  I_15},
-    {0, G_16,  H_16,  I_16},
-    {0, D_15,  E_15,  F_15},
-    {1,  J_1,   K_1,  L_1},
-    {1,  J_2,   K_2,  L_2},
-    {1,  J_3,   K_3,  L_3},
-    {1,  J_5,   K_5,  L_5},
-    {1,  J_6,   K_6,  L_6},
+    {0, CB10_CA13,  CB11_CA13,  CB12_CA13},
+    {0, CB10_CA14,  CB11_CA14,  CB12_CA14},
+    {0, CB10_CA15,  CB11_CA15,  CB12_CA15},
+    {0, CB10_CA16,  CB11_CA16,  CB12_CA16},
+    {0, CB7_CA14,  CB8_CA14,  CB9_CA14},
+    {0, CB7_CA15,  CB8_CA15,  CB9_CA15},
+    {0, CB7_CA16,  CB8_CA16,  CB9_CA16},
+    {0, CB4_CA15,  CB5_CA15,  CB6_CA15},
+    {1,  CB10_CA1,   CB11_CA1,  CB12_CA1},
+    {1,  CB10_CA2,   CB11_CA2,  CB12_CA2},
+    {1,  CB10_CA3,   CB11_CA3,  CB12_CA3},
+    {1,  CB10_CA5,   CB11_CA5,  CB12_CA5},
+    {1,  CB10_CA6,   CB11_CA6,  CB12_CA6},
 
 };
 #endif
diff --git a/keyboards/monsgeek/m6/m6.c b/keyboards/monsgeek/m6/m6.c
index 3d0a60eb0d..ef7fc92015 100644
--- a/keyboards/monsgeek/m6/m6.c
+++ b/keyboards/monsgeek/m6/m6.c
@@ -24,105 +24,105 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, A_1,   B_1,   C_1},
-    {0, A_2,   B_2,   C_2},
-    {0, A_3,   B_3,   C_3},
-    {0, A_4,   B_4,   C_4},
-    {0, A_5,   B_5,   C_5},
-    {0, A_6,   B_6,   C_6},
-    {0, A_7,   B_7,   C_7},
-    {0, A_8,   B_8,   C_8},
-    {0, A_9,   B_9,   C_9},
-    {0, A_10,  B_10,  C_10},
-    {0, A_11,  B_11,  C_11},
-    {0, A_12,  B_12,  C_12},
-    {0, A_13,  B_13,  C_13},
-    {0, A_14,  B_14,  C_14},
-    {1, D_1,   E_1,   F_1},
+    {0, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {0, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {0, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {0, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {0, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {0, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {0, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {0, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {0, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {0, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {0, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {0, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {0, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {0, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB4_CA1,   CB5_CA1,   CB6_CA1},
 
-    {0, D_1,   E_1,   F_1},
-    {0, D_2,   E_2,   F_2},
-    {0, D_3,   E_3,   F_3},
-    {0, D_4,   E_4,   F_4},
-    {0, D_5,   E_5,   F_5},
-    {0, D_6,   E_6,   F_6},
-    {0, D_7,   E_7,   F_7},
-    {0, D_8,   E_8,   F_8},
-    {0, D_9,   E_9,   F_9},
-    {0, D_10,  E_10,  F_10},
-    {0, D_11,  E_11,  F_11},
-    {0, D_12,  E_12,  F_12},
-    {0, D_13,  E_13,  F_13},
-    {0, D_14,  E_14,  F_14},
-    {1, D_2,   E_2,   F_2},
+    {0, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {0, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {0, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {0, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {0, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {0, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {0, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {0, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {0, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {0, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {0, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {0, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {0, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {0, CB4_CA14,  CB5_CA14,  CB6_CA14},
+    {1, CB4_CA2,   CB5_CA2,   CB6_CA2},
 
-    {0, G_1,   H_1,   I_1},
-    {0, G_2,   H_2,   I_2},
-    {0, G_3,   H_3,   I_3},
-    {0, G_4,   H_4,   I_4},
-    {0, G_5,   H_5,   I_5},
-    {0, G_6,   H_6,   I_6},
-    {0, G_7,   H_7,   I_7},
-    {0, G_8,   H_8,   I_8},
-    {0, G_9,   H_9,   I_9},
-    {0, G_10,  H_10,  I_10},
-    {0, G_11,  H_11,  I_11},
-    {0, G_12,  H_12,  I_12},
-    {0, A_15,  B_15,  C_15},
-    {0, G_13,  H_13,  I_13},
-    {1, D_3,   E_3,   F_3},
+    {0, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {0, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {0, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {0, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {0, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {0, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {0, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {0, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {0, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {0, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {0, CB7_CA11,  CB8_CA11,  CB9_CA11},
+    {0, CB7_CA12,  CB8_CA12,  CB9_CA12},
+    {0, CB1_CA15,  CB2_CA15,  CB3_CA15},
+    {0, CB7_CA13,  CB8_CA13,  CB9_CA13},
+    {1, CB4_CA3,   CB5_CA3,   CB6_CA3},
 
-    {0, J_1,   K_1,   L_1},
-    {0, A_16,  B_16,  C_16},
-    {0, J_2,   K_2,   L_2},
-    {0, J_3,   K_3,   L_3},
-    {0, J_4,   K_4,   L_4},
-    {0, J_5,   K_5,   L_5},
-    {0, J_6,   K_6,   L_6},
-    {0, J_7,   K_7,   L_7},
-    {0, J_8,   K_8,   L_8},
-    {0, J_9,   K_9,   L_9},
-    {0, J_10,  K_10,  L_10},
-    {0, J_11,  K_11,  L_11},
-    {0, J_12,  K_12,  L_12},
-    {1, D_7,   E_7,   F_7},
-    {1, D_4,   E_4,   F_4},
+    {0, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {0, CB1_CA16,  CB2_CA16,  CB3_CA16},
+    {0, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {0, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {0, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {0, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {0, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {0, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {0, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {0, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {0, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {0, CB10_CA11,  CB11_CA11,  CB12_CA11},
+    {0, CB10_CA12,  CB11_CA12,  CB12_CA12},
+    {1, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {1, CB4_CA4,   CB5_CA4,   CB6_CA4},
 
-    {0, J_13,  K_13,  L_13},
-    {0, J_14,  K_14,  L_14},
-    {0, J_15,  K_15,  L_15},
-    {0, J_16,  K_16,  L_16},
-    {0, G_14,  H_14,  I_14},
-    {0, G_15,  H_15,  I_15},
-    {0, G_16,  H_16,  I_16},
-    {0, D_15,  E_15,  F_15},
-    {1, D_6,   E_6,   F_6},
-    {1, D_5,   E_5,   F_5},
+    {0, CB10_CA13,  CB11_CA13,  CB12_CA13},
+    {0, CB10_CA14,  CB11_CA14,  CB12_CA14},
+    {0, CB10_CA15,  CB11_CA15,  CB12_CA15},
+    {0, CB10_CA16,  CB11_CA16,  CB12_CA16},
+    {0, CB7_CA14,  CB8_CA14,  CB9_CA14},
+    {0, CB7_CA15,  CB8_CA15,  CB9_CA15},
+    {0, CB7_CA16,  CB8_CA16,  CB9_CA16},
+    {0, CB4_CA15,  CB5_CA15,  CB6_CA15},
+    {1, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {1, CB4_CA5,   CB5_CA5,   CB6_CA5},
 
 
-    {1, G_1,   H_1,   I_1},
-    {1, G_2,   H_2,   I_2},
-    {1, G_3,   H_3,   I_3},
-    {1, G_4,   H_4,   I_4},
-    {1, G_5,   H_5,   I_5},
-    {1, G_6,   H_6,   I_6},
-    {1, G_7,   H_7,   I_7},
-    {1, G_8,   H_8,   I_8},
-    {1, G_9,   H_9,   I_9},
-    {1, G_10,  H_10,  I_10},
-    {1, G_11,  H_11,  I_11},
+    {1, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {1, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {1, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {1, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {1, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {1, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {1, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {1, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {1, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {1, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {1, CB7_CA11,  CB8_CA11,  CB9_CA11},
 
-    {1, J_1,   K_1,   L_1},
-    {1, J_2,   K_2,   L_2},
-    {1, J_3,   K_3,   L_3},
-    {1, J_4,   K_4,   L_4},
-    {1, J_5,   K_5,   L_5},
-    {1, J_6,   K_6,   L_6},
-    {1, J_7,   K_7,   L_7},
-    {1, J_8,   K_8,   L_8},
-    {1, J_9,   K_9,   L_9},
-    {1, J_10,  K_10,  L_10},
-    {1, J_11,  K_11,  L_11},
+    {1, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {1, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {1, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {1, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {1, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {1, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {1, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {1, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {1, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {1, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {1, CB10_CA11,  CB11_CA11,  CB12_CA11},
 };
 
 // clang-format on