diff --git a/src/include/taler_error_codes.h b/src/include/taler_error_codes.h
index 5bd9bde4c..b0e337325 100644
--- a/src/include/taler_error_codes.h
+++ b/src/include/taler_error_codes.h
@@ -1139,23 +1139,22 @@ enum TALER_ErrorCode
 
   /**
    * The backend encountered an error while trying to store the
-   * pair <contract, h_contract> into the database. 
+   * pair <proposal_data, h_transaction_id> into the database. 
    * The response is provided with HTTP status code MHD_HTTP_INTERNAL_SERVER_ERROR.
    */
-  TALER_EC_MAP_IN_STORE_DB_ERROR = 2501,
+  TALER_EC_PROPOSAL_STORE_DB_ERROR = 2501,
 
   /**
    * The backend encountered an error while trying to retrieve the
-   * contract from database.  Likely to be an internal error.
+   * proposal data from database.  Likely to be an internal error.
    */
-  TALER_EC_MAP_OUT_GET_FROM_DB_ERROR = 2502,
+  TALER_EC_PROPOSAL_LOOKUP_DB_ERROR = 2502,
 
 
   /**
-   * The backend encountered an error while trying to retrieve the
-   * contract from database.  Likely to be an internal error.
+   * The proposal being looked up is not found on this merchant.
    */
-  TALER_EC_MAP_OUT_CONTRACT_UNKNOWN = 2503,
+  TALER_EC_PROPOSAL_LOOKUP_NOT_FOUND = 2503,
 
   /* ********** /test API error codes ************* */
 
diff --git a/src/include/taler_signatures.h b/src/include/taler_signatures.h
index 00e5c6eaf..d7b2e91d5 100644
--- a/src/include/taler_signatures.h
+++ b/src/include/taler_signatures.h
@@ -1031,11 +1031,11 @@ struct TALER_WireDepositDataPS
 /**
  * The contract sent by the merchant to the wallet.
  */
-struct TALER_ContractPS
+struct TALER_ProposalDatatPS
 {
   /**
-   * Purpose header for the signature over the contract with
-   * purpose #TALER_SIGNATURE_MERCHANT_CONTRACT.
+   * Purpose header for the signature over the proposal data
+   * with purpose #TALER_SIGNATURE_MERCHANT_CONTRACT.
    */
   struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
 
@@ -1043,7 +1043,7 @@ struct TALER_ContractPS
    * Hash of the JSON contract in UTF-8 including 0-termination,
    * using JSON_COMPACT | JSON_SORT_KEYS
    */
-  struct GNUNET_HashCode h_contract;
+  struct GNUNET_HashCode h_proposal_data;
 };
 
 /**