diff --git a/README.md b/README.md
index 5574238..a88985c 100644
--- a/README.md
+++ b/README.md
@@ -81,14 +81,14 @@ configurations:
    how Device Tree files generated by CubeMX can be integrated in a
    Buildroot configuration.
 
-11. `m5stack_core135_defconfig`, which is a more feature-ful
+11. `m5stack_coremp135_defconfig`, which is a more feature-ful
    configuration to support the [STM32MP135F Discovery Kit](https://wiki.st.com/stm32mpu/wiki/STM32MP13_microprocessor)
    board. It has support for OpenGL and Qt5 for graphics, for OP-TEE
    as a Trusted Execution Environment, for RAUC for OTA. It also shows
    how Device Tree files generated by CubeMX can be integrated in a
    Buildroot configuration.
 
-| Feature | st_stm32mp157*_dk1 | st_stm32mp157*_dk2 | st_stm32mp157*_dk1_demo | st_stm32mp157*_dk2_demo | st_stm32mp135f_dk | st_stm32mp135f_dk_demo | m5stack_core135 |
+| Feature | st_stm32mp157*_dk1 | st_stm32mp157*_dk2 | st_stm32mp157*_dk1_demo | st_stm32mp157*_dk2_demo | st_stm32mp135f_dk | st_stm32mp135f_dk_demo | m5stack_coremp135 |
 | ------- | ------------------ | ------------------ | ----------------------- | ----------------------- | ----------------------- | ----------------------- | ----------------------- |
 | TF-A    | v2.8-stm32mp-r1.1 | v2.8-stm32mp-r1.1 | v2.8-stm32mp-r1.1 | v2.8-stm32mp-r1.1 | v2.8-stm32mp-r1.1 | v2.8-stm32mp-r1.1 | v2.8-stm32mp-r1.1 |
 | U-Boot  | v2022.10-stm32mp-r1.1 | v2022.10-stm32mp-r1.1 | v2022.10-stm32mp-r1.1 | v2022.10-stm32mp-r1.1 | v2022.10-stm32mp-r1.1 | v2022.10-stm32mp-r1.1 | v2022.10-stm32mp-r1.1 |
diff --git a/board/m5stack/core135/flash.tsv b/board/m5stack/coremp135/flash.tsv
similarity index 100%
rename from board/m5stack/core135/flash.tsv
rename to board/m5stack/coremp135/flash.tsv
diff --git a/board/m5stack/core135/genimage.cfg b/board/m5stack/coremp135/genimage.cfg
similarity index 100%
rename from board/m5stack/core135/genimage.cfg
rename to board/m5stack/coremp135/genimage.cfg
diff --git a/board/m5stack/core135/linux-disable-etnaviv.config b/board/m5stack/coremp135/linux-disable-etnaviv.config
similarity index 100%
rename from board/m5stack/core135/linux-disable-etnaviv.config
rename to board/m5stack/coremp135/linux-disable-etnaviv.config
diff --git a/board/m5stack/core135/linux-dts/stm32mp135f-core135.dts b/board/m5stack/coremp135/linux-dts/stm32mp135f-coremp135.dts
similarity index 100%
rename from board/m5stack/core135/linux-dts/stm32mp135f-core135.dts
rename to board/m5stack/coremp135/linux-dts/stm32mp135f-coremp135.dts
diff --git a/board/m5stack/core135/linux-enable-fbdev-emul.config b/board/m5stack/coremp135/linux-enable-fbdev-emul.config
similarity index 100%
rename from board/m5stack/core135/linux-enable-fbdev-emul.config
rename to board/m5stack/coremp135/linux-enable-fbdev-emul.config
diff --git a/board/m5stack/core135/linux-enable-m5stack.config b/board/m5stack/coremp135/linux-enable-m5stack.config
similarity index 100%
rename from board/m5stack/core135/linux-enable-m5stack.config
rename to board/m5stack/coremp135/linux-enable-m5stack.config
diff --git a/board/m5stack/core135/optee-dts/stm32mp135f-core135.dts b/board/m5stack/coremp135/optee-dts/stm32mp135f-coremp135.dts
similarity index 100%
rename from board/m5stack/core135/optee-dts/stm32mp135f-core135.dts
rename to board/m5stack/coremp135/optee-dts/stm32mp135f-coremp135.dts
diff --git a/board/m5stack/core135/optee-dts/stm32mp13xd.dtsi b/board/m5stack/coremp135/optee-dts/stm32mp13xd.dtsi
similarity index 100%
rename from board/m5stack/core135/optee-dts/stm32mp13xd.dtsi
rename to board/m5stack/coremp135/optee-dts/stm32mp13xd.dtsi
diff --git a/board/m5stack/core135/patches/linux/0001-ASoC-cs42l51-fix-driver-to-properly-autoload-with-au.patch b/board/m5stack/coremp135/patches/linux/0001-ASoC-cs42l51-fix-driver-to-properly-autoload-with-au.patch
similarity index 100%
rename from board/m5stack/core135/patches/linux/0001-ASoC-cs42l51-fix-driver-to-properly-autoload-with-au.patch
rename to board/m5stack/coremp135/patches/linux/0001-ASoC-cs42l51-fix-driver-to-properly-autoload-with-au.patch
diff --git a/board/m5stack/core135/patches/linux/0002-sund-out_to_pins.patch b/board/m5stack/coremp135/patches/linux/0002-sund-out_to_pins.patch
similarity index 100%
rename from board/m5stack/core135/patches/linux/0002-sund-out_to_pins.patch
rename to board/m5stack/coremp135/patches/linux/0002-sund-out_to_pins.patch
diff --git a/board/m5stack/core135/patches/linux/0003-sund-kconfig.patch b/board/m5stack/coremp135/patches/linux/0003-sund-kconfig.patch
similarity index 100%
rename from board/m5stack/core135/patches/linux/0003-sund-kconfig.patch
rename to board/m5stack/coremp135/patches/linux/0003-sund-kconfig.patch
diff --git a/board/m5stack/core135/patches/linux/0004-sund-makefile.patch b/board/m5stack/coremp135/patches/linux/0004-sund-makefile.patch
similarity index 100%
rename from board/m5stack/core135/patches/linux/0004-sund-makefile.patch
rename to board/m5stack/coremp135/patches/linux/0004-sund-makefile.patch
diff --git a/board/m5stack/core135/patches/linux/0005-fbdev-fb_ili9341_m5.patch b/board/m5stack/coremp135/patches/linux/0005-fbdev-fb_ili9341_m5.patch
similarity index 100%
rename from board/m5stack/core135/patches/linux/0005-fbdev-fb_ili9341_m5.patch
rename to board/m5stack/coremp135/patches/linux/0005-fbdev-fb_ili9341_m5.patch
diff --git a/board/m5stack/core135/patches/linux/0006-fbdev-makefile.patch b/board/m5stack/coremp135/patches/linux/0006-fbdev-makefile.patch
similarity index 100%
rename from board/m5stack/core135/patches/linux/0006-fbdev-makefile.patch
rename to board/m5stack/coremp135/patches/linux/0006-fbdev-makefile.patch
diff --git a/board/m5stack/core135/patches/linux/0007-fbdev-kconfig.patch b/board/m5stack/coremp135/patches/linux/0007-fbdev-kconfig.patch
similarity index 100%
rename from board/m5stack/core135/patches/linux/0007-fbdev-kconfig.patch
rename to board/m5stack/coremp135/patches/linux/0007-fbdev-kconfig.patch
diff --git a/board/m5stack/core135/patches/linux/0008-fbtft-core.patch b/board/m5stack/coremp135/patches/linux/0008-fbtft-core.patch
similarity index 100%
rename from board/m5stack/core135/patches/linux/0008-fbtft-core.patch
rename to board/m5stack/coremp135/patches/linux/0008-fbtft-core.patch
diff --git a/board/m5stack/core135/patches/uboot/0001-cmd_show_logo.patch b/board/m5stack/coremp135/patches/uboot/0001-cmd_show_logo.patch
similarity index 100%
rename from board/m5stack/core135/patches/uboot/0001-cmd_show_logo.patch
rename to board/m5stack/coremp135/patches/uboot/0001-cmd_show_logo.patch
diff --git a/board/m5stack/core135/patches/uboot/0002-core135.patch b/board/m5stack/coremp135/patches/uboot/0002-coremp135.patch
similarity index 96%
rename from board/m5stack/core135/patches/uboot/0002-core135.patch
rename to board/m5stack/coremp135/patches/uboot/0002-coremp135.patch
index 9fc1a41..f0ece2b 100644
--- a/board/m5stack/core135/patches/uboot/0002-core135.patch
+++ b/board/m5stack/coremp135/patches/uboot/0002-coremp135.patch
@@ -1,5 +1,5 @@
---- a/configs/core135_defconfig	2024-04-15 12:16:26.409859959 +0800
-+++ b/configs/core135_defconfig	2024-04-15 12:16:19.373730487 +0800
+--- a/configs/coremp135_defconfig	2024-04-15 12:16:26.409859959 +0800
++++ b/configs/coremp135_defconfig	2024-04-15 12:16:19.373730487 +0800
 @@ -0,0 +1,146 @@
 +CONFIG_ARM=y
 +CONFIG_ARCH_STM32MP=y
diff --git a/board/m5stack/core135/patches/uboot/0003-cmd_Makefile.patch b/board/m5stack/coremp135/patches/uboot/0003-cmd_Makefile.patch
similarity index 100%
rename from board/m5stack/core135/patches/uboot/0003-cmd_Makefile.patch
rename to board/m5stack/coremp135/patches/uboot/0003-cmd_Makefile.patch
diff --git a/board/m5stack/core135/post-build.sh b/board/m5stack/coremp135/post-build.sh
similarity index 100%
rename from board/m5stack/core135/post-build.sh
rename to board/m5stack/coremp135/post-build.sh
diff --git a/board/m5stack/core135/post-image.sh b/board/m5stack/coremp135/post-image.sh
similarity index 100%
rename from board/m5stack/core135/post-image.sh
rename to board/m5stack/coremp135/post-image.sh
diff --git a/board/m5stack/core135/tfa-dts/stm32mp135f-core135-fw-config.dts b/board/m5stack/coremp135/tfa-dts/stm32mp135f-coremp135-fw-config.dts
similarity index 100%
rename from board/m5stack/core135/tfa-dts/stm32mp135f-core135-fw-config.dts
rename to board/m5stack/coremp135/tfa-dts/stm32mp135f-coremp135-fw-config.dts
diff --git a/board/m5stack/core135/tfa-dts/stm32mp135f-core135.dts b/board/m5stack/coremp135/tfa-dts/stm32mp135f-coremp135.dts
similarity index 100%
rename from board/m5stack/core135/tfa-dts/stm32mp135f-core135.dts
rename to board/m5stack/coremp135/tfa-dts/stm32mp135f-coremp135.dts
diff --git a/board/m5stack/core135/uboot-dts/stm32mp135f-core135-u-boot.dtsi b/board/m5stack/coremp135/uboot-dts/stm32mp135f-coremp135-u-boot.dtsi
similarity index 100%
rename from board/m5stack/core135/uboot-dts/stm32mp135f-core135-u-boot.dtsi
rename to board/m5stack/coremp135/uboot-dts/stm32mp135f-coremp135-u-boot.dtsi
diff --git a/board/m5stack/core135/uboot-dts/stm32mp135f-core135.dts b/board/m5stack/coremp135/uboot-dts/stm32mp135f-coremp135.dts
similarity index 100%
rename from board/m5stack/core135/uboot-dts/stm32mp135f-core135.dts
rename to board/m5stack/coremp135/uboot-dts/stm32mp135f-coremp135.dts
diff --git a/board/m5stack/core135_5_15/flash.tsv b/board/m5stack/coremp135_5_15/flash.tsv
similarity index 100%
rename from board/m5stack/core135_5_15/flash.tsv
rename to board/m5stack/coremp135_5_15/flash.tsv
diff --git a/board/m5stack/core135_5_15/genimage.cfg b/board/m5stack/coremp135_5_15/genimage.cfg
similarity index 100%
rename from board/m5stack/core135_5_15/genimage.cfg
rename to board/m5stack/coremp135_5_15/genimage.cfg
diff --git a/board/m5stack/core135_5_15/linux-disable-etnaviv.config b/board/m5stack/coremp135_5_15/linux-disable-etnaviv.config
similarity index 100%
rename from board/m5stack/core135_5_15/linux-disable-etnaviv.config
rename to board/m5stack/coremp135_5_15/linux-disable-etnaviv.config
diff --git a/board/m5stack/core135_5_15/linux-dts/stm32mp135f-core135.dts b/board/m5stack/coremp135_5_15/linux-dts/stm32mp135f-coremp135.dts
similarity index 100%
rename from board/m5stack/core135_5_15/linux-dts/stm32mp135f-core135.dts
rename to board/m5stack/coremp135_5_15/linux-dts/stm32mp135f-coremp135.dts
diff --git a/board/m5stack/core135_5_15/linux-enable-fbdev-emul.config b/board/m5stack/coremp135_5_15/linux-enable-fbdev-emul.config
similarity index 100%
rename from board/m5stack/core135_5_15/linux-enable-fbdev-emul.config
rename to board/m5stack/coremp135_5_15/linux-enable-fbdev-emul.config
diff --git a/board/m5stack/core135_5_15/linux-enable-m5stack.config b/board/m5stack/coremp135_5_15/linux-enable-m5stack.config
similarity index 100%
rename from board/m5stack/core135_5_15/linux-enable-m5stack.config
rename to board/m5stack/coremp135_5_15/linux-enable-m5stack.config
diff --git a/board/m5stack/core135_5_15/optee-dts/stm32mp135f-core135.dts b/board/m5stack/coremp135_5_15/optee-dts/stm32mp135f-coremp135.dts
similarity index 100%
rename from board/m5stack/core135_5_15/optee-dts/stm32mp135f-core135.dts
rename to board/m5stack/coremp135_5_15/optee-dts/stm32mp135f-coremp135.dts
diff --git a/board/m5stack/core135_5_15/optee-dts/stm32mp13xd.dtsi b/board/m5stack/coremp135_5_15/optee-dts/stm32mp13xd.dtsi
similarity index 100%
rename from board/m5stack/core135_5_15/optee-dts/stm32mp13xd.dtsi
rename to board/m5stack/coremp135_5_15/optee-dts/stm32mp13xd.dtsi
diff --git a/board/m5stack/core135_5_15/patches/linux/0002-sund-out_to_pins.patch b/board/m5stack/coremp135_5_15/patches/linux/0002-sund-out_to_pins.patch
similarity index 100%
rename from board/m5stack/core135_5_15/patches/linux/0002-sund-out_to_pins.patch
rename to board/m5stack/coremp135_5_15/patches/linux/0002-sund-out_to_pins.patch
diff --git a/board/m5stack/core135_5_15/patches/linux/0003-sund-kconfig.patch b/board/m5stack/coremp135_5_15/patches/linux/0003-sund-kconfig.patch
similarity index 100%
rename from board/m5stack/core135_5_15/patches/linux/0003-sund-kconfig.patch
rename to board/m5stack/coremp135_5_15/patches/linux/0003-sund-kconfig.patch
diff --git a/board/m5stack/core135_5_15/patches/linux/0004-sund-makefile.patch b/board/m5stack/coremp135_5_15/patches/linux/0004-sund-makefile.patch
similarity index 100%
rename from board/m5stack/core135_5_15/patches/linux/0004-sund-makefile.patch
rename to board/m5stack/coremp135_5_15/patches/linux/0004-sund-makefile.patch
diff --git a/board/m5stack/core135_5_15/patches/linux/0005-fbdev-fb_ili9341_m5.patch b/board/m5stack/coremp135_5_15/patches/linux/0005-fbdev-fb_ili9341_m5.patch
similarity index 100%
rename from board/m5stack/core135_5_15/patches/linux/0005-fbdev-fb_ili9341_m5.patch
rename to board/m5stack/coremp135_5_15/patches/linux/0005-fbdev-fb_ili9341_m5.patch
diff --git a/board/m5stack/core135_5_15/patches/linux/0006-fbdev-makefile.patch b/board/m5stack/coremp135_5_15/patches/linux/0006-fbdev-makefile.patch
similarity index 100%
rename from board/m5stack/core135_5_15/patches/linux/0006-fbdev-makefile.patch
rename to board/m5stack/coremp135_5_15/patches/linux/0006-fbdev-makefile.patch
diff --git a/board/m5stack/core135_5_15/patches/linux/0007-fbdev-kconfig.patch b/board/m5stack/coremp135_5_15/patches/linux/0007-fbdev-kconfig.patch
similarity index 100%
rename from board/m5stack/core135_5_15/patches/linux/0007-fbdev-kconfig.patch
rename to board/m5stack/coremp135_5_15/patches/linux/0007-fbdev-kconfig.patch
diff --git a/board/m5stack/core135_5_15/patches/linux/0008-fbtft-core.patch b/board/m5stack/coremp135_5_15/patches/linux/0008-fbtft-core.patch
similarity index 100%
rename from board/m5stack/core135_5_15/patches/linux/0008-fbtft-core.patch
rename to board/m5stack/coremp135_5_15/patches/linux/0008-fbtft-core.patch
diff --git a/board/m5stack/core135_5_15/patches/uboot/0001-cmd_show_logo.patch b/board/m5stack/coremp135_5_15/patches/uboot/0001-cmd_show_logo.patch
similarity index 100%
rename from board/m5stack/core135_5_15/patches/uboot/0001-cmd_show_logo.patch
rename to board/m5stack/coremp135_5_15/patches/uboot/0001-cmd_show_logo.patch
diff --git a/board/m5stack/core135_5_15/patches/uboot/0002-core135.patch b/board/m5stack/coremp135_5_15/patches/uboot/0002-coremp135.patch
similarity index 96%
rename from board/m5stack/core135_5_15/patches/uboot/0002-core135.patch
rename to board/m5stack/coremp135_5_15/patches/uboot/0002-coremp135.patch
index 97d8f9c..2a0c979 100644
--- a/board/m5stack/core135_5_15/patches/uboot/0002-core135.patch
+++ b/board/m5stack/coremp135_5_15/patches/uboot/0002-coremp135.patch
@@ -1,5 +1,5 @@
---- a/configs/core135_defconfig	2024-04-15 12:16:26.409859959 +0800
-+++ b/configs/core135_defconfig	2024-04-15 12:16:19.373730487 +0800
+--- a/configs/coremp135_defconfig	2024-04-15 12:16:26.409859959 +0800
++++ b/configs/coremp135_defconfig	2024-04-15 12:16:19.373730487 +0800
 @@ -0,0 +1,143 @@
 +CONFIG_ARM=y
 +CONFIG_ARCH_STM32MP=y
diff --git a/board/m5stack/core135_5_15/patches/uboot/0003-cmd_Makefile.patch b/board/m5stack/coremp135_5_15/patches/uboot/0003-cmd_Makefile.patch
similarity index 100%
rename from board/m5stack/core135_5_15/patches/uboot/0003-cmd_Makefile.patch
rename to board/m5stack/coremp135_5_15/patches/uboot/0003-cmd_Makefile.patch
diff --git a/board/m5stack/core135_5_15/post-build.sh b/board/m5stack/coremp135_5_15/post-build.sh
similarity index 100%
rename from board/m5stack/core135_5_15/post-build.sh
rename to board/m5stack/coremp135_5_15/post-build.sh
diff --git a/board/m5stack/core135_5_15/post-image.sh b/board/m5stack/coremp135_5_15/post-image.sh
similarity index 100%
rename from board/m5stack/core135_5_15/post-image.sh
rename to board/m5stack/coremp135_5_15/post-image.sh
diff --git a/board/m5stack/core135_5_15/tfa-dts/stm32mp135f-core135-fw-config.dts b/board/m5stack/coremp135_5_15/tfa-dts/stm32mp135f-coremp135-fw-config.dts
similarity index 100%
rename from board/m5stack/core135_5_15/tfa-dts/stm32mp135f-core135-fw-config.dts
rename to board/m5stack/coremp135_5_15/tfa-dts/stm32mp135f-coremp135-fw-config.dts
diff --git a/board/m5stack/core135_5_15/tfa-dts/stm32mp135f-core135.dts b/board/m5stack/coremp135_5_15/tfa-dts/stm32mp135f-coremp135.dts
similarity index 100%
rename from board/m5stack/core135_5_15/tfa-dts/stm32mp135f-core135.dts
rename to board/m5stack/coremp135_5_15/tfa-dts/stm32mp135f-coremp135.dts
diff --git a/board/m5stack/core135_5_15/uboot-dts/stm32mp135f-core135-u-boot.dtsi b/board/m5stack/coremp135_5_15/uboot-dts/stm32mp135f-coremp135-u-boot.dtsi
similarity index 100%
rename from board/m5stack/core135_5_15/uboot-dts/stm32mp135f-core135-u-boot.dtsi
rename to board/m5stack/coremp135_5_15/uboot-dts/stm32mp135f-coremp135-u-boot.dtsi
diff --git a/board/m5stack/core135_5_15/uboot-dts/stm32mp135f-core135.dts b/board/m5stack/coremp135_5_15/uboot-dts/stm32mp135f-coremp135.dts
similarity index 100%
rename from board/m5stack/core135_5_15/uboot-dts/stm32mp135f-core135.dts
rename to board/m5stack/coremp135_5_15/uboot-dts/stm32mp135f-coremp135.dts
diff --git a/board/m5stack/overlay/etc/hostname b/board/m5stack/overlay/etc/hostname
index c13419c..6114eef 100644
--- a/board/m5stack/overlay/etc/hostname
+++ b/board/m5stack/overlay/etc/hostname
@@ -1 +1 @@
-Core135
\ No newline at end of file
+CoreMP135
\ No newline at end of file
diff --git a/board/m5stack/overlay/etc/issue b/board/m5stack/overlay/etc/issue
index fe257a9..49b5ba1 100644
--- a/board/m5stack/overlay/etc/issue
+++ b/board/m5stack/overlay/etc/issue
@@ -5,4 +5,4 @@
 #     #        #        #     #     #######  #        #  #   
 #     #  #     #  #     #     #     #     #  #     #  #   #  
 #     #   #####    #####      #     #     #   #####   #    # 
-Welcome to Core135, power by m5stack.
+Welcome to CoreMP135, Powered by M5Stack.
diff --git a/configs/m5stack_core135_515_defconfig b/configs/m5stack_coremp135_515_defconfig
similarity index 77%
rename from configs/m5stack_core135_515_defconfig
rename to configs/m5stack_coremp135_515_defconfig
index b322757..9aa77cd 100644
--- a/configs/m5stack_core135_515_defconfig
+++ b/configs/m5stack_coremp135_515_defconfig
@@ -3,11 +3,11 @@
 BR2_arm=y
 BR2_cortex_a7=y
 BR2_TOOLCHAIN_EXTERNAL=y
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_ST_PATH)/board/m5stack/core135_5_15/patches/"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_ST_PATH)/board/m5stack/coremp135_5_15/patches/"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
 BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_ST_PATH)/board/m5stack/overlay/"
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_ST_PATH)/board/m5stack/core135_5_15/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_ST_PATH)/board/m5stack/core135_5_15/post-image.sh"
+BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_ST_PATH)/board/m5stack/coremp135_5_15/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_ST_PATH)/board/m5stack/coremp135_5_15/post-image.sh"
 BR2_PACKAGE_OPTEE_CLIENT=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
