diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 7188b12..fe0114f 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -1226,9 +1226,9 @@
         return status;
     }
 
-    attributes->core = slot->attr;
-    attributes->core.flags &= (MBEDTLS_PSA_KA_MASK_EXTERNAL_ONLY |
-                               MBEDTLS_PSA_KA_MASK_DUAL_USE);
+    *attributes = slot->attr;
+    attributes->flags &= (MBEDTLS_PSA_KA_MASK_EXTERNAL_ONLY |
+                          MBEDTLS_PSA_KA_MASK_DUAL_USE);
 
 #if defined(MBEDTLS_PSA_CRYPTO_SE_C)
     if (psa_get_se_driver_entry(slot->attr.lifetime) != NULL) {
@@ -1325,7 +1325,7 @@
     }
 
     psa_key_attributes_t attributes = {
-        .core = slot->attr
+        .core = slot->attr.core
     };
     status = psa_driver_wrapper_export_key(&attributes,
                                            slot->key.data, slot->key.bytes,
@@ -1438,7 +1438,7 @@
     }
 
     attributes = (psa_key_attributes_t) {
-        .core = slot->attr
+        .core = slot->attr.core
     };
     status = psa_driver_wrapper_export_public_key(
         &attributes, slot->key.data, slot->key.bytes,
@@ -1617,7 +1617,7 @@
      * volatile key identifier associated to the slot returned to contain its
      * definition. */
 
-    slot->attr = attributes->core;
+    slot->attr = *attributes;
     if (PSA_KEY_LIFETIME_IS_VOLATILE(slot->attr.lifetime)) {
 #if !defined(MBEDTLS_PSA_CRYPTO_KEY_ID_ENCODES_OWNER)
         slot->attr.id = volatile_key_id;
@@ -2390,7 +2390,7 @@
     }
 
     attributes = (psa_key_attributes_t) {
-        .core = slot->attr
+        .core = slot->attr.core
     };
 
     status = psa_mac_finalize_alg_and_key_validation(alg, &attributes,
@@ -2571,7 +2571,7 @@
     }
 
     attributes = (psa_key_attributes_t) {
-        .core = slot->attr
+        .core = slot->attr.core
     };
 
     status = psa_mac_finalize_alg_and_key_validation(alg, &attributes,
@@ -2729,7 +2729,7 @@
     }
 
     attributes = (psa_key_attributes_t) {
-        .core = slot->attr
+        .core = slot->attr.core
     };
 
     if (input_is_message) {
@@ -2783,7 +2783,7 @@
     }
 
     psa_key_attributes_t attributes = {
-        .core = slot->attr
+        .core = slot->attr.core
     };
 
     if (input_is_message) {
@@ -3057,7 +3057,7 @@
     }
 
     attributes = (psa_key_attributes_t) {
-        .core = slot->attr
+        .core = slot->attr.core
     };
 
     status = psa_driver_wrapper_asymmetric_encrypt(
@@ -3108,7 +3108,7 @@
     }
 
     attributes = (psa_key_attributes_t) {
-        .core = slot->attr
+        .core = slot->attr.core
     };
 
     status = psa_driver_wrapper_asymmetric_decrypt(
@@ -3209,7 +3209,7 @@
     }
 
     attributes = (psa_key_attributes_t) {
-        .core = slot->attr
+        .core = slot->attr.core
     };
 
     /* Ensure ops count gets reset, in case of operation re-use. */
@@ -3354,7 +3354,7 @@
     }
 
     psa_key_attributes_t attributes = {
-        .core = slot->attr
+        .core = slot->attr.core
     };
 
     /* Ensure ops count gets reset, in case of operation re-use. */
@@ -3920,7 +3920,7 @@
     operation->default_iv_length = PSA_CIPHER_IV_LENGTH(slot->attr.type, alg);
 
     attributes = (psa_key_attributes_t) {
-        .core = slot->attr
+        .core = slot->attr.core
     };
 
     /* Try doing the operation through a driver before using software fallback. */
@@ -4160,7 +4160,7 @@
     }
 
     attributes = (psa_key_attributes_t) {
-        .core = slot->attr
+        .core = slot->attr.core
     };
 
     default_iv_length = PSA_CIPHER_IV_LENGTH(slot->attr.type, alg);
@@ -4231,7 +4231,7 @@
     }
 
     attributes = (psa_key_attributes_t) {
-        .core = slot->attr
+        .core = slot->attr.core
     };
 
     if (alg == PSA_ALG_CCM_STAR_NO_TAG &&
@@ -4354,7 +4354,7 @@
     }
 
     psa_key_attributes_t attributes = {
-        .core = slot->attr
+        .core = slot->attr.core
     };
 
     status = psa_aead_check_nonce_length(alg, nonce_length);
@@ -4409,7 +4409,7 @@
     }
 
     psa_key_attributes_t attributes = {
-        .core = slot->attr
+        .core = slot->attr.core
     };
 
     status = psa_aead_check_nonce_length(alg, nonce_length);
