diff --git a/scripts/resources/deb/copyright b/scripts/resources/deb/copyright
index d11b7847..cd72f825 100644
--- a/scripts/resources/deb/copyright
+++ b/scripts/resources/deb/copyright
@@ -1,5 +1,5 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: tachidesk-server
+Upstream-Name: suwayomi-server
 Upstream-Contact: https://discord.gg/DDZdqZWaHA
 Source: https://github.com/Suwayomi/Suwayomi-Server
 
diff --git a/scripts/resources/pkg/suwayomi-launcher.desktop b/scripts/resources/pkg/suwayomi-launcher.desktop
index 3a076d85..6f31dc32 100644
--- a/scripts/resources/pkg/suwayomi-launcher.desktop
+++ b/scripts/resources/pkg/suwayomi-launcher.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Name=Suwayomi-Launcher
 Comment=Manga Reader
-Exec=/usr/bin/java -jar /usr/share/java/tachidesk-server/Suwayomi-Launcher.jar "\\$@"
-Icon=tachidesk-server
+Exec=/usr/bin/java -jar /usr/share/java/suwayomi-server/Suwayomi-Launcher.jar "\\$@"
+Icon=suwayomi-server
 Terminal=false
 Categories=Network;
diff --git a/scripts/resources/pkg/suwayomi-launcher.sh b/scripts/resources/pkg/suwayomi-launcher.sh
index 81967d97..9250d189 100644
--- a/scripts/resources/pkg/suwayomi-launcher.sh
+++ b/scripts/resources/pkg/suwayomi-launcher.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec /usr/bin/java -jar /usr/share/java/tachidesk-server/Suwayomi-Launcher.jar
+exec /usr/bin/java -jar /usr/share/java/suwayomi-server/Suwayomi-Launcher.jar
diff --git a/scripts/resources/pkg/suwayomi-server.desktop b/scripts/resources/pkg/suwayomi-server.desktop
index 71748e2f..4b6ca31a 100644
--- a/scripts/resources/pkg/suwayomi-server.desktop
+++ b/scripts/resources/pkg/suwayomi-server.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Name=Suwayomi-Server
 Comment=Manga Reader
-Exec=/usr/bin/java -jar /usr/share/java/tachidesk-server/bin/Suwayomi-Server.jar "\\$@"
+Exec=/usr/bin/java -jar /usr/share/java/suwayomi-server/bin/Suwayomi-Server.jar "\\$@"
 Icon=suwayomi-server
 Terminal=false
 Categories=Network;
diff --git a/scripts/resources/pkg/suwayomi-server.sh b/scripts/resources/pkg/suwayomi-server.sh
index cf117fa3..c4e093f5 100644
--- a/scripts/resources/pkg/suwayomi-server.sh
+++ b/scripts/resources/pkg/suwayomi-server.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec /usr/bin/java -jar /usr/share/java/tachidesk-server/bin/Suwayomi-Server.jar
+exec /usr/bin/java -jar /usr/share/java/suwayomi-server/bin/Suwayomi-Server.jar
diff --git a/scripts/resources/pkg/systemd/suwayomi-server.service b/scripts/resources/pkg/systemd/suwayomi-server.service
index 84b65bdc..1020800e 100644
--- a/scripts/resources/pkg/systemd/suwayomi-server.service
+++ b/scripts/resources/pkg/systemd/suwayomi-server.service
@@ -5,12 +5,12 @@ After=network-online.target
 
 [Service]
 Type=simple
-User=suwayomi
-Group=suwayomi
-SyslogIdentifier=suwayomi
+User=suwayomi-server
+Group=suwayomi-server
+SyslogIdentifier=suwayomi-server
 
 EnvironmentFile=/etc/suwayomi/server.conf
-ExecStart=/usr/bin/java $JAVA_ARGS -Dsuwayomi.tachidesk.config.server.rootDir="${TACHIDESK_ROOT_DIR}" -jar /usr/share/java/tachidesk-server/bin/Suwayomi-Server.jar
+ExecStart=/usr/bin/java $JAVA_ARGS -Dsuwayomi.tachidesk.config.server.rootDir="${TACHIDESK_ROOT_DIR}" -jar /usr/share/java/suwayomi-server/bin/Suwayomi-Server.jar
 Restart=on-failure
 
 ProtectSystem=full
diff --git a/scripts/resources/pkg/systemd/suwayomi-server.sysusers b/scripts/resources/pkg/systemd/suwayomi-server.sysusers
index 8af5d493..7b1c9686 100644
--- a/scripts/resources/pkg/systemd/suwayomi-server.sysusers
+++ b/scripts/resources/pkg/systemd/suwayomi-server.sysusers
@@ -1,2 +1,2 @@
-#Type    Name       ID    GECOS                                 Home directory              Shell
-u        suwayomi   -     "Suwayomi Manga Server"               /var/lib/suwayomi
+#Type    Name              ID    GECOS                                 Home directory              Shell
+u        suwayomi-server   -     "Suwayomi Manga Server"               /var/lib/suwayomi
diff --git a/scripts/resources/pkg/systemd/suwayomi-server.tmpfiles b/scripts/resources/pkg/systemd/suwayomi-server.tmpfiles
index 353cac50..1b7c5a14 100644
--- a/scripts/resources/pkg/systemd/suwayomi-server.tmpfiles
+++ b/scripts/resources/pkg/systemd/suwayomi-server.tmpfiles
@@ -1,2 +1,2 @@
-#Type  Path                Mode  User       Group      Age  Argument
-d      /var/lib/suwayomi   0755  suwayomi   suwayomi
+#Type  Path                Mode  User              Group             Age  Argument
+d      /var/lib/suwayomi   0755  suwayomi-server   suwayomi-server