diff --git a/script/build_package.sh b/script/build_package.sh
index dcbd9e5..d219528 100755
--- a/script/build_package.sh
+++ b/script/build_package.sh
@@ -438,7 +438,7 @@
 		"$(get_tf_opt RESET_TO_BL31)" | \
 		"$(get_tf_opt ARM_LINUX_KERNEL_AS_BL33)" | \
 		"$(get_tf_opt RESET_TO_SP_MIN)" | \
-		"$(get_tf_opt BL2_AT_EL3)")
+		"$(get_tf_opt RESET_TO_BL2)")
 			return 0;;
 	esac
 
diff --git a/script/tf-coverity/tf-cov-make b/script/tf-coverity/tf-cov-make
index 48c1569..7892baf 100755
--- a/script/tf-coverity/tf-cov-make
+++ b/script/tf-coverity/tf-cov-make
@@ -141,9 +141,9 @@
 clean_build $fvp_common_flags SPD=spmd SPMD_SPM_AT_SEL2=0 SPMC_AT_EL3=1
 
 #BL2 at EL3 support
-clean_build $fvp_common_flags BL2_AT_EL3=1
+clean_build $fvp_common_flags RESET_TO_BL2=1
 clean_build $fvp_common_flags CROSS_COMPILE=arm-none-eabi- \
-    ARCH=aarch32 AARCH32_SP=sp_min BL2_AT_EL3=1
+    ARCH=aarch32 AARCH32_SP=sp_min RESET_TO_BL2=1
 
 # RAS Extension Support
 clean_build $fvp_common_flags EL3_EXCEPTION_HANDLING=1 \
@@ -308,7 +308,7 @@
      TARGET_PLATFORM=fpga \
      ENABLE_STACK_PROTECTOR=strong \
      ENABLE_PIE=1 \
-     BL2_AT_EL3=1 \
+     RESET_TO_BL2=1 \
      SPMD_SPM_AT_SEL2=0 \
      ${ARM_TBB_OPTIONS} \
      CREATE_KEYS=1 \