diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f51727f509..72a13987ed 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ jobs:
     outputs:
       arm-boards: ${{ steps.set-matrix.outputs.arm-boards }}
       riscv-boards: ${{ steps.set-matrix.outputs.riscv-boards }}
-      xtensa-boards: ${{ steps.set-matrix.outputs.xtensa-boards }}
+      espressif-boards: ${{ steps.set-matrix.outputs.espressif-boards }}
     steps:
     - name: Dump GitHub context
       env:
diff --git a/.gitmodules b/.gitmodules
index 1c6a98eb9d..b261d8f408 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -150,11 +150,11 @@
 [submodule "frozen/Adafruit_CircuitPython_RFM69"]
 	path = frozen/Adafruit_CircuitPython_RFM69
 	url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git
-[submodule "ports/esp32s2/esp-idf"]
+[submodule "ports/espressif/esp-idf"]
 	path = ports/espressif/esp-idf
 	url = https://github.com/espressif/esp-idf.git
 	branch = release/v4.3
-[submodule "ports/esp32s2/certificates/nina-fw"]
+[submodule "ports/espressif/certificates/nina-fw"]
 	path = ports/espressif/certificates/nina-fw
 	url = https://github.com/adafruit/nina-fw.git
 [submodule "frozen/Adafruit_CircuitPython_ST7789"]
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a6ad210f7a..cfee897258 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,7 +8,7 @@ repos:
     hooks:
     -   id: check-yaml
     -   id: end-of-file-fixer
-        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/esp32s2/esp-idf-config/.*|ports/esp32s2/boards/.*/sdkconfig)'
+        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/espressif/esp-idf-config/.*|ports/espressif/boards/.*/sdkconfig)'
     -   id: trailing-whitespace
         exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*)'
 -   repo: local
diff --git a/tools/ci_changed_board_list.py b/tools/ci_changed_board_list.py
index aab966e56b..086bd65418 100644
--- a/tools/ci_changed_board_list.py
+++ b/tools/ci_changed_board_list.py
@@ -83,7 +83,7 @@ else:
 
 # Split boards by architecture.
 print("Building boards:")
-arch_to_boards = {"arm": [], "riscv": [], "xtensa": []}
+arch_to_boards = {"arm": [], "riscv": [], "espressif": []}
 for board in boards_to_build:
     print(" ", board)
     arch = PORT_TO_ARCH[board_to_port[board]]