diff --git a/keyboards/czc/dwarf/config.h b/keyboards/czc/dwarf/config.h
index ee885178a3a9..834a8082a194 100644
--- a/keyboards/czc/dwarf/config.h
+++ b/keyboards/czc/dwarf/config.h
@@ -5,4 +5,4 @@
 
 /* RGB matrix configuration can't be fully expressed in JSON as of now */
 #define RGB_MATRIX_LED_COUNT 87
-#define SN32_RGB_MATRIX_ROW_PINS {C0, C1, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, C13, C14, B13, D3, B15, B14}
\ No newline at end of file
+#define SN32F2XX_RGB_MATRIX_ROW_PINS {C0, C1, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, C13, C14, B13, D3, B15, B14}
\ No newline at end of file
diff --git a/keyboards/designedbygg/berserker/config.h b/keyboards/designedbygg/berserker/config.h
index de0f8686fa70..51e5c2aed15d 100644
--- a/keyboards/designedbygg/berserker/config.h
+++ b/keyboards/designedbygg/berserker/config.h
@@ -33,5 +33,5 @@
 #define LED_WIN_LOCK_PIN B12
 
 /* RGB LED Config */
-#define SN32_RGB_MATRIX_ROW_PINS { C0, C1, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, B6, B7, B8, B9, B10, B11 }
+#define SN32F2XX_RGB_MATRIX_ROW_PINS { C0, C1, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, B6, B7, B8, B9, B10, B11 }
 #define RGB_MATRIX_LED_COUNT (88)
\ No newline at end of file
diff --git a/keyboards/designedbygg/ironclad/icl01/config.h b/keyboards/designedbygg/ironclad/icl01/config.h
index a2fb9d9f9084..377f4c7f3e0a 100644
--- a/keyboards/designedbygg/ironclad/icl01/config.h
+++ b/keyboards/designedbygg/ironclad/icl01/config.h
@@ -17,9 +17,9 @@
 #pragma once
 
 /* RGB LED Config */
-#define SN32_RGB_MATRIX_ROW_PINS \
+#define SN32F2XX_RGB_MATRIX_ROW_PINS \
     { C0, C1, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, B7, B8, B9, B10, B11, B12 }
-#define SN32_PWM_OUTPUT_ACTIVE_LEVEL SN32_PWM_OUTPUT_ACTIVE_HIGH
-#define SN32_RGB_OUTPUT_ACTIVE_LEVEL SN32_RGB_OUTPUT_ACTIVE_LOW
-#define SN32_PWM_DIRECTION ROW2COL
+#define SN32F2XX_PWM_OUTPUT_ACTIVE_LEVEL SN32F2XX_PWM_OUTPUT_ACTIVE_HIGH
+#define SN32F2XX_RGB_OUTPUT_ACTIVE_LEVEL SN32F2XX_RGB_OUTPUT_ACTIVE_LOW
+#define SN32F2XX_PWM_DIRECTION ROW2COL
 #define RGB_MATRIX_LED_COUNT (105)
\ No newline at end of file
diff --git a/keyboards/designedbygg/ironclad/icl03/config.h b/keyboards/designedbygg/ironclad/icl03/config.h
index 6b3493b6c826..1e812ba9601a 100644
--- a/keyboards/designedbygg/ironclad/icl03/config.h
+++ b/keyboards/designedbygg/ironclad/icl03/config.h
@@ -20,6 +20,6 @@
 #define LED_WIN_LOCK_PIN B12
 
 /* RGB LED Config */
-#define SN32_RGB_MATRIX_ROW_PINS \
+#define SN32F2XX_RGB_MATRIX_ROW_PINS \
     { C0, C1, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, B6, B7, B8, B9, B10, B11 }
 #define RGB_MATRIX_LED_COUNT (109)
diff --git a/keyboards/designedbygg/redblade/config.h b/keyboards/designedbygg/redblade/config.h
index d490c984aab0..61b7b6514e53 100644
--- a/keyboards/designedbygg/redblade/config.h
+++ b/keyboards/designedbygg/redblade/config.h
@@ -31,6 +31,6 @@
 #define LED_WIN_LOCK_PIN B12
 
 /* RGB LED Config */
-#define SN32_RGB_MATRIX_ROW_PINS \
+#define SN32F2XX_RGB_MATRIX_ROW_PINS \
     { C0, C1, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, B6, B7, B8, B9, B10, B11 }
 #define RGB_MATRIX_LED_COUNT (109)
