gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-donau] branch master updated: some deletions to the headers


From: gnunet
Subject: [taler-donau] branch master updated: some deletions to the headers
Date: Mon, 18 Sep 2023 12:12:56 +0200

This is an automated email from the git hooks/post-receive script.

lukas-matyja pushed a commit to branch master
in repository donau.

The following commit(s) were added to refs/heads/master by this push:
     new e57a1fe  some deletions to the headers
e57a1fe is described below

commit e57a1fe882d0c3baa2cd95148e49c4df38893f28
Author: Matyja Lukas Adam <lukas.matyja@students.bfh.ch>
AuthorDate: Mon Sep 18 12:12:06 2023 +0200

    some deletions to the headers
---
 ...er_exchange_service.h => taler_donau_service.h} | 2738 ++++++++------------
 ...{taler_exchangedb_lib.h => taler_donaudb_lib.h} |    2 +-
 ..._exchangedb_plugin.h => taler_donaudb_plugin.h} |    0
 src/lib/exchange_api_common.h                      |    2 +-
 4 files changed, 1071 insertions(+), 1671 deletions(-)

diff --git a/src/include/taler_exchange_service.h 
b/src/include/taler_donau_service.h
similarity index 64%
rename from src/include/taler_exchange_service.h
rename to src/include/taler_donau_service.h
index 31f41e1..a92b15b 100644
--- a/src/include/taler_exchange_service.h
+++ b/src/include/taler_donau_service.h
@@ -14,14 +14,14 @@
    TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
  */
 /**
- * @file include/taler_exchange_service.h
- * @brief C interface of libtalerexchange, a C library to use exchange's HTTP 
API
+ * @file include/taler_donau_service.h
+ * @brief C interface of libtalerdonau, a C library to use donau's HTTP API
  * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  * @author Christian Grothoff
  * @author Özgür Kesim
  */
-#ifndef _TALER_EXCHANGE_SERVICE_H
-#define _TALER_EXCHANGE_SERVICE_H
+#ifndef _TALER_DONAU_SERVICE_H
+#define _TALER_DONAU_SERVICE_H
 
 #include <jansson.h>
 #include "taler_util.h"
@@ -34,17 +34,17 @@
 
 
 /**
- * @brief Exchange's signature key
+ * @brief Donau's signature key
  */
