diff --git a/library/psa_crypto_storage_its.c b/library/psa_crypto_storage_its.c
index 1c7e171..1873c69 100644
--- a/library/psa_crypto_storage_its.c
+++ b/library/psa_crypto_storage_its.c
@@ -67,7 +67,7 @@
     }
 }
 
-static uint32_t psa_its_identifier_of_slot( psa_key_id_t key )
+static psa_its_uid_t psa_its_identifier_of_slot( psa_key_id_t key )
 {
     return( key );
 }
@@ -77,7 +77,7 @@
 {
     psa_its_status_t ret;
     psa_status_t status;
-    uint32_t data_identifier = psa_its_identifier_of_slot( key );
+    psa_its_uid_t data_identifier = psa_its_identifier_of_slot( key );
     struct psa_its_info_t data_identifier_info;
 
     ret = psa_its_get_info( data_identifier, &data_identifier_info );
@@ -94,7 +94,7 @@
 int psa_is_key_present_in_storage( const psa_key_id_t key )
 {
     psa_its_status_t ret;
-    uint32_t data_identifier = psa_its_identifier_of_slot( key );
+    psa_its_uid_t data_identifier = psa_its_identifier_of_slot( key );
     struct psa_its_info_t data_identifier_info;
 
     ret = psa_its_get_info( data_identifier, &data_identifier_info );
@@ -110,7 +110,7 @@
 {
     psa_its_status_t ret;
     psa_status_t status;
-    uint32_t data_identifier = psa_its_identifier_of_slot( key );
+    psa_its_uid_t data_identifier = psa_its_identifier_of_slot( key );
     struct psa_its_info_t data_identifier_info;
 
     if( psa_is_key_present_in_storage( key ) == 1 )
@@ -145,7 +145,7 @@
 psa_status_t psa_destroy_persistent_key( const psa_key_id_t key )
 {
     psa_its_status_t ret;
-    uint32_t data_identifier = psa_its_identifier_of_slot( key );
+    psa_its_uid_t data_identifier = psa_its_identifier_of_slot( key );
     struct psa_its_info_t data_identifier_info;
 
     ret = psa_its_get_info( data_identifier, &data_identifier_info );
@@ -167,7 +167,7 @@
 {
     psa_its_status_t ret;
     psa_status_t status;
-    uint32_t data_identifier = psa_its_identifier_of_slot( key );
+    psa_its_uid_t data_identifier = psa_its_identifier_of_slot( key );
     struct psa_its_info_t data_identifier_info;
 
     ret = psa_its_get_info( data_identifier, &data_identifier_info );