diff --git a/meta-arm-bsp/conf/machine/foundation-armv8.conf b/meta-arm-bsp/conf/machine/foundation-armv8.conf
index 73d2798c..c1b9f4de 100644
--- a/meta-arm-bsp/conf/machine/foundation-armv8.conf
+++ b/meta-arm-bsp/conf/machine/foundation-armv8.conf
@@ -4,7 +4,7 @@
 #@NAME: Armv8-A Foundation Platform machine
 #@DESCRIPTION: Machine configuration for Armv8-A Foundation Platform model
 
-require conf/machine/fvp-common/fvp.inc
+require conf/machine/fvp-common.inc
 
 KERNEL_DEVICETREE = "arm/foundation-v8-gicv3-psci.dtb"
 
diff --git a/meta-arm-bsp/conf/machine/fvp-base.conf b/meta-arm-bsp/conf/machine/fvp-base.conf
index 30396442..bd3c62d1 100644
--- a/meta-arm-bsp/conf/machine/fvp-base.conf
+++ b/meta-arm-bsp/conf/machine/fvp-base.conf
@@ -4,7 +4,7 @@
 #@NAME: Armv8-A Base Platform FVP machine
 #@DESCRIPTION: Machine configuration for Armv8-A Base Platform FVP model
 
-require conf/machine/fvp-common/fvp.inc
+require conf/machine/fvp-common.inc
 
 KERNEL_DEVICETREE = "arm/fvp-base-gicv3-psci-custom.dtb"
 
diff --git a/meta-arm-bsp/conf/machine/fvp-common/fvp.inc b/meta-arm-bsp/conf/machine/fvp-common.inc
similarity index 100%
rename from meta-arm-bsp/conf/machine/fvp-common/fvp.inc
rename to meta-arm-bsp/conf/machine/fvp-common.inc