diff --git a/keyboards/flesports/fl980/config.h b/keyboards/flesports/fl980/config.h
index 9c9589108458..f4a40af251db 100644
--- a/keyboards/flesports/fl980/config.h
+++ b/keyboards/flesports/fl980/config.h
@@ -16,9 +16,9 @@
 
 #pragma once
 
-#define SN32_RGB_MATRIX_ROW_PINS { C0,C1,C3, C4,C5,C6, C7,C8,C9, C10,C11,C12, C13,C14,B13, C15,B15,B14 }
+#define SN32F2XX_RGB_MATRIX_ROW_PINS { C0,C1,C3, C4,C5,C6, C7,C8,C9, C10,C11,C12, C13,C14,B13, C15,B15,B14 }
 
 #define RGB_MATRIX_LED_COUNT 98
 #define MATRIX_UNSELECT_DRIVE_HIGH
-#define SN32_PWM_OUTPUT_ACTIVE_LEVEL SN32_PWM_OUTPUT_ACTIVE_HIGH
-#define SN32_RGB_OUTPUT_ACTIVE_LEVEL SN32_RGB_OUTPUT_ACTIVE_HIGH
\ No newline at end of file
+#define SN32F2XX_PWM_OUTPUT_ACTIVE_LEVEL SN32F2XX_PWM_OUTPUT_ACTIVE_HIGH
+#define SN32F2XX_RGB_OUTPUT_ACTIVE_LEVEL SN32F2XX_RGB_OUTPUT_ACTIVE_HIGH
\ No newline at end of file
diff --git a/keyboards/hator/gravity/tkl/config.h b/keyboards/hator/gravity/tkl/config.h
index 24b96b0b6917..79ca47291c3a 100644
--- a/keyboards/hator/gravity/tkl/config.h
+++ b/keyboards/hator/gravity/tkl/config.h
@@ -16,13 +16,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define SN32_RGB_MATRIX_ROW_PINS { C3,C1,C0, C6,C5,C4, C9,C8,C7, C12,C11,C10, B13,C14,C13, B14,B15,D3, A2,A4,A3 }
+#define SN32F2XX_RGB_MATRIX_ROW_PINS { C3,C1,C0, C6,C5,C4, C9,C8,C7, C12,C11,C10, B13,C14,C13, B14,B15,D3, A2,A4,A3 }
 
-#define SN32_RGB_MATRIX_COL_PINS {A8, A9, A10, A11, A12, A13, A14, A15, B0, B1, B2, B3, B4, B5, B6, B7, B8}
+#define SN32F2XX_RGB_MATRIX_COL_PINS {A8, A9, A10, A11, A12, A13, A14, A15, B0, B1, B2, B3, B4, B5, B6, B7, B8}
 
 #define RGB_MATRIX_LED_COUNT 104
 #define MATRIX_UNSELECT_DRIVE_HIGH
-//#define SN32_PWM_OUTPUT_ACTIVE_LEVEL SN32_PWM_OUTPUT_ACTIVE_HIGH
-#define SN32_RGB_OUTPUT_ACTIVE_LEVEL SN32_RGB_OUTPUT_ACTIVE_HIGH
+//#define SN32F2XX_PWM_OUTPUT_ACTIVE_LEVEL SN32F2XX_PWM_OUTPUT_ACTIVE_HIGH
+#define SN32F2XX_RGB_OUTPUT_ACTIVE_LEVEL SN32F2XX_RGB_OUTPUT_ACTIVE_HIGH
 //#define USB_MAX_POWER_CONSUMPTION 500
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 240
\ No newline at end of file
diff --git a/keyboards/hator/gravity/xtkl/config.h b/keyboards/hator/gravity/xtkl/config.h
index 625ba5bd85f7..22dece50e220 100644
--- a/keyboards/hator/gravity/xtkl/config.h
+++ b/keyboards/hator/gravity/xtkl/config.h
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_UNSELECT_DRIVE_HIGH
 
