rename fest, make symbols better match new endpoint names

8 files changed, 108 insertions, 132 deletions

diff --git a/src/lib/exchange_api_common.c b/src/lib/exchange_api_common.c
index ae02b3db2..d5f31b064 100644
--- a/src/lib/exchange_api_common.c
+++ b/src/lib/exchange_api_common.c
@@ -382,17 +382,17 @@ TALER_EXCHANGE_verify_coin_history (const struct
  * @return NULL on error (@a exchange_pub not known)
  */
 const struct TALER_EXCHANGE_SigningPublicKey *
-TALER_EXCHANGE_get_exchange_signing_key_info (const struct
-                                              TALER_EXCHANGE_Keys *keys,
-                                              const struct
-                                              TALER_ExchangePublicKeyP *
-                                              exchange_pub)
+TALER_EXCHANGE_get_signing_key_info (const struct
+                                     TALER_EXCHANGE_Keys *keys,
+                                     const struct
+                                     TALER_ExchangePublicKeyP *
+                                     exchange_pub)
 {
   for (unsigned int i = 0; i<keys->num_sign_keys; i++)
   {
-    const struct TALER_EXCHANGE_SigningPublicKey *spk;
+    const struct TALER_EXCHANGE_SigningPublicKey *spk
+      = &keys->sign_keys[i];
 
-    spk = &keys->sign_keys[i];
     if (0 == GNUNET_memcmp (exchange_pub,
                             &spk->key))
       return spk;
diff --git a/src/lib/exchange_api_deposit.c b/src/lib/exchange_api_deposit.c
index 06eeb6a2f..b1d0162f2 100644
--- a/src/lib/exchange_api_deposit.c
+++ b/src/lib/exchange_api_deposit.c
@@ -146,8 +146,8 @@ auditor_cb (void *cls,
               "Will provide deposit confirmation to auditor `%s'\n",
               TALER_B2S (auditor_pub));
   key_state = TALER_EXCHANGE_get_keys (dh->exchange);
-  spk = TALER_EXCHANGE_get_signing_key_details (key_state,
-                                                &dh->exchange_pub);
+  spk = TALER_EXCHANGE_get_signing_key_info (key_state,
+                                             &dh->exchange_pub);
   GNUNET_assert (NULL != spk);
   TALER_amount_ntoh (&amount_without_fee,
                      &dh->depconf.amount_without_fee);
diff --git a/src/lib/exchange_api_handle.c b/src/lib/exchange_api_handle.c
index 783cddea2..6a88b703b 100644
--- a/src/lib/exchange_api_handle.c
+++ b/src/lib/exchange_api_handle.c
@@ -2038,30 +2038,6 @@ TALER_EXCHANGE_disconnect (struct TALER_EXCHANGE_Handle *exchange)
 
 
 /**
- * Lookup the given @a pub in @a keys.
- *
- * @param keys the exchange's key set
- * @param pub claimed current online signing key for the exchange
- * @return NULL if @a pub was not found
- */
-const struct TALER_EXCHANGE_SigningPublicKey *
-TALER_EXCHANGE_get_signing_key_details (const struct TALER_EXCHANGE_Keys *keys,
-                                        const struct
-                                        TALER_ExchangePublicKeyP *pub)
-{
-  for (unsigned int i = 0; i<keys->num_sign_keys; i++)
-  {
-    struct TALER_EXCHANGE_SigningPublicKey *spk = &keys->sign_keys[i];
-
-    if (0 == GNUNET_memcmp (pub,
-                            &spk->key))
-      return spk;
-  }
-  return NULL;
-}
-
-
-/**
  * Test if the given @a pub is a the current signing key from the exchange
  * according to @a keys.
  *
diff --git a/src/lib/exchange_api_refund.c b/src/lib/exchange_api_refund.c
index 8f2c0c4dc..e986f1020 100644
--- a/src/lib/exchange_api_refund.c
+++ b/src/lib/exchange_api_refund.c
@@ -62,7 +62,7 @@ struct TALER_EXCHANGE_RefundHandle
   /**
    * Function to call with the result.
    */
-  TALER_EXCHANGE_RefundResultCallback cb;
+  TALER_EXCHANGE_RefundCallback cb;
 
   /**
    * Closure for @a cb.
@@ -250,7 +250,7 @@ TALER_EXCHANGE_refund (struct TALER_EXCHANGE_Handle *exchange,
                        const struct TALER_CoinSpendPublicKeyP *coin_pub,
                        uint64_t rtransaction_id,
                        const struct TALER_MerchantPrivateKeyP *merchant_priv,
-                       TALER_EXCHANGE_RefundResultCallback cb,
+                       TALER_EXCHANGE_RefundCallback cb,
                        void *cb_cls)
 {
   struct TALER_RefundRequestPS rr;
@@ -326,7 +326,7 @@ TALER_EXCHANGE_refund2 (struct TALER_EXCHANGE_Handle *exchange,
                         uint64_t rtransaction_id,
                         const struct TALER_MerchantPublicKeyP *merchant_pub,
                         const struct TALER_MerchantSignatureP *merchant_sig,
-                        TALER_EXCHANGE_RefundResultCallback cb,
+                        TALER_EXCHANGE_RefundCallback cb,
                         void *cb_cls)
 {
   struct TALER_EXCHANGE_RefundHandle *rh;
diff --git a/src/lib/exchange_api_reserve.c b/src/lib/exchange_api_reserve.c
index c0dd66e8f..95a4a90eb 100644
--- a/src/lib/exchange_api_reserve.c
+++ b/src/lib/exchange_api_reserve.c
@@ -37,7 +37,7 @@
 /**
  * @brief A Withdraw Status Handle
  */
-struct TALER_EXCHANGE_ReserveStatusHandle
+struct TALER_EXCHANGE_ReservesGetHandle
 {
 
   /**
@@ -58,7 +58,7 @@ struct TALER_EXCHANGE_ReserveStatusHandle
   /**
    * Function to call with the result.
    */
-  TALER_EXCHANGE_ReserveStatusResultCallback cb;
+  TALER_EXCHANGE_ReservesGetCallback cb;
 
   /**
    * Public key of the reserve we are querying.
@@ -495,7 +495,7 @@ free_rhistory (struct TALER_EXCHANGE_ReserveHistory *rhistory,
  * @return #GNUNET_OK on success
  */
 static int
-handle_reserve_status_ok (struct TALER_EXCHANGE_ReserveStatusHandle *rsh,
+handle_reserve_status_ok (struct TALER_EXCHANGE_ReservesGetHandle *rsh,
                           const json_t *j)
 {
   json_t *history;
@@ -575,7 +575,7 @@ handle_reserve_status_ok (struct TALER_EXCHANGE_ReserveStatusHandle *rsh,
  * Function called when we're done processing the
  * HTTP /reserve/status request.
  *
- * @param cls the `struct TALER_EXCHANGE_ReserveStatusHandle`
+ * @param cls the `struct TALER_EXCHANGE_ReservesGetHandle`
  * @param response_code HTTP response code, 0 on error
  * @param response parsed JSON result, NULL on error
  */
@@ -584,7 +584,7 @@ handle_reserve_status_finished (void *cls,
                                 long response_code,
                                 const void *response)
 {
-  struct TALER_EXCHANGE_ReserveStatusHandle *rsh = cls;
+  struct TALER_EXCHANGE_ReservesGetHandle *rsh = cls;
   const json_t *j = response;
 
   rsh->job = NULL;
@@ -629,7 +629,7 @@ handle_reserve_status_finished (void *cls,
              0, NULL);
     rsh->cb = NULL;
   }
-  TALER_EXCHANGE_reserve_status_cancel (rsh);
+  TALER_EXCHANGE_reserves_get_cancel (rsh);
 }
 
 
@@ -649,14 +649,14 @@ handle_reserve_status_finished (void *cls,
  * @return a handle for this request; NULL if the inputs are invalid (i.e.
  *         signatures fail to verify).  In this case, the callback is not called.
  */
-struct TALER_EXCHANGE_ReserveStatusHandle *
-TALER_EXCHANGE_reserve_status (struct TALER_EXCHANGE_Handle *exchange,
-                               const struct
-                               TALER_ReservePublicKeyP *reserve_pub,
-                               TALER_EXCHANGE_ReserveStatusResultCallback cb,
-                               void *cb_cls)
+struct TALER_EXCHANGE_ReservesGetHandle *
+TALER_EXCHANGE_reserves_get (struct TALER_EXCHANGE_Handle *exchange,
+                             const struct
+                             TALER_ReservePublicKeyP *reserve_pub,
+                             TALER_EXCHANGE_ReservesGetCallback cb,
+                             void *cb_cls)
 {
-  struct TALER_EXCHANGE_ReserveStatusHandle *rsh;
+  struct TALER_EXCHANGE_ReservesGetHandle *rsh;
   struct GNUNET_CURL_Context *ctx;
   CURL *eh;
   char arg_str[sizeof (struct TALER_ReservePublicKeyP) * 2 + 16];
@@ -682,7 +682,7 @@ TALER_EXCHANGE_reserve_status (struct TALER_EXCHANGE_Handle *exchange,
                      "/reserves/%s",
                      pub_str);
   }
-  rsh = GNUNET_new (struct TALER_EXCHANGE_ReserveStatusHandle);
+  rsh = GNUNET_new (struct TALER_EXCHANGE_ReservesGetHandle);
   rsh->exchange = exchange;
   rsh->cb = cb;
   rsh->cb_cls = cb_cls;
@@ -707,8 +707,8 @@ TALER_EXCHANGE_reserve_status (struct TALER_EXCHANGE_Handle *exchange,
  * @param rsh the reserve status request handle
  */
 void
-TALER_EXCHANGE_reserve_status_cancel (struct
-                                      TALER_EXCHANGE_ReserveStatusHandle *rsh)
+TALER_EXCHANGE_reserves_get_cancel (struct
+                                    TALER_EXCHANGE_ReservesGetHandle *rsh)
 {
   if (NULL != rsh->job)
   {
@@ -725,7 +725,7 @@ TALER_EXCHANGE_reserve_status_cancel (struct
 /**
  * @brief A Withdraw Sign Handle
  */
-struct TALER_EXCHANGE_ReserveWithdrawHandle
+struct TALER_EXCHANGE_WithdrawHandle
 {
 
   /**
@@ -752,7 +752,7 @@ struct TALER_EXCHANGE_ReserveWithdrawHandle
   /**
    * Function to call with the result.
    */
-  TALER_EXCHANGE_ReserveWithdrawResultCallback cb;
+  TALER_EXCHANGE_WithdrawCallback cb;
 
   /**
    * Secrets of the planchet.
@@ -796,7 +796,7 @@ struct TALER_EXCHANGE_ReserveWithdrawHandle
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on errors
  */
 static int
-reserve_withdraw_ok (struct TALER_EXCHANGE_ReserveWithdrawHandle *wsh,
+reserve_withdraw_ok (struct TALER_EXCHANGE_WithdrawHandle *wsh,
                      const json_t *json)
 {
   struct GNUNET_CRYPTO_RsaSignature *blind_sig;
@@ -855,7 +855,7 @@ reserve_withdraw_ok (struct TALER_EXCHANGE_ReserveWithdrawHandle *wsh,
  */
 static int
 reserve_withdraw_payment_required (struct
-                                   TALER_EXCHANGE_ReserveWithdrawHandle *wsh,
+                                   TALER_EXCHANGE_WithdrawHandle *wsh,
                                    const json_t *json)
 {
   struct TALER_Amount balance;
@@ -956,7 +956,7 @@ reserve_withdraw_payment_required (struct
  * Function called when we're done processing the
  * HTTP /reserves/$RESERVE_PUB/withdraw request.
  *
- * @param cls the `struct TALER_EXCHANGE_ReserveWithdrawHandle`
+ * @param cls the `struct TALER_EXCHANGE_WithdrawHandle`
  * @param response_code HTTP response code, 0 on error
  * @param response parsed JSON result, NULL on error
  */
@@ -965,7 +965,7 @@ handle_reserve_withdraw_finished (void *cls,
                                   long response_code,
                                   const void *response)
 {
-  struct TALER_EXCHANGE_ReserveWithdrawHandle *wsh = cls;
+  struct TALER_EXCHANGE_WithdrawHandle *wsh = cls;
   const json_t *j = response;
 
   wsh->job = NULL;
@@ -1031,13 +1031,13 @@ handle_reserve_withdraw_finished (void *cls,
              j);
     wsh->cb = NULL;
   }
-  TALER_EXCHANGE_reserve_withdraw_cancel (wsh);
+  TALER_EXCHANGE_withdraw_cancel (wsh);
 }
 
 
 /**
- * Helper function for #TALER_EXCHANGE_reserve_withdraw2() and
- * #TALER_EXCHANGE_reserve_withdraw().
+ * Helper function for #TALER_EXCHANGE_withdraw2() and
+ * #TALER_EXCHANGE_withdraw().
  *
  * @param exchange the exchange handle; the exchange must be ready to operate
  * @param pk kind of coin to create
@@ -1052,17 +1052,17 @@ handle_reserve_withdraw_finished (void *cls,
  *         if the inputs are invalid (i.e. denomination key not with this exchange).
  *         In this case, the callback is not called.
  */
-struct TALER_EXCHANGE_ReserveWithdrawHandle *
+struct TALER_EXCHANGE_WithdrawHandle *
 reserve_withdraw_internal (struct TALER_EXCHANGE_Handle *exchange,
                            const struct TALER_EXCHANGE_DenomPublicKey *pk,
                            const struct TALER_ReserveSignatureP *reserve_sig,
                            const struct TALER_ReservePublicKeyP *reserve_pub,
                            const struct TALER_PlanchetSecretsP *ps,
                            const struct TALER_PlanchetDetail *pd,
-                           TALER_EXCHANGE_ReserveWithdrawResultCallback res_cb,
+                           TALER_EXCHANGE_WithdrawCallback res_cb,
                            void *res_cb_cls)
 {
-  struct TALER_EXCHANGE_ReserveWithdrawHandle *wsh;
+  struct TALER_EXCHANGE_WithdrawHandle *wsh;
   struct GNUNET_CURL_Context *ctx;
   json_t *withdraw_obj;
   CURL *eh;
@@ -1084,7 +1084,7 @@ reserve_withdraw_internal (struct TALER_EXCHANGE_Handle *exchange,
                      "/reserves/%s/withdraw",
                      pub_str);
   }
-  wsh = GNUNET_new (struct TALER_EXCHANGE_ReserveWithdrawHandle);
+  wsh = GNUNET_new (struct TALER_EXCHANGE_WithdrawHandle);
   wsh->exchange = exchange;
   wsh->cb = res_cb;
   wsh->cb_cls = res_cb_cls;
@@ -1159,21 +1159,21 @@ reserve_withdraw_internal (struct TALER_EXCHANGE_Handle *exchange,
  *         if the inputs are invalid (i.e. denomination key not with this exchange).
  *         In this case, the callback is not called.
  */
-struct TALER_EXCHANGE_ReserveWithdrawHandle *
-TALER_EXCHANGE_reserve_withdraw (struct TALER_EXCHANGE_Handle *exchange,
-                                 const struct TALER_EXCHANGE_DenomPublicKey *pk,
-                                 const struct
-                                 TALER_ReservePrivateKeyP *reserve_priv,
-                                 const struct TALER_PlanchetSecretsP *ps,
-                                 TALER_EXCHANGE_ReserveWithdrawResultCallback
-                                 res_cb,
-                                 void *res_cb_cls)
+struct TALER_EXCHANGE_WithdrawHandle *
+TALER_EXCHANGE_withdraw (struct TALER_EXCHANGE_Handle *exchange,
+                         const struct TALER_EXCHANGE_DenomPublicKey *pk,
+                         const struct
+                         TALER_ReservePrivateKeyP *reserve_priv,
+                         const struct TALER_PlanchetSecretsP *ps,
+                         TALER_EXCHANGE_WithdrawCallback
+                         res_cb,
+                         void *res_cb_cls)
 {
   struct TALER_Amount amount_with_fee;
   struct TALER_ReserveSignatureP reserve_sig;
   struct TALER_WithdrawRequestPS req;
   struct TALER_PlanchetDetail pd;
-  struct TALER_EXCHANGE_ReserveWithdrawHandle *wsh;
+  struct TALER_EXCHANGE_WithdrawHandle *wsh;
 
   GNUNET_CRYPTO_eddsa_key_get_public (&reserve_priv->eddsa_priv,
                                       &req.reserve_pub.eddsa_pub);
@@ -1243,20 +1243,20 @@ TALER_EXCHANGE_reserve_withdraw (struct TALER_EXCHANGE_Handle *exchange,
  *         if the inputs are invalid (i.e. denomination key not with this exchange).
  *         In this case, the callback is not called.
  */
-struct TALER_EXCHANGE_ReserveWithdrawHandle *
-TALER_EXCHANGE_reserve_withdraw2 (struct TALER_EXCHANGE_Handle *exchange,
-                                  const struct
-                                  TALER_EXCHANGE_DenomPublicKey *pk,
-                                  const struct
-                                  TALER_ReserveSignatureP *reserve_sig,
-                                  const struct
-                                  TALER_ReservePublicKeyP *reserve_pub,
-                                  const struct TALER_PlanchetSecretsP *ps,
-                                  TALER_EXCHANGE_ReserveWithdrawResultCallback
-                                  res_cb,
-                                  void *res_cb_cls)
+struct TALER_EXCHANGE_WithdrawHandle *
+TALER_EXCHANGE_withdraw2 (struct TALER_EXCHANGE_Handle *exchange,
+                          const struct
+                          TALER_EXCHANGE_DenomPublicKey *pk,
+                          const struct
+                          TALER_ReserveSignatureP *reserve_sig,
+                          const struct
+                          TALER_ReservePublicKeyP *reserve_pub,
+                          const struct TALER_PlanchetSecretsP *ps,
+                          TALER_EXCHANGE_WithdrawCallback
+                          res_cb,
+                          void *res_cb_cls)
 {
-  struct TALER_EXCHANGE_ReserveWithdrawHandle *wsh;
+  struct TALER_EXCHANGE_WithdrawHandle *wsh;
   struct TALER_PlanchetDetail pd;
 
   if (GNUNET_OK !=
@@ -1287,9 +1287,9 @@ TALER_EXCHANGE_reserve_withdraw2 (struct TALER_EXCHANGE_Handle *exchange,
  * @param sign the withdraw sign request handle
  */
 void
-TALER_EXCHANGE_reserve_withdraw_cancel (struct
-                                        TALER_EXCHANGE_ReserveWithdrawHandle *
-                                        sign)
+TALER_EXCHANGE_withdraw_cancel (struct
+                                TALER_EXCHANGE_WithdrawHandle *
+                                sign)
 {
   if (NULL != sign->job)
   {
diff --git a/src/lib/exchange_api_track_transaction.c b/src/lib/exchange_api_track_transaction.c
index 503ceea5b..636b986f9 100644
--- a/src/lib/exchange_api_track_transaction.c
+++ b/src/lib/exchange_api_track_transaction.c
@@ -35,7 +35,7 @@
 /**
  * @brief A Deposit Wtid Handle
  */
-struct TALER_EXCHANGE_TrackTransactionHandle
+struct TALER_EXCHANGE_DepositGetHandle
 {
 
   /**
@@ -62,7 +62,7 @@ struct TALER_EXCHANGE_TrackTransactionHandle
   /**
    * Function to call with the result.
    */
-  TALER_EXCHANGE_TrackTransactionCallback cb;
+  TALER_EXCHANGE_DepositGetCallback cb;
 
   /**
    * Closure for @a cb.
@@ -89,7 +89,7 @@ struct TALER_EXCHANGE_TrackTransactionHandle
  */
 static int
 verify_deposit_wtid_signature_ok (const struct
-                                  TALER_EXCHANGE_TrackTransactionHandle *dwh,
+                                  TALER_EXCHANGE_DepositGetHandle *dwh,
                                   const json_t *json,
                                   struct TALER_ExchangePublicKeyP *exchange_pub)
 {
@@ -134,7 +134,7 @@ verify_deposit_wtid_signature_ok (const struct
  * Function called when we're done processing the
  * HTTP /track/transaction request.
  *
- * @param cls the `struct TALER_EXCHANGE_TrackTransactionHandle`
+ * @param cls the `struct TALER_EXCHANGE_DepositGetHandle`
  * @param response_code HTTP response code, 0 on error
  * @param response parsed JSON result, NULL on error
  */
@@ -143,7 +143,7 @@ handle_deposit_wtid_finished (void *cls,
                               long response_code,
                               const void *response)
 {
-  struct TALER_EXCHANGE_TrackTransactionHandle *dwh = cls;
+  struct TALER_EXCHANGE_DepositGetHandle *dwh = cls;
   const struct TALER_WireTransferIdentifierRawP *wtid = NULL;
   struct GNUNET_TIME_Absolute execution_time = GNUNET_TIME_UNIT_FOREVER_ABS;
   const struct TALER_Amount *coin_contribution = NULL;
@@ -247,7 +247,7 @@ handle_deposit_wtid_finished (void *cls,
            wtid,
            execution_time,
            coin_contribution);
-  TALER_EXCHANGE_track_transaction_cancel (dwh);
+  TALER_EXCHANGE_deposits_get_cancel (dwh);
 }
 
 
@@ -264,21 +264,21 @@ handle_deposit_wtid_finished (void *cls,
  * @param cb_cls closure for @a cb
  * @return handle to abort request
  */
-struct TALER_EXCHANGE_TrackTransactionHandle *
-TALER_EXCHANGE_track_transaction (struct TALER_EXCHANGE_Handle *exchange,
-                                  const struct
-                                  TALER_MerchantPrivateKeyP *merchant_priv,
-                                  const struct GNUNET_HashCode *h_wire,
-                                  const struct
-                                  GNUNET_HashCode *h_contract_terms,
-                                  const struct
-                                  TALER_CoinSpendPublicKeyP *coin_pub,
-                                  TALER_EXCHANGE_TrackTransactionCallback cb,
-                                  void *cb_cls)
+struct TALER_EXCHANGE_DepositGetHandle *
+TALER_EXCHANGE_deposits_get (struct TALER_EXCHANGE_Handle *exchange,
+                             const struct
+                             TALER_MerchantPrivateKeyP *merchant_priv,
+                             const struct GNUNET_HashCode *h_wire,
+                             const struct
+                             GNUNET_HashCode *h_contract_terms,
+                             const struct
+                             TALER_CoinSpendPublicKeyP *coin_pub,
+                             TALER_EXCHANGE_DepositGetCallback cb,
+                             void *cb_cls)
 {
   struct TALER_DepositTrackPS dtp;
   struct TALER_MerchantSignatureP merchant_sig;
-  struct TALER_EXCHANGE_TrackTransactionHandle *dwh;
+  struct TALER_EXCHANGE_DepositGetHandle *dwh;
   struct GNUNET_CURL_Context *ctx;
   CURL *eh;
   char arg_str[(sizeof (struct TALER_CoinSpendPublicKeyP)
@@ -354,7 +354,7 @@ TALER_EXCHANGE_track_transaction (struct TALER_EXCHANGE_Handle *exchange,
                      msig_str);
   }
 
-  dwh = GNUNET_new (struct TALER_EXCHANGE_TrackTransactionHandle);
+  dwh = GNUNET_new (struct TALER_EXCHANGE_DepositGetHandle);
   dwh->exchange = exchange;
   dwh->cb = cb;
   dwh->cb_cls = cb_cls;
@@ -384,9 +384,9 @@ TALER_EXCHANGE_track_transaction (struct TALER_EXCHANGE_Handle *exchange,
  * @param dwh the wire deposits request handle
  */
 void
-TALER_EXCHANGE_track_transaction_cancel (struct
-                                         TALER_EXCHANGE_TrackTransactionHandle *
-                                         dwh)
+TALER_EXCHANGE_deposits_get_cancel (struct
+                                    TALER_EXCHANGE_DepositGetHandle *
+                                    dwh)
 {
   if (NULL != dwh->job)
   {
diff --git a/src/lib/exchange_api_track_transfer.c b/src/lib/exchange_api_track_transfer.c
index 2fdfdde16..c5d484d23 100644
--- a/src/lib/exchange_api_track_transfer.c
+++ b/src/lib/exchange_api_track_transfer.c
@@ -34,7 +34,7 @@
 /**
  * @brief A /track/transfer Handle
  */
-struct TALER_EXCHANGE_TrackTransferHandle
+struct TALER_EXCHANGE_TransfersGetHandle
 {
 
   /**
@@ -55,7 +55,7 @@ struct TALER_EXCHANGE_TrackTransferHandle
   /**
    * Function to call with the result.
    */
-  TALER_EXCHANGE_TrackTransferCallback cb;
+  TALER_EXCHANGE_TransfersGetCallback cb;
 
   /**
    * Closure for @a cb.
@@ -81,7 +81,7 @@ struct TALER_EXCHANGE_TrackTransferHandle
  */
 static int
 check_track_transfer_response_ok (struct
-                                  TALER_EXCHANGE_TrackTransferHandle *wdh,
+                                  TALER_EXCHANGE_TransfersGetHandle *wdh,
                                   const json_t *json)
 {
   json_t *details_j;
@@ -241,7 +241,7 @@ check_track_transfer_response_ok (struct
              details);
   }
   GNUNET_JSON_parse_free (spec);
-  TALER_EXCHANGE_track_transfer_cancel (wdh);
+  TALER_EXCHANGE_transfers_get_cancel (wdh);
   return GNUNET_OK;
 }
 
@@ -250,7 +250,7 @@ check_track_transfer_response_ok (struct
  * Function called when we're done processing the
  * HTTP /track/transfer request.
  *
- * @param cls the `struct TALER_EXCHANGE_TrackTransferHandle`
+ * @param cls the `struct TALER_EXCHANGE_TransfersGetHandle`
  * @param response_code HTTP response code, 0 on error
  * @param response parsed JSON result, NULL on error
  */
@@ -259,7 +259,7 @@ handle_track_transfer_finished (void *cls,
                                 long response_code,
                                 const void *response)
 {
-  struct TALER_EXCHANGE_TrackTransferHandle *wdh = cls;
+  struct TALER_EXCHANGE_TransfersGetHandle *wdh = cls;
   const json_t *j = response;
 
   wdh->job = NULL;
@@ -311,7 +311,7 @@ handle_track_transfer_finished (void *cls,
            NULL,
            NULL,
            0, NULL);
-  TALER_EXCHANGE_track_transfer_cancel (wdh);
+  TALER_EXCHANGE_transfers_get_cancel (wdh);
 }
 
 
@@ -325,14 +325,14 @@ handle_track_transfer_finished (void *cls,
  * @param cb_cls closure for @a cb
  * @return handle to cancel operation
  */
-struct TALER_EXCHANGE_TrackTransferHandle *
-TALER_EXCHANGE_track_transfer (struct TALER_EXCHANGE_Handle *exchange,
-                               const struct
-                               TALER_WireTransferIdentifierRawP *wtid,
-                               TALER_EXCHANGE_TrackTransferCallback cb,
-                               void *cb_cls)
+struct TALER_EXCHANGE_TransfersGetHandle *
+TALER_EXCHANGE_transfers_get (struct TALER_EXCHANGE_Handle *exchange,
+                              const struct
+                              TALER_WireTransferIdentifierRawP *wtid,
+                              TALER_EXCHANGE_TransfersGetCallback cb,
+                              void *cb_cls)
 {
-  struct TALER_EXCHANGE_TrackTransferHandle *wdh;
+  struct TALER_EXCHANGE_TransfersGetHandle *wdh;
   struct GNUNET_CURL_Context *ctx;
   CURL *eh;
   char arg_str[sizeof (struct TALER_WireTransferIdentifierRawP) * 2 + 32];
@@ -344,7 +344,7 @@ TALER_EXCHANGE_track_transfer (struct TALER_EXCHANGE_Handle *exchange,
     return NULL;
   }
 
-  wdh = GNUNET_new (struct TALER_EXCHANGE_TrackTransferHandle);
+  wdh = GNUNET_new (struct TALER_EXCHANGE_TransfersGetHandle);
   wdh->exchange = exchange;
   wdh->cb = cb;
   wdh->cb_cls = cb_cls;
@@ -384,8 +384,8 @@ TALER_EXCHANGE_track_transfer (struct TALER_EXCHANGE_Handle *exchange,
  * @param wdh the wire deposits request handle
  */
 void
-TALER_EXCHANGE_track_transfer_cancel (struct
-                                      TALER_EXCHANGE_TrackTransferHandle *wdh)
+TALER_EXCHANGE_transfers_get_cancel (struct
+                                     TALER_EXCHANGE_TransfersGetHandle *wdh)
 {
   if (NULL != wdh->job)
   {
diff --git a/src/lib/exchange_api_wire.c b/src/lib/exchange_api_wire.c
index 9d17f5c80..123f77e13 100644
--- a/src/lib/exchange_api_wire.c
+++ b/src/lib/exchange_api_wire.c
@@ -55,7 +55,7 @@ struct TALER_EXCHANGE_WireHandle
   /**
    * Function to call with the result.
    */
-  TALER_EXCHANGE_WireResultCallback cb;
+  TALER_EXCHANGE_WireCallback cb;
 
   /**
    * Closure for @a cb.
@@ -388,7 +388,7 @@ handle_wire_finished (void *cls,
  */
 struct TALER_EXCHANGE_WireHandle *
 TALER_EXCHANGE_wire (struct TALER_EXCHANGE_Handle *exchange,
-                     TALER_EXCHANGE_WireResultCallback wire_cb,
+                     TALER_EXCHANGE_WireCallback wire_cb,
                      void *wire_cb_cls)
 {
   struct TALER_EXCHANGE_WireHandle *wh;