diff --git a/interface/src/tfm_crypto_api.c b/interface/src/tfm_crypto_api.c
index 92d47d1..a4cddbf 100644
--- a/interface/src/tfm_crypto_api.c
+++ b/interface/src/tfm_crypto_api.c
@@ -61,7 +61,7 @@
 {
     psa_status_t status;
     const struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_ALLOCATE_KEY_SFID,
+        .sfn_id = TFM_CRYPTO_ALLOCATE_KEY_SID,
     };
     psa_invec in_vec[] = {
         {.base = &iov, .len = sizeof(struct tfm_crypto_pack_iovec)},
@@ -122,7 +122,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_IMPORT_KEY_SFID,
+        .sfn_id = TFM_CRYPTO_IMPORT_KEY_SID,
         .key_handle = handle,
         .type = type,
     };
@@ -148,7 +148,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_DESTROY_KEY_SFID,
+        .sfn_id = TFM_CRYPTO_DESTROY_KEY_SID,
         .key_handle = handle,
     };
     psa_invec in_vec[] = {
@@ -174,7 +174,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_GET_KEY_INFORMATION_SFID,
+        .sfn_id = TFM_CRYPTO_GET_KEY_INFORMATION_SID,
         .key_handle = handle,
     };
     psa_invec in_vec[] = {
@@ -205,7 +205,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_EXPORT_KEY_SFID,
+        .sfn_id = TFM_CRYPTO_EXPORT_KEY_SID,
         .key_handle = handle,
     };
     psa_invec in_vec[] = {
@@ -238,7 +238,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_EXPORT_PUBLIC_KEY_SFID,
+        .sfn_id = TFM_CRYPTO_EXPORT_PUBLIC_KEY_SID,
         .key_handle = handle,
     };
 
@@ -271,7 +271,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_COPY_KEY_SFID,
+        .sfn_id = TFM_CRYPTO_COPY_KEY_SID,
         .key_handle = source_handle,
     };
 
@@ -317,7 +317,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_SET_KEY_POLICY_SFID,
+        .sfn_id = TFM_CRYPTO_SET_KEY_POLICY_SID,
         .key_handle = handle,
     };
 
@@ -344,7 +344,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_GET_KEY_POLICY_SFID,
+        .sfn_id = TFM_CRYPTO_GET_KEY_POLICY_SID,
         .key_handle = handle,
     };
 
@@ -373,7 +373,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_GET_KEY_LIFETIME_SFID,
+        .sfn_id = TFM_CRYPTO_GET_KEY_LIFETIME_SID,
         .key_handle = handle,
     };
 
@@ -404,7 +404,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_CIPHER_GENERATE_IV_SFID,
+        .sfn_id = TFM_CRYPTO_CIPHER_GENERATE_IV_SID,
         .op_handle = operation->handle,
     };
 
@@ -438,7 +438,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_CIPHER_SET_IV_SFID,
+        .sfn_id = TFM_CRYPTO_CIPHER_SET_IV_SID,
         .op_handle = operation->handle,
     };
 
@@ -469,7 +469,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_CIPHER_ENCRYPT_SETUP_SFID,
+        .sfn_id = TFM_CRYPTO_CIPHER_ENCRYPT_SETUP_SID,
         .key_handle = handle,
         .alg = alg,
         .op_handle = operation->handle,
@@ -501,7 +501,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_CIPHER_DECRYPT_SETUP_SFID,
+        .sfn_id = TFM_CRYPTO_CIPHER_DECRYPT_SETUP_SID,
         .key_handle = handle,
         .alg = alg,
         .op_handle = operation->handle,
@@ -536,7 +536,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_CIPHER_UPDATE_SFID,
+        .sfn_id = TFM_CRYPTO_CIPHER_UPDATE_SID,
         .op_handle = operation->handle,
     };
 
@@ -569,7 +569,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_CIPHER_ABORT_SFID,
+        .sfn_id = TFM_CRYPTO_CIPHER_ABORT_SID,
         .op_handle = operation->handle,
     };
 
@@ -600,7 +600,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_CIPHER_FINISH_SFID,
+        .sfn_id = TFM_CRYPTO_CIPHER_FINISH_SID,
         .op_handle = operation->handle,
     };
 
@@ -633,7 +633,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_HASH_SETUP_SFID,
+        .sfn_id = TFM_CRYPTO_HASH_SETUP_SID,
         .alg = alg,
         .op_handle = operation->handle,
     };
@@ -665,7 +665,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_HASH_UPDATE_SFID,
+        .sfn_id = TFM_CRYPTO_HASH_UPDATE_SID,
         .op_handle = operation->handle,
     };
 
@@ -698,7 +698,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_HASH_FINISH_SFID,
+        .sfn_id = TFM_CRYPTO_HASH_FINISH_SID,
         .op_handle = operation->handle,
     };
 
@@ -732,7 +732,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_HASH_VERIFY_SFID,
+        .sfn_id = TFM_CRYPTO_HASH_VERIFY_SID,
         .op_handle = operation->handle,
     };
 
@@ -761,7 +761,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_HASH_ABORT_SFID,
+        .sfn_id = TFM_CRYPTO_HASH_ABORT_SID,
         .op_handle = operation->handle,
     };
 
