diff --git a/tf-psa-crypto/core/psa_crypto.c b/tf-psa-crypto/core/psa_crypto.c
index d41a232ed4..40617b4cd9 100644
--- a/tf-psa-crypto/core/psa_crypto.c
+++ b/tf-psa-crypto/core/psa_crypto.c
@@ -8191,8 +8191,8 @@ psa_status_t psa_generate_key_iop_complete(
         return PSA_ERROR_BAD_STATE;
     }
 
-    status = mbedtls_psa_generate_key_complete(&operation->ctx, key_data,
-                                               MBEDTLS_ECP_MAX_BYTES, &key_len);
+    status = mbedtls_psa_generate_key_iop_complete(&operation->ctx, key_data,
+                                                   MBEDTLS_ECP_MAX_BYTES, &key_len);
     if (status != PSA_SUCCESS) {
         goto exit;
     }
diff --git a/tf-psa-crypto/core/psa_crypto_core.h b/tf-psa-crypto/core/psa_crypto_core.h
index cc9a78dc95..14c74dc017 100644
--- a/tf-psa-crypto/core/psa_crypto_core.h
+++ b/tf-psa-crypto/core/psa_crypto_core.h
@@ -443,7 +443,7 @@ psa_status_t psa_generate_key_internal(const psa_key_attributes_t *attributes,
  *  \param[in] attributes                The desired attributes of the generated key.
  *
  *  \retval #PSA_SUCCESS
- *         The operation started successfully - call \c mbedtls_psa_generate_key_complete()
+ *         The operation started successfully - call \c mbedtls_psa_generate_key_iop_complete()
  *         with the same operation to complete the operation.
  * * \retval #PSA_ERROR_NOT_SUPPORTED
  *           Either no internal interruptible operations are
@@ -479,7 +479,7 @@ psa_status_t mbedtls_psa_generate_key_iop_setup(
  * \retval #PSA_ERROR_INSUFFICIENT_MEMORY \emptydescription
  *
  */
-psa_status_t mbedtls_psa_generate_key_complete(
+psa_status_t mbedtls_psa_generate_key_iop_complete(
     mbedtls_psa_generate_key_iop_t *operation,
     uint8_t *key_output,
     size_t key_output_size,
diff --git a/tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.c b/tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.c
index 57131d3413..cce993cf6e 100644
--- a/tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.c
+++ b/tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.c
@@ -617,7 +617,7 @@ psa_status_t mbedtls_psa_generate_key_iop_setup(
     return mbedtls_to_psa_error(status);
 }
 
-psa_status_t mbedtls_psa_generate_key_complete(
+psa_status_t mbedtls_psa_generate_key_iop_complete(
     mbedtls_psa_generate_key_iop_t *operation,
     uint8_t *key_output,
     size_t key_output_size,