diff --git a/api-tests/val/common/val.h b/api-tests/val/common/val.h
index 3b1a713..f2ccf7a 100644
--- a/api-tests/val/common/val.h
+++ b/api-tests/val/common/val.h
@@ -167,9 +167,9 @@
 
 /* enums */
 typedef enum {
-    NONSECURE = 0x0,
-    SECURE    = 0x1,
-} security_t;
+    CALLER_NONSECURE = 0x0,
+    CALLER_SECURE    = 0x1,
+} caller_security_t;
 
 typedef enum {
     TEST_ISOLATION_L1      = 0x1,
@@ -295,6 +295,6 @@
     uint8_t  status;
 } test_status_buffer_t;
 
-typedef int32_t (*client_test_t)(security_t caller);
+typedef int32_t (*client_test_t)(caller_security_t caller);
 typedef int32_t (*server_test_t)(void);
 #endif /* VAL_COMMON_H */
diff --git a/api-tests/val/nspe/val_framework.c b/api-tests/val/nspe/val_framework.c
index 19f8356..57cb0b6 100644
--- a/api-tests/val/nspe/val_framework.c
+++ b/api-tests/val/nspe/val_framework.c
@@ -159,7 +159,7 @@
             }
 
             /* Execute client tests */
-            test_status = tests_list[i](NONSECURE);
+            test_status = tests_list[i](CALLER_NONSECURE);
 
             if (server_hs == TRUE)
             {
diff --git a/api-tests/val/spe/val_partition_common.h b/api-tests/val/spe/val_partition_common.h
index 76b5c8c..fe32baa 100644
--- a/api-tests/val/spe/val_partition_common.h
+++ b/api-tests/val/spe/val_partition_common.h
@@ -337,7 +337,7 @@
         }
 
         /* Execute client tests */
-        test_status = tests_list[i](SECURE);
+        test_status = tests_list[i](CALLER_SECURE);
 
         /* Retrive Server test status */
         status = val_get_secure_test_result(&handle);