diff --git a/utils/conf/bitmonerod.conf b/utils/conf/bitmonerod.conf
deleted file mode 100644
index 64a02741..00000000
--- a/utils/conf/bitmonerod.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# Configuration for bitmonerod
-# Syntax: any command line option may be specified as 'clioptionname=value'.
-# See 'bitmonerod --help' for all available options.
-
-data-dir=/var/lib/bitmonero
-log-file=/var/log/bitmonero/bitmonero.log
-log-level=0
diff --git a/utils/conf/monerod.conf b/utils/conf/monerod.conf
new file mode 100644
index 00000000..9b391dfa
--- /dev/null
+++ b/utils/conf/monerod.conf
@@ -0,0 +1,7 @@
+# Configuration for monerod
+# Syntax: any command line option may be specified as 'clioptionname=value'.
+# See 'monerod --help' for all available options.
+
+data-dir=/var/lib/monero
+log-file=/var/log/monero/monero.log
+log-level=0
diff --git a/utils/systemd/bitmonerod.service b/utils/systemd/monerod.service
similarity index 68%
rename from utils/systemd/bitmonerod.service
rename to utils/systemd/monerod.service
index da012c4e..182878eb 100644
--- a/utils/systemd/bitmonerod.service
+++ b/utils/systemd/monerod.service
@@ -1,16 +1,16 @@
 [Unit]
-Description=Monero cryptocurrency node
+Description=Monero Full Node
 After=network.target
 
 [Service]
-User=bitmonero
-Group=bitmonero
+User=monero
+Group=monero
 WorkingDirectory=~
 
 Type=forking
-ExecStart=/usr/bin/bitmonerod --config-file /etc/bitmonerod.conf --detach
+ExecStart=/usr/bin/monerod --config-file /etc/monerod.conf --detach
 
-# This is necessary because bitmonerod does not yet support
+# This is necessary because monerod does not yet support
 # writing a PID file, which means systemd tries to guess the PID
 # by default, but it guesses wrong (sometimes, depending on
 # random timing of events), because the daemon forks twice.