5 files changed, 6 insertions, 8 deletions
diff --git a/src/exchange-tools/taler-auditor-sign.c b/src/exchange-tools/taler-auditor-sign.c
index 71c80f5ee..3652bc9e6 100644
--- a/src/exchange-tools/taler-auditor-sign.c
+++ b/src/exchange-tools/taler-auditor-sign.c
@@ -118,7 +118,7 @@ print_dk (const struct TALER_DenominationKeyValidityPS *dk)
            GNUNET_STRINGS_absolute_time_to_string (GNUNET_TIME_absolute_ntoh (dk->expire_withdraw)));
   fprintf (stdout,
            "Deposit end time: %s\n",
-           GNUNET_STRINGS_absolute_time_to_string (GNUNET_TIME_absolute_ntoh (dk->expire_spend)));
+           GNUNET_STRINGS_absolute_time_to_string (GNUNET_TIME_absolute_ntoh (dk->expire_deposit)));
   fprintf (stdout,
            "Legal dispute end time: %s\n",
            GNUNET_STRINGS_absolute_time_to_string (GNUNET_TIME_absolute_ntoh (dk->expire_legal)));
@@ -320,7 +320,7 @@ main (int argc,
       print_dk (dk);
     kv.start = dk->start;
     kv.expire_withdraw = dk->expire_withdraw;
-    kv.expire_spend = dk->expire_spend;
+    kv.expire_deposit = dk->expire_deposit;
     kv.expire_legal = dk->expire_legal;
     kv.value = dk->value;
     kv.fee_withdraw = dk->fee_withdraw;
diff --git a/src/exchange-tools/taler-exchange-dbinit.c b/src/exchange-tools/taler-exchange-dbinit.c
index f936e64d6..e51f5a21a 100644
--- a/src/exchange-tools/taler-exchange-dbinit.c
+++ b/src/exchange-tools/taler-exchange-dbinit.c
@@ -54,8 +54,7 @@ run (void *cls,
     return;
   }
   if (GNUNET_OK !=
-      plugin->create_tables (plugin->cls,
-                             GNUNET_NO))
+      plugin->create_tables (plugin->cls))
   {
     fprintf (stderr,
              "Failed to initialize database.\n");
diff --git a/src/exchange-tools/taler-exchange-keycheck.c b/src/exchange-tools/taler-exchange-keycheck.c
index dbe156526..103de138c 100644
--- a/src/exchange-tools/taler-exchange-keycheck.c
+++ b/src/exchange-tools/taler-exchange-keycheck.c
@@ -145,7 +145,7 @@ denomkeys_iter (void *cls,
   if ( (0 != GNUNET_TIME_absolute_ntoh (dki->issue.properties.start).abs_value_us % 1000000) ||
        (0 != GNUNET_TIME_absolute_ntoh (dki->issue.properties.expire_withdraw).abs_value_us % 1000000) ||
        (0 != GNUNET_TIME_absolute_ntoh (dki->issue.properties.expire_legal).abs_value_us % 1000000) ||
-       (0 != GNUNET_TIME_absolute_ntoh (dki->issue.properties.expire_spend).abs_value_us % 1000000) )
+       (0 != GNUNET_TIME_absolute_ntoh (dki->issue.properties.expire_deposit).abs_value_us % 1000000) )
   {
     fprintf (stderr,
              "Timestamps are not multiples of a round second\n");
diff --git a/src/exchange-tools/taler-exchange-keyup.c b/src/exchange-tools/taler-exchange-keyup.c
index 0cd9a30ca..155861936 100644
--- a/src/exchange-tools/taler-exchange-keyup.c
+++ b/src/exchange-tools/taler-exchange-keyup.c
@@ -765,7 +765,7 @@ create_denomkey_issue (const struct CoinTypeParams *params,
   dki->issue.properties.expire_withdraw =
       GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_add (params->anchor,
                                                            params->duration_withdraw));
-  dki->issue.properties.expire_spend =
+  dki->issue.properties.expire_deposit =
     GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_add (params->anchor,
                                                          params->duration_spend));
   dki->issue.properties.expire_legal =
diff --git a/src/exchange-tools/taler-exchange-reservemod.c b/src/exchange-tools/taler-exchange-reservemod.c
index de3e57f1f..2aeb951ce 100644
--- a/src/exchange-tools/taler-exchange-reservemod.c
+++ b/src/exchange-tools/taler-exchange-reservemod.c
@@ -73,8 +73,7 @@ run_transaction (const struct TALER_ReservePublicKeyP *reserve_pub,
   int ret;
   struct TALER_EXCHANGEDB_Session *session;
 
-  session = plugin->get_session (plugin->cls,
-                                 GNUNET_NO);
+  session = plugin->get_session (plugin->cls);
   if (NULL == session)
   {
     fprintf (stderr,