6 files changed, 15 insertions, 15 deletions
diff --git a/keyboards/xbows/knight/config.h b/keyboards/xbows/knight/config.h
index c38628fef1..21b3ff6946 100644
--- a/keyboards/xbows/knight/config.h
+++ b/keyboards/xbows/knight/config.h
@@ -47,9 +47,9 @@
 #    define ENABLE_RGB_MATRIX_SPLASH                  // Full gradient & value pulse away from a single key hit then fades value out
 #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH       // Hue & value pulse away from multiple key hits then fades value out
 
-#    define DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
-#    define DRIVER_ADDR_2 IS31FL3731_I2C_ADDRESS_SDA
-#    define DRIVER_ADDR_3 IS31FL3731_I2C_ADDRESS_SCL
+#    define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#    define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
+#    define IS31FL3731_I2C_ADDRESS_3 IS31FL3731_I2C_ADDRESS_SCL
 #    define IS31FL3731_DRIVER_COUNT 3
 #    define DRIVER_1_LED_TOTAL 36
 #    define DRIVER_2_LED_TOTAL 35
diff --git a/keyboards/xbows/knight_plus/config.h b/keyboards/xbows/knight_plus/config.h
index 7a26ca9944..91d69d9408 100644
--- a/keyboards/xbows/knight_plus/config.h
+++ b/keyboards/xbows/knight_plus/config.h
@@ -47,9 +47,9 @@
 #    define ENABLE_RGB_MATRIX_SPLASH                  // Full gradient & value pulse away from a single key hit then fades value out
 #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH       // Hue & value pulse away from multiple key hits then fades value out
 
-#    define DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
-#    define DRIVER_ADDR_2 IS31FL3731_I2C_ADDRESS_SDA
-#    define DRIVER_ADDR_3 IS31FL3731_I2C_ADDRESS_SCL
+#    define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#    define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
+#    define IS31FL3731_I2C_ADDRESS_3 IS31FL3731_I2C_ADDRESS_SCL
 #    define IS31FL3731_DRIVER_COUNT 3
 #    define DRIVER_1_LED_TOTAL 36
 #    define DRIVER_2_LED_TOTAL 35
diff --git a/keyboards/xbows/nature/config.h b/keyboards/xbows/nature/config.h
index f408d62699..4e8270ea89 100644
--- a/keyboards/xbows/nature/config.h
+++ b/keyboards/xbows/nature/config.h
@@ -49,9 +49,9 @@
 #    define ENABLE_RGB_MATRIX_SPLASH                  // Full gradient & value pulse away from a single key hit then fades value out
 #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH       // Hue & value pulse away from multiple key hits then fades value out
 
-#    define DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
-#    define DRIVER_ADDR_2 IS31FL3731_I2C_ADDRESS_SDA
-#    define DRIVER_ADDR_3 IS31FL3731_I2C_ADDRESS_SCL
+#    define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#    define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
+#    define IS31FL3731_I2C_ADDRESS_3 IS31FL3731_I2C_ADDRESS_SCL
 #    define IS31FL3731_DRIVER_COUNT 3
 #    define DRIVER_1_LED_TOTAL 36
 #    define DRIVER_2_LED_TOTAL 36
diff --git a/keyboards/xbows/numpad/config.h b/keyboards/xbows/numpad/config.h
index d0c5d88491..5beb35aa1b 100644
--- a/keyboards/xbows/numpad/config.h
+++ b/keyboards/xbows/numpad/config.h
@@ -47,7 +47,7 @@
 #    define ENABLE_RGB_MATRIX_SPLASH                  // Full gradient & value pulse away from a single key hit then fades value out
 #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH       // Hue & value pulse away from multiple key hits then fades value out
 
-#    define DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_VCC
+#    define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_VCC
 #    define IS31FL3731_DRIVER_COUNT 1
 #    define RGB_MATRIX_LED_COUNT 22
 #endif
diff --git a/keyboards/xbows/ranger/config.h b/keyboards/xbows/ranger/config.h
index 81d9737449..49d889b920 100644
--- a/keyboards/xbows/ranger/config.h
+++ b/keyboards/xbows/ranger/config.h
@@ -46,9 +46,9 @@
 #    define ENABLE_RGB_MATRIX_SPLASH                  // Full gradient & value pulse away from a single key hit then fades value out
 #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH       // Hue & value pulse away from multiple key hits then fades value out
 
-#    define DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
-#    define DRIVER_ADDR_2 IS31FL3731_I2C_ADDRESS_SCL
-#    define DRIVER_ADDR_3 IS31FL3731_I2C_ADDRESS_SDA
+#    define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#    define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SCL
+#    define IS31FL3731_I2C_ADDRESS_3 IS31FL3731_I2C_ADDRESS_SDA
 #    define IS31FL3731_DRIVER_COUNT 3
 #    define DRIVER_1_LED_TOTAL 36
 #    define DRIVER_2_LED_TOTAL 36
diff --git a/keyboards/xbows/woody/config.h b/keyboards/xbows/woody/config.h
index 4b6ea9f70a..dc86093694 100644
--- a/keyboards/xbows/woody/config.h
+++ b/keyboards/xbows/woody/config.h
@@ -56,8 +56,8 @@
 // #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#    define DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
-#    define DRIVER_ADDR_2 IS31FL3731_I2C_ADDRESS_SDA
+#    define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#    define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
 #    define IS31FL3731_DRIVER_COUNT 2
 #    define DRIVER_1_LED_TOTAL 35
 #    define DRIVER_2_LED_TOTAL 32