4 files changed, 8 insertions, 13 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index c06de792..269c9d00 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -7,7 +7,7 @@ if USE_COVERAGE
 endif
 
 
-pkgcfgdir = $(prefix)/share/sync/config.d/
+pkgcfgdir = $(prefix)/share/taler-merchant/config.d/
 
 pkgcfg_DATA = \
   merchant-paths.conf
diff --git a/src/util/merchant-paths.conf b/src/util/merchant-paths.conf
index b328a49f..d7f39fae 100644
--- a/src/util/merchant-paths.conf
+++ b/src/util/merchant-paths.conf
@@ -14,21 +14,16 @@ TALER_HOME = ${HOME:-${USERPROFILE}}
 # for how these should be used.
 
 # Persistent data storage
-TALER_DATA_HOME = ${XDG_DATA_HOME:-$TALER_HOME/.local/share}/sync/
+TALER_DATA_HOME = ${XDG_DATA_HOME:-$TALER_HOME/.local/share}/taler-merchant/
 
 # Configuration files
-TALER_CONFIG_HOME = ${XDG_CONFIG_HOME:-$TALER_HOME/.config}/sync/
+TALER_CONFIG_HOME = ${XDG_CONFIG_HOME:-$TALER_HOME/.config}/taler-merchant/
 
 # Cached data, no big deal if lost
-TALER_CACHE_HOME = ${XDG_CACHE_HOME:-$TALER_HOME/.cache}/sync/
+TALER_CACHE_HOME = ${XDG_CACHE_HOME:-$TALER_HOME/.cache}/taler-merchant/
 
 # Runtime data (i.e UNIX domain sockets, locks, always lost on system boot)
-TALER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/sync-runtime/
+TALER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/taler-merchant-runtime/
 
 # Directory to use for temporary files.
-TALER_TMP = ${TMPDIR:-${TMP:-/tmp}}/sync/
-
-# DEFAULTCONFIG = /etc/sync.conf
-# If 'DEFAULTCONFIG' is not defined, the current
-# configuration file is assumed to be the default,
-# which is what we want by default...
+TALER_TMP = ${TMPDIR:-${TMP:-/tmp}}/taler-merchant/
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index 322710f1..2dc5d01a 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -34,7 +34,7 @@
  */
 static const struct GNUNET_OS_ProjectData merchant_pd = {
   .libname = "libtalermerchantutil",
-  .project_dirname = "taler",
+  .project_dirname = "taler-merchant",
   .binary_name = "taler-merchant-httpd",
   .env_varname = "TALER_PREFIX",
   .base_config_varname = "TALER_BASE_CONFIG",
diff --git a/src/util/taler-merchant-config.c b/src/util/taler-merchant-config.c
index 150c9f06..8bdd27ff 100644
--- a/src/util/taler-merchant-config.c
+++ b/src/util/taler-merchant-config.c
@@ -70,4 +70,4 @@ main (int argc,
 }
 
 
-/* end of sync-config.c */
+/* end of taler-merchant-config.c */