diff --git a/tf-psa-crypto/core/psa_crypto_core.h b/tf-psa-crypto/core/psa_crypto_core.h
index 866f6cf..e7ff151 100644
--- a/tf-psa-crypto/core/psa_crypto_core.h
+++ b/tf-psa-crypto/core/psa_crypto_core.h
@@ -365,8 +365,7 @@
  * \param[in]  attributes         The attributes for the key to generate.
  * \param[in] custom              Custom parameters for the key generation.
  * \param[in] custom_data         Variable-length data associated with \c custom.
- * \param custom_data_length
- *                                Length of `custom_data` in bytes.
+ * \param custom_data_length      Length of `custom_data` in bytes.
  * \param[out] key_buffer         Buffer where the key data is to be written.
  * \param[in]  key_buffer_size    Size of \p key_buffer in bytes.
  * \param[out] key_buffer_length  On success, the number of bytes written in
diff --git a/tf-psa-crypto/core/psa_crypto_rsa.h b/tf-psa-crypto/core/psa_crypto_rsa.h
index 134844b..1a78000 100644
--- a/tf-psa-crypto/core/psa_crypto_rsa.h
+++ b/tf-psa-crypto/core/psa_crypto_rsa.h
@@ -106,7 +106,7 @@
  * \brief Generate an RSA key.
  *
  * \param[in]  attributes         The attributes for the RSA key to generate.
- * \param[in]  custom             The public exponent to use.
+ * \param[in]  custom_data        The public exponent to use.
  *                                This can be a null pointer if
  *                                \c params_data_length is 0.
  * \param custom_data_length      Length of \p custom_data in bytes.
@@ -126,7 +126,7 @@
  */
 psa_status_t mbedtls_psa_rsa_generate_key(
     const psa_key_attributes_t *attributes,
-    const uint8_t *custom, size_t custom_data_length,
+    const uint8_t *custom_data, size_t custom_data_length,
     uint8_t *key_buffer, size_t key_buffer_size, size_t *key_buffer_length);
 
 /** Sign an already-calculated hash with an RSA private key.
diff --git a/tf-psa-crypto/include/psa/crypto_struct.h b/tf-psa-crypto/include/psa/crypto_struct.h
index 08825f8..866f7e3 100644
--- a/tf-psa-crypto/include/psa/crypto_struct.h
+++ b/tf-psa-crypto/include/psa/crypto_struct.h
@@ -245,7 +245,7 @@
  */
 /* This is a deprecated variant of `struct psa_custom_key_parameters_s`.
  * It has exactly the same layout, plus an extra field which is a flexible
- * array members. Thus a `const struct psa_key_production_parameters_s*`
+ * array member. Thus a `const struct psa_key_production_parameters_s*`
  * can be passed to any function that reads a
  * `const struct psa_custom_key_parameters_s*`.
  */