diff --git a/ports/esp32/boards/XIAO_ESP32C3/board.json b/ports/esp32/boards/SEEED_XIAO_ESP32C3/board.json
similarity index 100%
rename from ports/esp32/boards/XIAO_ESP32C3/board.json
rename to ports/esp32/boards/SEEED_XIAO_ESP32C3/board.json
diff --git a/ports/esp32/boards/XIAO_ESP32C3/manifest.py b/ports/esp32/boards/SEEED_XIAO_ESP32C3/manifest.py
similarity index 100%
rename from ports/esp32/boards/XIAO_ESP32C3/manifest.py
rename to ports/esp32/boards/SEEED_XIAO_ESP32C3/manifest.py
diff --git a/ports/esp32/boards/XIAO_ESP32C3/modules/xiao.py b/ports/esp32/boards/SEEED_XIAO_ESP32C3/modules/xiao.py
similarity index 62%
rename from ports/esp32/boards/XIAO_ESP32C3/modules/xiao.py
rename to ports/esp32/boards/SEEED_XIAO_ESP32C3/modules/xiao.py
index 01ef7994d5..1c0f82b5cf 100644
--- a/ports/esp32/boards/XIAO_ESP32C3/modules/xiao.py
+++ b/ports/esp32/boards/SEEED_XIAO_ESP32C3/modules/xiao.py
@@ -1,9 +1,6 @@
-# XIAO ESP32 C3 MicroPython Helper Library
+# Seeed XIAO ESP32 C3 MicroPython Helper Library
 
 from micropython import const
-from machine import Pin
-
-# Pin Assignments
 
 # SPI
 SPI_MOSI = const(10)
diff --git a/ports/esp32/boards/XIAO_ESP32C3/mpconfigboard.cmake b/ports/esp32/boards/SEEED_XIAO_ESP32C3/mpconfigboard.cmake
similarity index 78%
rename from ports/esp32/boards/XIAO_ESP32C3/mpconfigboard.cmake
rename to ports/esp32/boards/SEEED_XIAO_ESP32C3/mpconfigboard.cmake
index 67ed6e6650..4efc554abd 100644
--- a/ports/esp32/boards/XIAO_ESP32C3/mpconfigboard.cmake
+++ b/ports/esp32/boards/SEEED_XIAO_ESP32C3/mpconfigboard.cmake
@@ -3,7 +3,7 @@ set(IDF_TARGET esp32c3)
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.ble
-    boards/XIAO_ESP32C3/sdkconfig.board
+    boards/SEEED_XIAO_ESP32C3/sdkconfig.board
 )
 
 set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/XIAO_ESP32C3/mpconfigboard.h b/ports/esp32/boards/SEEED_XIAO_ESP32C3/mpconfigboard.h
similarity index 88%
rename from ports/esp32/boards/XIAO_ESP32C3/mpconfigboard.h
rename to ports/esp32/boards/SEEED_XIAO_ESP32C3/mpconfigboard.h
index 551c47c91c..513cbae77f 100644
--- a/ports/esp32/boards/XIAO_ESP32C3/mpconfigboard.h
+++ b/ports/esp32/boards/SEEED_XIAO_ESP32C3/mpconfigboard.h
@@ -1,4 +1,4 @@
-#define MICROPY_HW_BOARD_NAME               "XIAO-ESP32C3"
+#define MICROPY_HW_BOARD_NAME               "Seeed XIAO ESP32C3"
 #define MICROPY_HW_MCU_NAME                 "ESP32-C3FN4"
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "XIAO-ESP32C3"
 
