diff --git a/keyboards/aeternus/omnibus/config.h b/keyboards/aeternus/omnibus/config.h
index 0a7d501827..e2d1c3842f 100644
--- a/keyboards/aeternus/omnibus/config.h
+++ b/keyboards/aeternus/omnibus/config.h
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLED_NUM 22
+#define RGBLIGHT_LED_COUNT 22
 
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/fancy_customs/aletheia/config.h b/keyboards/fancy_customs/aletheia/config.h
index 83b8711ad5..6979a6e0fb 100644
--- a/keyboards/fancy_customs/aletheia/config.h
+++ b/keyboards/fancy_customs/aletheia/config.h
@@ -45,7 +45,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_DI_PIN B7
 
 #ifdef WS2812_DI_PIN
-	#define RGBLED_NUM 23
+	#define RGBLIGHT_LED_COUNT 23
 	#define RGBLIGHT_HUE_STEP 8
 	#define RGBLIGHT_SAT_STEP 8
 	#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/grezeh/larva/larva2/config.h b/keyboards/grezeh/larva/larva2/config.h
index b614a40e70..4c3dff6b29 100644
--- a/keyboards/grezeh/larva/larva2/config.h
+++ b/keyboards/grezeh/larva/larva2/config.h
@@ -60,11 +60,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define BACKLIGHT_PIN B7
 //#define BACKLIGHT_LEVELS 3
 //#define BACKLIGHT_BREATHING
-#undef RGBLED_NUM
+#undef RGBLIGHT_LED_COUNT
 //#define RGBLIGHT_EFFECT_STATIC_GRADIENT
 //#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
 #define WS2812_DI_PIN B5
-#define RGBLED_NUM 2
+#define RGBLIGHT_LED_COUNT 2
 #define RGBLIGHT_DEFAULT_MODE	RGBLIGHT_MODE_STATIC_LIGHT
 #define RGBLIGHT_DEFAULT_HUE 222
 #define RGBLIGHT_DEFAULT_SAT UINT8_MAX
diff --git a/keyboards/lazydesigners/apricot/config.h b/keyboards/lazydesigners/apricot/config.h
index 2a80f87205..217ef8b65b 100644
--- a/keyboards/lazydesigners/apricot/config.h
+++ b/keyboards/lazydesigners/apricot/config.h
@@ -49,7 +49,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #define RGBLIGHT_SLEEP
-#define RGBLED_NUM 4
+#define RGBLIGHT_LED_COUNT 4
 /* #define RGBLIGHT_HUE_STEP 8 */
 /* #define RGBLIGHT_SAT_STEP 8 */
 /* #define RGBLIGHT_VAL_STEP 8 */
diff --git a/keyboards/lazydesigners/cloud/config.h b/keyboards/lazydesigners/cloud/config.h
index 117646a00d..b9f45732a9 100644
--- a/keyboards/lazydesigners/cloud/config.h
+++ b/keyboards/lazydesigners/cloud/config.h
@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_DI_PIN D0
 #ifdef WS2812_DI_PIN
 	#define RGBLIGHT_SLEEP
-	#define RGBLED_NUM 15
+	#define RGBLIGHT_LED_COUNT 15
 	#define RGBLIGHT_HUE_STEP 8
 	#define RGBLIGHT_SAT_STEP 8 
 	#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/rainkeebs/plop/config.h b/keyboards/rainkeebs/plop/config.h
index ad07b06d1f..bbefd6218b 100644
--- a/keyboards/rainkeebs/plop/config.h
+++ b/keyboards/rainkeebs/plop/config.h
@@ -51,7 +51,7 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_SLEEP
-#define RGBLED_NUM 9
+#define RGBLIGHT_LED_COUNT 9
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/tumler/reviungdash47/config.h b/keyboards/tumler/reviungdash47/config.h
index d63474de99..eb6e1b859d 100644
--- a/keyboards/tumler/reviungdash47/config.h
+++ b/keyboards/tumler/reviungdash47/config.h
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define WS2812_DI_PIN D3
 #ifdef WS2812_DI_PIN
-  #define RGBLED_NUM 11
+  #define RGBLIGHT_LED_COUNT 11
   #define RGBLIGHT_HUE_STEP 16
   #define RGBLIGHT_SAT_STEP 16
   #define RGBLIGHT_VAL_STEP 16