From 7dcb936c24167e52ca320a29d07a9badda62c0c5 Mon Sep 17 00:00:00 2001
From: Rodrigo Garcia <rodrigo.garcia@espressif.com>
Date: Thu, 22 Aug 2024 15:58:49 -0300
Subject: [PATCH] fix(symbol): remove TM terms

---
 cores/esp32/esp32-hal-gpio.c                  |   2 +-
 cores/esp32/io_pin_remap.h                    |   2 +-
 docs/__pycache__/conf_common.cpython-39.pyc   | Bin 0 -> 532 bytes
 docs/en/api/rmt.rst                           |   2 +-
 .../ESP32/examples/GPIO/BlinkRGB/BlinkRGB.ino |  10 ++++----
 .../Legacy_RMT_Driver_Compatible.ino          |   2 +-
 .../RMTWriteRGB_LED.ino}                      |  12 ++++-----
 .../RMT/RMT_CPUFreq_Test/RMT_CPUFreq_Test.ino |  24 +++++++++---------
 .../Zigbee/Zigbee_Light_Bulb/README.md        |   2 +-
 .../Zigbee_Light_Bulb/Zigbee_Light_Bulb.ino   |   4 +--
 .../examples/COAP/coap_lamp/coap_lamp.ino     |  18 ++++++-------
 .../examples/COAP/coap_switch/coap_switch.ino |  12 ++++-----
 variants/Bee_Data_Logger/pins_arduino.h       |   6 ++---
 variants/Bee_Motion_S3/pins_arduino.h         |   6 ++---
 variants/Bee_S3/pins_arduino.h                |   6 ++---
 .../adafruit_camera_esp32s3/pins_arduino.h    |   2 +-
 .../adafruit_feather_esp32_v2/pins_arduino.h  |   2 +-
 .../adafruit_feather_esp32c6/pins_arduino.h   |   2 +-
 .../adafruit_feather_esp32s2/pins_arduino.h   |   2 +-
 .../pins_arduino.h                            |   2 +-
 .../pins_arduino.h                            |   2 +-
 .../adafruit_feather_esp32s3/pins_arduino.h   |   2 +-
 .../pins_arduino.h                            |   2 +-
 .../pins_arduino.h                            |   2 +-
 .../pins_arduino.h                            |   2 +-
 .../adafruit_itsybitsy_esp32/pins_arduino.h   |   2 +-
 .../adafruit_magtag29_esp32s2/pins_arduino.h  |   2 +-
 .../pins_arduino.h                            |   2 +-
 .../adafruit_metro_esp32s2/pins_arduino.h     |   2 +-
 .../adafruit_metro_esp32s3/pins_arduino.h     |   2 +-
 variants/adafruit_qtpy_esp32/pins_arduino.h   |   2 +-
 variants/adafruit_qtpy_esp32c3/pins_arduino.h |   2 +-
 variants/adafruit_qtpy_esp32s2/pins_arduino.h |   2 +-
 .../adafruit_qtpy_esp32s3_n4r2/pins_arduino.h |   2 +-
 .../pins_arduino.h                            |   2 +-
 variants/atmegazero_esp32s2/pins_arduino.h    |   6 ++---
 variants/bpi-bit/pins_arduino.h               |   4 +--
 variants/bpi_leaf_s3/pins_arduino.h           |   6 ++---
 variants/circuitart_zero_s3/pins_arduino.h    |  10 ++++----
 .../pins_arduino.h                            |   2 +-
 .../pins_arduino.h                            |  14 +++++-----
 .../variant.cpp                               |   6 ++---
 variants/esp32c3/pins_arduino.h               |   6 ++---
 variants/esp32c6/pins_arduino.h               |   6 ++---
 variants/esp32h2-devkit-lipo/pins_arduino.h   |   6 ++---
 variants/esp32h2/pins_arduino.h               |   6 ++---
 .../esp32s2-devkit-lipo-usb/pins_arduino.h    |   4 +--
 variants/esp32s2-devkit-lipo/pins_arduino.h   |   4 +--
 variants/esp32s2/pins_arduino.h               |   8 +++---
 variants/esp32s3/pins_arduino.h               |   6 ++---
 variants/esp32thing_plus_c/pins_arduino.h     |   2 +-
 .../franzininho_wifi_esp32s2/pins_arduino.h   |   6 ++---
 .../pins_arduino.h                            |   6 ++---
 variants/gpy/pins_arduino.h                   |   8 +++---
 variants/lopy/pins_arduino.h                  |   8 +++---
 variants/lopy4/pins_arduino.h                 |   8 +++---
 variants/micro_s2/pins_arduino.h              |   2 +-
 variants/sensebox_mcu_esp32s2/pins_arduino.h  |   6 ++---
 variants/sensebox_mcu_esp32s2/variant.cpp     |   4 +--
 .../pins_arduino.h                            |   6 ++---
 variants/tamc_termod_s3/pins_arduino.h        |   2 +-
 .../pins_arduino.h                            |   6 ++---
 variants/uPesy_esp32s3_basic/pins_arduino.h   |   2 +-
 variants/um_bling/pins_arduino.h              |   2 +-
 variants/um_feathers2neo/pins_arduino.h       |  12 ++++-----
 variants/um_feathers3/pins_arduino.h          |   2 +-
 variants/um_feathers3neo/pins_arduino.h       |   2 +-
 variants/um_nanos3/pins_arduino.h             |   2 +-
 variants/um_pros3/pins_arduino.h              |   2 +-
 variants/um_tinyc6/pins_arduino.h             |   2 +-
 variants/um_tinys2/pins_arduino.h             |   2 +-
 variants/um_tinys3/pins_arduino.h             |   2 +-
 variants/wifiduino32s3/pins_arduino.h         |   2 +-
 variants/wipy3/pins_arduino.h                 |   8 +++---
 74 files changed, 173 insertions(+), 173 deletions(-)
 create mode 100644 docs/__pycache__/conf_common.cpython-39.pyc
 rename libraries/ESP32/examples/RMT/{RMTWriteNeoPixel/RMTWriteNeoPixel.ino => RMTWriteRGB_LED/RMTWriteRGB_LED.ino} (88%)

diff --git a/cores/esp32/esp32-hal-gpio.c b/cores/esp32/esp32-hal-gpio.c
index 98dc26599be..b11636daf81 100644
--- a/cores/esp32/esp32-hal-gpio.c
+++ b/cores/esp32/esp32-hal-gpio.c
@@ -166,7 +166,7 @@ extern void ARDUINO_ISR_ATTR __digitalWrite(uint8_t pin, uint8_t val) {
     //use RMT to set all channels on/off
     RGB_BUILTIN_storage = val;
     const uint8_t comm_val = val != 0 ? RGB_BRIGHTNESS : 0;
-    neopixelWrite(RGB_BUILTIN, comm_val, comm_val, comm_val);
+    rgbLedWrite(RGB_BUILTIN, comm_val, comm_val, comm_val);
     return;
   }
 #endif  // RGB_BUILTIN
diff --git a/cores/esp32/io_pin_remap.h b/cores/esp32/io_pin_remap.h
index 4e422632ea4..73789a585e3 100644
--- a/cores/esp32/io_pin_remap.h
+++ b/cores/esp32/io_pin_remap.h
@@ -77,7 +77,7 @@ int8_t gpioNumberToDigitalPin(int8_t gpioNumber);
 #define pinMatrixOutDetach(pin, invertOut, invertEnable)           pinMatrixOutDetach(digitalPinToGPIONumber(pin), invertOut, invertEnable)
 
 // cores/esp32/esp32-hal-rgb-led.h
-#define neopixelWrite(pin, red_val, green_val, blue_val) neopixelWrite(digitalPinToGPIONumber(pin), red_val, green_val, blue_val)
+#define rgbLedWrite(pin, red_val, green_val, blue_val) rgbLedWrite(digitalPinToGPIONumber(pin), red_val, green_val, blue_val)
 
 // cores/esp32/esp32-hal-rmt.h
 #define rmtInit(pin, channel_direction, memsize, frequency_Hz) rmtInit(digitalPinToGPIONumber(pin), channel_direction, memsize, frequency_Hz)
