renaming mint->exchange

19 files changed, 263 insertions, 264 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 51e1ed897..0b3dc39c4 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -4,11 +4,11 @@ SUBDIRS = . doxygen
 
 man_MANS = \
   taler-auditor-sign.1 \
-  taler-mint-dbinit.1 \
-  taler-mint-httpd.1 \
-  taler-mint-keyup.1 \
-  taler-mint-keycheck.1 \
-  taler-mint-reservemod.1 \
+  taler-exchange-dbinit.1 \
+  taler-exchange-httpd.1 \
+  taler-exchange-keyup.1 \
+  taler-exchange-keycheck.1 \
+  taler-exchange-reservemod.1 \
   taler.conf.5
 
 EXTRA_DIST = \
diff --git a/doc/coding-style.txt b/doc/coding-style.txt
index 093e14d31..fe7bfed12 100644
--- a/doc/coding-style.txt
+++ b/doc/coding-style.txt
@@ -14,10 +14,10 @@ Naming conventions:
     SHOULD NOT be included from outside of their own directory
   + end in "_lib" for "simple" libraries
   + end in "_plugin" for plugins
-  + end in "_service" for libraries accessing a service, i.e. the mint
+  + end in "_service" for libraries accessing a service, i.e. the exchange
 
 * binaries:
-  + taler-mint-xxx: mint programs
+  + taler-exchange-xxx: exchange programs
   + taler-merchant-xxx: merchant programs (demos)
   + taler-wallet-xxx: wallet programs
   + plugins should be libtaler_plugin_xxx_yyy.so: plugin yyy for API xxx
@@ -25,16 +25,16 @@ Naming conventions:
 
 * logging
   + tools use their full name in GNUNET_log_setup
-    (i.e. 'taler-mint-keyup') and log using plain 'GNUNET_log'.
+    (i.e. 'taler-exchange-keyup') and log using plain 'GNUNET_log'.
   + pure libraries (without associated service) use 'GNUNET_log_from'
     with the component set to their library name (without lib or '.so'),
     which should also be their directory name (i.e. 'util')
   + plugin libraries (without associated service) use 'GNUNET_log_from'
     with the component set to their type and plugin name (without lib or '.so'),
-    which should also be their directory name (i.e. 'mintdb-postgres')
+    which should also be their directory name (i.e. 'exchangedb-postgres')
   + libraries with associated service) use 'GNUNET_log_from'
     with the name of the service,  which should also be their
-    directory name (i.e. 'mint')
+    directory name (i.e. 'exchange')
 
 * configuration
   + same rules as for GNUnet
@@ -44,7 +44,7 @@ Naming conventions:
     MUST match the subdirectory of src/ in which the symbol is defined
   + from libtalerutil start just with TALER_, without subsystemname
   + if scope is ONE binary and symbols are not in a shared library,
-    use binary-specific prefix (such as TMH = taler-mint-httpd) for
+    use binary-specific prefix (such as TMH = taler-exchange-httpd) for
     globals, possibly followed by the subsystem (TMH_DB_xxx).
 
 * structs:
diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
index 6b6f1ed72..da4dbc140 100644
--- a/doc/doxygen/Makefile.am
+++ b/doc/doxygen/Makefile.am
@@ -5,14 +5,14 @@ all:
 "\tmake full - full documentation with dependency graphs (slow)\n" \
 "\tmake fast - fast mode without dependency graphs"
 
-full: taler-mint.doxy
+full: taler-exchange.doxy
 	doxygen $<
 
-fast: taler-mint.doxy
+fast: taler-exchange.doxy
 	sed 's/\(HAVE_DOT.*=\).*/\1 NO/' $< | doxygen -
 
 clean:
 	rm -rf html
 
 
-EXTRA_DIST = taler-mint.doxy
+EXTRA_DIST = taler-exchange.doxy
diff --git a/doc/doxygen/taler-mint.doxy b/doc/doxygen/taler-mint.doxy
index 2949fac0d..23c2fbe07 100644
--- a/doc/doxygen/taler-mint.doxy
+++ b/doc/doxygen/taler-mint.doxy
@@ -4,7 +4,7 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
-PROJECT_NAME           = "GNU Taler: Mint"
+PROJECT_NAME           = "GNU Taler: Exchange"
 PROJECT_NUMBER         = 0.0
 OUTPUT_DIRECTORY       = .
 CREATE_SUBDIRS         = YES
diff --git a/doc/logos/fonts/OldNewspaperTypes.ttf b/doc/logos/fonts/OldNewspaperTypes.ttf
index 7b9cf31b9..7b9cf31b9 100755..100644
--- a/doc/logos/fonts/OldNewspaperTypes.ttf
+++ b/doc/logos/fonts/OldNewspaperTypes.ttf
diff --git a/doc/paper/rfc.bib b/doc/paper/rfc.bib
index 700f3a99a..99c427e58 100644
--- a/doc/paper/rfc.bib
+++ b/doc/paper/rfc.bib
@@ -9025,7 +9025,7 @@
   organization="Internet Engineering Task Force",
   year=1978,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc748.txt",
 }
 
