diff --git a/group/spm-l2-boot-tests/fvp-default,fvp-spm-rme,fvp-invalid-access-rme:fvp-spm.trp.tftf-tftf.rme b/group/spm-l2-boot-tests/fvp-default,fvp-spm-rme,fvp-memory-access-rme:fvp-spm.trp.tftf-tftf.rme
similarity index 100%
rename from group/spm-l2-boot-tests/fvp-default,fvp-spm-rme,fvp-invalid-access-rme:fvp-spm.trp.tftf-tftf.rme
rename to group/spm-l2-boot-tests/fvp-default,fvp-spm-rme,fvp-memory-access-rme:fvp-spm.trp.tftf-tftf.rme
diff --git a/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-invalid-access:fvp-tftf-fip.tftf-aemv8a.bmcov-debug b/group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-memory-access:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
similarity index 100%
rename from group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-invalid-access:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
rename to group/tf-l3-code-coverage-extensive/fvp-default-cc,fvp-memory-access:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
diff --git a/group/tftf-l1-build/nil,fvp-invalid-access:nil b/group/tftf-l1-build/nil,fvp-memory-access:nil
similarity index 100%
rename from group/tftf-l1-build/nil,fvp-invalid-access:nil
rename to group/tftf-l1-build/nil,fvp-memory-access:nil
diff --git a/group/tftf-l2-fvp/fvp-default,fvp-invalid-access:fvp-tftf-fip.tftf-aemv8a-debug b/group/tftf-l2-fvp/fvp-default,fvp-memory-access:fvp-tftf-fip.tftf-aemv8a-debug
similarity index 100%
rename from group/tftf-l2-fvp/fvp-default,fvp-invalid-access:fvp-tftf-fip.tftf-aemv8a-debug
rename to group/tftf-l2-fvp/fvp-default,fvp-memory-access:fvp-tftf-fip.tftf-aemv8a-debug
diff --git a/tftf_config/fvp-invalid-access b/tftf_config/fvp-memory-access
similarity index 66%
rename from tftf_config/fvp-invalid-access
rename to tftf_config/fvp-memory-access
index ebb0144..6d2516c 100644
--- a/tftf_config/fvp-invalid-access
+++ b/tftf_config/fvp-memory-access
@@ -1,3 +1,3 @@
 CROSS_COMPILE=aarch64-none-elf-
 PLAT=fvp
-TESTS=invalid-access
+TESTS=memory-access
diff --git a/tftf_config/fvp-invalid-access-rme b/tftf_config/fvp-memory-access-rme
similarity index 76%
rename from tftf_config/fvp-invalid-access-rme
rename to tftf_config/fvp-memory-access-rme
index db1dcb7..c5650b0 100644
--- a/tftf_config/fvp-invalid-access-rme
+++ b/tftf_config/fvp-memory-access-rme
@@ -1,4 +1,4 @@
 CROSS_COMPILE=aarch64-none-elf-
 PLAT=fvp
-TESTS=invalid-access
+TESTS=memory-access
 ENABLE_REALM_PAYLOAD_TESTS=1