diff --git a/library/psa_crypto_cipher.c b/library/psa_crypto_cipher.c
index f7c2aee..872e18f 100644
--- a/library/psa_crypto_cipher.c
+++ b/library/psa_crypto_cipher.c
@@ -665,7 +665,7 @@
  */
 
 #if defined(PSA_CRYPTO_DRIVER_TEST) && defined(MBEDTLS_PSA_CRYPTO_CONFIG)
-psa_status_t mbedtls_transparent_test_driver_cipher_encrypt_setup(
+psa_status_t libtestdriver1_mbedtls_psa_cipher_encrypt_setup(
     mbedtls_psa_cipher_operation_t *operation,
     const psa_key_attributes_t *attributes,
     const uint8_t *key_buffer, size_t key_buffer_size,
@@ -675,7 +675,7 @@
                 operation, attributes, key_buffer, key_buffer_size, alg ) );
 }
 
-psa_status_t mbedtls_transparent_test_driver_cipher_decrypt_setup(
+psa_status_t libtestdriver1_mbedtls_psa_cipher_decrypt_setup(
     mbedtls_psa_cipher_operation_t *operation,
     const psa_key_attributes_t *attributes,
     const uint8_t *key_buffer, size_t key_buffer_size,
@@ -685,14 +685,14 @@
                 operation, attributes, key_buffer, key_buffer_size, alg ) );
 }
 
-psa_status_t mbedtls_transparent_test_driver_cipher_set_iv(
+psa_status_t libtestdriver1_mbedtls_psa_cipher_set_iv(
     mbedtls_psa_cipher_operation_t *operation,
     const uint8_t *iv, size_t iv_length )
 {
     return( cipher_set_iv( operation, iv, iv_length ) );
 }
 
-psa_status_t mbedtls_transparent_test_driver_cipher_update(
+psa_status_t libtestdriver1_mbedtls_psa_cipher_update(
     mbedtls_psa_cipher_operation_t *operation,
     const uint8_t *input, size_t input_length,
     uint8_t *output, size_t output_size, size_t *output_length )
@@ -701,20 +701,20 @@
                            output, output_size, output_length ) );
 }
 
-psa_status_t mbedtls_transparent_test_driver_cipher_finish(
+psa_status_t libtestdriver1_mbedtls_psa_cipher_finish(
     mbedtls_psa_cipher_operation_t *operation,
     uint8_t *output, size_t output_size, size_t *output_length )
 {
     return( cipher_finish( operation, output, output_size, output_length ) );
 }
 
-psa_status_t mbedtls_transparent_test_driver_cipher_abort(
+psa_status_t libtestdriver1_mbedtls_psa_cipher_abort(
     mbedtls_psa_cipher_operation_t *operation )
 {
     return( cipher_abort( operation ) );
 }
 
-psa_status_t mbedtls_transparent_test_driver_cipher_encrypt(
+psa_status_t libtestdriver1_mbedtls_psa_cipher_encrypt(
     const psa_key_attributes_t *attributes,
     const uint8_t *key_buffer,
     size_t key_buffer_size,
@@ -730,7 +730,7 @@
                             output, output_size, output_length ) );
 }
 
-psa_status_t mbedtls_transparent_test_driver_cipher_decrypt(
+psa_status_t libtestdriver1_mbedtls_psa_cipher_decrypt(
     const psa_key_attributes_t *attributes,
     const uint8_t *key_buffer,
     size_t key_buffer_size,
@@ -745,6 +745,7 @@
                             alg, input, input_length,
                             output, output_size, output_length ) );
 }
+
 #endif /* PSA_CRYPTO_DRIVER_TEST && MBEDTLS_PSA_CRYPTO_CONFIG */
 
 #endif /* MBEDTLS_PSA_CRYPTO_C */
diff --git a/library/psa_crypto_ecp.c b/library/psa_crypto_ecp.c
index 913d12e..3fdcdb2 100644
--- a/library/psa_crypto_ecp.c
+++ b/library/psa_crypto_ecp.c
@@ -576,7 +576,7 @@
 #if defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_KEY_PAIR) || \
     defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_PUBLIC_KEY)
 
-psa_status_t mbedtls_test_driver_ecp_import_key(
+psa_status_t libtestdriver1_mbedtls_psa_ecp_import_key(
     const psa_key_attributes_t *attributes,
     const uint8_t *data, size_t data_length,
     uint8_t *key_buffer, size_t key_buffer_size,
@@ -587,7 +587,7 @@
                             key_buffer_length, bits ) );
 }
 