diff --git a/docs/__pycache__/conf_common.cpython-39.pyc b/docs/__pycache__/conf_common.cpython-39.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..3613722d50e92fbb340a105383aae175266857c2
GIT binary patch
literal 532
zcmY*W&1&2*5SG{8-|U7omyk!;Kpkibg|L(s3c2Ny^ddxsEGf2wB^ixGvwn-dLT`N~
zADTl?eTAMn-Za~GK;LM7G(VrjYPBFJufKfPj~O992IF5z(RhakHVBHSq#?INjmm^3
zDy1Wp=~Rt3L`_gnQO_`v>2XQa{A==t(6O4(iCWx{^}$c9K-Nj0ob@AZyAutq*8uh1
zx$r91*1bf}#Vb1B2k1drhbk64g7)3&zqI~2=5_13MV_B?2qM&SozfT3R<(WL(zV+n
zhTv>>^v4xM0r>#k8MfidNyvwbehAt^?JVRf8nfj^tQ*B)3qhOf^^_j()1|X_yNCU}
z5w?t?)ZmdjLYGxA4R*Bw%h98q^)wW3MX374-!637dUvm7;LybK8}U;tu!CQp<R$xv
z3j^~`I?p~h8I869*!w4*ScOb{7GASGQ_Kh))bqj%D=U5zubNtE&xZZjZeZz*aW-$a
b{cK~Lij96d{4E?J%tn)Cmd+B?+4A%^_1LKh

literal 0
HcmV?d00001

diff --git a/docs/en/api/rmt.rst b/docs/en/api/rmt.rst
index 0a348592766..d4c5d3e2895 100644
--- a/docs/en/api/rmt.rst
+++ b/docs/en/api/rmt.rst
@@ -17,7 +17,7 @@ To get started with RMT, you can try:
 RMT Write Neo Pixel
 *******************
 
-.. literalinclude:: ../../../libraries/ESP32/examples/RMT/RMTWriteNeoPixel/RMTWriteNeoPixel.ino
+.. literalinclude:: ../../../libraries/ESP32/examples/RMT/RMTWriteRGB_LED/RMTWriteRGB_LED.ino
     :language: arduino
 
 
diff --git a/libraries/ESP32/examples/GPIO/BlinkRGB/BlinkRGB.ino b/libraries/ESP32/examples/GPIO/BlinkRGB/BlinkRGB.ino
index fa4e7596099..9544ce7cc25 100644
--- a/libraries/ESP32/examples/GPIO/BlinkRGB/BlinkRGB.ino
+++ b/libraries/ESP32/examples/GPIO/BlinkRGB/BlinkRGB.ino
@@ -6,7 +6,7 @@
   Calling digitalWrite(RGB_BUILTIN, HIGH) will use hidden RGB driver.
 
   RGBLedWrite demonstrates control of each channel:
-  void neopixelWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val)
+  void rgbLedWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val)
 
   WARNING: After using digitalWrite to drive RGB LED it will be impossible to drive the same pin
     with normal HIGH/LOW level
@@ -27,13 +27,13 @@ void loop() {
   digitalWrite(RGB_BUILTIN, LOW);  // Turn the RGB LED off
   delay(1000);
 
-  neopixelWrite(RGB_BUILTIN, RGB_BRIGHTNESS, 0, 0);  // Red
+  rgbLedWrite(RGB_BUILTIN, RGB_BRIGHTNESS, 0, 0);  // Red
   delay(1000);
-  neopixelWrite(RGB_BUILTIN, 0, RGB_BRIGHTNESS, 0);  // Green
+  rgbLedWrite(RGB_BUILTIN, 0, RGB_BRIGHTNESS, 0);  // Green
   delay(1000);
-  neopixelWrite(RGB_BUILTIN, 0, 0, RGB_BRIGHTNESS);  // Blue
+  rgbLedWrite(RGB_BUILTIN, 0, 0, RGB_BRIGHTNESS);  // Blue
   delay(1000);
-  neopixelWrite(RGB_BUILTIN, 0, 0, 0);  // Off / black
+  rgbLedWrite(RGB_BUILTIN, 0, 0, 0);  // Off / black
   delay(1000);
 #endif
 }
diff --git a/libraries/ESP32/examples/RMT/Legacy_RMT_Driver_Compatible/Legacy_RMT_Driver_Compatible.ino b/libraries/ESP32/examples/RMT/Legacy_RMT_Driver_Compatible/Legacy_RMT_Driver_Compatible.ino
index 74578f755dc..f00e1dce92e 100644
--- a/libraries/ESP32/examples/RMT/Legacy_RMT_Driver_Compatible/Legacy_RMT_Driver_Compatible.ino
+++ b/libraries/ESP32/examples/RMT/Legacy_RMT_Driver_Compatible/Legacy_RMT_Driver_Compatible.ino
@@ -17,7 +17,7 @@
 #else
 
 // add the file "build_opt.h" to your Arduino project folder with "-DESP32_ARDUINO_NO_RGB_BUILTIN" to use the RMT Legacy driver
-// neoPixelWrite() is a function that writes to the RGB LED and it won't be available here
+// rgbLedWrite() is a function that writes to the RGB LED and it won't be available here
 #include "driver/rmt.h"
 
 bool installed = false;
diff --git a/libraries/ESP32/examples/RMT/RMTWriteNeoPixel/RMTWriteNeoPixel.ino b/libraries/ESP32/examples/RMT/RMTWriteRGB_LED/RMTWriteRGB_LED.ino
similarity index 88%
rename from libraries/ESP32/examples/RMT/RMTWriteNeoPixel/RMTWriteNeoPixel.ino
rename to libraries/ESP32/examples/RMT/RMTWriteRGB_LED/RMTWriteRGB_LED.ino
index 0a8b8b8269f..a4713048eef 100644
--- a/libraries/ESP32/examples/RMT/RMTWriteNeoPixel/RMTWriteNeoPixel.ino
+++ b/libraries/ESP32/examples/RMT/RMTWriteRGB_LED/RMTWriteRGB_LED.ino
@@ -20,17 +20,17 @@
  */
 
 // The effect seen in (Espressif devkits) ESP32C6, ESP32H2, ESP32C3, ESP32S2 and ESP32S3 is like a Blink of RGB LED
-#ifdef PIN_NEOPIXEL
-#define BUILTIN_RGBLED_PIN PIN_NEOPIXEL
+#ifdef PIN_RGB_LED
+#define BUILTIN_RGB_LED_PIN PIN_RGB_LED
 #else
-#define BUILTIN_RGBLED_PIN 21  // ESP32 has no builtin RGB LED (PIN_NEOPIXEL)
+#define BUILTIN_RGB_LED_PIN 21  // ESP32 has no builtin RGB LED (PIN_RGB_LED)
 #endif
 
 #define NR_OF_LEDS     8 * 4
 #define NR_OF_ALL_BITS 24 * NR_OF_LEDS
 
 //
-// Note: This example uses Neopixel LED board, 32 LEDs chained one
+// Note: This example uses RGB LED board, 32 LEDs chained one
 //      after another, each RGB LED has its 24 bit value
 //      for color configuration (8b for each color)
 //
@@ -58,7 +58,7 @@ rmt_data_t led_data[NR_OF_ALL_BITS];
 
 void setup() {
   Serial.begin(115200);
-  if (!rmtInit(BUILTIN_RGBLED_PIN, RMT_TX_MODE, RMT_MEM_NUM_BLOCKS_1, 10000000)) {
+  if (!rmtInit(BUILTIN_RGB_LED_PIN, RMT_TX_MODE, RMT_MEM_NUM_BLOCKS_1, 10000000)) {
     Serial.println("init sender failed\n");
   }
   Serial.println("real tick set to: 100ns");
@@ -94,6 +94,6 @@ void loop() {
     led_index = 0;
   }
   // Send the data and wait until it is done
-  rmtWrite(BUILTIN_RGBLED_PIN, led_data, NR_OF_ALL_BITS, RMT_WAIT_FOR_EVER);
+  rmtWrite(BUILTIN_RGB_LED_PIN, led_data, NR_OF_ALL_BITS, RMT_WAIT_FOR_EVER);
   delay(100);
 }
diff --git a/libraries/ESP32/examples/RMT/RMT_CPUFreq_Test/RMT_CPUFreq_Test.ino b/libraries/ESP32/examples/RMT/RMT_CPUFreq_Test/RMT_CPUFreq_Test.ino
index 93ab0182802..8f4a78e0c4a 100644
--- a/libraries/ESP32/examples/RMT/RMT_CPUFreq_Test/RMT_CPUFreq_Test.ino
+++ b/libraries/ESP32/examples/RMT/RMT_CPUFreq_Test/RMT_CPUFreq_Test.ino
@@ -16,8 +16,8 @@
  * @brief This example demonstrates usage of RGB LED driven by RMT to verify
  * that RMT works on any CPU/APB Frequency.
  *
- * It uses an ESP32 Arduino builtin RGB NeoLED function based on RMT:
- * void neopixelWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val)
+ * It uses an ESP32 Arduino builtin RGB LED function based on RMT:
+ * void rgbLedWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val)
  *
  * The output is a visual WS2812 RGB LED color change routine using each time a
  * different CPU Frequency, just to illustrate how it works. Serial output indicates
