diff --git a/expect-lava/linux-busybox-sgi.exp b/expect-lava/linux-busybox-nrd.exp
similarity index 83%
rename from expect-lava/linux-busybox-sgi.exp
rename to expect-lava/linux-busybox-nrd.exp
index fc9b027..237f4b3 100644
--- a/expect-lava/linux-busybox-sgi.exp
+++ b/expect-lava/linux-busybox-nrd.exp
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022 Arm Limited. All rights reserved.
+# Copyright (c) 2022-2024 Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
diff --git a/expect-lava/trusted-firmware-sgi.exp b/expect-lava/trusted-firmware-nrd.exp
similarity index 76%
rename from expect-lava/trusted-firmware-sgi.exp
rename to expect-lava/trusted-firmware-nrd.exp
index 196ddc4..26fe31b 100644
--- a/expect-lava/trusted-firmware-sgi.exp
+++ b/expect-lava/trusted-firmware-nrd.exp
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022 Arm Limited. All rights reserved.
+# Copyright (c) 2022-2024 Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
diff --git a/expect/linux-busybox-sgi.exp b/expect/linux-busybox-nrd.exp
similarity index 85%
rename from expect/linux-busybox-sgi.exp
rename to expect/linux-busybox-nrd.exp
index 4361516..b95a91f 100644
--- a/expect/linux-busybox-sgi.exp
+++ b/expect/linux-busybox-nrd.exp
@@ -1,6 +1,6 @@
 
 #
