diff --git a/conf/__APP__-beat.service b/conf/bookwyrm-beat.service
similarity index 100%
rename from conf/__APP__-beat.service
rename to conf/bookwyrm-beat.service
diff --git a/conf/__APP__-server.service b/conf/bookwyrm-server.service
similarity index 100%
rename from conf/__APP__-server.service
rename to conf/bookwyrm-server.service
diff --git a/conf/__APP__-worker.service b/conf/bookwyrm-worker.service
similarity index 100%
rename from conf/__APP__-worker.service
rename to conf/bookwyrm-worker.service
diff --git a/conf/__APP__.target b/conf/bookwyrm.target
similarity index 100%
rename from conf/__APP__.target
rename to conf/bookwyrm.target
diff --git a/scripts/install b/scripts/install
index 5131411..0279e2d 100755
--- a/scripts/install
+++ b/scripts/install
@@ -75,12 +75,12 @@ chown -R $app:www-data /var/log/$app/
 #=================================================
 ynh_script_progression --message="Configuring a systemd service..." --weight=1
 
-ynh_add_config --template="../conf/$app.target" --destination="/etc/systemd/system/$app.target"
+ynh_add_config --template="../conf/bookwyrm.target" --destination="/etc/systemd/system/$app.target"
 
 # Create a dedicated systemd config
-ynh_add_systemd_config --service="$app-server" --template="$app-server.service"
-ynh_add_systemd_config --service="$app-worker" --template="$app-worker.service"
-ynh_add_systemd_config --service="$app-beat"   --template="$app-beat.service"
+ynh_add_systemd_config --service="$app-server" --template="bookwyrm-server.service"
+ynh_add_systemd_config --service="$app-worker" --template="bookwyrm-worker.service"
+ynh_add_systemd_config --service="$app-beat"   --template="bookwyrm-beat.service"
 
 #=================================================
 # GENERIC FINALIZATION
diff --git a/scripts/upgrade b/scripts/upgrade
index c0566f6..cc961c9 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -92,9 +92,9 @@ ynh_script_progression --message="Upgrading systemd configuration..." --weight=1
 ynh_add_config --template="../conf/bookwyrm.target" --destination="/etc/systemd/system/$app.target"
 
 # Create a dedicated systemd config
-ynh_add_systemd_config --service="$app-server" --template="$app-server.service"
-ynh_add_systemd_config --service="$app-worker" --template="$app-worker.service"
-ynh_add_systemd_config --service="$app-beat"   --template="$app-beat.service"
+ynh_add_systemd_config --service="$app-server" --template="bookwyrm-server.service"
+ynh_add_systemd_config --service="$app-worker" --template="bookwyrm-worker.service"
+ynh_add_systemd_config --service="$app-beat"   --template="bookwyrm-beat.service"
 
 #=================================================
 # GENERIC FINALIZATION