diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 888e40bb..b3a37739 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -253,13 +253,13 @@ jobs:
     steps:
     - uses: actions/checkout@v3
       with: { fetch-depth: 2 }
-    - run: if ./test/match_changed_files.sh "^src|examples/device-dashboard|examples/microchip/same54" ; then echo GO=1 >> $GITHUB_ENV ; fi
+    - run: if ./test/match_changed_files.sh "^src|examples/device-dashboard|examples/microchip/same54-xpro" ; then echo GO=1 >> $GITHUB_ENV ; fi
     - if: ${{ env.GO == 1 }}
       run: sudo apt -y update; sudo apt -y install gcc-arm-none-eabi
     - if: ${{ env.GO == 1 }}
-      run:  make -C examples/microchip/same54/device-dashboard test VCON_API_KEY=${{secrets.VCON_API_KEY}}
+      run:  make -C examples/microchip/same54-xpro/device-dashboard test VCON_API_KEY=${{secrets.VCON_API_KEY}}
     - if: ${{ env.GO == 1 }}
-      run:  make -C examples/microchip/same54/mqtt-client test VCON_API_KEY=${{secrets.VCON_API_KEY}}
+      run:  make -C examples/microchip/same54-xpro/mqtt-client test VCON_API_KEY=${{secrets.VCON_API_KEY}}
 
   test_pico_w5500:
     runs-on: ubuntu-latest
@@ -296,8 +296,8 @@ jobs:
           - path: esp32/device-dashboard
           - path: esp32/uart-bridge
           - path: esp8266/http-client-server
-          - path: microchip/same54/device-dashboard
-          - path: microchip/same54/mqtt-client
+          - path: microchip/same54-xpro/device-dashboard
+          - path: microchip/same54-xpro/mqtt-client
           - path: infineon/infineon-xmc4700_4800-lwip-rtx-rtos
           - path: nxp/nxp-mimxrt1020-azurertos
           - path: nxp/nxp-frdmk66f-freertos
diff --git a/examples/microchip/same54/device-dashboard/Makefile b/examples/microchip/same54-xpro/device-dashboard/Makefile
similarity index 100%
rename from examples/microchip/same54/device-dashboard/Makefile
rename to examples/microchip/same54-xpro/device-dashboard/Makefile
diff --git a/examples/microchip/same54/device-dashboard/hal.h b/examples/microchip/same54-xpro/device-dashboard/hal.h
similarity index 100%
rename from examples/microchip/same54/device-dashboard/hal.h
rename to examples/microchip/same54-xpro/device-dashboard/hal.h
diff --git a/examples/microchip/same54/device-dashboard/link.ld b/examples/microchip/same54-xpro/device-dashboard/link.ld
similarity index 100%
rename from examples/microchip/same54/device-dashboard/link.ld
rename to examples/microchip/same54-xpro/device-dashboard/link.ld
diff --git a/examples/microchip/same54/device-dashboard/main.c b/examples/microchip/same54-xpro/device-dashboard/main.c
similarity index 100%
rename from examples/microchip/same54/device-dashboard/main.c
rename to examples/microchip/same54-xpro/device-dashboard/main.c
diff --git a/examples/microchip/same54/device-dashboard/mongoose.c b/examples/microchip/same54-xpro/device-dashboard/mongoose.c
similarity index 100%
rename from examples/microchip/same54/device-dashboard/mongoose.c
rename to examples/microchip/same54-xpro/device-dashboard/mongoose.c
diff --git a/examples/microchip/same54/device-dashboard/mongoose.h b/examples/microchip/same54-xpro/device-dashboard/mongoose.h
similarity index 100%
rename from examples/microchip/same54/device-dashboard/mongoose.h
rename to examples/microchip/same54-xpro/device-dashboard/mongoose.h
diff --git a/examples/microchip/same54/device-dashboard/net.c b/examples/microchip/same54-xpro/device-dashboard/net.c
similarity index 100%
rename from examples/microchip/same54/device-dashboard/net.c
rename to examples/microchip/same54-xpro/device-dashboard/net.c
diff --git a/examples/microchip/same54/device-dashboard/net.h b/examples/microchip/same54-xpro/device-dashboard/net.h
similarity index 100%
rename from examples/microchip/same54/device-dashboard/net.h
rename to examples/microchip/same54-xpro/device-dashboard/net.h
diff --git a/examples/microchip/same54/device-dashboard/packed_fs.c b/examples/microchip/same54-xpro/device-dashboard/packed_fs.c
similarity index 100%
rename from examples/microchip/same54/device-dashboard/packed_fs.c
rename to examples/microchip/same54-xpro/device-dashboard/packed_fs.c
diff --git a/examples/microchip/same54/device-dashboard/startup.c b/examples/microchip/same54-xpro/device-dashboard/startup.c
similarity index 100%
rename from examples/microchip/same54/device-dashboard/startup.c
rename to examples/microchip/same54-xpro/device-dashboard/startup.c
diff --git a/examples/microchip/same54/device-dashboard/syscalls.c b/examples/microchip/same54-xpro/device-dashboard/syscalls.c
similarity index 100%
rename from examples/microchip/same54/device-dashboard/syscalls.c
rename to examples/microchip/same54-xpro/device-dashboard/syscalls.c
diff --git a/examples/microchip/same54/mqtt-client/Makefile b/examples/microchip/same54-xpro/mqtt-client/Makefile
similarity index 100%
rename from examples/microchip/same54/mqtt-client/Makefile
rename to examples/microchip/same54-xpro/mqtt-client/Makefile
diff --git a/examples/microchip/same54/mqtt-client/hal.h b/examples/microchip/same54-xpro/mqtt-client/hal.h
similarity index 100%
rename from examples/microchip/same54/mqtt-client/hal.h
rename to examples/microchip/same54-xpro/mqtt-client/hal.h
diff --git a/examples/microchip/same54/mqtt-client/link.ld b/examples/microchip/same54-xpro/mqtt-client/link.ld
similarity index 100%
rename from examples/microchip/same54/mqtt-client/link.ld
rename to examples/microchip/same54-xpro/mqtt-client/link.ld
diff --git a/examples/microchip/same54/mqtt-client/main.c b/examples/microchip/same54-xpro/mqtt-client/main.c
similarity index 100%
rename from examples/microchip/same54/mqtt-client/main.c
rename to examples/microchip/same54-xpro/mqtt-client/main.c
diff --git a/examples/microchip/same54/mqtt-client/mongoose.c b/examples/microchip/same54-xpro/mqtt-client/mongoose.c
similarity index 100%
rename from examples/microchip/same54/mqtt-client/mongoose.c
rename to examples/microchip/same54-xpro/mqtt-client/mongoose.c
diff --git a/examples/microchip/same54/mqtt-client/mongoose.h b/examples/microchip/same54-xpro/mqtt-client/mongoose.h
similarity index 100%
rename from examples/microchip/same54/mqtt-client/mongoose.h
rename to examples/microchip/same54-xpro/mqtt-client/mongoose.h
diff --git a/examples/microchip/same54/mqtt-client/startup.c b/examples/microchip/same54-xpro/mqtt-client/startup.c
similarity index 100%
rename from examples/microchip/same54/mqtt-client/startup.c
rename to examples/microchip/same54-xpro/mqtt-client/startup.c
diff --git a/examples/microchip/same54/mqtt-client/syscalls.c b/examples/microchip/same54-xpro/mqtt-client/syscalls.c
similarity index 100%
rename from examples/microchip/same54/mqtt-client/syscalls.c
rename to examples/microchip/same54-xpro/mqtt-client/syscalls.c