diff --git a/keyboards/fingerpunch/personal/le_chiffre_democratique/fp_build.json b/keyboards/fingerpunch/personal/le_chiffre_democratique/fp_build.json
index c16887a1ea..0d7282335f 100644
--- a/keyboards/fingerpunch/personal/le_chiffre_democratique/fp_build.json
+++ b/keyboards/fingerpunch/personal/le_chiffre_democratique/fp_build.json
@@ -9,10 +9,10 @@
             "VIK_PER56_PMW3360_LEDS",
             "VIK_PMW3360",
             "VIK_WEACT_ST7735",
-            "VIK_VIK_GC9A01",
+            "VIK_GC9A01",
             "VIK_WAVESHARE_22224"
         ],
-        "user_input": "Are you using a VIK module? NONE, VIK_HAPTIC, VIK_ILI9341, VIK_PER56_CIRQUE_LEDS, VIK_PER56_CIRQUE_LEDS, VIK_PER56_PMW3360_LEDS, VIK_PMW3360, VIK_WEACT_ST7735, VIK_VIK_GC9A01, VIK_WAVESHARE_22224"
+        "user_input": "Are you using a VIK module? NONE, VIK_HAPTIC, VIK_ILI9341, VIK_PER56_CIRQUE_LEDS, VIK_PER56_CIRQUE_LEDS, VIK_PER56_PMW3360_LEDS, VIK_PMW3360, VIK_WEACT_ST7735, VIK_GC9A01, VIK_WAVESHARE_22224"
     },
     {
         "type" : "single",
diff --git a/keyboards/fingerpunch/personal/testamatta/fp_build.json b/keyboards/fingerpunch/personal/testamatta/fp_build.json
index 95255c19f8..3c4e80ab10 100644
--- a/keyboards/fingerpunch/personal/testamatta/fp_build.json
+++ b/keyboards/fingerpunch/personal/testamatta/fp_build.json
@@ -9,9 +9,9 @@
             "VIK_PER56_PMW3360_LEDS",
             "VIK_PMW3360",
             "VIK_WEACT_ST7735",
-            "VIK_VIK_GC9A01",
+            "VIK_GC9A01",
             "VIK_WAVESHARE_22224"
         ],
-        "user_input": "Which VIK module are you testing? NONE, VIK_HAPTIC, VIK_ILI9341, VIK_PER56_CIRQUE_LEDS, VIK_PER56_CIRQUE_LEDS, VIK_PER56_PMW3360_LEDS, VIK_PMW3360, VIK_WEACT_ST7735, VIK_VIK_GC9A01, VIK_WAVESHARE_22224"
+        "user_input": "Which VIK module are you testing? NONE, VIK_HAPTIC, VIK_ILI9341, VIK_PER56_CIRQUE_LEDS, VIK_PER56_CIRQUE_LEDS, VIK_PER56_PMW3360_LEDS, VIK_PMW3360, VIK_WEACT_ST7735, VIK_GC9A01, VIK_WAVESHARE_22224"
     }
 ]
diff --git a/keyboards/fingerpunch/src/vik/config.h b/keyboards/fingerpunch/src/vik/config.h
index f602c0509d..5a405c33ee 100644
--- a/keyboards/fingerpunch/src/vik/config.h
+++ b/keyboards/fingerpunch/src/vik/config.h
@@ -8,7 +8,7 @@
  * VIK_PER56_PMW3360_LEDS
  * VIK_PMW3360
  * VIK_WEACT_ST7735
- * VIK_VIK_GC9A01
+ * VIK_GC9A01
  * VIK_WAVESHARE_22224
  * VIK_AZOTEQ
  * VIK_EC11_EVQWGD001
diff --git a/keyboards/fingerpunch/src/vik/rules.mk b/keyboards/fingerpunch/src/vik/rules.mk
index fe6a039e88..c6ccb2834d 100644
--- a/keyboards/fingerpunch/src/vik/rules.mk
+++ b/keyboards/fingerpunch/src/vik/rules.mk
@@ -8,7 +8,7 @@
 # VIK_PER56_PMW3360_LEDS
 # VIK_PMW3360
 # VIK_WEACT_ST7735
-# VIK_VIK_GC9A01
+# VIK_GC9A01
 # VIK_WAVESHARE_22224
 # VIK_AZOTEQ
 # VIK_EC11_EVQWGD001
