diff --git a/_board/espressif_esp32c6_devkitm_1_n4.md b/_board/espressif_esp32c6_devkitc_1_n4.md
similarity index 98%
rename from _board/espressif_esp32c6_devkitm_1_n4.md
rename to _board/espressif_esp32c6_devkitc_1_n4.md
index 1fde3276d9..113d7fa7df 100644
--- a/_board/espressif_esp32c6_devkitm_1_n4.md
+++ b/_board/espressif_esp32c6_devkitc_1_n4.md
@@ -1,8 +1,8 @@
 ---
 layout: download
 board_id: "espressif_esp32c6_devkitm_1_n4"
-title: "ESP32-C6-DevKitC-1-N4 Download"
-name: "ESP32-C6-DevKitC-1-N4"
+title: "ESP32-C6-DevKitM-1-N4 Download"
+name: "ESP32-C6-DevKitM-1-N4"
 manufacturer: "Espressif"
 board_url:
  - "https://docs.espressif.com/projects/espressif-esp-dev-kits/en/latest/esp32c6/esp32-c6-devkitm-1/user_guide.html"
diff --git a/_board/espressif_esp32s2_devkitc_1_n4r2.md b/_board/espressif_esp32s2_devkitc_1_n4r2.md
index bf97ea4d74..f4beb9c5d2 100644
--- a/_board/espressif_esp32s2_devkitc_1_n4r2.md
+++ b/_board/espressif_esp32s2_devkitc_1_n4r2.md
@@ -1,12 +1,12 @@
 ---
 layout: download
 board_id: "espressif_esp32s2_devkitc_1_n4r2"
-title: "ESP32-S2-DevKitC-1-N4R2 Download"
-name: "ESP32-S2-DevKitC-1-N4R2"
+title: "ESP32-S2-DEVKITC-1R (4MB flash/2MB PSRAM) Download"
+name: "ESP32-S2-DEVKITC-1R (4MB flash/2MB PSRAM)"
 manufacturer: "Espressif"
 board_url:
  - "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/hw-reference/esp32s2/user-guide-s2-devkitc-1.html"
-board_image: "espressif_esp32s2_devkitc_1_n4r2.jpg"
+board_image: "espressif_esp32s2_devkitc_1r.jpg"
 bootloader_id: espressif_esp32s2_devkitc_1
 date_added: 2022-02-14
 family: esp32s2
@@ -16,10 +16,10 @@ features:
   - Breadboard-Friendly
 ---
 
-ESP32-S2-DevKitC-1 is an entry-level development board based on ESP32-S2-SOLO (on-board PCB antenna) or ESP32-S2-SOLO-U (external antenna connector), which are two general-purpose modules with a 4 MB SPI flash. This board integrates complete Wi-Fi functions.
+The ESP32-S2-DEVKITC-1R Evaluation Board by Espressif Systems is a powerful development platform tailored for RF, RFID, and wireless applications. It features the ESP32-S2 transceiver, which supports 802.11 b/g/n Wi-Fi at 2.4GHz, making it ideal for a broad range of IoT applications. Powered by a 32-bit Xtensa single-core processor running at 240MHz, the board includes 320KB SRAM, 128KB ROM, and 4MB SPI Flash, offering efficient processing for complex tasks.
 
-Most of the I/O pins are broken out to the pin headers on both sides for easy interfacing. Developers can either connect peripherals with jumper wires or mount ESP32-S2-DevKitC-1 on a breadboard.
+Additionally, the board is equipped with 43 GPIOs, allowing for versatile interfacing with peripherals and sensors. It also supports multiple communication options, including 4 SPI, 2 UART, 2 I2C, I2S, RMT, USB-OTG, and TWAI (CAN). For analog interfacing, it includes 2 x 8-bit DACs and a 12-bit ADC, making it a comprehensive solution for development and testing of advanced wireless communication systems.
 
 ## Purchase
 
-* [AliExpress](https://www.aliexpress.com/item/1005003578116249.html)
+* [Digi-Key](https://www.digikey.com/en/products/detail/espressif-systems/ESP32-S2-DEVKITC-1R/15222539)
diff --git a/_board/espressif_esp8684_devkitc_02_n4.md b/_board/espressif_esp8684_devkitc_02_n4.md
index 43d773a5b5..6ac9ac86d5 100644
--- a/_board/espressif_esp8684_devkitc_02_n4.md
+++ b/_board/espressif_esp8684_devkitc_02_n4.md
@@ -1,8 +1,8 @@
 ---
 layout: download
 board_id: "espressif_esp8684_devkitc_02_n4"
-title: "ESP8684-DevKitC-2-N4 Download"
-name: "ESP8684-DevKitC-2-N4"
+title: "ESP8684-DevKitC-02C-N4 Download"
+name: "ESP8684-DevKitC-02C-N4"
 manufacturer: "Espressif"
 board_url:
  - "https://docs.espressif.com/projects/espressif-esp-dev-kits/en/latest/esp8684/esp8684-devkitc-02/user_guide.html"
diff --git a/assets/images/boards/large/espressif_esp32s2_devkitc_1_n4r2.jpg b/assets/images/boards/large/espressif_esp32s2_devkitc_1r.jpg
similarity index 100%
rename from assets/images/boards/large/espressif_esp32s2_devkitc_1_n4r2.jpg
rename to assets/images/boards/large/espressif_esp32s2_devkitc_1r.jpg
diff --git a/assets/images/boards/original/espressif_esp32s2_devkitc_1_n4r2.jpg b/assets/images/boards/original/espressif_esp32s2_devkitc_1r.jpg
similarity index 100%
rename from assets/images/boards/original/espressif_esp32s2_devkitc_1_n4r2.jpg
rename to assets/images/boards/original/espressif_esp32s2_devkitc_1r.jpg
diff --git a/assets/images/boards/small/espressif_esp32s2_devkitc_1_n4r2.jpg b/assets/images/boards/small/espressif_esp32s2_devkitc_1r.jpg
similarity index 100%
rename from assets/images/boards/small/espressif_esp32s2_devkitc_1_n4r2.jpg
rename to assets/images/boards/small/espressif_esp32s2_devkitc_1r.jpg