diff --git a/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ApplicationRootDir.kt b/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ApplicationRootDir.kt
index c2eecdb..83b68c2 100644
--- a/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ApplicationRootDir.kt
+++ b/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ApplicationRootDir.kt
@@ -12,7 +12,7 @@ import net.harawata.appdirs.AppDirsFactory
 val ApplicationRootDir: String
     get(): String {
         return System.getProperty(
-                "suwayomi.tachidesk.rootDir",
+                "suwayomi.server.rootDir",
                 AppDirsFactory.getInstance().getUserDataDir("Tachidesk", null, null)
         )
     }
\ No newline at end of file
diff --git a/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/Logging.kt b/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/Logging.kt
index efb6398..0c6d5f1 100644
--- a/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/Logging.kt
+++ b/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/Logging.kt
@@ -17,4 +17,4 @@ fun setLogLevel(level: Level) {
 }
 
 fun debugLogsEnabled(config: Config)
-    = System.getProperty("suwayomi.tachidesk.debugLogsEnabled", config.getString("server.debugLogsEnabled")).toBoolean()
\ No newline at end of file
+    = System.getProperty("suwayomi.server.debugLogsEnabled", config.getString("server.debugLogsEnabled")).toBoolean()
\ No newline at end of file
diff --git a/scripts/resources/Tachidesk Debug Launcher.bat b/scripts/resources/Tachidesk Debug Launcher.bat
index f6e86c3..2705add 100644
--- a/scripts/resources/Tachidesk Debug Launcher.bat	
+++ b/scripts/resources/Tachidesk Debug Launcher.bat	
@@ -1 +1 @@
-jre\bin\java -Dsuwayomi.tachidesk.debugLogsEnabled=true -jar  Tachidesk.jar
+jre\bin\java -Dsuwayomi.server.debugLogsEnabled=true -jar  Tachidesk.jar
diff --git a/scripts/resources/Tachidesk Electron Launcher.bat b/scripts/resources/Tachidesk Electron Launcher.bat
index 33defed..7c24329 100644
--- a/scripts/resources/Tachidesk Electron Launcher.bat	
+++ b/scripts/resources/Tachidesk Electron Launcher.bat	
@@ -1 +1 @@
-jre\bin\javaw "-Dsuwayomi.tachidesk.webInterface=electron" "-Dsuwayomi.tachidesk.electronPath=electron/electron.exe" -jar Tachidesk.jar
+jre\bin\javaw "-Dsuwayomi.server.webInterface=electron" "-Dsuwayomi.server.electronPath=electron/electron.exe" -jar Tachidesk.jar
diff --git a/server/src/main/kotlin/suwayomi/server/util/Browser.kt b/server/src/main/kotlin/suwayomi/server/util/Browser.kt
index 3b4b501..8a9e4ad 100644
--- a/server/src/main/kotlin/suwayomi/server/util/Browser.kt
+++ b/server/src/main/kotlin/suwayomi/server/util/Browser.kt
@@ -18,11 +18,11 @@ object Browser {
 
     fun openInBrowser() {
 
-        val openInElectron = System.getProperty("suwayomi.tachidesk.webInterface")?.equals("electron")
+        val openInElectron = System.getProperty("suwayomi.server.webInterface")?.equals("electron")
 
         if (openInElectron == true) {
             try {
-                val electronPath = System.getProperty("suwayomi.tachidesk.electronPath")!!
+                val electronPath = System.getProperty("suwayomi.server.electronPath")!!
                 electronInstances.add(ProcessBuilder(electronPath, appBaseUrl).start())
             } catch (e: Throwable) { // cover both java.lang.Exception and java.lang.Error
                 e.printStackTrace()