@@ -13671,7 +13671,7 @@
   organization="Internet Engineering Task Force",
   year=1989,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc1097.txt",
 }
 
@@ -14377,7 +14377,7 @@
   organization="Internet Engineering Task Force",
   year=1990,
   month=apr,
-  day="1",  
+  day="1",
   note="Updated by RFCs 2549, 6214",
   url="http://www.ietf.org/rfc/rfc1149.txt",
 }
@@ -15260,7 +15260,7 @@
   organization="Internet Engineering Task Force",
   year=1991,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc1216.txt",
 }
 
@@ -15274,7 +15274,7 @@
   organization="Internet Engineering Task Force",
   year=1991,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc1217.txt",
 }
 
@@ -16551,7 +16551,7 @@
   organization="Internet Engineering Task Force",
   year=1992,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc1313.txt",
 }
 
@@ -18223,7 +18223,7 @@
   organization="Internet Engineering Task Force",
   year=1993,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc1437.txt",
 }
 
@@ -18237,7 +18237,7 @@
   organization="Internet Engineering Task Force",
   year=1993,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc1438.txt",
 }
 
@@ -20478,7 +20478,7 @@
   organization="Internet Engineering Task Force",
   year=1994,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc1605.txt",
 }
 
@@ -20492,7 +20492,7 @@
   organization="Internet Engineering Task Force",
   year=1994,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc1606.txt",
 }
 
@@ -20506,7 +20506,7 @@
   organization="Internet Engineering Task Force",
   year=1994,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc1607.txt",
 }
 
@@ -22753,7 +22753,7 @@
   organization="Internet Engineering Task Force",
   year=1995,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc1776.txt",
 }
 
@@ -24716,7 +24716,7 @@
   organization="Internet Engineering Task Force",
   year=1996,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc1924.txt",
 }
 
@@ -24730,7 +24730,7 @@
   organization="Internet Engineering Task Force",
   year=1996,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc1925.txt",
 }
 
@@ -24744,7 +24744,7 @@
   organization="Internet Engineering Task Force",
   year=1996,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc1926.txt",
 }
 
@@ -24758,7 +24758,7 @@
   organization="Internet Engineering Task Force",
   year=1996,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc1927.txt",
 }
 
@@ -27077,7 +27077,7 @@
   organization="Internet Engineering Task Force",
   year=1997,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc2100.txt",
 }
 
@@ -30038,7 +30038,7 @@
   organization="Internet Engineering Task Force",
   year=1998,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc2321.txt",
 }
 
@@ -30052,7 +30052,7 @@
   organization="Internet Engineering Task Force",
   year=1998,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc2322.txt",
 }
 
@@ -30066,7 +30066,7 @@
   organization="Internet Engineering Task Force",
   year=1998,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc2323.txt",
 }
 
@@ -30080,7 +30080,7 @@
   organization="Internet Engineering Task Force",
   year=1998,
   month=apr,
-  day="1",  
+  day="1",
   note="Updated by RFC 7168",
   url="http://www.ietf.org/rfc/rfc2324.txt",
 }
@@ -30095,7 +30095,7 @@
   organization="Internet Engineering Task Force",
   year=1998,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc2325.txt",
 }
 
@@ -33099,7 +33099,7 @@
   organization="Internet Engineering Task Force",
   year=1999,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc2549.txt",
 }
 
@@ -33113,7 +33113,7 @@
   organization="Internet Engineering Task Force",
   year=1999,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc2550.txt",
 }
 
@@ -33127,7 +33127,7 @@
   organization="Internet Engineering Task Force",
   year=1999,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc2551.txt",
 }
 
@@ -36388,7 +36388,7 @@
   organization="Internet Engineering Task Force",
   year=2000,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc2795.txt",
 }
 
@@ -40323,7 +40323,7 @@
   organization="Internet Engineering Task Force",
   year=2001,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc3091.txt",
 }
 
@@ -40337,7 +40337,7 @@
   organization="Internet Engineering Task Force",
   year=2001,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc3092.txt",
 }
 
@@ -40351,7 +40351,7 @@
   organization="Internet Engineering Task Force",
   year=2001,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc3093.txt",
 }
 
@@ -42397,7 +42397,7 @@
   organization="Internet Engineering Task Force",
   year=2002,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc3251.txt",
 }
 
@@ -42411,7 +42411,7 @@
   organization="Internet Engineering Task Force",
   year=2002,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc3252.txt",
 }
 
@@ -45820,7 +45820,7 @@
   organization="Internet Engineering Task Force",
   year=2003,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc3514.txt",
 }
 
@@ -48951,7 +48951,7 @@
   organization="Internet Engineering Task Force",
   year=2004,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc3751.txt",
 }
 
@@ -52675,7 +52675,7 @@
   organization="Internet Engineering Task Force",
   year=2005,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc4041.txt",
 }
 
@@ -52689,7 +52689,7 @@
   organization="Internet Engineering Task Force",
   year=2005,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc4042.txt",
 }
 
@@ -62743,7 +62743,7 @@
   organization="Internet Engineering Task Force",
   year=2007,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc4824.txt",
 }
 
