diff --git a/library/ssl_misc.h b/library/ssl_misc.h
index 8155fb79c9..f3b4b9f4e2 100644
--- a/library/ssl_misc.h
+++ b/library/ssl_misc.h
@@ -1305,7 +1305,7 @@ static inline mbedtls_svc_key_id_t mbedtls_ssl_get_opaque_psk(
  * \return                     PSA_SUCCESS on success or PSA_ERROR_NOT_SUPPORTED if
  *                             conversion is not supported.
  */
-psa_status_t tls_mbedtls_cipher_to_psa( mbedtls_cipher_type_t mbedtls_cipher_type,
+psa_status_t mbedtls_ssl_cipher_to_psa( mbedtls_cipher_type_t mbedtls_cipher_type,
                                     size_t taglen,
                                     psa_algorithm_t *alg,
                                     psa_key_type_t *key_type,
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 0efdd3e3eb..ba8a096540 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -1009,14 +1009,14 @@ static int ssl_tls12_populate_transform( mbedtls_ssl_transform *transform,
     }
 
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
-    if( ( status = tls_mbedtls_cipher_to_psa( cipher_info->type,
+    if( ( status = mbedtls_ssl_cipher_to_psa( cipher_info->type,
                                  transform->taglen,
                                  &alg,
                                  &key_type,
                                  &key_bits ) ) != PSA_SUCCESS )
     {
         ret = psa_status_to_mbedtls( status );
-        MBEDTLS_SSL_DEBUG_RET( 1, "tls_mbedtls_cipher_to_psa", ret );
+        MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_ssl_cipher_to_psa", ret );
         goto end;
     }
 
@@ -4012,7 +4012,7 @@ int mbedtls_ssl_conf_psk_opaque( mbedtls_ssl_config *conf,
     return( ret );
 }
 
-psa_status_t tls_mbedtls_cipher_to_psa( mbedtls_cipher_type_t mbedtls_cipher_type,
+psa_status_t mbedtls_ssl_cipher_to_psa( mbedtls_cipher_type_t mbedtls_cipher_type,
                                     size_t taglen,
                                     psa_algorithm_t *alg,
                                     psa_key_type_t *key_type,
diff --git a/library/ssl_tls13_keys.c b/library/ssl_tls13_keys.c
index 5f0595bbb6..13122c80d5 100644
--- a/library/ssl_tls13_keys.c
+++ b/library/ssl_tls13_keys.c
@@ -930,13 +930,13 @@ int mbedtls_ssl_tls13_populate_transform( mbedtls_ssl_transform *transform,
     /*
      * Setup psa keys and alg
      */
-    if( ( status = tls_mbedtls_cipher_to_psa( cipher_info->type,
+    if( ( status = mbedtls_ssl_cipher_to_psa( cipher_info->type,
                                  transform->taglen,
                                  &alg,
                                  &key_type,
                                  &key_bits ) ) != PSA_SUCCESS )
     {
-        MBEDTLS_SSL_DEBUG_RET( 1, "tls_mbedtls_cipher_to_psa", psa_status_to_mbedtls( status ) );
+        MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_ssl_cipher_to_psa", psa_status_to_mbedtls( status ) );
         return( psa_status_to_mbedtls( status ) );
     }
 
diff --git a/tests/suites/test_suite_ssl.function b/tests/suites/test_suite_ssl.function
index acfc3a4f4d..91858e41c3 100644
--- a/tests/suites/test_suite_ssl.function
+++ b/tests/suites/test_suite_ssl.function
@@ -1431,7 +1431,7 @@ static int build_transforms( mbedtls_ssl_transform *t_in,
 #endif /* MBEDTLS_SSL_DTLS_CONNECTION_ID */
 
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
-    status = tls_mbedtls_cipher_to_psa( cipher_type,
+    status = mbedtls_ssl_cipher_to_psa( cipher_type,
                             t_in->taglen,
                             &alg,
                             &key_type,