diff --git a/src/exchange-lib/exchange_api_handle.c b/src/exchange-lib/exchange_api_handle.c
index aaca8bac1..c3dd0d4cb 100644
--- a/src/exchange-lib/exchange_api_handle.c
+++ b/src/exchange-lib/exchange_api_handle.c
@@ -260,7 +260,7 @@ parse_json_denomkey (struct TALER_EXCHANGE_DenomPublicKey *denom_key,
   struct TALER_Amount fee_deposit;
   struct TALER_Amount fee_refresh;
   struct TALER_DenominationKeyValidityPS denom_key_issue;
-  struct GNUNET_CRYPTO_rsa_PublicKey *pk;
+  struct GNUNET_CRYPTO_RsaPublicKey *pk;
   struct GNUNET_CRYPTO_EddsaSignature sig;
 
   struct GNUNET_JSON_Specification spec[] = {
diff --git a/src/exchange-lib/exchange_api_refresh.c b/src/exchange-lib/exchange_api_refresh.c
index 2949cf1e8..5cdf059b7 100644
--- a/src/exchange-lib/exchange_api_refresh.c
+++ b/src/exchange-lib/exchange_api_refresh.c
@@ -1762,8 +1762,8 @@ refresh_reveal_ok (struct TALER_EXCHANGE_RefreshRevealHandle *rrh,
     const struct FreshCoin *fc;
     struct TALER_DenominationPublicKey *pk;
     json_t *jsonai;
-    struct GNUNET_CRYPTO_rsa_Signature *blind_sig;
-    struct GNUNET_CRYPTO_rsa_Signature *sig;
+    struct GNUNET_CRYPTO_RsaSignature *blind_sig;
+    struct GNUNET_CRYPTO_RsaSignature *sig;
     struct TALER_CoinSpendPublicKeyP coin_pub;
     struct GNUNET_HashCode coin_hash;
 
diff --git a/src/exchange-lib/exchange_api_refresh_link.c b/src/exchange-lib/exchange_api_refresh_link.c
index 41d421f58..8bb40d7f4 100644
--- a/src/exchange-lib/exchange_api_refresh_link.c
+++ b/src/exchange-lib/exchange_api_refresh_link.c
@@ -98,8 +98,8 @@ parse_refresh_link_coin (const struct TALER_EXCHANGE_RefreshLinkHandle *rlh,
 {
   void *link_enc;
   size_t link_enc_size;
-  struct GNUNET_CRYPTO_rsa_Signature *bsig;
-  struct GNUNET_CRYPTO_rsa_PublicKey *rpub;
+  struct GNUNET_CRYPTO_RsaSignature *bsig;
+  struct GNUNET_CRYPTO_RsaPublicKey *rpub;
   struct GNUNET_JSON_Specification spec[] = {
     GNUNET_JSON_spec_varsize ("link_enc", &link_enc, &link_enc_size),
     GNUNET_JSON_spec_rsa_public_key ("denom_pub", &rpub),
diff --git a/src/exchange-lib/exchange_api_reserve.c b/src/exchange-lib/exchange_api_reserve.c
index 87d7b37f2..8c3663244 100644
--- a/src/exchange-lib/exchange_api_reserve.c
+++ b/src/exchange-lib/exchange_api_reserve.c
@@ -563,8 +563,8 @@ static int
 reserve_withdraw_ok (struct TALER_EXCHANGE_ReserveWithdrawHandle *wsh,
                   json_t *json)
 {
-  struct GNUNET_CRYPTO_rsa_Signature *blind_sig;
-  struct GNUNET_CRYPTO_rsa_Signature *sig;
+  struct GNUNET_CRYPTO_RsaSignature *blind_sig;
+  struct GNUNET_CRYPTO_RsaSignature *sig;
   struct TALER_DenominationSignature dsig;
   struct GNUNET_JSON_Specification spec[] = {
     GNUNET_JSON_spec_rsa_signature ("ev_sig", &blind_sig),
diff --git a/src/exchange/taler-exchange-httpd_test.c b/src/exchange/taler-exchange-httpd_test.c
index 0a4181ed8..3fc8f473b 100644
--- a/src/exchange/taler-exchange-httpd_test.c
+++ b/src/exchange/taler-exchange-httpd_test.c
@@ -33,7 +33,7 @@
 /**
  * Private key the test module uses for signing.
  */
-static struct GNUNET_CRYPTO_rsa_PrivateKey *rsa_pk;
+static struct GNUNET_CRYPTO_RsaPrivateKey *rsa_pk;
 
 
 /**
@@ -415,7 +415,7 @@ TMH_TEST_handler_test_rsa_get (struct TMH_RequestHandler *rh,
                                size_t *upload_data_size)
 {
   int res;
-  struct GNUNET_CRYPTO_rsa_PublicKey *pub;
+  struct GNUNET_CRYPTO_RsaPublicKey *pub;
 
   if (NULL == rsa_pk)
     rsa_pk = GNUNET_CRYPTO_rsa_private_key_create (1024);
@@ -463,7 +463,7 @@ TMH_TEST_handler_test_rsa_sign (struct TMH_RequestHandler *rh,
 {
   json_t *json;
   int res;
-  struct GNUNET_CRYPTO_rsa_Signature *sig;
+  struct GNUNET_CRYPTO_RsaSignature *sig;
   void *in_ptr;
   size_t in_ptr_size;
   struct GNUNET_JSON_Specification spec[] = {
diff --git a/src/exchangedb/exchangedb_keyio.c b/src/exchangedb/exchangedb_keyio.c
index 6b8ca24e3..177af2a04 100644
--- a/src/exchangedb/exchangedb_keyio.c
+++ b/src/exchangedb/exchangedb_keyio.c
@@ -128,7 +128,7 @@ TALER_EXCHANGEDB_denomination_key_read (const char *filename,
   uint64_t size;
   size_t offset;
   void *data;
-  struct GNUNET_CRYPTO_rsa_PrivateKey *priv;
+  struct GNUNET_CRYPTO_RsaPrivateKey *priv;
 
   if (GNUNET_OK != GNUNET_DISK_file_size (filename,
                                           &size,
diff --git a/src/exchangedb/plugin_exchangedb_postgres.c b/src/exchangedb/plugin_exchangedb_postgres.c
index 0395c208e..bcd6b9a0c 100644
--- a/src/exchangedb/plugin_exchangedb_postgres.c
+++ b/src/exchangedb/plugin_exchangedb_postgres.c
@@ -3457,8 +3457,8 @@ postgres_get_link_data_list (void *cls,
   for (i = 0; i < nrows; i++)
   {
     struct TALER_RefreshLinkEncrypted *link_enc;
-    struct GNUNET_CRYPTO_rsa_PublicKey *denom_pub;
-    struct GNUNET_CRYPTO_rsa_Signature *sig;
+    struct GNUNET_CRYPTO_RsaPublicKey *denom_pub;
+    struct GNUNET_CRYPTO_RsaSignature *sig;
     void *ld_buf;
     size_t ld_buf_size;
     struct GNUNET_PQ_ResultSpec rs[] = {
diff --git a/src/include/taler_crypto_lib.h b/src/include/taler_crypto_lib.h
index e948fa28a..a3275b74d 100644
--- a/src/include/taler_crypto_lib.h
+++ b/src/include/taler_crypto_lib.h
@@ -299,7 +299,7 @@ struct TALER_DenominationSignature
   /**
    * Taler uses RSA for blinding.
    */
-  struct GNUNET_CRYPTO_rsa_Signature *rsa_signature;
+  struct GNUNET_CRYPTO_RsaSignature *rsa_signature;
 };
 
 
@@ -311,7 +311,7 @@ struct TALER_DenominationPublicKey
   /**
    * Taler uses RSA for signing coins.
    */
-  struct GNUNET_CRYPTO_rsa_PublicKey *rsa_public_key;
+  struct GNUNET_CRYPTO_RsaPublicKey *rsa_public_key;
 };
 
 
@@ -323,7 +323,7 @@ struct TALER_DenominationPrivateKey
   /**
    * Taler uses RSA for signing coins.
    */
-  struct GNUNET_CRYPTO_rsa_PrivateKey *rsa_private_key;
+  struct GNUNET_CRYPTO_RsaPrivateKey *rsa_private_key;
 };