Rename psa_generate_key() and psa_generator_import_key()
diff --git a/include/psa/crypto_extra.h b/include/psa/crypto_extra.h
index f2cf051..216039c 100644
--- a/include/psa/crypto_extra.h
+++ b/include/psa/crypto_extra.h
@@ -430,12 +430,12 @@
                           psa_key_handle_t target_handle,
                           const psa_key_policy_t *constraint);
 
-psa_status_t psa_generator_import_key_to_handle(psa_key_handle_t handle,
+psa_status_t psa_generate_derived_key_to_handle(psa_key_handle_t handle,
                                       psa_key_type_t type,
                                       size_t bits,
                                       psa_crypto_generator_t *generator);
 
-psa_status_t psa_generate_key_to_handle(psa_key_handle_t handle,
+psa_status_t psa_generate_random_key_to_handle(psa_key_handle_t handle,
                               psa_key_type_t type,
                               size_t bits,
                               const void *extra,