@@ -68094,7 +68094,7 @@
   organization="Internet Engineering Task Force",
   year=2008,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc5241.txt",
 }
 
@@ -68108,7 +68108,7 @@
   organization="Internet Engineering Task Force",
   year=2008,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc5242.txt",
 }
 
@@ -71194,7 +71194,7 @@
 
 @misc{rfc5486,
   author="D. Malas and D. Meyer",
-  title="{Session Peering for Multimedia Interconnect (SPEERMINT) Terminology}",
+  title="{Session Peering for Multimedia Interconnect (SPEEREXCHANGE) Terminology}",
   series="Request for Comments",
   number="5486",
   howpublished="RFC 5486 (Informational)",
@@ -71529,7 +71529,7 @@
   organization="Internet Engineering Task Force",
   year=2009,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc5513.txt",
 }
 
@@ -71543,7 +71543,7 @@
   organization="Internet Engineering Task Force",
   year=2009,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc5514.txt",
 }
 
@@ -75706,7 +75706,7 @@
   organization="Internet Engineering Task Force",
   year=2010,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc5841.txt",
 }
 
@@ -77555,7 +77555,7 @@
   organization="Internet Engineering Task Force",
   year=2011,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc5984.txt",
 }
 
@@ -80463,7 +80463,7 @@
   organization="Internet Engineering Task Force",
   year=2011,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc6214.txt",
 }
 
@@ -80503,7 +80503,7 @@
   organization="Internet Engineering Task Force",
   year=2011,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc6217.txt",
 }
 
@@ -82898,7 +82898,7 @@
 
 @misc{rfc6404,
   author="J. Seedorf and S. Niccolini and E. Chen and H. Scholz",
-  title="{Session PEERing for Multimedia INTerconnect (SPEERMINT) Security Threats and Suggested Countermeasures}",
+  title="{Session PEERing for Multimedia INTerconnect (SPEEREXCHANGE) Security Threats and Suggested Countermeasures}",
   series="Request for Comments",
   number="6404",
   howpublished="RFC 6404 (Informational)",
@@ -82924,7 +82924,7 @@
 
 @misc{rfc6406,
   author="D. Malas and J. Livingood",
-  title="{Session PEERing for Multimedia INTerconnect (SPEERMINT) Architecture}",
+  title="{Session PEERing for Multimedia INTerconnect (SPEEREXCHANGE) Architecture}",
   series="Request for Comments",
   number="6406",
   howpublished="RFC 6406 (Informational)",
@@ -85310,7 +85310,7 @@
   organization="Internet Engineering Task Force",
   year=2012,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc6592.txt",
 }
 
@@ -85324,7 +85324,7 @@
   organization="Internet Engineering Task Force",
   year=2012,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc6593.txt",
 }
 
@@ -89460,7 +89460,7 @@
   organization="Internet Engineering Task Force",
   year=2013,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc6919.txt",
 }
 
@@ -89487,7 +89487,7 @@
   organization="Internet Engineering Task Force",
   year=2013,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc6921.txt",
 }
 
@@ -92639,7 +92639,7 @@
   organization="Internet Engineering Task Force",
   year=2014,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc7168.txt",
 }
 
@@ -92653,7 +92653,7 @@
   organization="Internet Engineering Task Force",
   year=2014,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc7169.txt",
 }
 
@@ -97095,7 +97095,7 @@
   organization="Internet Engineering Task Force",
   year=2015,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc7511.txt",
 }
 
@@ -97135,7 +97135,7 @@
   organization="Internet Engineering Task Force",
   year=2015,
   month=apr,
-  day="1",  
+  day="1",
   url="http://www.ietf.org/rfc/rfc7514.txt",
 }
 
@@ -98711,4 +98711,3 @@
   month=sep,
     url="http://www.ietf.org/rfc/rfc7651.txt",
 }
-
diff --git a/doc/taler-auditor-sign.1 b/doc/taler-auditor-sign.1
index ed264a496..177d0df04 100644
--- a/doc/taler-auditor-sign.1
+++ b/doc/taler-auditor-sign.1
@@ -1,7 +1,7 @@
 .TH TALER\-AUDITOR\-SIGN 1 "Sep 15, 2015" "GNU Taler"
 
 .SH NAME
-taler\-auditor\-sign \- Sign mint denomination as auditor.
+taler\-auditor\-sign \- Sign exchange denomination as auditor.
 
 .SH SYNOPSIS
 .B taler\-auditor\-sign
@@ -9,7 +9,7 @@ taler\-auditor\-sign \- Sign mint denomination as auditor.
 .br
 
 .SH DESCRIPTION
-\fBtaler\-auditor\-sign\fP is a command line tool to be used by an auditor to sign that he is aware of certain keys being used by a mint.  Using this signature, the auditor affirms that he will verify that the mint is properly accounting for those coins.
+\fBtaler\-auditor\-sign\fP is a command line tool to be used by an auditor to sign that he is aware of certain keys being used by a exchange.  Using this signature, the auditor affirms that he will verify that the exchange is properly accounting for those coins.
 
 .SH OPTIONS
 .B
