diff --git a/contrib/backends/bitcoin/btc.conf b/contrib/backends/bitcoin/bitcoin.conf
similarity index 100%
rename from contrib/backends/bitcoin/btc.conf
rename to contrib/backends/bitcoin/bitcoin.conf
diff --git a/contrib/backends/bitcoin/btc-testnet.conf b/contrib/backends/bitcoin/bitcoin_testnet.conf
similarity index 100%
rename from contrib/backends/bitcoin/btc-testnet.conf
rename to contrib/backends/bitcoin/bitcoin_testnet.conf
diff --git a/contrib/backends/bitcoin/debian/bitcoin-btc.conffiles b/contrib/backends/bitcoin/debian/bitcoin-btc.conffiles
deleted file mode 100644
index b734a623..00000000
--- a/contrib/backends/bitcoin/debian/bitcoin-btc.conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/opt/coins/nodes/bitcoin/btc/btc.conf
diff --git a/contrib/backends/bitcoin/debian/bitcoin-btc.dirs b/contrib/backends/bitcoin/debian/bitcoin-btc.dirs
deleted file mode 100644
index 5ee2039f..00000000
--- a/contrib/backends/bitcoin/debian/bitcoin-btc.dirs
+++ /dev/null
@@ -1 +0,0 @@
-/opt/coins/data/btc/bitcoin
diff --git a/contrib/backends/bitcoin/debian/bitcoin-btc.install b/contrib/backends/bitcoin/debian/bitcoin-btc.install
deleted file mode 100644
index 46107c83..00000000
--- a/contrib/backends/bitcoin/debian/bitcoin-btc.install
+++ /dev/null
@@ -1,2 +0,0 @@
-bitcoin/* /opt/coins/nodes/bitcoin/btc
-btc.conf /opt/coins/nodes/bitcoin/btc
diff --git a/contrib/backends/bitcoin/debian/bitcoin-testnet.conffiles b/contrib/backends/bitcoin/debian/bitcoin-testnet.conffiles
index 2d919034..5b49d3ea 100644
--- a/contrib/backends/bitcoin/debian/bitcoin-testnet.conffiles
+++ b/contrib/backends/bitcoin/debian/bitcoin-testnet.conffiles
@@ -1 +1 @@
-/opt/coins/nodes/bitcoin/btc-testnet/btc-testnet.conf
+/opt/coins/nodes/bitcoin_testnet/bitcoin_testnet.conf
diff --git a/contrib/backends/bitcoin/debian/bitcoin-testnet.dirs b/contrib/backends/bitcoin/debian/bitcoin-testnet.dirs
index d15c0af3..64476a16 100644
--- a/contrib/backends/bitcoin/debian/bitcoin-testnet.dirs
+++ b/contrib/backends/bitcoin/debian/bitcoin-testnet.dirs
@@ -1 +1 @@
-/opt/coins/data/btc-testnet/bitcoin
+/opt/coins/data/bitcoin_testnet/backend
diff --git a/contrib/backends/bitcoin/debian/bitcoin-testnet.install b/contrib/backends/bitcoin/debian/bitcoin-testnet.install
index 35109b8d..ba8e07d6 100644
--- a/contrib/backends/bitcoin/debian/bitcoin-testnet.install
+++ b/contrib/backends/bitcoin/debian/bitcoin-testnet.install
@@ -1,2 +1,2 @@
-bitcoin/* /opt/coins/nodes/bitcoin/btc-testnet
-btc-testnet.conf /opt/coins/nodes/bitcoin/btc-testnet
+bitcoin/* /opt/coins/nodes/bitcoin_testnet
+bitcoin_testnet.conf /opt/coins/nodes/bitcoin_testnet/bitcoin_testnet.conf
diff --git a/contrib/backends/bitcoin/debian/bitcoin-testnet.logrotate b/contrib/backends/bitcoin/debian/bitcoin-testnet.logrotate
index ebe95e6f..204426b9 100644
--- a/contrib/backends/bitcoin/debian/bitcoin-testnet.logrotate
+++ b/contrib/backends/bitcoin/debian/bitcoin-testnet.logrotate
@@ -1,5 +1,5 @@
-/opt/coins/data/btc-testnet/bitcoin/testnet3/debug.log
-/opt/coins/data/btc-testnet/bitcoin/testnet3/db.log
+/opt/coins/data/bitcoin_testnet/backend/testnet3/debug.log
+/opt/coins/data/bitcoin_testnet/backend/testnet3/db.log
 {
         rotate 7
         daily
diff --git a/contrib/backends/bitcoin/debian/bitcoin-testnet.postinst b/contrib/backends/bitcoin/debian/bitcoin-testnet.postinst
index ae1a2441..db0a7dd4 100644
--- a/contrib/backends/bitcoin/debian/bitcoin-testnet.postinst
+++ b/contrib/backends/bitcoin/debian/bitcoin-testnet.postinst
@@ -9,9 +9,9 @@ case "$1" in
         useradd --system -M -U bitcoin -s /bin/false
     fi
 
-    if [ "$(stat -c '%U' /opt/coins/data/btc-testnet/bitcoin)" != "bitcoin" ]
+    if [ "$(stat -c '%U' /opt/coins/data/bitcoin_testnet/backend)" != "bitcoin" ]
     then
-        chown -R bitcoin:bitcoin /opt/coins/data/btc-testnet/bitcoin
+        chown -R bitcoin:bitcoin /opt/coins/data/bitcoin_testnet/backend
     fi
   ;;
 
diff --git a/contrib/backends/bitcoin/debian/bitcoin-testnet.service b/contrib/backends/bitcoin/debian/bitcoin-testnet.service
index a539bd74..83746aa1 100644
--- a/contrib/backends/bitcoin/debian/bitcoin-testnet.service
+++ b/contrib/backends/bitcoin/debian/bitcoin-testnet.service
@@ -5,19 +5,19 @@
 # See "man systemd.service" for details.
 
 # Note that almost all daemon options could be specified in
-# /opt/coins/nodes/bitcoin/btc-testnet/btc-testnet.conf
+# /opt/coins/nodes/bitcoin_testnet/bitcoin_testnet.conf
 
 [Unit]
 Description=Bitcoin daemon (testnet)
 After=network.target
 
 [Service]
-ExecStart=/opt/coins/nodes/bitcoin/btc-testnet/bin/bitcoind -datadir=/opt/coins/data/btc-testnet/bitcoin -conf=/opt/coins/nodes/bitcoin/btc-testnet/btc-testnet.conf -pid=/run/bitcoind/testnet.pid
+ExecStart=/opt/coins/nodes/bitcoin_testnet/bin/bitcoind -datadir=/opt/coins/data/bitcoin_testnet/backend -conf=/opt/coins/nodes/bitcoin_testnet/bitcoin_testnet.conf -pid=/run/bitcoind/bitcoin_testnet.pid
 # Creates /run/bitcoind owned by bitcoin
 RuntimeDirectory=bitcoind
 User=bitcoin
 Type=forking
-PIDFile=/run/bitcoind/testnet.pid
+PIDFile=/run/bitcoind/bitcoin_testnet.pid
 Restart=on-failure
 
 # Resource limits
diff --git a/contrib/backends/bitcoin/debian/bitcoin.conffiles b/contrib/backends/bitcoin/debian/bitcoin.conffiles
new file mode 100644
index 00000000..84076cff
--- /dev/null
+++ b/contrib/backends/bitcoin/debian/bitcoin.conffiles
@@ -0,0 +1 @@
+/opt/coins/nodes/bitcoin/bitcoin.conf
diff --git a/contrib/backends/bitcoin/debian/bitcoin.dirs b/contrib/backends/bitcoin/debian/bitcoin.dirs
new file mode 100644
index 00000000..1a64a55f
--- /dev/null
+++ b/contrib/backends/bitcoin/debian/bitcoin.dirs
@@ -0,0 +1 @@
+/opt/coins/data/bitcoin/backend
diff --git a/contrib/backends/bitcoin/debian/bitcoin.install b/contrib/backends/bitcoin/debian/bitcoin.install
new file mode 100644
index 00000000..e986b075
--- /dev/null
+++ b/contrib/backends/bitcoin/debian/bitcoin.install
@@ -0,0 +1,2 @@
+bitcoin/* /opt/coins/nodes/bitcoin
+bitcoin.conf /opt/coins/nodes/bitcoin
diff --git a/contrib/backends/bitcoin/debian/bitcoin-btc.logrotate b/contrib/backends/bitcoin/debian/bitcoin.logrotate
similarity index 57%
rename from contrib/backends/bitcoin/debian/bitcoin-btc.logrotate
rename to contrib/backends/bitcoin/debian/bitcoin.logrotate
index 0b571179..a6f9c50a 100644
--- a/contrib/backends/bitcoin/debian/bitcoin-btc.logrotate
+++ b/contrib/backends/bitcoin/debian/bitcoin.logrotate
@@ -1,5 +1,5 @@
-/opt/coins/data/btc/bitcoin/debug.log
-/opt/coins/data/btc/bitcoin/db.log
+/opt/coins/data/bitcoin/backend/debug.log
+/opt/coins/data/bitcoin/backend/db.log
 {
         rotate 7
         daily
diff --git a/contrib/backends/bitcoin/debian/bitcoin-btc.postinst b/contrib/backends/bitcoin/debian/bitcoin.postinst
similarity index 58%
rename from contrib/backends/bitcoin/debian/bitcoin-btc.postinst
rename to contrib/backends/bitcoin/debian/bitcoin.postinst
index 495f0345..d1435dc1 100644
--- a/contrib/backends/bitcoin/debian/bitcoin-btc.postinst
+++ b/contrib/backends/bitcoin/debian/bitcoin.postinst
@@ -9,9 +9,9 @@ case "$1" in
         useradd --system -M -U bitcoin -s /bin/false
     fi
 
-    if [ "$(stat -c '%U' /opt/coins/data/btc/bitcoin)" != "bitcoin" ]
+    if [ "$(stat -c '%U' /opt/coins/data/bitcoin/backend)" != "bitcoin" ]
     then
-        chown -R bitcoin:bitcoin /opt/coins/data/btc/bitcoin
+        chown -R bitcoin:bitcoin /opt/coins/data/bitcoin/backend
     fi
   ;;
 
diff --git a/contrib/backends/bitcoin/debian/bitcoin-btc.service b/contrib/backends/bitcoin/debian/bitcoin.service
similarity index 79%
rename from contrib/backends/bitcoin/debian/bitcoin-btc.service
rename to contrib/backends/bitcoin/debian/bitcoin.service
index c3ca491f..19281f2a 100644
--- a/contrib/backends/bitcoin/debian/bitcoin-btc.service
+++ b/contrib/backends/bitcoin/debian/bitcoin.service
@@ -1,23 +1,23 @@
 # It is not recommended to modify this file in-place, because it will
 # be overwritten during package upgrades. If you want to add further
 # options or overwrite existing ones then use
-# $ systemctl edit bitcoin-btc.service
+# $ systemctl edit bitcoin.service
 # See "man systemd.service" for details.
 
 # Note that almost all daemon options could be specified in
-# /opt/coins/nodes/bitcoin/btc/btc.conf
+# /opt/coins/nodes/bitcoin/bitcoin.conf
 
 [Unit]
 Description=Bitcoin daemon (mainnet)
 After=network.target
 
 [Service]
-ExecStart=/opt/coins/nodes/bitcoin/btc/bin/bitcoind -datadir=/opt/coins/data/btc/bitcoin -conf=/opt/coins/nodes/bitcoin/btc/btc.conf -pid=/run/bitcoind/btc.pid
+ExecStart=/opt/coins/nodes/bitcoin/bin/bitcoind -datadir=/opt/coins/data/bitcoin/backend -conf=/opt/coins/nodes/bitcoin/bitcoin.conf -pid=/run/bitcoind/bitcoin.pid
 # Creates /run/bitcoind owned by bitcoin
 RuntimeDirectory=bitcoind
 User=bitcoin
 Type=forking
-PIDFile=/run/bitcoind/btc.pid
+PIDFile=/run/bitcoind/bitcoin.pid
 Restart=on-failure
 
 # Resource limits
diff --git a/contrib/backends/bitcoin/debian/changelog b/contrib/backends/bitcoin/debian/changelog
index e61dd8f0..d654e716 100644
--- a/contrib/backends/bitcoin/debian/changelog
+++ b/contrib/backends/bitcoin/debian/changelog
@@ -1,3 +1,9 @@
+bitcoin (0.16.0-satoshilabs6) unstable; urgency=medium
+
+  * Rename packages and directories
+
+ -- Martin Bohm <martin.bohm@satoshilabs.com>  Wed, 06 Jun 2018 11:12:13 +0200
+
 bitcoin (0.16.0-satoshilabs5) unstable; urgency=medium
 
   * Added deprecatedrpc=estimatefee option
diff --git a/contrib/backends/bitcoin/debian/control b/contrib/backends/bitcoin/debian/control
index b53f5d77..788bc474 100644
--- a/contrib/backends/bitcoin/debian/control
+++ b/contrib/backends/bitcoin/debian/control
@@ -5,7 +5,7 @@ Maintainer: jakub.matys@satoshilabs.com
 Build-Depends: debhelper, wget, tar, gzip, make, dh-systemd, dh-exec
 Standards-Version: 3.9.5
 
-Package: bitcoin-btc
+Package: bitcoin
 Architecture: amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}, logrotate
 Description: Satoshilabs packaged bitcoin server