diff --git a/library/psa_crypto_mac.c b/library/psa_crypto_mac.c
index 5a7bc2c..5ea2f17 100644
--- a/library/psa_crypto_mac.c
+++ b/library/psa_crypto_mac.c
@@ -69,13 +69,13 @@
     }
 }
 
-psa_status_t psa_hmac_abort_internal( psa_hmac_internal_data *hmac )
+psa_status_t psa_hmac_abort_internal( psa_hmac_internal_data_t *hmac )
 {
     mbedtls_platform_zeroize( hmac->opad, sizeof( hmac->opad ) );
     return( psa_hash_abort( &hmac->hash_ctx ) );
 }
 
-psa_status_t psa_hmac_setup_internal( psa_hmac_internal_data *hmac,
+psa_status_t psa_hmac_setup_internal( psa_hmac_internal_data_t *hmac,
                                       const uint8_t *key,
                                       size_t key_length,
                                       psa_algorithm_t hash_alg )
@@ -139,14 +139,14 @@
     return( status );
 }
 
-psa_status_t psa_hmac_update_internal( psa_hmac_internal_data *hmac,
+psa_status_t psa_hmac_update_internal( psa_hmac_internal_data_t *hmac,
                                        const uint8_t *data,
                                        size_t data_length )
 {
     return( psa_hash_update( &hmac->hash_ctx, data, data_length ) );
 }
 
-psa_status_t psa_hmac_finish_internal( psa_hmac_internal_data *hmac,
+psa_status_t psa_hmac_finish_internal( psa_hmac_internal_data_t *hmac,
                                        uint8_t *mac,
                                        size_t mac_size )
 {
@@ -184,8 +184,8 @@
     return( status );
 }
 
-psa_status_t psa_hmac_clone_internal( const psa_hmac_internal_data *source,
-                                      psa_hmac_internal_data *destination )
+psa_status_t psa_hmac_clone_internal( const psa_hmac_internal_data_t *source,
+                                      psa_hmac_internal_data_t *destination )
 {
     psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;