@@ -19,11 +19,11 @@ Location of the private EdDSA auditor key.  If it does not exist, it will be cre
 .IP "\-h, \-\-help"
 Print short help on options.
 .B
-.IP "\-m KEY,  \-\-mint-key=KEY"
-Public key of the mint in Crockford base32 encoding, for example as generated by gnunet\-ecc \-p.
+.IP "\-m KEY,  \-\-exchange-key=KEY"
+Public key of the exchange in Crockford base32 encoding, for example as generated by gnunet\-ecc \-p.
 .B
-.IP "\-r FILE,  \-\-mint-request=FILE"
-File with the mint's denomination key signing request as generated by taler\-mint\-keyup \-o.
+.IP "\-r FILE,  \-\-exchange-request=FILE"
+File with the exchange's denomination key signing request as generated by taler\-exchange\-keyup \-o.
 .B
 .IP "\-o FILE, \-\-output=FILE"
 File where the auditor should write the EdDSA signature.
@@ -32,4 +32,4 @@ File where the auditor should write the EdDSA signature.
 Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <taler@gnu.org>
 
 .SH "SEE ALSO"
-\fBtaler\-mint\-keyup\fP(1), \fBgnunet\-ecc\fP(1), \fBtaler.conf\fP(5)
+\fBtaler\-exchange\-keyup\fP(1), \fBgnunet\-ecc\fP(1), \fBtaler.conf\fP(5)
diff --git a/doc/taler-exchange-dbinit.1 b/doc/taler-exchange-dbinit.1
new file mode 100644
index 000000000..456a85b0c
--- /dev/null
+++ b/doc/taler-exchange-dbinit.1
@@ -0,0 +1,29 @@
+.TH TALER\-EXCHANGE\-DBINIT 1 "Apr 22, 2015" "GNU Taler"
+
+.SH NAME
+taler\-exchange\-dbinit \- Initialize Taler exchange database.
+
+.SH SYNOPSIS
+.B taler\-exchange\-dbinit
+.RI [ options ]
+.br
+
+.SH DESCRIPTION
+\fBtaler\-exchange\-dbinit\fP is a command line tool to initialize the Taler exchange database.  It creates the necessary tables and indices for the Taler exchange to operate.
+
+.SH OPTIONS
+.B
+.IP "\-d DIRNAME,  \-\-exchange-dir=DIRNAME"
+Use the configuration and other resources for the exchange to operate from DIRNAME.
+.B
+.IP "\-h, \-\-help"
+Print short help on options.
+.B
+.IP "\-v, \-\-version"
+Print version information.
+
+.SH BUGS
+Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <taler@gnu.org>
+
+.SH "SEE ALSO"
+\fBtaler\-exchange\-httpd\fP(1), \fBtaler\-exchange\-keyup\fP(1), \fBtaler\-exchange\-reservemod\fP(1), \fBtaler.conf\fP(5)
diff --git a/doc/taler-exchange-httpd.1 b/doc/taler-exchange-httpd.1
new file mode 100644
index 000000000..959f1ec76
--- /dev/null
+++ b/doc/taler-exchange-httpd.1
@@ -0,0 +1,39 @@
+.TH TALER\-EXCHANGE\-HTTPD 1 "Apr 22, 2015" "GNU Taler"
+
+.SH NAME
+taler\-exchange\-httpd \- Run Taler exchange (with RESTful API)
+
+.SH SYNOPSIS
+.B taler\-exchange\-httpd
+.RI [ options ]
+.br
+
+.SH DESCRIPTION
+\fBtaler\-exchange\-httpd\fP is a command line tool to run the Taler exchange (HTTP server).  The required configuration, keys and database must exist before running this command.
+
+.SH OPTIONS
+.B
+.IP "\-C,  \-\-connection-close"
+Force each HTTP connection to be closed after each request (useful in combination with \-f to avoid having to wait for nc to time out).
+.B
+.IP "\-d DIRNAME,  \-\-exchange-dir=DIRNAME"
+Use the configuration and other resources for the exchange to operate from DIRNAME.
+.B
+.IP "\-h, \-\-help"
+Print short help on options.
+.B
+.IP "\-v, \-\-version"
+Print version information.
+.B
+.IP "\-f FILENAME, \-\-file\-input=FILENAME"
+This option is only available if the exchange was compiled with the configure option
+\-\-enable\-developer\-mode.  It is used for generating test cases against the exchange using AFL.  When this option is present, the HTTP server will (1) terminate after the first client's HTTP connection is completed, and (2) automatically start such a client using a helper process based on the 'nc' or 'ncat' binary using FILENAME as the standard input to the helper process.  As a result, the process will effectively run with FILENAME as the input from an HTTP client and then immediately exit.  This is useful to test taler\-exchange\-httpd against many different possible inputs in a controlled way.
+.B
+.IP \"-t SECONDS, \-\-timeout=SECONDS"
+Specifies the number of SECONDS after which the HTTPD should close (idle) HTTP connections.
+
+.SH BUGS
+Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <taler@gnu.org>
+
+.SH "SEE ALSO"
+\fBtaler\-exchange\-dbinit\fP(1), \fBtaler\-exchange\-keyup\fP(1), \fBtaler\-exchange\-reservemod\fP(1), \fBtaler.conf\fP(5)
diff --git a/doc/taler-exchange-keycheck.1 b/doc/taler-exchange-keycheck.1
new file mode 100644
index 000000000..3f3382336
--- /dev/null
+++ b/doc/taler-exchange-keycheck.1
@@ -0,0 +1,29 @@
+.TH TALER\-EXCHANGE\-KEYCHECK 1 "Apr 22, 2015" "GNU Taler"
+
+.SH NAME
+taler\-exchange\-keycheck \- Check validity of Taler signing and denomination keys.
+
+.SH SYNOPSIS
+.B taler\-exchange\-keycheck
+.RI [ options ]
+.br
+
+.SH DESCRIPTION
+\fBtaler\-exchange\-keycheck\fP can be used to check if the signing and denomination keys in the operation directory are well-formed. This can be useful after importing fresh keys from the offline system to ensure that the files are correct.
+
+.SH OPTIONS
+.B
+.IP "\-d DIRNAME,  \-\-exchange-dir=DIRNAME"
+Use the configuration and other resources for the exchange to operate from DIRNAME.
+.B
+.IP "\-h, \-\-help"
+Print short help on options.
+.B
+.IP "\-v, \-\-version"
+Print version information.
+
+.SH BUGS
+Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <taler@gnu.org>
+
+.SH "SEE ALSO"
+\fBtaler\-exchange\-httpd\fP(1), \fBtaler\-exchange\-keyup\fP(1), \fBtaler\-exchange\-dbinit\fP(1), \fBtaler.conf\fP(5)
diff --git a/doc/taler-exchange-keyup.1 b/doc/taler-exchange-keyup.1
new file mode 100644
index 000000000..541c10ec8
--- /dev/null
+++ b/doc/taler-exchange-keyup.1
@@ -0,0 +1,38 @@
+.TH TALER\-EXCHANGE\-KEYUP 1 "Apr 22, 2015" "GNU Taler"
+
+.SH NAME
+taler\-exchange\-keyup \- Setup Taler exchange denomination and signing keys.
+
+.SH SYNOPSIS
+.B taler\-exchange\-keyup
+.RI [ options ]
+.br
+
+.SH DESCRIPTION
+\fBtaler\-exchange\-keyup\fP is a command line tool to setup Taler denomination and signing keys.  This tool requires access to the exchange's long-term offline signing key and should be run in a secure (offline) environment under strict controls. The resulting keys can then be copied to the main online directory where the Taler HTTP server operates.
+
+.SH OPTIONS
+.B
+.IP "\-d DIRNAME,  \-\-exchange-dir=DIRNAME"
+Use the configuration and other resources for the exchange to operate from DIRNAME.
+.B
+.IP "\-h, \-\-help"
+Print short help on options.
+.B
+.IP "\-m FILE,  \-\-master-key=FILE"
+Location of the private EdDSA offline master key of the exchange.
+.B
+.IP "\-o FILE,  \-\-ouptut=FILE"
+Where to write a denomination key signing request file to be given to the auditor.
+.B
+.IP "\-t TIMESTAMP,  \-\-time=TIMESTAMP"
+Operate as if the current time was TIMESTAMP.
+.B
+.IP "\-v, \-\-version"
+Print version information.
+
+.SH BUGS
+Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <taler@gnu.org>
+
+.SH "SEE ALSO"
+\fBtaler\-exchange\-httpd\fP(1), \fBtaler\-exchange\-keyup\fP(1), \fBtaler\-exchange\-keycheck\fP(1), \fBtaler.conf\fP(5)
diff --git a/doc/taler-exchange-reservemod.1 b/doc/taler-exchange-reservemod.1
new file mode 100644
index 000000000..7044a7c61
--- /dev/null
+++ b/doc/taler-exchange-reservemod.1
@@ -0,0 +1,35 @@
+.TH TALER\-EXCHANGE\-RESERVEMOD 1 "Apr 22, 2015" "GNU Taler"
+
+.SH NAME
+taler\-exchange\-reservemod \- Modify reserve balance in the Taler exchange database.
+
+.SH SYNOPSIS
+.B taler\-exchange\-reservemod
+.RI [ options ]
+.br
+
+.SH DESCRIPTION
+\fBtaler\-exchange\-reservemod\fP is a command line tool to modify reserves in the Taler exchange database.  Basically, it can be used to import deposits, either for testing or as part of the import from the list of incoming transactions. 
+
+.SH OPTIONS
+.B
+.IP "\-a DENOM,  \-\-add=DENOM"
+Amount to add to the reserve.
+.B
+.IP "\-d DIRNAME,  \-\-exchange-dir=DIRNAME"
+Use the configuration and other resources for the exchange to operate from DIRNAME.
+.B
+.IP "\-h, \-\-help"
+Print short help on options.
+.B
+.IP "\-R KEY,  \-\-reserve=KEY"
+Public EdDSA key of the reserve to modify.
+.B
+.IP "\-v, \-\-version"
+Print version information.
+
+.SH BUGS
+Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <taler@gnu.org>
+
+.SH "SEE ALSO"
+\fBtaler\-exchange\-httpd\fP(1), \fBtaler\-exchange\-keyup\fP(1), \fBtaler\-exchange\-dbinit\fP(1), \fBtaler.conf\fP(5)
diff --git a/doc/taler-mint-sepa.1 b/doc/taler-exchange-sepa.1
index 62d75a667..b24828d96 100644
--- a/doc/taler-mint-sepa.1
+++ b/doc/taler-exchange-sepa.1
@@ -1,15 +1,15 @@
-.TH TALER\-MINT\-SEPA 1 "Apr 22, 2015" "GNU Taler"
+.TH TALER\-EXCHANGE\-SEPA 1 "Apr 22, 2015" "GNU Taler"
 
 .SH NAME
