diff --git a/cmake/UnitTest.cmake b/cmake/UnitTest.cmake
index 207b25c..cb496f7 100644
--- a/cmake/UnitTest.cmake
+++ b/cmake/UnitTest.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -15,20 +15,20 @@
 #   Modules
 #     CTest module should be included in the root CMakeLists.txt before calling this function
 
-function(add_unit_test_suite)
+function(unit_test_add_suite)
 	set(_OPTIONS_ARGS args1)
-	set(_ONE_VALUE_ARGS TEST_NAME)
-	set(_MULTI_VALUE_ARGS TEST_SOURCES TEST_INCLUDES TEST_DEFINES)
+	set(_ONE_VALUE_ARGS NAME)
+	set(_MULTI_VALUE_ARGS SOURCES INCLUDE_DIRECTORIES COMPILE_DEFINITIONS)
 	cmake_parse_arguments(_MY_PARAMS "${_OPTIONS_ARGS}" "${_ONE_VALUE_ARGS}" "${_MULTI_VALUE_ARGS}" ${ARGN})
 	# TODO: check_args(add_unit_test_suite args1 args2 args3)
 
-	set(TEST_NAME ${_MY_PARAMS_TEST_NAME})
-	set(TEST_INCLUDES ${_MY_PARAMS_TEST_INCLUDES})
-	set(TEST_DEFINES ${_MY_PARAMS_TEST_DEFINES})
+	set(TEST_NAME ${_MY_PARAMS_NAME})
+	set(TEST_INCLUDE_DIRECTORIES ${_MY_PARAMS_INCLUDE_DIRECTORIES})
+	set(TEST_COMPILE_DEFINITIONS ${_MY_PARAMS_COMPILE_DEFINITIONS})
 
 	add_executable(${TEST_NAME} ${UNIT_TEST_COMMON_SOURCES})
 
-	foreach(TEST_SOURCE ${_MY_PARAMS_TEST_SOURCES})
+	foreach(TEST_SOURCE ${_MY_PARAMS_SOURCES})
 		get_filename_component(TEST_SOURCE_EXTENSION ${TEST_SOURCE} EXT)
 
 		if (${TEST_SOURCE_EXTENSION} STREQUAL ".yml")
@@ -65,7 +65,7 @@
 		target_sources(${TEST_NAME} PRIVATE ${TEST_SOURCE})
 	endforeach()
 
-	target_include_directories(${TEST_NAME} PRIVATE ${TEST_INCLUDES})
-	target_compile_definitions(${TEST_NAME} PRIVATE ${TEST_DEFINES})
+	target_include_directories(${TEST_NAME} PRIVATE ${TEST_INCLUDE_DIRECTORIES})
+	target_compile_definitions(${TEST_NAME} PRIVATE ${TEST_COMPILE_DEFINITIONS})
 	add_test(${TEST_NAME} ${TEST_NAME})
 endfunction()