diff --git a/tftf/tests/common/test_helpers.c b/tftf/tests/common/test_helpers.c
index 9861070..05b09d7 100644
--- a/tftf/tests/common/test_helpers.c
+++ b/tftf/tests/common/test_helpers.c
@@ -148,7 +148,7 @@
 	return false;
 }
 
-test_result_t check_hafnium_spmc_testing_set_up(
+test_result_t check_spmc_testing_set_up(
 	uint32_t ffa_version_major, uint32_t ffa_version_minor,
 	const struct ffa_uuid *ffa_uuids, size_t ffa_uuids_size)
 {
diff --git a/tftf/tests/runtime_services/secure_service/test_ffa_direct_messaging.c b/tftf/tests/runtime_services/secure_service/test_ffa_direct_messaging.c
index aeeb19b..da5b941 100644
--- a/tftf/tests/runtime_services/secure_service/test_ffa_direct_messaging.c
+++ b/tftf/tests/runtime_services/secure_service/test_ffa_direct_messaging.c
@@ -62,7 +62,7 @@
 	/**********************************************************************
 	 * Check SPMC has ffa_version and expected FFA endpoints are deployed.
 	 **********************************************************************/
-	CHECK_HAFNIUM_SPMC_TESTING_SETUP(1, 0, expected_sp_uuids);
+	CHECK_SPMC_TESTING_SETUP(1, 0, expected_sp_uuids);
 
 	/**********************************************************************
 	 * Send a message to SP1 through direct messaging
@@ -122,7 +122,7 @@
 {
 	test_result_t result;
 
-	CHECK_HAFNIUM_SPMC_TESTING_SETUP(1, 0, expected_sp_uuids);
+	CHECK_SPMC_TESTING_SETUP(1, 0, expected_sp_uuids);
 
 	result = send_cactus_req_echo_cmd(HYP_ID, SP_ID(1), SP_ID(2),
 					  ECHO_VAL1);
@@ -153,7 +153,7 @@
 	/**********************************************************************
 	 * Check SPMC has ffa_version and expected FFA endpoints are deployed.
 	 **********************************************************************/
-	CHECK_HAFNIUM_SPMC_TESTING_SETUP(1, 0, expected_sp_uuids);
+	CHECK_SPMC_TESTING_SETUP(1, 0, expected_sp_uuids);
 
 	ret = CACTUS_REQ_DEADLOCK_SEND_CMD(HYP_ID, SP_ID(1), SP_ID(2),
 					   SP_ID(3));
diff --git a/tftf/tests/runtime_services/secure_service/test_ffa_memory_sharing.c b/tftf/tests/runtime_services/secure_service/test_ffa_memory_sharing.c
index 61f1aaa..43cf9a1 100644
--- a/tftf/tests/runtime_services/secure_service/test_ffa_memory_sharing.c
+++ b/tftf/tests/runtime_services/secure_service/test_ffa_memory_sharing.c
@@ -52,7 +52,7 @@
 	/***********************************************************************
 	 * Check if SPMC has ffa_version and expected FFA endpoints are deployed.
 	 **********************************************************************/
-	CHECK_HAFNIUM_SPMC_TESTING_SETUP(1, 0, expected_sp_uuids);
+	CHECK_SPMC_TESTING_SETUP(1, 0, expected_sp_uuids);
 
 	GET_TFTF_MAILBOX(mb);
 
@@ -139,7 +139,7 @@
 	/***********************************************************************
 	 * Check if SPMC's ffa_version and presence of expected FF-A endpoints.
 	 **********************************************************************/
-	CHECK_HAFNIUM_SPMC_TESTING_SETUP(1, 0, expected_sp_uuids);
+	CHECK_SPMC_TESTING_SETUP(1, 0, expected_sp_uuids);
 
 	ret = CACTUS_REQ_MEM_SEND_SEND_CMD(HYP_ID, sender_sp, mem_func,
 					   receiver_sp);