-taler\-mint\-sepa \- Create the master-key signed response to /wire/sepa.
+taler\-exchange\-sepa \- Create the master-key signed response to /wire/sepa.
 
 .SH SYNOPSIS
-.B taler\-mint\-sepa
+.B taler\-exchange\-sepa
 .RI [ options ]
 .br
 
 .SH DESCRIPTION
-\fBtaler\-mint\-sepa\fP is used to create the mint's reply to a /wire/sepa request.  It converts the bank details into the appropriate signed response.  This needs to be done using the long-term offline master key.
+\fBtaler\-exchange\-sepa\fP is used to create the exchange's reply to a /wire/sepa request.  It converts the bank details into the appropriate signed response.  This needs to be done using the long-term offline master key.
 
 .SH OPTIONS
 .B
@@ -23,7 +23,7 @@ Specifies the IBAN to use.
 Specifies the name of the account holder.
 .B
 .IP "\-m MASTERKEYFILE,  \-\-master=MASTERKEYFILE"
-Specifies the name of the file containing the mint's master key.
+Specifies the name of the file containing the exchange's master key.
 .B
 .IP "\-o FILENAME,  \-\-output=FILENAME"
 Where to write the SEPA_RESPONSE_FILE.
@@ -38,4 +38,4 @@ Print version information.
 Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <taler@gnu.org>
 
 .SH "SEE ALSO"