-#define SN32_RGB_MATRIX_ROW_PINS { C3,C1,C0, C6,C5,C4, C9,C8,C7, C12,C11,C10, B13,C14,C13, B14,B15,D3, A2,A4,A3 }
-#define SN32_RGB_OUTPUT_ACTIVE_LEVEL SN32_RGB_OUTPUT_ACTIVE_HIGH
+#define SN32F2XX_RGB_MATRIX_ROW_PINS { C3,C1,C0, C6,C5,C4, C9,C8,C7, C12,C11,C10, B13,C14,C13, B14,B15,D3, A2,A4,A3 }
+#define SN32F2XX_RGB_OUTPUT_ACTIVE_LEVEL SN32F2XX_RGB_OUTPUT_ACTIVE_HIGH
 #define RGB_MATRIX_LED_COUNT 104
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 240
diff --git a/keyboards/keychron/c1/rgb/config.h b/keyboards/keychron/c1/rgb/config.h
index 39cc3cd7dc54..4b1d70684c43 100644
--- a/keyboards/keychron/c1/rgb/config.h
+++ b/keyboards/keychron/c1/rgb/config.h
@@ -14,7 +14,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#define SN32_RGB_MATRIX_ROW_PINS { C0, C1, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, C13, C14, B13, D3, B15, B14 }
+#define SN32F2XX_RGB_MATRIX_ROW_PINS { C0, C1, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, C13, C14, B13, D3, B15, B14 }
 
 #define LED_MAC_PIN         B11 // Labeled Mac on KB since no Scroll Lock
 #define LED_WIN_PIN         B12 // Labeled Windows on KB since no Numpad
diff --git a/keyboards/keychron/k12/rgb/config.h b/keyboards/keychron/k12/rgb/config.h
index 87374a259321..8626eeba6270 100644
--- a/keyboards/keychron/k12/rgb/config.h
+++ b/keyboards/keychron/k12/rgb/config.h
@@ -16,4 +16,4 @@
 
 #pragma once
 
-#define SN32_RGB_MATRIX_ROW_PINS {C6, C5, C4, C9, C8, C7, C12, C11, C10, B13, C14, C13, B14, B15, D3}
\ No newline at end of file
+#define SN32F2XX_RGB_MATRIX_ROW_PINS {C6, C5, C4, C9, C8, C7, C12, C11, C10, B13, C14, C13, B14, B15, D3}
\ No newline at end of file
diff --git a/keyboards/keychron/k2/rgb/v2/config.h b/keyboards/keychron/k2/rgb/v2/config.h
index 4ea10f15291c..5147b70a57e2 100644
--- a/keyboards/keychron/k2/rgb/v2/config.h
+++ b/keyboards/keychron/k2/rgb/v2/config.h
@@ -17,5 +17,5 @@
  */
 
 #pragma once
-#define SN32_RGB_MATRIX_ROW_PINS { C3, C1, C0, C6, C5, C4, C9, C8, C7, C12, C11, C10, B13, C14, C13, B14, B15, D3 }
+#define SN32F2XX_RGB_MATRIX_ROW_PINS { C3, C1, C0, C6, C5, C4, C9, C8, C7, C12, C11, C10, B13, C14, C13, B14, B15, D3 }
 #define DIP_SWITCH_PINS { D4, D5 }
diff --git a/keyboards/keychron/k4/rgb/v2/ansi/config.h b/keyboards/keychron/k4/rgb/v2/ansi/config.h
index 111ab0f01df3..e0f22bc0513b 100644
--- a/keyboards/keychron/k4/rgb/v2/ansi/config.h
+++ b/keyboards/keychron/k4/rgb/v2/ansi/config.h
@@ -15,4 +15,4 @@
 #define DIP_SWITCH_PINS { D5, D6 }
 #define RGB_MATRIX_LED_COUNT 100
 
-#define SN32_RGB_MATRIX_ROW_PINS { C3, C1, C0, C6, C5, C4, C9, C8, C7, C12, C11, C10, B13, C14, C13, B14, B15, D3 }
\ No newline at end of file
+#define SN32F2XX_RGB_MATRIX_ROW_PINS { C3, C1, C0, C6, C5, C4, C9, C8, C7, C12, C11, C10, B13, C14, C13, B14, B15, D3 }
\ No newline at end of file
diff --git a/keyboards/keychron/k4/rgb/v2/iso/config.h b/keyboards/keychron/k4/rgb/v2/iso/config.h
index 5eac10cdd5f5..34a1c6459cfa 100644
--- a/keyboards/keychron/k4/rgb/v2/iso/config.h
+++ b/keyboards/keychron/k4/rgb/v2/iso/config.h
@@ -15,4 +15,4 @@
 #define DIP_SWITCH_PINS { D5, D6 }
 #define RGB_MATRIX_LED_COUNT 101
 