diff --git a/ports/esp32/boards/XIAO_ESP32C3/sdkconfig.board b/ports/esp32/boards/SEEED_XIAO_ESP32C3/sdkconfig.board
similarity index 100%
rename from ports/esp32/boards/XIAO_ESP32C3/sdkconfig.board
rename to ports/esp32/boards/SEEED_XIAO_ESP32C3/sdkconfig.board
diff --git a/ports/esp32/boards/XIAO_ESP32S3/board.json b/ports/esp32/boards/SEEED_XIAO_ESP32S3/board.json
similarity index 100%
rename from ports/esp32/boards/XIAO_ESP32S3/board.json
rename to ports/esp32/boards/SEEED_XIAO_ESP32S3/board.json
diff --git a/ports/esp32/boards/XIAO_ESP32S3/manifest.py b/ports/esp32/boards/SEEED_XIAO_ESP32S3/manifest.py
similarity index 100%
rename from ports/esp32/boards/XIAO_ESP32S3/manifest.py
rename to ports/esp32/boards/SEEED_XIAO_ESP32S3/manifest.py
diff --git a/ports/esp32/boards/XIAO_ESP32S3/modules/xiao.py b/ports/esp32/boards/SEEED_XIAO_ESP32S3/modules/xiao.py
similarity index 94%
rename from ports/esp32/boards/XIAO_ESP32S3/modules/xiao.py
rename to ports/esp32/boards/SEEED_XIAO_ESP32S3/modules/xiao.py
index 0f403dd324..6864f3de10 100644
--- a/ports/esp32/boards/XIAO_ESP32S3/modules/xiao.py
+++ b/ports/esp32/boards/SEEED_XIAO_ESP32S3/modules/xiao.py
@@ -3,8 +3,6 @@
 from micropython import const
 from machine import Pin
 
-# Pin Assignments
-
 # SPI
 SPI_MOSI = const(9)
 SPI_MISO = const(8)
diff --git a/ports/esp32/boards/XIAO_ESP32S3/mpconfigboard.cmake b/ports/esp32/boards/SEEED_XIAO_ESP32S3/mpconfigboard.cmake
similarity index 84%
rename from ports/esp32/boards/XIAO_ESP32S3/mpconfigboard.cmake
rename to ports/esp32/boards/SEEED_XIAO_ESP32S3/mpconfigboard.cmake
index 07d69f7b02..01ea92951d 100644
--- a/ports/esp32/boards/XIAO_ESP32S3/mpconfigboard.cmake
+++ b/ports/esp32/boards/SEEED_XIAO_ESP32S3/mpconfigboard.cmake
@@ -6,7 +6,7 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
     boards/sdkconfig.spiram_sx
-    boards/XIAO_ESP32S3/sdkconfig.board
+    boards/SEEED_XIAO_ESP32S3/sdkconfig.board
 )
 
 set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/XIAO_ESP32S3/mpconfigboard.h b/ports/esp32/boards/SEEED_XIAO_ESP32S3/mpconfigboard.h
similarity index 86%
rename from ports/esp32/boards/XIAO_ESP32S3/mpconfigboard.h
rename to ports/esp32/boards/SEEED_XIAO_ESP32S3/mpconfigboard.h
index 175df58331..48b1ca8488 100644
--- a/ports/esp32/boards/XIAO_ESP32S3/mpconfigboard.h
+++ b/ports/esp32/boards/SEEED_XIAO_ESP32S3/mpconfigboard.h
@@ -1,4 +1,4 @@
-#define MICROPY_HW_BOARD_NAME               "XIAO-ESP32S3"
+#define MICROPY_HW_BOARD_NAME               "Seeed XIAO ESP32S3"
 #define MICROPY_HW_MCU_NAME                 "ESP32-S3-FN8"
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "XIAO-ESP32S3"
 
diff --git a/ports/esp32/boards/XIAO_ESP32S3/sdkconfig.board b/ports/esp32/boards/SEEED_XIAO_ESP32S3/sdkconfig.board
similarity index 100%
rename from ports/esp32/boards/XIAO_ESP32S3/sdkconfig.board
rename to ports/esp32/boards/SEEED_XIAO_ESP32S3/sdkconfig.board