-# Copyright (c) 2022 Arm Limited. All rights reserved.
+# Copyright (c) 2022-204 Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
diff --git a/expect/tftf-sgi.exp b/expect/tftf-nrd.exp
similarity index 88%
rename from expect/tftf-sgi.exp
rename to expect/tftf-nrd.exp
index 80390ee..2dd7912 100644
--- a/expect/tftf-sgi.exp
+++ b/expect/tftf-nrd.exp
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022 Arm Limited. All rights reserved.
+# Copyright (c) 2022-2024 Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
diff --git a/expect/trusted-firmware-sgi.exp b/expect/trusted-firmware-nrd.exp
similarity index 81%
rename from expect/trusted-firmware-sgi.exp
rename to expect/trusted-firmware-nrd.exp
index 05d9c63..5aa42d2 100644
--- a/expect/trusted-firmware-sgi.exp
+++ b/expect/trusted-firmware-nrd.exp
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022 Arm Limited. All rights reserved.
+# Copyright (c) 2022-2024 Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
diff --git a/group/scp-boot-tests-coverage/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.nrd-fip.nrd-rdn1edge-debug-bmcov b/group/scp-boot-tests-coverage/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.nrd-fip.nrd-rdn1edge-debug-bmcov
new file mode 100644
index 0000000..892d94a
--- /dev/null
+++ b/group/scp-boot-tests-coverage/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.nrd-fip.nrd-rdn1edge-debug-bmcov
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/scp-boot-tests-coverage/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.sgi-fip.sgi-rdn1edge-debug-bmcov b/group/scp-boot-tests-coverage/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.sgi-fip.sgi-rdn1edge-debug-bmcov
deleted file mode 100644
index d52947d..0000000
--- a/group/scp-boot-tests-coverage/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.sgi-fip.sgi-rdn1edge-debug-bmcov
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/scp-boot-tests-coverage/fvp-rdv1,fvp-rdv1-tbb:fvp-linux.nrd-fip.nrd-rdv1-debug-bmcov b/group/scp-boot-tests-coverage/fvp-rdv1,fvp-rdv1-tbb:fvp-linux.nrd-fip.nrd-rdv1-debug-bmcov
new file mode 100644
index 0000000..892d94a
--- /dev/null
+++ b/group/scp-boot-tests-coverage/fvp-rdv1,fvp-rdv1-tbb:fvp-linux.nrd-fip.nrd-rdv1-debug-bmcov
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/scp-boot-tests-coverage/fvp-rdv1,fvp-rdv1-tbb:fvp-linux.sgi-fip.sgi-rdv1-debug-bmcov b/group/scp-boot-tests-coverage/fvp-rdv1,fvp-rdv1-tbb:fvp-linux.sgi-fip.sgi-rdv1-debug-bmcov
deleted file mode 100644
index d52947d..0000000
--- a/group/scp-boot-tests-coverage/fvp-rdv1,fvp-rdv1-tbb:fvp-linux.sgi-fip.sgi-rdv1-debug-bmcov
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/scp-boot-tests-coverage/fvp-sgi575,fvp-sgi575-tbb:fvp-linux.nrd-fip.nrd-sgi575-debug-bmcov b/group/scp-boot-tests-coverage/fvp-sgi575,fvp-sgi575-tbb:fvp-linux.nrd-fip.nrd-sgi575-debug-bmcov
new file mode 100644
index 0000000..892d94a
--- /dev/null
+++ b/group/scp-boot-tests-coverage/fvp-sgi575,fvp-sgi575-tbb:fvp-linux.nrd-fip.nrd-sgi575-debug-bmcov
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/scp-boot-tests-coverage/fvp-sgi575,fvp-sgi575-tbb:fvp-linux.sgi-fip.sgi-sgi575-debug-bmcov b/group/scp-boot-tests-coverage/fvp-sgi575,fvp-sgi575-tbb:fvp-linux.sgi-fip.sgi-sgi575-debug-bmcov
deleted file mode 100644
index d52947d..0000000
--- a/group/scp-boot-tests-coverage/fvp-sgi575,fvp-sgi575-tbb:fvp-linux.sgi-fip.sgi-sgi575-debug-bmcov
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/scp-boot-tests/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.nrd-fip.nrd-rdn1edge-debug b/group/scp-boot-tests/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.nrd-fip.nrd-rdn1edge-debug
new file mode 100644
index 0000000..52bfb1d
--- /dev/null
+++ b/group/scp-boot-tests/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.nrd-fip.nrd-rdn1edge-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019-2024 Arm Limited and Contributors. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/scp-boot-tests/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.sgi-fip.sgi-rdn1edge-debug b/group/scp-boot-tests/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.sgi-fip.sgi-rdn1edge-debug
deleted file mode 100644
index aab4796..0000000
--- a/group/scp-boot-tests/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.sgi-fip.sgi-rdn1edge-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/scp-boot-tests/fvp-rdv1,fvp-rdv1-tbb:fvp-linux.nrd-fip.nrd-rdv1-debug b/group/scp-boot-tests/fvp-rdv1,fvp-rdv1-tbb:fvp-linux.nrd-fip.nrd-rdv1-debug
new file mode 100644
index 0000000..892d94a
--- /dev/null
+++ b/group/scp-boot-tests/fvp-rdv1,fvp-rdv1-tbb:fvp-linux.nrd-fip.nrd-rdv1-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/scp-boot-tests/fvp-rdv1,fvp-rdv1-tbb:fvp-linux.sgi-fip.sgi-rdv1-debug b/group/scp-boot-tests/fvp-rdv1,fvp-rdv1-tbb:fvp-linux.sgi-fip.sgi-rdv1-debug
deleted file mode 100644
index d52947d..0000000
--- a/group/scp-boot-tests/fvp-rdv1,fvp-rdv1-tbb:fvp-linux.sgi-fip.sgi-rdv1-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/scp-boot-tests/fvp-sgi575,fvp-sgi575-tbb:fvp-linux.nrd-fip.nrd-sgi575-debug b/group/scp-boot-tests/fvp-sgi575,fvp-sgi575-tbb:fvp-linux.nrd-fip.nrd-sgi575-debug
new file mode 100644
index 0000000..52bfb1d
--- /dev/null
+++ b/group/scp-boot-tests/fvp-sgi575,fvp-sgi575-tbb:fvp-linux.nrd-fip.nrd-sgi575-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019-2024 Arm Limited and Contributors. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/scp-boot-tests/fvp-sgi575,fvp-sgi575-tbb:fvp-linux.sgi-fip.sgi-sgi575-debug b/group/scp-boot-tests/fvp-sgi575,fvp-sgi575-tbb:fvp-linux.sgi-fip.sgi-sgi575-debug
deleted file mode 100644
index aab4796..0000000
--- a/group/scp-boot-tests/fvp-sgi575,fvp-sgi575-tbb:fvp-linux.sgi-fip.sgi-sgi575-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l3-boot-tests-css/fvp-rdv1-tbb:fvp-linux.nrd-fip.nrd-rdv1-debug b/group/tf-l3-boot-tests-css/fvp-rdv1-tbb:fvp-linux.nrd-fip.nrd-rdv1-debug
new file mode 100644
index 0000000..892d94a
--- /dev/null
+++ b/group/tf-l3-boot-tests-css/fvp-rdv1-tbb:fvp-linux.nrd-fip.nrd-rdv1-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-boot-tests-css/fvp-rdv1-tbb:fvp-linux.sgi-fip.sgi-rdv1-debug b/group/tf-l3-boot-tests-css/fvp-rdv1-tbb:fvp-linux.sgi-fip.sgi-rdv1-debug
deleted file mode 100644
index d52947d..0000000
--- a/group/tf-l3-boot-tests-css/fvp-rdv1-tbb:fvp-linux.sgi-fip.sgi-rdv1-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/run_config/fvp-fip.sgi b/run_config/fvp-fip.nrd
similarity index 100%
rename from run_config/fvp-fip.sgi
rename to run_config/fvp-fip.nrd
diff --git a/run_config/fvp-linux.sgi b/run_config/fvp-linux.nrd
similarity index 84%
rename from run_config/fvp-linux.sgi
rename to run_config/fvp-linux.nrd
index dd3250c..946c00c 100644
--- a/run_config/fvp-linux.sgi
+++ b/run_config/fvp-linux.nrd
@@ -17,8 +17,8 @@
 }
 
 generate_lava_job_template() {
-	uart="0" port="5004" file="trusted-firmware-sgi.exp" track_expect
-	uart="1" port="5003" file="linux-busybox-sgi.exp" timeout="1800" \
+	uart="0" port="5004" file="trusted-firmware-nrd.exp" track_expect
+	uart="1" port="5003" file="linux-busybox-nrd.exp" timeout="1800" \
 		set_primary="1" track_expect
 
 	set_uart_port "${archive:?}" 2 5000
diff --git a/run_config/fvp-tftf.nrd b/run_config/fvp-tftf.nrd
new file mode 100644
index 0000000..6ef65c0
--- /dev/null
+++ b/run_config/fvp-tftf.nrd
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2022-2024, Arm Limited and Contributors. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+generate_lava_job_template() {
+	uart="1" timeout="1200" set_primary="1" file="tftf-nrd.exp" track_expect
+	uart="0" file="hold_uart.exp" track_expect
+
+	payload_type="tftf" gen_yaml_template
+}
diff --git a/run_config/fvp-tftf.sgi b/run_config/fvp-tftf.sgi
deleted file mode 100644
index 48a6e7a..0000000
--- a/run_config/fvp-tftf.sgi
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2022-2023, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-generate_lava_job_template() {
-	uart="1" timeout="1200" set_primary="1" file="tftf-sgi.exp" track_expect
-	uart="0" file="hold_uart.exp" track_expect
-
-	payload_type="tftf" gen_yaml_template
-}
diff --git a/script/trusted-firmware.nomination.py b/script/trusted-firmware.nomination.py
index 4b2934c..c535d1b 100644
--- a/script/trusted-firmware.nomination.py
+++ b/script/trusted-firmware.nomination.py
@@ -12,20 +12,20 @@
 nomination_rules = {
         # Run RDN1EDGE TF-A Tests and MISRA checks for any platform changes
         "path:plat/arm/board/rdn1edge":
-            ["tf-l3-boot-tests-css/fvp-rdn1edge-tbb,fvp-rdn1edge-default:fvp-tftf.sgi-fip.tftf-rdn1edge",
+            ["tf-l3-boot-tests-css/fvp-rdn1edge-tbb,fvp-rdn1edge-default:fvp-tftf.nrd-fip.tftf-rdn1edge",
              "tf-l2-coverity-misra-nominated/fvp-rdn1edge-tbb:coverity-tf-misra.diff",
-             "tf-l3-boot-tests-css/fvp-rdn1edgex2-tbb:fvp-linux.sgi-fip.sgi-rdn1edgex2-debug",
+             "tf-l3-boot-tests-css/fvp-rdn1edgex2-tbb:fvp-linux.nrd-fip.nrd-rdn1edgex2-debug",
              "tf-l2-coverity-misra-nominated/fvp-rdn1edgex2-tbb:coverity-tf-misra.diff"],
 
         # Run RD-V1 TF-A Tests and MISRA checks for any platform changes
         "path:plat/arm/board/rdv1":
-            ["tf-l3-boot-tests-css/fvp-rdv1-tbb:fvp-linux.sgi-fip.sgi-rdv1-debug",
+            ["tf-l3-boot-tests-css/fvp-rdv1-tbb:fvp-linux.nrd-fip.nrd-rdv1-debug",
              "tf-l2-coverity-misra-nominated/fvp-rdv1-tbb:coverity-tf-misra.diff"],
 
         # Run SGI575 boot test, TF-A Tests and MISRA checks for any changes with "sgi" in the path
         "pathre:sgi":
-            ["tf-l3-boot-tests-css/fvp-sgi575-tbb:fvp-linux.sgi-fip.sgi-sgi575-debug",
-             "tf-l3-boot-tests-css/fvp-sgi575-tbb,fvp-sgi575-default:fvp-tftf.sgi-fip.tftf-sgi575",
+            ["tf-l3-boot-tests-css/fvp-sgi575-tbb:fvp-linux.nrd-fip.nrd-sgi575-debug",
+             "tf-l3-boot-tests-css/fvp-sgi575-tbb,fvp-sgi575-default:fvp-tftf.nrd-fip.tftf-sgi575",
              "tf-l2-coverity-misra-nominated/fvp-sgi575-tbb:coverity-tf-misra.diff"],
 
         # Run Coverity MISRA checks for tc platform changes