-#define SN32_RGB_MATRIX_ROW_PINS { C3, C1, C0, C6, C5, C4, C9, C8, C7, C12, C11, C10, B13, C14, C13, B14, B15, D3 }
\ No newline at end of file
+#define SN32F2XX_RGB_MATRIX_ROW_PINS { C3, C1, C0, C6, C5, C4, C9, C8, C7, C12, C11, C10, B13, C14, C13, B14, B15, D3 }
\ No newline at end of file
diff --git a/keyboards/keychron/k8/rgb/config.h b/keyboards/keychron/k8/rgb/config.h
index d981b41b239d..04cdc6b71a28 100644
--- a/keyboards/keychron/k8/rgb/config.h
+++ b/keyboards/keychron/k8/rgb/config.h
@@ -22,4 +22,4 @@
 #define DIP_SWITCH_PINS { D4, D5 }
 
 // RGB LED Config
-#define SN32_RGB_MATRIX_ROW_PINS { C3, C1, C0, C6, C5, C4, C9, C8, C7, C12, C11, C10, B13, C14, C13, B14, B15, D3 }
\ No newline at end of file
+#define SN32F2XX_RGB_MATRIX_ROW_PINS { C3, C1, C0, C6, C5, C4, C9, C8, C7, C12, C11, C10, B13, C14, C13, B14, B15, D3 }
\ No newline at end of file
diff --git a/keyboards/ozone/tactical/config.h b/keyboards/ozone/tactical/config.h
index e1b472017be8..b60d0fca09a0 100644
--- a/keyboards/ozone/tactical/config.h
+++ b/keyboards/ozone/tactical/config.h
@@ -18,5 +18,5 @@
 #pragma once
 
 // RGB config
-#define SN32_RGB_MATRIX_ROW_PINS { C4, C5, C6,  C7, C8, C9,  C10, C11, C12, C13, C14, B13,  D3, B15, B14 }
+#define SN32F2XX_RGB_MATRIX_ROW_PINS { C4, C5, C6,  C7, C8, C9,  C10, C11, C12, C13, C14, B13,  D3, B15, B14 }
 #define RGB_MATRIX_LED_COUNT 69
\ No newline at end of file
diff --git a/keyboards/redragon/k552/v2/config.h b/keyboards/redragon/k552/v2/config.h
index 47dd843f1c81..f31451ecf0f4 100644
--- a/keyboards/redragon/k552/v2/config.h
+++ b/keyboards/redragon/k552/v2/config.h
@@ -17,9 +17,9 @@
 
 #pragma once
 
-#define SN32_RGB_MATRIX_ROW_PINS { C0, C1, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, B6, B7, B8, B9, B10, B11 }
-#define SN32_PWM_OUTPUT_ACTIVE_LEVEL SN32_PWM_OUTPUT_ACTIVE_HIGH
-#define SN32_RGB_OUTPUT_ACTIVE_LEVEL SN32_RGB_OUTPUT_ACTIVE_LOW
+#define SN32F2XX_RGB_MATRIX_ROW_PINS { C0, C1, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, B6, B7, B8, B9, B10, B11 }
+#define SN32F2XX_PWM_OUTPUT_ACTIVE_LEVEL SN32F2XX_PWM_OUTPUT_ACTIVE_HIGH
+#define SN32F2XX_RGB_OUTPUT_ACTIVE_LEVEL SN32F2XX_RGB_OUTPUT_ACTIVE_LOW
 #define MATRIX_UNSELECT_DRIVE_HIGH
 
 #define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 50
diff --git a/keyboards/redragon/k556/config.h b/keyboards/redragon/k556/config.h
index d3754fd2183e..89f593c5e274 100644
--- a/keyboards/redragon/k556/config.h
+++ b/keyboards/redragon/k556/config.h
@@ -21,11 +21,11 @@
 /* key matrix size */
 #define RGB_MATRIX_LED_COUNT 106
 
-#define SN32_RGB_MATRIX_ROW_PINS { C0, C1, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, B6, B7, B8, B9, B10, B11 }
+#define SN32F2XX_RGB_MATRIX_ROW_PINS { C0, C1, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, B6, B7, B8, B9, B10, B11 }
 
 /* Configure the effects:                                              */
 #define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 50
 
 /* Configure transistor logic for RGB matrix */
