2 files changed, 10 insertions, 10 deletions

diff --git a/src/lib/merchant_api_proposal.c b/src/lib/merchant_api_proposal.c
index bdcdbd4d..8a951b9f 100644
--- a/src/lib/merchant_api_proposal.c
+++ b/src/lib/merchant_api_proposal.c
@@ -117,14 +117,14 @@ handle_proposal_finished (void *cls,
   struct TALER_MERCHANT_ProposalOperation *po = cls;
   json_t *proposal_data;
   const struct TALER_MerchantSignatureP *sigp;
-  const struct GNUNET_HashCode *h_proposal_datap;
+  const struct GNUNET_HashCode *hashp;
   struct TALER_MerchantSignatureP sig;
-  struct GNUNET_HashCode h_proposal_data;
+  struct GNUNET_HashCode hash;
 
   po->job = NULL;
   proposal_data = NULL;
   sigp = NULL;
-  h_proposal_datap = NULL;
+  hashp = NULL;
   switch (response_code)
   {
     case 0:
@@ -134,7 +134,7 @@ handle_proposal_finished (void *cls,
       struct GNUNET_JSON_Specification spec[] = {
         GNUNET_JSON_spec_json ("proposal_data", &proposal_data),
         GNUNET_JSON_spec_fixed_auto ("merchant_sig", &sig),
-        GNUNET_JSON_spec_fixed_auto ("h_proposal_data", &h_proposal_data),
+        GNUNET_JSON_spec_fixed_auto ("hash", &hash),
         GNUNET_JSON_spec_end()
       };
   
@@ -147,7 +147,7 @@ handle_proposal_finished (void *cls,
         response_code = 0;
         break;
       }
-      h_proposal_datap = &h_proposal_data;
+      hashp = &hash;
       sigp = &sig;
     }
       break;
@@ -184,7 +184,7 @@ handle_proposal_finished (void *cls,
           json,
           proposal_data,
           sigp,
-          h_proposal_datap);
+          hashp);
   if (NULL != proposal_data)
     json_decref (proposal_data);
 }
diff --git a/src/lib/test_merchant_api.c b/src/lib/test_merchant_api.c
index 0e2ea5c7..1397bd44 100644
--- a/src/lib/test_merchant_api.c
+++ b/src/lib/test_merchant_api.c
@@ -431,7 +431,7 @@ struct Command
       /**
        * Proposal data's hashcode.
        */
-      struct GNUNET_HashCode h_proposal_data;
+      struct GNUNET_HashCode hash;
 
     } proposal;
 
@@ -1031,7 +1031,7 @@ proposal_cb (void *cls,
              const json_t *obj,
              const json_t *proposal_data,
              const struct TALER_MerchantSignatureP *sig,
-             const struct GNUNET_HashCode *h_proposal_data)
+             const struct GNUNET_HashCode *hash)
 {
   struct InterpreterState *is = cls;
   struct Command *cmd = &is->commands[is->ip];
@@ -1042,7 +1042,7 @@ proposal_cb (void *cls,
   case MHD_HTTP_OK:
     cmd->details.proposal.proposal_data = json_incref ((json_t *) proposal_data);
     cmd->details.proposal.merchant_sig = *sig;
-    cmd->details.proposal.h_proposal_data = *h_proposal_data;
+    cmd->details.proposal.hash = *hash;
     break;
   default:
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -1815,7 +1815,7 @@ interpreter_run (void *cls)
 	= TALER_MERCHANT_pay_wallet (ctx,
 				     MERCHANT_URI,
                                      instance,
-				     &ref->details.proposal.h_proposal_data,
+				     &ref->details.proposal.hash,
 				     transaction_id,
 				     &total_amount,
 				     &max_fee,