diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 78f9f27..fa27a64 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -638,11 +638,11 @@
  * \param[in] data_size     The length of the buffer to export to
  * \param[out] data_length  The amount of bytes written to \p data
  */
-static psa_status_t psa_export_rsa_key( psa_key_type_t type,
-                                        mbedtls_rsa_context *rsa,
-                                        uint8_t *data,
-                                        size_t data_size,
-                                        size_t *data_length )
+static psa_status_t mbedtls_psa_rsa_export_key( psa_key_type_t type,
+                                                mbedtls_rsa_context *rsa,
+                                                uint8_t *data,
+                                                size_t data_size,
+                                                size_t *data_length )
 {
 #if defined(MBEDTLS_PK_WRITE_C)
     int ret;
@@ -730,11 +730,11 @@
         goto exit;
     }
 
-    status = psa_export_rsa_key( slot->attr.type,
-                                 rsa,
-                                 output,
-                                 data_length,
-                                 &data_length);
+    status = mbedtls_psa_rsa_export_key( slot->attr.type,
+                                         rsa,
+                                         output,
+                                         data_length,
+                                         &data_length);
 exit:
     /* Always free the RSA object */
     mbedtls_rsa_free( rsa );
@@ -876,11 +876,11 @@
  * \param[in] data_size     The length of the buffer to export to
  * \param[out] data_length  The amount of bytes written to \p data
  */
-static psa_status_t psa_export_ecp_key( psa_key_type_t type,
-                                        mbedtls_ecp_keypair *ecp,
-                                        uint8_t *data,
-                                        size_t data_size,
-                                        size_t *data_length )
+static psa_status_t mbedtls_psa_ecp_export_key( psa_key_type_t type,
+                                                mbedtls_ecp_keypair *ecp,
+                                                uint8_t *data,
+                                                size_t data_size,
+                                                size_t *data_length )
 {
     psa_status_t status;
 
@@ -963,11 +963,11 @@
         goto exit;
     }
 
-    status = psa_export_ecp_key( slot->attr.type,
-                                 ecp,
-                                 output,
-                                 data_length,
-                                 &data_length);
+    status = mbedtls_psa_ecp_export_key( slot->attr.type,
+                                         ecp,
+                                         output,
+                                         data_length,
+                                         &data_length);
 exit:
     /* Always free the PK object (will also free contained ECP context) */
     mbedtls_ecp_keypair_free( ecp );
@@ -1780,11 +1780,11 @@
             if( status != PSA_SUCCESS )
                 return( status );
 
-            status = psa_export_rsa_key( PSA_KEY_TYPE_RSA_PUBLIC_KEY,
-                                         rsa,
-                                         data,
-                                         data_size,
-                                         data_length );
+            status = mbedtls_psa_rsa_export_key( PSA_KEY_TYPE_RSA_PUBLIC_KEY,
+                                                 rsa,
+                                                 data,
+                                                 data_size,
+                                                 data_length );
 
             mbedtls_rsa_free( rsa );
             mbedtls_free( rsa );
@@ -1808,13 +1808,13 @@
             if( status != PSA_SUCCESS )
                 return( status );
 
-            status = psa_export_ecp_key( PSA_KEY_TYPE_ECC_PUBLIC_KEY(
-                                            PSA_KEY_TYPE_ECC_GET_FAMILY(
-                                                slot->attr.type ) ),
-                                         ecp,
-                                         data,
-                                         data_size,
-                                         data_length );
+            status = mbedtls_psa_ecp_export_key(
+                PSA_KEY_TYPE_ECC_PUBLIC_KEY(
+                    PSA_KEY_TYPE_ECC_GET_FAMILY( slot->attr.type ) ),
+                ecp,
+                data,
+                data_size,
+                data_length );
 
             mbedtls_ecp_keypair_free( ecp );
             mbedtls_free( ecp );
@@ -6621,11 +6621,11 @@
             return( status );
         }
 
-        status = psa_export_rsa_key( type,
-                                     &rsa,
-                                     slot->key.data,
-                                     bytes,
-                                     &slot->key.bytes );
+        status = mbedtls_psa_rsa_export_key( type,
+                                             &rsa,
+                                             slot->key.data,
+                                             bytes,
+                                             &slot->key.bytes );
         mbedtls_rsa_free( &rsa );
         if( status != PSA_SUCCESS )
             psa_remove_key_data_from_memory( slot );