diff --git a/script/tf-coverity/tf-cov-make b/script/tf-coverity/tf-cov-make
index cd4b89e..f2ccde3 100755
--- a/script/tf-coverity/tf-cov-make
+++ b/script/tf-coverity/tf-cov-make
@@ -161,7 +161,7 @@
 clean_build $fvp_common_flags GIC_ENABLE_V4_EXTN=1 GIC_EXT_INTID=1
 
 # Measured Boot
-clean_build $fvp_common_flags ${ARM_TBB_OPTIONS} TPM_HASH_ALG=sha256 MEASURED_BOOT=1 USE_ROMLIB=1
+clean_build $fvp_common_flags ${ARM_TBB_OPTIONS} MBOOT_EL_HASH_ALG=sha256 MEASURED_BOOT=1 USE_ROMLIB=1
 
 # CoT descriptors in device tree
 clean_build $fvp_common_flags ${ARM_TBB_OPTIONS} COT_DESC_IN_DTB=1 USE_ROMLIB=1
@@ -372,7 +372,7 @@
 make AARCH32_SP=optee ARCH=aarch32 CROSS_COMPILE=arm-none-eabi- PLAT=picopi \
     $(common_flags) all
 make PLAT=imx8mm $(common_flags) NEED_BL2=yes MEASURED_BOOT=1 \
-    TPM_HASH_ALG=sha256 ${TBB_OPTIONS} all
+    MBOOT_EL_HASH_ALG=sha256 ${TBB_OPTIONS} all
 make PLAT=imx8mn $(common_flags) SDEI_SUPPORT=1 all
 make PLAT=imx8mp $(common_flags) NEED_BL2=yes ${TBB_OPTIONS} all
 
@@ -619,7 +619,7 @@
     BL32_RAM_LOCATION=tdram ARM_BL31_IN_DRAM=1 \
     SPD=spmd CTX_INCLUDE_EL2_REGS=0 SPMD_SPM_AT_SEL2=0 SPMC_OPTEE=1
 # Measured Boot
-clean_build PLAT=qemu $(common_flags) ${TBB_OPTIONS} TPM_HASH_ALG=sha256 MEASURED_BOOT=1
+clean_build PLAT=qemu $(common_flags) ${TBB_OPTIONS} MBOOT_EL_HASH_ALG=sha256 MEASURED_BOOT=1
 
 clean_build PLAT=qemu_sbsa $(common_flags)
 
diff --git a/tf_config/fvp-mb_hash256-tbb_hash256-romlib b/tf_config/fvp-mb_hash256-tbb_hash256-romlib
index 3fe3958..0952007 100644
--- a/tf_config/fvp-mb_hash256-tbb_hash256-romlib
+++ b/tf_config/fvp-mb_hash256-tbb_hash256-romlib
@@ -4,6 +4,6 @@
 MEASURED_BOOT=1
 PLAT=fvp
 ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
-TPM_HASH_ALG=sha256
+MBOOT_EL_HASH_ALG=sha256
 TRUSTED_BOARD_BOOT=1
 USE_ROMLIB=1
diff --git a/tf_config/fvp-mb_hash256-tbb_hash384-optee-romlib b/tf_config/fvp-mb_hash256-tbb_hash384-optee-romlib
index b04c64b..17e5675 100644
--- a/tf_config/fvp-mb_hash256-tbb_hash384-optee-romlib
+++ b/tf_config/fvp-mb_hash256-tbb_hash384-optee-romlib
@@ -8,6 +8,6 @@
 PLAT=fvp
 ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
 SPD=opteed
-TPM_HASH_ALG=sha256
+MBOOT_EL_HASH_ALG=sha256
 TRUSTED_BOARD_BOOT=1
 USE_ROMLIB=1
diff --git a/tf_config/fvp-mb_hash384-optee-romlib b/tf_config/fvp-mb_hash384-optee-romlib
index b2cedc5..53b3fcb 100644
--- a/tf_config/fvp-mb_hash384-optee-romlib
+++ b/tf_config/fvp-mb_hash384-optee-romlib
@@ -4,5 +4,5 @@
 MEASURED_BOOT=1
 PLAT=fvp
 SPD=opteed
-TPM_HASH_ALG=sha384
+MBOOT_EL_HASH_ALG=sha384
 USE_ROMLIB=1
diff --git a/tf_config/qemu-mb_hash256 b/tf_config/qemu-mb_hash256
index 5145502..6b48c8e 100644
--- a/tf_config/qemu-mb_hash256
+++ b/tf_config/qemu-mb_hash256
@@ -1,4 +1,4 @@
 CROSS_COMPILE=aarch64-none-elf-
 MEASURED_BOOT=1
 PLAT=qemu
-TPM_HASH_ALG=sha256
+MBOOT_EL_HASH_ALG=sha256