-struct TALER_EXCHANGE_SigningPublicKey
+struct TALER_DONAU_SigningPublicKey
 {
   /**
    * The signing public key
    */
-  struct TALER_ExchangePublicKeyP key;
+  struct TALER_DonauPublicKeyP key;
 
   /**
-   * Signature over this signing key by the exchange's master signature.
+   * Signature over this signing key by the donau's master signature.
    */
   struct TALER_MasterSignatureP master_sig;
 
@@ -54,7 +54,7 @@ struct TALER_EXCHANGE_SigningPublicKey
   struct GNUNET_TIME_Timestamp valid_from;
 
   /**
-   * Validity expiration time (how long the exchange may use it).
+   * Validity expiration time (how long the donau may use it).
    */
   struct GNUNET_TIME_Timestamp valid_until;
 
@@ -66,9 +66,9 @@ struct TALER_EXCHANGE_SigningPublicKey
 
 
 /**
- * @brief Public information about a exchange's denomination key
+ * @brief Public information about a donau's denomination key
  */
-struct TALER_EXCHANGE_DenomPublicKey
+struct TALER_DONAU_DenomPublicKey
 {
   /**
    * The public key
@@ -81,7 +81,7 @@ struct TALER_EXCHANGE_DenomPublicKey
   struct TALER_DenominationHashP h_key;
 
   /**
-   * Exchange's master signature over this denomination record.
+   * Donau's master signature over this denomination record.
    */
   struct TALER_MasterSignatureP master_sig;
 
@@ -122,14 +122,14 @@ struct TALER_EXCHANGE_DenomPublicKey
 
   /**
    * Set to true if the private denomination key has been
-   * lost by the exchange and thus the key cannot be
+   * lost by the donau and thus the key cannot be
    * used for withdrawing at this time.
    */
   bool lost;
 
   /**
    * Set to true if this denomination key has been
-   * revoked by the exchange.
+   * revoked by the donau.
    */
   bool revoked;
 
@@ -139,7 +139,7 @@ struct TALER_EXCHANGE_DenomPublicKey
 /**
  * Information we track per denomination audited by the auditor.
  */
-struct TALER_EXCHANGE_AuditorDenominationInfo
+struct TALER_DONAU_AuditorDenominationInfo
 {
 
   /**
@@ -158,9 +158,9 @@ struct TALER_EXCHANGE_AuditorDenominationInfo
 
 
 /**
- * @brief Information we get from the exchange about auditors.
+ * @brief Information we get from the donau about auditors.
  */
-struct TALER_EXCHANGE_AuditorInformation
+struct TALER_DONAU_AuditorInformation
 {
   /**
    * Public key of the auditing institution.  Wallets and merchants
@@ -175,7 +175,7 @@ struct TALER_EXCHANGE_AuditorInformation
    * key, this URL is a place where applications can direct users for
    * additional information about the auditor.  In the future, there
    * should also be an auditor API for automated submission about
-   * claims of misbehaving exchange providers.
+   * claims of misbehaving donau providers.
    */
   char *auditor_url;
 
@@ -183,7 +183,7 @@ struct TALER_EXCHANGE_AuditorInformation
    * Array of length @a num_denom_keys with the denomination
    * keys audited by this auditor.
    */
-  struct TALER_EXCHANGE_AuditorDenominationInfo *denom_keys;
+  struct TALER_DONAU_AuditorDenominationInfo *denom_keys;
 
   /**
    * Number of denomination keys audited by this auditor.
@@ -193,224 +193,13 @@ struct TALER_EXCHANGE_AuditorInformation
 
 
 /**
- * Global fees and options of an exchange for a given time period.
+ * @brief Information about keys from the donau.
  */
-struct TALER_EXCHANGE_GlobalFee
+struct TALER_DONAU_Keys
 {
 
   /**
-   * Signature affirming all of the data.
-   */
-  struct TALER_MasterSignatureP master_sig;
-
-  /**
-   * Starting time of the validity period (inclusive).
-   */
-  struct GNUNET_TIME_Timestamp start_date;
-
-  /**
-   * End time of the validity period (exclusive).
-   */
-  struct GNUNET_TIME_Timestamp end_date;
-
-  /**
-   * Unmerged purses will be timed out after at most this time.
-   */
-  struct GNUNET_TIME_Relative purse_timeout;
-
-  /**
-   * Account history is limited to this timeframe.
-   */
-  struct GNUNET_TIME_Relative history_expiration;
-
-  /**
-   * Fees that apply globally, independent of denomination
-   * and wire method.
-   */
-  struct TALER_GlobalFeeSet fees;
-
-  /**
-   * Number of free purses per account.
-   */
-  uint32_t purse_account_limit;
-};
-
-
-/**
- * List sorted by @a start_date with fees to be paid for aggregate wire 
transfers.
- */
-struct TALER_EXCHANGE_WireAggregateFees
-{
-  /**
-   * This is a linked list.
-   */
-  struct TALER_EXCHANGE_WireAggregateFees *next;
-
-  /**
-   * Fee to be paid whenever the exchange wires funds to the merchant.
-   */
-  struct TALER_WireFeeSet fees;
-
-  /**
-   * Time when this fee goes into effect (inclusive)
-   */
-  struct GNUNET_TIME_Timestamp start_date;
-
-  /**
-   * Time when this fee stops being in effect (exclusive).
-   */
-  struct GNUNET_TIME_Timestamp end_date;
-
-  /**
-   * Signature affirming the above fee structure.
-   */
-  struct TALER_MasterSignatureP master_sig;
-};
-
-
-/**
- * Information about wire fees by wire method.
- */
-struct TALER_EXCHANGE_WireFeesByMethod
-{
-  /**
-   * Wire method with the given @e fees.
-   */
-  char *method;
-
-  /**
-   * Linked list of wire fees the exchange charges for
-   * accounts of the wire @e method.
-   */
-  struct TALER_EXCHANGE_WireAggregateFees *fees_head;
-
-};
-
-
-/**
- * Type of an account restriction.
- */
-enum TALER_EXCHANGE_AccountRestrictionType
-{
-  /**
-   * Invalid restriction.
-   */
-  TALER_EXCHANGE_AR_INVALID = 0,
-
-  /**
-   * Account must not be used for this operation.
-   */
-  TALER_EXCHANGE_AR_DENY = 1,
-
-  /**
-   * Other account must match given regular expression.
-   */
-  TALER_EXCHANGE_AR_REGEX = 2
-};
-
-/**
- * Restrictions that apply to using a given exchange bank account.
- */
-struct TALER_EXCHANGE_AccountRestriction
-{
-
-  /**
-   * Type of the account restriction.
-   */
-  enum TALER_EXCHANGE_AccountRestrictionType type;
-
-  /**
-   * Restriction details depending on @e type.
-   */
-  union
-  {
-    /**
-     * Details if type is #TALER_EXCHANGE_AR_REGEX.
-     */
-    struct
-    {
-      /**
-       * Regular expression that the payto://-URI of the partner account must
-       * follow.  The regular expression should follow posix-egrep, but
-       * without support for character classes, GNU extensions,
-       * back-references or intervals. See
-       * 
https://www.gnu.org/software/findutils/manual/html_node/find_html/posix_002degrep-regular-expression-syntax.html
-       * for a description of the posix-egrep syntax. Applications may support
-       * regexes with additional features, but exchanges must not use such
-       * regexes.
-       */
-      char *posix_egrep;
-
-      /**
-       * Hint for a human to understand the restriction.
-       */
-      char *human_hint;
-
-      /**
-       * Internationalizations for the @e human_hint.  Map from IETF BCP 47
-       * language tax to localized human hints.
-       */
-      json_t *human_hint_i18n;
-    } regex;
-  } details;
-
-};
-
-
-/**
- * Information about a wire account of the exchange.
- */
-struct TALER_EXCHANGE_WireAccount
-{
-  /**
-   * payto://-URI of the exchange.
-   */
-  char *payto_uri;
-
-  /**
-   * URL of a conversion service in case using this account is subject to
-   * currency conversion.  NULL for no conversion needed.
-   */
-  char *conversion_url;
-
-  /**
-   * Array of restrictions that apply when crediting
-   * this account.
-   */
-  struct TALER_EXCHANGE_AccountRestriction *credit_restrictions;
-
-  /**
-   * Array of restrictions that apply when debiting
-   * this account.
-   */
-  struct TALER_EXCHANGE_AccountRestriction *debit_restrictions;
-
-  /**
-   * Length of the @e credit_restrictions array.
-   */
-  unsigned int credit_restrictions_length;
-
-  /**
-   * Length of the @e debit_restrictions array.
-   */
-  unsigned int debit_restrictions_length;
-
-  /**
-   * Signature of the exchange over the account (was checked by the API).
-   */
-  struct TALER_MasterSignatureP master_sig;
-
-};
-
-
-/**
- * @brief Information about keys from the exchange.
- */
-struct TALER_EXCHANGE_Keys
-{
-
-  /**
-   * Long-term offline signing key of the exchange.
+   * Long-term offline signing key of the donau.
    */
   struct TALER_MasterPublicKeyP master_pub;
 
@@ -420,24 +209,24 @@ struct TALER_EXCHANGE_Keys
   struct TALER_MasterSignatureP extensions_sig;
 
   /**
-   * Array of the exchange's online signing keys.
+   * Array of the donau's online signing keys.
    */
-  struct TALER_EXCHANGE_SigningPublicKey *sign_keys;
+  struct TALER_DONAU_SigningPublicKey *sign_keys;
 
   /**
-   * Array of the exchange's denomination keys.
+   * Array of the donau's denomination keys.
    */
-  struct TALER_EXCHANGE_DenomPublicKey *denom_keys;
+  struct TALER_DONAU_DenomPublicKey *denom_keys;
 
   /**
-   * Array of the keys of the auditors of the exchange.
+   * Array of the keys of the auditors of the donau.
    */
-  struct TALER_EXCHANGE_AuditorInformation *auditors;
+  struct TALER_DONAU_AuditorInformation *auditors;
 
   /**
-   * Array with the global fees of the exchange.
+   * Array with the global fees of the donau.
    */
-  struct TALER_EXCHANGE_GlobalFee *global_fees;
+  struct TALER_DONAU_GlobalFee *global_fees;
 
   /**
    * Configuration data for extensions.
@@ -445,7 +234,7 @@ struct TALER_EXCHANGE_Keys
   json_t *extensions;
 
   /**
-   * Supported Taler protocol version by the exchange.
+   * Supported Taler protocol version by the donau.
    * String in the format current:revision:age using the
    * semantics of GNU libtool.  See
    * 
https://www.gnu.org/software/libtool/manual/html_node/Versioning.html#Versioning
@@ -453,18 +242,18 @@ struct TALER_EXCHANGE_Keys
   char *version;
 
   /**
-   * Supported currency of the exchange.
+   * Supported currency of the donau.
    */
   char *currency;
 
   /**
-   * What is the base URL of the exchange that returned
+   * What is the base URL of the donau that returned
    * these keys?
    */
-  char *exchange_url;
+  char *donau_url;
 
   /**
-   * Asset type used by the exchange. Typical values
+   * Asset type used by the donau. Typical values
    * are "fiat" or "crypto" or "regional" or "stock".
    * Wallets should adjust their UI/UX based on this
    * value.
@@ -473,24 +262,24 @@ struct TALER_EXCHANGE_Keys
 
   /**
    * Array of amounts a wallet is allowed to hold from
-   * this exchange before it must undergo further KYC checks.
+   * this donau before it must undergo further KYC checks.
    */
   struct TALER_Amount *wallet_balance_limit_without_kyc;
 
   /**
-   * Array of accounts of the exchange.
+   * Array of accounts of the donau.
    */
-  struct TALER_EXCHANGE_WireAccount *accounts;
+  struct TALER_DONAU_WireAccount *accounts;
 
   /**
    * Array of wire fees by wire method.
    */
-  struct TALER_EXCHANGE_WireFeesByMethod *fees;
+  struct TALER_DONAU_WireFeesByMethod *fees;
 
   /**
-   * How long after a reserve went idle will the exchange close it?
+   * How long after a reserve went idle will the donau close it?
    * This is an approximate number, not cryptographically signed by
-   * the exchange (advisory-only, may change anytime).
+   * the donau (advisory-only, may change anytime).
    */
   struct GNUNET_TIME_Relative reserve_closing_delay;
 
@@ -512,7 +301,7 @@ struct TALER_EXCHANGE_Keys
   struct GNUNET_TIME_Timestamp last_denom_issue_date;
 
   /**
-   * If age restriction is enabled on the exchange, we get an non-zero age_mask
+   * If age restriction is enabled on the donau, we get an non-zero age_mask
    */
   struct TALER_AgeMask age_mask;
 
@@ -590,69 +379,69 @@ struct TALER_EXCHANGE_Keys
   unsigned int rc;
 
   /**
-   * Set to true if rewards are allowed at this exchange.
+   * Set to true if rewards are allowed at this donau.
    */
   bool rewards_allowed;
 };
 
 
 /**
- * How compatible are the protocol version of the exchange and this
- * client?  The bits (1,2,4) can be used to test if the exchange's
+ * How compatible are the protocol version of the donau and this
+ * client?  The bits (1,2,4) can be used to test if the donau's
  * version is incompatible, older or newer respectively.
  */
-enum TALER_EXCHANGE_VersionCompatibility
+enum TALER_DONAU_VersionCompatibility
 {
 
   /**
-   * The exchange runs exactly the same protocol version.
+   * The donau runs exactly the same protocol version.
    */
-  TALER_EXCHANGE_VC_MATCH = 0,
+  TALER_DONAU_VC_MATCH = 0,
 
   /**
-   * The exchange is too old or too new to be compatible with this
+   * The donau is too old or too new to be compatible with this
    * implementation (bit)
    */
-  TALER_EXCHANGE_VC_INCOMPATIBLE = 1,
+  TALER_DONAU_VC_INCOMPATIBLE = 1,
 
   /**
-   * The exchange is older than this implementation (bit)
+   * The donau is older than this implementation (bit)
    */
-  TALER_EXCHANGE_VC_OLDER = 2,
+  TALER_DONAU_VC_OLDER = 2,
 
   /**
-   * The exchange is too old to be compatible with
+   * The donau is too old to be compatible with
    * this implementation.
    */
-  TALER_EXCHANGE_VC_INCOMPATIBLE_OUTDATED
-    = TALER_EXCHANGE_VC_INCOMPATIBLE
-      | TALER_EXCHANGE_VC_OLDER,
+  TALER_DONAU_VC_INCOMPATIBLE_OUTDATED
+    = TALER_DONAU_VC_INCOMPATIBLE
+      | TALER_DONAU_VC_OLDER,
 
   /**
-   * The exchange is more recent than this implementation (bit).
+   * The donau is more recent than this implementation (bit).
    */
-  TALER_EXCHANGE_VC_NEWER = 4,
+  TALER_DONAU_VC_NEWER = 4,
 
   /**
-   * The exchange is too recent for this implementation.
+   * The donau is too recent for this implementation.
    */
-  TALER_EXCHANGE_VC_INCOMPATIBLE_NEWER
-    = TALER_EXCHANGE_VC_INCOMPATIBLE
-      | TALER_EXCHANGE_VC_NEWER,
+  TALER_DONAU_VC_INCOMPATIBLE_NEWER
+    = TALER_DONAU_VC_INCOMPATIBLE
+      | TALER_DONAU_VC_NEWER,
 
   /**
    * We could not even parse the version data.
    */
-  TALER_EXCHANGE_VC_PROTOCOL_ERROR = 8
+  TALER_DONAU_VC_PROTOCOL_ERROR = 8
 
 };
 
 
 /**
  * General information about the HTTP response we obtained
- * from the exchange for a request.
+ * from the donau for a request.
  */
-struct TALER_EXCHANGE_HttpResponse
+struct TALER_DONAU_HttpResponse
 {
 
   /**
@@ -663,7 +452,7 @@ struct TALER_EXCHANGE_HttpResponse
 
   /**
    * Set to the human-readable 'hint' that is optionally
-   * provided by the exchange together with errors. NULL
+   * provided by the donau together with errors. NULL
    * if no hint was provided or if there was no error.
    */
   const char *hint;
@@ -691,12 +480,12 @@ struct TALER_EXCHANGE_HttpResponse
 /**
  * Response from /keys.
  */
-struct TALER_EXCHANGE_KeysResponse
+struct TALER_DONAU_KeysResponse
 {
   /**
    * HTTP response data
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Details depending on the HTTP status code.
@@ -710,14 +499,14 @@ struct TALER_EXCHANGE_KeysResponse
     struct
     {
       /**
-       * Information about the various keys used by the exchange.
+       * Information about the various keys used by the donau.
        */
-      const struct TALER_EXCHANGE_Keys *keys;
+      const struct TALER_DONAU_Keys *keys;
 
       /**
        * Protocol compatibility information
        */
-      enum TALER_EXCHANGE_VersionCompatibility compat;
+      enum TALER_DONAU_VersionCompatibility compat;
     } ok;
   } details;
 
@@ -726,7 +515,7 @@ struct TALER_EXCHANGE_KeysResponse
 
 /**
  * Function called with information about who is auditing
- * a particular exchange and what keys the exchange is using.
+ * a particular donau and what keys the donau is using.
  * The ownership over the @a keys object is passed to
  * the callee, thus it is given explicitly and not
  * (only) via @a kr.
@@ -735,42 +524,42 @@ struct TALER_EXCHANGE_KeysResponse
  * @param kr response from /keys
  * @param[in] keys keys object passed to callback with
  *  reference counter of 1. Must be freed by callee
- *  using #TALER_EXCHANGE_keys_decref(). NULL on failure.
+ *  using #TALER_DONAU_keys_decref(). NULL on failure.
  */
 typedef void
-(*TALER_EXCHANGE_GetKeysCallback) (
+(*TALER_DONAU_GetKeysCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_KeysResponse *kr,
-  struct TALER_EXCHANGE_Keys *keys);
+  const struct TALER_DONAU_KeysResponse *kr,
+  struct TALER_DONAU_Keys *keys);
 
 
 /**
  * @brief Handle for a GET /keys request.
  */
-struct TALER_EXCHANGE_GetKeysHandle;
+struct TALER_DONAU_GetKeysHandle;
 
 
 /**
- * Fetch the main /keys resources from an exchange.  Does an incremental
+ * Fetch the main /keys resources from an donau.  Does an incremental
  * fetch if @a last_keys is given.  The obtained information will be passed to
  * the @a cert_cb (possibly after first merging it with @a last_keys to
  * produce a full picture; expired keys (for deposit) will be removed from @a
  * last_keys if there are any).
  *
  * @param ctx the context
- * @param url HTTP base URL for the exchange
+ * @param url HTTP base URL for the donau
  * @param[in,out] last_keys previous keys object, NULL for none
- * @param cert_cb function to call with the exchange's certification 
information,
+ * @param cert_cb function to call with the donau's certification information,
  *                possibly called repeatedly if the information changes
  * @param cert_cb_cls closure for @a cert_cb
- * @return the exchange handle; NULL upon error
+ * @return the donau handle; NULL upon error
  */
-struct TALER_EXCHANGE_GetKeysHandle *
-TALER_EXCHANGE_get_keys (
+struct TALER_DONAU_GetKeysHandle *
+TALER_DONAU_get_keys (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
-  struct TALER_EXCHANGE_Keys *last_keys,
-  TALER_EXCHANGE_GetKeysCallback cert_cb,
+  struct TALER_DONAU_Keys *last_keys,
+  TALER_DONAU_GetKeysCallback cert_cb,
   void *cert_cb_cls);
 
 
@@ -782,18 +571,18 @@ TALER_EXCHANGE_get_keys (
  * @return NULL on error; otherwise JSON object owned by the caller
  */
 json_t *
-TALER_EXCHANGE_keys_to_json (const struct TALER_EXCHANGE_Keys *kd);
+TALER_DONAU_keys_to_json (const struct TALER_DONAU_Keys *kd);
 
 
 /**
  * Deserialize keys data stored in @a j.
  *
- * @param j JSON keys data previously returned from 
#TALER_EXCHANGE_keys_to_json()
+ * @param j JSON keys data previously returned from #TALER_DONAU_keys_to_json()
  * @return NULL on error (i.e. invalid JSON); otherwise
  *         keys object with reference counter 1 owned by the caller
  */
-struct TALER_EXCHANGE_Keys *
-TALER_EXCHANGE_keys_from_json (const json_t *j);
+struct TALER_DONAU_Keys *
+TALER_DONAU_keys_from_json (const json_t *j);
 
 
 /**
@@ -802,7 +591,7 @@ TALER_EXCHANGE_keys_from_json (const json_t *j);
  * @param[in] gkh the GET /keys handle
  */
 void
-TALER_EXCHANGE_get_keys_cancel (struct TALER_EXCHANGE_GetKeysHandle *gkh);
+TALER_DONAU_get_keys_cancel (struct TALER_DONAU_GetKeysHandle *gkh);
 
 
 /**
@@ -811,185 +600,116 @@ TALER_EXCHANGE_get_keys_cancel (struct 
TALER_EXCHANGE_GetKeysHandle *gkh);
  * @param[in,out] keys object to increment reference counter for
  * @return keys, with incremented reference counter
  */
-struct TALER_EXCHANGE_Keys *
-TALER_EXCHANGE_keys_incref (struct TALER_EXCHANGE_Keys *keys);
+struct TALER_DONAU_Keys *
+TALER_DONAU_keys_incref (struct TALER_DONAU_Keys *keys);
 
 
 /**
- * Deccrement reference counter for @a keys.
+ * Decrement reference counter for @a keys.
  * Frees @a keys if reference counter becomes zero.
  *
  * @param[in,out] keys object to decrement reference counter for
  */
 void
-TALER_EXCHANGE_keys_decref (struct TALER_EXCHANGE_Keys *keys);
-
-
-/**
- * Use STEFAN curve in @a keys to convert @a brut to @a net.  Computes the
- * expected minimum (!) @a net amount that should for sure arrive in the
- * target amount at cost of @a brut to the wallet. Note that STEFAN curves by
- * design over-estimate actual fees and a wallet may be able to achieve the
- * same @a net amount with less fees --- or if the available coins are
- * abnormal in structure, it may take more.
- *
- * @param keys exchange key data
- * @param brut gross amount (actual cost including fees)
- * @param[out] net net amount (effective amount)
- * @return #GNUNET_OK on success, #GNUNET_NO if the
- *   resulting @a net is zero (or lower)
- */
-enum GNUNET_GenericReturnValue
-TALER_EXCHANGE_keys_stefan_b2n (
-  const struct TALER_EXCHANGE_Keys *keys,
-  const struct TALER_Amount *brut,
-  struct TALER_Amount *net);
-
-
-/**
- * Use STEFAN curve in @a keys to convert @a net to @a brut.  Computes the
- * expected maximum (!) @a brut amount that should be needed in the wallet to
- * transfer @a net amount to the target account.  Note that STEFAN curves by
- * design over-estimate actual fees and a wallet may be able to achieve the
- * same @a net amount with less fees --- or if the available coins are
- * abnormal in structure, it may take more.
- *
- * @param keys exchange key data
- * @param net net amount (effective amount)
- * @param[out] brut gross amount (actual cost including fees)
- * @return #GNUNET_OK on success, #GNUNET_NO if the
- *   resulting @a brut is zero (only if @a net was zero)
- */
-enum GNUNET_GenericReturnValue
-TALER_EXCHANGE_keys_stefan_n2b (
-  const struct TALER_EXCHANGE_Keys *keys,
-  const struct TALER_Amount *net,
-  struct TALER_Amount *brut);
-
-
-/**
- * Round brutto or netto value computed via STEFAN
- * curve to decimal places commonly used at the exchange.
- *
- * @param keys exchange keys response data
- * @param[in,out] val value to round
- */
-void
-TALER_EXCHANGE_keys_stefan_round (
-  const struct TALER_EXCHANGE_Keys *keys,
-  struct TALER_Amount *val);
-
+TALER_DONAU_keys_decref (struct TALER_DONAU_Keys *keys);
 
 /**
- * Test if the given @a pub is a the current signing key from the exchange
+ * Test if the given @a pub is a the current signing key from the donau
  * according to @a keys.
  *
- * @param keys the exchange's key set
- * @param pub claimed current online signing key for the exchange
+ * @param keys the donau's key set
+ * @param pub claimed current online signing key for the donau
  * @return #GNUNET_OK if @a pub is (according to /keys) a current signing key
  */
 enum GNUNET_GenericReturnValue
-TALER_EXCHANGE_test_signing_key (
-  const struct TALER_EXCHANGE_Keys *keys,
+TALER_DONAU_test_signing_key (
+  const struct TALER_DONAU_Keys *keys,
   const struct TALER_ExchangePublicKeyP *pub);
 
 
 /**
- * Obtain the denomination key details from the exchange.
+ * Obtain the denomination key details from the donau.
  *
- * @param keys the exchange's key set
+ * @param keys the donau's key set
  * @param pk public key of the denomination to lookup
  * @return details about the given denomination key, NULL if the key is not
  * found
  */
-const struct TALER_EXCHANGE_DenomPublicKey *
-TALER_EXCHANGE_get_denomination_key (
-  const struct TALER_EXCHANGE_Keys *keys,
+const struct TALER_DONAU_DenomPublicKey *
+TALER_DONAU_get_denomination_key (
+  const struct TALER_DONAU_Keys *keys,
   const struct TALER_DenominationPublicKey *pk);
 
 
-/**
- * Obtain the global fee details from the exchange.
- *
- * @param keys the exchange's key set
- * @param ts time for when to fetch the fees
- * @return details about the fees, NULL if no fees are known at @a ts
- */
-const struct TALER_EXCHANGE_GlobalFee *
-TALER_EXCHANGE_get_global_fee (
-  const struct TALER_EXCHANGE_Keys *keys,
-  struct GNUNET_TIME_Timestamp ts);
-
-
 /**
  * Create a copy of a denomination public key.
  *
  * @param key key to copy
- * @returns a copy, must be freed with 
#TALER_EXCHANGE_destroy_denomination_key()
+ * @returns a copy, must be freed with #TALER_DONAU_destroy_denomination_key()
  * @deprecated
  */
-struct TALER_EXCHANGE_DenomPublicKey *
-TALER_EXCHANGE_copy_denomination_key (
-  const struct TALER_EXCHANGE_DenomPublicKey *key);
+struct TALER_DONAU_DenomPublicKey *
+TALER_DONAU_copy_denomination_key (
+  const struct TALER_DONAU_DenomPublicKey *key);
 
 
 /**
  * Destroy a denomination public key.
- * Should only be called with keys created by 
#TALER_EXCHANGE_copy_denomination_key().
+ * Should only be called with keys created by 
#TALER_DONAU_copy_denomination_key().
  *
  * @param key key to destroy.
  * @deprecated
  */
 void
-TALER_EXCHANGE_destroy_denomination_key (
-  struct TALER_EXCHANGE_DenomPublicKey *key);
+TALER_DONAU_destroy_denomination_key (
+  struct TALER_DONAU_DenomPublicKey *key);
 
 
 /**
- * Obtain the denomination key details from the exchange.
+ * Obtain the denomination key details from the donau.
  *
- * @param keys the exchange's key set
+ * @param keys the donau's key set
  * @param hc hash of the public key of the denomination to lookup
  * @return details about the given denomination key
  */
-const struct TALER_EXCHANGE_DenomPublicKey *
-TALER_EXCHANGE_get_denomination_key_by_hash (
-  const struct TALER_EXCHANGE_Keys *keys,
+const struct TALER_DONAU_DenomPublicKey *
+TALER_DONAU_get_denomination_key_by_hash (
+  const struct TALER_DONAU_Keys *keys,
   const struct TALER_DenominationHashP *hc);
 
 
 /**
- * Obtain meta data about an exchange (online) signing
+ * Obtain meta data about an donau (online) signing
  * key.
  *
  * @param keys from where to obtain the meta data
- * @param exchange_pub public key to lookup
- * @return NULL on error (@a exchange_pub not known)
+ * @param donau_pub public key to lookup
+ * @return NULL on error (@a donau_pub not known)
  */
-const struct TALER_EXCHANGE_SigningPublicKey *
-TALER_EXCHANGE_get_signing_key_info (
-  const struct TALER_EXCHANGE_Keys *keys,
-  const struct TALER_ExchangePublicKeyP *exchange_pub);
+const struct TALER_DONAU_SigningPublicKey *
+TALER_DONAU_get_signing_key_info (
+  const struct TALER_DONAU_Keys *keys,
+  const struct TALER_ExchangePublicKeyP *donau_pub);
 
 
 /* *********************  wire helpers *********************** */
 
 
 /**
- * Parse array of @a accounts of the exchange into @a was.
+ * Parse array of @a accounts of the donau into @a was.
  *
- * @param master_pub master public key of the exchange, NULL to not verify 
signatures
+ * @param master_pub master public key of the donau, NULL to not verify 
signatures
  * @param accounts array of accounts to parse
  * @param[out] was where to write the result (already allocated)
  * @param was_length length of the @a was array, must match the length of @a 
accounts
  * @return #GNUNET_OK if parsing @a accounts succeeded
  */
 enum GNUNET_GenericReturnValue
-TALER_EXCHANGE_parse_accounts (
+TALER_DONAU_parse_accounts (
   const struct TALER_MasterPublicKeyP *master_pub,
   const json_t *accounts,
   unsigned int was_length,
-  struct TALER_EXCHANGE_WireAccount was[static was_length]);
+  struct TALER_DONAU_WireAccount was[static was_length]);
 
 
 /**
@@ -999,9 +719,9 @@ TALER_EXCHANGE_parse_accounts (
  * @param was_len length of the @a was array
  */
 void
-TALER_EXCHANGE_free_accounts (
+TALER_DONAU_free_accounts (
   unsigned int was_len,
-  struct TALER_EXCHANGE_WireAccount was[static was_len]);
+  struct TALER_DONAU_WireAccount was[static was_len]);
 
 
 /* *********************  /coins/$COIN_PUB/deposit *********************** */
@@ -1010,7 +730,7 @@ TALER_EXCHANGE_free_accounts (
 /**
  * Information needed for a coin to be deposited.
  */
-struct TALER_EXCHANGE_CoinDepositDetail
+struct TALER_DONAU_CoinDepositDetail
 {
 
   /**
@@ -1050,12 +770,12 @@ struct TALER_EXCHANGE_CoinDepositDetail
  * Meta information about the contract relevant for a coin's deposit
  * operation.
  */
-struct TALER_EXCHANGE_DepositContractDetail
+struct TALER_DONAU_DepositContractDetail
 {
 
   /**
    * Hash of the contact of the merchant with the customer (further details
-   * are never disclosed to the exchange)
+   * are never disclosed to the donau)
    */
   struct TALER_PrivateContractHashP h_contract_terms;
 
@@ -1078,33 +798,33 @@ struct TALER_EXCHANGE_DepositContractDetail
 
   /**
    * Date until which the merchant can issue a refund to the customer via the
-   * exchange (can be zero if refunds are not allowed); must not be after the
+   * donau (can be zero if refunds are not allowed); must not be after the
    * @e wire_deadline.
    */
   struct GNUNET_TIME_Timestamp refund_deadline;
 
   /**
-   * Execution date, until which the merchant would like the exchange to
-   * settle the balance (advisory, the exchange cannot be forced to settle in
-   * the past or upon very short notice, but of course a well-behaved exchange
+   * Execution date, until which the merchant would like the donau to
+   * settle the balance (advisory, the donau cannot be forced to settle in
+   * the past or upon very short notice, but of course a well-behaved donau
    * will limit aggregation based on the advice received).
    */
   struct GNUNET_TIME_Timestamp wire_deadline;
 
   /**
    * Timestamp when the contract was finalized, must match approximately the
-   * current time of the exchange.
+   * current time of the donau.
    */
   struct GNUNET_TIME_Timestamp wallet_timestamp;
 
   /**
    * The merchant’s account details, in the payto://-format supported by the
-   * exchange.
+   * donau.
    */
   const char *merchant_payto_uri;
 
   /**
-   * Policy extension specific details about the deposit relevant to the 
exchange.
+   * Policy extension specific details about the deposit relevant to the donau.
    */
   const json_t *policy_details;
 
@@ -1114,19 +834,19 @@ struct TALER_EXCHANGE_DepositContractDetail
 /**
  * @brief A Batch Deposit Handle
  */
-struct TALER_EXCHANGE_BatchDepositHandle;
+struct TALER_DONAU_BatchDepositHandle;
 
 
 /**
  * Structure with information about a batch deposit
  * operation's result.
  */
-struct TALER_EXCHANGE_BatchDepositResult
+struct TALER_DONAU_BatchDepositResult
 {
   /**
    * HTTP response data
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   union
   {
@@ -1138,19 +858,19 @@ struct TALER_EXCHANGE_BatchDepositResult
     struct
     {
       /**
-       * Time when the exchange generated the batch deposit confirmation
+       * Time when the donau generated the batch deposit confirmation
        */
       struct GNUNET_TIME_Timestamp deposit_timestamp;
 
       /**
-       * Array of signatures provided by the exchange
+       * Array of signatures provided by the donau
        */
-      const struct TALER_ExchangeSignatureP *exchange_sigs;
+      const struct TALER_ExchangeSignatureP *donau_sigs;
 
       /**
-       * exchange key used to sign @a exchange_sig.
+       * donau key used to sign @a donau_sig.
        */
-      const struct TALER_ExchangePublicKeyP *exchange_pub;
+      const struct TALER_ExchangePublicKeyP *donau_pub;
 
       /**
        * Base URL for looking up wire transfers, or
@@ -1159,7 +879,7 @@ struct TALER_EXCHANGE_BatchDepositResult
       const char *transaction_base_url;
 
       /**
-       * Length of the @e exchange_sigs array.
+       * Length of the @e donau_sigs array.
        */
       unsigned int num_signatures;
 
@@ -1180,34 +900,34 @@ struct TALER_EXCHANGE_BatchDepositResult
 
 /**
  * Callbacks of this type are used to serve the result of submitting a
- * deposit permission request to a exchange.
+ * deposit permission request to a donau.
  *
  * @param cls closure
  * @param dr deposit response details
  */
 typedef void
-(*TALER_EXCHANGE_BatchDepositResultCallback) (
+(*TALER_DONAU_BatchDepositResultCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_BatchDepositResult *dr);
+  const struct TALER_DONAU_BatchDepositResult *dr);
 
 
 /**
- * Submit a batch of deposit permissions to the exchange and get the
- * exchange's response.  This API is typically used by a merchant.  Note that
+ * Submit a batch of deposit permissions to the donau and get the
+ * donau's response.  This API is typically used by a merchant.  Note that
  * while we return the response verbatim to the caller for further processing,
  * we do already verify that the response is well-formed (i.e. that signatures
- * included in the response are all valid).  If the exchange's reply is not
+ * included in the response are all valid).  If the donau's reply is not
  * well-formed, we return an HTTP status code of zero to @a cb.
  *
  * We also verify that the @a cdds.coin_sig are valid for this deposit
  * request, and that the @a cdds.ub_sig are a valid signatures for @a
- * coin_pub.  Also, the @a exchange must be ready to operate (i.e.  have
+ * coin_pub.  Also, the @a donau must be ready to operate (i.e.  have
  * finished processing the /keys reply).  If either check fails, we do
- * NOT initiate the transaction with the exchange and instead return NULL.
+ * NOT initiate the transaction with the donau and instead return NULL.
  *
  * @param ctx curl context
- * @param url exchange base URL
- * @param keys exchange keys
+ * @param url donau base URL
+ * @param keys donau keys
  * @param dcd details about the contract the deposit is for
  * @param num_cdds length of the @a cdds array
  * @param cdds array with details about the coins to be deposited
@@ -1217,15 +937,15 @@ typedef void
  * @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_BatchDepositHandle *
-TALER_EXCHANGE_batch_deposit (
+struct TALER_DONAU_BatchDepositHandle *
+TALER_DONAU_batch_deposit (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
-  struct TALER_EXCHANGE_Keys *keys,
-  const struct TALER_EXCHANGE_DepositContractDetail *dcd,
+  struct TALER_DONAU_Keys *keys,
+  const struct TALER_DONAU_DepositContractDetail *dcd,
   unsigned int num_cdds,
-  const struct TALER_EXCHANGE_CoinDepositDetail cdds[static num_cdds],
-  TALER_EXCHANGE_BatchDepositResultCallback cb,
+  const struct TALER_DONAU_CoinDepositDetail cdds[static num_cdds],
+  TALER_DONAU_BatchDepositResultCallback cb,
   void *cb_cls,
   enum TALER_ErrorCode *ec);
 
@@ -1237,8 +957,8 @@ TALER_EXCHANGE_batch_deposit (
  * @param[in,out] deposit the batch deposit permission request handle
  */
 void
-TALER_EXCHANGE_batch_deposit_force_dc (
-  struct TALER_EXCHANGE_BatchDepositHandle *deposit);
+TALER_DONAU_batch_deposit_force_dc (
+  struct TALER_DONAU_BatchDepositHandle *deposit);
 
 
 /**
@@ -1248,8 +968,8 @@ TALER_EXCHANGE_batch_deposit_force_dc (
  * @param[in] deposit the deposit permission request handle
  */
 void
-TALER_EXCHANGE_batch_deposit_cancel (
-  struct TALER_EXCHANGE_BatchDepositHandle *deposit);
+TALER_DONAU_batch_deposit_cancel (
+  struct TALER_DONAU_BatchDepositHandle *deposit);
 
 
 /* *********************  /coins/$COIN_PUB/refund *********************** */
@@ -1257,17 +977,17 @@ TALER_EXCHANGE_batch_deposit_cancel (
 /**
  * @brief A Refund Handle
  */
-struct TALER_EXCHANGE_RefundHandle;
+struct TALER_DONAU_RefundHandle;
 
 /**
  * Response from the /refund API.
  */
-struct TALER_EXCHANGE_RefundResponse
+struct TALER_DONAU_RefundResponse
 {
   /**
    * HTTP response data
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Response details depending on the HTTP status code.
@@ -1282,12 +1002,12 @@ struct TALER_EXCHANGE_RefundResponse
       /**
        * Exchange key used to sign.
        */
-      struct TALER_ExchangePublicKeyP exchange_pub;
+      struct TALER_ExchangePublicKeyP donau_pub;
 
       /**
        * The actual signature
        */
-      struct TALER_ExchangeSignatureP exchange_sig;
+      struct TALER_ExchangeSignatureP donau_sig;
     } ok;
   } details;
 };
@@ -1295,31 +1015,31 @@ struct TALER_EXCHANGE_RefundResponse
 
 /**
  * Callbacks of this type are used to serve the result of submitting a
- * refund request to an exchange.
+ * refund request to an donau.
  *
  * @param cls closure
  * @param rr refund response
  */
 typedef void
-(*TALER_EXCHANGE_RefundCallback) (
+(*TALER_DONAU_RefundCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_RefundResponse *rr);
+  const struct TALER_DONAU_RefundResponse *rr);
 
 /**
- * Submit a refund request to the exchange and get the exchange's response.
+ * Submit a refund request to the donau and get the donau's response.
  * This API is used by a merchant.  Note that while we return the response
  * verbatim to the caller for further processing, we do already verify that
  * the response is well-formed (i.e. that signatures included in the response
- * are all valid).  If the exchange's reply is not well-formed, we return an
+ * are all valid).  If the donau's reply is not well-formed, we return an
  * HTTP status code of zero to @a cb.
  *
- * The @a exchange must be ready to operate (i.e.  have
+ * The @a donau must be ready to operate (i.e.  have
  * finished processing the /keys reply).  If this check fails, we do
- * NOT initiate the transaction with the exchange and instead return NULL.
+ * NOT initiate the transaction with the donau and instead return NULL.
  *
  * @param ctx curl context
- * @param url exchange base URL
- * @param keys exchange keys
+ * @param url donau base URL
+ * @param keys donau keys
  * @param amount the amount to be refunded; must be larger than the refund fee
  *        (as that fee is still being subtracted), and smaller than the amount
  *        (with deposit fee) of the original deposit contribution of this coin
@@ -1335,17 +1055,17 @@ typedef void
  * @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_RefundHandle *
-TALER_EXCHANGE_refund (
+struct TALER_DONAU_RefundHandle *
+TALER_DONAU_refund (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
-  struct TALER_EXCHANGE_Keys *keys,
+  struct TALER_DONAU_Keys *keys,
   const struct TALER_Amount *amount,
   const struct TALER_PrivateContractHashP *h_contract_terms,
   const struct TALER_CoinSpendPublicKeyP *coin_pub,
   uint64_t rtransaction_id,
   const struct TALER_MerchantPrivateKeyP *merchant_priv,
-  TALER_EXCHANGE_RefundCallback cb,
+  TALER_DONAU_RefundCallback cb,
   void *cb_cls);
 
 
@@ -1358,7 +1078,7 @@ TALER_EXCHANGE_refund (
  * @param refund the refund request handle
  */
 void
-TALER_EXCHANGE_refund_cancel (struct TALER_EXCHANGE_RefundHandle *refund);
+TALER_DONAU_refund_cancel (struct TALER_DONAU_RefundHandle *refund);
 
 
 /* ********************* POST /csr-melt *********************** */
@@ -1367,18 +1087,18 @@ TALER_EXCHANGE_refund_cancel (struct 
TALER_EXCHANGE_RefundHandle *refund);
 /**
  * @brief A /csr-melt Handle
  */
-struct TALER_EXCHANGE_CsRMeltHandle;
+struct TALER_DONAU_CsRMeltHandle;
 
 
 /**
  * Details about a response for a CS R request.
  */
-struct TALER_EXCHANGE_CsRMeltResponse
+struct TALER_DONAU_CsRMeltResponse
 {
   /**
    * HTTP response data.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Details about the response.
@@ -1396,7 +1116,7 @@ struct TALER_EXCHANGE_CsRMeltResponse
       unsigned int alg_values_len;
 
       /**
-       * Values contributed by the exchange for the
+       * Values contributed by the donau for the
        * respective coin's withdraw operation.
        */
       const struct TALER_ExchangeWithdrawValues *alg_values;
@@ -1416,26 +1136,26 @@ struct TALER_EXCHANGE_CsRMeltResponse
 
 /**
  * Callbacks of this type are used to serve the result of submitting a
- * CS R request to a exchange.
+ * CS R request to a donau.
  *
  * @param cls closure
  * @param csrr response details
  */
 typedef void
-(*TALER_EXCHANGE_CsRMeltCallback) (
+(*TALER_DONAU_CsRMeltCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_CsRMeltResponse *csrr);
+  const struct TALER_DONAU_CsRMeltResponse *csrr);
 
 
 /**
  * Information we pass per coin to a /csr-melt request.
  */
-struct TALER_EXCHANGE_NonceKey
+struct TALER_DONAU_NonceKey
 {
   /**
    * Which denomination key is the /csr-melt request for?
    */
-  const struct TALER_EXCHANGE_DenomPublicKey *pk;
+  const struct TALER_DONAU_DenomPublicKey *pk;
 
   /**
    * What is number to derive the client nonce for the
@@ -1449,24 +1169,24 @@ struct TALER_EXCHANGE_NonceKey
  * Get a set of CS R values using a /csr-melt request.
  *
  * @param ctx curl context
- * @param url exchange base URL
+ * @param url donau base URL
  * @param rms master key used for the derivation of the CS values
  * @param nks_len length of the @a nks array
  * @param nks array of denominations and nonces
  * @param res_cb the callback to call when the final result for this request 
is available
  * @param res_cb_cls closure for the above callback
  * @return handle for the operation on success, NULL on error, i.e.
- *         if the inputs are invalid (i.e. denomination key not with this 
exchange).
+ *         if the inputs are invalid (i.e. denomination key not with this 
donau).
  *         In this case, the callback is not called.
  */
-struct TALER_EXCHANGE_CsRMeltHandle *
-TALER_EXCHANGE_csr_melt (
+struct TALER_DONAU_CsRMeltHandle *
+TALER_DONAU_csr_melt (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
   const struct TALER_RefreshMasterSecretP *rms,
   unsigned int nks_len,
-  struct TALER_EXCHANGE_NonceKey nks[static nks_len],
-  TALER_EXCHANGE_CsRMeltCallback res_cb,
+  struct TALER_DONAU_NonceKey nks[static nks_len],
+  TALER_DONAU_CsRMeltCallback res_cb,
   void *res_cb_cls);
 
 
@@ -1478,7 +1198,7 @@ TALER_EXCHANGE_csr_melt (
  * @param csrh the withdraw handle
  */
 void
-TALER_EXCHANGE_csr_melt_cancel (struct TALER_EXCHANGE_CsRMeltHandle *csrh);
+TALER_DONAU_csr_melt_cancel (struct TALER_DONAU_CsRMeltHandle *csrh);
 
 
 /* ********************* POST /csr-withdraw *********************** */
@@ -1487,18 +1207,18 @@ TALER_EXCHANGE_csr_melt_cancel (struct 
TALER_EXCHANGE_CsRMeltHandle *csrh);
 /**
  * @brief A /csr-withdraw Handle
  */
-struct TALER_EXCHANGE_CsRWithdrawHandle;
+struct TALER_DONAU_CsRWithdrawHandle;
 
 
 /**
  * Details about a response for a CS R request.
  */
-struct TALER_EXCHANGE_CsRWithdrawResponse
+struct TALER_DONAU_CsRWithdrawResponse
 {
   /**
    * HTTP response data.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Details about the response.
@@ -1511,7 +1231,7 @@ struct TALER_EXCHANGE_CsRWithdrawResponse
     struct
     {
       /**
-       * Values contributed by the exchange for the
+       * Values contributed by the donau for the
        * respective coin's withdraw operation.
        */
       struct TALER_ExchangeWithdrawValues alg_values;
@@ -1531,37 +1251,37 @@ struct TALER_EXCHANGE_CsRWithdrawResponse
 
 /**
  * Callbacks of this type are used to serve the result of submitting a
- * CS R withdraw request to a exchange.
+ * CS R withdraw request to a donau.
  *
  * @param cls closure
  * @param csrr response details
  */
 typedef void
-(*TALER_EXCHANGE_CsRWithdrawCallback) (
+(*TALER_DONAU_CsRWithdrawCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_CsRWithdrawResponse *csrr);
+  const struct TALER_DONAU_CsRWithdrawResponse *csrr);
 
 
 /**
  * Get a CS R using a /csr-withdraw request.
  *
  * @param curl_ctx The curl context to use for the requests
- * @param exchange_url Base-URL to the excnange
+ * @param donau_url Base-URL to the excnange
  * @param pk Which denomination key is the /csr request for
  * @param nonce client nonce for the request
  * @param res_cb the callback to call when the final result for this request 
is available
  * @param res_cb_cls closure for the above callback
  * @return handle for the operation on success, NULL on error, i.e.
- *         if the inputs are invalid (i.e. denomination key not with this 
exchange).
+ *         if the inputs are invalid (i.e. denomination key not with this 
donau).
  *         In this case, the callback is not called.
  */
-struct TALER_EXCHANGE_CsRWithdrawHandle *
-TALER_EXCHANGE_csr_withdraw (
+struct TALER_DONAU_CsRWithdrawHandle *
+TALER_DONAU_csr_withdraw (
   struct GNUNET_CURL_Context *curl_ctx,
-  const char *exchange_url,
-  const struct TALER_EXCHANGE_DenomPublicKey *pk,
+  const char *donau_url,
+  const struct TALER_DONAU_DenomPublicKey *pk,
   const struct TALER_CsNonce *nonce,
-  TALER_EXCHANGE_CsRWithdrawCallback res_cb,
+  TALER_DONAU_CsRWithdrawCallback res_cb,
   void *res_cb_cls);
 
 
@@ -1573,8 +1293,8 @@ TALER_EXCHANGE_csr_withdraw (
  * @param csrh the withdraw handle
  */
 void
-TALER_EXCHANGE_csr_withdraw_cancel (
-  struct TALER_EXCHANGE_CsRWithdrawHandle *csrh);
+TALER_DONAU_csr_withdraw_cancel (
+  struct TALER_DONAU_CsRWithdrawHandle *csrh);
 
 
 /* ********************* GET /reserves/$RESERVE_PUB *********************** */
@@ -1582,53 +1302,53 @@ TALER_EXCHANGE_csr_withdraw_cancel (
 /**
  * Ways how a reserve's balance may change.
  */
-enum TALER_EXCHANGE_ReserveTransactionType
+enum TALER_DONAU_ReserveTransactionType
 {
 
   /**
    * Deposit into the reserve.
    */
-  TALER_EXCHANGE_RTT_CREDIT,
+  TALER_DONAU_RTT_CREDIT,
 
   /**
    * Withdrawal from the reserve.
    */
-  TALER_EXCHANGE_RTT_WITHDRAWAL,
+  TALER_DONAU_RTT_WITHDRAWAL,
 
   /**
    * Age-Withdrawal from the reserve.
    */
-  TALER_EXCHANGE_RTT_AGEWITHDRAWAL,
+  TALER_DONAU_RTT_AGEWITHDRAWAL,
 
   /**
    * /recoup operation.
    */
-  TALER_EXCHANGE_RTT_RECOUP,
+  TALER_DONAU_RTT_RECOUP,
 
   /**
    * Reserve closed operation.
    */
-  TALER_EXCHANGE_RTT_CLOSING,
+  TALER_DONAU_RTT_CLOSING,
 
   /**
    * Reserve history request.
    */
-  TALER_EXCHANGE_RTT_HISTORY,
+  TALER_DONAU_RTT_HISTORY,
 
   /**
    * Reserve purse merge operation.
    */
-  TALER_EXCHANGE_RTT_MERGE,
+  TALER_DONAU_RTT_MERGE,
 
   /**
    * Reserve open request operation.
    */
-  TALER_EXCHANGE_RTT_OPEN,
+  TALER_DONAU_RTT_OPEN,
 
   /**
    * Reserve close request operation.
    */
-  TALER_EXCHANGE_RTT_CLOSE
+  TALER_DONAU_RTT_CLOSE
 
 };
 
@@ -1636,13 +1356,13 @@ enum TALER_EXCHANGE_ReserveTransactionType
 /**
  * @brief Entry in the reserve's transaction history.
  */
-struct TALER_EXCHANGE_ReserveHistoryEntry
+struct TALER_DONAU_ReserveHistoryEntry
 {
 
   /**
    * Type of the transaction.
    */
-  enum TALER_EXCHANGE_ReserveTransactionType type;
+  enum TALER_DONAU_ReserveTransactionType type;
 
   /**
    * Amount transferred (in or out).
@@ -1657,7 +1377,7 @@ struct TALER_EXCHANGE_ReserveHistoryEntry
 
     /**
      * Information about a deposit that filled this reserve.
-     * @e type is #TALER_EXCHANGE_RTT_CREDIT.
+     * @e type is #TALER_DONAU_RTT_CREDIT.
      */
     struct
     {
@@ -1680,7 +1400,7 @@ struct TALER_EXCHANGE_ReserveHistoryEntry
 
     /**
      * Information about withdraw operation.
-     * @e type is #TALER_EXCHANGE_RTT_WITHDRAWAL.
+     * @e type is #TALER_DONAU_RTT_WITHDRAWAL.
      */
     struct
     {
@@ -1697,7 +1417,7 @@ struct TALER_EXCHANGE_ReserveHistoryEntry
 
     /**
      * Information about withdraw operation.
-     * @e type is #TALER_EXCHANGE_RTT_AGEWITHDRAWAL.
+     * @e type is #TALER_DONAU_RTT_AGEWITHDRAWAL.
      */
     struct
     {
@@ -1719,7 +1439,7 @@ struct TALER_EXCHANGE_ReserveHistoryEntry
 
     /**
      * Information provided if the reserve was filled via /recoup.
-     * @e type is #TALER_EXCHANGE_RTT_RECOUP.
+     * @e type is #TALER_DONAU_RTT_RECOUP.
      */
     struct
     {
@@ -1731,14 +1451,14 @@ struct TALER_EXCHANGE_ReserveHistoryEntry
 
       /**
        * Signature of the coin of type
-       * #TALER_SIGNATURE_EXCHANGE_CONFIRM_RECOUP.
+       * #TALER_SIGNATURE_DONAU_CONFIRM_RECOUP.
        */
-      struct TALER_ExchangeSignatureP exchange_sig;
+      struct TALER_ExchangeSignatureP donau_sig;
 
       /**
-       * Public key of the exchange that was used for @e exchange_sig.
+       * Public key of the donau that was used for @e donau_sig.
        */
-      struct TALER_ExchangePublicKeyP exchange_pub;
+      struct TALER_ExchangePublicKeyP donau_pub;
 
       /**
        * When did the /recoup operation happen?
@@ -1749,7 +1469,7 @@ struct TALER_EXCHANGE_ReserveHistoryEntry
 
     /**
      * Information about a close operation of the reserve.
-     * @e type is #TALER_EXCHANGE_RTT_CLOSE.
+     * @e type is #TALER_DONAU_RTT_CLOSE.
      */
     struct
     {
@@ -1765,14 +1485,14 @@ struct TALER_EXCHANGE_ReserveHistoryEntry
 
       /**
        * Signature of the coin of type
-       * #TALER_SIGNATURE_EXCHANGE_RESERVE_CLOSED.
+       * #TALER_SIGNATURE_DONAU_RESERVE_CLOSED.
        */
-      struct TALER_ExchangeSignatureP exchange_sig;
+      struct TALER_ExchangeSignatureP donau_sig;
 
       /**
-       * Public key of the exchange that was used for @e exchange_sig.
+       * Public key of the donau that was used for @e donau_sig.
        */
-      struct TALER_ExchangePublicKeyP exchange_pub;
+      struct TALER_ExchangePublicKeyP donau_pub;
 
       /**
        * When did the wire transfer happen?
@@ -1788,7 +1508,7 @@ struct TALER_EXCHANGE_ReserveHistoryEntry
 
     /**
      * Information about a history operation of the reserve.
-     * @e type is #TALER_EXCHANGE_RTT_HISTORY.
+     * @e type is #TALER_DONAU_RTT_HISTORY.
      */
     struct
     {
@@ -1807,7 +1527,7 @@ struct TALER_EXCHANGE_ReserveHistoryEntry
 
     /**
      * Information about a merge operation on the reserve.
-     * @e type is #TALER_EXCHANGE_RTT_MERGE.
+     * @e type is #TALER_DONAU_RTT_MERGE.
      */
     struct
     {
@@ -1867,7 +1587,7 @@ struct TALER_EXCHANGE_ReserveHistoryEntry
 
     /**
      * Information about an open request operation on the reserve.
-     * @e type is #TALER_EXCHANGE_RTT_OPEN.
+     * @e type is #TALER_DONAU_RTT_OPEN.
      */
     struct
     {
@@ -1905,7 +1625,7 @@ struct TALER_EXCHANGE_ReserveHistoryEntry
 
     /**
      * Information about an close request operation on the reserve.
-     * @e type is #TALER_EXCHANGE_RTT_CLOSE.
+     * @e type is #TALER_DONAU_RTT_CLOSE.
      */
     struct
     {
@@ -1938,19 +1658,19 @@ struct TALER_EXCHANGE_ReserveHistoryEntry
 /**
  * @brief A /reserves/ GET Handle
  */
-struct TALER_EXCHANGE_ReservesGetHandle;
+struct TALER_DONAU_ReservesGetHandle;
 
 
 /**
  * @brief Reserve summary.
  */
-struct TALER_EXCHANGE_ReserveSummary
+struct TALER_DONAU_ReserveSummary
 {
 
   /**
    * High-level HTTP response details.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Details depending on @e hr.http_status.
@@ -1979,28 +1699,28 @@ struct TALER_EXCHANGE_ReserveSummary
 
 /**
  * Callbacks of this type are used to serve the result of submitting a
- * reserve status request to a exchange.
+ * reserve status request to a donau.
  *
  * @param cls closure
  * @param rs HTTP response data
  */
 typedef void
-(*TALER_EXCHANGE_ReservesGetCallback) (
+(*TALER_DONAU_ReservesGetCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_ReserveSummary *rs);
+  const struct TALER_DONAU_ReserveSummary *rs);
 
 
 /**
  * Submit a request to obtain the transaction history of a reserve
- * from the exchange.  Note that while we return the full response to the
+ * from the donau.  Note that while we return the full response to the
  * caller for further processing, we do already verify that the
  * response is well-formed (i.e. that signatures included in the
- * response are all valid and add up to the balance).  If the exchange's
+ * response are all valid and add up to the balance).  If the donau's
  * reply is not well-formed, we return an HTTP status code of zero to
  * @a cb.
  *
  * @param ctx curl context
- * @param url exchange base URL
+ * @param url donau base URL
  * @param reserve_pub public key of the reserve to inspect
  * @param timeout how long to wait for an affirmative reply
  *        (enables long polling if the reserve does not yet exist)
@@ -2009,13 +1729,13 @@ typedef void
  * @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_ReservesGetHandle *
-TALER_EXCHANGE_reserves_get (
+struct TALER_DONAU_ReservesGetHandle *
+TALER_DONAU_reserves_get (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
   const struct TALER_ReservePublicKeyP *reserve_pub,
   struct GNUNET_TIME_Relative timeout,
-  TALER_EXCHANGE_ReservesGetCallback cb,
+  TALER_DONAU_ReservesGetCallback cb,
   void *cb_cls);
 
 
@@ -2026,26 +1746,26 @@ TALER_EXCHANGE_reserves_get (
  * @param rgh the reserve request handle
  */
 void
-TALER_EXCHANGE_reserves_get_cancel (
-  struct TALER_EXCHANGE_ReservesGetHandle *rgh);
+TALER_DONAU_reserves_get_cancel (
+  struct TALER_DONAU_ReservesGetHandle *rgh);
 
 
 /**
  * @brief A /reserves/$RID/status Handle
  */
-struct TALER_EXCHANGE_ReservesStatusHandle;
+struct TALER_DONAU_ReservesStatusHandle;
 
 
 /**
  * @brief Reserve status details.
  */
-struct TALER_EXCHANGE_ReserveStatus
+struct TALER_DONAU_ReserveStatus
 {
 
   /**
    * High-level HTTP response details.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Details depending on @e hr.http_status.
@@ -2079,7 +1799,7 @@ struct TALER_EXCHANGE_ReserveStatus
       /**
        * Reserve history.
        */
-      const struct TALER_EXCHANGE_ReserveHistoryEntry *history;
+      const struct TALER_DONAU_ReserveHistoryEntry *history;
 
       /**
        * Length of the @e history array.
@@ -2095,36 +1815,36 @@ struct TALER_EXCHANGE_ReserveStatus
 
 /**
  * Callbacks of this type are used to serve the result of submitting a
- * reserve status request to a exchange.
+ * reserve status request to a donau.
  *
  * @param cls closure
  * @param rs HTTP response data
  */
 typedef void
-(*TALER_EXCHANGE_ReservesStatusCallback) (
+(*TALER_DONAU_ReservesStatusCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_ReserveStatus *rs);
+  const struct TALER_DONAU_ReserveStatus *rs);
 
 
 /**
  * Submit a request to obtain the reserve status.
  *
  * @param ctx curl context
- * @param url exchange base URL
- * @param keys exchange keys
+ * @param url donau base URL
+ * @param keys donau keys
  * @param reserve_priv private key of the reserve to inspect
  * @param cb the callback to call when a reply for this request is available
  * @param cb_cls closure for the above callback
  * @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_ReservesStatusHandle *
-TALER_EXCHANGE_reserves_status (
+struct TALER_DONAU_ReservesStatusHandle *
+TALER_DONAU_reserves_status (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
-  struct TALER_EXCHANGE_Keys *keys,
+  struct TALER_DONAU_Keys *keys,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
-  TALER_EXCHANGE_ReservesStatusCallback cb,
+  TALER_DONAU_ReservesStatusCallback cb,
   void *cb_cls);
 
 
@@ -2135,26 +1855,26 @@ TALER_EXCHANGE_reserves_status (
  * @param rsh the reserve request handle
  */
 void
-TALER_EXCHANGE_reserves_status_cancel (
-  struct TALER_EXCHANGE_ReservesStatusHandle *rsh);
+TALER_DONAU_reserves_status_cancel (
+  struct TALER_DONAU_ReservesStatusHandle *rsh);
 
 
 /**
  * @brief A /reserves/$RID/history Handle
  */
-struct TALER_EXCHANGE_ReservesHistoryHandle;
+struct TALER_DONAU_ReservesHistoryHandle;
 
 
 /**
  * @brief Reserve history details.
  */
-struct TALER_EXCHANGE_ReserveHistory
+struct TALER_DONAU_ReserveHistory
 {
 
   /**
    * High-level HTTP response details.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Timestamp of when we made the history request
@@ -2201,7 +1921,7 @@ struct TALER_EXCHANGE_ReserveHistory
       /**
        * Reserve history.
        */
-      const struct TALER_EXCHANGE_ReserveHistoryEntry *history;
+      const struct TALER_DONAU_ReserveHistoryEntry *history;
 
       /**
        * Length of the @e history array.
@@ -2217,36 +1937,36 @@ struct TALER_EXCHANGE_ReserveHistory
 
 /**
  * Callbacks of this type are used to serve the result of submitting a
- * reserve history request to a exchange.
+ * reserve history request to a donau.
  *
  * @param cls closure
  * @param rs HTTP response data
  */
 typedef void
-(*TALER_EXCHANGE_ReservesHistoryCallback) (
+(*TALER_DONAU_ReservesHistoryCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_ReserveHistory *rs);
+  const struct TALER_DONAU_ReserveHistory *rs);
 
 
 /**
  * Submit a request to obtain the reserve history.
  *
  * @param ctx curl context
- * @param url exchange base URL
- * @param keys exchange keys
+ * @param url donau base URL
+ * @param keys donau keys
  * @param reserve_priv private key of the reserve to inspect
  * @param cb the callback to call when a reply for this request is available
  * @param cb_cls closure for the above callback
  * @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_ReservesHistoryHandle *
-TALER_EXCHANGE_reserves_history (
+struct TALER_DONAU_ReservesHistoryHandle *
+TALER_DONAU_reserves_history (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
-  struct TALER_EXCHANGE_Keys *keys,
+  struct TALER_DONAU_Keys *keys,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
-  TALER_EXCHANGE_ReservesHistoryCallback cb,
+  TALER_DONAU_ReservesHistoryCallback cb,
   void *cb_cls);
 
 
@@ -2257,8 +1977,8 @@ TALER_EXCHANGE_reserves_history (
  * @param rsh the reserve request handle
  */
 void
-TALER_EXCHANGE_reserves_history_cancel (
-  struct TALER_EXCHANGE_ReservesHistoryHandle *rsh);
+TALER_DONAU_reserves_history_cancel (
+  struct TALER_DONAU_ReservesHistoryHandle *rsh);
 
 
 /* ********************* POST /reserves/$RESERVE_PUB/withdraw 
*********************** */
@@ -2267,18 +1987,18 @@ TALER_EXCHANGE_reserves_history_cancel (
 /**
  * @brief A /reserves/$RESERVE_PUB/withdraw Handle
  */
-struct TALER_EXCHANGE_WithdrawHandle;
+struct TALER_DONAU_WithdrawHandle;
 
 
 /**
  * Information input into the withdraw process per coin.
  */
-struct TALER_EXCHANGE_WithdrawCoinInput
+struct TALER_DONAU_WithdrawCoinInput
 {
   /**
    * Denomination of the coin.
    */
-  const struct TALER_EXCHANGE_DenomPublicKey *pk;
+  const struct TALER_DONAU_DenomPublicKey *pk;
 
   /**
    * Master key material for the coin.
@@ -2297,7 +2017,7 @@ struct TALER_EXCHANGE_WithdrawCoinInput
  * All the details about a coin that are generated during withdrawal and that
  * may be needed for future operations on the coin.
  */
-struct TALER_EXCHANGE_PrivateCoinDetails
+struct TALER_DONAU_PrivateCoinDetails
 {
   /**
    * Private key of the coin.
@@ -2316,22 +2036,22 @@ struct TALER_EXCHANGE_PrivateCoinDetails
   struct TALER_DenominationSignature sig;
 
   /**
-   * Values contributed from the exchange during the
+   * Values contributed from the donau during the
    * withdraw protocol.
    */
-  struct TALER_ExchangeWithdrawValues exchange_vals;
+  struct TALER_ExchangeWithdrawValues donau_vals;
 };
 
 
 /**
  * Details about a response for a withdraw request.
  */
-struct TALER_EXCHANGE_WithdrawResponse
+struct TALER_DONAU_WithdrawResponse
 {
   /**
    * HTTP response data.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Details about the response.
@@ -2341,7 +2061,7 @@ struct TALER_EXCHANGE_WithdrawResponse
     /**
      * Details if the status is #MHD_HTTP_OK.
      */
-    struct TALER_EXCHANGE_PrivateCoinDetails ok;
+    struct TALER_DONAU_PrivateCoinDetails ok;
 
     /**
      * Details if the status is #MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS.
@@ -2383,19 +2103,19 @@ struct TALER_EXCHANGE_WithdrawResponse
 
 /**
  * Callbacks of this type are used to serve the result of submitting a
- * withdraw request to a exchange.
+ * withdraw request to a donau.
  *
  * @param cls closure
  * @param wr response details
  */
 typedef void
-(*TALER_EXCHANGE_WithdrawCallback) (
+(*TALER_DONAU_WithdrawCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_WithdrawResponse *wr);
+  const struct TALER_DONAU_WithdrawResponse *wr);
 
 
 /**
- * Withdraw a coin from the exchange using a /reserves/$RESERVE_PUB/withdraw
+ * Withdraw a coin from the donau using a /reserves/$RESERVE_PUB/withdraw
  * request.  This API is typically used by a wallet to withdraw from a
  * reserve.
  *
@@ -2405,24 +2125,24 @@ typedef void
  * same arguments in case of failures.
  *
  * @param curl_ctx The curl context to use
- * @param exchange_url The base-URL of the exchange
- * @param keys The /keys material from the exchange
+ * @param donau_url The base-URL of the donau
+ * @param keys The /keys material from the donau
  * @param reserve_priv private key of the reserve to withdraw from
  * @param wci inputs that determine the planchet
  * @param res_cb the callback to call when the final result for this request 
is available
  * @param res_cb_cls closure for @a res_cb
  * @return NULL
- *         if the inputs are invalid (i.e. denomination key not with this 
exchange).
+ *         if the inputs are invalid (i.e. denomination key not with this 
donau).
  *         In this case, the callback is not called.
  */
-struct TALER_EXCHANGE_WithdrawHandle *
-TALER_EXCHANGE_withdraw (
+struct TALER_DONAU_WithdrawHandle *
+TALER_DONAU_withdraw (
   struct GNUNET_CURL_Context *curl_ctx,
-  const char *exchange_url,
-  struct TALER_EXCHANGE_Keys *keys,
+  const char *donau_url,
+  struct TALER_DONAU_Keys *keys,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
-  const struct TALER_EXCHANGE_WithdrawCoinInput *wci,
-  TALER_EXCHANGE_WithdrawCallback res_cb,
+  const struct TALER_DONAU_WithdrawCoinInput *wci,
+  TALER_DONAU_WithdrawCallback res_cb,
   void *res_cb_cls);
 
 
@@ -2433,24 +2153,24 @@ TALER_EXCHANGE_withdraw (
  * @param wh the withdraw handle
  */
 void
-TALER_EXCHANGE_withdraw_cancel (struct TALER_EXCHANGE_WithdrawHandle *wh);
+TALER_DONAU_withdraw_cancel (struct TALER_DONAU_WithdrawHandle *wh);
 
 
 /**
  * @brief A /reserves/$RESERVE_PUB/batch-withdraw Handle
  */
-struct TALER_EXCHANGE_BatchWithdrawHandle;
+struct TALER_DONAU_BatchWithdrawHandle;
 
 
 /**
  * Details about a response for a batch withdraw request.
  */
-struct TALER_EXCHANGE_BatchWithdrawResponse
+struct TALER_DONAU_BatchWithdrawResponse
 {
   /**
    * HTTP response data.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Details about the response.
@@ -2466,7 +2186,7 @@ struct TALER_EXCHANGE_BatchWithdrawResponse
       /**
        * Array of coins returned by the batch withdraw operation.
        */
-      struct TALER_EXCHANGE_PrivateCoinDetails *coins;
+      struct TALER_DONAU_PrivateCoinDetails *coins;
 
       /**
        * Length of the @e coins array.
@@ -2514,19 +2234,19 @@ struct TALER_EXCHANGE_BatchWithdrawResponse
 
 /**
  * Callbacks of this type are used to serve the result of submitting a
- * batch withdraw request to a exchange.
+ * batch withdraw request to a donau.
  *
  * @param cls closure
  * @param wr response details
  */
 typedef void
-(*TALER_EXCHANGE_BatchWithdrawCallback) (
+(*TALER_DONAU_BatchWithdrawCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_BatchWithdrawResponse *wr);
+  const struct TALER_DONAU_BatchWithdrawResponse *wr);
 
 
 /**
- * Withdraw multiple coins from the exchange using a 
/reserves/$RESERVE_PUB/batch-withdraw
+ * Withdraw multiple coins from the donau using a 
/reserves/$RESERVE_PUB/batch-withdraw
  * request.  This API is typically used by a wallet to withdraw many coins 
from a
  * reserve.
  *
@@ -2536,26 +2256,26 @@ typedef void
  * same arguments in case of failures.
  *
  * @param curl_ctx The curl context to use
- * @param exchange_url The base-URL of the exchange
- * @param keys The /keys material from the exchange
+ * @param donau_url The base-URL of the donau
+ * @param keys The /keys material from the donau
  * @param reserve_priv private key of the reserve to withdraw from
  * @param wci_length number of entries in @a wcis
  * @param wcis inputs that determine the planchets
  * @param res_cb the callback to call when the final result for this request 
is available
  * @param res_cb_cls closure for @a res_cb
  * @return NULL
- *         if the inputs are invalid (i.e. denomination key not with this 
exchange).
+ *         if the inputs are invalid (i.e. denomination key not with this 
donau).
  *         In this case, the callback is not called.
  */
-struct TALER_EXCHANGE_BatchWithdrawHandle *
-TALER_EXCHANGE_batch_withdraw (
+struct TALER_DONAU_BatchWithdrawHandle *
+TALER_DONAU_batch_withdraw (
   struct GNUNET_CURL_Context *curl_ctx,
-  const char *exchange_url,
-  const struct TALER_EXCHANGE_Keys *keys,
+  const char *donau_url,
+  const struct TALER_DONAU_Keys *keys,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
   unsigned int wci_length,
-  const struct TALER_EXCHANGE_WithdrawCoinInput wcis[static wci_length],
-  TALER_EXCHANGE_BatchWithdrawCallback res_cb,
+  const struct TALER_DONAU_WithdrawCoinInput wcis[static wci_length],
+  TALER_DONAU_BatchWithdrawCallback res_cb,
   void *res_cb_cls);
 
 
@@ -2566,19 +2286,19 @@ TALER_EXCHANGE_batch_withdraw (
  * @param wh the batch withdraw handle
  */
 void
-TALER_EXCHANGE_batch_withdraw_cancel (
-  struct TALER_EXCHANGE_BatchWithdrawHandle *wh);
+TALER_DONAU_batch_withdraw_cancel (
+  struct TALER_DONAU_BatchWithdrawHandle *wh);
 
 
 /**
  * Response from a withdraw2 request.
  */
-struct TALER_EXCHANGE_Withdraw2Response
+struct TALER_DONAU_Withdraw2Response
 {
   /**
    * HTTP response data
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Response details depending on the HTTP status.
@@ -2601,29 +2321,29 @@ struct TALER_EXCHANGE_Withdraw2Response
 
 /**
  * Callbacks of this type are used to serve the result of submitting a
- * withdraw request to a exchange without the (un)blinding factor.
+ * withdraw request to a donau without the (un)blinding factor.
  *
  * @param cls closure
  * @param w2r response data
  */
 typedef void
-(*TALER_EXCHANGE_Withdraw2Callback) (
+(*TALER_DONAU_Withdraw2Callback) (
   void *cls,
-  const struct TALER_EXCHANGE_Withdraw2Response *w2r);
+  const struct TALER_DONAU_Withdraw2Response *w2r);
 
 
 /**
  * @brief A /reserves/$RESERVE_PUB/withdraw Handle, 2nd variant.
  * This variant does not do the blinding/unblinding and only
  * fetches the blind signature on the already blinded planchet.
- * Used internally by the `struct TALER_EXCHANGE_WithdrawHandle`
+ * Used internally by the `struct TALER_DONAU_WithdrawHandle`
  * implementation as well as for the tipping logic of merchants.
  */
-struct TALER_EXCHANGE_Withdraw2Handle;
+struct TALER_DONAU_Withdraw2Handle;
 
 
 /**
- * Withdraw a coin from the exchange using a /reserves/$RESERVE_PUB/withdraw
+ * Withdraw a coin from the donau using a /reserves/$RESERVE_PUB/withdraw
  * request.  This API is typically used by a merchant to withdraw a tip
  * where the blinding factor is unknown to the merchant.
  *
@@ -2633,24 +2353,24 @@ struct TALER_EXCHANGE_Withdraw2Handle;
  * same arguments in case of failures.
  *
  * @param curl_ctx The curl-context to use
- * @param exchange_url The base-URL of the exchange
- * @param keys The /keys material from the exchange
+ * @param donau_url The base-URL of the donau
+ * @param keys The /keys material from the donau
  * @param pd planchet details of the planchet to withdraw
  * @param reserve_priv private key of the reserve to withdraw from
  * @param res_cb the callback to call when the final result for this request 
is available
  * @param res_cb_cls closure for @a res_cb
  * @return NULL
- *         if the inputs are invalid (i.e. denomination key not with this 
exchange).
+ *         if the inputs are invalid (i.e. denomination key not with this 
donau).
  *         In this case, the callback is not called.
  */
-struct TALER_EXCHANGE_Withdraw2Handle *
-TALER_EXCHANGE_withdraw2 (
+struct TALER_DONAU_Withdraw2Handle *
+TALER_DONAU_withdraw2 (
   struct GNUNET_CURL_Context *curl_ctx,
-  const char *exchange_url,
-  struct TALER_EXCHANGE_Keys *keys,
+  const char *donau_url,
+  struct TALER_DONAU_Keys *keys,
   const struct TALER_PlanchetDetail *pd,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
-  TALER_EXCHANGE_Withdraw2Callback res_cb,
+  TALER_DONAU_Withdraw2Callback res_cb,
   void *res_cb_cls);
 
 
@@ -2661,18 +2381,18 @@ TALER_EXCHANGE_withdraw2 (
  * @param wh the withdraw handle
  */
 void
-TALER_EXCHANGE_withdraw2_cancel (struct TALER_EXCHANGE_Withdraw2Handle *wh);
+TALER_DONAU_withdraw2_cancel (struct TALER_DONAU_Withdraw2Handle *wh);
 
 
 /**
  * Response from a batch-withdraw request (2nd variant).
  */
-struct TALER_EXCHANGE_BatchWithdraw2Response
+struct TALER_DONAU_BatchWithdraw2Response
 {
   /**
    * HTTP response data
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Response details depending on the HTTP status.
@@ -2702,29 +2422,29 @@ struct TALER_EXCHANGE_BatchWithdraw2Response
 
 /**
  * Callbacks of this type are used to serve the result of submitting a batch
- * withdraw request to a exchange without the (un)blinding factor.
+ * withdraw request to a donau without the (un)blinding factor.
  *
  * @param cls closure
  * @param bw2r response data
  */
 typedef void
-(*TALER_EXCHANGE_BatchWithdraw2Callback) (
+(*TALER_DONAU_BatchWithdraw2Callback) (
   void *cls,
-  const struct TALER_EXCHANGE_BatchWithdraw2Response *bw2r);
+  const struct TALER_DONAU_BatchWithdraw2Response *bw2r);
 
 
 /**
  * @brief A /reserves/$RESERVE_PUB/batch-withdraw Handle, 2nd variant.
  * This variant does not do the blinding/unblinding and only
  * fetches the blind signatures on the already blinded planchets.
- * Used internally by the `struct TALER_EXCHANGE_BatchWithdrawHandle`
+ * Used internally by the `struct TALER_DONAU_BatchWithdrawHandle`
  * implementation as well as for the tipping logic of merchants.
  */
-struct TALER_EXCHANGE_BatchWithdraw2Handle;
+struct TALER_DONAU_BatchWithdraw2Handle;
 
 
 /**
- * Withdraw a coin from the exchange using a 
/reserves/$RESERVE_PUB/batch-withdraw
+ * Withdraw a coin from the donau using a /reserves/$RESERVE_PUB/batch-withdraw
  * request.  This API is typically used by a merchant to withdraw a tip
  * where the blinding factor is unknown to the merchant.
  *
@@ -2734,26 +2454,26 @@ struct TALER_EXCHANGE_BatchWithdraw2Handle;
  * same arguments in case of failures.
  *
  * @param curl_ctx The curl context to use
- * @param exchange_url The base-URL of the exchange
- * @param keys The /keys material from the exchange
+ * @param donau_url The base-URL of the donau
+ * @param keys The /keys material from the donau
  * @param pds array of planchet details of the planchet to withdraw
  * @param pds_length number of entries in the @a pds array
  * @param reserve_priv private key of the reserve to withdraw from
  * @param res_cb the callback to call when the final result for this request 
is available
  * @param res_cb_cls closure for @a res_cb
  * @return NULL
- *         if the inputs are invalid (i.e. denomination key not with this 
exchange).
+ *         if the inputs are invalid (i.e. denomination key not with this 
donau).
  *         In this case, the callback is not called.
  */
-struct TALER_EXCHANGE_BatchWithdraw2Handle *
-TALER_EXCHANGE_batch_withdraw2 (
+struct TALER_DONAU_BatchWithdraw2Handle *
+TALER_DONAU_batch_withdraw2 (
   struct GNUNET_CURL_Context *curl_ctx,
-  const char *exchange_url,
-  const struct TALER_EXCHANGE_Keys *keys,
+  const char *donau_url,
+  const struct TALER_DONAU_Keys *keys,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
   unsigned int pds_length,
   const struct TALER_PlanchetDetail pds[static pds_length],
-  TALER_EXCHANGE_BatchWithdraw2Callback res_cb,
+  TALER_DONAU_BatchWithdraw2Callback res_cb,
   void *res_cb_cls);
 
 
@@ -2764,8 +2484,8 @@ TALER_EXCHANGE_batch_withdraw2 (
  * @param wh the withdraw handle
  */
 void
-TALER_EXCHANGE_batch_withdraw2_cancel (
-  struct TALER_EXCHANGE_BatchWithdraw2Handle *wh);
+TALER_DONAU_batch_withdraw2_cancel (
+  struct TALER_DONAU_BatchWithdraw2Handle *wh);
 
 
 /* ********************* /reserve/$RESERVE_PUB/age-withdraw *************** */
@@ -2773,7 +2493,7 @@ TALER_EXCHANGE_batch_withdraw2_cancel (
 /**
  * @brief Information needed to withdraw (and reveal) age restricted coins.
  */
-struct TALER_EXCHANGE_AgeWithdrawCoinInput
+struct TALER_DONAU_AgeWithdrawCoinInput
 {
   /**
    * The master secret from which we derive all other relevant values for
@@ -2785,7 +2505,7 @@ struct TALER_EXCHANGE_AgeWithdrawCoinInput
    * The denomination of the coin.  Must support age restriction, i.e
    * its .keys.age_mask MUST not be 0
    */
-  struct TALER_EXCHANGE_DenomPublicKey *denom_pub;
+  struct TALER_DONAU_DenomPublicKey *denom_pub;
 };
 
 
@@ -2793,7 +2513,7 @@ struct TALER_EXCHANGE_AgeWithdrawCoinInput
  * All the details about a coin that are generated during age-withdrawal and
  * that may be needed for future operations on the coin.
  */
-struct TALER_EXCHANGE_AgeWithdrawCoinPrivateDetails
+struct TALER_DONAU_AgeWithdrawCoinPrivateDetails
 {
   /**
    * Private key of the coin.
@@ -2823,7 +2543,7 @@ struct TALER_EXCHANGE_AgeWithdrawCoinPrivateDetails
   struct TALER_AgeCommitmentHash h_age_commitment;
 
   /**
-   * Values contributed from the exchange during the
+   * Values contributed from the donau during the
    * withdraw protocol.
    */
   struct TALER_ExchangeWithdrawValues alg_values;
@@ -2837,17 +2557,17 @@ struct TALER_EXCHANGE_AgeWithdrawCoinPrivateDetails
 /**
  * @brief A handle to a /reserves/$RESERVE_PUB/age-withdraw request
  */
-struct TALER_EXCHANGE_AgeWithdrawHandle;
+struct TALER_DONAU_AgeWithdrawHandle;
 
 /**
  * @brief Details about the response for a age withdraw request.
  */
-struct TALER_EXCHANGE_AgeWithdrawResponse
+struct TALER_DONAU_AgeWithdrawResponse
 {
   /**
    * HTTP response data.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Details about the response
@@ -2880,7 +2600,7 @@ struct TALER_EXCHANGE_AgeWithdrawResponse
       /**
        * The computed details of the non-revealed @e num_coins coins to keep.
        */
-      const struct TALER_EXCHANGE_AgeWithdrawCoinPrivateDetails *coin_details;
+      const struct TALER_DONAU_AgeWithdrawCoinPrivateDetails *coin_details;
 
       /**
        * The array of blinded hashes of the non-revealed
@@ -2889,20 +2609,20 @@ struct TALER_EXCHANGE_AgeWithdrawResponse
       const struct TALER_BlindedCoinHashP *blinded_coin_hs;
 
       /**
-       * Key used by the exchange to sign the response.
+       * Key used by the donau to sign the response.
        */
-      struct TALER_ExchangePublicKeyP exchange_pub;
+      struct TALER_ExchangePublicKeyP donau_pub;
     } ok;
   } details;
 };
 
 typedef void
-(*TALER_EXCHANGE_AgeWithdrawCallback)(
+(*TALER_DONAU_AgeWithdrawCallback)(
   void *cls,
-  const struct TALER_EXCHANGE_AgeWithdrawResponse *awr);
+  const struct TALER_DONAU_AgeWithdrawResponse *awr);
 
 /**
- * Submit an age-withdraw request to the exchange and get the exchange's
+ * Submit an age-withdraw request to the donau and get the donau's
  * response.
  *
  * This API is typically used by a wallet.  Note that to ensure that
@@ -2911,8 +2631,8 @@ typedef void
  * prior to calling this function.
  *
  * @param curl_ctx The curl context
- * @param exchange_url The base url of the exchange
- * @param keys The denomination keys from the exchange
+ * @param donau_url The base url of the donau
+ * @param keys The denomination keys from the donau
  * @param reserve_priv The pivate key to the reserve
  * @param num_coins The number of elements in @e coin_inputs
  * @param coin_inputs The input for the coins to withdraw
@@ -2922,17 +2642,17 @@ typedef void
  * @return a handle for this request; NULL if the argument was invalid.
  *         In this case, the callback will not be called.
  */
-struct TALER_EXCHANGE_AgeWithdrawHandle *
-TALER_EXCHANGE_age_withdraw (
+struct TALER_DONAU_AgeWithdrawHandle *
+TALER_DONAU_age_withdraw (
   struct GNUNET_CURL_Context *curl_ctx,
-  struct TALER_EXCHANGE_Keys *keys,
-  const char *exchange_url,
+  struct TALER_DONAU_Keys *keys,
+  const char *donau_url,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
   size_t num_coins,
-  const struct TALER_EXCHANGE_AgeWithdrawCoinInput coin_inputs[static
+  const struct TALER_DONAU_AgeWithdrawCoinInput coin_inputs[static
                                                                num_coins],
   uint8_t max_age,
-  TALER_EXCHANGE_AgeWithdrawCallback res_cb,
+  TALER_DONAU_AgeWithdrawCallback res_cb,
   void *res_cb_cls);
 
 /**
@@ -2942,8 +2662,8 @@ TALER_EXCHANGE_age_withdraw (
  * @param awh the age-withdraw handle
  */
 void
-TALER_EXCHANGE_age_withdraw_cancel (
-  struct TALER_EXCHANGE_AgeWithdrawHandle *awh);
+TALER_DONAU_age_withdraw_cancel (
+  struct TALER_DONAU_AgeWithdrawHandle *awh);
 
 
 /**++++++ age-withdraw with pre-blinded planchets ***************************/
@@ -2951,13 +2671,13 @@ TALER_EXCHANGE_age_withdraw_cancel (
 /**
  * @brief Information needed to withdraw (and reveal) age restricted coins.
  */
-struct TALER_EXCHANGE_AgeWithdrawBlindedInput
+struct TALER_DONAU_AgeWithdrawBlindedInput
 {
   /**
    * The denomination of the coin.  Must support age restriction, i.e
    * its .keys.age_mask MUST not be 0
    */
-  const struct TALER_EXCHANGE_DenomPublicKey *denom_pub;
+  const struct TALER_DONAU_DenomPublicKey *denom_pub;
 
   /**
    * Blinded Planchets
@@ -2968,12 +2688,12 @@ struct TALER_EXCHANGE_AgeWithdrawBlindedInput
 /**
  * Response from an age-withdraw request with pre-blinded planchets
  */
-struct TALER_EXCHANGE_AgeWithdrawBlindedResponse
+struct TALER_DONAU_AgeWithdrawBlindedResponse
 {
   /**
    * HTTP response data
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Response details depending on the HTTP status.
@@ -2999,9 +2719,9 @@ struct TALER_EXCHANGE_AgeWithdrawBlindedResponse
       struct TALER_AgeWithdrawCommitmentHashP h_commitment;
 
       /**
-       * Key used by the exchange to sign the response.
+       * Key used by the donau to sign the response.
        */
-      struct TALER_ExchangePublicKeyP exchange_pub;
+      struct TALER_ExchangePublicKeyP donau_pub;
 
     } ok;
   } details;
@@ -3011,16 +2731,16 @@ struct TALER_EXCHANGE_AgeWithdrawBlindedResponse
 
 /**
  * Callbacks of this type are used to serve the result of submitting an
- * age-withdraw request to a exchange with pre-blinded planchets
+ * age-withdraw request to a donau with pre-blinded planchets
  * without the (un)blinding factor.
  *
  * @param cls closure
  * @param awbr response data
  */
 typedef void
-(*TALER_EXCHANGE_AgeWithdrawBlindedCallback) (
+(*TALER_DONAU_AgeWithdrawBlindedCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_AgeWithdrawBlindedResponse *awbr);
+  const struct TALER_DONAU_AgeWithdrawBlindedResponse *awbr);
 
 
 /**
@@ -3029,13 +2749,13 @@ typedef void
  *
  * This variant does not do the blinding/unblinding and only
  * fetches the blind signatures on the already blinded planchets.
- * Used internally by the `struct TALER_EXCHANGE_BatchWithdrawHandle`
+ * Used internally by the `struct TALER_DONAU_BatchWithdrawHandle`
  * implementation as well as for the reward logic of merchants.
  */
-struct TALER_EXCHANGE_AgeWithdrawBlindedHandle;
+struct TALER_DONAU_AgeWithdrawBlindedHandle;
 
 /**
- * Withdraw age-restricted coins from the exchange using a
+ * Withdraw age-restricted coins from the donau using a
  * /reserves/$RESERVE_PUB/age-withdraw request.  This API is typically used
  * by a merchant to withdraw a reward where the planchets are pre-blinded and
  * the blinding factor is unknown to the merchant.
@@ -3046,8 +2766,8 @@ struct TALER_EXCHANGE_AgeWithdrawBlindedHandle;
  * same arguments in case of failures.
  *
  * @param curl_ctx The curl context to use
- * @param exchange_url The base-URL of the exchange
- * @param keys The /keys material from the exchange
+ * @param donau_url The base-URL of the donau
+ * @param keys The /keys material from the donau
  * @param max_age The maximum age that the coins are committed to.
  * @param num_input number of entries in the @a blinded_input array
  * @param blinded_input array of planchet details of the planchet to withdraw
@@ -3055,20 +2775,20 @@ struct TALER_EXCHANGE_AgeWithdrawBlindedHandle;
  * @param res_cb the callback to call when the final result for this request 
is available
  * @param res_cb_cls closure for @a res_cb
  * @return NULL
- *         if the inputs are invalid (i.e. denomination key not with this 
exchange).
+ *         if the inputs are invalid (i.e. denomination key not with this 
donau).
  *         In this case, the callback is not called.
  */
-struct TALER_EXCHANGE_AgeWithdrawBlindedHandle *
-TALER_EXCHANGE_age_withdraw_blinded (
+struct TALER_DONAU_AgeWithdrawBlindedHandle *
+TALER_DONAU_age_withdraw_blinded (
   struct GNUNET_CURL_Context *curl_ctx,
-  struct TALER_EXCHANGE_Keys *keys,
-  const char *exchange_url,
+  struct TALER_DONAU_Keys *keys,
+  const char *donau_url,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
   uint8_t max_age,
   unsigned int num_input,
-  const struct TALER_EXCHANGE_AgeWithdrawBlindedInput blinded_input[static
+  const struct TALER_DONAU_AgeWithdrawBlindedInput blinded_input[static
                                                                     num_input],
-  TALER_EXCHANGE_AgeWithdrawBlindedCallback res_cb,
+  TALER_DONAU_AgeWithdrawBlindedCallback res_cb,
   void *res_cb_cls);
 
 
@@ -3079,8 +2799,8 @@ TALER_EXCHANGE_age_withdraw_blinded (
  * @param awbh the age-withdraw handle
  */
 void
-TALER_EXCHANGE_age_withdraw_blinded_cancel (
-  struct TALER_EXCHANGE_AgeWithdrawBlindedHandle *awbh);
+TALER_DONAU_age_withdraw_blinded_cancel (
+  struct TALER_DONAU_AgeWithdrawBlindedHandle *awbh);
 
 
 /* ********************* /age-withdraw/$ACH/reveal ************************ */
@@ -3088,17 +2808,17 @@ TALER_EXCHANGE_age_withdraw_blinded_cancel (
 /**
  * @brief A handle to a /age-withdraw/$ACH/reveal request
  */
-struct TALER_EXCHANGE_AgeWithdrawRevealHandle;
+struct TALER_DONAU_AgeWithdrawRevealHandle;
 
 /**
  * The response from a /age-withdraw/$ACH/reveal request
  */
-struct TALER_EXCHANGE_AgeWithdrawRevealResponse
+struct TALER_DONAU_AgeWithdrawRevealResponse
 {
   /**
    * HTTP response data.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Details about the response
@@ -3129,12 +2849,12 @@ struct TALER_EXCHANGE_AgeWithdrawRevealResponse
 };
 
 typedef void
-(*TALER_EXCHANGE_AgeWithdrawRevealCallback)(
+(*TALER_DONAU_AgeWithdrawRevealCallback)(
   void *cls,
-  const struct TALER_EXCHANGE_AgeWithdrawRevealResponse *awr);
+  const struct TALER_DONAU_AgeWithdrawRevealResponse *awr);
 
 /**
- * Submit an age-withdraw-reveal request to the exchange and get the exchange's
+ * Submit an age-withdraw-reveal request to the donau and get the donau's
  * response.
  *
  * This API is typically used by a wallet.  Note that to ensure that
@@ -3143,10 +2863,10 @@ typedef void
  * prior to calling this function.
  *
  * @param curl_ctx The curl context
- * @param exchange_url The base url of the exchange
+ * @param donau_url The base url of the donau
  * @param num_coins The number of elements in @e coin_inputs and @e alg_values
  * @param coin_inputs The input for the coins to withdraw, same as in the 
previous call to /age-withdraw
- * @param noreveal_index The index into each of the kappa coin candidates, 
that should not be revealed to the exchange
+ * @param noreveal_index The index into each of the kappa coin candidates, 
that should not be revealed to the donau
  * @param h_commitment The commmitment from the previous call to /age-withdraw
  * @param reserve_pub The public key of the reserve the original call to 
/age-withdraw was made to
  * @param res_cb A callback for the result, maybe NULL
@@ -3154,17 +2874,17 @@ typedef void
  * @return a handle for this request; NULL if the argument was invalid.
  *         In this case, the callback will not be called.
  */
-struct TALER_EXCHANGE_AgeWithdrawRevealHandle *
-TALER_EXCHANGE_age_withdraw_reveal (
+struct TALER_DONAU_AgeWithdrawRevealHandle *
+TALER_DONAU_age_withdraw_reveal (
   struct GNUNET_CURL_Context *curl_ctx,
-  const char *exchange_url,
+  const char *donau_url,
   size_t num_coins,
-  const struct TALER_EXCHANGE_AgeWithdrawCoinInput coin_inputs[static
+  const struct TALER_DONAU_AgeWithdrawCoinInput coin_inputs[static
                                                                num_coins],
   uint8_t noreveal_index,
   const struct TALER_AgeWithdrawCommitmentHashP *h_commitment,
   const struct TALER_ReservePublicKeyP *reserve_pub,
-  TALER_EXCHANGE_AgeWithdrawRevealCallback res_cb,
+  TALER_DONAU_AgeWithdrawRevealCallback res_cb,
   void *res_cb_cls);
 
 
@@ -3174,8 +2894,8 @@ TALER_EXCHANGE_age_withdraw_reveal (
  * @param awrh Handle to an age-withdraw-reqveal request
  */
 void
-TALER_EXCHANGE_age_withdraw_reveal_cancel (
-  struct TALER_EXCHANGE_AgeWithdrawRevealHandle *awrh);
+TALER_DONAU_age_withdraw_reveal_cancel (
+  struct TALER_DONAU_AgeWithdrawRevealHandle *awrh);
 
 
 /* ********************* /refresh/melt+reveal ***************************** */
@@ -3187,7 +2907,7 @@ TALER_EXCHANGE_age_withdraw_reveal_cancel (
  * one coin in a single request will make those coins linkable, so we only melt
  * one coin at a time.
  */
-struct TALER_EXCHANGE_RefreshData
+struct TALER_DONAU_RefreshData
 {
   /**
    * private key of the coin to melt
@@ -3217,12 +2937,12 @@ struct TALER_EXCHANGE_RefreshData
    * denomination key information record corresponding to the @e melt_sig
    * validity of the keys
    */
-  struct TALER_EXCHANGE_DenomPublicKey melt_pk;
+  struct TALER_DONAU_DenomPublicKey melt_pk;
 
   /**
    * array of @e pks_len denominations of fresh coins to create
    */
-  const struct TALER_EXCHANGE_DenomPublicKey *fresh_pks;
+  const struct TALER_DONAU_DenomPublicKey *fresh_pks;
 
   /**
    * length of the @e pks array
@@ -3236,13 +2956,13 @@ struct TALER_EXCHANGE_RefreshData
 /**
  * @brief A /coins/$COIN_PUB/melt Handle
  */
-struct TALER_EXCHANGE_MeltHandle;
+struct TALER_DONAU_MeltHandle;
 
 
 /**
  * Information we obtain per coin during melting.
  */
-struct TALER_EXCHANGE_MeltBlindingDetail
+struct TALER_DONAU_MeltBlindingDetail
 {
   /**
    * Exchange values contributed to the refresh operation
@@ -3255,12 +2975,12 @@ struct TALER_EXCHANGE_MeltBlindingDetail
 /**
  * Response returned to a /melt request.
  */
-struct TALER_EXCHANGE_MeltResponse
+struct TALER_DONAU_MeltResponse
 {
   /**
    * Full HTTP response details.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Parsed response details, variant depending on the
@@ -3277,21 +2997,21 @@ struct TALER_EXCHANGE_MeltResponse
       /**
        * Information returned per coin.
        */
-      const struct TALER_EXCHANGE_MeltBlindingDetail *mbds;
+      const struct TALER_DONAU_MeltBlindingDetail *mbds;
 
       /**
-       * Key used by the exchange to sign the response.
+       * Key used by the donau to sign the response.
        */
       struct TALER_ExchangePublicKeyP sign_key;
 
       /**
-       * Length of the @a mbds array with the exchange values
+       * Length of the @a mbds array with the donau values
        * and blinding keys we are using.
        */
       unsigned int num_mbds;
 
       /**
-       * Gamma value chosen by the exchange.
+       * Gamma value chosen by the donau.
        */
       uint32_t noreveal_index;
     } ok;
@@ -3304,19 +3024,19 @@ struct TALER_EXCHANGE_MeltResponse
  * Callbacks of this type are used to notify the application about the result
  * of the /coins/$COIN_PUB/melt stage.  If successful, the @a noreveal_index
  * should be committed to disk prior to proceeding
- * #TALER_EXCHANGE_refreshes_reveal().
+ * #TALER_DONAU_refreshes_reveal().
  *
  * @param cls closure
  * @param mr response details
  */
 typedef void
-(*TALER_EXCHANGE_MeltCallback) (
+(*TALER_DONAU_MeltCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_MeltResponse *mr);
+  const struct TALER_DONAU_MeltResponse *mr);
 
 
 /**
- * Submit a melt request to the exchange and get the exchange's
+ * Submit a melt request to the donau and get the donau's
  * response.
  *
  * This API is typically used by a wallet.  Note that to ensure that
@@ -3325,8 +3045,8 @@ typedef void
  * prior to calling this function.
  *
  * @param ctx curl context
- * @param url exchange base URL
- * @param keys exchange keys
+ * @param url donau base URL
+ * @param keys donau keys
  * @param rms the fresh secret that defines the refresh operation
  * @param rd the refresh data specifying the characteristics of the operation
  * @param melt_cb the callback to call with the result
@@ -3334,14 +3054,14 @@ typedef void
  * @return a handle for this request; NULL if the argument was invalid.
  *         In this case, neither callback will be called.
  */
-struct TALER_EXCHANGE_MeltHandle *
-TALER_EXCHANGE_melt (
+struct TALER_DONAU_MeltHandle *
+TALER_DONAU_melt (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
-  struct TALER_EXCHANGE_Keys *keys,
+  struct TALER_DONAU_Keys *keys,
   const struct TALER_RefreshMasterSecretP *rms,
-  const struct TALER_EXCHANGE_RefreshData *rd,
-  TALER_EXCHANGE_MeltCallback melt_cb,
+  const struct TALER_DONAU_RefreshData *rd,
+  TALER_DONAU_MeltCallback melt_cb,
   void *melt_cb_cls);
 
 
@@ -3352,7 +3072,7 @@ TALER_EXCHANGE_melt (
  * @param mh the melt handle
  */
 void
-TALER_EXCHANGE_melt_cancel (struct TALER_EXCHANGE_MeltHandle *mh);
+TALER_DONAU_melt_cancel (struct TALER_DONAU_MeltHandle *mh);
 
 
 /* ********************* /refreshes/$RCH/reveal ***************************** 
*/
@@ -3361,7 +3081,7 @@ TALER_EXCHANGE_melt_cancel (struct 
TALER_EXCHANGE_MeltHandle *mh);
 /**
  * Information about a coin obtained via /refreshes/$RCH/reveal.
  */
-struct TALER_EXCHANGE_RevealedCoinInfo
+struct TALER_DONAU_RevealedCoinInfo
 {
   /**
    * Private key of the coin.
@@ -3395,12 +3115,12 @@ struct TALER_EXCHANGE_RevealedCoinInfo
 /**
  * Result of a /refreshes/$RCH/reveal request.
  */
-struct TALER_EXCHANGE_RevealResult
+struct TALER_DONAU_RevealResult
 {
   /**
    * HTTP status.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Parsed response details, variant depending on the
@@ -3419,7 +3139,7 @@ struct TALER_EXCHANGE_RevealResult
        * have the same length) in which the original melt request specified the
        * respective denomination keys.
        */
-      const struct TALER_EXCHANGE_RevealedCoinInfo *coins;
+      const struct TALER_DONAU_RevealedCoinInfo *coins;
 
       /**
        * Number of coins returned.
@@ -3434,7 +3154,7 @@ struct TALER_EXCHANGE_RevealResult
 
 /**
  * Callbacks of this type are used to return the final result of
- * submitting a refresh request to a exchange.  If the operation was
+ * submitting a refresh request to a donau.  If the operation was
  * successful, this function returns the signatures over the coins
  * that were remelted.
  *
@@ -3442,19 +3162,19 @@ struct TALER_EXCHANGE_RevealResult
  * @param rr result of the reveal operation
  */
 typedef void
-(*TALER_EXCHANGE_RefreshesRevealCallback)(
+(*TALER_DONAU_RefreshesRevealCallback)(
   void *cls,
-  const struct TALER_EXCHANGE_RevealResult *rr);
+  const struct TALER_DONAU_RevealResult *rr);
 
 
 /**
  * @brief A /refreshes/$RCH/reveal Handle
  */
-struct TALER_EXCHANGE_RefreshesRevealHandle;
+struct TALER_DONAU_RefreshesRevealHandle;
 
 
 /**
- * Submit a /refreshes/$RCH/reval request to the exchange and get the 
exchange's
+ * Submit a /refreshes/$RCH/reval request to the donau and get the donau's
  * response.
  *
  * This API is typically used by a wallet.  Note that to ensure that
@@ -3463,29 +3183,29 @@ struct TALER_EXCHANGE_RefreshesRevealHandle;
  * prior to calling this function.
  *
  * @param ctx curl context
- * @param url exchange base URL
+ * @param url donau base URL
  * @param rms the fresh secret that defines the refresh operation
  * @param rd the refresh data that characterizes the refresh operation
- * @param num_coins number of fresh coins to be created, length of the @a 
exchange_vals array, must match value in @a rd
- * @param alg_values array @a num_coins of exchange values contributed to the 
refresh operation
- * @param noreveal_index response from the exchange to the
- *        #TALER_EXCHANGE_melt() invocation
+ * @param num_coins number of fresh coins to be created, length of the @a 
donau_vals array, must match value in @a rd
+ * @param alg_values array @a num_coins of donau values contributed to the 
refresh operation
+ * @param noreveal_index response from the donau to the
+ *        #TALER_DONAU_melt() invocation
  * @param reveal_cb the callback to call with the final result of the
  *        refresh operation
  * @param reveal_cb_cls closure for the above callback
  * @return a handle for this request; NULL if the argument was invalid.
  *         In this case, neither callback will be called.
  */
-struct TALER_EXCHANGE_RefreshesRevealHandle *
-TALER_EXCHANGE_refreshes_reveal (
+struct TALER_DONAU_RefreshesRevealHandle *
+TALER_DONAU_refreshes_reveal (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
   const struct TALER_RefreshMasterSecretP *rms,
-  const struct TALER_EXCHANGE_RefreshData *rd,
+  const struct TALER_DONAU_RefreshData *rd,
   unsigned int num_coins,
   const struct TALER_ExchangeWithdrawValues alg_values[static num_coins],
   uint32_t noreveal_index,
-  TALER_EXCHANGE_RefreshesRevealCallback reveal_cb,
+  TALER_DONAU_RefreshesRevealCallback reveal_cb,
   void *reveal_cb_cls);
 
 
@@ -3496,8 +3216,8 @@ TALER_EXCHANGE_refreshes_reveal (
  * @param rrh the refresh reval handle
  */
 void
-TALER_EXCHANGE_refreshes_reveal_cancel (
-  struct TALER_EXCHANGE_RefreshesRevealHandle *rrh);
+TALER_DONAU_refreshes_reveal_cancel (
+  struct TALER_DONAU_RefreshesRevealHandle *rrh);
 
 
 /* ********************* /coins/$COIN_PUB/link ***************************** */
@@ -3506,13 +3226,13 @@ TALER_EXCHANGE_refreshes_reveal_cancel (
 /**
  * @brief A /coins/$COIN_PUB/link Handle
  */
-struct TALER_EXCHANGE_LinkHandle;
+struct TALER_DONAU_LinkHandle;
 
 
 /**
  * Information about a coin obtained via /link.
  */
-struct TALER_EXCHANGE_LinkedCoinInfo
+struct TALER_DONAU_LinkedCoinInfo
 {
   /**
    * Private key of the coin.
@@ -3546,12 +3266,12 @@ struct TALER_EXCHANGE_LinkedCoinInfo
 /**
  * Result of a /link request.
  */
-struct TALER_EXCHANGE_LinkResult
+struct TALER_DONAU_LinkResult
 {
   /**
    * HTTP status.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Parsed response details, variant depending on the
@@ -3568,7 +3288,7 @@ struct TALER_EXCHANGE_LinkResult
        * Array of @e num_coins values about the
        * coins obtained via linkage.
        */
-      const struct TALER_EXCHANGE_LinkedCoinInfo *coins;
+      const struct TALER_DONAU_LinkedCoinInfo *coins;
 
       /**
        * Number of coins returned.
@@ -3583,7 +3303,7 @@ struct TALER_EXCHANGE_LinkResult
 
 /**
  * Callbacks of this type are used to return the final result of submitting a
- * /coins/$COIN_PUB/link request to a exchange.  If the operation was
+ * /coins/$COIN_PUB/link request to a donau.  If the operation was
  * successful, this function returns the signatures over the coins that were
  * created when the original coin was melted.
  *
@@ -3591,19 +3311,19 @@ struct TALER_EXCHANGE_LinkResult
  * @param lr result of the /link operation
  */
 typedef void
-(*TALER_EXCHANGE_LinkCallback) (
+(*TALER_DONAU_LinkCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_LinkResult *lr);
+  const struct TALER_DONAU_LinkResult *lr);
 
 
 /**
- * Submit a link request to the exchange and get the exchange's response.
+ * Submit a link request to the donau and get the donau's response.
  *
  * This API is typically not used by anyone, it is more a threat against those
  * trying to receive a funds transfer by abusing the refresh protocol.
  *
  * @param ctx CURL context
- * @param url exchange base URL
+ * @param url donau base URL
  * @param coin_priv private key to request link data for
  * @param age_commitment_proof age commitment to the corresponding coin, might 
be NULL
  * @param link_cb the callback to call with the useful result of the
@@ -3611,13 +3331,13 @@ typedef void
  * @param link_cb_cls closure for @a link_cb
  * @return a handle for this request
  */
-struct TALER_EXCHANGE_LinkHandle *
-TALER_EXCHANGE_link (
+struct TALER_DONAU_LinkHandle *
+TALER_DONAU_link (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
   const struct TALER_CoinSpendPrivateKeyP *coin_priv,
   const struct TALER_AgeCommitmentProof *age_commitment_proof,
-  TALER_EXCHANGE_LinkCallback link_cb,
+  TALER_DONAU_LinkCallback link_cb,
   void *link_cb_cls);
 
 
@@ -3628,7 +3348,7 @@ TALER_EXCHANGE_link (
  * @param lh the link handle
  */
 void
-TALER_EXCHANGE_link_cancel (struct TALER_EXCHANGE_LinkHandle *lh);
+TALER_DONAU_link_cancel (struct TALER_DONAU_LinkHandle *lh);
 
 
 /* ********************* /transfers/$WTID *********************** */
@@ -3636,24 +3356,24 @@ TALER_EXCHANGE_link_cancel (struct 
TALER_EXCHANGE_LinkHandle *lh);
 /**
  * @brief A /transfers/$WTID Handle
  */
-struct TALER_EXCHANGE_TransfersGetHandle;
+struct TALER_DONAU_TransfersGetHandle;
 
 
 /**
- * Information the exchange returns per wire transfer.
+ * Information the donau returns per wire transfer.
  */
-struct TALER_EXCHANGE_TransferData
+struct TALER_DONAU_TransferData
 {
 
   /**
-   * exchange key used to sign
+   * donau key used to sign
    */
-  struct TALER_ExchangePublicKeyP exchange_pub;
+  struct TALER_ExchangePublicKeyP donau_pub;
 
   /**
-   * exchange signature over the transfer data
+   * donau signature over the transfer data
    */
-  struct TALER_ExchangeSignatureP exchange_sig;
+  struct TALER_ExchangeSignatureP donau_sig;
 
   /**
    * hash of the payto:// URI the transfer went to
@@ -3661,7 +3381,7 @@ struct TALER_EXCHANGE_TransferData
   struct TALER_PaytoHashP h_payto;
 
   /**
-   * time when the exchange claims to have performed the wire transfer
+   * time when the donau claims to have performed the wire transfer
    */
   struct GNUNET_TIME_Timestamp execution_time;
 
@@ -3671,7 +3391,7 @@ struct TALER_EXCHANGE_TransferData
   struct TALER_Amount total_amount;
 
   /**
-   * wire fee that was charged by the exchange
+   * wire fee that was charged by the donau
    */
   struct TALER_Amount wire_fee;
 
@@ -3691,12 +3411,12 @@ struct TALER_EXCHANGE_TransferData
 /**
  * Response for a GET /transfers request.
  */
-struct TALER_EXCHANGE_TransfersGetResponse
+struct TALER_DONAU_TransfersGetResponse
 {
   /**
    * HTTP response.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Details depending on HTTP status code.
@@ -3708,7 +3428,7 @@ struct TALER_EXCHANGE_TransfersGetResponse
      */
     struct
     {
-      struct TALER_EXCHANGE_TransferData td;
+      struct TALER_DONAU_TransferData td;
     } ok;
 
   } details;
@@ -3723,30 +3443,30 @@ struct TALER_EXCHANGE_TransfersGetResponse
  * @param tgr response data
  */
 typedef void
-(*TALER_EXCHANGE_TransfersGetCallback)(
+(*TALER_DONAU_TransfersGetCallback)(
   void *cls,
-  const struct TALER_EXCHANGE_TransfersGetResponse *tgr);
+  const struct TALER_DONAU_TransfersGetResponse *tgr);
 
 
 /**
- * Query the exchange about which transactions were combined
+ * Query the donau about which transactions were combined
  * to create a wire transfer.
  *
  * @param ctx curl context
- * @param url exchange base URL
- * @param keys exchange keys
+ * @param url donau base URL
+ * @param keys donau keys
  * @param wtid raw wire transfer identifier to get information about
  * @param cb callback to call
  * @param cb_cls closure for @a cb
  * @return handle to cancel operation
  */
-struct TALER_EXCHANGE_TransfersGetHandle *
-TALER_EXCHANGE_transfers_get (
+struct TALER_DONAU_TransfersGetHandle *
+TALER_DONAU_transfers_get (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
-  struct TALER_EXCHANGE_Keys *keys,
+  struct TALER_DONAU_Keys *keys,
   const struct TALER_WireTransferIdentifierRawP *wtid,
-  TALER_EXCHANGE_TransfersGetCallback cb,
+  TALER_DONAU_TransfersGetCallback cb,
   void *cb_cls);
 
 
@@ -3757,8 +3477,8 @@ TALER_EXCHANGE_transfers_get (
  * @param wdh the wire deposits request handle
  */
 void
-TALER_EXCHANGE_transfers_get_cancel (
-  struct TALER_EXCHANGE_TransfersGetHandle *wdh);
+TALER_DONAU_transfers_get_cancel (
+  struct TALER_DONAU_TransfersGetHandle *wdh);
 
 
 /* ********************* GET /deposits/ *********************** */
@@ -3767,19 +3487,19 @@ TALER_EXCHANGE_transfers_get_cancel (
 /**
  * @brief A /deposits/ GET Handle
  */
-struct TALER_EXCHANGE_DepositGetHandle;
+struct TALER_DONAU_DepositGetHandle;
 
 
 /**
  * Data returned for a successful GET /deposits/ request.
  */
-struct TALER_EXCHANGE_GetDepositResponse
+struct TALER_DONAU_GetDepositResponse
 {
 
   /**
    * HTTP response data.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Details about the response.
@@ -3790,22 +3510,22 @@ struct TALER_EXCHANGE_GetDepositResponse
     /**
      * Response if the status was #MHD_HTTP_OK
      */
-    struct TALER_EXCHANGE_DepositData
+    struct TALER_DONAU_DepositData
     {
       /**
-       * exchange key used to sign, all zeros if exchange did not
+       * donau key used to sign, all zeros if donau did not
        * yet execute the transaction
        */
-      struct TALER_ExchangePublicKeyP exchange_pub;
+      struct TALER_ExchangePublicKeyP donau_pub;
 
       /**
-       * signature from the exchange over the deposit data, all zeros if 
exchange did not
+       * signature from the donau over the deposit data, all zeros if donau 
did not
        * yet execute the transaction
        */
-      struct TALER_ExchangeSignatureP exchange_sig;
+      struct TALER_ExchangeSignatureP donau_sig;
 
       /**
-       * wire transfer identifier used by the exchange, all zeros if exchange 
did not
+       * wire transfer identifier used by the donau, all zeros if donau did not
        * yet execute the transaction
        */
       struct TALER_WireTransferIdentifierRawP wtid;
@@ -3816,7 +3536,7 @@ struct TALER_EXCHANGE_GetDepositResponse
       struct GNUNET_TIME_Timestamp execution_time;
 
       /**
-       * contribution to the total amount by this coin, all zeros if exchange 
did not
+       * contribution to the total amount by this coin, all zeros if donau did 
not
        * yet execute the transaction
        */
       struct TALER_Amount coin_contribution;
@@ -3848,7 +3568,7 @@ struct TALER_EXCHANGE_GetDepositResponse
 
       /**
        * Set to 'true' if the KYC check is already finished and
-       * the exchange is merely waiting for the @e execution_time.
+       * the donau is merely waiting for the @e execution_time.
        */
       bool kyc_ok;
     } accepted;
@@ -3864,9 +3584,9 @@ struct TALER_EXCHANGE_GetDepositResponse
  * @param dr details about the deposit response
  */
 typedef void
-(*TALER_EXCHANGE_DepositGetCallback)(
+(*TALER_DONAU_DepositGetCallback)(
   void *cls,
-  const struct TALER_EXCHANGE_GetDepositResponse *dr);
+  const struct TALER_DONAU_GetDepositResponse *dr);
 
 
 /**
@@ -3875,8 +3595,8 @@ typedef void
  * @a merchant_priv and @a h_contract_terms contributed to.
  *
  * @param ctx curl context
- * @param url exchange base URL
- * @param keys exchange keys
+ * @param url donau base URL
+ * @param keys donau keys
  * @param merchant_priv the merchant's private key
  * @param h_wire hash of merchant's wire transfer details
  * @param h_contract_terms hash of the proposal data
@@ -3886,17 +3606,17 @@ typedef void
  * @param cb_cls closure for @a cb
  * @return handle to abort request
  */
-struct TALER_EXCHANGE_DepositGetHandle *
-TALER_EXCHANGE_deposits_get (
+struct TALER_DONAU_DepositGetHandle *
+TALER_DONAU_deposits_get (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
-  struct TALER_EXCHANGE_Keys *keys,
+  struct TALER_DONAU_Keys *keys,
   const struct TALER_MerchantPrivateKeyP *merchant_priv,
   const struct TALER_MerchantWireHashP *h_wire,
   const struct TALER_PrivateContractHashP *h_contract_terms,
   const struct TALER_CoinSpendPublicKeyP *coin_pub,
   struct GNUNET_TIME_Relative timeout,
-  TALER_EXCHANGE_DepositGetCallback cb,
+  TALER_DONAU_DepositGetCallback cb,
   void *cb_cls);
 
 
@@ -3907,13 +3627,13 @@ TALER_EXCHANGE_deposits_get (
  * @param dwh the wire deposits request handle
  */
 void
-TALER_EXCHANGE_deposits_get_cancel (
-  struct TALER_EXCHANGE_DepositGetHandle *dwh);
+TALER_DONAU_deposits_get_cancel (
+  struct TALER_DONAU_DepositGetHandle *dwh);
 
 
 /**
  * Convenience function.  Verifies a coin's transaction history as
- * returned by the exchange.
+ * returned by the donau.
  *
  * @param dk fee structure for the coin
  * @param coin_pub public key of the coin
@@ -3922,8 +3642,8 @@ TALER_EXCHANGE_deposits_get_cancel (
  * @return #GNUNET_OK if @a history is valid, #GNUNET_SYSERR if not
  */
 enum GNUNET_GenericReturnValue
-TALER_EXCHANGE_verify_coin_history (
-  const struct TALER_EXCHANGE_DenomPublicKey *dk,
+TALER_DONAU_verify_coin_history (
+  const struct TALER_DONAU_DenomPublicKey *dk,
   const struct TALER_CoinSpendPublicKeyP *coin_pub,
   const json_t *history,
   struct TALER_Amount *total);
@@ -3933,7 +3653,7 @@ TALER_EXCHANGE_verify_coin_history (
  * Parse history given in JSON format and return it in binary
  * format.
  *
- * @param keys exchange keys
+ * @param keys donau keys
  * @param history JSON array with the history
  * @param reserve_pub public key of the reserve to inspect
  * @param currency currency we expect the balance to be in
@@ -3947,27 +3667,27 @@ TALER_EXCHANGE_verify_coin_history (
  *         #GNUNET_SYSERR if there was a protocol violation in @a history
  */
 enum GNUNET_GenericReturnValue
-TALER_EXCHANGE_parse_reserve_history (
-  const struct TALER_EXCHANGE_Keys *keys,
+TALER_DONAU_parse_reserve_history (
+  const struct TALER_DONAU_Keys *keys,
   const json_t *history,
   const struct TALER_ReservePublicKeyP *reserve_pub,
   const char *currency,
   struct TALER_Amount *total_in,
   struct TALER_Amount *total_out,
   unsigned int history_length,
-  struct TALER_EXCHANGE_ReserveHistoryEntry rhistory[static history_length]);
+  struct TALER_DONAU_ReserveHistoryEntry rhistory[static history_length]);
 
 
 /**
- * Free memory (potentially) allocated by 
#TALER_EXCHANGE_parse_reserve_history().
+ * Free memory (potentially) allocated by #TALER_DONAU_parse_reserve_history().
  *
  * @param len number of entries in @a rhistory
  * @param[in] rhistory result to free
  */
 void
-TALER_EXCHANGE_free_reserve_history (
+TALER_DONAU_free_reserve_history (
   unsigned int len,
-  struct TALER_EXCHANGE_ReserveHistoryEntry rhistory[static len]);
+  struct TALER_DONAU_ReserveHistoryEntry rhistory[static len]);
 
 
 /* ********************* /recoup *********************** */
@@ -3976,18 +3696,18 @@ TALER_EXCHANGE_free_reserve_history (
 /**
  * @brief A /recoup Handle
  */
-struct TALER_EXCHANGE_RecoupHandle;
+struct TALER_DONAU_RecoupHandle;
 
 
 /**
  * Response from a recoup request.
  */
-struct TALER_EXCHANGE_RecoupResponse
+struct TALER_DONAU_RecoupResponse
 {
   /**
    * HTTP response data
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Response details depending on the HTTP status.
@@ -4012,7 +3732,7 @@ struct TALER_EXCHANGE_RecoupResponse
 
 /**
  * Callbacks of this type are used to return the final result of
- * submitting a recoup request to a exchange.  If the operation was
+ * submitting a recoup request to a donau.  If the operation was
  * successful, this function returns the @a reserve_pub of the
  * reserve that was credited.
  *
@@ -4020,39 +3740,39 @@ struct TALER_EXCHANGE_RecoupResponse
  * @param rr response data
  */
 typedef void
-(*TALER_EXCHANGE_RecoupResultCallback) (
+(*TALER_DONAU_RecoupResultCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_RecoupResponse *rr);
+  const struct TALER_DONAU_RecoupResponse *rr);
 
 
 /**
- * Ask the exchange to pay back a coin due to the exchange triggering
+ * Ask the donau to pay back a coin due to the donau triggering
  * the emergency recoup protocol for a given denomination.  The value
  * of the coin will be refunded to the original customer (without fees).
  *
  * @param ctx curl context
- * @param url exchange base URL
- * @param keys exchange keys
+ * @param url donau base URL
+ * @param keys donau keys
  * @param pk kind of coin to pay back
- * @param denom_sig signature over the coin by the exchange using @a pk
- * @param exchange_vals contribution from the exchange on the withdraw
+ * @param denom_sig signature over the coin by the donau using @a pk
+ * @param donau_vals contribution from the donau on the withdraw
  * @param ps secret internals of the original planchet
  * @param recoup_cb the callback to call when the final result for this 
request is available
  * @param recoup_cb_cls closure for @a recoup_cb
  * @return NULL
- *         if the inputs are invalid (i.e. denomination key not with this 
exchange).
+ *         if the inputs are invalid (i.e. denomination key not with this 
donau).
  *         In this case, the callback is not called.
  */
-struct TALER_EXCHANGE_RecoupHandle *
-TALER_EXCHANGE_recoup (
+struct TALER_DONAU_RecoupHandle *
+TALER_DONAU_recoup (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
-  struct TALER_EXCHANGE_Keys *keys,
-  const struct TALER_EXCHANGE_DenomPublicKey *pk,
+  struct TALER_DONAU_Keys *keys,
+  const struct TALER_DONAU_DenomPublicKey *pk,
   const struct TALER_DenominationSignature *denom_sig,
-  const struct TALER_ExchangeWithdrawValues *exchange_vals,
+  const struct TALER_ExchangeWithdrawValues *donau_vals,
   const struct TALER_PlanchetMasterSecretP *ps,
-  TALER_EXCHANGE_RecoupResultCallback recoup_cb,
+  TALER_DONAU_RecoupResultCallback recoup_cb,
   void *recoup_cb_cls);
 
 
@@ -4063,7 +3783,7 @@ TALER_EXCHANGE_recoup (
  * @param ph the recoup handle
  */
 void
-TALER_EXCHANGE_recoup_cancel (struct TALER_EXCHANGE_RecoupHandle *ph);
+TALER_DONAU_recoup_cancel (struct TALER_DONAU_RecoupHandle *ph);
 
 
 /* ********************* /recoup-refresh *********************** */
@@ -4072,18 +3792,18 @@ TALER_EXCHANGE_recoup_cancel (struct 
TALER_EXCHANGE_RecoupHandle *ph);
 /**
  * @brief A /recoup-refresh Handle
  */
-struct TALER_EXCHANGE_RecoupRefreshHandle;
+struct TALER_DONAU_RecoupRefreshHandle;
 
 
 /**
  * Response from a /recoup-refresh request.
  */
-struct TALER_EXCHANGE_RecoupRefreshResponse
+struct TALER_DONAU_RecoupRefreshResponse
 {
   /**
    * HTTP response data
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Response details depending on the HTTP status.
@@ -4108,51 +3828,51 @@ struct TALER_EXCHANGE_RecoupRefreshResponse
 
 /**
  * Callbacks of this type are used to return the final result of
- * submitting a recoup-refresh request to a exchange.
+ * submitting a recoup-refresh request to a donau.
  *
  * @param cls closure
  * @param rrr response data
  */
 typedef void
-(*TALER_EXCHANGE_RecoupRefreshResultCallback) (
+(*TALER_DONAU_RecoupRefreshResultCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_RecoupRefreshResponse *rrr);
+  const struct TALER_DONAU_RecoupRefreshResponse *rrr);
 
 
 /**
- * Ask the exchange to pay back a coin due to the exchange triggering
+ * Ask the donau to pay back a coin due to the donau triggering
  * the emergency recoup protocol for a given denomination.  The value
  * of the coin will be refunded to the original coin that the
  * revoked coin was refreshed from. The original coin is then
  * considered a zombie.
  *
  * @param ctx curl context
- * @param url exchange base URL
- * @param keys exchange keys
+ * @param url donau base URL
+ * @param keys donau keys
  * @param pk kind of coin to pay back
- * @param denom_sig signature over the coin by the exchange using @a pk
- * @param exchange_vals contribution from the exchange on the withdraw
+ * @param denom_sig signature over the coin by the donau using @a pk
+ * @param donau_vals contribution from the donau on the withdraw
  * @param rms melt secret of the refreshing operation
  * @param ps coin-specific secrets derived for this coin during the refreshing 
operation
  * @param idx index of the fresh coin in the refresh operation that is now 
being recouped
  * @param recoup_cb the callback to call when the final result for this 
request is available
  * @param recoup_cb_cls closure for @a recoup_cb
  * @return NULL
- *         if the inputs are invalid (i.e. denomination key not with this 
exchange).
+ *         if the inputs are invalid (i.e. denomination key not with this 
donau).
  *         In this case, the callback is not called.
  */
-struct TALER_EXCHANGE_RecoupRefreshHandle *
-TALER_EXCHANGE_recoup_refresh (
+struct TALER_DONAU_RecoupRefreshHandle *
+TALER_DONAU_recoup_refresh (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
-  struct TALER_EXCHANGE_Keys *keys,
-  const struct TALER_EXCHANGE_DenomPublicKey *pk,
+  struct TALER_DONAU_Keys *keys,
+  const struct TALER_DONAU_DenomPublicKey *pk,
   const struct TALER_DenominationSignature *denom_sig,
-  const struct TALER_ExchangeWithdrawValues *exchange_vals,
+  const struct TALER_ExchangeWithdrawValues *donau_vals,
   const struct TALER_RefreshMasterSecretP *rms,
   const struct TALER_PlanchetMasterSecretP *ps,
   unsigned int idx,
-  TALER_EXCHANGE_RecoupRefreshResultCallback recoup_cb,
+  TALER_DONAU_RecoupRefreshResultCallback recoup_cb,
   void *recoup_cb_cls);
 
 
@@ -4163,330 +3883,10 @@ TALER_EXCHANGE_recoup_refresh (
  * @param ph the recoup handle
  */
 void
-TALER_EXCHANGE_recoup_refresh_cancel (
-  struct TALER_EXCHANGE_RecoupRefreshHandle *ph);
-
-
-/* *********************  /kyc* *********************** */
-
-/**
- * Handle for a ``/kyc-check`` operation.
- */
-struct TALER_EXCHANGE_KycCheckHandle;
-
-
-/**
- * KYC status response details.
- */
-struct TALER_EXCHANGE_KycStatus
-{
-  /**
-   * HTTP status code returned by the exchange.
-   */
-  unsigned int http_status;
-
-  /**
-   * Taler error code, if any.
-   */
-  enum TALER_ErrorCode ec;
-
-  union
-  {
-
-    /**
-     * KYC is OK, affirmation returned by the exchange.
-     */
-    struct
-    {
-
-      /**
-       * Details about which KYC check(s) were passed.
-       */
-      const json_t *kyc_details;
-
-      /**
-       * Time of the affirmation.
-       */
-      struct GNUNET_TIME_Timestamp timestamp;
-
-      /**
-       * The signing public key used for @e exchange_sig.
-       */
-      struct TALER_ExchangePublicKeyP exchange_pub;
-
-      /**
-       * Signature of purpose
-       * #TALER_SIGNATURE_EXCHANGE_ACCOUNT_SETUP_SUCCESS affirming
-       * the successful KYC process.
-       */
-      struct TALER_ExchangeSignatureP exchange_sig;
-
-      /**
-       * AML status for the account.
-       */
-      enum TALER_AmlDecisionState aml_status;
-
-    } ok;
-
-    /**
-     * KYC is required.
-     */
-    struct
-    {
-
-      /**
-       * URL the user should open in a browser if
-       * the KYC process is to be run. Returned if
-       * @e http_status is #MHD_HTTP_ACCEPTED.
-       */
-      const char *kyc_url;
-
-      /**
-       * AML status for the account.
-       */
-      enum TALER_AmlDecisionState aml_status;
-
-    } accepted;
-
-    /**
-     * KYC is OK, but account needs positive AML decision.
-     */
-    struct
-    {
-
-      /**
-       * AML status for the account.
-       */
-      enum TALER_AmlDecisionState aml_status;
-
-    } unavailable_for_legal_reasons;
-
-  } details;
-
-};
-
-/**
- * Function called with the result of a KYC check.
- *
- * @param cls closure
- * @param ks the account's KYC status details
- */
-typedef void
-(*TALER_EXCHANGE_KycStatusCallback)(
-  void *cls,
-  const struct TALER_EXCHANGE_KycStatus *ks);
-
-
-/**
- * Run interaction with exchange to check KYC status
- * of a merchant.
- *
- * @param ctx CURL context
- * @param url exchange base URL
- * @param keys keys of the exchange
- * @param requirement_row number identifying the KYC requirement
- * @param h_payto hash of the payto:// URI at @a payment_target
- * @param ut type of the entity performing the KYC check
- * @param timeout how long to wait for a positive KYC status
- * @param cb function to call with the result
- * @param cb_cls closure for @a cb
- * @return NULL on error
- */
-struct TALER_EXCHANGE_KycCheckHandle *
-TALER_EXCHANGE_kyc_check (
-  struct GNUNET_CURL_Context *ctx,
-  const char *url,
-  struct TALER_EXCHANGE_Keys *keys,
-  uint64_t requirement_row,
-  const struct TALER_PaytoHashP *h_payto,
-  enum TALER_KYCLOGIC_KycUserType ut,
-  struct GNUNET_TIME_Relative timeout,
-  TALER_EXCHANGE_KycStatusCallback cb,
-  void *cb_cls);
-
-
-/**
- * Cancel KYC check operation.
- *
- * @param kyc handle for operation to cancel
- */
-void
-TALER_EXCHANGE_kyc_check_cancel (struct TALER_EXCHANGE_KycCheckHandle *kyc);
-
-
-/**
- * KYC proof response details.
- */
-struct TALER_EXCHANGE_KycProofResponse
-{
-  /**
-   * HTTP status code returned by the exchange.
-   */
-  unsigned int http_status;
-
-  union
-  {
-
-    /**
-     * KYC is OK, affirmation returned by the exchange.
-     */
-    struct
-    {
-
-      /**
-       * Where to redirect the client next.
-       */
-      const char *redirect_url;
-
-    } found;
-
-  } details;
-
-};
-
-/**
- * Function called with the result of a KYC check.
- *
- * @param cls closure
- * @param kpr the account's KYC status details
- */
-typedef void
-(*TALER_EXCHANGE_KycProofCallback)(
-  void *cls,
-  const struct TALER_EXCHANGE_KycProofResponse *kpr);
-
-
-/**
- * Handle for a /kyc-proof operation.
- */
-struct TALER_EXCHANGE_KycProofHandle;
-
-
-/**
- * Run interaction with exchange to provide proof of KYC status.
- *
- * @param ctx CURL context
- * @param url exchange base URL
- * @param h_payto hash of payto URI identifying the target account
- * @param logic name of the KYC logic to run
- * @param args additional args to pass, can be NULL
- *        or a string to append to the URL. Must then begin with '&'.
- * @param cb function to call with the result
- * @param cb_cls closure for @a cb
- * @return NULL on error
- */
-struct TALER_EXCHANGE_KycProofHandle *
-TALER_EXCHANGE_kyc_proof (
-  struct GNUNET_CURL_Context *ctx,
-  const char *url,
-  const struct TALER_PaytoHashP *h_payto,
-  const char *logic,
-  const char *args,
-  TALER_EXCHANGE_KycProofCallback cb,
-  void *cb_cls);
-
-
-/**
- * Cancel KYC proof operation.
- *
- * @param kph handle for operation to cancel
- */
-void
-TALER_EXCHANGE_kyc_proof_cancel (struct TALER_EXCHANGE_KycProofHandle *kph);
-
-
-/**
- * Handle for a ``/kyc-wallet`` operation.
- */
-struct TALER_EXCHANGE_KycWalletHandle;
-
-
-/**
- * KYC status response details.
- */
-struct TALER_EXCHANGE_WalletKycResponse
-{
-
-  /**
-   * HTTP status code returned by the exchange.
-   */
-  unsigned int http_status;
-
-  /**
-   * Taler error code, if any.
-   */
-  enum TALER_ErrorCode ec;
-
-  /**
-   * Variants depending on @e http_status.
-   */
-  union
-  {
-
-    /**
-     * In case @e http_status is #MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS.
-     */
-    struct
-    {
-      /**
-       * Wallet's KYC requirement row.
-       */
-      uint64_t requirement_row;
-
-      /**
-       * Hash of the payto-URI identifying the wallet to KYC.
-       */
-      struct TALER_PaytoHashP h_payto;
-
-    } unavailable_for_legal_reasons;
-
-  } details;
-
-};
-
-/**
- * Function called with the result for a wallet looking
- * up its KYC payment target.
- *
- * @param cls closure
- * @param ks the wallets KYC payment target details
- */
-typedef void
-(*TALER_EXCHANGE_KycWalletCallback)(
-  void *cls,
-  const struct TALER_EXCHANGE_WalletKycResponse *ks);
-
-
-/**
- * Run interaction with exchange to find out the wallet's KYC
- * identifier.
- *
- * @param ctx CURL context
- * @param url exchange base URL
- * @param reserve_priv wallet private key to check
- * @param balance balance (or balance threshold) crossed by the wallet
- * @param cb function to call with the result
- * @param cb_cls closure for @a cb
- * @return NULL on error
- */
-struct TALER_EXCHANGE_KycWalletHandle *
-TALER_EXCHANGE_kyc_wallet (
-  struct GNUNET_CURL_Context *ctx,
-  const char *url,
-  const struct TALER_ReservePrivateKeyP *reserve_priv,
-  const struct TALER_Amount *balance,
-  TALER_EXCHANGE_KycWalletCallback cb,
-  void *cb_cls);
-
-
-/**
- * Cancel KYC wallet operation
- *
- * @param kwh handle for operation to cancel
- */
-void
-TALER_EXCHANGE_kyc_wallet_cancel (struct TALER_EXCHANGE_KycWalletHandle *kwh);
+TALER_DONAU_recoup_refresh_cancel (
+  struct TALER_DONAU_RecoupRefreshHandle *ph);
 
+struct TALER_DONAU_KycProofHandle;
 
 /* *********************  /management *********************** */
 
@@ -4494,7 +3894,7 @@ TALER_EXCHANGE_kyc_wallet_cancel (struct 
TALER_EXCHANGE_KycWalletHandle *kwh);
 /**
  * @brief Future Exchange's signature key
  */
-struct TALER_EXCHANGE_FutureSigningPublicKey
+struct TALER_DONAU_FutureSigningPublicKey
 {
   /**
    * The signing public key
@@ -4512,7 +3912,7 @@ struct TALER_EXCHANGE_FutureSigningPublicKey
   struct GNUNET_TIME_Timestamp valid_from;
 
   /**
-   * Validity expiration time (how long the exchange may use it).
+   * Validity expiration time (how long the donau may use it).
    */
   struct GNUNET_TIME_Timestamp valid_until;
 
@@ -4524,9 +3924,9 @@ struct TALER_EXCHANGE_FutureSigningPublicKey
 
 
 /**
- * @brief Public information about a future exchange's denomination key
+ * @brief Public information about a future donau's denomination key
  */
-struct TALER_EXCHANGE_FutureDenomPublicKey
+struct TALER_DONAU_FutureDenomPublicKey
 {
   /**
    * The public key
@@ -4592,20 +3992,20 @@ struct TALER_EXCHANGE_FutureDenomPublicKey
 
 
 /**
- * @brief Information about future keys from the exchange.
+ * @brief Information about future keys from the donau.
  */
-struct TALER_EXCHANGE_FutureKeys
+struct TALER_DONAU_FutureKeys
 {
 
   /**
-   * Array of the exchange's online signing keys.
+   * Array of the donau's online signing keys.
    */
-  struct TALER_EXCHANGE_FutureSigningPublicKey *sign_keys;
+  struct TALER_DONAU_FutureSigningPublicKey *sign_keys;
 
   /**
-   * Array of the exchange's denomination keys.
+   * Array of the donau's denomination keys.
    */
-  struct TALER_EXCHANGE_FutureDenomPublicKey *denom_keys;
+  struct TALER_DONAU_FutureDenomPublicKey *denom_keys;
 
   /**
    * Public key of the signkey security module.
@@ -4623,7 +4023,7 @@ struct TALER_EXCHANGE_FutureKeys
   struct TALER_SecurityModulePublicKeyP denom_secmod_cs_public_key;
 
   /**
-   * Offline master public key used by this exchange.
+   * Offline master public key used by this donau.
    */
   struct TALER_MasterPublicKeyP master_pub;
 
@@ -4643,12 +4043,12 @@ struct TALER_EXCHANGE_FutureKeys
 /**
  * Response from a /management/keys request.
  */
-struct TALER_EXCHANGE_ManagementGetKeysResponse
+struct TALER_DONAU_ManagementGetKeysResponse
 {
   /**
    * HTTP response data
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Response details depending on the HTTP status.
@@ -4662,9 +4062,9 @@ struct TALER_EXCHANGE_ManagementGetKeysResponse
     {
       /**
        * information about the various keys used
-       * by the exchange
+       * by the donau
        */
-      struct TALER_EXCHANGE_FutureKeys keys;
+      struct TALER_DONAU_FutureKeys keys;
 
     } ok;
   } details;
@@ -4679,57 +4079,57 @@ struct TALER_EXCHANGE_ManagementGetKeysResponse
  * @param mgr HTTP response data
  */
 typedef void
-(*TALER_EXCHANGE_ManagementGetKeysCallback) (
+(*TALER_DONAU_ManagementGetKeysCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_ManagementGetKeysResponse *mgr);
+  const struct TALER_DONAU_ManagementGetKeysResponse *mgr);
 
 
 /**
  * @brief Handle for a GET /management/keys request.
  */
-struct TALER_EXCHANGE_ManagementGetKeysHandle;
+struct TALER_DONAU_ManagementGetKeysHandle;
 
 
 /**
- * Request future keys from the exchange.  The obtained information will be
+ * Request future keys from the donau.  The obtained information will be
  * passed to the @a cb.
  *
  * @param ctx the context
- * @param url HTTP base URL for the exchange
- * @param cb function to call with the exchange's future keys result
+ * @param url HTTP base URL for the donau
+ * @param cb function to call with the donau's future keys result
  * @param cb_cls closure for @a cb
  * @return the request handle; NULL upon error
  */
-struct TALER_EXCHANGE_ManagementGetKeysHandle *
-TALER_EXCHANGE_get_management_keys (
+struct TALER_DONAU_ManagementGetKeysHandle *
+TALER_DONAU_get_management_keys (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
-  TALER_EXCHANGE_ManagementGetKeysCallback cb,
+  TALER_DONAU_ManagementGetKeysCallback cb,
   void *cb_cls);
 
 
 /**
- * Cancel #TALER_EXCHANGE_get_management_keys() operation.
+ * Cancel #TALER_DONAU_get_management_keys() operation.
  *
  * @param gh handle of the operation to cancel
  */
 void
-TALER_EXCHANGE_get_management_keys_cancel (
-  struct TALER_EXCHANGE_ManagementGetKeysHandle *gh);
+TALER_DONAU_get_management_keys_cancel (
+  struct TALER_DONAU_ManagementGetKeysHandle *gh);
 
 
 /**
- * @brief Public information about a signature on an exchange's online signing 
key
+ * @brief Public information about a signature on an donau's online signing key
  */
-struct TALER_EXCHANGE_SigningKeySignature
+struct TALER_DONAU_SigningKeySignature
 {
   /**
    * The signing public key
    */
-  struct TALER_ExchangePublicKeyP exchange_pub;
+  struct TALER_ExchangePublicKeyP donau_pub;
 
   /**
-   * Signature over this signing key by the exchange's master signature.
+   * Signature over this signing key by the donau's master signature.
    * Of purpose #TALER_SIGNATURE_MASTER_SIGNING_KEY_VALIDITY
    */
   struct TALER_MasterSignatureP master_sig;
@@ -4738,9 +4138,9 @@ struct TALER_EXCHANGE_SigningKeySignature
 
 
 /**
- * @brief Public information about a signature on an exchange's denomination 
key
+ * @brief Public information about a signature on an donau's denomination key
  */
-struct TALER_EXCHANGE_DenominationKeySignature
+struct TALER_DONAU_DenominationKeySignature
 {
   /**
    * The hash of the denomination's public key
@@ -4748,7 +4148,7 @@ struct TALER_EXCHANGE_DenominationKeySignature
   struct TALER_DenominationHashP h_denom_pub;
 
   /**
-   * Signature over this denomination key by the exchange's master signature.
+   * Signature over this denomination key by the donau's master signature.
    * Of purpose #TALER_SIGNATURE_MASTER_DENOMINATION_KEY_VALIDITY.
    */
   struct TALER_MasterSignatureP master_sig;
@@ -4759,18 +4159,18 @@ struct TALER_EXCHANGE_DenominationKeySignature
 /**
  * Information needed for a POST /management/keys operation.
  */
-struct TALER_EXCHANGE_ManagementPostKeysData
+struct TALER_DONAU_ManagementPostKeysData
 {
 
   /**
-   * Array of the master signatures for the exchange's online signing keys.
+   * Array of the master signatures for the donau's online signing keys.
    */
-  struct TALER_EXCHANGE_SigningKeySignature *sign_sigs;
+  struct TALER_DONAU_SigningKeySignature *sign_sigs;
 
   /**
-   * Array of the master signatures for the exchange's denomination keys.
+   * Array of the master signatures for the donau's denomination keys.
    */
-  struct TALER_EXCHANGE_DenominationKeySignature *denom_sigs;
+  struct TALER_DONAU_DenominationKeySignature *denom_sigs;
 
   /**
    * Length of the @e sign_keys array (number of valid entries).
@@ -4787,12 +4187,12 @@ struct TALER_EXCHANGE_ManagementPostKeysData
 /**
  * Response from a POST /management/keys request.
  */
-struct TALER_EXCHANGE_ManagementPostKeysResponse
+struct TALER_DONAU_ManagementPostKeysResponse
 {
   /**
    * HTTP response data
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
 };
 
@@ -4804,53 +4204,53 @@ struct TALER_EXCHANGE_ManagementPostKeysResponse
  * @param mr response data
  */
 typedef void
-(*TALER_EXCHANGE_ManagementPostKeysCallback) (
+(*TALER_DONAU_ManagementPostKeysCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_ManagementPostKeysResponse *mr);
+  const struct TALER_DONAU_ManagementPostKeysResponse *mr);
 
 
 /**
  * @brief Handle for a POST /management/keys request.
  */
-struct TALER_EXCHANGE_ManagementPostKeysHandle;
+struct TALER_DONAU_ManagementPostKeysHandle;
 
 
 /**
- * Provide master-key signatures to the exchange.
+ * Provide master-key signatures to the donau.
  *
  * @param ctx the context
- * @param url HTTP base URL for the exchange
+ * @param url HTTP base URL for the donau
  * @param pkd signature data to POST
- * @param cb function to call with the exchange's result
+ * @param cb function to call with the donau's result
  * @param cb_cls closure for @a cb
  * @return the request handle; NULL upon error
  */
-struct TALER_EXCHANGE_ManagementPostKeysHandle *
-TALER_EXCHANGE_post_management_keys (
+struct TALER_DONAU_ManagementPostKeysHandle *
+TALER_DONAU_post_management_keys (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
-  const struct TALER_EXCHANGE_ManagementPostKeysData *pkd,
-  TALER_EXCHANGE_ManagementPostKeysCallback cb,
+  const struct TALER_DONAU_ManagementPostKeysData *pkd,
+  TALER_DONAU_ManagementPostKeysCallback cb,
   void *cb_cls);
 
 
 /**
- * Cancel #TALER_EXCHANGE_post_management_keys() operation.
+ * Cancel #TALER_DONAU_post_management_keys() operation.
  *
  * @param ph handle of the operation to cancel
  */
 void
-TALER_EXCHANGE_post_management_keys_cancel (
-  struct TALER_EXCHANGE_ManagementPostKeysHandle *ph);
+TALER_DONAU_post_management_keys_cancel (
+  struct TALER_DONAU_ManagementPostKeysHandle *ph);
 
 
 /**
  * Information needed for a POST /management/extensions operation.
  *
  * It represents the interface ExchangeKeysResponse as defined in
- * https://docs.taler.net/design-documents/006-extensions.html#exchange
+ * https://docs.taler.net/design-documents/006-extensions.html#donau
  */
-struct TALER_EXCHANGE_ManagementPostExtensionsData
+struct TALER_DONAU_ManagementPostExtensionsData
 {
   const json_t *extensions;
   struct TALER_MasterSignatureP extensions_sig;
@@ -4860,12 +4260,12 @@ struct TALER_EXCHANGE_ManagementPostExtensionsData
 /**
  * Response from a POST /management/extensions request.
  */
-struct TALER_EXCHANGE_ManagementPostExtensionsResponse
+struct TALER_DONAU_ManagementPostExtensionsResponse
 {
   /**
    * HTTP response data
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
 };
 
@@ -4877,55 +4277,55 @@ struct TALER_EXCHANGE_ManagementPostExtensionsResponse
  * @param hr HTTP response data
  */
 typedef void
-(*TALER_EXCHANGE_ManagementPostExtensionsCallback) (
+(*TALER_DONAU_ManagementPostExtensionsCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_ManagementPostExtensionsResponse *hr);
+  const struct TALER_DONAU_ManagementPostExtensionsResponse *hr);
 
 /**
  * @brief Handle for a POST /management/extensions request.
  */
-struct TALER_EXCHANGE_ManagementPostExtensionsHandle;
+struct TALER_DONAU_ManagementPostExtensionsHandle;
 
 
 /**
- * Uploads the configurations of enabled extensions to the exchange, signed
+ * Uploads the configurations of enabled extensions to the donau, signed
  * with the master key.
  *
  * @param ctx the context
- * @param url HTTP base URL for the exchange
+ * @param url HTTP base URL for the donau
  * @param ped signature data to POST
- * @param cb function to call with the exchange's result
+ * @param cb function to call with the donau's result
  * @param cb_cls closure for @a cb
  * @return the request handle; NULL upon error
  */
-struct TALER_EXCHANGE_ManagementPostExtensionsHandle *
-TALER_EXCHANGE_management_post_extensions (
+struct TALER_DONAU_ManagementPostExtensionsHandle *
+TALER_DONAU_management_post_extensions (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
-  const struct TALER_EXCHANGE_ManagementPostExtensionsData *ped,
-  TALER_EXCHANGE_ManagementPostExtensionsCallback cb,
+  const struct TALER_DONAU_ManagementPostExtensionsData *ped,
+  TALER_DONAU_ManagementPostExtensionsCallback cb,
   void *cb_cls);
 
 
 /**
- * Cancel #TALER_EXCHANGE_management_post_extensions() operation.
+ * Cancel #TALER_DONAU_management_post_extensions() operation.
  *
  * @param ph handle of the operation to cancel
  */
 void
-TALER_EXCHANGE_management_post_extensions_cancel (
-  struct TALER_EXCHANGE_ManagementPostExtensionsHandle *ph);
+TALER_DONAU_management_post_extensions_cancel (
+  struct TALER_DONAU_ManagementPostExtensionsHandle *ph);
 
 
 /**
  * Response from a POST /management/drain request.
  */
-struct TALER_EXCHANGE_ManagementDrainResponse
+struct TALER_DONAU_ManagementDrainResponse
 {
   /**
    * HTTP response data
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
 };
 
@@ -4937,34 +4337,34 @@ struct TALER_EXCHANGE_ManagementDrainResponse
  * @param hr HTTP response data
  */
 typedef void
-(*TALER_EXCHANGE_ManagementDrainProfitsCallback) (
+(*TALER_DONAU_ManagementDrainProfitsCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_ManagementDrainResponse *hr);
+  const struct TALER_DONAU_ManagementDrainResponse *hr);
 
 
 /**
  * @brief Handle for a POST /management/drain request.
  */
-struct TALER_EXCHANGE_ManagementDrainProfitsHandle;
+struct TALER_DONAU_ManagementDrainProfitsHandle;
 
 
 /**
  * Uploads the drain profits request.
  *
  * @param ctx the context
- * @param url HTTP base URL for the exchange
+ * @param url HTTP base URL for the donau
  * @param wtid wire transfer identifier to use
  * @param amount total to transfer
  * @param date when was the request created
  * @param account_section configuration section identifying account to debit
  * @param payto_uri RFC 8905 URI of the account to credit
  * @param master_sig signature affirming the operation
- * @param cb function to call with the exchange's result
+ * @param cb function to call with the donau's result
  * @param cb_cls closure for @a cb
  * @return the request handle; NULL upon error
  */
-struct TALER_EXCHANGE_ManagementDrainProfitsHandle *
-TALER_EXCHANGE_management_drain_profits (
+struct TALER_DONAU_ManagementDrainProfitsHandle *
+TALER_DONAU_management_drain_profits (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
   const struct TALER_WireTransferIdentifierRawP *wtid,
@@ -4973,29 +4373,29 @@ TALER_EXCHANGE_management_drain_profits (
   const char *account_section,
   const char *payto_uri,
   const struct TALER_MasterSignatureP *master_sig,
-  TALER_EXCHANGE_ManagementDrainProfitsCallback cb,
+  TALER_DONAU_ManagementDrainProfitsCallback cb,
   void *cb_cls);
 
 
 /**
- * Cancel #TALER_EXCHANGE_management_drain_profits() operation.
+ * Cancel #TALER_DONAU_management_drain_profits() operation.
  *
  * @param dp handle of the operation to cancel
  */
 void
-TALER_EXCHANGE_management_drain_profits_cancel (
-  struct TALER_EXCHANGE_ManagementDrainProfitsHandle *dp);
+TALER_DONAU_management_drain_profits_cancel (
+  struct TALER_DONAU_ManagementDrainProfitsHandle *dp);
 
 
 /**
  * Response from a POST /management/denominations/$DENOM/revoke request.
  */
-struct TALER_EXCHANGE_ManagementRevokeDenominationResponse
+struct TALER_DONAU_ManagementRevokeDenominationResponse
 {
   /**
    * HTTP response data
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
 };
 
@@ -5007,57 +4407,57 @@ struct 
TALER_EXCHANGE_ManagementRevokeDenominationResponse
  * @param hr HTTP response data
  */
 typedef void
-(*TALER_EXCHANGE_ManagementRevokeDenominationKeyCallback) (
+(*TALER_DONAU_ManagementRevokeDenominationKeyCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_ManagementRevokeDenominationResponse *hr);
+  const struct TALER_DONAU_ManagementRevokeDenominationResponse *hr);
 
 
 /**
  * @brief Handle for a POST /management/denominations/$H_DENOM_PUB/revoke 
request.
  */
-struct TALER_EXCHANGE_ManagementRevokeDenominationKeyHandle;
+struct TALER_DONAU_ManagementRevokeDenominationKeyHandle;
 
 
 /**
- * Inform the exchange that a denomination key was revoked.
+ * Inform the donau that a denomination key was revoked.
  *
  * @param ctx the context
- * @param url HTTP base URL for the exchange
+ * @param url HTTP base URL for the donau
  * @param h_denom_pub hash of the denomination public key that was revoked
  * @param master_sig signature affirming the revocation
- * @param cb function to call with the exchange's result
+ * @param cb function to call with the donau's result
  * @param cb_cls closure for @a cb
  * @return the request handle; NULL upon error
  */
-struct TALER_EXCHANGE_ManagementRevokeDenominationKeyHandle *
-TALER_EXCHANGE_management_revoke_denomination_key (
+struct TALER_DONAU_ManagementRevokeDenominationKeyHandle *
+TALER_DONAU_management_revoke_denomination_key (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
   const struct TALER_DenominationHashP *h_denom_pub,
   const struct TALER_MasterSignatureP *master_sig,
-  TALER_EXCHANGE_ManagementRevokeDenominationKeyCallback cb,
+  TALER_DONAU_ManagementRevokeDenominationKeyCallback cb,
   void *cb_cls);
 
 
 /**
- * Cancel #TALER_EXCHANGE_management_revoke_denomination_key() operation.
+ * Cancel #TALER_DONAU_management_revoke_denomination_key() operation.
  *
  * @param rh handle of the operation to cancel
  */
 void
-TALER_EXCHANGE_management_revoke_denomination_key_cancel (
-  struct TALER_EXCHANGE_ManagementRevokeDenominationKeyHandle *rh);
+TALER_DONAU_management_revoke_denomination_key_cancel (
+  struct TALER_DONAU_ManagementRevokeDenominationKeyHandle *rh);
 
 
 /**
  * Response from a POST /management/signkeys/$SK/revoke request.
  */
-struct TALER_EXCHANGE_ManagementRevokeSigningKeyResponse
+struct TALER_DONAU_ManagementRevokeSigningKeyResponse
 {
   /**
    * HTTP response data
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
 };
 
@@ -5068,57 +4468,57 @@ struct TALER_EXCHANGE_ManagementRevokeSigningKeyResponse
  * @param hr HTTP response data
  */
 typedef void
-(*TALER_EXCHANGE_ManagementRevokeSigningKeyCallback) (
+(*TALER_DONAU_ManagementRevokeSigningKeyCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_ManagementRevokeSigningKeyResponse *hr);
+  const struct TALER_DONAU_ManagementRevokeSigningKeyResponse *hr);
 
 
 /**
  * @brief Handle for a POST /management/signkeys/$H_DENOM_PUB/revoke request.
  */
-struct TALER_EXCHANGE_ManagementRevokeSigningKeyHandle;
+struct TALER_DONAU_ManagementRevokeSigningKeyHandle;
 
 
 /**
- * Inform the exchange that a signing key was revoked.
+ * Inform the donau that a signing key was revoked.
  *
  * @param ctx the context
- * @param url HTTP base URL for the exchange
- * @param exchange_pub the public signing key that was revoked
+ * @param url HTTP base URL for the donau
+ * @param donau_pub the public signing key that was revoked
  * @param master_sig signature affirming the revocation
- * @param cb function to call with the exchange's result
+ * @param cb function to call with the donau's result
  * @param cb_cls closure for @a cb
  * @return the request handle; NULL upon error
  */
-struct TALER_EXCHANGE_ManagementRevokeSigningKeyHandle *
-TALER_EXCHANGE_management_revoke_signing_key (
+struct TALER_DONAU_ManagementRevokeSigningKeyHandle *
+TALER_DONAU_management_revoke_signing_key (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
-  const struct TALER_ExchangePublicKeyP *exchange_pub,
+  const struct TALER_ExchangePublicKeyP *donau_pub,
   const struct TALER_MasterSignatureP *master_sig,
-  TALER_EXCHANGE_ManagementRevokeSigningKeyCallback cb,
+  TALER_DONAU_ManagementRevokeSigningKeyCallback cb,
   void *cb_cls);
 
 
 /**
- * Cancel #TALER_EXCHANGE_management_revoke_signing_key() operation.
+ * Cancel #TALER_DONAU_management_revoke_signing_key() operation.
  *
  * @param rh handle of the operation to cancel
  */
 void
-TALER_EXCHANGE_management_revoke_signing_key_cancel (
-  struct TALER_EXCHANGE_ManagementRevokeSigningKeyHandle *rh);
+TALER_DONAU_management_revoke_signing_key_cancel (
+  struct TALER_DONAU_ManagementRevokeSigningKeyHandle *rh);
 
 
 /**
  * Response from a POST /management/aml-officers request.
  */
-struct TALER_EXCHANGE_ManagementUpdateAmlOfficerResponse
+struct TALER_DONAU_ManagementUpdateAmlOfficerResponse
 {
   /**
    * HTTP response data
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
 };
 
@@ -5130,34 +4530,34 @@ struct TALER_EXCHANGE_ManagementUpdateAmlOfficerResponse
  * @param hr HTTP response data
  */
 typedef void
-(*TALER_EXCHANGE_ManagementUpdateAmlOfficerCallback) (
+(*TALER_DONAU_ManagementUpdateAmlOfficerCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_ManagementUpdateAmlOfficerResponse *hr);
+  const struct TALER_DONAU_ManagementUpdateAmlOfficerResponse *hr);
 
 
 /**
  * @brief Handle for a POST /management/aml-officers/$OFFICER_PUB request.
  */
-struct TALER_EXCHANGE_ManagementUpdateAmlOfficer;
+struct TALER_DONAU_ManagementUpdateAmlOfficer;
 
 
 /**
- * Inform the exchange that the status of an AML officer has changed.
+ * Inform the donau that the status of an AML officer has changed.
  *
  * @param ctx the context
- * @param url HTTP base URL for the exchange
+ * @param url HTTP base URL for the donau
  * @param officer_pub the public signing key of the officer
  * @param officer_name name of the officer
  * @param change_date when to affect the status change
  * @param is_active true to enable the officer
  * @param read_only true to only allow read-only access
  * @param master_sig signature affirming the change
- * @param cb function to call with the exchange's result
+ * @param cb function to call with the donau's result
  * @param cb_cls closure for @a cb
  * @return the request handle; NULL upon error
  */
-struct TALER_EXCHANGE_ManagementUpdateAmlOfficer *
-TALER_EXCHANGE_management_update_aml_officer (
+struct TALER_DONAU_ManagementUpdateAmlOfficer *
+TALER_DONAU_management_update_aml_officer (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
   const struct TALER_AmlOfficerPublicKeyP *officer_pub,
@@ -5166,24 +4566,24 @@ TALER_EXCHANGE_management_update_aml_officer (
   bool is_active,
   bool read_only,
   const struct TALER_MasterSignatureP *master_sig,
-  TALER_EXCHANGE_ManagementUpdateAmlOfficerCallback cb,
+  TALER_DONAU_ManagementUpdateAmlOfficerCallback cb,
   void *cb_cls);
 
 
 /**
- * Cancel #TALER_EXCHANGE_management_update_aml_officer() operation.
+ * Cancel #TALER_DONAU_management_update_aml_officer() operation.
  *
  * @param rh handle of the operation to cancel
  */
 void
-TALER_EXCHANGE_management_update_aml_officer_cancel (
-  struct TALER_EXCHANGE_ManagementUpdateAmlOfficer *rh);
+TALER_DONAU_management_update_aml_officer_cancel (
+  struct TALER_DONAU_ManagementUpdateAmlOfficer *rh);
 
 
 /**
  * Summary data about an AML decision.
  */
-struct TALER_EXCHANGE_AmlDecisionSummary
+struct TALER_DONAU_AmlDecisionSummary
 {
   /**
    * What is the current monthly threshold.
@@ -5208,14 +4608,14 @@ struct TALER_EXCHANGE_AmlDecisionSummary
 
 
 /**
- * Information about AML decisions returned by the exchange.
+ * Information about AML decisions returned by the donau.
  */
-struct TALER_EXCHANGE_AmlDecisionsResponse
+struct TALER_DONAU_AmlDecisionsResponse
 {
   /**
    * HTTP response details.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Details depending on the HTTP response code.
@@ -5230,9 +4630,9 @@ struct TALER_EXCHANGE_AmlDecisionsResponse
     {
 
       /**
-       * Array of AML decision summaries returned by the exchange.
+       * Array of AML decision summaries returned by the donau.
        */
-      const struct TALER_EXCHANGE_AmlDecisionSummary *decisions;
+      const struct TALER_DONAU_AmlDecisionSummary *decisions;
 
       /**
        * Length of the @e decisions array.
@@ -5253,56 +4653,56 @@ struct TALER_EXCHANGE_AmlDecisionsResponse
  * @param adr response data
  */
 typedef void
-(*TALER_EXCHANGE_LookupAmlDecisionsCallback) (
+(*TALER_DONAU_LookupAmlDecisionsCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_AmlDecisionsResponse *adr);
+  const struct TALER_DONAU_AmlDecisionsResponse *adr);
 
 
 /**
  * @brief Handle for a POST /aml/$OFFICER_PUB/decisions/$STATUS request.
  */
-struct TALER_EXCHANGE_LookupAmlDecisions;
+struct TALER_DONAU_LookupAmlDecisions;
 
 
 /**
- * Inform the exchange that an AML decision has been taken.
+ * Inform the donau that an AML decision has been taken.
  *
  * @param ctx the context
- * @param exchange_url HTTP base URL for the exchange
+ * @param donau_url HTTP base URL for the donau
  * @param start row number starting point (exclusive rowid)
  * @param delta number of records to return, negative for descending, positive 
for ascending from start
  * @param state type of AML decisions to return
  * @param officer_priv private key of the deciding AML officer
- * @param cb function to call with the exchange's result
+ * @param cb function to call with the donau's result
  * @param cb_cls closure for @a cb
  * @return the request handle; NULL upon error
  */
-struct TALER_EXCHANGE_LookupAmlDecisions *
-TALER_EXCHANGE_lookup_aml_decisions (
+struct TALER_DONAU_LookupAmlDecisions *
+TALER_DONAU_lookup_aml_decisions (
   struct GNUNET_CURL_Context *ctx,
-  const char *exchange_url,
+  const char *donau_url,
   uint64_t start,
   int delta,
   enum TALER_AmlDecisionState state,
   const struct TALER_AmlOfficerPrivateKeyP *officer_priv,
-  TALER_EXCHANGE_LookupAmlDecisionsCallback cb,
+  TALER_DONAU_LookupAmlDecisionsCallback cb,
   void *cb_cls);
 
 
 /**
- * Cancel #TALER_EXCHANGE_lookup_aml_decisions() operation.
+ * Cancel #TALER_DONAU_lookup_aml_decisions() operation.
  *
  * @param lh handle of the operation to cancel
  */
 void
-TALER_EXCHANGE_lookup_aml_decisions_cancel (
-  struct TALER_EXCHANGE_LookupAmlDecisions *lh);
+TALER_DONAU_lookup_aml_decisions_cancel (
+  struct TALER_DONAU_LookupAmlDecisions *lh);
 
 
 /**
  * Detailed data about an AML decision.
  */
-struct TALER_EXCHANGE_AmlDecisionDetail
+struct TALER_DONAU_AmlDecisionDetail
 {
   /**
    * When was the decision made.
@@ -5334,7 +4734,7 @@ struct TALER_EXCHANGE_AmlDecisionDetail
 /**
  * Detailed data collected during a KYC process for the account.
  */
-struct TALER_EXCHANGE_KycHistoryDetail
+struct TALER_DONAU_KycHistoryDetail
 {
   /**
    * Configuration section name of the KYC provider that contributed the data.
@@ -5355,14 +4755,14 @@ struct TALER_EXCHANGE_KycHistoryDetail
 
 
 /**
- * Information about AML decision details returned by the exchange.
+ * Information about AML decision details returned by the donau.
  */
-struct TALER_EXCHANGE_AmlDecisionResponse
+struct TALER_DONAU_AmlDecisionResponse
 {
   /**
    * HTTP response details.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Details depending on the HTTP response code.
@@ -5377,9 +4777,9 @@ struct TALER_EXCHANGE_AmlDecisionResponse
     {
 
       /**
-       * Array of AML decision details returned by the exchange.
+       * Array of AML decision details returned by the donau.
        */
-      const struct TALER_EXCHANGE_AmlDecisionDetail *aml_history;
+      const struct TALER_DONAU_AmlDecisionDetail *aml_history;
 
       /**
        * Length of the @e aml_history array.
@@ -5387,9 +4787,9 @@ struct TALER_EXCHANGE_AmlDecisionResponse
       unsigned int aml_history_length;
 
       /**
-       * Array of KYC data collections returned by the exchange.
+       * Array of KYC data collections returned by the donau.
        */
-      const struct TALER_EXCHANGE_KycHistoryDetail *kyc_attributes;
+      const struct TALER_DONAU_KycHistoryDetail *kyc_attributes;
 
       /**
        * Length of the @e kyc_attributes array.
@@ -5410,65 +4810,65 @@ struct TALER_EXCHANGE_AmlDecisionResponse
  * @param adr response data
  */
 typedef void
-(*TALER_EXCHANGE_LookupAmlDecisionCallback) (
+(*TALER_DONAU_LookupAmlDecisionCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_AmlDecisionResponse *adr);
+  const struct TALER_DONAU_AmlDecisionResponse *adr);
 
 
 /**
  * @brief Handle for a POST /aml/$OFFICER_PUB/decision/$H_PAYTO request.
  */
-struct TALER_EXCHANGE_LookupAmlDecision;
+struct TALER_DONAU_LookupAmlDecision;
 
 
 /**
- * Inform the exchange that an AML decision has been taken.
+ * Inform the donau that an AML decision has been taken.
  *
  * @param ctx the context
- * @param exchange_url HTTP base URL for the exchange
+ * @param donau_url HTTP base URL for the donau
  * @param h_payto which account to return the decision history for
  * @param officer_priv private key of the deciding AML officer
  * @param history true to return the full history, otherwise only the last 
decision
- * @param cb function to call with the exchange's result
+ * @param cb function to call with the donau's result
  * @param cb_cls closure for @a cb
  * @return the request handle; NULL upon error
  */
-struct TALER_EXCHANGE_LookupAmlDecision *
-TALER_EXCHANGE_lookup_aml_decision (
+struct TALER_DONAU_LookupAmlDecision *
+TALER_DONAU_lookup_aml_decision (
   struct GNUNET_CURL_Context *ctx,
-  const char *exchange_url,
+  const char *donau_url,
   const struct TALER_PaytoHashP *h_payto,
   const struct TALER_AmlOfficerPrivateKeyP *officer_priv,
   bool history,
-  TALER_EXCHANGE_LookupAmlDecisionCallback cb,
+  TALER_DONAU_LookupAmlDecisionCallback cb,
   void *cb_cls);
 
 
 /**
- * Cancel #TALER_EXCHANGE_lookup_aml_decision() operation.
+ * Cancel #TALER_DONAU_lookup_aml_decision() operation.
  *
  * @param rh handle of the operation to cancel
  */
 void
-TALER_EXCHANGE_lookup_aml_decision_cancel (
-  struct TALER_EXCHANGE_LookupAmlDecision *rh);
+TALER_DONAU_lookup_aml_decision_cancel (
+  struct TALER_DONAU_LookupAmlDecision *rh);
 
 
 /**
  * @brief Handle for a POST /aml-decision/$OFFICER_PUB request.
  */
-struct TALER_EXCHANGE_AddAmlDecision;
+struct TALER_DONAU_AddAmlDecision;
 
 
 /**
  * Response when making an AML decision.
  */
-struct TALER_EXCHANGE_AddAmlDecisionResponse
+struct TALER_DONAU_AddAmlDecisionResponse
 {
   /**
    * HTTP response data.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 };
 
 
@@ -5480,15 +4880,15 @@ struct TALER_EXCHANGE_AddAmlDecisionResponse
  * @param adr response data
  */
 typedef void
-(*TALER_EXCHANGE_AddAmlDecisionCallback) (
+(*TALER_DONAU_AddAmlDecisionCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_AddAmlDecisionResponse *adr);
+  const struct TALER_DONAU_AddAmlDecisionResponse *adr);
 
 /**
- * Inform the exchange that an AML decision has been taken.
+ * Inform the donau that an AML decision has been taken.
  *
  * @param ctx the context
- * @param url HTTP base URL for the exchange
+ * @param url HTTP base URL for the donau
  * @param justification human-readable justification
  * @param decision_time when was the decision made
  * @param new_threshold at what monthly amount threshold
@@ -5498,12 +4898,12 @@ typedef void
  * @param new_state updated AML state
  * @param kyc_requirements JSON array of KYC requirements being imposed, NULL 
for none
  * @param officer_priv private key of the deciding AML officer
- * @param cb function to call with the exchange's result
+ * @param cb function to call with the donau's result
  * @param cb_cls closure for @a cb
  * @return the request handle; NULL upon error
  */
-struct TALER_EXCHANGE_AddAmlDecision *
-TALER_EXCHANGE_add_aml_decision (
+struct TALER_DONAU_AddAmlDecision *
+TALER_DONAU_add_aml_decision (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
   const char *justification,
@@ -5513,29 +4913,29 @@ TALER_EXCHANGE_add_aml_decision (
   enum TALER_AmlDecisionState new_state,
   const json_t *kyc_requirements,
   const struct TALER_AmlOfficerPrivateKeyP *officer_priv,
-  TALER_EXCHANGE_AddAmlDecisionCallback cb,
+  TALER_DONAU_AddAmlDecisionCallback cb,
   void *cb_cls);
 
 
 /**
- * Cancel #TALER_EXCHANGE_add_aml_decision() operation.
+ * Cancel #TALER_DONAU_add_aml_decision() operation.
  *
  * @param rh handle of the operation to cancel
  */
 void
-TALER_EXCHANGE_add_aml_decision_cancel (
-  struct TALER_EXCHANGE_AddAmlDecision *rh);
+TALER_DONAU_add_aml_decision_cancel (
+  struct TALER_DONAU_AddAmlDecision *rh);
 
 
 /**
- * Response when adding a partner exchange.
+ * Response when adding a partner donau.
  */
-struct TALER_EXCHANGE_ManagementAddPartnerResponse
+struct TALER_DONAU_ManagementAddPartnerResponse
 {
   /**
    * HTTP response data.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 };
 
 /**
@@ -5546,36 +4946,36 @@ struct TALER_EXCHANGE_ManagementAddPartnerResponse
  * @param apr response data
  */
 typedef void
-(*TALER_EXCHANGE_ManagementAddPartnerCallback) (
+(*TALER_DONAU_ManagementAddPartnerCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_ManagementAddPartnerResponse *apr);
+  const struct TALER_DONAU_ManagementAddPartnerResponse *apr);
 
 
 /**
  * @brief Handle for a POST /management/partners/$PARTNER_PUB request.
  */
-struct TALER_EXCHANGE_ManagementAddPartner;
+struct TALER_DONAU_ManagementAddPartner;
 
 
 /**
- * Inform the exchange that the status of a partnering
- * exchange was defined.
+ * Inform the donau that the status of a partnering
+ * donau was defined.
  *
  * @param ctx the context
- * @param url HTTP base URL for the exchange
+ * @param url HTTP base URL for the donau
  * @param partner_pub the offline signing key of the partner
  * @param start_date validity period start
  * @param end_date validity period end
  * @param wad_frequency how often will we do wad transfers to this partner
  * @param wad_fee what is the wad fee to this partner
- * @param partner_base_url what is the base URL of the @a partner_pub exchange
+ * @param partner_base_url what is the base URL of the @a partner_pub donau
  * @param master_sig the signature the signature
- * @param cb function to call with the exchange's result
+ * @param cb function to call with the donau's result
  * @param cb_cls closure for @a cb
  * @return the request handle; NULL upon error
  */
-struct TALER_EXCHANGE_ManagementAddPartner *
-TALER_EXCHANGE_management_add_partner (
+struct TALER_DONAU_ManagementAddPartner *
+TALER_DONAU_management_add_partner (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
   const struct TALER_MasterPublicKeyP *partner_pub,
@@ -5585,29 +4985,29 @@ TALER_EXCHANGE_management_add_partner (
   const struct TALER_Amount *wad_fee,
   const char *partner_base_url,
   const struct TALER_MasterSignatureP *master_sig,
-  TALER_EXCHANGE_ManagementAddPartnerCallback cb,
+  TALER_DONAU_ManagementAddPartnerCallback cb,
   void *cb_cls);
 
 
 /**
- * Cancel #TALER_EXCHANGE_management_add_partner() operation.
+ * Cancel #TALER_DONAU_management_add_partner() operation.
  *
  * @param rh handle of the operation to cancel
  */
 void
-TALER_EXCHANGE_management_add_partner_cancel (
-  struct TALER_EXCHANGE_ManagementAddPartner *rh);
+TALER_DONAU_management_add_partner_cancel (
+  struct TALER_DONAU_ManagementAddPartner *rh);
 
 
 /**
  * Response when enabling an auditor.
  */
-struct TALER_EXCHANGE_ManagementAuditorEnableResponse
+struct TALER_DONAU_ManagementAuditorEnableResponse
 {
   /**
    * HTTP response data.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 };
 
 /**
@@ -5617,33 +5017,33 @@ struct TALER_EXCHANGE_ManagementAuditorEnableResponse
  * @param aer response data
  */
 typedef void
-(*TALER_EXCHANGE_ManagementAuditorEnableCallback) (
+(*TALER_DONAU_ManagementAuditorEnableCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_ManagementAuditorEnableResponse *aer);
+  const struct TALER_DONAU_ManagementAuditorEnableResponse *aer);
 
 
 /**
  * @brief Handle for a POST /management/auditors request.
  */
-struct TALER_EXCHANGE_ManagementAuditorEnableHandle;
+struct TALER_DONAU_ManagementAuditorEnableHandle;
 
 
 /**
- * Inform the exchange that an auditor should be enable or enabled.
+ * Inform the donau that an auditor should be enable or enabled.
  *
  * @param ctx the context
- * @param url HTTP base URL for the exchange
+ * @param url HTTP base URL for the donau
  * @param auditor_pub the public signing key of the auditor
  * @param auditor_url base URL of the auditor
  * @param auditor_name human readable name for the auditor
  * @param validity_start when was this decided?
  * @param master_sig signature affirming the auditor addition
- * @param cb function to call with the exchange's result
+ * @param cb function to call with the donau's result
  * @param cb_cls closure for @a cb
  * @return the request handle; NULL upon error
  */
-struct TALER_EXCHANGE_ManagementAuditorEnableHandle *
-TALER_EXCHANGE_management_enable_auditor (
+struct TALER_DONAU_ManagementAuditorEnableHandle *
+TALER_DONAU_management_enable_auditor (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
   const struct TALER_AuditorPublicKeyP *auditor_pub,
@@ -5651,28 +5051,28 @@ TALER_EXCHANGE_management_enable_auditor (
   const char *auditor_name,
   struct GNUNET_TIME_Timestamp validity_start,
   const struct TALER_MasterSignatureP *master_sig,
-  TALER_EXCHANGE_ManagementAuditorEnableCallback cb,
+  TALER_DONAU_ManagementAuditorEnableCallback cb,
   void *cb_cls);
 
 
 /**
- * Cancel #TALER_EXCHANGE_management_enable_auditor() operation.
+ * Cancel #TALER_DONAU_management_enable_auditor() operation.
  *
  * @param ah handle of the operation to cancel
  */
 void
-TALER_EXCHANGE_management_enable_auditor_cancel (
-  struct TALER_EXCHANGE_ManagementAuditorEnableHandle *ah);
+TALER_DONAU_management_enable_auditor_cancel (
+  struct TALER_DONAU_ManagementAuditorEnableHandle *ah);
 
 /**
  * Response when disabling an auditor.
  */
-struct TALER_EXCHANGE_ManagementAuditorDisableResponse
+struct TALER_DONAU_ManagementAuditorDisableResponse
 {
   /**
    * HTTP response data.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 };
 
 /**
@@ -5682,59 +5082,59 @@ struct TALER_EXCHANGE_ManagementAuditorDisableResponse
  * @param adr HTTP response data
  */
 typedef void
-(*TALER_EXCHANGE_ManagementAuditorDisableCallback) (
+(*TALER_DONAU_ManagementAuditorDisableCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_ManagementAuditorDisableResponse *adr);
+  const struct TALER_DONAU_ManagementAuditorDisableResponse *adr);
 
 
 /**
  * @brief Handle for a POST /management/auditors/$AUDITOR_PUB/disable request.
  */
-struct TALER_EXCHANGE_ManagementAuditorDisableHandle;
+struct TALER_DONAU_ManagementAuditorDisableHandle;
 
 
 /**
- * Inform the exchange that an auditor should be disabled.
+ * Inform the donau that an auditor should be disabled.
  *
  * @param ctx the context
- * @param url HTTP base URL for the exchange
+ * @param url HTTP base URL for the donau
  * @param auditor_pub the public signing key of the auditor
  * @param validity_end when was this decided?
  * @param master_sig signature affirming the auditor addition
- * @param cb function to call with the exchange's result
+ * @param cb function to call with the donau's result
  * @param cb_cls closure for @a cb
  * @return the request handle; NULL upon error
  */
-struct TALER_EXCHANGE_ManagementAuditorDisableHandle *
-TALER_EXCHANGE_management_disable_auditor (
+struct TALER_DONAU_ManagementAuditorDisableHandle *
+TALER_DONAU_management_disable_auditor (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
   const struct TALER_AuditorPublicKeyP *auditor_pub,
   struct GNUNET_TIME_Timestamp validity_end,
   const struct TALER_MasterSignatureP *master_sig,
-  TALER_EXCHANGE_ManagementAuditorDisableCallback cb,
+  TALER_DONAU_ManagementAuditorDisableCallback cb,
   void *cb_cls);
 
 
 /**
- * Cancel #TALER_EXCHANGE_management_disable_auditor() operation.
+ * Cancel #TALER_DONAU_management_disable_auditor() operation.
  *
  * @param ah handle of the operation to cancel
  */
 void
-TALER_EXCHANGE_management_disable_auditor_cancel (
-  struct TALER_EXCHANGE_ManagementAuditorDisableHandle *ah);
+TALER_DONAU_management_disable_auditor_cancel (
+  struct TALER_DONAU_ManagementAuditorDisableHandle *ah);
 
 
 /**
- * Response from an exchange account/enable operation.
+ * Response from an donau account/enable operation.
  */
-struct TALER_EXCHANGE_ManagementWireEnableResponse
+struct TALER_DONAU_ManagementWireEnableResponse
 {
   /**
    * HTTP response data.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 };
 
 
@@ -5745,23 +5145,23 @@ struct TALER_EXCHANGE_ManagementWireEnableResponse
  * @param wer HTTP response data
  */
 typedef void
-(*TALER_EXCHANGE_ManagementWireEnableCallback) (
+(*TALER_DONAU_ManagementWireEnableCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_ManagementWireEnableResponse *wer);
+  const struct TALER_DONAU_ManagementWireEnableResponse *wer);
 
 
 /**
  * @brief Handle for a POST /management/wire request.
  */
-struct TALER_EXCHANGE_ManagementWireEnableHandle;
+struct TALER_DONAU_ManagementWireEnableHandle;
 
 
 /**
- * Inform the exchange that a wire account should be enabled.
+ * Inform the donau that a wire account should be enabled.
  *
  * @param ctx the context
- * @param url HTTP base URL for the exchange
- * @param payto_uri RFC 8905 URI of the exchange's bank account
+ * @param url HTTP base URL for the donau
+ * @param payto_uri RFC 8905 URI of the donau's bank account
  * @param conversion_url URL of the conversion service, or NULL if none
  * @param debit_restrictions JSON encoding of debit restrictions on the 
account; see AccountRestriction in the spec
  * @param credit_restrictions JSON encoding of credit restrictions on the 
account; see AccountRestriction in the spec
@@ -5770,12 +5170,12 @@ struct TALER_EXCHANGE_ManagementWireEnableHandle;
  *        of purpose #TALER_SIGNATURE_MASTER_ADD_WIRE
  * @param master_sig2 signature affirming the validity of the account for 
clients;
  *        of purpose #TALER_SIGNATURE_MASTER_WIRE_DETAILS.
- * @param cb function to call with the exchange's result
+ * @param cb function to call with the donau's result
  * @param cb_cls closure for @a cb
  * @return the request handle; NULL upon error
  */
-struct TALER_EXCHANGE_ManagementWireEnableHandle *
-TALER_EXCHANGE_management_enable_wire (
+struct TALER_DONAU_ManagementWireEnableHandle *
+TALER_DONAU_management_enable_wire (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
   const char *payto_uri,
@@ -5785,29 +5185,29 @@ TALER_EXCHANGE_management_enable_wire (
   struct GNUNET_TIME_Timestamp validity_start,
   const struct TALER_MasterSignatureP *master_sig1,
   const struct TALER_MasterSignatureP *master_sig2,
-  TALER_EXCHANGE_ManagementWireEnableCallback cb,
+  TALER_DONAU_ManagementWireEnableCallback cb,
   void *cb_cls);
 
 
 /**
- * Cancel #TALER_EXCHANGE_management_enable_wire() operation.
+ * Cancel #TALER_DONAU_management_enable_wire() operation.
  *
  * @param wh handle of the operation to cancel
  */
 void
-TALER_EXCHANGE_management_enable_wire_cancel (
-  struct TALER_EXCHANGE_ManagementWireEnableHandle *wh);
+TALER_DONAU_management_enable_wire_cancel (
+  struct TALER_DONAU_ManagementWireEnableHandle *wh);
 
 
 /**
- * Response from an exchange account/disable operation.
+ * Response from an donau account/disable operation.
  */
-struct TALER_EXCHANGE_ManagementWireDisableResponse
+struct TALER_DONAU_ManagementWireDisableResponse
 {
   /**
    * HTTP response data.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 };
 
 /**
@@ -5817,60 +5217,60 @@ struct TALER_EXCHANGE_ManagementWireDisableResponse
  * @param wdr response data
  */
 typedef void
-(*TALER_EXCHANGE_ManagementWireDisableCallback) (
+(*TALER_DONAU_ManagementWireDisableCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_ManagementWireDisableResponse *wdr);
+  const struct TALER_DONAU_ManagementWireDisableResponse *wdr);
 
 
 /**
  * @brief Handle for a POST /management/wire/disable request.
  */
-struct TALER_EXCHANGE_ManagementWireDisableHandle;
+struct TALER_DONAU_ManagementWireDisableHandle;
 
 
 /**
- * Inform the exchange that a wire account should be disabled.
+ * Inform the donau that a wire account should be disabled.
  *
  * @param ctx the context
- * @param url HTTP base URL for the exchange
- * @param payto_uri RFC 8905 URI of the exchange's bank account
+ * @param url HTTP base URL for the donau
+ * @param payto_uri RFC 8905 URI of the donau's bank account
  * @param validity_end when was this decided?
  * @param master_sig signature affirming the wire addition
  *        of purpose #TALER_SIGNATURE_MASTER_DEL_WIRE
- * @param cb function to call with the exchange's result
+ * @param cb function to call with the donau's result
  * @param cb_cls closure for @a cb
  * @return the request handle; NULL upon error
  */
-struct TALER_EXCHANGE_ManagementWireDisableHandle *
-TALER_EXCHANGE_management_disable_wire (
+struct TALER_DONAU_ManagementWireDisableHandle *
+TALER_DONAU_management_disable_wire (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
   const char *payto_uri,
   struct GNUNET_TIME_Timestamp validity_end,
   const struct TALER_MasterSignatureP *master_sig,
-  TALER_EXCHANGE_ManagementWireDisableCallback cb,
+  TALER_DONAU_ManagementWireDisableCallback cb,
   void *cb_cls);
 
 
 /**
- * Cancel #TALER_EXCHANGE_management_disable_wire() operation.
+ * Cancel #TALER_DONAU_management_disable_wire() operation.
  *
  * @param wh handle of the operation to cancel
  */
 void
-TALER_EXCHANGE_management_disable_wire_cancel (
-  struct TALER_EXCHANGE_ManagementWireDisableHandle *wh);
+TALER_DONAU_management_disable_wire_cancel (
+  struct TALER_DONAU_ManagementWireDisableHandle *wh);
 
 
 /**
  * Response when setting wire fees.
  */
-struct TALER_EXCHANGE_ManagementSetWireFeeResponse
+struct TALER_DONAU_ManagementSetWireFeeResponse
 {
   /**
    * HTTP response data.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 };
 
 /**
@@ -5880,64 +5280,64 @@ struct TALER_EXCHANGE_ManagementSetWireFeeResponse
  * @param wfr response data
  */
 typedef void
-(*TALER_EXCHANGE_ManagementSetWireFeeCallback) (
+(*TALER_DONAU_ManagementSetWireFeeCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_ManagementSetWireFeeResponse *wfr);
+  const struct TALER_DONAU_ManagementSetWireFeeResponse *wfr);
 
 
 /**
  * @brief Handle for a POST /management/wire-fees request.
  */
-struct TALER_EXCHANGE_ManagementSetWireFeeHandle;
+struct TALER_DONAU_ManagementSetWireFeeHandle;
 
 
 /**
- * Inform the exchange about future wire fees.
+ * Inform the donau about future wire fees.
  *
  * @param ctx the context
- * @param exchange_base_url HTTP base URL for the exchange
+ * @param donau_base_url HTTP base URL for the donau
  * @param wire_method for which wire method are fees provided
  * @param validity_start start date for the provided wire fees
  * @param validity_end end date for the provided wire fees
  * @param fees the wire fees for this time period
  * @param master_sig signature affirming the wire fees;
  *        of purpose #TALER_SIGNATURE_MASTER_WIRE_FEES
- * @param cb function to call with the exchange's result
+ * @param cb function to call with the donau's result
  * @param cb_cls closure for @a cb
  * @return the request handle; NULL upon error
  */
-struct TALER_EXCHANGE_ManagementSetWireFeeHandle *
-TALER_EXCHANGE_management_set_wire_fees (
+struct TALER_DONAU_ManagementSetWireFeeHandle *
+TALER_DONAU_management_set_wire_fees (
   struct GNUNET_CURL_Context *ctx,
-  const char *exchange_base_url,
+  const char *donau_base_url,
   const char *wire_method,
   struct GNUNET_TIME_Timestamp validity_start,
   struct GNUNET_TIME_Timestamp validity_end,
   const struct TALER_WireFeeSet *fees,
   const struct TALER_MasterSignatureP *master_sig,
-  TALER_EXCHANGE_ManagementSetWireFeeCallback cb,
+  TALER_DONAU_ManagementSetWireFeeCallback cb,
   void *cb_cls);
 
 
 /**
- * Cancel #TALER_EXCHANGE_management_enable_wire() operation.
+ * Cancel #TALER_DONAU_management_enable_wire() operation.
  *
  * @param swfh handle of the operation to cancel
  */
 void
-TALER_EXCHANGE_management_set_wire_fees_cancel (
-  struct TALER_EXCHANGE_ManagementSetWireFeeHandle *swfh);
+TALER_DONAU_management_set_wire_fees_cancel (
+  struct TALER_DONAU_ManagementSetWireFeeHandle *swfh);
 
 
 /**
  * Response when setting global fees.
  */
-struct TALER_EXCHANGE_ManagementSetGlobalFeeResponse
+struct TALER_DONAU_ManagementSetGlobalFeeResponse
 {
   /**
    * HTTP response data.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 };
 
 
@@ -5948,22 +5348,22 @@ struct TALER_EXCHANGE_ManagementSetGlobalFeeResponse
  * @param gfr HTTP response data
  */
 typedef void
-(*TALER_EXCHANGE_ManagementSetGlobalFeeCallback) (
+(*TALER_DONAU_ManagementSetGlobalFeeCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_ManagementSetGlobalFeeResponse *gfr);
+  const struct TALER_DONAU_ManagementSetGlobalFeeResponse *gfr);
 
 
 /**
  * @brief Handle for a POST /management/global-fees request.
  */
-struct TALER_EXCHANGE_ManagementSetGlobalFeeHandle;
+struct TALER_DONAU_ManagementSetGlobalFeeHandle;
 
 
 /**
- * Inform the exchange about global fees.
+ * Inform the donau about global fees.
  *
  * @param ctx the context
- * @param exchange_base_url HTTP base URL for the exchange
+ * @param donau_base_url HTTP base URL for the donau
  * @param validity_start start date for the provided wire fees
  * @param validity_end end date for the provided wire fees
  * @param fees the wire fees for this time period
@@ -5972,14 +5372,14 @@ struct TALER_EXCHANGE_ManagementSetGlobalFeeHandle;
  * @param purse_account_limit how many purses are free per account
  * @param master_sig signature affirming the wire fees;
  *        of purpose #TALER_SIGNATURE_MASTER_GLOBAL_FEES
- * @param cb function to call with the exchange's result
+ * @param cb function to call with the donau's result
  * @param cb_cls closure for @a cb
  * @return the request handle; NULL upon error
  */
-struct TALER_EXCHANGE_ManagementSetGlobalFeeHandle *
-TALER_EXCHANGE_management_set_global_fees (
+struct TALER_DONAU_ManagementSetGlobalFeeHandle *
+TALER_DONAU_management_set_global_fees (
   struct GNUNET_CURL_Context *ctx,
-  const char *exchange_base_url,
+  const char *donau_base_url,
   struct GNUNET_TIME_Timestamp validity_start,
   struct GNUNET_TIME_Timestamp validity_end,
   const struct TALER_GlobalFeeSet *fees,
@@ -5987,29 +5387,29 @@ TALER_EXCHANGE_management_set_global_fees (
   struct GNUNET_TIME_Relative history_expiration,
   uint32_t purse_account_limit,
   const struct TALER_MasterSignatureP *master_sig,
-  TALER_EXCHANGE_ManagementSetGlobalFeeCallback cb,
+  TALER_DONAU_ManagementSetGlobalFeeCallback cb,
   void *cb_cls);
 
 
 /**
- * Cancel #TALER_EXCHANGE_management_enable_wire() operation.
+ * Cancel #TALER_DONAU_management_enable_wire() operation.
  *
  * @param sgfh handle of the operation to cancel
  */
 void
-TALER_EXCHANGE_management_set_global_fees_cancel (
-  struct TALER_EXCHANGE_ManagementSetGlobalFeeHandle *sgfh);
+TALER_DONAU_management_set_global_fees_cancel (
+  struct TALER_DONAU_ManagementSetGlobalFeeHandle *sgfh);
 
 
 /**
  * Response when adding denomination signature by auditor.
  */
-struct TALER_EXCHANGE_AuditorAddDenominationResponse
+struct TALER_DONAU_AuditorAddDenominationResponse
 {
   /**
    * HTTP response data.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 };
 
 
@@ -6021,49 +5421,49 @@ struct TALER_EXCHANGE_AuditorAddDenominationResponse
  * @param adr HTTP response data
  */
 typedef void
-(*TALER_EXCHANGE_AuditorAddDenominationCallback) (
+(*TALER_DONAU_AuditorAddDenominationCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_AuditorAddDenominationResponse *adr);
+  const struct TALER_DONAU_AuditorAddDenominationResponse *adr);
 
 
 /**
  * @brief Handle for a POST /auditor/$AUDITOR_PUB/$H_DENOM_PUB request.
  */
-struct TALER_EXCHANGE_AuditorAddDenominationHandle;
+struct TALER_DONAU_AuditorAddDenominationHandle;
 
 
 /**
- * Provide auditor signatures for a denomination to the exchange.
+ * Provide auditor signatures for a denomination to the donau.
  *
  * @param ctx the context
- * @param url HTTP base URL for the exchange
+ * @param url HTTP base URL for the donau
  * @param h_denom_pub hash of the public key of the denomination
  * @param auditor_pub public key of the auditor
  * @param auditor_sig signature of the auditor, of
- *         purpose #TALER_SIGNATURE_AUDITOR_EXCHANGE_KEYS
- * @param cb function to call with the exchange's result
+ *         purpose #TALER_SIGNATURE_AUDITOR_DONAU_KEYS
+ * @param cb function to call with the donau's result
  * @param cb_cls closure for @a cb
  * @return the request handle; NULL upon error
  */
-struct TALER_EXCHANGE_AuditorAddDenominationHandle *
-TALER_EXCHANGE_add_auditor_denomination (
+struct TALER_DONAU_AuditorAddDenominationHandle *
+TALER_DONAU_add_auditor_denomination (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
   const struct TALER_DenominationHashP *h_denom_pub,
   const struct TALER_AuditorPublicKeyP *auditor_pub,
   const struct TALER_AuditorSignatureP *auditor_sig,
-  TALER_EXCHANGE_AuditorAddDenominationCallback cb,
+  TALER_DONAU_AuditorAddDenominationCallback cb,
   void *cb_cls);
 
 
 /**
- * Cancel #TALER_EXCHANGE_add_auditor_denomination() operation.
+ * Cancel #TALER_DONAU_add_auditor_denomination() operation.
  *
  * @param ah handle of the operation to cancel
  */
 void
-TALER_EXCHANGE_add_auditor_denomination_cancel (
-  struct TALER_EXCHANGE_AuditorAddDenominationHandle *ah);
+TALER_DONAU_add_auditor_denomination_cancel (
+  struct TALER_DONAU_AuditorAddDenominationHandle *ah);
 
 
 /* ********************* W2W API ****************** */
@@ -6072,12 +5472,12 @@ TALER_EXCHANGE_add_auditor_denomination_cancel (
 /**
  * Response generated for a contract get request.
  */
-struct TALER_EXCHANGE_ContractGetResponse
+struct TALER_DONAU_ContractGetResponse
 {
   /**
    * Full HTTP response.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Details depending on the HTTP status code.
@@ -6118,55 +5518,55 @@ struct TALER_EXCHANGE_ContractGetResponse
  * @param cgr HTTP response data
  */
 typedef void
-(*TALER_EXCHANGE_ContractGetCallback) (
+(*TALER_DONAU_ContractGetCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_ContractGetResponse *cgr);
+  const struct TALER_DONAU_ContractGetResponse *cgr);
 
 
 /**
  * @brief Handle for a GET /contracts/$CPUB request.
  */
-struct TALER_EXCHANGE_ContractsGetHandle;
+struct TALER_DONAU_ContractsGetHandle;
 
 
 /**
- * Request information about a contract from the exchange.
+ * Request information about a contract from the donau.
  *
  * @param ctx CURL context
- * @param url exchange base URL
+ * @param url donau base URL
  * @param contract_priv private key of the contract
- * @param cb function to call with the exchange's result
+ * @param cb function to call with the donau's result
  * @param cb_cls closure for @a cb
  * @return the request handle; NULL upon error
  */
-struct TALER_EXCHANGE_ContractsGetHandle *
-TALER_EXCHANGE_contract_get (
+struct TALER_DONAU_ContractsGetHandle *
+TALER_DONAU_contract_get (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
   const struct TALER_ContractDiffiePrivateP *contract_priv,
-  TALER_EXCHANGE_ContractGetCallback cb,
+  TALER_DONAU_ContractGetCallback cb,
   void *cb_cls);
 
 
 /**
- * Cancel #TALER_EXCHANGE_contract_get() operation.
+ * Cancel #TALER_DONAU_contract_get() operation.
  *
  * @param cgh handle of the operation to cancel
  */
 void
-TALER_EXCHANGE_contract_get_cancel (
-  struct TALER_EXCHANGE_ContractsGetHandle *cgh);
+TALER_DONAU_contract_get_cancel (
+  struct TALER_DONAU_ContractsGetHandle *cgh);
 
 
 /**
  * Response generated for a purse get request.
  */
-struct TALER_EXCHANGE_PurseGetResponse
+struct TALER_DONAU_PurseGetResponse
 {
   /**
    * Full HTTP response.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Details depending on the HTTP status.
@@ -6217,61 +5617,61 @@ struct TALER_EXCHANGE_PurseGetResponse
  * @param pgr HTTP response data
  */
 typedef void
-(*TALER_EXCHANGE_PurseGetCallback) (
+(*TALER_DONAU_PurseGetCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_PurseGetResponse *pgr);
+  const struct TALER_DONAU_PurseGetResponse *pgr);
 
 
 /**
  * @brief Handle for a GET /purses/$PPUB request.
  */
-struct TALER_EXCHANGE_PurseGetHandle;
+struct TALER_DONAU_PurseGetHandle;
 
 
 /**
- * Request information about a purse from the exchange.
+ * Request information about a purse from the donau.
  *
  * @param ctx curl context
- * @param url exchange base URL
- * @param keys exchange keys
+ * @param url donau base URL
+ * @param keys donau keys
  * @param purse_pub public key of the purse
  * @param timeout how long to wait for a change to happen
  * @param wait_for_merge true to wait for a merge event, otherwise wait for a 
deposit event
- * @param cb function to call with the exchange's result
+ * @param cb function to call with the donau's result
  * @param cb_cls closure for @a cb
  * @return the request handle; NULL upon error
  */
-struct TALER_EXCHANGE_PurseGetHandle *
-TALER_EXCHANGE_purse_get (
+struct TALER_DONAU_PurseGetHandle *
+TALER_DONAU_purse_get (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
-  struct TALER_EXCHANGE_Keys *keys,
+  struct TALER_DONAU_Keys *keys,
   const struct TALER_PurseContractPublicKeyP *purse_pub,
   struct GNUNET_TIME_Relative timeout,
   bool wait_for_merge,
-  TALER_EXCHANGE_PurseGetCallback cb,
+  TALER_DONAU_PurseGetCallback cb,
   void *cb_cls);
 
 
 /**
- * Cancel #TALER_EXCHANGE_purse_get() operation.
+ * Cancel #TALER_DONAU_purse_get() operation.
  *
  * @param pgh handle of the operation to cancel
  */
 void
-TALER_EXCHANGE_purse_get_cancel (
-  struct TALER_EXCHANGE_PurseGetHandle *pgh);
+TALER_DONAU_purse_get_cancel (
+  struct TALER_DONAU_PurseGetHandle *pgh);
 
 
 /**
  * Response generated for a purse creation request.
  */
-struct TALER_EXCHANGE_PurseCreateDepositResponse
+struct TALER_DONAU_PurseCreateDepositResponse
 {
   /**
    * Full HTTP response.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Details depending on the HTTP status.
@@ -6285,16 +5685,16 @@ struct TALER_EXCHANGE_PurseCreateDepositResponse
     struct
     {
       /**
-       * Signing key used by the exchange to sign the
+       * Signing key used by the donau to sign the
        * purse create with deposit confirmation.
        */
-      struct TALER_ExchangePublicKeyP exchange_pub;
+      struct TALER_ExchangePublicKeyP donau_pub;
 
       /**
-       * Signature from the exchange on the
+       * Signature from the donau on the
        * purse create with deposit confirmation.
        */
-      struct TALER_ExchangeSignatureP exchange_sig;
+      struct TALER_ExchangeSignatureP donau_sig;
 
 
     } ok;
@@ -6311,21 +5711,21 @@ struct TALER_EXCHANGE_PurseCreateDepositResponse
  * @param pcr HTTP response data
  */
 typedef void
-(*TALER_EXCHANGE_PurseCreateDepositCallback) (
+(*TALER_DONAU_PurseCreateDepositCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_PurseCreateDepositResponse *pcr);
+  const struct TALER_DONAU_PurseCreateDepositResponse *pcr);
 
 
 /**
  * @brief Handle for a POST /purses/$PID/create request.
  */
-struct TALER_EXCHANGE_PurseCreateDepositHandle;
+struct TALER_DONAU_PurseCreateDepositHandle;
 
 
 /**
  * Information about a coin to be deposited into a purse or reserve.
  */
-struct TALER_EXCHANGE_PurseDeposit
+struct TALER_DONAU_PurseDeposit
 {
   /**
    * Age commitment data, might be NULL.
@@ -6356,12 +5756,12 @@ struct TALER_EXCHANGE_PurseDeposit
 
 
 /**
- * Inform the exchange that a purse should be created
+ * Inform the donau that a purse should be created
  * and coins deposited into it.
  *
  * @param ctx curl context
- * @param url exchange base URL
- * @param keys exchange keys
+ * @param url donau base URL
+ * @param keys donau keys
  * @param purse_priv private key of the purse
  * @param merge_priv the merge credential
  * @param contract_priv key needed to obtain and decrypt the contract
@@ -6371,45 +5771,45 @@ struct TALER_EXCHANGE_PurseDeposit
  * @param upload_contract true to upload the contract; must
  *        be FALSE for repeated calls to this API for the
  *        same purse (i.e. when adding more deposits).
- * @param cb function to call with the exchange's result
+ * @param cb function to call with the donau's result
  * @param cb_cls closure for @a cb
  * @return the request handle; NULL upon error
  */
-struct TALER_EXCHANGE_PurseCreateDepositHandle *
-TALER_EXCHANGE_purse_create_with_deposit (
+struct TALER_DONAU_PurseCreateDepositHandle *
+TALER_DONAU_purse_create_with_deposit (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
-  struct TALER_EXCHANGE_Keys *keys,
+  struct TALER_DONAU_Keys *keys,
   const struct TALER_PurseContractPrivateKeyP *purse_priv,
   const struct TALER_PurseMergePrivateKeyP *merge_priv,
   const struct TALER_ContractDiffiePrivateP *contract_priv,
   const json_t *contract_terms,
   unsigned int num_deposits,
-  const struct TALER_EXCHANGE_PurseDeposit deposits[static num_deposits],
+  const struct TALER_DONAU_PurseDeposit deposits[static num_deposits],
   bool upload_contract,
-  TALER_EXCHANGE_PurseCreateDepositCallback cb,
+  TALER_DONAU_PurseCreateDepositCallback cb,
   void *cb_cls);
 
 
 /**
- * Cancel #TALER_EXCHANGE_purse_create_with_deposit() operation.
+ * Cancel #TALER_DONAU_purse_create_with_deposit() operation.
  *
  * @param pch handle of the operation to cancel
  */
 void
-TALER_EXCHANGE_purse_create_with_deposit_cancel (
-  struct TALER_EXCHANGE_PurseCreateDepositHandle *pch);
+TALER_DONAU_purse_create_with_deposit_cancel (
+  struct TALER_DONAU_PurseCreateDepositHandle *pch);
 
 
 /**
  * Response generated for a purse deletion request.
  */
-struct TALER_EXCHANGE_PurseDeleteResponse
+struct TALER_DONAU_PurseDeleteResponse
 {
   /**
    * Full HTTP response.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 };
 
 
@@ -6421,56 +5821,56 @@ struct TALER_EXCHANGE_PurseDeleteResponse
  * @param pdr HTTP response data
  */
 typedef void
-(*TALER_EXCHANGE_PurseDeleteCallback) (
+(*TALER_DONAU_PurseDeleteCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_PurseDeleteResponse *pdr);
+  const struct TALER_DONAU_PurseDeleteResponse *pdr);
 
 
 /**
  * @brief Handle for a DELETE /purses/$PID request.
  */
-struct TALER_EXCHANGE_PurseDeleteHandle;
+struct TALER_DONAU_PurseDeleteHandle;
 
 
 /**
- * Asks the exchange to delete a purse. Will only succeed if
+ * Asks the donau to delete a purse. Will only succeed if
  * the purse was not yet merged and did not yet time out.
  *
  * @param ctx CURL context
- * @param url exchange base URL
+ * @param url donau base URL
  * @param purse_priv private key of the purse
- * @param cb function to call with the exchange's result
+ * @param cb function to call with the donau's result
  * @param cb_cls closure for @a cb
  * @return the request handle; NULL upon error
  */
-struct TALER_EXCHANGE_PurseDeleteHandle *
-TALER_EXCHANGE_purse_delete (
+struct TALER_DONAU_PurseDeleteHandle *
+TALER_DONAU_purse_delete (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
   const struct TALER_PurseContractPrivateKeyP *purse_priv,
-  TALER_EXCHANGE_PurseDeleteCallback cb,
+  TALER_DONAU_PurseDeleteCallback cb,
   void *cb_cls);
 
 
 /**
- * Cancel #TALER_EXCHANGE_purse_delete() operation.
+ * Cancel #TALER_DONAU_purse_delete() operation.
  *
  * @param pdh handle of the operation to cancel
  */
 void
-TALER_EXCHANGE_purse_delete_cancel (
-  struct TALER_EXCHANGE_PurseDeleteHandle *pdh);
+TALER_DONAU_purse_delete_cancel (
+  struct TALER_DONAU_PurseDeleteHandle *pdh);
 
 
 /**
  * Response generated for an account merge request.
  */
-struct TALER_EXCHANGE_AccountMergeResponse
+struct TALER_DONAU_AccountMergeResponse
 {
   /**
    * Full HTTP response.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Reserve signature affirming the merge.
@@ -6488,17 +5888,17 @@ struct TALER_EXCHANGE_AccountMergeResponse
     struct
     {
       /**
-       * Signature by the exchange affirming the merge.
+       * Signature by the donau affirming the merge.
        */
-      struct TALER_ExchangeSignatureP exchange_sig;
+      struct TALER_ExchangeSignatureP donau_sig;
 
       /**
-       * Online signing key used by the exchange.
+       * Online signing key used by the donau.
        */
-      struct TALER_ExchangePublicKeyP exchange_pub;
+      struct TALER_ExchangePublicKeyP donau_pub;
 
       /**
-       * Timestamp of the exchange for @e exchange_sig.
+       * Timestamp of the donau for @e donau_sig.
        */
       struct GNUNET_TIME_Timestamp etime;
 
@@ -6528,25 +5928,25 @@ struct TALER_EXCHANGE_AccountMergeResponse
  * @param amr HTTP response data
  */
 typedef void
-(*TALER_EXCHANGE_AccountMergeCallback) (
+(*TALER_DONAU_AccountMergeCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_AccountMergeResponse *amr);
+  const struct TALER_DONAU_AccountMergeResponse *amr);
 
 
 /**
  * @brief Handle for a POST /purses/$PID/merge request.
  */
-struct TALER_EXCHANGE_AccountMergeHandle;
+struct TALER_DONAU_AccountMergeHandle;
 
 
 /**
- * Inform the exchange that a purse should be merged
+ * Inform the donau that a purse should be merged
  * with a reserve.
  *
  * @param ctx curl context
- * @param url exchange base URL
- * @param keys exchange keys
- * @param reserve_exchange_url base URL of the exchange with the reserve
+ * @param url donau base URL
+ * @param keys donau keys
+ * @param reserve_donau_url base URL of the donau with the reserve
  * @param reserve_priv private key of the reserve to merge into
  * @param purse_pub public key of the purse to merge
  * @param merge_priv private key granting us the right to merge
@@ -6555,16 +5955,16 @@ struct TALER_EXCHANGE_AccountMergeHandle;
  * @param purse_value_after_fees amount that should be in the purse
  * @param purse_expiration when will the purse expire
  * @param merge_timestamp when is the merge happening (current time)
- * @param cb function to call with the exchange's result
+ * @param cb function to call with the donau's result
  * @param cb_cls closure for @a cb
  * @return the request handle; NULL upon error
  */
-struct TALER_EXCHANGE_AccountMergeHandle *
-TALER_EXCHANGE_account_merge (
+struct TALER_DONAU_AccountMergeHandle *
+TALER_DONAU_account_merge (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
-  struct TALER_EXCHANGE_Keys *keys,
-  const char *reserve_exchange_url,
+  struct TALER_DONAU_Keys *keys,
+  const char *reserve_donau_url,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
   const struct TALER_PurseContractPublicKeyP *purse_pub,
   const struct TALER_PurseMergePrivateKeyP *merge_priv,
@@ -6573,29 +5973,29 @@ TALER_EXCHANGE_account_merge (
   const struct TALER_Amount *purse_value_after_fees,
   struct GNUNET_TIME_Timestamp purse_expiration,
   struct GNUNET_TIME_Timestamp merge_timestamp,
-  TALER_EXCHANGE_AccountMergeCallback cb,
+  TALER_DONAU_AccountMergeCallback cb,
   void *cb_cls);
 
 
 /**
- * Cancel #TALER_EXCHANGE_account_merge() operation.
+ * Cancel #TALER_DONAU_account_merge() operation.
  *
  * @param amh handle of the operation to cancel
  */
 void
-TALER_EXCHANGE_account_merge_cancel (
-  struct TALER_EXCHANGE_AccountMergeHandle *amh);
+TALER_DONAU_account_merge_cancel (
+  struct TALER_DONAU_AccountMergeHandle *amh);
 
 
 /**
  * Response generated for a purse creation request.
  */
-struct TALER_EXCHANGE_PurseCreateMergeResponse
+struct TALER_DONAU_PurseCreateMergeResponse
 {
   /**
    * Full HTTP response.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Reserve signature generated for the request
@@ -6640,24 +6040,24 @@ struct TALER_EXCHANGE_PurseCreateMergeResponse
  * @param pcr HTTP response data
  */
 typedef void
-(*TALER_EXCHANGE_PurseCreateMergeCallback) (
+(*TALER_DONAU_PurseCreateMergeCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_PurseCreateMergeResponse *pcr);
+  const struct TALER_DONAU_PurseCreateMergeResponse *pcr);
 
 
 /**
  * @brief Handle for a POST /reserves/$RID/purse request.
  */
-struct TALER_EXCHANGE_PurseCreateMergeHandle;
+struct TALER_DONAU_PurseCreateMergeHandle;
 
 
 /**
- * Inform the exchange that a purse should be created
+ * Inform the donau that a purse should be created
  * and merged with a reserve.
  *
  * @param ctx curl context
- * @param url exchange base URL
- * @param keys exchange keys
+ * @param url donau base URL
+ * @param keys donau keys
  * @param reserve_priv private key of the reserve
  * @param purse_priv private key of the purse
  * @param merge_priv private key of the merge capability
@@ -6666,15 +6066,15 @@ struct TALER_EXCHANGE_PurseCreateMergeHandle;
  * @param upload_contract true to upload the contract
  * @param pay_for_purse true to pay for purse creation
  * @param merge_timestamp when should the merge happen (use current time)
- * @param cb function to call with the exchange's result
+ * @param cb function to call with the donau's result
  * @param cb_cls closure for @a cb
  * @return the request handle; NULL upon error
  */
-struct TALER_EXCHANGE_PurseCreateMergeHandle *
-TALER_EXCHANGE_purse_create_with_merge (
+struct TALER_DONAU_PurseCreateMergeHandle *
+TALER_DONAU_purse_create_with_merge (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
-  struct TALER_EXCHANGE_Keys *keys,
+  struct TALER_DONAU_Keys *keys,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
   const struct TALER_PurseContractPrivateKeyP *purse_priv,
   const struct TALER_PurseMergePrivateKeyP *merge_priv,
@@ -6683,29 +6083,29 @@ TALER_EXCHANGE_purse_create_with_merge (
   bool upload_contract,
   bool pay_for_purse,
   struct GNUNET_TIME_Timestamp merge_timestamp,
-  TALER_EXCHANGE_PurseCreateMergeCallback cb,
+  TALER_DONAU_PurseCreateMergeCallback cb,
   void *cb_cls);
 
 
 /**
- * Cancel #TALER_EXCHANGE_purse_create_with_merge() operation.
+ * Cancel #TALER_DONAU_purse_create_with_merge() operation.
  *
  * @param pcm handle of the operation to cancel
  */
 void
-TALER_EXCHANGE_purse_create_with_merge_cancel (
-  struct TALER_EXCHANGE_PurseCreateMergeHandle *pcm);
+TALER_DONAU_purse_create_with_merge_cancel (
+  struct TALER_DONAU_PurseCreateMergeHandle *pcm);
 
 
 /**
  * Response generated for purse deposit request.
  */
-struct TALER_EXCHANGE_PurseDepositResponse
+struct TALER_DONAU_PurseDepositResponse
 {
   /**
    * Full HTTP response.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Details depending on the HTTP status.
@@ -6751,55 +6151,55 @@ struct TALER_EXCHANGE_PurseDepositResponse
  * @param pdr HTTP response data
  */
 typedef void
-(*TALER_EXCHANGE_PurseDepositCallback) (
+(*TALER_DONAU_PurseDepositCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_PurseDepositResponse *pdr);
+  const struct TALER_DONAU_PurseDepositResponse *pdr);
 
 
 /**
  * @brief Handle for a POST /purses/$PID/deposit request.
  */
-struct TALER_EXCHANGE_PurseDepositHandle;
+struct TALER_DONAU_PurseDepositHandle;
 
 
 /**
- * Inform the exchange that a deposit should be made into
+ * Inform the donau that a deposit should be made into
  * a purse.
  *
  * @param ctx curl context
- * @param url exchange base URL
- * @param keys exchange keys
- * @param purse_exchange_url base URL of the exchange hosting the purse
+ * @param url donau base URL
+ * @param keys donau keys
+ * @param purse_donau_url base URL of the donau hosting the purse
  * @param purse_pub public key of the purse to merge
  * @param min_age minimum age we need to prove for the purse
  * @param num_deposits length of the @a deposits array
  * @param deposits array of deposits to make into the purse
- * @param cb function to call with the exchange's result
+ * @param cb function to call with the donau's result
  * @param cb_cls closure for @a cb
  * @return the request handle; NULL upon error
  */
-struct TALER_EXCHANGE_PurseDepositHandle *
-TALER_EXCHANGE_purse_deposit (
+struct TALER_DONAU_PurseDepositHandle *
+TALER_DONAU_purse_deposit (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
-  struct TALER_EXCHANGE_Keys *keys,
-  const char *purse_exchange_url,
+  struct TALER_DONAU_Keys *keys,
+  const char *purse_donau_url,
   const struct TALER_PurseContractPublicKeyP *purse_pub,
   uint8_t min_age,
   unsigned int num_deposits,
-  const struct TALER_EXCHANGE_PurseDeposit deposits[static num_deposits],
-  TALER_EXCHANGE_PurseDepositCallback cb,
+  const struct TALER_DONAU_PurseDeposit deposits[static num_deposits],
+  TALER_DONAU_PurseDepositCallback cb,
   void *cb_cls);
 
 
 /**
- * Cancel #TALER_EXCHANGE_purse_deposit() operation.
+ * Cancel #TALER_DONAU_purse_deposit() operation.
  *
  * @param amh handle of the operation to cancel
  */
 void
-TALER_EXCHANGE_purse_deposit_cancel (
-  struct TALER_EXCHANGE_PurseDepositHandle *amh);
+TALER_DONAU_purse_deposit_cancel (
+  struct TALER_DONAU_PurseDepositHandle *amh);
 
 
 /* *********************  /reserves/$RID/open *********************** */
@@ -6808,19 +6208,19 @@ TALER_EXCHANGE_purse_deposit_cancel (
 /**
  * @brief A /reserves/$RID/open Handle
  */
-struct TALER_EXCHANGE_ReservesOpenHandle;
+struct TALER_DONAU_ReservesOpenHandle;
 
 
 /**
  * @brief Reserve open result details.
  */
-struct TALER_EXCHANGE_ReserveOpenResult
+struct TALER_DONAU_ReserveOpenResult
 {
 
   /**
    * High-level HTTP response details.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Details depending on @e hr.http_status.
@@ -6892,23 +6292,23 @@ struct TALER_EXCHANGE_ReserveOpenResult
 
 /**
  * Callbacks of this type are used to serve the result of submitting a
- * reserve open request to a exchange.
+ * reserve open request to a donau.
  *
  * @param cls closure
  * @param ror HTTP response data
  */
 typedef void
-(*TALER_EXCHANGE_ReservesOpenCallback) (
+(*TALER_DONAU_ReservesOpenCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_ReserveOpenResult *ror);
+  const struct TALER_DONAU_ReserveOpenResult *ror);
 
 
 /**
  * Submit a request to open a reserve.
  *
  * @param ctx curl context
- * @param url exchange base URL
- * @param keys exchange keys
+ * @param url donau base URL
+ * @param keys donau keys
  * @param reserve_priv private key of the reserve to open
  * @param reserve_contribution amount to pay from the reserve's balance for 
the operation
  * @param coin_payments_length length of the @a coin_payments array
@@ -6920,19 +6320,19 @@ typedef void
  * @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_ReservesOpenHandle *
-TALER_EXCHANGE_reserves_open (
+struct TALER_DONAU_ReservesOpenHandle *
+TALER_DONAU_reserves_open (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
-  struct TALER_EXCHANGE_Keys *keys,
+  struct TALER_DONAU_Keys *keys,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
   const struct TALER_Amount *reserve_contribution,
   unsigned int coin_payments_length,
-  const struct TALER_EXCHANGE_PurseDeposit coin_payments[
+  const struct TALER_DONAU_PurseDeposit coin_payments[
     static coin_payments_length],
   struct GNUNET_TIME_Timestamp expiration_time,
   uint32_t min_purses,
-  TALER_EXCHANGE_ReservesOpenCallback cb,
+  TALER_DONAU_ReservesOpenCallback cb,
   void *cb_cls);
 
 
@@ -6943,8 +6343,8 @@ TALER_EXCHANGE_reserves_open (
  * @param[in] roh the reserve open request handle
  */
 void
-TALER_EXCHANGE_reserves_open_cancel (
-  struct TALER_EXCHANGE_ReservesOpenHandle *roh);
+TALER_DONAU_reserves_open_cancel (
+  struct TALER_DONAU_ReservesOpenHandle *roh);
 
 
 /* *********************  /reserves/$RID/attest *********************** */
@@ -6953,19 +6353,19 @@ TALER_EXCHANGE_reserves_open_cancel (
 /**
  * @brief A Get /reserves/$RID/attest Handle
  */
-struct TALER_EXCHANGE_ReservesGetAttestHandle;
+struct TALER_DONAU_ReservesGetAttestHandle;
 
 
 /**
  * @brief Reserve GET attest result details.
  */
-struct TALER_EXCHANGE_ReserveGetAttestResult
+struct TALER_DONAU_ReserveGetAttestResult
 {
 
   /**
    * High-level HTTP response details.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Details depending on @e hr.http_status.
@@ -6999,34 +6399,34 @@ struct TALER_EXCHANGE_ReserveGetAttestResult
 
 /**
  * Callbacks of this type are used to serve the result of submitting a
- * reserve attest request to a exchange.
+ * reserve attest request to a donau.
  *
  * @param cls closure
  * @param ror HTTP response data
  */
 typedef void
-(*TALER_EXCHANGE_ReservesGetAttestCallback) (
+(*TALER_DONAU_ReservesGetAttestCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_ReserveGetAttestResult *ror);
+  const struct TALER_DONAU_ReserveGetAttestResult *ror);
 
 
 /**
  * Submit a request to get the list of attestable attributes for a reserve.
  *
  * @param ctx CURL context
- * @param url exchange base URL
+ * @param url donau base URL
  * @param reserve_pub public key of the reserve to get available attributes for
  * @param cb the callback to call when a reply for this request is available
  * @param cb_cls closure for the above callback
  * @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_ReservesGetAttestHandle *
-TALER_EXCHANGE_reserves_get_attestable (
+struct TALER_DONAU_ReservesGetAttestHandle *
+TALER_DONAU_reserves_get_attestable (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
   const struct TALER_ReservePublicKeyP *reserve_pub,
-  TALER_EXCHANGE_ReservesGetAttestCallback cb,
+  TALER_DONAU_ReservesGetAttestCallback cb,
   void *cb_cls);
 
 
@@ -7037,26 +6437,26 @@ TALER_EXCHANGE_reserves_get_attestable (
  * @param rgah the reserve get attestable request handle
  */
 void
-TALER_EXCHANGE_reserves_get_attestable_cancel (
-  struct TALER_EXCHANGE_ReservesGetAttestHandle *rgah);
+TALER_DONAU_reserves_get_attestable_cancel (
+  struct TALER_DONAU_ReservesGetAttestHandle *rgah);
 
 
 /**
  * @brief A POST /reserves/$RID/attest Handle
  */
-struct TALER_EXCHANGE_ReservesPostAttestHandle;
+struct TALER_DONAU_ReservesPostAttestHandle;
 
 
 /**
  * @brief Reserve attest result details.
  */
-struct TALER_EXCHANGE_ReservePostAttestResult
+struct TALER_DONAU_ReservePostAttestResult
 {
 
   /**
    * High-level HTTP response details.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Details depending on @e hr.http_status.
@@ -7071,9 +6471,9 @@ struct TALER_EXCHANGE_ReservePostAttestResult
     struct
     {
       /**
-       * Time when the exchange made the signature.
+       * Time when the donau made the signature.
        */
-      struct GNUNET_TIME_Timestamp exchange_time;
+      struct GNUNET_TIME_Timestamp donau_time;
 
       /**
        * Expiration time of the attested attributes.
@@ -7081,17 +6481,17 @@ struct TALER_EXCHANGE_ReservePostAttestResult
       struct GNUNET_TIME_Timestamp expiration_time;
 
       /**
-       * Signature by the exchange affirming the attributes.
+       * Signature by the donau affirming the attributes.
        */
-      struct TALER_ExchangeSignatureP exchange_sig;
+      struct TALER_ExchangeSignatureP donau_sig;
 
       /**
-       * Online signing key used by the exchange.
+       * Online signing key used by the donau.
        */
-      struct TALER_ExchangePublicKeyP exchange_pub;
+      struct TALER_ExchangePublicKeyP donau_pub;
 
       /**
-       * Attributes being confirmed by the exchange.
+       * Attributes being confirmed by the donau.
        */
       const json_t *attributes;
 
@@ -7104,22 +6504,22 @@ struct TALER_EXCHANGE_ReservePostAttestResult
 
 /**
  * Callbacks of this type are used to serve the result of submitting a
- * reserve attest request to a exchange.
+ * reserve attest request to a donau.
  *
  * @param cls closure
  * @param ror HTTP response data
  */
 typedef void
-(*TALER_EXCHANGE_ReservesPostAttestCallback) (
+(*TALER_DONAU_ReservesPostAttestCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_ReservePostAttestResult *ror);
+  const struct TALER_DONAU_ReservePostAttestResult *ror);
 
 
 /**
  * Submit a request to attest attributes about the owner of a reserve.
  *
  * @param ctx CURL context
- * @param url exchange base URL
+ * @param url donau base URL
  * @param reserve_priv private key of the reserve to attest
  * @param attributes_length length of the @a attributes array
  * @param attributes array of names of attributes to get attestations for
@@ -7128,14 +6528,14 @@ typedef void
  * @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_ReservesAttestHandle *
-TALER_EXCHANGE_reserves_attest (
+struct TALER_DONAU_ReservesAttestHandle *
+TALER_DONAU_reserves_attest (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
   unsigned int attributes_length,
   const char *attributes[const static attributes_length],
-  TALER_EXCHANGE_ReservesPostAttestCallback cb,
+  TALER_DONAU_ReservesPostAttestCallback cb,
   void *cb_cls);
 
 
@@ -7146,8 +6546,8 @@ TALER_EXCHANGE_reserves_attest (
  * @param rah the reserve attest request handle
  */
 void
-TALER_EXCHANGE_reserves_attest_cancel (
-  struct TALER_EXCHANGE_ReservesAttestHandle *rah);
+TALER_DONAU_reserves_attest_cancel (
+  struct TALER_DONAU_ReservesAttestHandle *rah);
 
 
 /* *********************  /reserves/$RID/close *********************** */
@@ -7156,19 +6556,19 @@ TALER_EXCHANGE_reserves_attest_cancel (
 /**
  * @brief A /reserves/$RID/close Handle
  */
-struct TALER_EXCHANGE_ReservesCloseHandle;
+struct TALER_DONAU_ReservesCloseHandle;
 
 
 /**
  * @brief Reserve close result details.
  */
-struct TALER_EXCHANGE_ReserveCloseResult
+struct TALER_DONAU_ReserveCloseResult
 {
 
   /**
    * High-level HTTP response details.
    */
-  struct TALER_EXCHANGE_HttpResponse hr;
+  struct TALER_DONAU_HttpResponse hr;
 
   /**
    * Details depending on @e hr.http_status.
@@ -7215,22 +6615,22 @@ struct TALER_EXCHANGE_ReserveCloseResult
 
 /**
  * Callbacks of this type are used to serve the result of submitting a
- * reserve close request to a exchange.
+ * reserve close request to a donau.
  *
  * @param cls closure
  * @param ror HTTP response data
  */
 typedef void
-(*TALER_EXCHANGE_ReservesCloseCallback) (
+(*TALER_DONAU_ReservesCloseCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_ReserveCloseResult *ror);
+  const struct TALER_DONAU_ReserveCloseResult *ror);
 
 
 /**
  * Submit a request to close a reserve.
  *
  * @param ctx curl context
- * @param url exchange base URL
+ * @param url donau base URL
  * @param reserve_priv private key of the reserve to close
  * @param target_payto_uri where to send the payment, NULL to send to reserve 
origin
  * @param cb the callback to call when a reply for this request is available
@@ -7238,13 +6638,13 @@ typedef void
  * @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_ReservesCloseHandle *
-TALER_EXCHANGE_reserves_close (
+struct TALER_DONAU_ReservesCloseHandle *
+TALER_DONAU_reserves_close (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
   const char *target_payto_uri,
-  TALER_EXCHANGE_ReservesCloseCallback cb,
+  TALER_DONAU_ReservesCloseCallback cb,
   void *cb_cls);
 
 
@@ -7255,7 +6655,7 @@ TALER_EXCHANGE_reserves_close (
  * @param rch the reserve request handle
  */
 void
-TALER_EXCHANGE_reserves_close_cancel (
-  struct TALER_EXCHANGE_ReservesCloseHandle *rch);
+TALER_DONAU_reserves_close_cancel (
+  struct TALER_DONAU_ReservesCloseHandle *rch);
 
-#endif  /* _TALER_EXCHANGE_SERVICE_H */
+#endif  /* _TALER_DONAU_SERVICE_H */
diff --git a/src/include/taler_exchangedb_lib.h 
b/src/include/taler_donaudb_lib.h
similarity index 99%
rename from src/include/taler_exchangedb_lib.h
rename to src/include/taler_donaudb_lib.h
index 17b01b0..90eb327 100644
--- a/src/include/taler_exchangedb_lib.h
+++ b/src/include/taler_donaudb_lib.h
@@ -1,4 +1,4 @@
-/*
+
   This file is part of TALER
   Copyright (C) 2014-2020 Taler Systems SA
 
diff --git a/src/include/taler_exchangedb_plugin.h 
b/src/include/taler_donaudb_plugin.h
similarity index 100%
rename from src/include/taler_exchangedb_plugin.h
rename to src/include/taler_donaudb_plugin.h
diff --git a/src/lib/exchange_api_common.h b/src/lib/exchange_api_common.h
index 1b9ddce..d17493b 100644
--- a/src/lib/exchange_api_common.h
+++ b/src/lib/exchange_api_common.h
@@ -190,7 +190,7 @@ TALER_EXCHANGE_check_coin_conflict_ (
  * @param keys keys to search
  * @param[out] min set to the smallest amount
  * @return #GNUNET_SYSERR if there are no denominations in @a keys
- */
+
 enum GNUNET_GenericReturnValue
 TALER_EXCHANGE_get_min_denomination_ (
   const struct TALER_EXCHANGE_Keys *keys,

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]