diff --git a/contrib/README b/contrib/README
index e4219347d7..21b4aa13cc 100644
--- a/contrib/README
+++ b/contrib/README
@@ -1,10 +1,10 @@
-This folder contains willie.service and willie.cfg designed to be distributed by 3rd party distrubtions such as Fedora Project or Arch Linux.
+This folder contains sopel.service and sopel.cfg designed to be distributed by 3rd party distrubtions such as Fedora Project or Arch Linux.
 
-willie.cfg is a default configuration file for willie, that assumes the OS is new enough to have /run and /usr/lib/tmpfiles.d
+sopel.cfg is a default configuration file for sopel, that assumes the OS is new enough to have /run and /usr/lib/tmpfiles.d
 
-willie.service is a systemd service file that assumes you are using a rather recent Willie and has no multiple instance support (TODO). It also assumes that the system has a special user named willie designated for running the bot and this user has access to /run/willie (should be setup by willie.conf in /usr/lib/tmpfiles.d), /var/log/willie and /var/lib/willie
+sopel.service is a systemd service file that assumes you are using a rather recent Willie and has no multiple instance support (TODO). It also assumes that the system has a special user named sopel designated for running the bot and this user has access to /run/sopel (should be setup by sopel.conf in /usr/lib/tmpfiles.d), /var/log/sopel and /var/lib/sopel
 
 Default installation paths:
- willie.cfg	/etc
- willie.conf	/usr/lib/tmpfiles.d
- willie.service	/usr/lib/systemd/system
+ sopel.cfg	/etc
+ sopel.conf	/usr/lib/tmpfiles.d
+ sopel.service	/usr/lib/systemd/system
diff --git a/contrib/willie.cfg b/contrib/sopel.cfg
similarity index 51%
rename from contrib/willie.cfg
rename to contrib/sopel.cfg
index 7e5a3cc40c..f99eb68b9b 100644
--- a/contrib/willie.cfg
+++ b/contrib/sopel.cfg
@@ -1,24 +1,24 @@
-#Default willie configuration file for Fedora
+#Default sopel configuration file for Fedora
 #For information related to possible configuration values see
-# https://github.com/embolalia/willie/wiki/Core-configuration-settings
-# https://github.com/embolalia/willie/wiki/Module-Configuration
+# https://github.com/sopel-irc/sopel/wiki/Core-configuration-settings
+# https://github.com/sopel-irc/sopel/wiki/Module-Configuration
 #
 #IMPORTANT NOTE!
 #You must delete the not_configured line in order for the bot to work,
 # otherwise it will refuse to start.
 [core]
-nick=willie
+nick=sopel
 not_configured=True
 host=chat.freenode.net
 port=6697
 use_ssl=True
 verify_ssl=True
 owner=
-logdir=/var/log/willie
-pid_dir=/run/willie
-homedir=/var/lib/willie
+logdir=/var/log/sopel
+pid_dir=/run/sopel
+homedir=/var/lib/sopel
 
 [db]
 userdb_type='sqlite'
-userdb_file='/var/lib/willie/user.db
+userdb_file='/var/lib/sopel/user.db
 
diff --git a/contrib/sopel.conf b/contrib/sopel.conf
new file mode 100644
index 0000000000..bbff2ae1e3
--- /dev/null
+++ b/contrib/sopel.conf
@@ -0,0 +1,2 @@
+# Sopel temporary directory setup
+d /run/sopel 0755 sopel sopel -
diff --git a/contrib/willie.conf b/contrib/willie.conf
deleted file mode 100644
index b97cc8e868..0000000000
--- a/contrib/willie.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Willie tmporary directory setup
-d /run/willie 0755 willie willie -