-\fBtaler\-mint\-httpd\fP(1), \fBtaler.conf\fP(5)
+\fBtaler\-exchange\-httpd\fP(1), \fBtaler.conf\fP(5)
diff --git a/doc/taler-mint-dbinit.1 b/doc/taler-mint-dbinit.1
deleted file mode 100644
index c8678aed0..000000000
--- a/doc/taler-mint-dbinit.1
+++ /dev/null
@@ -1,29 +0,0 @@
-.TH TALER\-MINT\-DBINIT 1 "Apr 22, 2015" "GNU Taler"
-
-.SH NAME
-taler\-mint\-dbinit \- Initialize Taler mint database.
-
-.SH SYNOPSIS
-.B taler\-mint\-dbinit
-.RI [ options ]
-.br
-
-.SH DESCRIPTION
-\fBtaler\-mint\-dbinit\fP is a command line tool to initialize the Taler mint database.  It creates the necessary tables and indices for the Taler mint to operate.
-
-.SH OPTIONS
-.B
-.IP "\-d DIRNAME,  \-\-mint-dir=DIRNAME"
-Use the configuration and other resources for the mint to operate from DIRNAME.
-.B
-.IP "\-h, \-\-help"
-Print short help on options.
-.B
-.IP "\-v, \-\-version"
-Print version information.
-
-.SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <taler@gnu.org>
-
-.SH "SEE ALSO"
-\fBtaler\-mint\-httpd\fP(1), \fBtaler\-mint\-keyup\fP(1), \fBtaler\-mint\-reservemod\fP(1), \fBtaler.conf\fP(5)
diff --git a/doc/taler-mint-httpd.1 b/doc/taler-mint-httpd.1
deleted file mode 100644
index 4f9c35292..000000000
--- a/doc/taler-mint-httpd.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.TH TALER\-MINT\-HTTPD 1 "Apr 22, 2015" "GNU Taler"
-
-.SH NAME
-taler\-mint\-httpd \- Run Taler mint (with RESTful API)
-
-.SH SYNOPSIS
-.B taler\-mint\-httpd
-.RI [ options ]
-.br
-
-.SH DESCRIPTION
-\fBtaler\-mint\-httpd\fP is a command line tool to run the Taler mint (HTTP server).  The required configuration, keys and database must exist before running this command.
-
-.SH OPTIONS
-.B
-.IP "\-C,  \-\-connection-close"
-Force each HTTP connection to be closed after each request (useful in combination with \-f to avoid having to wait for nc to time out).
-.B
-.IP "\-d DIRNAME,  \-\-mint-dir=DIRNAME"
-Use the configuration and other resources for the mint to operate from DIRNAME.
-.B
-.IP "\-h, \-\-help"
-Print short help on options.
-.B
-.IP "\-v, \-\-version"
-Print version information.
-.B
-.IP "\-f FILENAME, \-\-file\-input=FILENAME"
-This option is only available if the mint was compiled with the configure option
-\-\-enable\-developer\-mode.  It is used for generating test cases against the mint using AFL.  When this option is present, the HTTP server will (1) terminate after the first client's HTTP connection is completed, and (2) automatically start such a client using a helper process based on the 'nc' or 'ncat' binary using FILENAME as the standard input to the helper process.  As a result, the process will effectively run with FILENAME as the input from an HTTP client and then immediately exit.  This is useful to test taler\-mint\-httpd against many different possible inputs in a controlled way.
-.B
-.IP \"-t SECONDS, \-\-timeout=SECONDS"
-Specifies the number of SECONDS after which the HTTPD should close (idle) HTTP connections.
-
-.SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <taler@gnu.org>
-
-.SH "SEE ALSO"
-\fBtaler\-mint\-dbinit\fP(1), \fBtaler\-mint\-keyup\fP(1), \fBtaler\-mint\-reservemod\fP(1), \fBtaler.conf\fP(5)
diff --git a/doc/taler-mint-keycheck.1 b/doc/taler-mint-keycheck.1
deleted file mode 100644
index a2c153244..000000000
--- a/doc/taler-mint-keycheck.1
+++ /dev/null
@@ -1,29 +0,0 @@
-.TH TALER\-MINT\-KEYCHECK 1 "Apr 22, 2015" "GNU Taler"
-
-.SH NAME
-taler\-mint\-keycheck \- Check validity of Taler signing and denomination keys.
-
-.SH SYNOPSIS
-.B taler\-mint\-keycheck
-.RI [ options ]
-.br
-
-.SH DESCRIPTION
-\fBtaler\-mint\-keycheck\fP can be used to check if the signing and denomination keys in the operation directory are well-formed. This can be useful after importing fresh keys from the offline system to ensure that the files are correct.
-
-.SH OPTIONS
-.B
-.IP "\-d DIRNAME,  \-\-mint-dir=DIRNAME"
-Use the configuration and other resources for the mint to operate from DIRNAME.
-.B
-.IP "\-h, \-\-help"
-Print short help on options.
-.B
-.IP "\-v, \-\-version"
-Print version information.
-
-.SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <taler@gnu.org>
-
-.SH "SEE ALSO"
-\fBtaler\-mint\-httpd\fP(1), \fBtaler\-mint\-keyup\fP(1), \fBtaler\-mint\-dbinit\fP(1), \fBtaler.conf\fP(5)
diff --git a/doc/taler-mint-keyup.1 b/doc/taler-mint-keyup.1
deleted file mode 100644
index 71135b36a..000000000
--- a/doc/taler-mint-keyup.1
+++ /dev/null
@@ -1,38 +0,0 @@
-.TH TALER\-MINT\-KEYUP 1 "Apr 22, 2015" "GNU Taler"
-
-.SH NAME
-taler\-mint\-keyup \- Setup Taler mint denomination and signing keys.
-
-.SH SYNOPSIS
-.B taler\-mint\-keyup
-.RI [ options ]
-.br
-
-.SH DESCRIPTION
-\fBtaler\-mint\-keyup\fP is a command line tool to setup Taler denomination and signing keys.  This tool requires access to the mint's long-term offline signing key and should be run in a secure (offline) environment under strict controls. The resulting keys can then be copied to the main online directory where the Taler HTTP server operates.
-
-.SH OPTIONS
-.B
-.IP "\-d DIRNAME,  \-\-mint-dir=DIRNAME"
-Use the configuration and other resources for the mint to operate from DIRNAME.
-.B
-.IP "\-h, \-\-help"
-Print short help on options.
-.B
-.IP "\-m FILE,  \-\-master-key=FILE"
-Location of the private EdDSA offline master key of the mint.
-.B
-.IP "\-o FILE,  \-\-ouptut=FILE"
-Where to write a denomination key signing request file to be given to the auditor.
-.B
-.IP "\-t TIMESTAMP,  \-\-time=TIMESTAMP"
-Operate as if the current time was TIMESTAMP.
-.B
-.IP "\-v, \-\-version"
-Print version information.
-
-.SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <taler@gnu.org>
-
-.SH "SEE ALSO"
-\fBtaler\-mint\-httpd\fP(1), \fBtaler\-mint\-keyup\fP(1), \fBtaler\-mint\-keycheck\fP(1), \fBtaler.conf\fP(5)
diff --git a/doc/taler-mint-reservemod.1 b/doc/taler-mint-reservemod.1
deleted file mode 100644
index 1d8270458..000000000
--- a/doc/taler-mint-reservemod.1
+++ /dev/null
@@ -1,35 +0,0 @@
-.TH TALER\-MINT\-RESERVEMOD 1 "Apr 22, 2015" "GNU Taler"
-
-.SH NAME
-taler\-mint\-reservemod \- Modify reserve balance in the Taler mint database.
-
-.SH SYNOPSIS
-.B taler\-mint\-reservemod
-.RI [ options ]
-.br
-
-.SH DESCRIPTION
-\fBtaler\-mint\-reservemod\fP is a command line tool to modify reserves in the Taler mint database.  Basically, it can be used to import deposits, either for testing or as part of the import from the list of incoming transactions. 
-
-.SH OPTIONS
-.B
-.IP "\-a DENOM,  \-\-add=DENOM"
-Amount to add to the reserve.
-.B
-.IP "\-d DIRNAME,  \-\-mint-dir=DIRNAME"
-Use the configuration and other resources for the mint to operate from DIRNAME.
-.B
-.IP "\-h, \-\-help"
-Print short help on options.
-.B
-.IP "\-R KEY,  \-\-reserve=KEY"
-Public EdDSA key of the reserve to modify.
-.B
-.IP "\-v, \-\-version"
-Print version information.
-
-.SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <taler@gnu.org>
-
-.SH "SEE ALSO"
-\fBtaler\-mint\-httpd\fP(1), \fBtaler\-mint\-keyup\fP(1), \fBtaler\-mint\-dbinit\fP(1), \fBtaler.conf\fP(5)
diff --git a/doc/taler.conf.5 b/doc/taler.conf.5
index 87f216913..f9d9d6312 100644
--- a/doc/taler.conf.5
+++ b/doc/taler.conf.5
@@ -10,9 +10,9 @@ taler.conf \- Taler configuration file.
 
 The basic structure of the configuration file is the following.  The file is split into sections.  Every section begins with "[SECTIONNAME]" and contains a number of options of the form "OPTION=VALUE".  Empty lines and lines beginning with a "#" are treated as comments.
 