@@ -26,10 +26,10 @@
 
 // Default DevKit RGB LED GPIOs:
 // The effect seen in (Espressif devkits) ESP32C6, ESP32H2, ESP32C3, ESP32S2 and ESP32S3 is like a Blink of RGB LED
-#ifdef PIN_NEOPIXEL
-#define MY_LED_GPIO PIN_NEOPIXEL
+#ifdef PIN_RGB_LED
+#define MY_LED_GPIO PIN_RGB_LED
 #else
-#define MY_LED_GPIO 21  // ESP32 has no builtin RGB LED (PIN_NEOPIXEL)
+#define MY_LED_GPIO 21  // ESP32 has no builtin RGB LED (PIN_RGB_LED)
 #endif
 
 // Set the correct GPIO to any necessary by changing RGB_LED_GPIO value
@@ -58,29 +58,29 @@ void loop() {
 
   // Changing the CPU Freq demands RMT to reset internals parameters setting it correctly
   // This is fixed by reinitializing the RMT peripheral as done below
-  // 100ns RMT Tick for driving the NeoLED as in the code of esp32-hal-rgb-led.c (github)
+  // 100ns RMT Tick for driving the RGB LED as in the code of esp32-hal-rgb-led.c (github)
   rmtInit(RGB_LED_GPIO, RMT_TX_MODE, RMT_MEM_NUM_BLOCKS_1, 10000000);
 
   // resets also UART to adapt to the new CPU Freq
   Serial.updateBaudRate(115200);
   Serial.printf("\n--changed CPU Frequency to %lu MHz\n", getCpuFrequencyMhz());
 
-  neopixelWrite(RGB_LED_GPIO, BRIGHTNESS, BRIGHTNESS, BRIGHTNESS);  // White
+  rgbLedWrite(RGB_LED_GPIO, BRIGHTNESS, BRIGHTNESS, BRIGHTNESS);  // White
   Serial.println("White");
   delay(1000);
-  neopixelWrite(RGB_LED_GPIO, 0, 0, 0);  // Off
+  rgbLedWrite(RGB_LED_GPIO, 0, 0, 0);  // Off
   Serial.println("Off");
   delay(1000);
-  neopixelWrite(RGB_LED_GPIO, BRIGHTNESS, 0, 0);  // Red
+  rgbLedWrite(RGB_LED_GPIO, BRIGHTNESS, 0, 0);  // Red
   Serial.println("Red");
   delay(1000);
-  neopixelWrite(RGB_LED_GPIO, 0, BRIGHTNESS, 0);  // Green
+  rgbLedWrite(RGB_LED_GPIO, 0, BRIGHTNESS, 0);  // Green
   Serial.println("Green");
   delay(1000);
-  neopixelWrite(RGB_LED_GPIO, 0, 0, BRIGHTNESS);  // Blue
+  rgbLedWrite(RGB_LED_GPIO, 0, 0, BRIGHTNESS);  // Blue
   Serial.println("Blue");
   delay(1000);
-  neopixelWrite(RGB_LED_GPIO, 0, 0, 0);  // Off
+  rgbLedWrite(RGB_LED_GPIO, 0, 0, 0);  // Off
   Serial.println("Off");
   delay(1000);
 }
diff --git a/libraries/ESP32/examples/Zigbee/Zigbee_Light_Bulb/README.md b/libraries/ESP32/examples/Zigbee/Zigbee_Light_Bulb/README.md
index cccc97aec98..d3441c3523b 100644
--- a/libraries/ESP32/examples/Zigbee/Zigbee_Light_Bulb/README.md
+++ b/libraries/ESP32/examples/Zigbee/Zigbee_Light_Bulb/README.md
@@ -20,7 +20,7 @@ Currently, this example supports the following targets.
 ### Configure the Project
 
 Set the LED GPIO by changing the `LED_PIN` definition. By default, the LED_PIN is `RGB_BUILTIN`.
-By default, the `neoPixelWrite` function is used to control the LED. You can change it to digitalWrite to control a simple LED.
+By default, the `rgbLedWrite` function is used to control the LED. You can change it to digitalWrite to control a simple LED.
 
 #### Using Arduino IDE
 
diff --git a/libraries/ESP32/examples/Zigbee/Zigbee_Light_Bulb/Zigbee_Light_Bulb.ino b/libraries/ESP32/examples/Zigbee/Zigbee_Light_Bulb/Zigbee_Light_Bulb.ino
index 67b9123c937..b98b67cb475 100644
--- a/libraries/ESP32/examples/Zigbee/Zigbee_Light_Bulb/Zigbee_Light_Bulb.ino
+++ b/libraries/ESP32/examples/Zigbee/Zigbee_Light_Bulb/Zigbee_Light_Bulb.ino
@@ -155,7 +155,7 @@ static esp_err_t zb_attribute_handler(const esp_zb_zcl_set_attr_value_message_t
       if (message->attribute.id == ESP_ZB_ZCL_ATTR_ON_OFF_ON_OFF_ID && message->attribute.data.type == ESP_ZB_ZCL_ATTR_TYPE_BOOL) {
         light_state = message->attribute.data.value ? *(bool *)message->attribute.data.value : light_state;
         log_i("Light sets to %s", light_state ? "On" : "Off");
-        neopixelWrite(LED_PIN, 255 * light_state, 255 * light_state, 255 * light_state);  // Toggle light
+        rgbLedWrite(LED_PIN, 255 * light_state, 255 * light_state, 255 * light_state);  // Toggle light
       }
     }
   }
@@ -172,7 +172,7 @@ void setup() {
   ESP_ERROR_CHECK(esp_zb_platform_config(&config));
 
   // Init RMT and leave light OFF
-  neopixelWrite(LED_PIN, 0, 0, 0);
+  rgbLedWrite(LED_PIN, 0, 0, 0);
 
   // Start Zigbee task
   xTaskCreate(esp_zb_task, "Zigbee_main", 4096, NULL, 5, NULL);
diff --git a/libraries/OpenThread/examples/COAP/coap_lamp/coap_lamp.ino b/libraries/OpenThread/examples/COAP/coap_lamp/coap_lamp.ino
index 81d9b35e48f..0e6504757ce 100644
--- a/libraries/OpenThread/examples/COAP/coap_lamp/coap_lamp.ino
+++ b/libraries/OpenThread/examples/COAP/coap_lamp/coap_lamp.ino
@@ -55,7 +55,7 @@ bool otDeviceSetup(const char **otSetupCmds, uint8_t nCmds1, const char **otCoap
   }
   if (i != nCmds1) {
     log_e("Sorry, OpenThread Network setup failed!");
-    neopixelWrite(RGB_BUILTIN, 255, 0, 0);  // RED ... failed!
+    rgbLedWrite(RGB_BUILTIN, 255, 0, 0);  // RED ... failed!
     return false;
   }
   Serial.println("OpenThread started.\r\nWaiting for activating correct Device Role.");
@@ -69,7 +69,7 @@ bool otDeviceSetup(const char **otSetupCmds, uint8_t nCmds1, const char **otCoap
   Serial.println();
   if (!tries) {
     log_e("Sorry, Device Role failed by timeout! Current Role: %s.", otGetStringDeviceRole());
-    neopixelWrite(RGB_BUILTIN, 255, 0, 0);  // RED ... failed!
+    rgbLedWrite(RGB_BUILTIN, 255, 0, 0);  // RED ... failed!
     return false;
   }
   Serial.printf("Device is %s.\r\n", otGetStringDeviceRole());
@@ -80,12 +80,12 @@ bool otDeviceSetup(const char **otSetupCmds, uint8_t nCmds1, const char **otCoap
   }
   if (i != nCmds2) {
     log_e("Sorry, OpenThread CoAP setup failed!");
-    neopixelWrite(RGB_BUILTIN, 255, 0, 0);  // RED ... failed!
+    rgbLedWrite(RGB_BUILTIN, 255, 0, 0);  // RED ... failed!
     return false;
   }
   Serial.println("OpenThread setup done. Node is ready.");
   // all fine! LED goes Green
-  neopixelWrite(RGB_BUILTIN, 0, 64, 8);  // GREEN ... Lamp is ready!
+  rgbLedWrite(RGB_BUILTIN, 0, 64, 8);  // GREEN ... Lamp is ready!
   return true;
 }
 
@@ -118,16 +118,16 @@ void otCOAPListen() {
       log_i("CoAP PUT [%s]\r\n", payload == '0' ? "OFF" : "ON");
       if (payload == '0') {
         for (int16_t c = 248; c > 16; c -= 8) {
-          neopixelWrite(RGB_BUILTIN, c, c, c);  // ramp down
+          rgbLedWrite(RGB_BUILTIN, c, c, c);  // ramp down
           delay(5);
         }
-        neopixelWrite(RGB_BUILTIN, 0, 0, 0);  // Lamp Off
+        rgbLedWrite(RGB_BUILTIN, 0, 0, 0);  // Lamp Off
       } else {
         for (int16_t c = 16; c < 248; c += 8) {
-          neopixelWrite(RGB_BUILTIN, c, c, c);  // ramp up
+          rgbLedWrite(RGB_BUILTIN, c, c, c);  // ramp up
           delay(5);
         }
-        neopixelWrite(RGB_BUILTIN, 255, 255, 255);  // Lamp On
+        rgbLedWrite(RGB_BUILTIN, 255, 255, 255);  // Lamp On
       }
     }
   }
