tip -> reward

1 files changed, 152 insertions, 152 deletions

diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h
index 12b8ce95..b1876a30 100644
--- a/src/include/taler_merchant_service.h
+++ b/src/include/taler_merchant_service.h
@@ -3765,7 +3765,7 @@ struct TALER_MERCHANT_ReserveSummary
   struct TALER_Amount pickup_amount;
 
   /**
-   * Amount approved for tips that exceeds the pickup_amount.
+   * Amount approved for rewards that exceeds the pickup_amount.
    */
   struct TALER_Amount committed_amount;
 
@@ -3861,28 +3861,28 @@ TALER_MERCHANT_reserves_get_cancel (
 
 /**
  * Handle for a request to obtain details on a specific
- * (tipping) reserve.
+ * (rewardping) reserve.
  */
 struct TALER_MERCHANT_ReserveGetHandle;
 
 
 /**
- * Details about a tip granted by the merchant.
+ * Details about a reward granted by the merchant.
  */
-struct TALER_MERCHANT_TipDetails
+struct TALER_MERCHANT_RewardDetails
 {
   /**
-   * Identifier for the tip.
+   * Identifier for the reward.
    */
-  struct TALER_TipIdentifierP tip_id;
+  struct TALER_RewardIdentifierP reward_id;
 
   /**
-   * Total value of the tip (including fees).
+   * Total value of the reward (including fees).
    */
   struct TALER_Amount amount;
 
   /**
-   * Human-readable reason for why the tip was granted.
+   * Human-readable reason for why the reward was granted.
    */
   const char *reason;
 
@@ -3934,14 +3934,14 @@ struct TALER_MERCHANT_ReserveGetResponse
       unsigned int accounts_len;
 
       /**
-       * Array with details about the tips granted.
+       * Array with details about the rewards granted.
        */
-      const struct TALER_MERCHANT_TipDetails *tips;
+      const struct TALER_MERCHANT_RewardDetails *rewards;
 
       /**
-       * Length of the @e tips array
+       * Length of the @e rewards array
        */
-      unsigned int tips_length;
+      unsigned int rewards_length;
 
       /**
        * Is this reserve active (false if it was deleted but not purged)
@@ -3974,7 +3974,7 @@ typedef void
  * @param ctx execution context
  * @param backend_url base URL of the merchant backend
  * @param reserve_pub which reserve should be queried
- * @param fetch_tips should we return details about the tips issued from the reserve
+ * @param fetch_rewards should we return details about the rewards issued from the reserve
  * @param cb function to call with the result(s)
  * @param cb_cls closure for @a cb
  * @return handle for this operation, NULL upon errors
@@ -3983,7 +3983,7 @@ struct TALER_MERCHANT_ReserveGetHandle *
 TALER_MERCHANT_reserve_get (struct GNUNET_CURL_Context *ctx,
                             const char *backend_url,
                             const struct TALER_ReservePublicKeyP *reserve_pub,
-                            bool fetch_tips,
+                            bool fetch_rewards,
                             TALER_MERCHANT_ReserveGetCallback cb,
                             void *cb_cls);
 
@@ -3999,15 +3999,15 @@ TALER_MERCHANT_reserve_get_cancel (
 
 
 /**
- * Handle for a /tip-authorize operation.
+ * Handle for a /reward-authorize operation.
  */
-struct TALER_MERCHANT_TipAuthorizeHandle;
+struct TALER_MERCHANT_RewardAuthorizeHandle;
 
 
 /**
- * Response to a /tip-authorize request.
+ * Response to a /reward-authorize request.
  */
-struct TALER_MERCHANT_TipAuthorizeResponse
+struct TALER_MERCHANT_RewardAuthorizeResponse
 {
   /**
    * HTTP response details
@@ -4027,19 +4027,19 @@ struct TALER_MERCHANT_TipAuthorizeResponse
     {
 
       /**
-       * which tip ID should be used to pickup the tip
+       * which reward ID should be used to pickup the reward
        */
-      struct TALER_TipIdentifierP tip_id;
+      struct TALER_RewardIdentifierP reward_id;
 
       /**
-       * URI for the tip
+       * URI for the reward
        */
-      const char *tip_uri;
+      const char *reward_uri;
 
       /**
-       * when does the tip expire
+       * when does the reward expire
        */
-      struct GNUNET_TIME_Timestamp tip_expiration;
+      struct GNUNET_TIME_Timestamp reward_expiration;
 
     } ok;
 
@@ -4049,77 +4049,77 @@ struct TALER_MERCHANT_TipAuthorizeResponse
 
 
 /**
- * Callback for a /reserves/$RESERVE_PUB/tip-authorize request.  Returns the
+ * Callback for a /reserves/$RESERVE_PUB/reward-authorize request.  Returns the
  * result of the operation.
  *
  * @param cls closure
  * @param tar response
  */
 typedef void
-(*TALER_MERCHANT_TipAuthorizeCallback) (
+(*TALER_MERCHANT_RewardAuthorizeCallback) (
   void *cls,
-  const struct TALER_MERCHANT_TipAuthorizeResponse *tar);
+  const struct TALER_MERCHANT_RewardAuthorizeResponse *tar);
 
 
 /**
- * Issue a /tip-authorize request to the backend.  Informs the backend
- * that a tip should be created.
+ * Issue a /reward-authorize request to the backend.  Informs the backend
+ * that a reward should be created.
  *
  * @param ctx execution context
  * @param backend_url base URL of the merchant backend
  * @param reserve_pub public key of the reserve
- * @param next_url where the browser should proceed after picking up the tip
- * @param amount amount to be handed out as a tip
- * @param justification which justification should be stored (human-readable reason for the tip)
+ * @param next_url where the browser should proceed after picking up the reward
+ * @param amount amount to be handed out as a reward
+ * @param justification which justification should be stored (human-readable reason for the reward)
  * @param authorize_cb callback which will work the response gotten from the backend
  * @param authorize_cb_cls closure to pass to @a authorize_cb
  * @return handle for this operation, NULL upon errors
  */
-struct TALER_MERCHANT_TipAuthorizeHandle *
-TALER_MERCHANT_tip_authorize2 (
+struct TALER_MERCHANT_RewardAuthorizeHandle *
+TALER_MERCHANT_reward_authorize2 (
   struct GNUNET_CURL_Context *ctx,
   const char *backend_url,
   const struct TALER_ReservePublicKeyP *reserve_pub,
   const char *next_url,
   const struct TALER_Amount *amount,
   const char *justification,
-  TALER_MERCHANT_TipAuthorizeCallback authorize_cb,
+  TALER_MERCHANT_RewardAuthorizeCallback authorize_cb,
   void *authorize_cb_cls);
 
 
 /**
- * Issue a POST /tips request to the backend.  Informs the backend that a tip
- * should be created. In contrast to #TALER_MERCHANT_tip_authorize2(), the
+ * Issue a POST /rewards request to the backend.  Informs the backend that a reward
+ * should be created. In contrast to #TALER_MERCHANT_reward_authorize2(), the
  * backend gets to pick the reserve with this API.
  *
  * @param ctx execution context
  * @param backend_url base URL of the merchant backend
- * @param next_url where the browser should proceed after picking up the tip
- * @param amount amount to be handed out as a tip
- * @param justification which justification should be stored (human-readable reason for the tip)
+ * @param next_url where the browser should proceed after picking up the reward
+ * @param amount amount to be handed out as a reward
+ * @param justification which justification should be stored (human-readable reason for the reward)
  * @param authorize_cb callback which will work the response gotten from the backend
  * @param authorize_cb_cls closure to pass to @a authorize_cb
  * @return handle for this operation, NULL upon errors
  */
-struct TALER_MERCHANT_TipAuthorizeHandle *
-TALER_MERCHANT_tip_authorize (
+struct TALER_MERCHANT_RewardAuthorizeHandle *
+TALER_MERCHANT_reward_authorize (
   struct GNUNET_CURL_Context *ctx,
   const char *backend_url,
   const char *next_url,
   const struct TALER_Amount *amount,
   const char *justification,
-  TALER_MERCHANT_TipAuthorizeCallback authorize_cb,
+  TALER_MERCHANT_RewardAuthorizeCallback authorize_cb,
   void *authorize_cb_cls);
 
 
 /**
- * Cancel a pending /tip-authorize request
+ * Cancel a pending /reward-authorize request
  *
  * @param ta handle from the operation to cancel
  */
 void
-TALER_MERCHANT_tip_authorize_cancel (
-  struct TALER_MERCHANT_TipAuthorizeHandle *ta);
+TALER_MERCHANT_reward_authorize_cancel (
+  struct TALER_MERCHANT_RewardAuthorizeHandle *ta);
 
 
 /**
@@ -4142,7 +4142,7 @@ typedef void
 
 /**
  * Issue a DELETE /reserve/$RESERVE_ID request to the backend.  Only
- * deletes the private key of the reserve, preserves tipping data.
+ * deletes the private key of the reserve, preserves rewardping data.
  *
  * @param ctx execution context
  * @param backend_url base URL of the merchant backend
@@ -4190,18 +4190,18 @@ TALER_MERCHANT_reserve_delete_cancel (
   struct TALER_MERCHANT_ReserveDeleteHandle *rdh);
 
 
-/* ********************* /tips ************************** */
+/* ********************* /rewards ************************** */
 
 
 /**
- * Handle for a GET /tips/$TIP_ID (public variant) operation.
+ * Handle for a GET /rewards/$REWARD_ID (public variant) operation.
  */
-struct TALER_MERCHANT_TipWalletGetHandle;
+struct TALER_MERCHANT_RewardWalletGetHandle;
 
 /**
- * Response to a wallet's GET /tips/$TIP_ID request.
+ * Response to a wallet's GET /rewards/$REWARD_ID request.
  */
-struct TALER_MERCHANT_TipWalletGetResponse
+struct TALER_MERCHANT_RewardWalletGetResponse
 {
   /**
    * HTTP response details
@@ -4221,7 +4221,7 @@ struct TALER_MERCHANT_TipWalletGetResponse
     {
 
       /**
-       * when the tip will expire
+       * when the reward will expire
        */
       struct GNUNET_TIME_Timestamp expiration;
 
@@ -4231,12 +4231,12 @@ struct TALER_MERCHANT_TipWalletGetResponse
       const char *exchange_url;
 
       /**
-       * URL where the wallet should navigate after withdrawing the tip.
+       * URL where the wallet should navigate after withdrawing the reward.
        */
       const char *next_url;
 
       /**
-       * total amount still available for the tip
+       * total amount still available for the reward
        */
       struct TALER_Amount amount_remaining;
     } ok;
@@ -4246,55 +4246,55 @@ struct TALER_MERCHANT_TipWalletGetResponse
 
 
 /**
- * Callback to process a GET /tips/$TIP_ID request
+ * Callback to process a GET /rewards/$REWARD_ID request
  *
  * @param cls closure
  * @param wgr response details
  */
 typedef void
-(*TALER_MERCHANT_TipWalletGetCallback) (
+(*TALER_MERCHANT_RewardWalletGetCallback) (
   void *cls,
-  const struct TALER_MERCHANT_TipWalletGetResponse *wgr);
+  const struct TALER_MERCHANT_RewardWalletGetResponse *wgr);
 
 
 /**
- * Issue a GET /tips/$TIP_ID (public variant) request to the backend.  Returns
- * information needed to pick up a tip.
+ * Issue a GET /rewards/$REWARD_ID (public variant) request to the backend.  Returns
+ * information needed to pick up a reward.
  *
  * @param ctx execution context
  * @param backend_url base URL of the merchant backend
- * @param tip_id which tip should we query
+ * @param reward_id which reward should we query
  * @param cb function to call with the result
  * @param cb_cls closure for @a cb
  * @return handle for this operation, NULL upon errors
  */
-struct TALER_MERCHANT_TipWalletGetHandle *
-TALER_MERCHANT_wallet_tip_get (
+struct TALER_MERCHANT_RewardWalletGetHandle *
+TALER_MERCHANT_wallet_reward_get (
   struct GNUNET_CURL_Context *ctx,
   const char *backend_url,
-  const struct TALER_TipIdentifierP *tip_id,
-  TALER_MERCHANT_TipWalletGetCallback cb,
+  const struct TALER_RewardIdentifierP *reward_id,
+  TALER_MERCHANT_RewardWalletGetCallback cb,
   void *cb_cls);
 
 
 /**
- * Cancel a GET /tips/$TIP_ID request.
+ * Cancel a GET /rewards/$REWARD_ID request.
  *
  * @param[in] tgh handle to the request to be canceled
  */
 void
-TALER_MERCHANT_wallet_tip_get_cancel (
-  struct TALER_MERCHANT_TipWalletGetHandle *tgh);
+TALER_MERCHANT_wallet_reward_get_cancel (
+  struct TALER_MERCHANT_RewardWalletGetHandle *tgh);
 
 
 /**
- * Handle for a GET /private/tips/$TIP_ID (private variant) operation.
+ * Handle for a GET /private/rewards/$REWARD_ID (private variant) operation.
  */
-struct TALER_MERCHANT_TipMerchantGetHandle;
+struct TALER_MERCHANT_RewardMerchantGetHandle;
 
 
 /**
- * Summary information for a tip pickup.
+ * Summary information for a reward pickup.
  */
 struct TALER_MERCHANT_PickupDetail
 {
@@ -4316,9 +4316,9 @@ struct TALER_MERCHANT_PickupDetail
 
 
 /**
- * Details returned about a tip by the merchant.
+ * Details returned about a reward by the merchant.
  */
-struct TALER_MERCHANT_TipStatusResponse
+struct TALER_MERCHANT_RewardStatusResponse
 {
   /**
    * HTTP status of the response.
@@ -4338,7 +4338,7 @@ struct TALER_MERCHANT_TipStatusResponse
     {
 
       /**
-       * Amount that was authorized under this tip
+       * Amount that was authorized under this reward
        */
       struct TALER_Amount total_authorized;
 
@@ -4348,17 +4348,17 @@ struct TALER_MERCHANT_TipStatusResponse
       struct TALER_Amount total_picked_up;
 
       /**
-       * The reason given for the tip
+       * The reason given for the reward
        */
       const char *reason;
 
       /**
-       * Time when the tip will expire
+       * Time when the reward will expire
        */
       struct GNUNET_TIME_Timestamp expiration;
 
       /**
-       * reserve which is funding this tip
+       * reserve which is funding this reward
        */
       struct TALER_ReservePublicKeyP reserve_pub;
 
@@ -4368,7 +4368,7 @@ struct TALER_MERCHANT_TipStatusResponse
       unsigned int pickups_length;
 
       /**
-       * array of pickup operations performed for this tip
+       * array of pickup operations performed for this reward
        */
       struct TALER_MERCHANT_PickupDetail *pickups;
     } ok;
@@ -4379,24 +4379,24 @@ struct TALER_MERCHANT_TipStatusResponse
 
 
 /**
- * Callback to process a GET /private/tips/$TIP_ID request
+ * Callback to process a GET /private/rewards/$REWARD_ID request
  *
  * @param cls closure
  * @param tsr response details
  */
 typedef void
-(*TALER_MERCHANT_TipMerchantGetCallback) (
+(*TALER_MERCHANT_RewardMerchantGetCallback) (
   void *cls,
-  const struct TALER_MERCHANT_TipStatusResponse *tsr);
+  const struct TALER_MERCHANT_RewardStatusResponse *tsr);
 
 
 /**
- * Issue a GET /private/tips/$TIP_ID (private variant) request to the backend.
- * Returns information needed to pick up a tip.
+ * Issue a GET /private/rewards/$REWARD_ID (private variant) request to the backend.
+ * Returns information needed to pick up a reward.
  *
  * @param ctx execution context
  * @param backend_url base URL of the merchant backend
- * @param tip_id which tip should we query
+ * @param reward_id which reward should we query
  * @param min_pick_up minimum amount picked up to notify about
  * @param lp_timeout how long to wait for @a min_pick_up to be exceeded
  * @param pickups whether to fetch associated pickups
@@ -4404,61 +4404,61 @@ typedef void
  * @param cb_cls closure for @a cb
  * @return handle for this operation, NULL upon errors
  */
-struct TALER_MERCHANT_TipMerchantGetHandle *
-TALER_MERCHANT_merchant_tip_get (
+struct TALER_MERCHANT_RewardMerchantGetHandle *
+TALER_MERCHANT_merchant_reward_get (
   struct GNUNET_CURL_Context *ctx,
   const char *backend_url,
-  const struct TALER_TipIdentifierP *tip_id,
+  const struct TALER_RewardIdentifierP *reward_id,
   const struct TALER_Amount *min_pick_up,
   struct GNUNET_TIME_Relative lp_timeout,
   bool pickups,
-  TALER_MERCHANT_TipMerchantGetCallback cb,
+  TALER_MERCHANT_RewardMerchantGetCallback cb,
   void *cb_cls);
 
 
 /**
- * Cancel a GET /private/tips/$TIP_ID request.
+ * Cancel a GET /private/rewards/$REWARD_ID request.
  *
  * @param[in] tgh handle to the request to be canceled
  */
 void
-TALER_MERCHANT_merchant_tip_get_cancel (
-  struct TALER_MERCHANT_TipMerchantGetHandle *tgh);
+TALER_MERCHANT_merchant_reward_get_cancel (
+  struct TALER_MERCHANT_RewardMerchantGetHandle *tgh);
 
 
 /**
- * Handle for a GET /private/tips request.
+ * Handle for a GET /private/rewards request.
  */
-struct TALER_MERCHANT_TipsGetHandle;
+struct TALER_MERCHANT_RewardsGetHandle;
 
 
 /**
- * Database entry information of a tip.
+ * Database entry information of a reward.
  */
-struct TALER_MERCHANT_TipEntry
+struct TALER_MERCHANT_RewardEntry
 {
   /**
-   * Row number of the tip in the database.
+   * Row number of the reward in the database.
    */
   uint64_t row_id;
 
   /**
-   * Identifier for the tip.
+   * Identifier for the reward.
    */
-  struct TALER_TipIdentifierP tip_id;
+  struct TALER_RewardIdentifierP reward_id;
 
   /**
-   * Total value of the tip (including fees).
+   * Total value of the reward (including fees).
    */
-  struct TALER_Amount tip_amount;
+  struct TALER_Amount reward_amount;
 
 };
 
 
 /**
- * Response to a GET /private/tips request.
+ * Response to a GET /private/rewards request.
  */
-struct TALER_MERCHANT_TipsGetResponse
+struct TALER_MERCHANT_RewardsGetResponse
 {
   /**
    * HTTP response details
@@ -4477,14 +4477,14 @@ struct TALER_MERCHANT_TipsGetResponse
     struct
     {
       /**
-       * length of the @e tips array
+       * length of the @e rewards array
        */
-      unsigned int tips_length;
+      unsigned int rewards_length;
 
       /**
-       * the array of tips
+       * the array of rewards
        */
-      const struct TALER_MERCHANT_TipEntry *tips;
+      const struct TALER_MERCHANT_RewardEntry *rewards;
 
     } ok;
 
@@ -4493,19 +4493,19 @@ struct TALER_MERCHANT_TipsGetResponse
 
 
 /**
- * Callback to process a GET /private/tips request.
+ * Callback to process a GET /private/rewards request.
  *
  * @param cls closure
  * @param tgr response details
  */
 typedef void
-(*TALER_MERCHANT_TipsGetCallback) (
+(*TALER_MERCHANT_RewardsGetCallback) (
   void *cls,
-  const struct TALER_MERCHANT_TipsGetResponse *tgr);
+  const struct TALER_MERCHANT_RewardsGetResponse *tgr);
 
 
 /**
- * Issue a GET /private/tips request to the backend.
+ * Issue a GET /private/rewards request to the backend.
  *
  * @param ctx execution context
  * @param backend_url base URL of the merchant backend
@@ -4513,50 +4513,50 @@ typedef void
  * @param cb_cls closure for @a cb
  * @return handle for this operation, NULL upon errors
  */
-struct TALER_MERCHANT_TipsGetHandle *
-TALER_MERCHANT_tips_get (
+struct TALER_MERCHANT_RewardsGetHandle *
+TALER_MERCHANT_rewards_get (
   struct GNUNET_CURL_Context *ctx,
   const char *backend_url,
-  TALER_MERCHANT_TipsGetCallback cb,
+  TALER_MERCHANT_RewardsGetCallback cb,
   void *cb_cls);
 
 
 /**
- * Issue a GET /private/tips request with filters to the backend.
+ * Issue a GET /private/rewards request with filters to the backend.
  *
  * @param ctx execution context
  * @param backend_url base URL of the merchant backend
- * @param expired yes for expired tips, no for unexpired tips, all for all tips
+ * @param expired yes for expired rewards, no for unexpired rewards, all for all rewards
  * @param limit number of results to return, negative for descending row id, positive for ascending
  * @param offset row id to start returning results from
  * @param cb function to call with the result
  * @param cb_cls closure for @a cb
  * @return handle for this operation, NULL upon errors
  */
-struct TALER_MERCHANT_TipsGetHandle *
-TALER_MERCHANT_tips_get2 (
+struct TALER_MERCHANT_RewardsGetHandle *
+TALER_MERCHANT_rewards_get2 (
   struct GNUNET_CURL_Context *ctx,
   const char *backend_url,
   enum TALER_EXCHANGE_YesNoAll expired,
   int64_t limit,
   uint64_t offset,
-  TALER_MERCHANT_TipsGetCallback cb,
+  TALER_MERCHANT_RewardsGetCallback cb,
   void *cb_cls);
 
 
 /**
- * Cancel a GET /private/tips request.
+ * Cancel a GET /private/rewards request.
  *
  * @param tgh the operation to cancel
  */
 void
-TALER_MERCHANT_tips_get_cancel (struct TALER_MERCHANT_TipsGetHandle *tgh);
+TALER_MERCHANT_rewards_get_cancel (struct TALER_MERCHANT_RewardsGetHandle *tgh);
 
 
 /**
- * Handle for a POST /tips/$TIP_ID/pickup operation.
+ * Handle for a POST /rewards/$REWARD_ID/pickup operation.
  */
-struct TALER_MERCHANT_TipPickupHandle;
+struct TALER_MERCHANT_RewardPickupHandle;
 
 
 /**
@@ -4598,14 +4598,14 @@ struct TALER_MERCHANT_PickupDetails
 
 
 /**
- * Callback for a POST /tips/$TIP_ID/pickup request.  Returns the result of
+ * Callback for a POST /rewards/$REWARD_ID/pickup request.  Returns the result of
  * the operation.
  *
  * @param cls closure
  * @param pd HTTP response details
  */
 typedef void
-(*TALER_MERCHANT_TipPickupCallback) (
+(*TALER_MERCHANT_RewardPickupCallback) (
   void *cls,
   const struct TALER_MERCHANT_PickupDetails *pd);
 
@@ -4628,50 +4628,50 @@ struct TALER_MERCHANT_PlanchetData
 };
 
 /**
- * Issue a POST /tips/$TIP_ID/pickup request to the backend.  Informs the
- * backend that a customer wants to pick up a tip.
+ * Issue a POST /rewards/$REWARD_ID/pickup request to the backend.  Informs the
+ * backend that a customer wants to pick up a reward.
  *
  * @param ctx execution context
  * @param exchange_url base URL of the exchange
  * @param backend_url base URL of the merchant backend
- * @param tip_id unique identifier for the tip
+ * @param reward_id unique identifier for the reward
  * @param num_planchets number of planchets provided in @a pds
- * @param planchets array of planchet secrets to be signed into existence for the tip
+ * @param planchets array of planchet secrets to be signed into existence for the reward
  * @param pickup_cb callback which will work the response gotten from the backend
  * @param pickup_cb_cls closure to pass to @a pickup_cb
  * @return handle for this operation, NULL upon errors
  */
-struct TALER_MERCHANT_TipPickupHandle *
-TALER_MERCHANT_tip_pickup (
+struct TALER_MERCHANT_RewardPickupHandle *
+TALER_MERCHANT_reward_pickup (
   struct GNUNET_CURL_Context *ctx,
   const char *exchange_url,
   const char *backend_url,
-  const struct TALER_TipIdentifierP *tip_id,
+  const struct TALER_RewardIdentifierP *reward_id,
   unsigned int num_planchets,
   const struct TALER_MERCHANT_PlanchetData planchets[static num_planchets],
-  TALER_MERCHANT_TipPickupCallback pickup_cb,
+  TALER_MERCHANT_RewardPickupCallback pickup_cb,
   void *pickup_cb_cls);
 
 
 /**
- * Cancel a pending /tips/$TIP_ID/pickup request
+ * Cancel a pending /rewards/$REWARD_ID/pickup request
  *
  * @param tph handle from the operation to cancel
  */
 void
-TALER_MERCHANT_tip_pickup_cancel (struct TALER_MERCHANT_TipPickupHandle *tph);
+TALER_MERCHANT_reward_pickup_cancel (struct TALER_MERCHANT_RewardPickupHandle *tph);
 
 
 /**
- * Handle for a low-level /tip-pickup operation (without unblinding).
+ * Handle for a low-level /reward-pickup operation (without unblinding).
  */
-struct TALER_MERCHANT_TipPickup2Handle;
+struct TALER_MERCHANT_RewardPickup2Handle;
 
 
 /**
- * Response for a POST /tips/$TIP_ID/pickup request.
+ * Response for a POST /rewards/$REWARD_ID/pickup request.
  */
-struct TALER_MERCHANT_TipPickup2Response
+struct TALER_MERCHANT_RewardPickup2Response
 {
   /**
    * HTTP response details
@@ -4707,50 +4707,50 @@ struct TALER_MERCHANT_TipPickup2Response
 
 
 /**
- * Callback for a POST /tips/$TIP_ID/pickup request.  Returns the result of
+ * Callback for a POST /rewards/$REWARD_ID/pickup request.  Returns the result of
  * the operation.  Note that the client MUST still do the unblinding.
  *
  * @param cls closure
  * @param tpr response details
  */
 typedef void
-(*TALER_MERCHANT_TipPickup2Callback) (
+(*TALER_MERCHANT_RewardPickup2Callback) (
   void *cls,
-  const struct TALER_MERCHANT_TipPickup2Response *tpr);
+  const struct TALER_MERCHANT_RewardPickup2Response *tpr);
 
 
 /**
- * Issue a POST /tips/$TIP_ID/pickup request to the backend.  Informs the
- * backend that a customer wants to pick up a tip.
+ * Issue a POST /rewards/$REWARD_ID/pickup request to the backend.  Informs the
+ * backend that a customer wants to pick up a reward.
  *
  * @param ctx execution context
  * @param backend_url base URL of the merchant backend
- * @param tip_id unique identifier for the tip
+ * @param reward_id unique identifier for the reward
  * @param num_planchets number of planchets provided in @a planchets
- * @param planchets array of planchets to be signed into existence for the tip
+ * @param planchets array of planchets to be signed into existence for the reward
  * @param pickup_cb callback which will work the response gotten from the backend
  * @param pickup_cb_cls closure to pass to @a pickup_cb
  * @return handle for this operation, NULL upon errors
  */
-struct TALER_MERCHANT_TipPickup2Handle *
-TALER_MERCHANT_tip_pickup2 (
+struct TALER_MERCHANT_RewardPickup2Handle *
+TALER_MERCHANT_reward_pickup2 (
   struct GNUNET_CURL_Context *ctx,
   const char *backend_url,
-  const struct TALER_TipIdentifierP *tip_id,
+  const struct TALER_RewardIdentifierP *reward_id,
   unsigned int num_planchets,
   const struct TALER_PlanchetDetail planchets[static num_planchets],
-  TALER_MERCHANT_TipPickup2Callback pickup_cb,
+  TALER_MERCHANT_RewardPickup2Callback pickup_cb,
   void *pickup_cb_cls);
 
 
 /**
- * Cancel a pending /tip-pickup request.
+ * Cancel a pending /reward-pickup request.
  *
  * @param[in] tp handle from the operation to cancel
  */
 void
-TALER_MERCHANT_tip_pickup2_cancel (
-  struct TALER_MERCHANT_TipPickup2Handle *tp);
+TALER_MERCHANT_reward_pickup2_cancel (
+  struct TALER_MERCHANT_RewardPickup2Handle *tp);
 
 
 /* ********************* /kyc ************************** */