@@ -45,8 +45,8 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE="u-boot-nodtb.bin"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="*.stm32 fip.bin"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_ST_PATH)/board/m5stack/core135_5_15/tfa-dts/*"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=optee DTB_FILE_NAME=stm32mp135f-core135.dtb BL33_CFG=$(BINARIES_DIR)/u-boot.dtb STM32MP_USB_PROGRAMMER=1"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_ST_PATH)/board/m5stack/coremp135_5_15/tfa-dts/*"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=optee DTB_FILE_NAME=stm32mp135f-coremp135.dtb BL33_CFG=$(BINARIES_DIR)/u-boot.dtb STM32MP_USB_PROGRAMMER=1"
 
 
 
@@ -57,9 +57,9 @@ BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL_LOCATION="$(call github,STMicroelectronics,op
 BR2_TARGET_OPTEE_OS_NEEDS_DTC=y
 BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY=y
 BR2_TARGET_OPTEE_OS_PLATFORM="stm32mp1"
-BR2_TARGET_OPTEE_OS_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_ST_PATH)/board/m5stack/core135_5_15/optee-dts/*"
-BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES="CFG_EMBED_DTB_SOURCE_FILE=stm32mp135f-core135.dts CFG_STM32MP13=y CFG_WITH_TUI=n CFG_DRAM_SIZE=0x20000000"
-# BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES="CFG_EMBED_DTB_SOURCE_FILE=stm32mp135f-core135.dts CFG_STM32MP13=y CFG_WITH_TUI=n"
+BR2_TARGET_OPTEE_OS_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_ST_PATH)/board/m5stack/coremp135_5_15/optee-dts/*"
+BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES="CFG_EMBED_DTB_SOURCE_FILE=stm32mp135f-coremp135.dts CFG_STM32MP13=y CFG_WITH_TUI=n CFG_DRAM_SIZE=0x20000000"
+# BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES="CFG_EMBED_DTB_SOURCE_FILE=stm32mp135f-coremp135.dts CFG_STM32MP13=y CFG_WITH_TUI=n"
 
 
 
@@ -69,13 +69,13 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,STMicroelectronics,u-boot)v2021.10-stm32mp-r1.tar.gz"
-BR2_TARGET_UBOOT_BOARD_DEFCONFIG="core135"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="coremp135"
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
 # BR2_TARGET_UBOOT_FORMAT_BIN is not set
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin u-boot.dtb"
-BR2_TARGET_UBOOT_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_ST_PATH)/board/m5stack/core135_5_15/uboot-dts/*"
-BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="dtb-y=stm32mp135f-core135.dtb DEVICE_TREE=stm32mp135f-core135"
+BR2_TARGET_UBOOT_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_ST_PATH)/board/m5stack/coremp135_5_15/uboot-dts/*"
+BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="dtb-y=stm32mp135f-coremp135.dtb DEVICE_TREE=stm32mp135f-coremp135"
 
 
 
@@ -85,13 +85,13 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,STMicroelectronics,linux)v5.15-stm32mp-r1.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="multi_v7"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm/configs/fragment-01-multiv7_cleanup.config $(LINUX_DIR)/arch/arm/configs/fragment-02-multiv7_addons.config $(BR2_EXTERNAL_ST_PATH)/board/m5stack/core135_5_15/linux-disable-etnaviv.config $(BR2_EXTERNAL_ST_PATH)/board/m5stack/core135_5_15/linux-enable-fbdev-emul.config $(BR2_EXTERNAL_ST_PATH)/board/m5stack/core135_5_15/linux-enable-m5stack.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm/configs/fragment-01-multiv7_cleanup.config $(LINUX_DIR)/arch/arm/configs/fragment-02-multiv7_addons.config $(BR2_EXTERNAL_ST_PATH)/board/m5stack/coremp135_5_15/linux-disable-etnaviv.config $(BR2_EXTERNAL_ST_PATH)/board/m5stack/coremp135_5_15/linux-enable-fbdev-emul.config $(BR2_EXTERNAL_ST_PATH)/board/m5stack/coremp135_5_15/linux-enable-m5stack.config"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
-BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_ST_PATH)/board/m5stack/core135_5_15/linux-dts/*"
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32mp135f-core135"
+BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_ST_PATH)/board/m5stack/coremp135_5_15/linux-dts/*"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32mp135f-coremp135"
 
 
 
diff --git a/configs/m5stack_core135_defconfig b/configs/m5stack_coremp135_defconfig
similarity index 78%
rename from configs/m5stack_core135_defconfig
rename to configs/m5stack_coremp135_defconfig
index d0d9df0..5fb16bf 100644
--- a/configs/m5stack_core135_defconfig
+++ b/configs/m5stack_coremp135_defconfig
@@ -3,11 +3,11 @@
 BR2_arm=y
 BR2_cortex_a7=y
 BR2_TOOLCHAIN_EXTERNAL=y
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_ST_PATH)/board/m5stack/core135/patches/"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_ST_PATH)/board/m5stack/coremp135/patches/"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
 BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_ST_PATH)/board/m5stack/overlay/"
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_ST_PATH)/board/m5stack/core135/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_ST_PATH)/board/m5stack/core135/post-image.sh"
+BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_ST_PATH)/board/m5stack/coremp135/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_ST_PATH)/board/m5stack/coremp135/post-image.sh"
 BR2_PACKAGE_OPTEE_CLIENT=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
@@ -45,8 +45,8 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE="u-boot-nodtb.bin"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="*.stm32 fip.bin"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_ST_PATH)/board/m5stack/core135/tfa-dts/*"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=optee DTB_FILE_NAME=stm32mp135f-core135.dtb BL33_CFG=$(BINARIES_DIR)/u-boot.dtb STM32MP_USB_PROGRAMMER=1"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_ST_PATH)/board/m5stack/coremp135/tfa-dts/*"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=optee DTB_FILE_NAME=stm32mp135f-coremp135.dtb BL33_CFG=$(BINARIES_DIR)/u-boot.dtb STM32MP_USB_PROGRAMMER=1"
 
 
 
@@ -57,9 +57,9 @@ BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL_LOCATION="$(call github,STMicroelectronics,op
 BR2_TARGET_OPTEE_OS_NEEDS_DTC=y
 BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY=y
 BR2_TARGET_OPTEE_OS_PLATFORM="stm32mp1"
-BR2_TARGET_OPTEE_OS_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_ST_PATH)/board/m5stack/core135/optee-dts/*"
-BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES="CFG_EMBED_DTB_SOURCE_FILE=stm32mp135f-core135.dts CFG_STM32MP13=y CFG_WITH_TUI=n CFG_DRAM_SIZE=0x20000000"
-# BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES="CFG_EMBED_DTB_SOURCE_FILE=stm32mp135f-core135.dts CFG_STM32MP13=y CFG_WITH_TUI=n"
+BR2_TARGET_OPTEE_OS_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_ST_PATH)/board/m5stack/coremp135/optee-dts/*"
+BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES="CFG_EMBED_DTB_SOURCE_FILE=stm32mp135f-coremp135.dts CFG_STM32MP13=y CFG_WITH_TUI=n CFG_DRAM_SIZE=0x20000000"
+# BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES="CFG_EMBED_DTB_SOURCE_FILE=stm32mp135f-coremp135.dts CFG_STM32MP13=y CFG_WITH_TUI=n"
 
 
 
@@ -69,13 +69,13 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,STMicroelectronics,u-boot)v2022.10-stm32mp-r1.tar.gz"
-BR2_TARGET_UBOOT_BOARD_DEFCONFIG="core135"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="coremp135"
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
 # BR2_TARGET_UBOOT_FORMAT_BIN is not set
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin u-boot.dtb"
-BR2_TARGET_UBOOT_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_ST_PATH)/board/m5stack/core135/uboot-dts/*"
-BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="dtb-y=stm32mp135f-core135.dtb DEVICE_TREE=stm32mp135f-core135"
+BR2_TARGET_UBOOT_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_ST_PATH)/board/m5stack/coremp135/uboot-dts/*"
+BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="dtb-y=stm32mp135f-coremp135.dtb DEVICE_TREE=stm32mp135f-coremp135"
 
 
 
@@ -85,13 +85,13 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,STMicroelectronics,linux)v6.1-stm32mp-r1.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="multi_v7"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm/configs/fragment-01-multiv7_cleanup.config $(LINUX_DIR)/arch/arm/configs/fragment-02-multiv7_addons.config $(BR2_EXTERNAL_ST_PATH)/board/m5stack/core135/linux-disable-etnaviv.config $(BR2_EXTERNAL_ST_PATH)/board/m5stack/core135/linux-enable-fbdev-emul.config $(BR2_EXTERNAL_ST_PATH)/board/m5stack/core135/linux-enable-m5stack.config"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm/configs/fragment-01-multiv7_cleanup.config $(LINUX_DIR)/arch/arm/configs/fragment-02-multiv7_addons.config $(BR2_EXTERNAL_ST_PATH)/board/m5stack/coremp135/linux-disable-etnaviv.config $(BR2_EXTERNAL_ST_PATH)/board/m5stack/coremp135/linux-enable-fbdev-emul.config $(BR2_EXTERNAL_ST_PATH)/board/m5stack/coremp135/linux-enable-m5stack.config"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
-BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_ST_PATH)/board/m5stack/core135/linux-dts/*"
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32mp135f-core135"
+BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_ST_PATH)/board/m5stack/coremp135/linux-dts/*"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32mp135f-coremp135"