@@ -790,7 +790,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_HASH_CLONE_SFID,
+        .sfn_id = TFM_CRYPTO_HASH_CLONE_SID,
         .op_handle = source_operation->handle,
     };
 
@@ -820,7 +820,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_MAC_SIGN_SETUP_SFID,
+        .sfn_id = TFM_CRYPTO_MAC_SIGN_SETUP_SID,
         .key_handle = handle,
         .alg = alg,
         .op_handle = operation->handle,
@@ -852,7 +852,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_MAC_VERIFY_SETUP_SFID,
+        .sfn_id = TFM_CRYPTO_MAC_VERIFY_SETUP_SID,
         .key_handle = handle,
         .alg = alg,
         .op_handle = operation->handle,
@@ -884,7 +884,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_MAC_UPDATE_SFID,
+        .sfn_id = TFM_CRYPTO_MAC_UPDATE_SID,
         .op_handle = operation->handle,
     };
 
@@ -916,7 +916,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_MAC_SIGN_FINISH_SFID,
+        .sfn_id = TFM_CRYPTO_MAC_SIGN_FINISH_SID,
         .op_handle = operation->handle,
     };
 
@@ -950,7 +950,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_MAC_VERIFY_FINISH_SFID,
+        .sfn_id = TFM_CRYPTO_MAC_VERIFY_FINISH_SID,
         .op_handle = operation->handle,
     };
 
@@ -980,7 +980,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_MAC_ABORT_SFID,
+        .sfn_id = TFM_CRYPTO_MAC_ABORT_SID,
         .op_handle = operation->handle,
     };
 
@@ -1018,7 +1018,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_AEAD_ENCRYPT_SFID,
+        .sfn_id = TFM_CRYPTO_AEAD_ENCRYPT_SID,
         .key_handle = handle,
         .alg = alg,
         .aead_in = {.nonce = {0}, .nonce_length = nonce_length}
@@ -1088,7 +1088,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_AEAD_DECRYPT_SFID,
+        .sfn_id = TFM_CRYPTO_AEAD_DECRYPT_SID,
         .key_handle = handle,
         .alg = alg,
         .aead_in = {.nonce = {0}, .nonce_length = nonce_length}
@@ -1154,7 +1154,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_ASYMMETRIC_SIGN_SFID,
+        .sfn_id = TFM_CRYPTO_ASYMMETRIC_SIGN_SID,
         .key_handle = handle,
         .alg = alg,
     };
@@ -1192,7 +1192,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_ASYMMETRIC_VERIFY_SFID,
+        .sfn_id = TFM_CRYPTO_ASYMMETRIC_VERIFY_SID,
         .key_handle = handle,
         .alg = alg
     };
@@ -1228,7 +1228,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_ASYMMETRIC_ENCRYPT_SFID,
+        .sfn_id = TFM_CRYPTO_ASYMMETRIC_ENCRYPT_SID,
         .key_handle = handle,
         .alg = alg
     };
@@ -1285,7 +1285,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_ASYMMETRIC_DECRYPT_SFID,
+        .sfn_id = TFM_CRYPTO_ASYMMETRIC_DECRYPT_SID,
         .key_handle = handle,
         .alg = alg
     };
@@ -1335,7 +1335,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_GET_GENERATOR_CAPACITY_SFID,
+        .sfn_id = TFM_CRYPTO_GET_GENERATOR_CAPACITY_SID,
         .op_handle = generator->handle,
     };
 
@@ -1366,7 +1366,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_GENERATOR_READ_SFID,
+        .sfn_id = TFM_CRYPTO_GENERATOR_READ_SID,
         .op_handle = generator->handle,
     };
 
@@ -1398,7 +1398,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_GENERATOR_IMPORT_KEY_SFID,
+        .sfn_id = TFM_CRYPTO_GENERATOR_IMPORT_KEY_SID,
         .key_handle = handle,
         .type = type,
         .op_handle = generator->handle,
@@ -1426,7 +1426,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_GENERATOR_ABORT_SFID,
+        .sfn_id = TFM_CRYPTO_GENERATOR_ABORT_SID,
         .op_handle = generator->handle,
     };
 
@@ -1462,7 +1462,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_KEY_DERIVATION_SFID,
+        .sfn_id = TFM_CRYPTO_KEY_DERIVATION_SID,
         .key_handle = handle,
         .alg = alg,
         .op_handle = generator->handle,
@@ -1522,7 +1522,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_KEY_AGREEMENT_SFID,
+        .sfn_id = TFM_CRYPTO_KEY_AGREEMENT_SID,
         .key_handle = private_key,
         .alg = alg,
         .op_handle = generator->handle,
@@ -1556,7 +1556,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_GENERATE_RANDOM_SFID,
+        .sfn_id = TFM_CRYPTO_GENERATE_RANDOM_SID,
     };
 
     psa_invec in_vec[] = {
@@ -1593,7 +1593,7 @@
 {
     psa_status_t status;
     struct tfm_crypto_pack_iovec iov = {
-        .sfn_id = TFM_CRYPTO_GENERATE_KEY_SFID,
+        .sfn_id = TFM_CRYPTO_GENERATE_KEY_SID,
         .key_handle = handle,
         .type = type,
     };