diff --git a/Containerfile b/Containerfile
index ac977210..f95d29b2 100644
--- a/Containerfile
+++ b/Containerfile
@@ -181,8 +181,8 @@ RUN rm /usr/share/applications/shredder.desktop && \
     systemctl enable displaylink.service && \
     systemctl enable btrfs-dedup@var-home.timer && \
     systemctl enable input-remapper.service && \
-    systemctl unmask flatpak-system-install.service && \
-    systemctl enable flatpak-system-install.service && \
+    systemctl unmask bazzite-flatpak-manager.service && \
+    systemctl enable bazzite-flatpak-manager.service && \
     systemctl disable rpm-ostreed-automatic.timer && \
     systemctl --global enable ublue-update.timer && \
     systemctl enable bazzite-hardware-setup.service && \
diff --git a/system_files/desktop/shared/etc/systemd/system/flatpak-system-install.service b/system_files/desktop/shared/etc/systemd/system/bazzite-flatpak-manager.service
similarity index 72%
rename from system_files/desktop/shared/etc/systemd/system/flatpak-system-install.service
rename to system_files/desktop/shared/etc/systemd/system/bazzite-flatpak-manager.service
index 6f2aba6c..1d205976 100644
--- a/system_files/desktop/shared/etc/systemd/system/flatpak-system-install.service
+++ b/system_files/desktop/shared/etc/systemd/system/bazzite-flatpak-manager.service
@@ -1,12 +1,12 @@
 [Unit]
-Description=Install System Flatpak on boot
+Description=Manage system flatpaks
 Documentation=https://github.com/ublue-os/endlish-oesque/issues/10
 Wants=network-online.target
 After=network-online.target bazzite-hardware-setup.service
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/ublue-flatpak-system-install
+ExecStart=/usr/bin/bazzite-flatpak-manager
 Restart=on-failure
 
 [Install]
diff --git a/system_files/desktop/shared/usr/bin/ublue-flatpak-system-install b/system_files/desktop/shared/usr/bin/bazzite-flatpak-manager
similarity index 80%
rename from system_files/desktop/shared/usr/bin/ublue-flatpak-system-install
rename to system_files/desktop/shared/usr/bin/bazzite-flatpak-manager
index 37e85e9d..89ffa3ac 100755
--- a/system_files/desktop/shared/usr/bin/ublue-flatpak-system-install
+++ b/system_files/desktop/shared/usr/bin/bazzite-flatpak-manager
@@ -2,13 +2,13 @@
 source /etc/default/bazzite
 
 # Script Version
-FSI_VER=1
-FSI_VER_FILE="/etc/bazzite/fsi_version"
-FSI_VER_RAN=$(cat $FSI_VER_FILE)
+VER=1
+VER_FILE="/etc/bazzite/flatpak_manager_version"
+VER_RAN=$(cat $VER_FILE)
 
 # Run script if updated
-if [[ -f $FSI_VER_FILE && $FSI_VER = $FSI_VER_RAN ]]; then
-  echo "Flatpak system installation has already ran. Exiting..."
+if [[ -f $VER_FILE && $VER = $VER_RAN ]]; then
+  echo "Flatpak manager v$VER has already ran. Exiting..."
   exit 0
 fi
 
@@ -43,4 +43,4 @@ if [[ -n $REMOVE_LIST ]]; then
 fi
 
 mkdir -p /etc/bazzite
-echo $FSI_VER > $FSI_VER_FILE
+echo $VER > $VER_FILE