diff --git a/keyboards/fingerpunch/svlinky/fp_build.json b/keyboards/fingerpunch/svlinky/fp_build.json
index a678931461..c2505ab85f 100644
--- a/keyboards/fingerpunch/svlinky/fp_build.json
+++ b/keyboards/fingerpunch/svlinky/fp_build.json
@@ -14,13 +14,13 @@
             "VIK_PER56_PMW3360_LEDS",
             "VIK_PMW3360",
             "VIK_WEACT_ST7735",
-            "VIK_VIK_GC9A01",
+            "VIK_GC9A01",
             "VIK_WAVESHARE_22224",
             "VIK_AZOTEQ",
             "VIK_EC11_EVQWGD001",
             "VIK_TRACKPOINT"
         ],
-        "user_input": "Which VIK module are you testing? NONE, VIK_HAPTIC, VIK_ILI9341, VIK_PER56_CIRQUE_LEDS, VIK_PER56_CIRQUE_LEDS, VIK_PER56_PMW3360_LEDS, VIK_PMW3360, VIK_WEACT_ST7735, VIK_VIK_GC9A01, VIK_WAVESHARE_22224, VIK_AZOTEQ, VIK_EC11_EVQWGD001, VIK_AZOTEQ, VIK_EC11_EVQWGD001, VIK_TRACKPOINT"
+        "user_input": "Which VIK module are you testing? NONE, VIK_HAPTIC, VIK_ILI9341, VIK_PER56_CIRQUE_LEDS, VIK_PER56_CIRQUE_LEDS, VIK_PER56_PMW3360_LEDS, VIK_PMW3360, VIK_WEACT_ST7735, VIK_GC9A01, VIK_WAVESHARE_22224, VIK_AZOTEQ, VIK_EC11_EVQWGD001, VIK_AZOTEQ, VIK_EC11_EVQWGD001, VIK_TRACKPOINT"
     },
     {
         "type" : "single",
diff --git a/keyboards/fingerpunch/vulpes_majora/v1/fp_build.json b/keyboards/fingerpunch/vulpes_majora/v1/fp_build.json
index d5087767b7..155146a9fb 100644
--- a/keyboards/fingerpunch/vulpes_majora/v1/fp_build.json
+++ b/keyboards/fingerpunch/vulpes_majora/v1/fp_build.json
@@ -7,7 +7,7 @@
             "FP_TRACKBALL_ENABLE",
             "VIK_ILI9341",
             "VIK_WEACT_ST7735",
-            "VIK_VIK_GC9A01",
+            "VIK_GC9A01",
             "VIK_WAVESHARE_22224"
         ],
         "name" : "CIRQUE_ENABLE",
diff --git a/keyboards/fingerpunch/vulpes_minora/byomcu/fp_build.json b/keyboards/fingerpunch/vulpes_minora/byomcu/fp_build.json
index cee4b12e66..33ce69e3b1 100644
--- a/keyboards/fingerpunch/vulpes_minora/byomcu/fp_build.json
+++ b/keyboards/fingerpunch/vulpes_minora/byomcu/fp_build.json
@@ -9,10 +9,10 @@
             "VIK_PMW3360",
             "VIK_ILI9341",
             "VIK_WEACT_ST7735",
-            "VIK_VIK_GC9A01",
+            "VIK_GC9A01",
             "VIK_WAVESHARE_22224"
         ],
-        "user_input": "Are you using a VIK module? NONE, VIK_HAPTIC, VIK_PER56_CIRQUE_LEDS, VIK_PER56_CIRQUE_LEDS, VIK_PER56_PMW3360_LEDS, VIK_PMW3360, VIK_ILI9341, VIK_WEACT_ST7735, VIK_VIK_GC9A01, VIK_WAVESHARE_22224"
+        "user_input": "Are you using a VIK module? NONE, VIK_HAPTIC, VIK_PER56_CIRQUE_LEDS, VIK_PER56_CIRQUE_LEDS, VIK_PER56_PMW3360_LEDS, VIK_PMW3360, VIK_ILI9341, VIK_WEACT_ST7735, VIK_GC9A01, VIK_WAVESHARE_22224"
     },
     {
         "type" : "single",
diff --git a/keyboards/fingerpunch/vulpes_minora/rp2040zero/fp_build.json b/keyboards/fingerpunch/vulpes_minora/rp2040zero/fp_build.json
index 62787714a4..ee62e66b9e 100644
--- a/keyboards/fingerpunch/vulpes_minora/rp2040zero/fp_build.json
+++ b/keyboards/fingerpunch/vulpes_minora/rp2040zero/fp_build.json
@@ -9,10 +9,10 @@
             "VIK_PMW3360",
             "VIK_ILI9341",
             "VIK_WEACT_ST7735",
-            "VIK_VIK_GC9A01",
+            "VIK_GC9A01",
             "VIK_WAVESHARE_22224"
         ],
