diff --git a/model/tc0.sh b/model/tc0.sh
index 1f0ae7c..4b0c8bc 100644
--- a/model/tc0.sh
+++ b/model/tc0.sh
@@ -9,7 +9,7 @@
 
 cat <<EOF >"$model_param_file"
 ${bl1_bin+-C css.trustedBootROMloader.fname=$bl1_bin}
-${scp_romfw_bin+-C css.scp.ROMloader.fname=$scp_romfw_bin}
+${scp_rom_bin+-C css.scp.ROMloader.fname=$scp_rom_bin}
 ${fip_bin+-C board.flashloader0.fname=$fip_bin}
 ${initrd_bin+--data board.dram=$initrd_bin@${initrd_addr:?}}
 ${kernel_bin+--data board.dram=$kernel_bin@${kernel_addr:?}}
diff --git a/model/tc1.sh b/model/tc1.sh
index dc184de..8ba4129 100644
--- a/model/tc1.sh
+++ b/model/tc1.sh
@@ -9,7 +9,7 @@
 
 cat <<EOF >"$model_param_file"
 ${bl1_bin+-C css.trustedBootROMloader.fname=$bl1_bin}
-${scp_romfw_bin+-C css.scp.ROMloader.fname=$scp_romfw_bin}
+${scp_rom_bin+-C css.scp.ROMloader.fname=$scp_rom_bin}
 ${fip_bin+-C board.flashloader0.fname=$fip_bin}
 ${initrd_bin+--data board.dram=$initrd_bin@${initrd_addr:?}}
 ${kernel_bin+--data board.dram=$kernel_bin@${kernel_addr:?}}
diff --git a/run_config/fvp-fip.tc b/run_config/fvp-fip.tc
index 244b9f1..7088366 100644
--- a/run_config/fvp-fip.tc
+++ b/run_config/fvp-fip.tc
@@ -10,10 +10,10 @@
 	archive_file "u-boot.bin"
 
 	# Use SCP binary from SCP build if it exists, or fetch pre-built ones.
-	if [ ! -f "$archive/scp_ramfw.bin" ]; then
-		url="$scp_prebuilts/tc$plat_variant/scp_ramfw.bin" fetch_file
-		archive_file "scp_ramfw.bin"
+	if [ ! -f "$archive/scp_ram.bin" ]; then
+		url="$scp_prebuilts/tc$plat_variant/scp_ramfw.bin" saveas="scp_ram.bin" fetch_file
+		archive_file "scp_ram.bin"
 	fi
 
-	build_fip BL33="$archive/u-boot.bin" SCP_BL2="$archive/scp_ramfw.bin"
+	build_fip BL33="$archive/u-boot.bin" SCP_BL2="$archive/scp_ram.bin"
 }
diff --git a/run_config/fvp-linux.tc b/run_config/fvp-linux.tc
index 206a248..1016f72 100644
--- a/run_config/fvp-linux.tc
+++ b/run_config/fvp-linux.tc
@@ -12,10 +12,10 @@
 
 	payload_type="linux" gen_fvp_yaml_template
 	# Use SCP binary from SCP build if it exists, or fetch pre-built ones.
-	if [ ! -f "$archive/scp_romfw.bin" ]; then
+	if [ ! -f "$archive/scp_rom.bin" ]; then
 		# Pick the appropriate binary based on target platform variant
-		url="$scp_prebuilts/tc$plat_variant/scp_romfw.bin" fetch_file
-		archive_file "scp_romfw.bin"
+		url="$scp_prebuilts/tc$plat_variant/scp_romfw.bin" saveas="scp_rom.bin" fetch_file
+		archive_file "scp_rom.bin"
 	fi
 
 	# Hold scp terminal_s0