diff --git a/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-hercules-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa78x4-debug
similarity index 100%
rename from group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-hercules-debug
rename to group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa78x4-debug
diff --git a/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-hercules-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-neoversev1x4-debug
similarity index 100%
copy from group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-hercules-debug
copy to group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-neoversev1x4-debug
diff --git a/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-zeus-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-zeus-debug
deleted file mode 100644
index c75b524..0000000
--- a/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-zeus-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/model/base-aemv8a-latest-revb.sh b/model/base-aemv8a-latest-revb.sh
index 9047477..0b8037a 100644
--- a/model/base-aemv8a-latest-revb.sh
+++ b/model/base-aemv8a-latest-revb.sh
@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2019, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
 set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_AEMv8A-AEMv8A"
 
-default_var sve_plugin_path "$warehouse/SysGen/ShojiPlugin/$model_version/$model_build/v9.0-00bet4/$model_flavour/ScalableVectorExtension.so"
+default_var sve_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/sve2-HEAD/ScalableVectorExtension.so"
 
 default_var is_dual_cluster 1
 
diff --git a/model/base-aemv8a-revb.sh b/model/base-aemv8a-revb.sh
index 3c6e9f5..8acf498 100644
--- a/model/base-aemv8a-revb.sh
+++ b/model/base-aemv8a-revb.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2019, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -8,7 +8,7 @@
 # Use revb model
 set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_AEMv8A-AEMv8A"
 
-default_var sve_plugin_path "$warehouse/SysGen/ShojiPlugin/$model_version/$model_build/v9.0-00bet4/$model_flavour/ScalableVectorExtension.so"
+default_var sve_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/sve2-HEAD/ScalableVectorExtension.so"
 
 default_var is_dual_cluster 1
 
diff --git a/model/base-aemv8a.sh b/model/base-aemv8a.sh
index 931f034..90700a5 100644
--- a/model/base-aemv8a.sh
+++ b/model/base-aemv8a.sh
@@ -8,7 +8,7 @@
 # Use revc model
 set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_RevC-2xAEMv8A"
 
-default_var sve_plugin_path "$warehouse/SysGen/ShojiPlugin/$model_version/$model_build/v9.0-00bet4/$model_flavour/ScalableVectorExtension.so"
+default_var sve_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/sve2-HEAD/ScalableVectorExtension.so"
 
 default_var is_dual_cluster 1
 
diff --git a/model/base-aemva.sh b/model/base-aemva.sh
index 729b4c4..ebea303 100644
--- a/model/base-aemva.sh
+++ b/model/base-aemva.sh
@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2019, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
 set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_AEMvA"
 
-default_var sve_plugin_path "$warehouse/SysGen/ShojiPlugin/$model_version/$model_build/v9.0-00bet4/$model_flavour/ScalableVectorExtension.so"
+default_var sve_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/sve2-HEAD/ScalableVectorExtension.so"
 
 default_var is_dual_cluster 0
 
diff --git a/model/cortex-a78x4.sh b/model/cortex-a78x4.sh
new file mode 100644
index 0000000..0cebfcc
--- /dev/null
+++ b/model/cortex-a78x4.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Cortex-A78x4"
+
+# Option not supported on A78 FVP yet.
+export no_quantum=""
+
+source "$ci_root/model/fvp_common.sh"
diff --git a/model/hercules.sh b/model/hercules.sh
deleted file mode 100644
index bcb598d..0000000
--- a/model/hercules.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Herculesx4"
-
-# Option not supported on Hercules FVP yet.
-export no_quantum=""
-
-source "$ci_root/model/fvp_common.sh"
diff --git a/model/neoverse-v1x4.sh b/model/neoverse-v1x4.sh
new file mode 100644
index 0000000..a6cbff3
--- /dev/null
+++ b/model/neoverse-v1x4.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Neoverse-V1x4"
+
+# Option not supported on Neoverse FVP yet.
+export no_quantum=""
+
+source "$ci_root/model/fvp_common.sh"
diff --git a/model/zeus.sh b/model/zeus.sh
deleted file mode 100644
index 452205c..0000000
--- a/model/zeus.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Zeusx4"
-
-# Option not supported on Zeus FVP yet.
-export no_quantum=""
-
-source "$ci_root/model/fvp_common.sh"
diff --git a/run_config/fvp-hercules b/run_config/fvp-cortexa78x4
similarity index 85%
rename from run_config/fvp-hercules
rename to run_config/fvp-cortexa78x4
index 966adbe..bc636ca 100644
--- a/run_config/fvp-hercules
+++ b/run_config/fvp-cortexa78x4
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 post_fetch_tf_resource() {
-	model="hercules" \
+	model="cortex-a78x4" \
 	cache_state_modelled="0" \
 	gen_model_params
 	uart="0" set_expect_variable "num_cpus" "4"
diff --git a/run_config/fvp-zeus b/run_config/fvp-neoversev1x4
similarity index 90%
rename from run_config/fvp-zeus
rename to run_config/fvp-neoversev1x4
index 2cc6f86..2d8ecac 100644
--- a/run_config/fvp-zeus
+++ b/run_config/fvp-neoversev1x4
@@ -6,7 +6,7 @@
 #
 
 post_fetch_tf_resource() {
-	model="zeus" \
+	model="neoverse-v1x4" \
 	cache_state_modelled="0" \
 	gen_model_params
 	uart="0" set_expect_variable "num_cpus" "4"
diff --git a/run_config/fvp-rde1edge b/run_config/fvp-rde1edge
index 186cdbb..df6c610 100644
--- a/run_config/fvp-rde1edge
+++ b/run_config/fvp-rde1edge
@@ -17,7 +17,10 @@
 }
 
 post_fetch_tf_resource() {
-	model="css-rde1edge" gen_model_params
+	model="css-rde1edge" \
+	model_version="11.9" \
+	model_build="41" \
+	gen_model_params
 	set_run_env "ports_script" "$ci_root/model/css-sgi575-ports.awk"
 	set_run_env "num_uarts" "2"
 	uart="0" set_expect_variable "num_cpus" "32"
diff --git a/utils.sh b/utils.sh
index 7c63dc9..92d4aa3 100644
--- a/utils.sh
+++ b/utils.sh
@@ -290,8 +290,8 @@
 jenkins_url="${jenkins_url:-https://ci.trustedfirmware.org/}"
 
 # Model revisions
-model_version="${model_version:-11.9}"
-model_build="${model_build:-41}"
+model_version="${model_version:-11.12}"
+model_build="${model_build:-35}"
 model_flavour="${model_flavour:-Linux64_GCC-6.4}"
 
 # Model snapshots from filer are not normally not accessible from developer