diff --git a/src/security/intel/txt/Makefile.inc b/src/security/intel/txt/Makefile.inc
index 39c3ad1..712ab58 100644
--- a/src/security/intel/txt/Makefile.inc
+++ b/src/security/intel/txt/Makefile.inc
@@ -9,24 +9,25 @@
 ramstage-y += ramstage.c
 ramstage-$(CONFIG_INTEL_TXT_LOGGING) += logging.c
 
-cbfs-files-y += txt_bios_acm.bin
-txt_bios_acm.bin-file := $(CONFIG_INTEL_TXT_BIOSACM_FILE)
-txt_bios_acm.bin-type := raw
-txt_bios_acm.bin-align := $(CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT)
+cbfs-files-y += $(CONFIG_INTEL_TXT_CBFS_BIOS_ACM)
+$(CONFIG_INTEL_TXT_CBFS_BIOS_ACM)-file := $(CONFIG_INTEL_TXT_BIOSACM_FILE)
+$(CONFIG_INTEL_TXT_CBFS_BIOS_ACM)-type := raw
+$(CONFIG_INTEL_TXT_CBFS_BIOS_ACM)-align := $(CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT)
 
 ifneq ($(CONFIG_INTEL_TXT_SINITACM_FILE),"")
-cbfs-files-y += txt_sinit_acm.bin
-txt_sinit_acm.bin-file := $(CONFIG_INTEL_TXT_SINITACM_FILE)
-txt_sinit_acm.bin-type := raw
-txt_sinit_acm.bin-align := 0x10
-txt_sinit_acm.bin-compression := lzma
+cbfs-files-y += $(CONFIG_INTEL_TXT_CBFS_SINIT_ACM)
+$(CONFIG_INTEL_TXT_CBFS_SINIT_ACM)-file := $(CONFIG_INTEL_TXT_SINITACM_FILE)
+$(CONFIG_INTEL_TXT_CBFS_SINIT_ACM)-type := raw
+$(CONFIG_INTEL_TXT_CBFS_SINIT_ACM)-align := 0x10
+$(CONFIG_INTEL_TXT_CBFS_SINIT_ACM)-compression := lzma
 endif
 
 ifeq ($(CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE),y)
 
 INTERMEDIATE+=add_acm_fit
 add_acm_fit: $(obj)/coreboot.pre $(IFITTOOL)
-	$(IFITTOOL) -r COREBOOT -a -n txt_bios_acm.bin -t 2 -s $(CONFIG_CPU_INTEL_NUM_FIT_ENTRIES) -f $<
+	$(IFITTOOL) -r COREBOOT -a -n $(CONFIG_INTEL_TXT_CBFS_BIOS_ACM) -t 2 \
+        	-s $(CONFIG_CPU_INTEL_NUM_FIT_ENTRIES) -f $<
 
 # Initial BootBlock files
 ibb-files := $(foreach file,$(cbfs-files), \