diff --git a/tests/src/drivers/hash.c b/tests/src/drivers/hash.c
index e618660..99de56f 100644
--- a/tests/src/drivers/hash.c
+++ b/tests/src/drivers/hash.c
@@ -47,7 +47,7 @@
     {
 #if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
         mbedtls_test_driver_hash_hooks.driver_status =
-            mbedtls_transparent_test_driver_hash_compute(
+            libtestdriver1_mbedtls_psa_hash_compute(
                 alg, input, input_length,
                 hash, hash_size, hash_length );
 #elif defined(MBEDTLS_PSA_BUILTIN_HASH)
@@ -84,7 +84,7 @@
     {
 #if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
         mbedtls_test_driver_hash_hooks.driver_status =
-            mbedtls_transparent_test_driver_hash_setup( operation, alg );
+            libtestdriver1_mbedtls_psa_hash_setup( operation, alg );
 #elif defined(MBEDTLS_PSA_BUILTIN_HASH)
         mbedtls_test_driver_hash_hooks.driver_status =
             mbedtls_psa_hash_setup( operation, alg );
@@ -113,8 +113,8 @@
     {
 #if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
         mbedtls_test_driver_hash_hooks.driver_status =
-            mbedtls_transparent_test_driver_hash_clone( source_operation,
-                                                        target_operation );
+            libtestdriver1_mbedtls_psa_hash_clone( source_operation,
+                                                   target_operation );
 #elif defined(MBEDTLS_PSA_BUILTIN_HASH)
         mbedtls_test_driver_hash_hooks.driver_status =
             mbedtls_psa_hash_clone( source_operation, target_operation );
@@ -144,7 +144,7 @@
     {
 #if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
         mbedtls_test_driver_hash_hooks.driver_status =
-            mbedtls_transparent_test_driver_hash_update(
+            libtestdriver1_mbedtls_psa_hash_update(
                 operation, input, input_length );
 #elif defined(MBEDTLS_PSA_BUILTIN_HASH)
         mbedtls_test_driver_hash_hooks.driver_status =
@@ -177,7 +177,7 @@
     {
 #if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
         mbedtls_test_driver_hash_hooks.driver_status =
-            mbedtls_transparent_test_driver_hash_finish(
+            libtestdriver1_mbedtls_psa_hash_finish(
                 operation, hash, hash_size, hash_length );
 #elif defined(MBEDTLS_PSA_BUILTIN_HASH)
         mbedtls_test_driver_hash_hooks.driver_status =
@@ -208,7 +208,7 @@
     {
 #if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
         mbedtls_test_driver_hash_hooks.driver_status =
-            mbedtls_transparent_test_driver_hash_abort( operation );
+            libtestdriver1_mbedtls_psa_hash_abort( operation );
 #elif defined(MBEDTLS_PSA_BUILTIN_HASH)
         mbedtls_test_driver_hash_hooks.driver_status =
             mbedtls_psa_hash_abort( operation );
diff --git a/tests/src/drivers/test_driver_cipher.c b/tests/src/drivers/test_driver_cipher.c
index 03c160d..b70ef61 100644
--- a/tests/src/drivers/test_driver_cipher.c
+++ b/tests/src/drivers/test_driver_cipher.c
@@ -71,7 +71,7 @@
     psa_generate_random( output, PSA_CIPHER_IV_LENGTH( attributes->core.type, alg ) );
 
 #if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
-    return( mbedtls_transparent_test_driver_cipher_encrypt(
+    return( libtestdriver1_mbedtls_psa_cipher_encrypt(
                 attributes, key_buffer, key_buffer_size,
                 alg, input, input_length,
                 output, output_size, output_length ) );
@@ -115,7 +115,7 @@
         return( mbedtls_test_driver_cipher_hooks.forced_status );
 
 #if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
-    return( mbedtls_transparent_test_driver_cipher_decrypt(
+    return( libtestdriver1_mbedtls_psa_cipher_decrypt(
                 attributes, key_buffer, key_buffer_size,
                 alg, input, input_length,
                 output, output_size, output_length ) );
@@ -147,7 +147,7 @@
         return( mbedtls_test_driver_cipher_hooks.forced_status );
 
 #if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
-    return( mbedtls_transparent_test_driver_cipher_encrypt_setup(
+    return( libtestdriver1_mbedtls_psa_cipher_encrypt_setup(
                 operation, attributes, key, key_length, alg ) );
 #elif defined(MBEDTLS_PSA_BUILTIN_CIPHER)
     return( mbedtls_psa_cipher_encrypt_setup(
@@ -169,7 +169,7 @@
         return( mbedtls_test_driver_cipher_hooks.forced_status );
 
 #if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
-    return( mbedtls_transparent_test_driver_cipher_decrypt_setup(
+    return( libtestdriver1_mbedtls_psa_cipher_decrypt_setup(
                 operation, attributes, key, key_length, alg ) );
 #elif defined(MBEDTLS_PSA_BUILTIN_CIPHER)
     return( mbedtls_psa_cipher_decrypt_setup(
@@ -188,7 +188,7 @@
         return( PSA_SUCCESS );
 
 #if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
-    mbedtls_transparent_test_driver_cipher_abort( operation );
+    libtestdriver1_mbedtls_psa_cipher_abort( operation );
 #elif defined(MBEDTLS_PSA_BUILTIN_CIPHER)
     mbedtls_psa_cipher_abort( operation );
 #endif
@@ -213,7 +213,7 @@
         return( mbedtls_test_driver_cipher_hooks.forced_status );
 
 #if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
-    return( mbedtls_transparent_test_driver_cipher_set_iv(
+    return( libtestdriver1_mbedtls_psa_cipher_set_iv(
                 operation, iv, iv_length ) );
 #elif defined(MBEDTLS_PSA_BUILTIN_CIPHER)
     return( mbedtls_psa_cipher_set_iv( operation, iv, iv_length ) );
@@ -249,7 +249,7 @@
         return( mbedtls_test_driver_cipher_hooks.forced_status );
 
 #if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
-    return( mbedtls_transparent_test_driver_cipher_update(
+    return( libtestdriver1_mbedtls_psa_cipher_update(
                 operation, input, input_length,
                 output, output_size, output_length ) );
 #elif defined(MBEDTLS_PSA_BUILTIN_CIPHER)
@@ -286,7 +286,7 @@
         return( mbedtls_test_driver_cipher_hooks.forced_status );
 
 #if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
-    return( mbedtls_transparent_test_driver_cipher_finish(
+    return( libtestdriver1_mbedtls_psa_cipher_finish(
                 operation, output, output_size, output_length ) );
 #elif defined(MBEDTLS_PSA_BUILTIN_CIPHER)
     return( mbedtls_psa_cipher_finish(
diff --git a/tests/src/drivers/test_driver_key_management.c b/tests/src/drivers/test_driver_key_management.c
index 3d88285..ce646ba 100644
--- a/tests/src/drivers/test_driver_key_management.c
+++ b/tests/src/drivers/test_driver_key_management.c
@@ -105,7 +105,7 @@
     {
 #if defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_KEY_PAIR) && \
     defined(MBEDTLS_PSA_CRYPTO_CONFIG)
-        return( mbedtls_transparent_test_driver_ecp_generate_key(
+        return( libtestdriver1_mbedtls_psa_ecp_generate_key(
                     attributes, key, key_size, key_length ) );
 #elif defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_KEY_PAIR)
         return( mbedtls_psa_ecp_generate_key(
@@ -116,7 +116,7 @@
     {
 #if defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_KEY_PAIR) && \
     defined(MBEDTLS_PSA_CRYPTO_CONFIG)
-        return( mbedtls_transparent_test_driver_rsa_generate_key(
+        return( libtestdriver1_mbedtls_psa_rsa_generate_key(
                     attributes, key, key_size, key_length ) );
 #elif defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_KEY_PAIR)
         return( mbedtls_psa_rsa_generate_key(
@@ -160,7 +160,7 @@
 #if ( defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_KEY_PAIR) || \
       defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_PUBLIC_KEY) ) && \
     defined(MBEDTLS_PSA_CRYPTO_CONFIG)
-        return( mbedtls_transparent_test_driver_ecp_import_key(
+        return( libtestdriver1_mbedtls_psa_ecp_import_key(
                     attributes,
                     data, data_length,
                     key_buffer, key_buffer_size,
@@ -179,7 +179,7 @@
 #if ( defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_KEY_PAIR) || \
       defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_PUBLIC_KEY) ) && \
     defined(MBEDTLS_PSA_CRYPTO_CONFIG)
-        return( mbedtls_transparent_test_driver_rsa_import_key(
+        return( libtestdriver1_mbedtls_psa_rsa_import_key(
                     attributes,
                     data, data_length,
                     key_buffer, key_buffer_size,
@@ -298,7 +298,7 @@
 #if ( defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_KEY_PAIR) || \
       defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_PUBLIC_KEY) ) && \
     defined(MBEDTLS_PSA_CRYPTO_CONFIG)
-        return( mbedtls_transparent_test_driver_ecp_export_public_key(
+        return( libtestdriver1_mbedtls_psa_ecp_export_public_key(
                     attributes,
                     key_buffer, key_buffer_size,
                     data, data_size, data_length ) );
@@ -315,7 +315,7 @@
 #if ( defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_KEY_PAIR) || \
       defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_PUBLIC_KEY) ) && \
     defined(MBEDTLS_PSA_CRYPTO_CONFIG)
-        return( mbedtls_transparent_test_driver_rsa_export_public_key(
+        return( libtestdriver1_mbedtls_psa_rsa_export_public_key(
                     attributes,
                     key_buffer, key_buffer_size,
                     data, data_size, data_length ) );
diff --git a/tests/src/drivers/test_driver_mac.c b/tests/src/drivers/test_driver_mac.c
index 6f8c3c4..a6c2c88 100644
--- a/tests/src/drivers/test_driver_mac.c
+++ b/tests/src/drivers/test_driver_mac.c
@@ -53,7 +53,7 @@
     {
 #if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
         mbedtls_test_driver_mac_hooks.driver_status =
-            mbedtls_transparent_test_driver_mac_compute(
+            libtestdriver1_mbedtls_psa_mac_compute(
                 attributes, key_buffer, key_buffer_size, alg,
                 input, input_length,
                 mac, mac_size, mac_length );
@@ -98,7 +98,7 @@
     {
 #if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
         mbedtls_test_driver_mac_hooks.driver_status =
-            mbedtls_transparent_test_driver_mac_sign_setup(
+            libtestdriver1_mbedtls_psa_mac_sign_setup(
                 operation, attributes, key_buffer, key_buffer_size, alg );
 #elif defined(MBEDTLS_PSA_BUILTIN_MAC)
         mbedtls_test_driver_mac_hooks.driver_status =
@@ -135,7 +135,7 @@
     {
 #if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
         mbedtls_test_driver_mac_hooks.driver_status =
-            mbedtls_transparent_test_driver_mac_verify_setup(
+            libtestdriver1_mbedtls_psa_mac_verify_setup(
                 operation, attributes, key_buffer, key_buffer_size, alg );
 #elif defined(MBEDTLS_PSA_BUILTIN_MAC)
         mbedtls_test_driver_mac_hooks.driver_status =
@@ -170,7 +170,7 @@
     {
 #if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
         mbedtls_test_driver_mac_hooks.driver_status =
-            mbedtls_transparent_test_driver_mac_update(
+            libtestdriver1_mbedtls_psa_mac_update(
                 operation, input, input_length );
 #elif defined(MBEDTLS_PSA_BUILTIN_MAC)
         mbedtls_test_driver_mac_hooks.driver_status =
@@ -204,7 +204,7 @@
     {
 #if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
         mbedtls_test_driver_mac_hooks.driver_status =
-            mbedtls_transparent_test_driver_mac_sign_finish(
+            libtestdriver1_mbedtls_psa_mac_sign_finish(
                 operation, mac, mac_size, mac_length );
 #elif defined(MBEDTLS_PSA_BUILTIN_MAC)
         mbedtls_test_driver_mac_hooks.driver_status =
@@ -238,7 +238,7 @@
     {
 #if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
         mbedtls_test_driver_mac_hooks.driver_status =
-            mbedtls_transparent_test_driver_mac_verify_finish(
+            libtestdriver1_mbedtls_psa_mac_verify_finish(
                 operation, mac, mac_length );
 #elif defined(MBEDTLS_PSA_BUILTIN_MAC)
         mbedtls_test_driver_mac_hooks.driver_status =
@@ -269,7 +269,7 @@
     {
 #if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
         mbedtls_test_driver_mac_hooks.driver_status =
-            mbedtls_transparent_test_driver_mac_abort( operation );
+            libtestdriver1_mbedtls_psa_mac_abort( operation );
 #elif defined(MBEDTLS_PSA_BUILTIN_MAC)
         mbedtls_test_driver_mac_hooks.driver_status =
             mbedtls_psa_mac_abort( operation );
diff --git a/tests/src/drivers/test_driver_signature.c b/tests/src/drivers/test_driver_signature.c
index 443b52e..a656287 100644
--- a/tests/src/drivers/test_driver_signature.c
+++ b/tests/src/drivers/test_driver_signature.c
@@ -35,6 +35,7 @@
 
 #include "test/drivers/hash.h"
 #include "test/drivers/signature.h"
+#include "test/drivers/hash.h"
 
 #include "mbedtls/md.h"
 #include "mbedtls/ecdsa.h"
@@ -67,18 +68,18 @@
 #if ( defined(MBEDTLS_PSA_ACCEL_ALG_RSA_PKCS1V15_SIGN) || \
       defined(MBEDTLS_PSA_ACCEL_ALG_RSA_PSS) ) && \
     defined(MBEDTLS_PSA_CRYPTO_CONFIG)
-            return( mbedtls_transparent_test_driver_rsa_sign_hash(
+            return( libtestdriver1_mbedtls_psa_rsa_sign_hash(
                         attributes,
                         key_buffer, key_buffer_size,
                         alg, hash, hash_length,
                         signature, signature_size, signature_length ) );
 #elif defined(MBEDTLS_PSA_BUILTIN_ALG_RSA_PKCS1V15_SIGN) || \
       defined(MBEDTLS_PSA_BUILTIN_ALG_RSA_PSS)
-        return( mbedtls_psa_rsa_sign_hash(
-                    attributes,
-                    key_buffer, key_buffer_size,
-                    alg, hash, hash_length,
-                    signature, signature_size, signature_length ) );
+            return( mbedtls_psa_rsa_sign_hash(
+                        attributes,
+                        key_buffer, key_buffer_size,
+                        alg, hash, hash_length,
+                        signature, signature_size, signature_length ) );
 #endif
         }
         else
@@ -93,7 +94,7 @@
 #if ( defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA) || \
       defined(MBEDTLS_PSA_ACCEL_ALG_DETERMINISTIC_ECDSA) ) && \
     defined(MBEDTLS_PSA_CRYPTO_CONFIG)
-            return( mbedtls_transparent_test_driver_ecdsa_sign_hash(
+            return( libtestdriver1_mbedtls_psa_ecdsa_sign_hash(
                         attributes,
                         key_buffer, key_buffer_size,
                         alg, hash, hash_length,
@@ -143,18 +144,18 @@
 #if ( defined(MBEDTLS_PSA_ACCEL_ALG_RSA_PKCS1V15_SIGN) || \
       defined(MBEDTLS_PSA_ACCEL_ALG_RSA_PSS) ) && \
     defined(MBEDTLS_PSA_CRYPTO_CONFIG)
-            return( mbedtls_transparent_test_driver_rsa_verify_hash(
+            return( libtestdriver1_mbedtls_psa_rsa_verify_hash(
                         attributes,
                         key_buffer, key_buffer_size,
                         alg, hash, hash_length,
                         signature, signature_length ) );
 #elif defined(MBEDTLS_PSA_BUILTIN_ALG_RSA_PKCS1V15_SIGN) || \
       defined(MBEDTLS_PSA_BUILTIN_ALG_RSA_PSS)
-        return( mbedtls_psa_rsa_verify_hash(
-                    attributes,
-                    key_buffer, key_buffer_size,
-                    alg, hash, hash_length,
-                    signature, signature_length ) );
+            return( mbedtls_psa_rsa_verify_hash(
+                        attributes,
+                        key_buffer, key_buffer_size,
+                        alg, hash, hash_length,
+                        signature, signature_length ) );
 #endif
         }
         else
@@ -169,7 +170,7 @@
 #if ( defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA) || \
       defined(MBEDTLS_PSA_ACCEL_ALG_DETERMINISTIC_ECDSA) ) && \
     defined(MBEDTLS_PSA_CRYPTO_CONFIG)
-            return( mbedtls_transparent_test_driver_ecdsa_verify_hash(
+            return( libtestdriver1_mbedtls_psa_ecdsa_verify_hash(
                         attributes,
                         key_buffer, key_buffer_size,
                         alg, hash, hash_length,
@@ -233,7 +234,7 @@
     }
 
 #if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
-    status = mbedtls_transparent_test_driver_hash_compute(
+    status = libtestdriver1_mbedtls_psa_hash_compute(
                 PSA_ALG_SIGN_GET_HASH( alg ), input, input_length,
                 hash, sizeof( hash ), &hash_length );
 #elif defined(MBEDTLS_PSA_BUILTIN_HASH)
@@ -297,7 +298,7 @@
         return( mbedtls_test_driver_signature_verify_hooks.forced_status );
 
 #if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
-    status = mbedtls_transparent_test_driver_hash_compute(
+    status = libtestdriver1_mbedtls_psa_hash_compute(
                 PSA_ALG_SIGN_GET_HASH( alg ), input, input_length,
                 hash, sizeof( hash ), &hash_length );
 #elif defined(MBEDTLS_PSA_BUILTIN_HASH)
@@ -361,9 +362,9 @@
         return( PSA_SUCCESS );
     }
 
-    return sign_hash( attributes, key_buffer, key_buffer_size,
+    return( sign_hash( attributes, key_buffer, key_buffer_size,
                       alg, hash, hash_length,
-                      signature, signature_size, signature_length );
+                      signature, signature_size, signature_length ) );
 }
 
 psa_status_t mbedtls_test_opaque_signature_sign_hash(