diff --git a/contrib/init/dashd.conf b/contrib/init/dashd.conf
index fa981b4e9e..fbcb7ebf1e 100644
--- a/contrib/init/dashd.conf
+++ b/contrib/init/dashd.conf
@@ -9,7 +9,7 @@ env BITCOIND_GROUP="dashcore"
 env BITCOIND_PIDDIR="/var/run/dashd"
 # upstart can't handle variables constructed with other variables
 env BITCOIND_PIDFILE="/var/run/dashd/dashd.pid"
-env BITCOIND_CONFIGFILE="/etc/dash/dash.conf"
+env BITCOIND_CONFIGFILE="/etc/dashcore/dash.conf"
 env BITCOIND_DATADIR="/var/lib/dashd"
 
 expect fork
diff --git a/contrib/init/dashd.openrc b/contrib/init/dashd.openrc
index 0c243f56c0..e8e8515849 100644
--- a/contrib/init/dashd.openrc
+++ b/contrib/init/dashd.openrc
@@ -2,13 +2,13 @@
 
 # backward compatibility for existing gentoo layout 
 #
-if [ -d "/var/lib/dash/.dash" ]; then
-	BITCOIND_DEFAULT_DATADIR="/var/lib/dash/.dash"
+if [ -d "/var/lib/dashcore/.dashcore" ]; then
+	BITCOIND_DEFAULT_DATADIR="/var/lib/dashcore/.dashcore"
 else
 	BITCOIND_DEFAULT_DATADIR="/var/lib/dashd"
 fi
 
-BITCOIND_CONFIGFILE=${BITCOIND_CONFIGFILE:-/etc/dash/dash.conf}
+BITCOIND_CONFIGFILE=${BITCOIND_CONFIGFILE:-/etc/dashcore/dash.conf}
 BITCOIND_PIDDIR=${BITCOIND_PIDDIR:-/var/run/dashd}
 BITCOIND_PIDFILE=${BITCOIND_PIDFILE:-${BITCOIND_PIDDIR}/dashd.pid}
 BITCOIND_DATADIR=${BITCOIND_DATADIR:-${BITCOIND_DEFAULT_DATADIR}}
diff --git a/contrib/init/dashd.openrcconf b/contrib/init/dashd.openrcconf
index c133b52924..a5977598ad 100644
--- a/contrib/init/dashd.openrcconf
+++ b/contrib/init/dashd.openrcconf
@@ -1,7 +1,7 @@
 # /etc/conf.d/dashd: config file for /etc/init.d/dashd
 
 # Config file location
-#BITCOIND_CONFIGFILE="/etc/dash/dash.conf"
+#BITCOIND_CONFIGFILE="/etc/dashcore/dash.conf"
 
 # What directory to write pidfile to?  (created and owned by $BITCOIND_USER)
 #BITCOIND_PIDDIR="/var/run/dashd"
diff --git a/contrib/init/dashd.service b/contrib/init/dashd.service
index 88137116b7..a256c6a03a 100644
--- a/contrib/init/dashd.service
+++ b/contrib/init/dashd.service
@@ -9,7 +9,7 @@ Group=dashcore
 Type=forking
 PIDFile=/var/lib/dashd/dashd.pid
 ExecStart=/usr/bin/dashd -daemon -pid=/var/lib/dashd/dashd.pid \
--conf=/etc/dash/dash.conf -datadir=/var/lib/dashd -disablewallet
+-conf=/etc/dashcore/dash.conf -datadir=/var/lib/dashd -disablewallet
 
 Restart=always
 PrivateTmp=true
diff --git a/doc/init.md b/doc/init.md
index 03a8e76f6f..819934ebe4 100644
--- a/doc/init.md
+++ b/doc/init.md
@@ -54,7 +54,7 @@ see `contrib/debian/examples/dash.conf`.
 All three configurations assume several paths that might need to be adjusted.
 
 Binary:              `/usr/bin/dashd`  
-Configuration file:  `/etc/dash/dash.conf`  
+Configuration file:  `/etc/dashcore/dash.conf`  
 Data directory:      `/var/lib/dashd`  
 PID file:            `/var/run/dashd/dashd.pid` (OpenRC and Upstart) or `/var/lib/dashd/dashd.pid` (systemd)  
 Lock file:           `/var/lock/subsys/dashd` (CentOS)  
diff --git a/doc/tor.md b/doc/tor.md
index 8e6d9a2207..cce8c2cf62 100644
--- a/doc/tor.md
+++ b/doc/tor.md
@@ -51,7 +51,7 @@ If you configure your Tor system accordingly, it is possible to make your node a
 reachable from the Tor network. Add these lines to your /etc/tor/torrc (or equivalent
 config file):
 
-	HiddenServiceDir /var/lib/tor/dash-service/
+	HiddenServiceDir /var/lib/tor/dashcore-service/
 	HiddenServicePort 9999 127.0.0.1:9999
 	HiddenServicePort 19999 127.0.0.1:19999
 
@@ -61,7 +61,7 @@ your dashd's P2P listen port (9999 by default).
 	-externalip=X   You can tell Dash Core about its publicly reachable address using
 	                this option, and this can be a .onion address. Given the above
 	                configuration, you can find your onion address in
-	                /var/lib/tor/dash-service/hostname. Onion addresses are given
+	                /var/lib/tor/dashcore-service/hostname. Onion addresses are given
 	                preference for your node to advertize itself with, for connections
 	                coming from unroutable addresses (such as 127.0.0.1, where the
 	                Tor proxy typically runs).