diff --git a/group/spm-l3-boot-tests/tc-default,fvp-tc0-spm,fvp-tc0-spm:fvp-tc0.spm.tftf-debug b/group/spm-l3-boot-tests/tc-default,fvp-tc0-spm,fvp-tc-spm:fvp-tc0.spm.tftf-debug
similarity index 100%
rename from group/spm-l3-boot-tests/tc-default,fvp-tc0-spm,fvp-tc0-spm:fvp-tc0.spm.tftf-debug
rename to group/spm-l3-boot-tests/tc-default,fvp-tc0-spm,fvp-tc-spm:fvp-tc0.spm.tftf-debug
diff --git a/tf_config/fvp-tc0-spm b/tf_config/fvp-tc0-spm
index 7b63e1f..6f215ea 100644
--- a/tf_config/fvp-tc0-spm
+++ b/tf_config/fvp-tc0-spm
@@ -8,5 +8,5 @@
 PLAT=tc
 SCP_BL2=/dev/null
 SPD=spmd
-SP_LAYOUT_FILE=${tftf_root}/build/tc0/${bin_mode}/sp_layout.json
+SP_LAYOUT_FILE=${tftf_root}/build/tc/${bin_mode}/sp_layout.json
 TARGET_PLATFORM=0
diff --git a/tftf_config/fvp-tc0-spm b/tftf_config/fvp-tc-spm
similarity index 82%
rename from tftf_config/fvp-tc0-spm
rename to tftf_config/fvp-tc-spm
index ebc8b20..439ad9a 100644
--- a/tftf_config/fvp-tc0-spm
+++ b/tftf_config/fvp-tc-spm
@@ -1,3 +1,3 @@
 CROSS_COMPILE=aarch64-none-elf-
-PLAT=tc0
+PLAT=tc
 TESTS=spm