@@ -136,7 +136,7 @@ void otCOAPListen() {
 void setup() {
   Serial.begin(115200);
   // LED starts RED, indicating not connected to Thread network.
-  neopixelWrite(RGB_BUILTIN, 64, 0, 0);
+  rgbLedWrite(RGB_BUILTIN, 64, 0, 0);
   OThreadCLI.begin(false);     // No AutoStart is necessary
   OThreadCLI.setTimeout(250);  // waits 250ms for the OpenThread CLI response
   setupNode();
diff --git a/libraries/OpenThread/examples/COAP/coap_switch/coap_switch.ino b/libraries/OpenThread/examples/COAP/coap_switch/coap_switch.ino
index 37942dcf576..37e5baa675c 100644
--- a/libraries/OpenThread/examples/COAP/coap_switch/coap_switch.ino
+++ b/libraries/OpenThread/examples/COAP/coap_switch/coap_switch.ino
@@ -49,7 +49,7 @@ bool otDeviceSetup(
   }
   if (i != nCmds1) {
     log_e("Sorry, OpenThread Network setup failed!");
-    neopixelWrite(RGB_BUILTIN, 255, 0, 0);  // RED ... failed!
+    rgbLedWrite(RGB_BUILTIN, 255, 0, 0);  // RED ... failed!
     return false;
   }
   Serial.println("OpenThread started.\r\nWaiting for activating correct Device Role.");
@@ -63,7 +63,7 @@ bool otDeviceSetup(
   Serial.println();
   if (!tries) {
     log_e("Sorry, Device Role failed by timeout! Current Role: %s.", otGetStringDeviceRole());
-    neopixelWrite(RGB_BUILTIN, 255, 0, 0);  // RED ... failed!
+    rgbLedWrite(RGB_BUILTIN, 255, 0, 0);  // RED ... failed!
     return false;
   }
   Serial.printf("Device is %s.\r\n", otGetStringDeviceRole());
@@ -74,12 +74,12 @@ bool otDeviceSetup(
   }
   if (i != nCmds2) {
     log_e("Sorry, OpenThread CoAP setup failed!");
-    neopixelWrite(RGB_BUILTIN, 255, 0, 0);  // RED ... failed!
+    rgbLedWrite(RGB_BUILTIN, 255, 0, 0);  // RED ... failed!
     return false;
   }
   Serial.println("OpenThread setup done. Node is ready.");
   // all fine! LED goes and stays Blue
-  neopixelWrite(RGB_BUILTIN, 0, 0, 64);  // BLUE ... Swtich is ready!
+  rgbLedWrite(RGB_BUILTIN, 0, 0, 64);  // BLUE ... Swtich is ready!
   return true;
 }
 
@@ -149,7 +149,7 @@ void checkUserButton() {
     lastLampState = !lastLampState;
     if (!otCoapPUT(lastLampState)) {  // failed: Lamp Node is not responding due to be off or unreachable
       // timeout from the CoAP PUT message... restart the node.
-      neopixelWrite(RGB_BUILTIN, 255, 0, 0);  // RED ... something failed!
+      rgbLedWrite(RGB_BUILTIN, 255, 0, 0);  // RED ... something failed!
       Serial.println("Reseting the Node as Switch... wait.");
       // start over...
       setupNode();
@@ -161,7 +161,7 @@ void checkUserButton() {
 void setup() {
   Serial.begin(115200);
   // LED starts RED, indicating not connected to Thread network.
-  neopixelWrite(RGB_BUILTIN, 64, 0, 0);
+  rgbLedWrite(RGB_BUILTIN, 64, 0, 0);
   OThreadCLI.begin(false);     // No AutoStart is necessary
   OThreadCLI.setTimeout(250);  // waits 250ms for the OpenThread CLI response
   setupNode();
diff --git a/variants/Bee_Data_Logger/pins_arduino.h b/variants/Bee_Data_Logger/pins_arduino.h
index 9924e2eb38a..1114ff0bdd3 100644
--- a/variants/Bee_Data_Logger/pins_arduino.h
+++ b/variants/Bee_Data_Logger/pins_arduino.h
@@ -65,12 +65,12 @@ static const uint8_t LDO2 = 34;
 static const uint8_t RGB_DATA = 40;
 static const uint8_t RGB_PWR = 34;
 
-#define PIN_NEOPIXEL RGB_DATA
+#define PIN_RGB_LED RGB_DATA
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL;
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/Bee_Motion_S3/pins_arduino.h b/variants/Bee_Motion_S3/pins_arduino.h
index a319f5ec161..45f73b56ba0 100644
--- a/variants/Bee_Motion_S3/pins_arduino.h
+++ b/variants/Bee_Motion_S3/pins_arduino.h
@@ -73,12 +73,12 @@ static const uint8_t LDO2 = 34;
 static const uint8_t RGB_DATA = 40;
 static const uint8_t RGB_PWR = 34;
 
-#define PIN_NEOPIXEL RGB_DATA
+#define PIN_RGB_LED RGB_DATA
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL;
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/Bee_S3/pins_arduino.h b/variants/Bee_S3/pins_arduino.h
index b8bdd7f1d3b..4f7b776f4cf 100644
--- a/variants/Bee_S3/pins_arduino.h
+++ b/variants/Bee_S3/pins_arduino.h
@@ -62,12 +62,12 @@ static const uint8_t VBAT_VOLTAGE = 1;
 static const uint8_t RGB_DATA = 48;
 static const uint8_t RGB_PWR = 34;
 
-#define PIN_NEOPIXEL RGB_DATA
+#define PIN_RGB_LED RGB_DATA
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL;
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/adafruit_camera_esp32s3/pins_arduino.h b/variants/adafruit_camera_esp32s3/pins_arduino.h
index 8560b44f4fb..447204f7345 100644
--- a/variants/adafruit_camera_esp32s3/pins_arduino.h
+++ b/variants/adafruit_camera_esp32s3/pins_arduino.h
@@ -18,7 +18,7 @@ static const uint8_t NEOPIXEL_PIN = 1;
 static const uint8_t LED_BUILTIN = PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() and digitalWrite() for blinking
 #define RGB_BUILTIN    (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/adafruit_feather_esp32_v2/pins_arduino.h b/variants/adafruit_feather_esp32_v2/pins_arduino.h
index 89bd844e3b5..f4af72aa98b 100644
--- a/variants/adafruit_feather_esp32_v2/pins_arduino.h
+++ b/variants/adafruit_feather_esp32_v2/pins_arduino.h
@@ -46,7 +46,7 @@ static const uint8_t LED_BUILTIN = 13;
 
 // Neopixel
 #define PIN_NEOPIXEL 0
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() and digitalWrite() for blinking
 #define RGB_BUILTIN    (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/adafruit_feather_esp32c6/pins_arduino.h b/variants/adafruit_feather_esp32c6/pins_arduino.h
index f8a7b112161..c4ae4bab3fe 100644
--- a/variants/adafruit_feather_esp32c6/pins_arduino.h
+++ b/variants/adafruit_feather_esp32c6/pins_arduino.h
@@ -9,7 +9,7 @@
 static const uint8_t LED_BUILTIN = 15;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    (SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL)
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/adafruit_feather_esp32s2/pins_arduino.h b/variants/adafruit_feather_esp32s2/pins_arduino.h
index 2e04e95e605..72ab65a8d33 100644
--- a/variants/adafruit_feather_esp32s2/pins_arduino.h
+++ b/variants/adafruit_feather_esp32s2/pins_arduino.h
@@ -16,7 +16,7 @@
 
 // Neopixel
 #define PIN_NEOPIXEL 33
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() and digitalWrite() for blinking
 #define RGB_BUILTIN    (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h b/variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h
index 22c9e938007..92902cc1622 100644
--- a/variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h
+++ b/variants/adafruit_feather_esp32s2_reversetft/pins_arduino.h
@@ -16,7 +16,7 @@
 
 // Neopixel
 #define PIN_NEOPIXEL 33
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() and digitalWrite() for blinking
 #define RGB_BUILTIN    (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/adafruit_feather_esp32s2_tft/pins_arduino.h b/variants/adafruit_feather_esp32s2_tft/pins_arduino.h
index 2717d441f7c..8c3059acb6e 100644
--- a/variants/adafruit_feather_esp32s2_tft/pins_arduino.h
+++ b/variants/adafruit_feather_esp32s2_tft/pins_arduino.h
@@ -16,7 +16,7 @@
 
 // Neopixel
 #define PIN_NEOPIXEL 33
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() and digitalWrite() for blinking
 #define RGB_BUILTIN    (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/adafruit_feather_esp32s3/pins_arduino.h b/variants/adafruit_feather_esp32s3/pins_arduino.h
index 679014b4df5..991a57c9eba 100644
--- a/variants/adafruit_feather_esp32s3/pins_arduino.h
+++ b/variants/adafruit_feather_esp32s3/pins_arduino.h
@@ -16,7 +16,7 @@
 
 // Neopixel
 #define PIN_NEOPIXEL 33
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() and digitalWrite() for blinking
 #define RGB_BUILTIN    (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/adafruit_feather_esp32s3_nopsram/pins_arduino.h b/variants/adafruit_feather_esp32s3_nopsram/pins_arduino.h
index 0fd8b1e91ba..34fe2ebae2c 100644
--- a/variants/adafruit_feather_esp32s3_nopsram/pins_arduino.h
+++ b/variants/adafruit_feather_esp32s3_nopsram/pins_arduino.h
@@ -16,7 +16,7 @@
 
 // Neopixel
 #define PIN_NEOPIXEL 33
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() and digitalWrite() for blinking
 #define RGB_BUILTIN    (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/adafruit_feather_esp32s3_reversetft/pins_arduino.h b/variants/adafruit_feather_esp32s3_reversetft/pins_arduino.h
index 4f76626a50b..ea955ff54f5 100644
--- a/variants/adafruit_feather_esp32s3_reversetft/pins_arduino.h
+++ b/variants/adafruit_feather_esp32s3_reversetft/pins_arduino.h
@@ -16,7 +16,7 @@
 
 // Neopixel
 #define PIN_NEOPIXEL 33
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() and digitalWrite() for blinking
 #define RGB_BUILTIN    (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/adafruit_feather_esp32s3_tft/pins_arduino.h b/variants/adafruit_feather_esp32s3_tft/pins_arduino.h
index 25cc9f785bc..3e007c7706d 100644
--- a/variants/adafruit_feather_esp32s3_tft/pins_arduino.h
+++ b/variants/adafruit_feather_esp32s3_tft/pins_arduino.h
@@ -16,7 +16,7 @@
 
 // Neopixel
 #define PIN_NEOPIXEL 33
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() and digitalWrite() for blinking
 #define RGB_BUILTIN    (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/adafruit_itsybitsy_esp32/pins_arduino.h b/variants/adafruit_itsybitsy_esp32/pins_arduino.h
index bd7a09562e3..801dc15da57 100644
--- a/variants/adafruit_itsybitsy_esp32/pins_arduino.h
+++ b/variants/adafruit_itsybitsy_esp32/pins_arduino.h
@@ -11,7 +11,7 @@ static const uint8_t LED_BUILTIN = 13;
 
 // Neopixel
 static const uint8_t PIN_NEOPIXEL = 0;
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() and digitalWrite() for blinking
 #define RGB_BUILTIN    (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/adafruit_magtag29_esp32s2/pins_arduino.h b/variants/adafruit_magtag29_esp32s2/pins_arduino.h
index 97977a0a6bc..197f2e4c1aa 100644
--- a/variants/adafruit_magtag29_esp32s2/pins_arduino.h
+++ b/variants/adafruit_magtag29_esp32s2/pins_arduino.h
@@ -16,7 +16,7 @@
 
 // Neopixel
 #define PIN_NEOPIXEL 1  // D1
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() and digitalWrite() for blinking
 #define RGB_BUILTIN    (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/adafruit_matrixportal_esp32s3/pins_arduino.h b/variants/adafruit_matrixportal_esp32s3/pins_arduino.h
index 9d5dd018b74..9843c54c1cd 100644
--- a/variants/adafruit_matrixportal_esp32s3/pins_arduino.h
+++ b/variants/adafruit_matrixportal_esp32s3/pins_arduino.h
@@ -16,7 +16,7 @@
 
 #define PIN_NEOPIXEL 4
 #define NEOPIXEL_PIN 4
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() and digitalWrite() for blinking
 #define RGB_BUILTIN    (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/adafruit_metro_esp32s2/pins_arduino.h b/variants/adafruit_metro_esp32s2/pins_arduino.h
index 89235f5ab15..cef937d3662 100644
--- a/variants/adafruit_metro_esp32s2/pins_arduino.h
+++ b/variants/adafruit_metro_esp32s2/pins_arduino.h
@@ -15,7 +15,7 @@
 
 // Neopixel
 #define PIN_NEOPIXEL 45
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() and digitalWrite() for blinking
 #define RGB_BUILTIN    (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/adafruit_metro_esp32s3/pins_arduino.h b/variants/adafruit_metro_esp32s3/pins_arduino.h
index 80beb123e58..9e2cff7e651 100644
--- a/variants/adafruit_metro_esp32s3/pins_arduino.h
+++ b/variants/adafruit_metro_esp32s3/pins_arduino.h
@@ -15,7 +15,7 @@
 
 // Neopixel
 #define PIN_NEOPIXEL 46
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() and digitalWrite() for blinking
 #define RGB_BUILTIN    (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/adafruit_qtpy_esp32/pins_arduino.h b/variants/adafruit_qtpy_esp32/pins_arduino.h
index 6080527cdda..b422377d981 100644
--- a/variants/adafruit_qtpy_esp32/pins_arduino.h
+++ b/variants/adafruit_qtpy_esp32/pins_arduino.h
@@ -11,7 +11,7 @@ static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/adafruit_qtpy_esp32c3/pins_arduino.h b/variants/adafruit_qtpy_esp32c3/pins_arduino.h
index 71affaad7d7..92d2591a806 100644
--- a/variants/adafruit_qtpy_esp32c3/pins_arduino.h
+++ b/variants/adafruit_qtpy_esp32c3/pins_arduino.h
@@ -13,7 +13,7 @@ static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/adafruit_qtpy_esp32s2/pins_arduino.h b/variants/adafruit_qtpy_esp32s2/pins_arduino.h
index 9eb04c70467..3baf0808db1 100644
--- a/variants/adafruit_qtpy_esp32s2/pins_arduino.h
+++ b/variants/adafruit_qtpy_esp32s2/pins_arduino.h
@@ -15,7 +15,7 @@
 static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/adafruit_qtpy_esp32s3_n4r2/pins_arduino.h b/variants/adafruit_qtpy_esp32s3_n4r2/pins_arduino.h
index dc68c1f6998..1202ad1caca 100644
--- a/variants/adafruit_qtpy_esp32s3_n4r2/pins_arduino.h
+++ b/variants/adafruit_qtpy_esp32s3_n4r2/pins_arduino.h
@@ -18,7 +18,7 @@
 static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h b/variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h
index 2c42f8c8db8..55b4f4355a9 100644
--- a/variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h
+++ b/variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h
@@ -18,7 +18,7 @@
 static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/atmegazero_esp32s2/pins_arduino.h b/variants/atmegazero_esp32s2/pins_arduino.h
index c28126dd397..7e03f7f5c23 100644
--- a/variants/atmegazero_esp32s2/pins_arduino.h
+++ b/variants/atmegazero_esp32s2/pins_arduino.h
@@ -10,12 +10,12 @@
 #define USB_PRODUCT      "ATMZ-ESP32S2"
 #define USB_SERIAL       ""
 
-static const uint8_t NEOPIXEL = 40;
+static const uint8_t RGB_LED = 40;
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = (NEOPIXEL + SOC_GPIO_PIN_COUNT);
+static const uint8_t LED_BUILTIN = (RGB_LED + SOC_GPIO_PIN_COUNT);
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/bpi-bit/pins_arduino.h b/variants/bpi-bit/pins_arduino.h
index b6247c12ae9..ffe5d4c789b 100644
--- a/variants/bpi-bit/pins_arduino.h
+++ b/variants/bpi-bit/pins_arduino.h
@@ -9,13 +9,13 @@ static const uint8_t BUZZER = 25;
 static const uint8_t BUTTON_A = 35;
 static const uint8_t BUTTON_B = 27;
 
-// NeoPixel Matrix 5 x 5
+// RGB_LED Matrix 5 x 5
 static const uint8_t RGB_LED = 4;
 
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
 #define LED_BUILTIN (RGB_LED + SOC_GPIO_PIN_COUNT)  // Just a single LED in the Matrix
 #define BUILTIN_LED LED_BUILTIN                     // backward compatibility
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 static const uint8_t LIGHT_SENSOR1 = 36;
diff --git a/variants/bpi_leaf_s3/pins_arduino.h b/variants/bpi_leaf_s3/pins_arduino.h
index 68083e2e1ea..3a22a46bfc1 100644
--- a/variants/bpi_leaf_s3/pins_arduino.h
+++ b/variants/bpi_leaf_s3/pins_arduino.h
@@ -13,12 +13,12 @@
 // Some boards have too low voltage on this pin (board design bug)
 // Use different pin with 3V and connect with 48
 // and change this setup for the chosen pin (for example 38)
-#define PIN_NEOPIXEL 48
+#define PIN_RGB_LED 48
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL;
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 25
 
diff --git a/variants/circuitart_zero_s3/pins_arduino.h b/variants/circuitart_zero_s3/pins_arduino.h
index 6de73a7aecc..1184642d47d 100644
--- a/variants/circuitart_zero_s3/pins_arduino.h
+++ b/variants/circuitart_zero_s3/pins_arduino.h
@@ -13,12 +13,12 @@
 #define LED_BUILTIN 46
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 
-// Neopixel
-#define PIN_NEOPIXEL 47
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
-#define RGB_BUILTIN    (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)
+// RGB_LED
+#define PIN_RGB_LED 47
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() and digitalWrite() for blinking
+#define RGB_BUILTIN    (PIN_RGB_LED + SOC_GPIO_PIN_COUNT)
 #define RGB_BRIGHTNESS 64
-#define NEOPIXEL_NUM   1  // number of neopixels
+#define RGB_LED_NUM   1  // number of RGB_LEDs
 
 static const uint8_t KEY_BUILTIN = 0;
 
diff --git a/variants/cytron_maker_feather_aiot_s3/pins_arduino.h b/variants/cytron_maker_feather_aiot_s3/pins_arduino.h
index 9f27ff8ecf7..22f40804a55 100644
--- a/variants/cytron_maker_feather_aiot_s3/pins_arduino.h
+++ b/variants/cytron_maker_feather_aiot_s3/pins_arduino.h
@@ -19,7 +19,7 @@ static const uint8_t RGB_BUILTIN = SOC_GPIO_PIN_COUNT + 46;  // RGB LED.
 
 #define LED            LED_BUILTIN
 #define RGB            RGB_BUILTIN
-#define NEOPIXEL       RGB_BUILTIN
+#define RGB_LED       RGB_BUILTIN
 #define RGB_BRIGHTNESS 65
 
 #define VP_EN  11  // V Peripheral Enable.
diff --git a/variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h b/variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h
index c7ce982ff79..b1c31879ed8 100644
--- a/variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h
+++ b/variants/department_of_alchemy_minimain_esp32s2/pins_arduino.h
@@ -14,15 +14,15 @@
 #define LED_BUILTIN 13
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 
-// Neopixel
-#define PIN_NEOPIXEL 33
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() and digitalWrite() for blinking
-#define RGB_BUILTIN    (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT)
+// RGB_LED
+#define PIN_RGB_LED 33
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite() and digitalWrite() for blinking
+#define RGB_BUILTIN    (PIN_RGB_LED + SOC_GPIO_PIN_COUNT)
 #define RGB_BRIGHTNESS 64
 
-#define NEOPIXEL_NUM       1     // number of neopixels
-#define NEOPIXEL_POWER     21    // power pin
-#define NEOPIXEL_POWER_ON  HIGH  // power pin state when on
+#define RGB_LED_NUM       1     // number of RGB_LEDs
+#define RGB_LED_POWER     21    // power pin
+#define RGB_LED_POWER_ON  HIGH  // power pin state when on
 #define PIN_SERVO          2     // servo pin
 #define PIN_ISOLATED_INPUT 40    // optocoupled input
 
diff --git a/variants/department_of_alchemy_minimain_esp32s2/variant.cpp b/variants/department_of_alchemy_minimain_esp32s2/variant.cpp
index 7809ec26f46..40ae1d585b5 100644
--- a/variants/department_of_alchemy_minimain_esp32s2/variant.cpp
+++ b/variants/department_of_alchemy_minimain_esp32s2/variant.cpp
@@ -30,8 +30,8 @@ extern "C" {
 // Initialize variant/board, called before setup()
 void initVariant(void) {
   // This board has a power control pin, and we must set it to output and high
-  // in order to enable the NeoPixels.
-  pinMode(NEOPIXEL_POWER, OUTPUT);
-  digitalWrite(NEOPIXEL_POWER, HIGH);
+  // in order to enable the RGB_LEDs.
+  pinMode(RGB_LED_POWER, OUTPUT);
+  digitalWrite(RGB_LED_POWER, HIGH);
 }
 }
diff --git a/variants/esp32c3/pins_arduino.h b/variants/esp32c3/pins_arduino.h
index 9ad2102955c..179ce636ea5 100644
--- a/variants/esp32c3/pins_arduino.h
+++ b/variants/esp32c3/pins_arduino.h
@@ -4,12 +4,12 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-#define PIN_NEOPIXEL 8
+#define PIN_RGB_LED 8
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL;
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/esp32c6/pins_arduino.h b/variants/esp32c6/pins_arduino.h
index 705c2b4d9ce..55afea91565 100644
--- a/variants/esp32c6/pins_arduino.h
+++ b/variants/esp32c6/pins_arduino.h
@@ -4,12 +4,12 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-#define PIN_NEOPIXEL 8
+#define PIN_RGB_LED 8
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL;
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/esp32h2-devkit-lipo/pins_arduino.h b/variants/esp32h2-devkit-lipo/pins_arduino.h
index 534b6d64fe1..bb15be3e871 100644
--- a/variants/esp32h2-devkit-lipo/pins_arduino.h
+++ b/variants/esp32h2-devkit-lipo/pins_arduino.h
@@ -4,12 +4,12 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-#define PIN_NEOPIXEL 8
+#define PIN_RGB_LED 8
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL;
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/esp32h2/pins_arduino.h b/variants/esp32h2/pins_arduino.h
index 99a6b1152c9..c8a3481259a 100644
--- a/variants/esp32h2/pins_arduino.h
+++ b/variants/esp32h2/pins_arduino.h
@@ -4,12 +4,12 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-#define PIN_NEOPIXEL 8
+#define PIN_RGB_LED 8
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL;
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/esp32s2-devkit-lipo-usb/pins_arduino.h b/variants/esp32s2-devkit-lipo-usb/pins_arduino.h
index 3d5f92aa46f..3f7db9a842e 100644
--- a/variants/esp32s2-devkit-lipo-usb/pins_arduino.h
+++ b/variants/esp32s2-devkit-lipo-usb/pins_arduino.h
@@ -4,8 +4,8 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-#define PIN_NEOPIXEL   18
-#define RGB_BUILTIN    PIN_NEOPIXEL
+#define PIN_RGB_LED   18
+#define RGB_BUILTIN    PIN_RGB_LED
 #define RGB_BRIGHTNESS 64
 
 static const uint8_t BUT_BUILTIN = 0;
diff --git a/variants/esp32s2-devkit-lipo/pins_arduino.h b/variants/esp32s2-devkit-lipo/pins_arduino.h
index 04c89f4d5d6..cbbd0cd5a91 100644
--- a/variants/esp32s2-devkit-lipo/pins_arduino.h
+++ b/variants/esp32s2-devkit-lipo/pins_arduino.h
@@ -4,8 +4,8 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-#define PIN_NEOPIXEL   18
-#define RGB_BUILTIN    PIN_NEOPIXEL
+#define PIN_RGB_LED   18
+#define RGB_BUILTIN    PIN_RGB_LED
 #define RGB_BRIGHTNESS 64
 
 static const uint8_t BUT_BUILTIN = 0;
diff --git a/variants/esp32s2/pins_arduino.h b/variants/esp32s2/pins_arduino.h
index 95ece4649c8..27391ef22ab 100644
--- a/variants/esp32s2/pins_arduino.h
+++ b/variants/esp32s2/pins_arduino.h
@@ -5,14 +5,14 @@
 #include "soc/soc_caps.h"
 
 // GPIO pin for Saola-1 & DevKitM-1 = 18
-#define PIN_NEOPIXEL 18
+#define PIN_RGB_LED 18
 // GPIO pin for Kaluga = 45
-//#define PIN_NEOPIXEL 45
+//#define PIN_RGB_LED 45
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL;
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/esp32s3/pins_arduino.h b/variants/esp32s3/pins_arduino.h
index de3a6f975ce..623d684e20f 100644
--- a/variants/esp32s3/pins_arduino.h
+++ b/variants/esp32s3/pins_arduino.h
@@ -10,12 +10,12 @@
 // Some boards have too low voltage on this pin (board design bug)
 // Use different pin with 3V and connect with 48
 // and change this setup for the chosen pin (for example 38)
-#define PIN_NEOPIXEL 48
+#define PIN_RGB_LED 48
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL;
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/esp32thing_plus_c/pins_arduino.h b/variants/esp32thing_plus_c/pins_arduino.h
index 6d154a402d6..ca7b6c65d45 100644
--- a/variants/esp32thing_plus_c/pins_arduino.h
+++ b/variants/esp32thing_plus_c/pins_arduino.h
@@ -8,7 +8,7 @@ static const uint8_t LED_BUILTIN = 13;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 static const uint8_t RGB_BUILTIN = SOC_GPIO_PIN_COUNT + 2;
 #define RGB_BUILTIN    RGB_BUILTIN  // necessary to make digitalWrite/digitalMode find it
 #define RGB_BRIGHTNESS 64
diff --git a/variants/franzininho_wifi_esp32s2/pins_arduino.h b/variants/franzininho_wifi_esp32s2/pins_arduino.h
index 94d64aa18fb..b75fcc768d7 100644
--- a/variants/franzininho_wifi_esp32s2/pins_arduino.h
+++ b/variants/franzininho_wifi_esp32s2/pins_arduino.h
@@ -11,12 +11,12 @@
 #define USB_SERIAL         "0"
 #define USB_WEBUSB_ENABLED false
 
-static const uint8_t PIN_NEOPIXEL = 18;
+static const uint8_t PIN_RGB_LED = 18;
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);
+static const uint8_t LED_BUILTIN = (PIN_RGB_LED + SOC_GPIO_PIN_COUNT);
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/franzininho_wifi_msc_esp32s2/pins_arduino.h b/variants/franzininho_wifi_msc_esp32s2/pins_arduino.h
index 5e301876c19..db213cb97d4 100644
--- a/variants/franzininho_wifi_msc_esp32s2/pins_arduino.h
+++ b/variants/franzininho_wifi_msc_esp32s2/pins_arduino.h
@@ -18,12 +18,12 @@
 #define USB_FW_MSC_VOLUME_NAME      "S2-Firmware"   //max 11 chars
 #define USB_FW_MSC_SERIAL_NUMBER    0x00000000
 
-static const uint8_t PIN_NEOPIXEL = 18;
+static const uint8_t PIN_RGB_LED = 18;
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);
+static const uint8_t LED_BUILTIN = (PIN_RGB_LED + SOC_GPIO_PIN_COUNT);
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/gpy/pins_arduino.h b/variants/gpy/pins_arduino.h
index 02ee758e1a3..21a5672dea3 100644
--- a/variants/gpy/pins_arduino.h
+++ b/variants/gpy/pins_arduino.h
@@ -15,12 +15,12 @@
 #define LTE_WAKE 27  // GPIO27 - Sequans modem wake-up interrupt
 #define LTE_BAUD 921600
 
-// Neopixel
-#define PIN_NEOPIXEL 0  // ->2812 RGB !!!
-static const uint8_t LED_BUILTIN = PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT;
+// RGB_LED
+#define PIN_RGB_LED 0  // ->2812 RGB !!!
+static const uint8_t LED_BUILTIN = PIN_RGB_LED + SOC_GPIO_PIN_COUNT;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/lopy/pins_arduino.h b/variants/lopy/pins_arduino.h
index a648c529c46..dedccf91d59 100644
--- a/variants/lopy/pins_arduino.h
+++ b/variants/lopy/pins_arduino.h
@@ -15,12 +15,12 @@
 #define LORA_IO1  LORA_IRQ  // tied by diode to IO0
 #define LORA_IO2  LORA_IRQ  // tied by diode to IO0
 
-// Neopixel
-#define PIN_NEOPIXEL 0  // ->2812 RGB !!!
-static const uint8_t LED_BUILTIN = PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT;
+// RGB_LED
+#define PIN_RGB_LED 0  // ->2812 RGB !!!
+static const uint8_t LED_BUILTIN = PIN_RGB_LED + SOC_GPIO_PIN_COUNT;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/lopy4/pins_arduino.h b/variants/lopy4/pins_arduino.h
index 4ac91267e69..5f29f8c87e0 100644
--- a/variants/lopy4/pins_arduino.h
+++ b/variants/lopy4/pins_arduino.h
@@ -15,12 +15,12 @@
 #define LORA_IO2  LORA_IRQ  // tied by diode to IO0
 #define LORA_RST  NOT_A_PIN
 
-// Neopixel
-#define PIN_NEOPIXEL 0  // ->2812 RGB !!!
-static const uint8_t LED_BUILTIN = PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT;
+// RGB_LED
+#define PIN_RGB_LED 0  // ->2812 RGB !!!
+static const uint8_t LED_BUILTIN = PIN_RGB_LED + SOC_GPIO_PIN_COUNT;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/micro_s2/pins_arduino.h b/variants/micro_s2/pins_arduino.h
index 5b3d3964917..422799478fc 100644
--- a/variants/micro_s2/pins_arduino.h
+++ b/variants/micro_s2/pins_arduino.h
@@ -66,7 +66,7 @@ static const uint8_t LED_BUILTIN = 21;
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
 static const uint8_t PIXEL_BUILTIN = 33;
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    (PIXEL_BUILTIN + SOC_GPIO_PIN_COUNT)
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/sensebox_mcu_esp32s2/pins_arduino.h b/variants/sensebox_mcu_esp32s2/pins_arduino.h
index c3d03784964..8a03c6fec5e 100644
--- a/variants/sensebox_mcu_esp32s2/pins_arduino.h
+++ b/variants/sensebox_mcu_esp32s2/pins_arduino.h
@@ -16,9 +16,9 @@
 #define USB_FW_MSC_VOLUME_NAME      "senseBox"        // max 11 chars
 #define USB_FW_MSC_SERIAL_NUMBER    0x00000000
 
-#define PIN_NEOPIXEL 1  // NeoPixel LED
-#define NEOPIXEL_PIN 1  // NeoPixel LED
-#define NEOPIXEL_NUM 1  // number of neopixels
+#define PIN_RGB_LED 1  // RGB_LED LED
+#define RGB_LED_PIN 1  // RGB_LED LED
+#define RGB_LED_NUM 1  // number of RGB_LEDs
 
 // Default I2C QWIIC-Ports
 static const uint8_t SDA = 39;
diff --git a/variants/sensebox_mcu_esp32s2/variant.cpp b/variants/sensebox_mcu_esp32s2/variant.cpp
index 59e187b2a7f..0c58ef2cbe2 100644
--- a/variants/sensebox_mcu_esp32s2/variant.cpp
+++ b/variants/sensebox_mcu_esp32s2/variant.cpp
@@ -34,8 +34,8 @@ void initVariant(void) {
   digitalWrite(IO_ENABLE, LOW);
 
   //reset RGB
-  pinMode(PIN_NEOPIXEL, OUTPUT);
-  digitalWrite(PIN_NEOPIXEL, LOW);
+  pinMode(PIN_RGB_LED, OUTPUT);
+  digitalWrite(PIN_RGB_LED, LOW);
 
   //enable XBEE by default
   pinMode(PIN_XB1_ENABLE, OUTPUT);
diff --git a/variants/sparkfun_esp32c6_thing_plus/pins_arduino.h b/variants/sparkfun_esp32c6_thing_plus/pins_arduino.h
index 53724f067f4..61c939a32a9 100644
--- a/variants/sparkfun_esp32c6_thing_plus/pins_arduino.h
+++ b/variants/sparkfun_esp32c6_thing_plus/pins_arduino.h
@@ -4,12 +4,12 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-#define PIN_NEOPIXEL 23
+#define PIN_RGB_LED 23
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL;
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/tamc_termod_s3/pins_arduino.h b/variants/tamc_termod_s3/pins_arduino.h
index 3d846c9b111..0d7808911ea 100644
--- a/variants/tamc_termod_s3/pins_arduino.h
+++ b/variants/tamc_termod_s3/pins_arduino.h
@@ -6,7 +6,7 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-// This board has no NeoLED or any User LED
+// This board has no RGB LED or any User LED
 
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
diff --git a/variants/thingpulse_epulse_feather_c6/pins_arduino.h b/variants/thingpulse_epulse_feather_c6/pins_arduino.h
index 705c2b4d9ce..55afea91565 100644
--- a/variants/thingpulse_epulse_feather_c6/pins_arduino.h
+++ b/variants/thingpulse_epulse_feather_c6/pins_arduino.h
@@ -4,12 +4,12 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-#define PIN_NEOPIXEL 8
+#define PIN_RGB_LED 8
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_NEOPIXEL;
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/uPesy_esp32s3_basic/pins_arduino.h b/variants/uPesy_esp32s3_basic/pins_arduino.h
index f2566444276..85d9c2ccb00 100644
--- a/variants/uPesy_esp32s3_basic/pins_arduino.h
+++ b/variants/uPesy_esp32s3_basic/pins_arduino.h
@@ -11,7 +11,7 @@
 #define USB_SERIAL       ""
 
 static const uint8_t RGB_DATA = 38;
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    (RGB_DATA + SOC_GPIO_PIN_COUNT)
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/um_bling/pins_arduino.h b/variants/um_bling/pins_arduino.h
index bd5b4a07b38..590eec5efea 100644
--- a/variants/um_bling/pins_arduino.h
+++ b/variants/um_bling/pins_arduino.h
@@ -67,7 +67,7 @@ static const uint8_t I2S_AMP_WS = 1;
 static const uint8_t RTC_INT = 7;
 
 static const uint8_t RGB_DATA = 18;
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    (RGB_DATA + SOC_GPIO_PIN_COUNT)
 #define RGB_BRIGHTNESS 64
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
diff --git a/variants/um_feathers2neo/pins_arduino.h b/variants/um_feathers2neo/pins_arduino.h
index ff3398de910..5a9a46152ec 100644
--- a/variants/um_feathers2neo/pins_arduino.h
+++ b/variants/um_feathers2neo/pins_arduino.h
@@ -50,19 +50,19 @@ static const uint8_t T14 = 14;
 static const uint8_t DAC1 = 17;
 static const uint8_t DAC2 = 18;
 
-static const uint8_t NEOPIXEL_MATRIX_DATA = 21;
-static const uint8_t NEOPIXEL_MATRIX_PWR = 4;
+static const uint8_t RGB_LED_MATRIX_DATA = 21;
+static const uint8_t RGB_LED_MATRIX_PWR = 4;
 
-static const uint8_t NEOPIXEL_DATA = 40;
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
-#define RGB_BUILTIN    (NEOPIXEL_DATA + SOC_GPIO_PIN_COUNT)
+static const uint8_t RGB_LED_DATA = 40;
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
+#define RGB_BUILTIN    (RGB_LED_DATA + SOC_GPIO_PIN_COUNT)
 #define RGB_BRIGHTNESS 64
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
 static const uint8_t LED_BUILTIN = RGB_BUILTIN;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 
-static const uint8_t NEOPIXEL_PWR = 39;
+static const uint8_t RGB_LED_PWR = 39;
 
 static const uint8_t VBAT_SENSE = 2;
 static const uint8_t VBUS_SENSE = 34;
diff --git a/variants/um_feathers3/pins_arduino.h b/variants/um_feathers3/pins_arduino.h
index 4d68148ac92..8de87c688a9 100644
--- a/variants/um_feathers3/pins_arduino.h
+++ b/variants/um_feathers3/pins_arduino.h
@@ -57,7 +57,7 @@ static const uint8_t VBUS_SENSE = 34;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 
 static const uint8_t RGB_DATA = 40;
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    (RGB_DATA + SOC_GPIO_PIN_COUNT)
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/um_feathers3neo/pins_arduino.h b/variants/um_feathers3neo/pins_arduino.h
index c0a1aae867e..94d546d22c2 100644
--- a/variants/um_feathers3neo/pins_arduino.h
+++ b/variants/um_feathers3neo/pins_arduino.h
@@ -57,7 +57,7 @@ static const uint8_t VBUS_SENSE = 15;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 
 static const uint8_t RGB_DATA = 40;
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    (RGB_DATA + SOC_GPIO_PIN_COUNT)
 #define RGB_BRIGHTNESS 64
 
diff --git a/variants/um_nanos3/pins_arduino.h b/variants/um_nanos3/pins_arduino.h
index 0db14ebf792..66aef214c47 100644
--- a/variants/um_nanos3/pins_arduino.h
+++ b/variants/um_nanos3/pins_arduino.h
@@ -44,7 +44,7 @@ static const uint8_t T8 = 8;
 static const uint8_t T9 = 9;
 
 static const uint8_t RGB_DATA = 41;
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    (RGB_DATA + SOC_GPIO_PIN_COUNT)
 #define RGB_BRIGHTNESS 64
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
diff --git a/variants/um_pros3/pins_arduino.h b/variants/um_pros3/pins_arduino.h
index 7a8921bacb7..4b9bc8de6aa 100644
--- a/variants/um_pros3/pins_arduino.h
+++ b/variants/um_pros3/pins_arduino.h
@@ -55,7 +55,7 @@ static const uint8_t VBAT_SENSE = 10;
 static const uint8_t VBUS_SENSE = 33;
 
 static const uint8_t RGB_DATA = 18;
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    (RGB_DATA + SOC_GPIO_PIN_COUNT)
 #define RGB_BRIGHTNESS 64
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
diff --git a/variants/um_tinyc6/pins_arduino.h b/variants/um_tinyc6/pins_arduino.h
index 1afb1d5cc17..6505e1ed50e 100644
--- a/variants/um_tinyc6/pins_arduino.h
+++ b/variants/um_tinyc6/pins_arduino.h
@@ -47,7 +47,7 @@ static const uint8_t VBAT_SENSE = 4;
 static const uint8_t VBUS_SENSE = 10;
 
 static const uint8_t RGB_DATA = 23;
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    (RGB_DATA + SOC_GPIO_PIN_COUNT)
 #define RGB_BRIGHTNESS 64
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
diff --git a/variants/um_tinys2/pins_arduino.h b/variants/um_tinys2/pins_arduino.h
index 1a725f58686..2a6e03aa078 100644
--- a/variants/um_tinys2/pins_arduino.h
+++ b/variants/um_tinys2/pins_arduino.h
@@ -66,7 +66,7 @@ static const uint8_t VBAT_SENSE = 3;
 static const uint8_t VBUS_SENSE = 21;
 
 static const uint8_t RGB_DATA = 1;
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    (RGB_DATA + SOC_GPIO_PIN_COUNT)
 #define RGB_BRIGHTNESS 64
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
diff --git a/variants/um_tinys3/pins_arduino.h b/variants/um_tinys3/pins_arduino.h
index 7168669caf9..24742781dce 100644
--- a/variants/um_tinys3/pins_arduino.h
+++ b/variants/um_tinys3/pins_arduino.h
@@ -47,7 +47,7 @@ static const uint8_t VBAT_SENSE = 10;
 static const uint8_t VBUS_SENSE = 33;
 
 static const uint8_t RGB_DATA = 18;
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    (RGB_DATA + SOC_GPIO_PIN_COUNT)
 #define RGB_BRIGHTNESS 64
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
diff --git a/variants/wifiduino32s3/pins_arduino.h b/variants/wifiduino32s3/pins_arduino.h
index d26e415910e..f6cd2d76ecc 100644
--- a/variants/wifiduino32s3/pins_arduino.h
+++ b/variants/wifiduino32s3/pins_arduino.h
@@ -6,7 +6,7 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-// No USER LED or NeoLED
+// No USER LED or RGB LED
 
 static const uint8_t TX = 45;
 static const uint8_t RX = 44;
diff --git a/variants/wipy3/pins_arduino.h b/variants/wipy3/pins_arduino.h
index 54e565d862f..e655a38f306 100644
--- a/variants/wipy3/pins_arduino.h
+++ b/variants/wipy3/pins_arduino.h
@@ -4,13 +4,13 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
-// Neopixel
-#define PIN_NEOPIXEL 0  // ->2812 RGB !!!
+// RGB_LED
+#define PIN_RGB_LED 0  // ->2812 RGB !!!
 // BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
-static const uint8_t LED_BUILTIN = (PIN_NEOPIXEL + SOC_GPIO_PIN_COUNT);
+static const uint8_t LED_BUILTIN = (PIN_RGB_LED + SOC_GPIO_PIN_COUNT);
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
-// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
 #define RGB_BUILTIN    LED_BUILTIN
 #define RGB_BRIGHTNESS 64