4 files changed, 8 insertions, 8 deletions

diff --git a/src/gns/test_gns_defaults.conf b/src/gns/test_gns_defaults.conf
index 2652b98a3..769952cc8 100644
--- a/src/gns/test_gns_defaults.conf
+++ b/src/gns/test_gns_defaults.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-gns-testing/
+GNUNET_TEST_HOME = /tmp/test-gnunet-gns-testing/
 
 [dhtcache]
 DATABASE = heap
diff --git a/src/gns/test_gns_lookup.conf b/src/gns/test_gns_lookup.conf
index 94042a5e9..5d77e157a 100644
--- a/src/gns/test_gns_lookup.conf
+++ b/src/gns/test_gns_lookup.conf
@@ -9,7 +9,7 @@ PLUGINS =
 DEFAULTSERVICES = 
 
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-gns-peer-1/
+GNUNET_TEST_HOME = /tmp/test-gnunet-gns-peer-1/
 
 [gns]
 #PREFIX = valgrind --leak-check=full --track-origins=yes 
diff --git a/src/gns/test_gns_proxy.conf b/src/gns/test_gns_proxy.conf
index b098edb60..547e5580b 100644
--- a/src/gns/test_gns_proxy.conf
+++ b/src/gns/test_gns_proxy.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/gnunet-test-gns-proxy/
+GNUNET_TEST_HOME = /tmp/gnunet-test-gns-proxy/
 
 [transport]
 PLUGINS = tcp
@@ -15,7 +15,7 @@ HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 
 [gns]
 AUTOSTART = YES
-ZONEKEY = $SERVICEHOME/.hostkey
+ZONEKEY = $GNUNET_TEST_HOME/.hostkey
 HIJACK_DNS = YES
 
 [gns-proxy]
diff --git a/src/gns/test_gns_simple_lookup.conf b/src/gns/test_gns_simple_lookup.conf
index c7f9f7132..5830c427b 100644
--- a/src/gns/test_gns_simple_lookup.conf
+++ b/src/gns/test_gns_simple_lookup.conf
@@ -42,7 +42,7 @@ PORT = 12368
 BINDTO = 127.0.0.1
 
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-gns-peer-1/
+GNUNET_TEST_HOME = /tmp/test-gnunetd-gns-peer-1/
 
 
 [nat]
@@ -67,7 +67,7 @@ PRIVATE_ZONE = private
 PRIVATE_ZONEKEY = zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey
 SHORTEN_ZONE = short
 SHORTEN_ZONEKEY = zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey
-#ZONEKEY =  $SERVICEHOME/gns/zonekey.zkey
+#ZONEKEY =  $GNUNET_TEST_HOME/gns/zonekey.zkey
 HIJACK_DNS = NO
 UNIXPATH = /tmp/gnunet-service-gns.sock
 AUTO_IMPORT_PKEY = YES
@@ -92,7 +92,7 @@ BINARY = gnunet-service-namestore
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
 DATABASE = sqlite
-ZONEFILE_DIRECTORY = $SERVICEHOME
+ZONEFILE_DIRECTORY = $GNUNET_TEST_HOME
 
 [namestore-sqlite]
-FILENAME = $SERVICEHOME/sqlite-default.db
+FILENAME = $GNUNET_TEST_HOME/sqlite-default.db