@@ -4515,7 +4515,7 @@
     }
 
     attributes = (psa_key_attributes_t) {
-        .core = slot->attr
+        .core = slot->attr.core
     };
 
     if ((status = psa_validate_tag_length(alg)) != PSA_SUCCESS) {
@@ -5892,7 +5892,7 @@
 
     slot->attr.bits = (psa_key_bits_t) bits;
     attributes = (psa_key_attributes_t) {
-        .core = slot->attr
+        .core = slot->attr.core
     };
 
     if (psa_key_lifetime_is_external(attributes.core.lifetime)) {
@@ -7024,7 +7024,7 @@
     }
 
     psa_key_attributes_t attributes = {
-        .core = private_key->attr
+        .core = private_key->attr.core
     };
 
     return psa_driver_wrapper_key_agreement(&attributes,
@@ -7839,7 +7839,7 @@
     }
 
     attributes = (psa_key_attributes_t) {
-        .core = slot->attr
+        .core = slot->attr.core
     };
 
     type = psa_get_key_type(&attributes);
@@ -7858,7 +7858,8 @@
 
     memcpy(operation->data.inputs.password, slot->key.data, slot->key.bytes);
     operation->data.inputs.password_len = slot->key.bytes;
-    operation->data.inputs.attributes = attributes;
+    operation->data.inputs.attributes = slot->attr;
+
 exit:
     if (status != PSA_SUCCESS) {
         psa_pake_abort(operation);
diff --git a/library/psa_crypto_core.h b/library/psa_crypto_core.h
index afa8659..02c485e 100644
--- a/library/psa_crypto_core.h
+++ b/library/psa_crypto_core.h
@@ -59,7 +59,7 @@
  * and metadata for one key.
  */
 typedef struct {
-    psa_core_key_attributes_t attr;
+    psa_key_attributes_t attr;
 
     /*
      * The current state of the key slot, as described in
diff --git a/library/psa_crypto_slot_management.c b/library/psa_crypto_slot_management.c
index b2a3c7e..5dee32f 100644
--- a/library/psa_crypto_slot_management.c
+++ b/library/psa_crypto_slot_management.c
@@ -329,7 +329,7 @@
 
     /* Copy actual key length and core attributes into the slot on success */
     slot->key.bytes = key_buffer_length;
-    slot->attr = attributes.core;
+    slot->attr = attributes;
 exit:
     if (status != PSA_SUCCESS) {
         psa_remove_key_data_from_memory(slot);
diff --git a/library/psa_crypto_storage.c b/library/psa_crypto_storage.c
index 13a3c8a..7d1317b 100644
--- a/library/psa_crypto_storage.c
+++ b/library/psa_crypto_storage.c
@@ -235,7 +235,7 @@
 
 void psa_format_key_data_for_storage(const uint8_t *data,
                                      const size_t data_length,
-                                     const psa_core_key_attributes_t *attr,
+                                     const psa_key_attributes_t *attr,
                                      uint8_t *storage_data)
 {
     psa_persistent_key_storage_format *storage_format =
@@ -267,7 +267,7 @@
                                              size_t storage_data_length,
                                              uint8_t **key_data,
                                              size_t *key_data_length,
-                                             psa_core_key_attributes_t *attr)
+                                             psa_key_attributes_t *attr)
 {
     psa_status_t status;
     const psa_persistent_key_storage_format *storage_format =
@@ -314,7 +314,7 @@
     return PSA_SUCCESS;
 }
 
-psa_status_t psa_save_persistent_key(const psa_core_key_attributes_t *attr,
+psa_status_t psa_save_persistent_key(const psa_key_attributes_t *attr,
                                      const uint8_t *data,
                                      const size_t data_length)
 {
@@ -352,7 +352,7 @@
     mbedtls_zeroize_and_free(key_data, key_data_length);
 }
 
-psa_status_t psa_load_persistent_key(psa_core_key_attributes_t *attr,
+psa_status_t psa_load_persistent_key(psa_key_attributes_t *attr,
                                      uint8_t **data,
                                      size_t *data_length)
 {
diff --git a/library/psa_crypto_storage.h b/library/psa_crypto_storage.h
index b6b5e15..f1ea265 100644
--- a/library/psa_crypto_storage.h
+++ b/library/psa_crypto_storage.h
@@ -93,7 +93,7 @@
  * \retval #PSA_ERROR_DATA_INVALID \emptydescription
  * \retval #PSA_ERROR_DATA_CORRUPT \emptydescription
  */
-psa_status_t psa_save_persistent_key(const psa_core_key_attributes_t *attr,
+psa_status_t psa_save_persistent_key(const psa_key_attributes_t *attr,
                                      const uint8_t *data,
                                      const size_t data_length);
 
@@ -123,7 +123,7 @@
  * \retval #PSA_ERROR_DATA_CORRUPT \emptydescription
  * \retval #PSA_ERROR_DOES_NOT_EXIST \emptydescription
  */
-psa_status_t psa_load_persistent_key(psa_core_key_attributes_t *attr,
+psa_status_t psa_load_persistent_key(psa_key_attributes_t *attr,
                                      uint8_t **data,
                                      size_t *data_length);
 
@@ -163,7 +163,7 @@
  */
 void psa_format_key_data_for_storage(const uint8_t *data,
                                      const size_t data_length,
-                                     const psa_core_key_attributes_t *attr,
+                                     const psa_key_attributes_t *attr,
                                      uint8_t *storage_data);
 
 /**
@@ -186,7 +186,7 @@
                                              size_t storage_data_length,
                                              uint8_t **key_data,
                                              size_t *key_data_length,
-                                             psa_core_key_attributes_t *attr);
+                                             psa_key_attributes_t *attr);
 
 #if defined(MBEDTLS_PSA_CRYPTO_SE_C)
 /** This symbol is defined if transaction support is required. */