diff --git a/meta-arm-bsp/recipes-security/optee/optee-os_corstone1000_common.inc b/meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc
similarity index 100%
rename from meta-arm-bsp/recipes-security/optee/optee-os_corstone1000_common.inc
rename to meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc
diff --git a/meta-arm-bsp/recipes-security/optee/optee-os_corstone1000.inc b/meta-arm-bsp/recipes-security/optee/optee-os-corstone1000.inc
similarity index 94%
rename from meta-arm-bsp/recipes-security/optee/optee-os_corstone1000.inc
rename to meta-arm-bsp/recipes-security/optee/optee-os-corstone1000.inc
index eb5f6df0..8ddf47e3 100644
--- a/meta-arm-bsp/recipes-security/optee/optee-os_corstone1000.inc
+++ b/meta-arm-bsp/recipes-security/optee/optee-os-corstone1000.inc
@@ -1,4 +1,4 @@
-require optee-os_corstone1000_common.inc
+require optee-os-corstone1000-common.inc
 
 DEPENDS += " secure-partitions"
 EXTRA_OEMAKE +="'SP_PACKAGING_METHOD=embedded'"
diff --git a/meta-arm-bsp/recipes-security/optee/optee-spdevkit-corstone1000.inc b/meta-arm-bsp/recipes-security/optee/optee-spdevkit-corstone1000.inc
new file mode 100644
index 00000000..db85ed8e
--- /dev/null
+++ b/meta-arm-bsp/recipes-security/optee/optee-spdevkit-corstone1000.inc
@@ -0,0 +1 @@
+require optee-os-corstone1000-common.inc
diff --git a/meta-arm-bsp/recipes-security/optee/optee-spdevkit_corstone1000.inc b/meta-arm-bsp/recipes-security/optee/optee-spdevkit_corstone1000.inc
deleted file mode 100644
index 363b0ed1..00000000
--- a/meta-arm-bsp/recipes-security/optee/optee-spdevkit_corstone1000.inc
+++ /dev/null
@@ -1 +0,0 @@
-require optee-os_corstone1000_common.inc
diff --git a/meta-arm-bsp/recipes-security/optee/optee-spdevkit_git.bbappend b/meta-arm-bsp/recipes-security/optee/optee-spdevkit_git.bbappend
index 13e109cb..5f74ae45 100644
--- a/meta-arm-bsp/recipes-security/optee/optee-spdevkit_git.bbappend
+++ b/meta-arm-bsp/recipes-security/optee/optee-spdevkit_git.bbappend
@@ -1,6 +1,6 @@
 # Machine specific configurations
 
 MACHINE_OPTEE_SPDEVKIT_REQUIRE ?= ""
-MACHINE_OPTEE_SPDEVKIT_REQUIRE:corstone1000 = "optee-spdevkit_corstone1000.inc"
+MACHINE_OPTEE_SPDEVKIT_REQUIRE:corstone1000 = "optee-spdevkit-corstone1000.inc"
 
 require ${MACHINE_OPTEE_SPDEVKIT_REQUIRE}