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 \
diff --git a/tf_config/corstone1000-fpga-default b/tf_config/corstone1000-fpga-default
index df7899e..d0b8b23 100644
--- a/tf_config/corstone1000-fpga-default
+++ b/tf_config/corstone1000-fpga-default
@@ -1,5 +1,5 @@
 ARM_ROTPK_LOCATION=devel_rsa
-BL2_AT_EL3=1
+RESET_TO_BL2=1
 CROSS_COMPILE=aarch64-none-elf-
 ENABLE_PIE=1
 GENERATE_COT=1
diff --git a/tf_config/corstone1000-fvp-default b/tf_config/corstone1000-fvp-default
index df7899e..d0b8b23 100644
--- a/tf_config/corstone1000-fvp-default
+++ b/tf_config/corstone1000-fvp-default
@@ -1,5 +1,5 @@
 ARM_ROTPK_LOCATION=devel_rsa
-BL2_AT_EL3=1
+RESET_TO_BL2=1
 CROSS_COMPILE=aarch64-none-elf-
 ENABLE_PIE=1
 GENERATE_COT=1
diff --git a/tf_config/fvp-aarch32-bl2-el3 b/tf_config/fvp-aarch32-bl2-el3
index 1cc311f..d5a278d 100644
--- a/tf_config/fvp-aarch32-bl2-el3
+++ b/tf_config/fvp-aarch32-bl2-el3
@@ -1,5 +1,5 @@
 AARCH32_SP=sp_min
 ARCH=aarch32
-BL2_AT_EL3=1
+RESET_TO_BL2=1
 CROSS_COMPILE=arm-none-eabi-
 PLAT=fvp
diff --git a/tf_config/fvp-aarch32-tbb-mbedtls-bl2-el3 b/tf_config/fvp-aarch32-tbb-mbedtls-bl2-el3
index 889a16e..f30cecb 100644
--- a/tf_config/fvp-aarch32-tbb-mbedtls-bl2-el3
+++ b/tf_config/fvp-aarch32-tbb-mbedtls-bl2-el3
@@ -1,7 +1,7 @@
 AARCH32_SP=sp_min
 ARCH=aarch32
 ARM_ROTPK_LOCATION=devel_rsa
-BL2_AT_EL3=1
+RESET_TO_BL2=1
 CROSS_COMPILE=arm-none-eabi-
 GENERATE_COT=1
 PLAT=fvp
diff --git a/tf_config/fvp-bl2-el3 b/tf_config/fvp-bl2-el3
index 011094b..79f2539 100644
--- a/tf_config/fvp-bl2-el3
+++ b/tf_config/fvp-bl2-el3
@@ -1,3 +1,3 @@
-BL2_AT_EL3=1
+RESET_TO_BL2=1
 CROSS_COMPILE=aarch64-none-elf-
 PLAT=fvp
diff --git a/tf_config/fvp-bl2-el3-pie b/tf_config/fvp-bl2-el3-pie
index 793c8f4..d838a3d 100644
--- a/tf_config/fvp-bl2-el3-pie
+++ b/tf_config/fvp-bl2-el3-pie
@@ -1,4 +1,4 @@
-BL2_AT_EL3=1
+RESET_TO_BL2=1
 CROSS_COMPILE=aarch64-none-elf-
 PLAT=fvp
 ENABLE_PIE=1
diff --git a/tf_config/fvp-tbb-mbedtls-bl2-el3 b/tf_config/fvp-tbb-mbedtls-bl2-el3
index 7b461d4..fd2141b 100644
--- a/tf_config/fvp-tbb-mbedtls-bl2-el3
+++ b/tf_config/fvp-tbb-mbedtls-bl2-el3
@@ -1,5 +1,5 @@
 ARM_ROTPK_LOCATION=devel_rsa
-BL2_AT_EL3=1
+RESET_TO_BL2=1
 CROSS_COMPILE=aarch64-none-elf-
 GENERATE_COT=1
 PLAT=fvp