diff --git a/meta-arm-bsp/conf/machine/musca_b1.conf b/meta-arm-bsp/conf/machine/musca-b1.conf
similarity index 100%
rename from meta-arm-bsp/conf/machine/musca_b1.conf
rename to meta-arm-bsp/conf/machine/musca-b1.conf
diff --git a/meta-arm-bsp/conf/machine/musca_s1.conf b/meta-arm-bsp/conf/machine/musca-s1.conf
similarity index 100%
rename from meta-arm-bsp/conf/machine/musca_s1.conf
rename to meta-arm-bsp/conf/machine/musca-s1.conf
diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_%.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_%.bbappend
index 32b50b7f..d7a099e0 100644
--- a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_%.bbappend
+++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_%.bbappend
@@ -1,4 +1,4 @@
-COMPATIBLE_MACHINE = "musca_b1|musca_s1"
+COMPATIBLE_MACHINE = "musca-b1|musca-s1"
 
-TFM_PLATFORM_musca_b1 = "MUSCA_B1"
-TFM_PLATFORM_musca_s1 = "MUSCA_S1"
+TFM_PLATFORM_musca-b1 = "MUSCA_B1"
+TFM_PLATFORM_musca-s1 = "MUSCA_S1"