diff --git a/doc/Makefile.am b/doc/Makefile.am
index 37c0a431b..caa8f8940 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,37 +3,38 @@
 SUBDIRS = . doxygen
 
 man_MANS = \
-  prebuilt/man/taler-auditor.1             \
-  prebuilt/man/taler-exchange-benchmark.1  \
-  prebuilt/man/taler-helper-auditor-coins.1\
-  prebuilt/man/taler-auditor-dbinit.1      \
-  prebuilt/man/taler-exchange-closer.1     \
-  prebuilt/man/taler-helper-auditor-deposits.1\
-  prebuilt/man/taler-auditor-exchange.1     \
-  prebuilt/man/taler-exchange-dbinit.1  \
-  prebuilt/man/taler-helper-auditor-reserves.1\
-  prebuilt/man/taler-auditor-httpd.1       \
-  prebuilt/man/taler-exchange-httpd.1       \
-  prebuilt/man/taler-helper-auditor-wire.1\
-  prebuilt/man/taler-auditor-offline.1    \
-  prebuilt/man/taler-exchange-offline.1    \
-  prebuilt/man/taler-auditor-sign.1       \
-  prebuilt/man/taler-exchange-secmod-eddsa.1\
-  prebuilt/man/taler-bank-transfer.1   \
-  prebuilt/man/taler-exchange-secmod-rsa.1 \
   prebuilt/man/taler.conf.5            \
-  prebuilt/man/taler-exchange-transfer.1\
   prebuilt/man/taler-config-generate.1     \
-  prebuilt/man/taler-exchange-wirewatch.1   \
-  prebuilt/man/taler-wire-gateway-client.1\
+  prebuilt/man/taler-auditor.1             \
+  prebuilt/man/taler-auditor-dbinit.1      \
+  prebuilt/man/taler-auditor-exchange.1     \
+  prebuilt/man/taler-auditor-httpd.1       \
+  prebuilt/man/taler-auditor-offline.1    \
+  prebuilt/man/taler-auditor-sign.1       \
+  prebuilt/man/taler-bank-transfer.1   \
   prebuilt/man/taler-exchange-aggregator.1 \
-  prebuilt/man/taler-helper-auditor-aggregation.1
+  prebuilt/man/taler-exchange-benchmark.1  \
+  prebuilt/man/taler-exchange-closer.1     \
+  prebuilt/man/taler-exchange-dbinit.1  \
+  prebuilt/man/taler-exchange-httpd.1       \
+  prebuilt/man/taler-exchange-offline.1    \
+  prebuilt/man/taler-exchange-secmod-eddsa.1\
+  prebuilt/man/taler-exchange-secmod-rsa.1 \
+  prebuilt/man/taler-exchange-transfer.1\
+  prebuilt/man/taler-exchange-wirewatch.1   \
+  prebuilt/man/taler-exchange-wire-gateway-client.1\
+  prebuilt/man/taler-helper-auditor-aggregation.1 \
+  prebuilt/man/taler-helper-auditor-coins.1\
+  prebuilt/man/taler-helper-auditor-deposits.1\
+  prebuilt/man/taler-helper-auditor-reserves.1\
+  prebuilt/man/taler-helper-auditor-wire.1
 
 info_TEXINFOS = \
   prebuilt/texinfo/taler-auditor.texi \
+  prebuilt/texinfo/taler-bank.texi \
   prebuilt/texinfo/taler-developer-manual.texi \
-  prebuilt/texinfo/taler-exchange.texi \
-  prebuilt/texinfo/taler-bank.texi
+  prebuilt/texinfo/taler-exchange.texi
+
 
 EXTRA_DIST = \
   $(man_MANS) \
diff --git a/doc/prebuilt b/doc/prebuilt
index e32c7da99..e306092a5 160000
--- a/doc/prebuilt
+++ b/doc/prebuilt
@@ -1 +1 @@
-Subproject commit e32c7da994a3787ad34d99b21d2cbc12d6988166
+Subproject commit e306092a5315336c103191ac9fa79a180a10c20d
diff --git a/src/bank-lib/Makefile.am b/src/bank-lib/Makefile.am
index a520b24df..78349dc8d 100644
--- a/src/bank-lib/Makefile.am
+++ b/src/bank-lib/Makefile.am
@@ -7,7 +7,7 @@ if USE_COVERAGE
 endif
 
 bin_PROGRAMS = \
-  taler-wire-gateway-client \
+  taler-exchange-wire-gateway-client \
   taler-fakebank-run
 
 taler_fakebank_run_SOURCES = \
@@ -17,9 +17,9 @@ taler_fakebank_run_LDADD = \
   $(top_builddir)/src/util/libtalerutil.la \
   -lgnunetutil
 
-taler_wire_gateway_client_SOURCES = \
-  taler-wire-gateway-client.c
-taler_wire_gateway_client_LDADD = \
+taler_exchange_wire_gateway_client_SOURCES = \
+  taler-exchange-wire-gateway-client.c
+taler_exchange_wire_gateway_client_LDADD = \
   $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/json/libtalerjson.la \
diff --git a/src/bank-lib/taler-wire-gateway-client.c b/src/bank-lib/taler-exchange-wire-gateway-client.c
similarity index 100%
rename from src/bank-lib/taler-wire-gateway-client.c
rename to src/bank-lib/taler-exchange-wire-gateway-client.c