diff --git a/app/boards/lpcxpresso55s16.overlay b/app/boards/lpcxpresso55s16_lpc55s16.overlay
similarity index 100%
rename from app/boards/lpcxpresso55s16.overlay
rename to app/boards/lpcxpresso55s16_lpc55s16.overlay
diff --git a/app/boards/makerbase/mks_canable_v20/mks_canable_v20.conf b/app/boards/mks_canable_v20_stm32g431xx.conf
similarity index 100%
rename from app/boards/makerbase/mks_canable_v20/mks_canable_v20.conf
rename to app/boards/mks_canable_v20_stm32g431xx.conf
diff --git a/app/boards/makerbase/mks_canable_v20/mks_canable_v20.overlay b/app/boards/mks_canable_v20_stm32g431xx.overlay
similarity index 100%
rename from app/boards/makerbase/mks_canable_v20/mks_canable_v20.overlay
rename to app/boards/mks_canable_v20_stm32g431xx.overlay
diff --git a/app/boards/nucleo_h723zg.overlay b/app/boards/nucleo_h723zg_stm32h723xx.overlay
similarity index 100%
rename from app/boards/nucleo_h723zg.overlay
rename to app/boards/nucleo_h723zg_stm32h723xx.overlay