-#define SN32_PWM_OUTPUT_ACTIVE_LEVEL SN32_PWM_OUTPUT_ACTIVE_HIGH
-#define SN32_RGB_OUTPUT_ACTIVE_LEVEL SN32_RGB_OUTPUT_ACTIVE_LOW
\ No newline at end of file
+#define SN32F2XX_PWM_OUTPUT_ACTIVE_LEVEL SN32F2XX_PWM_OUTPUT_ACTIVE_HIGH
+#define SN32F2XX_RGB_OUTPUT_ACTIVE_LEVEL SN32F2XX_RGB_OUTPUT_ACTIVE_LOW
\ No newline at end of file
diff --git a/keyboards/redragon/k582/config.h b/keyboards/redragon/k582/config.h
index 376753b58516..59dfdcfbbfc6 100644
--- a/keyboards/redragon/k582/config.h
+++ b/keyboards/redragon/k582/config.h
@@ -21,11 +21,11 @@
 /* key matrix size */
 #define RGB_MATRIX_LED_COUNT 104
 
-#define SN32_RGB_MATRIX_ROW_PINS { C0, C1, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, B6, B7, B8, B9, B10, B11 }
+#define SN32F2XX_RGB_MATRIX_ROW_PINS { C0, C1, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, B6, B7, B8, B9, B10, B11 }
 
 /* Configure the effects:                                              */
 #define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 50
 
 /* Configure transistor logic for RGB matrix */
-#define SN32_PWM_OUTPUT_ACTIVE_LEVEL SN32_PWM_OUTPUT_ACTIVE_HIGH
-#define SN32_RGB_OUTPUT_ACTIVE_LEVEL SN32_RGB_OUTPUT_ACTIVE_LOW
+#define SN32F2XX_PWM_OUTPUT_ACTIVE_LEVEL SN32F2XX_PWM_OUTPUT_ACTIVE_HIGH
+#define SN32F2XX_RGB_OUTPUT_ACTIVE_LEVEL SN32F2XX_RGB_OUTPUT_ACTIVE_LOW
diff --git a/keyboards/redragon/k630/config.h b/keyboards/redragon/k630/config.h
index a93fbd18e933..a4141f68644e 100644
--- a/keyboards/redragon/k630/config.h
+++ b/keyboards/redragon/k630/config.h
@@ -18,7 +18,7 @@
 
 /* RGB matrix configuration can't be fully expressed in JSON as of now */
 #define RGB_MATRIX_LED_COUNT 61
-#define SN32_RGB_MATRIX_ROW_PINS { C4, C5, C6, C7, C8, C9, C10, C11, C12, B6, B7, B8, B9, B10, B11 }
+#define SN32F2XX_RGB_MATRIX_ROW_PINS { C4, C5, C6, C7, C8, C9, C10, C11, C12, B6, B7, B8, B9, B10, B11 }
 
 /* Configure the effects:                                              */
 #define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 50
\ No newline at end of file
diff --git a/keyboards/royal_kludge/rk61_rgb/config.h b/keyboards/royal_kludge/rk61_rgb/config.h
index 5872dd62574c..7dd80cf02a5c 100644
--- a/keyboards/royal_kludge/rk61_rgb/config.h
+++ b/keyboards/royal_kludge/rk61_rgb/config.h
@@ -17,7 +17,7 @@
 #pragma once
 
 /* RGB matrix configuration can't be fully expressed in JSON as of now */
-#define SN32_RGB_MATRIX_ROW_PINS { C5, C6, C4, C8, C9, C7, C11, C12, C10, C14, B13, C13, B15, B14, D3 }
+#define SN32F2XX_RGB_MATRIX_ROW_PINS { C5, C6, C4, C8, C9, C7, C11, C12, C10, C14, B13, C13, B15, B14, D3 }
 
 /* Configure the effects:                                              */
 #define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 50
\ No newline at end of file
diff --git a/keyboards/royal_kludge/rk68_rgb/config.h b/keyboards/royal_kludge/rk68_rgb/config.h
index 6da87ccdc05d..85958af84dd2 100644
--- a/keyboards/royal_kludge/rk68_rgb/config.h
+++ b/keyboards/royal_kludge/rk68_rgb/config.h
@@ -17,7 +17,7 @@
 #pragma once
 
 /* RGB matrix configuration can't be fully expressed in JSON as of now */
-#define SN32_RGB_MATRIX_ROW_PINS { C4, C5, C6, C7, C8, C9, C10, C11, C12, C13, C14, B13, D3, B15, B14 }
+#define SN32F2XX_RGB_MATRIX_ROW_PINS { C4, C5, C6, C7, C8, C9, C10, C11, C12, C13, C14, B13, D3, B15, B14 }
 
 /* Configure the effects:                                              */
 #define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 50
\ No newline at end of file