diff --git a/group/tftf-l2-fvp/fvp-ext-pstate-ea-el3,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd-debug b/group/tftf-l2-fvp/fvp-enable-runtime-instr,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug
similarity index 100%
rename from group/tftf-l2-fvp/fvp-ext-pstate-ea-el3,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd-debug
rename to group/tftf-l2-fvp/fvp-enable-runtime-instr,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug
diff --git a/group/tftf-l2-fvp/fvp-enable-runtime-instr,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd-debug b/group/tftf-l2-fvp/fvp-enable-runtime-instr,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd-debug
deleted file mode 100644
index aab4796..0000000
--- a/group/tftf-l2-fvp/fvp-enable-runtime-instr,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd-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/tftf-l2-fvp/fvp-ext-pstate-ea-el3,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd-debug b/group/tftf-l2-fvp/fvp-ext-pstate-ea-el3,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug
similarity index 100%
copy from group/tftf-l2-fvp/fvp-ext-pstate-ea-el3,fvp-default:fvp-tftf-fip.tftf-foundationv8-tspd-debug
copy to group/tftf-l2-fvp/fvp-ext-pstate-ea-el3,fvp-default:fvp-tftf-fip.tftf-foundationv8-debug