diff --git a/library/psa_crypto_cipher.h b/library/psa_crypto_cipher.h
index 3a58a81..127f18c 100644
--- a/library/psa_crypto_cipher.h
+++ b/library/psa_crypto_cipher.h
@@ -48,7 +48,7 @@
  * \retval #PSA_ERROR_CORRUPTION_DETECTED
  */
 psa_status_t mbedtls_psa_cipher_encrypt_setup(
-    psa_cipher_operation_t *operation,
+    mbedtls_psa_cipher_operation_t *operation,
     const psa_key_attributes_t *attributes,
     const uint8_t *key_buffer, size_t key_buffer_size,
     psa_algorithm_t alg );
@@ -78,7 +78,7 @@
  * \retval #PSA_ERROR_CORRUPTION_DETECTED
  */
 psa_status_t mbedtls_psa_cipher_decrypt_setup(
-    psa_cipher_operation_t *operation,
+    mbedtls_psa_cipher_operation_t *operation,
     const psa_key_attributes_t *attributes,
     const uint8_t *key_buffer, size_t key_buffer_size,
     psa_algorithm_t alg );
@@ -106,7 +106,7 @@
  * \retval #PSA_ERROR_INSUFFICIENT_MEMORY
  */
 psa_status_t mbedtls_psa_cipher_generate_iv(
-    psa_cipher_operation_t *operation,
+    mbedtls_psa_cipher_operation_t *operation,
     uint8_t *iv, size_t iv_size, size_t *iv_length );
 
 /** Set the IV for a symmetric encryption or decryption operation.
@@ -130,7 +130,7 @@
  * \retval #PSA_ERROR_INSUFFICIENT_MEMORY
  */
 psa_status_t mbedtls_psa_cipher_set_iv(
-    psa_cipher_operation_t *operation,
+    mbedtls_psa_cipher_operation_t *operation,
     const uint8_t *iv, size_t iv_length );
 
 /** Encrypt or decrypt a message fragment in an active cipher operation.
@@ -155,7 +155,7 @@
  * \retval #PSA_ERROR_INSUFFICIENT_MEMORY
  */
 psa_status_t mbedtls_psa_cipher_update(
-    psa_cipher_operation_t *operation,
+    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 );
 
@@ -186,7 +186,7 @@
  * \retval #PSA_ERROR_INSUFFICIENT_MEMORY
  */
 psa_status_t mbedtls_psa_cipher_finish(
-    psa_cipher_operation_t *operation,
+    mbedtls_psa_cipher_operation_t *operation,
     uint8_t *output, size_t output_size, size_t *output_length );
 
 /** Abort a cipher operation.
@@ -204,6 +204,6 @@
  *
  * \retval #PSA_SUCCESS
  */
-psa_status_t mbedtls_psa_cipher_abort( psa_cipher_operation_t *operation );
+psa_status_t mbedtls_psa_cipher_abort( mbedtls_psa_cipher_operation_t *operation );
 
 #endif /* PSA_CRYPTO_CIPHER_H */