diff --git a/conf/eula/stm32mp1-disco b/conf/eula/stm32mp15-disco
similarity index 100%
rename from conf/eula/stm32mp1-disco
rename to conf/eula/stm32mp15-disco
diff --git a/conf/eula/stm32mp1-eval b/conf/eula/stm32mp15-eval
similarity index 100%
rename from conf/eula/stm32mp1-eval
rename to conf/eula/stm32mp15-eval
diff --git a/conf/machine/stm32mp1.conf b/conf/machine/stm32mp1.conf
index 7d110bd..c4dcdae 100644
--- a/conf/machine/stm32mp1.conf
+++ b/conf/machine/stm32mp1.conf
@@ -8,6 +8,7 @@ include conf/machine/include/st-machine-providers-stm32mp.inc
 
 # Define specific familly common machine name
 MACHINEOVERRIDES .= ":stm32mp1common"
+MACHINEOVERRIDES .= ":stm32mp15common"
 
 # =========================================================================
 # Chip architecture
diff --git a/conf/machine/stm32mp1-disco.conf b/conf/machine/stm32mp15-disco.conf
similarity index 98%
rename from conf/machine/stm32mp1-disco.conf
rename to conf/machine/stm32mp15-disco.conf
index aba817f..9770c36 100644
--- a/conf/machine/stm32mp1-disco.conf
+++ b/conf/machine/stm32mp15-disco.conf
@@ -1,5 +1,5 @@
 #@TYPE: Machine
-#@NAME: stm32mp1-disco
+#@NAME: stm32mp15-disco
 #@DESCRIPTION: [EXAMPLE] STM32MP157C-DK2 board ONLY with Trusted boot and SDcard support
 #@NEEDED_BSPLAYERS: layers/meta-openembedded/meta-oe layers/meta-openembedded/meta-python
 
@@ -7,7 +7,7 @@ include conf/machine/include/st-machine-common-stm32mp.inc
 include conf/machine/include/st-machine-providers-stm32mp.inc
 
 # Define specific familly common machine name
-MACHINEOVERRIDES .= ":stm32mp1common"
+MACHINEOVERRIDES .= ":stm32mp1common:stm32mp15common"
 
 # =========================================================================
 # Chip architecture
diff --git a/conf/machine/stm32mp1-eval.conf b/conf/machine/stm32mp15-eval.conf
similarity index 97%
rename from conf/machine/stm32mp1-eval.conf
rename to conf/machine/stm32mp15-eval.conf
index 7b2942d..698e4b5 100644
--- a/conf/machine/stm32mp1-eval.conf
+++ b/conf/machine/stm32mp15-eval.conf
@@ -1,5 +1,5 @@
 #@TYPE: Machine
-#@NAME: stm32mp1-eval
+#@NAME: stm32mp15-eval
 #@DESCRIPTION: [EXAMPLE] STM32MP157C-EV1 board ONLY with Trusted boot and SDcard support
 #@NEEDED_BSPLAYERS: layers/meta-openembedded/meta-oe layers/meta-openembedded/meta-python
 
@@ -7,7 +7,7 @@ include conf/machine/include/st-machine-common-stm32mp.inc
 include conf/machine/include/st-machine-providers-stm32mp.inc
 
 # Define specific familly common machine name
-MACHINEOVERRIDES .= ":stm32mp1common"
+MACHINEOVERRIDES .= ":stm32mp1common:stm32mp15common"
 
 # =========================================================================
 # Chip architecture