-.SH MINT OPTIONS
+.SH EXCHANGE OPTIONS
 
-The following options are from the "[mint]" section and used by most mint tools:
+The following options are from the "[exchange]" section and used by most exchange tools:
 
 .IP CURRENCY
     Name of the currency, i.e. "EUR" for Euro.
@@ -23,32 +23,32 @@ The following options are from the "[mint]" section and used by most mint tools:
 .IP PORT
     Port on which the HTTP server listens, i.e. 8080.
 .IP MASTER_PUBLIC_KEY
-    Crockford Base32-encoded master public key, public version of the mint\'s long\-time offline signing key.
+    Crockford Base32-encoded master public key, public version of the exchange\'s long\-time offline signing key.
 
 
 .SH WIRE transfer details
 
-The following options must be in section "[mint-wire-test]":
+The following options must be in section "[exchange-wire-test]":
 
 .IP REDIRECT_URL
     URL to redirect /wire/test to. Should contain a Web form the user can use to charge his wallet with coins in a "test" currency for testing. If this option is not provided, /wire/test will return "501 NOT IMPLEMENTED".
 
-The following options must be in section "[mint-wire-sepa]":
+The following options must be in section "[exchange-wire-sepa]":
 
 .IP SEPA_RESPONSE_FILE
-    Filename with the JSON body for the /wire/sepa response, signed using the mint's long-term offline master key.  If this option is not provided, /wire/test will return "501 NOT IMPLEMENTED".  Use "taler-mint-sepa" to create the SEPA_RESPONSE_FILE.
+    Filename with the JSON body for the /wire/sepa response, signed using the exchange's long-term offline master key.  If this option is not provided, /wire/test will return "501 NOT IMPLEMENTED".  Use "taler-exchange-sepa" to create the SEPA_RESPONSE_FILE.
 
 
 .SH Postgres database options
 
