diff --git a/setup/start.sh b/setup/start.sh
index ce94b0367..5a7bb60ed 100755
--- a/setup/start.sh
+++ b/setup/start.sh
@@ -99,7 +99,7 @@ fi
 
 if [[ ! -d "${DATA_DIR}" ]]; then
     echo "==> Mounting loopback btrfs"
-    truncate -s "8192m" "${DATA_FILE}" # 8gb start (this will get resized dynamically by cloudron-system-setup.service)
+    truncate -s "8192m" "${DATA_FILE}" # 8gb start (this will get resized dynamically by cloudron-resize-fs.service)
     mkfs.btrfs -L UserDataHome "${DATA_FILE}"
     mkdir -p "${DATA_DIR}"
     mount -t btrfs -o loop,nosuid "${DATA_FILE}" ${DATA_DIR}
diff --git a/setup/start/cloudron-system-setup.sh b/setup/start/cloudron-resize-fs.sh
similarity index 100%
rename from setup/start/cloudron-system-setup.sh
rename to setup/start/cloudron-resize-fs.sh
diff --git a/setup/start/systemd/box.service b/setup/start/systemd/box.service
index 61b3c3d5f..ca90b25a6 100644
--- a/setup/start/systemd/box.service
+++ b/setup/start/systemd/box.service
@@ -5,8 +5,8 @@ StopWhenUnneeded=true
 ; journald crashes result in a EPIPE in node. Cannot ignore it as it results in loss of logs.
 BindsTo=systemd-journald.service
 After=mysql.service
-; As cloudron-system-setup is a one-shot, the Wants= automatically ensures that the service *finishes*
-Wants=cloudron-system-setup.service
+; As cloudron-resize-fs is a one-shot, the Wants= automatically ensures that the service *finishes*
+Wants=cloudron-resize-fs.service
 
 [Service]
 Type=idle
diff --git a/setup/start/systemd/cloudron-system-setup.service b/setup/start/systemd/cloudron-resize-fs.service
similarity index 79%
rename from setup/start/systemd/cloudron-system-setup.service
rename to setup/start/systemd/cloudron-resize-fs.service
index d626609ba..26b431929 100644
--- a/setup/start/systemd/cloudron-system-setup.service
+++ b/setup/start/systemd/cloudron-resize-fs.service
@@ -3,13 +3,13 @@
 # On ubuntu ec2 we use cloud-init https://wiki.archlinux.org/index.php/Cloud-init
 
 [Unit]
-Description=Box Setup
+Description=Cloudron FS Resizer
 Before=docker.service collectd.service mysql.service sshd.service nginx.service
 After=cloud-init.service
 
 [Service]
 Type=oneshot
-ExecStart="/home/yellowtent/box/setup/start/cloudron-system-setup.sh"
+ExecStart="/home/yellowtent/box/setup/start/cloudron-resize-fs.sh"
 RemainAfterExit=yes
 
 [Install]