-        "user_input": "Are you using a VIK module? NONE, VIK_HAPTIC, VIK_PER56_CIRQUE_LEDS, VIK_PER56_CIRQUE_LEDS, VIK_PER56_PMW3360_LEDS, VIK_PMW3360, VIK_ILI9341, VIK_WEACT_ST7735, VIK_VIK_GC9A01, VIK_WAVESHARE_22224"
+        "user_input": "Are you using a VIK module? NONE, VIK_HAPTIC, VIK_PER56_CIRQUE_LEDS, VIK_PER56_CIRQUE_LEDS, VIK_PER56_PMW3360_LEDS, VIK_PMW3360, VIK_ILI9341, VIK_WEACT_ST7735, VIK_GC9A01, VIK_WAVESHARE_22224"
     },
     {
         "type" : "single",
diff --git a/keyboards/fingerpunch/vulpes_minora/xivik/fp_build.json b/keyboards/fingerpunch/vulpes_minora/xivik/fp_build.json
index 8f697374ca..65c0ece8bf 100644
--- a/keyboards/fingerpunch/vulpes_minora/xivik/fp_build.json
+++ b/keyboards/fingerpunch/vulpes_minora/xivik/fp_build.json
@@ -17,10 +17,10 @@
             "VIK_PMW3360",
             "VIK_ILI9341",
             "VIK_WEACT_ST7735",
-            "VIK_VIK_GC9A01",
+            "VIK_GC9A01",
             "VIK_WAVESHARE_22224",
             "VIK_EC11_EVQWGD001"
         ],
-        "user_input": "Which VIK module are you testing? NONE, VIK_HAPTIC, VIK_PER56_CIRQUE_LEDS, VIK_PER56_CIRQUE_LEDS, VIK_PER56_PMW3360_LEDS, VIK_PMW3360, VIK_ILI9341, VIK_WEACT_ST7735, VIK_VIK_GC9A01, VIK_WAVESHARE_22224, VIK_EC11_EVQWGD001"
+        "user_input": "Which VIK module are you testing? NONE, VIK_HAPTIC, VIK_PER56_CIRQUE_LEDS, VIK_PER56_CIRQUE_LEDS, VIK_PER56_PMW3360_LEDS, VIK_PMW3360, VIK_ILI9341, VIK_WEACT_ST7735, VIK_GC9A01, VIK_WAVESHARE_22224, VIK_EC11_EVQWGD001"
     }
 ]
diff --git a/keyboards/fingerpunch/xivik/fp_build.json b/keyboards/fingerpunch/xivik/fp_build.json
index ba58665b4f..990deb254b 100644
--- a/keyboards/fingerpunch/xivik/fp_build.json
+++ b/keyboards/fingerpunch/xivik/fp_build.json
@@ -17,11 +17,11 @@
             "VIK_PMW3360",
             "VIK_ILI9341",
             "VIK_WEACT_ST7735",
-            "VIK_VIK_GC9A01",
+            "VIK_GC9A01",
             "VIK_WAVESHARE_22224",
             "VIK_EC11_EVQWGD001"
         ],
-        "user_input": "Which VIK module are you testing? NONE, VIK_HAPTIC, VIK_PER56_CIRQUE_LEDS, VIK_PER56_CIRQUE_LEDS, VIK_PER56_PMW3360_LEDS, VIK_PMW3360, VIK_ILI9341, VIK_WEACT_ST7735, VIK_VIK_GC9A01, VIK_WAVESHARE_22224, VIK_EC11_EVQWGD001"
+        "user_input": "Which VIK module are you testing? NONE, VIK_HAPTIC, VIK_PER56_CIRQUE_LEDS, VIK_PER56_CIRQUE_LEDS, VIK_PER56_PMW3360_LEDS, VIK_PMW3360, VIK_ILI9341, VIK_WEACT_ST7735, VIK_GC9A01, VIK_WAVESHARE_22224, VIK_EC11_EVQWGD001"
     },
     {
         "type" : "single",