-The following options must be in section "[mintdb-postgres]":
+The following options must be in section "[exchangedb-postgres]":
 
 .IP DB_CONN_STR
     How to access the database, i.e. "postgres:///taler" to use the "taler" database. Testcases use "talercheck".
 
 .SH COIN OPTIONS
 
-The following options must be in sections starting with "[coin_]" and are used by taler\-mint\-keyup to create denomination keys:
+The following options must be in sections starting with "[coin_]" and are used by taler\-exchange\-keyup to create denomination keys:
 
 .IP VALUE
     Value of the coin, i.e. "EUR:1.50" for 1 Euro and 50 Cents (per coin).
@@ -69,7 +69,7 @@ The following options must be in sections starting with "[coin_]" and are used b
 
 .SH KEY OPTIONS
 
-The following options are from the "[mint_keys]" section and used by most taler\-mint\-keyup to create keys:
+The following options are from the "[exchange_keys]" section and used by most taler\-exchange\-keyup to create keys:
 
 .IP SIGNKEY_DURATION
     For how long is a signing key valid?
@@ -85,5 +85,5 @@ The following options are from the "[mint_keys]" section and used by most taler\
 Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <taler@gnu.org>
 
 .SH "SEE ALSO"
-\fBtaler\-mint\-httpd\fP(1), \fBtaler\-mint\-keyup\fP(1), \fBtaler\-mint\-reservemod\fP(1), \fBtaler\-mint\-dbinit\fP(1), \fBtaler\-mint\-sepa(1)
+\fBtaler\-exchange\-httpd\fP(1), \fBtaler\-exchange\-keyup\fP(1), \fBtaler\-exchange\-reservemod\fP(1), \fBtaler\-exchange\-dbinit\fP(1), \fBtaler\-exchange\-sepa(1)