-psa_status_t mbedtls_test_driver_ecp_export_public_key(
+psa_status_t libtestdriver1_mbedtls_psa_ecp_export_public_key(
     const psa_key_attributes_t *attributes,
     const uint8_t *key_buffer, size_t key_buffer_size,
     uint8_t *data, size_t data_size, size_t *data_length )
@@ -601,7 +601,7 @@
 
 #if defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_KEY_PAIR) && \
     defined(MBEDTLS_GENPRIME)
-psa_status_t mbedtls_transparent_test_driver_ecp_generate_key(
+psa_status_t libtestdriver1_mbedtls_psa_ecp_generate_key(
     const psa_key_attributes_t *attributes,
     uint8_t *key_buffer, size_t key_buffer_size, size_t *key_buffer_length )
 {
@@ -614,7 +614,7 @@
 #if defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA) || \
     defined(MBEDTLS_PSA_ACCEL_ALG_DETERMINISTIC_ECDSA)
 
-psa_status_t mbedtls_transparent_test_driver_ecdsa_sign_hash(
+psa_status_t libtestdriver1_mbedtls_psa_ecdsa_sign_hash(
     const psa_key_attributes_t *attributes,
     const uint8_t *key_buffer, size_t key_buffer_size,
     psa_algorithm_t alg, const uint8_t *hash, size_t hash_length,
@@ -640,7 +640,7 @@
 #endif
 }
 
-psa_status_t mbedtls_transparent_test_driver_ecdsa_verify_hash(
+psa_status_t libtestdriver1_mbedtls_psa_ecdsa_verify_hash(
     const psa_key_attributes_t *attributes,
     const uint8_t *key_buffer, size_t key_buffer_size,
     psa_algorithm_t alg, const uint8_t *hash, size_t hash_length,
diff --git a/library/psa_crypto_hash.c b/library/psa_crypto_hash.c
index 2eac2d0..3ecc954 100644
--- a/library/psa_crypto_hash.c
+++ b/library/psa_crypto_hash.c
@@ -564,7 +564,7 @@
     }
 }
 
-psa_status_t mbedtls_transparent_test_driver_hash_compute(
+psa_status_t libtestdriver1_mbedtls_psa_hash_compute(
     psa_algorithm_t alg,
     const uint8_t *input,
     size_t input_length,
@@ -579,7 +579,7 @@
         return( PSA_ERROR_NOT_SUPPORTED );
 }
 
-psa_status_t mbedtls_transparent_test_driver_hash_setup(
+psa_status_t libtestdriver1_mbedtls_psa_hash_setup(
     mbedtls_psa_hash_operation_t *operation,
     psa_algorithm_t alg )
 {
@@ -589,7 +589,7 @@
         return( PSA_ERROR_NOT_SUPPORTED );
 }
 
-psa_status_t mbedtls_transparent_test_driver_hash_clone(
+psa_status_t libtestdriver1_mbedtls_psa_hash_clone(
     const mbedtls_psa_hash_operation_t *source_operation,
     mbedtls_psa_hash_operation_t *target_operation )
 {
@@ -599,7 +599,7 @@
         return( PSA_ERROR_BAD_STATE );
 }
 
-psa_status_t mbedtls_transparent_test_driver_hash_update(
+psa_status_t libtestdriver1_mbedtls_psa_hash_update(
     mbedtls_psa_hash_operation_t *operation,
     const uint8_t *input,
     size_t input_length )
@@ -610,7 +610,7 @@
         return( PSA_ERROR_BAD_STATE );
 }
 
-psa_status_t mbedtls_transparent_test_driver_hash_finish(
+psa_status_t libtestdriver1_mbedtls_psa_hash_finish(
     mbedtls_psa_hash_operation_t *operation,
     uint8_t *hash,
     size_t hash_size,
@@ -622,7 +622,7 @@
         return( PSA_ERROR_BAD_STATE );
 }
 
-psa_status_t mbedtls_transparent_test_driver_hash_abort(
+psa_status_t libtestdriver1_mbedtls_psa_hash_abort(
     mbedtls_psa_hash_operation_t *operation )
 {
     return( hash_abort( operation ) );
diff --git a/library/psa_crypto_mac.c b/library/psa_crypto_mac.c
index 421d12e..fe15e9f 100644
--- a/library/psa_crypto_mac.c
+++ b/library/psa_crypto_mac.c
@@ -585,7 +585,7 @@
     }
 }
 
-psa_status_t mbedtls_transparent_test_driver_mac_compute(
+psa_status_t libtestdriver1_mbedtls_psa_mac_compute(
     const psa_key_attributes_t *attributes,
     const uint8_t *key_buffer,
     size_t key_buffer_size,
@@ -604,7 +604,7 @@
         return( PSA_ERROR_NOT_SUPPORTED );
 }
 
-psa_status_t mbedtls_transparent_test_driver_mac_sign_setup(
+psa_status_t libtestdriver1_mbedtls_psa_mac_sign_setup(
     mbedtls_psa_mac_operation_t *operation,
     const psa_key_attributes_t *attributes,
     const uint8_t *key_buffer,
@@ -618,7 +618,7 @@
         return( PSA_ERROR_NOT_SUPPORTED );
 }
 
-psa_status_t mbedtls_transparent_test_driver_mac_verify_setup(
+psa_status_t libtestdriver1_mbedtls_psa_mac_verify_setup(
     mbedtls_psa_mac_operation_t *operation,
     const psa_key_attributes_t *attributes,
     const uint8_t *key_buffer,
@@ -632,7 +632,7 @@
         return( PSA_ERROR_NOT_SUPPORTED );
 }
 
-psa_status_t mbedtls_transparent_test_driver_mac_update(
+psa_status_t libtestdriver1_mbedtls_psa_mac_update(
     mbedtls_psa_mac_operation_t *operation,
     const uint8_t *input,
     size_t input_length )
@@ -643,7 +643,7 @@
         return( PSA_ERROR_BAD_STATE );
 }
 
-psa_status_t mbedtls_transparent_test_driver_mac_sign_finish(
+psa_status_t libtestdriver1_mbedtls_psa_mac_sign_finish(
     mbedtls_psa_mac_operation_t *operation,
     uint8_t *mac,
     size_t mac_size,
@@ -655,7 +655,7 @@
         return( PSA_ERROR_BAD_STATE );
 }
 
-psa_status_t mbedtls_transparent_test_driver_mac_verify_finish(
+psa_status_t libtestdriver1_mbedtls_psa_mac_verify_finish(
     mbedtls_psa_mac_operation_t *operation,
     const uint8_t *mac,
     size_t mac_length )
@@ -666,7 +666,7 @@
         return( PSA_ERROR_BAD_STATE );
 }
 
-psa_status_t mbedtls_transparent_test_driver_mac_abort(
+psa_status_t libtestdriver1_mbedtls_psa_mac_abort(
     mbedtls_psa_mac_operation_t *operation )
 {
     return( mac_abort( operation ) );
diff --git a/library/psa_crypto_rsa.c b/library/psa_crypto_rsa.c
index 629f354..9492a6b 100644
--- a/library/psa_crypto_rsa.c
+++ b/library/psa_crypto_rsa.c
@@ -639,7 +639,7 @@
 #if defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_KEY_PAIR) || \
     defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_PUBLIC_KEY)
 
-psa_status_t mbedtls_test_driver_rsa_import_key(
+psa_status_t libtestdriver1_mbedtls_psa_rsa_import_key(
     const psa_key_attributes_t *attributes,
     const uint8_t *data, size_t data_length,
     uint8_t *key_buffer, size_t key_buffer_size,
@@ -650,7 +650,7 @@
                             key_buffer_length, bits ) );
 }
 
-psa_status_t mbedtls_test_driver_rsa_export_public_key(
+psa_status_t libtestdriver1_mbedtls_psa_rsa_export_public_key(
     const psa_key_attributes_t *attributes,
     const uint8_t *key_buffer, size_t key_buffer_size,
     uint8_t *data, size_t data_size, size_t *data_length )
@@ -663,7 +663,7 @@
           defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_PUBLIC_KEY) */
 
 #if defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_KEY_PAIR)
-psa_status_t mbedtls_transparent_test_driver_rsa_generate_key(
+psa_status_t libtestdriver1_mbedtls_psa_rsa_generate_key(
     const psa_key_attributes_t *attributes,
     uint8_t *key_buffer, size_t key_buffer_size, size_t *key_buffer_length )
 {
@@ -674,7 +674,7 @@
 
 #if defined(MBEDTLS_PSA_ACCEL_ALG_RSA_PKCS1V15_SIGN) || \
     defined(MBEDTLS_PSA_ACCEL_ALG_RSA_PSS)
-psa_status_t mbedtls_transparent_test_driver_rsa_sign_hash(
+psa_status_t libtestdriver1_mbedtls_psa_rsa_sign_hash(
     const psa_key_attributes_t *attributes,
     const uint8_t *key_buffer, size_t key_buffer_size,
     psa_algorithm_t alg, const uint8_t *hash, size_t hash_length,
@@ -701,7 +701,7 @@
 #endif
 }
 
-psa_status_t mbedtls_transparent_test_driver_rsa_verify_hash(
+psa_status_t libtestdriver1_mbedtls_psa_rsa_verify_hash(
     const psa_key_attributes_t *attributes,
     const uint8_t *key_buffer, size_t key_buffer_size,
     psa_algorithm_t alg, const uint8_t *hash, size_t hash_length,