diff --git a/.github/workflows/_rust.yml b/.github/workflows/_rust.yml
index 97f78ac07..f22851c8d 100644
--- a/.github/workflows/_rust.yml
+++ b/.github/workflows/_rust.yml
@@ -28,7 +28,7 @@ jobs:
           - runs-on: macos-14
             packages: -p connlib-client-apple -p snownet
           - runs-on: windows-2022
-            packages: -p connlib-client-shared -p firezone-windows-client -p snownet
+            packages: -p connlib-client-shared -p firezone-gui-client -p snownet
     runs-on: ${{ matrix.runs-on }}
     steps:
       - uses: actions/checkout@v4
@@ -60,9 +60,9 @@ jobs:
           - runs-on: macos-14
             packages: -p connlib-client-apple -p snownet
           - runs-on: windows-2019
-            packages: -p firezone-windows-client -p connlib-client-shared -p snownet
+            packages: -p firezone-gui-client -p connlib-client-shared -p snownet
           - runs-on: windows-2022
-            packages: -p firezone-windows-client -p connlib-client-shared -p snownet
+            packages: -p firezone-gui-client -p connlib-client-shared -p snownet
     runs-on: ${{ matrix.runs-on }}
     steps:
       - uses: actions/checkout@v4
@@ -87,7 +87,7 @@ jobs:
     runs-on: ${{ matrix.runs-on }}
     defaults:
       run:
-        working-directory: ./rust/windows-client
+        working-directory: ./rust/gui-client
     env:
       CONNLIB_LOG_UPLOAD_INTERVAL_SECS: 300
       # The Windows client ignores RUST_LOG because it uses a settings file instead
@@ -107,9 +107,9 @@ jobs:
       - name: Compile Tailwind
         run: pnpm tailwindcss -i src/input.css -o src/output.css
       - name: Build client
-        run: cargo build -p firezone-windows-client
+        run: cargo build -p firezone-gui-client
       - name: Run smoke test
-        run: cargo run -p firezone-windows-client -- smoke-test
+        run: cargo run -p firezone-gui-client -- smoke-test
       - name: Test that the crash handler produces a crash dump
         run: bash scripts/crash-handling-smoke-test.bash
 
@@ -119,7 +119,7 @@ jobs:
     runs-on: ${{ matrix.runs-on }}
     defaults:
       run:
-        working-directory: ./rust/windows-client
+        working-directory: ./rust/gui-client
     strategy:
       fail-fast: false
       matrix:
@@ -127,11 +127,8 @@ jobs:
           # TODO
           # - ubuntu-20.04
           - windows-2019
-        include:
-          # - runs-on: ubuntu-20.04
-          - runs-on: windows-2019
     env:
-      BINARY_DEST_PATH: firezone-windows-client
+      BINARY_DEST_PATH: firezone-gui-client
       CONNLIB_LOG_UPLOAD_INTERVAL_SECS: 300
     steps:
       - uses: actions/checkout@v4
@@ -150,7 +147,7 @@ jobs:
           # In release mode the name comes from tauri.conf.json
           cp "../target/release/Firezone.exe" "${{ env.BINARY_DEST_PATH }}-x64.exe"
           cp "../target/release/bundle/msi/*.msi" "${{ env.BINARY_DEST_PATH }}-x64.msi"
-          cp "../target/release/firezone_windows_client.pdb" "${{ env.BINARY_DEST_PATH }}-x64.pdb"
+          cp "../target/release/firezone_gui_client.pdb" "${{ env.BINARY_DEST_PATH }}-x64.pdb"
 
           Get-FileHash ${{ env.BINARY_DEST_PATH }}-x64.exe -Algorithm SHA256 | Select-Object Hash > ${{ env.BINARY_DEST_PATH }}-x64.exe.sha256sum.txt
           Get-FileHash ${{ env.BINARY_DEST_PATH }}-x64.msi -Algorithm SHA256 | Select-Object Hash > ${{ env.BINARY_DEST_PATH }}-x64.msi.sha256sum.txt
@@ -164,21 +161,21 @@ jobs:
         with:
           name: ${{ env.BINARY_DEST_PATH }}-x64
           path: |
-            ${{ github.workspace }}/rust/windows-client/${{ env.BINARY_DEST_PATH }}-x64.exe
-            ${{ github.workspace }}/rust/windows-client/${{ env.BINARY_DEST_PATH }}-x64.exe.sha256sum.txt
+            ${{ github.workspace }}/rust/gui-client/${{ env.BINARY_DEST_PATH }}-x64.exe
+            ${{ github.workspace }}/rust/gui-client/${{ env.BINARY_DEST_PATH }}-x64.exe.sha256sum.txt
       - name: Save Windows MSI installer
         if: ${{ runner.os == 'Windows' }}
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.BINARY_DEST_PATH }}-x64-msi
           path: |
-            ${{ github.workspace }}/rust/windows-client/${{ env.BINARY_DEST_PATH }}-x64.msi
-            ${{ github.workspace }}/rust/windows-client/${{ env.BINARY_DEST_PATH }}-x64.msi.sha256sum.txt
+            ${{ github.workspace }}/rust/gui-client/${{ env.BINARY_DEST_PATH }}-x64.msi
+            ${{ github.workspace }}/rust/gui-client/${{ env.BINARY_DEST_PATH }}-x64.msi.sha256sum.txt
       - name: Save Windows debug symbols
         if: ${{ runner.os == 'Windows' }}
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.BINARY_DEST_PATH }}-x64-pdb
           path: |
-            ${{ github.workspace }}/rust/windows-client/${{ env.BINARY_DEST_PATH }}-x64.pdb
-            ${{ github.workspace }}/rust/windows-client/${{ env.BINARY_DEST_PATH }}-x64.pdb.sha256sum.txt
+            ${{ github.workspace }}/rust/gui-client/${{ env.BINARY_DEST_PATH }}-x64.pdb
+            ${{ github.workspace }}/rust/gui-client/${{ env.BINARY_DEST_PATH }}-x64.pdb.sha256sum.txt
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 7dc10dee7..f8b1e3fcd 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -243,23 +243,21 @@ jobs:
     runs-on: windows-2019
     defaults:
       run:
-        working-directory: ./rust/windows-client
+        working-directory: ./rust/gui-client
     strategy:
       fail-fast: false
       # The matrix is 1x1 to match the style of build-push-linux-release-artifacts
       # In the future we could try to cross-compile aarch64-windows here.
       matrix:
         name:
-          - package: firezone-windows-client
-            artifact: windows-client
+          - package: firezone-gui-client
+            artifact: gui-client
     env:
       BINARY_DEST_PATH: firezone-${{ matrix.name.artifact }}
       CONNLIB_LOG_UPLOAD_INTERVAL_SECS: 300
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-rust
-        with:
-          targets: x86_64-pc-windows-msvc
       - uses: ./.github/actions/setup-node
       - name: Install pnpm deps
         run: pnpm install
@@ -278,7 +276,7 @@ jobs:
         run: |
           # Upload Windows MSI
 
-          # This artifact name is tied to the update checker in `windows-client/src-tauri/src/client/updates.rs`
+          # This artifact name is tied to the update checker in `gui-client/src-tauri/src/client/updates.rs`
           gh release upload ${{ needs.update-release-draft.outputs.tag_name }} `
             ${{ env.BINARY_DEST_PATH }}-x64.msi `
             ${{ env.BINARY_DEST_PATH }}-x64.msi.sha256sum.txt `
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index bfa14aa44..c6c9f1767 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -1816,6 +1816,58 @@ dependencies = [
  "uuid",
 ]
 
+[[package]]
+name = "firezone-gui-client"
+version = "1.0.0"
+dependencies = [
+ "anyhow",
+ "arboard",
+ "arc-swap",
+ "bincode",
+ "chrono",
+ "clap",
+ "connlib-client-shared",
+ "connlib-shared",
+ "crash-handler",
+ "firezone-cli-utils",
+ "git-version",
+ "hex",
+ "hostname",
+ "ipconfig",
+ "keyring",
+ "known-folders",
+ "minidumper",
+ "native-dialog",
+ "output_vt100",
+ "rand 0.8.5",
+ "reqwest",
+ "ring",
+ "sadness-generator",
+ "secrecy",
+ "semver",
+ "serde",
+ "serde_json",
+ "subtle",
+ "tauri",
+ "tauri-build",
+ "tauri-runtime",
+ "tauri-utils",
+ "tauri-winrt-notification",
+ "thiserror",
+ "tokio",
+ "tracing",
+ "tracing-log 0.2.0",
+ "tracing-panic",
+ "tracing-subscriber",
+ "url",
+ "uuid",
+ "windows 0.52.0",
+ "windows-implement 0.52.0",
+ "winreg 0.52.0",
+ "wintun",
+ "zip",
+]
+
 [[package]]
 name = "firezone-linux-client"
 version = "1.0.0"
@@ -1922,58 +1974,6 @@ dependencies = [
  "wintun",
 ]
 
-[[package]]
-name = "firezone-windows-client"
-version = "1.0.0"
-dependencies = [
- "anyhow",
- "arboard",
- "arc-swap",
- "bincode",
- "chrono",
- "clap",
- "connlib-client-shared",
- "connlib-shared",
- "crash-handler",
- "firezone-cli-utils",
- "git-version",
- "hex",
- "hostname",
- "ipconfig",
- "keyring",
- "known-folders",
- "minidumper",
- "native-dialog",
- "output_vt100",
- "rand 0.8.5",
- "reqwest",
- "ring",
- "sadness-generator",
- "secrecy",
- "semver",
- "serde",
- "serde_json",
- "subtle",
- "tauri",
- "tauri-build",
- "tauri-runtime",
- "tauri-utils",
- "tauri-winrt-notification",
- "thiserror",
- "tokio",
- "tracing",
- "tracing-log 0.2.0",
- "tracing-panic",
- "tracing-subscriber",
- "url",
- "uuid",
- "windows 0.52.0",
- "windows-implement 0.52.0",
- "winreg 0.52.0",
- "wintun",
- "zip",
-]
-
 [[package]]
 name = "flate2"
 version = "1.0.28"
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
index b27bbe8d2..6fbe64a9b 100644
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -12,7 +12,7 @@ members = [
   "snownet-tests",
   "phoenix-channel",
   "relay",
-  "windows-client/src-tauri",
+  "gui-client/src-tauri",
 ]
 
 resolver = "2"
@@ -38,7 +38,7 @@ connlib-client-apple = { path = "connlib/clients/apple"}
 connlib-client-shared = { path = "connlib/clients/shared"}
 firezone-gateway = { path = "gateway"}
 firezone-linux-client = { path = "linux-client"}
-firezone-windows-client = { path = "windows-client/src-tauri"}
+firezone-gui-client = { path = "gui-client/src-tauri"}
 firezone-cli-utils = { path = "firezone-cli-utils"}
 snownet = { path = "connlib/snownet"}
 firezone-relay = { path = "relay"}
@@ -58,7 +58,7 @@ quinn-udp = { git = "https://github.com/conectado/quinn", branch = "main" }
 strip = true
 
 # Override build settings just for the Windows client, so we get a pdb
-[profile.release.package.firezone-windows-client]
+[profile.release.package.firezone-gui-client]
 # Generate debug symbols for the crash handler to use, even if the exe itself is optimized
 debug = "full"
 # Split out debug info from the exe. This is already default on Windows.
diff --git a/rust/windows-client/.gitignore b/rust/gui-client/.gitignore
similarity index 100%
rename from rust/windows-client/.gitignore
rename to rust/gui-client/.gitignore
diff --git a/rust/windows-client/README.md b/rust/gui-client/README.md
similarity index 100%
rename from rust/windows-client/README.md
rename to rust/gui-client/README.md
diff --git a/rust/windows-client/build-debug.bat b/rust/gui-client/build-debug.bat
similarity index 100%
rename from rust/windows-client/build-debug.bat
rename to rust/gui-client/build-debug.bat
diff --git a/rust/windows-client/build.bat b/rust/gui-client/build.bat
similarity index 100%
rename from rust/windows-client/build.bat
rename to rust/gui-client/build.bat
diff --git a/rust/windows-client/build.sh b/rust/gui-client/build.sh
similarity index 100%
rename from rust/windows-client/build.sh
rename to rust/gui-client/build.sh
diff --git a/rust/windows-client/dev.bat b/rust/gui-client/dev.bat
similarity index 100%
rename from rust/windows-client/dev.bat
rename to rust/gui-client/dev.bat
diff --git a/rust/windows-client/dev.sh b/rust/gui-client/dev.sh
similarity index 100%
rename from rust/windows-client/dev.sh
rename to rust/gui-client/dev.sh
diff --git a/rust/windows-client/docs/manual_testing.md b/rust/gui-client/docs/manual_testing.md
similarity index 98%
rename from rust/windows-client/docs/manual_testing.md
rename to rust/gui-client/docs/manual_testing.md
index 7b24df1b4..341de7eaa 100644
--- a/rust/windows-client/docs/manual_testing.md
+++ b/rust/gui-client/docs/manual_testing.md
@@ -1,4 +1,4 @@
-How to run manual tests of `firezone-windows-client`
+How to run manual tests of `firezone-gui-client`
 
 Using [Given-when-then syntax](https://en.wikipedia.org/wiki/Given-When-Then)
 
@@ -6,7 +6,7 @@ Using [Given-when-then syntax](https://en.wikipedia.org/wiki/Given-When-Then)
 
 The client may be running or not running.
 
-Only one instance of the client may run at a time per Windows device. If two users are logged in at once, starting a 2nd instance results in undefined behavior.
+Only one instance of the client may run at a time per system. If two users are logged in at once, starting a 2nd instance results in undefined behavior.
 
 If the client is running, the GUI may be in a "signed out", "signed in", or "signing in" state.
 
diff --git a/rust/windows-client/docs/vm_testing.md b/rust/gui-client/docs/vm_testing.md
similarity index 100%
rename from rust/windows-client/docs/vm_testing.md
rename to rust/gui-client/docs/vm_testing.md
diff --git a/rust/windows-client/package.json b/rust/gui-client/package.json
similarity index 100%
rename from rust/windows-client/package.json
rename to rust/gui-client/package.json
diff --git a/rust/windows-client/pnpm-lock.yaml b/rust/gui-client/pnpm-lock.yaml
similarity index 100%
rename from rust/windows-client/pnpm-lock.yaml
rename to rust/gui-client/pnpm-lock.yaml
diff --git a/rust/windows-client/scripts/crash-handling-smoke-test.bash b/rust/gui-client/scripts/crash-handling-smoke-test.bash
similarity index 87%
rename from rust/windows-client/scripts/crash-handling-smoke-test.bash
rename to rust/gui-client/scripts/crash-handling-smoke-test.bash
index e9a59577f..ad8a5d2fa 100644
--- a/rust/windows-client/scripts/crash-handling-smoke-test.bash
+++ b/rust/gui-client/scripts/crash-handling-smoke-test.bash
@@ -9,7 +9,7 @@ DUMP_PATH="$LOCALAPPDATA/$BUNDLE_ID/data/logs/last_crash.dmp"
 rm -f "$DUMP_PATH"
 
 # Ignore the exit code, this is supposed to crash
-cargo run -p firezone-windows-client -- --crash || true
+cargo run -p firezone-gui-client -- --crash || true
 
 # Fail if the crash file wasn't written
 stat "$DUMP_PATH"
diff --git a/rust/windows-client/src-tauri/.gitignore b/rust/gui-client/src-tauri/.gitignore
similarity index 100%
rename from rust/windows-client/src-tauri/.gitignore
rename to rust/gui-client/src-tauri/.gitignore
diff --git a/rust/windows-client/src-tauri/Cargo.toml b/rust/gui-client/src-tauri/Cargo.toml
similarity index 98%
rename from rust/windows-client/src-tauri/Cargo.toml
rename to rust/gui-client/src-tauri/Cargo.toml
index e59e1770c..0333f1f95 100644
--- a/rust/windows-client/src-tauri/Cargo.toml
+++ b/rust/gui-client/src-tauri/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "firezone-windows-client"
+name = "firezone-gui-client"
 # mark:automatic-version
 version = "1.0.0"
 description = "Firezone"
diff --git a/rust/windows-client/src-tauri/build.rs b/rust/gui-client/src-tauri/build.rs
similarity index 100%
rename from rust/windows-client/src-tauri/build.rs
rename to rust/gui-client/src-tauri/build.rs
diff --git a/rust/windows-client/src-tauri/icons/128x128.png b/rust/gui-client/src-tauri/icons/128x128.png
similarity index 100%
rename from rust/windows-client/src-tauri/icons/128x128.png
rename to rust/gui-client/src-tauri/icons/128x128.png
diff --git a/rust/windows-client/src-tauri/icons/128x128@2x.png b/rust/gui-client/src-tauri/icons/128x128@2x.png
similarity index 100%
rename from rust/windows-client/src-tauri/icons/128x128@2x.png
rename to rust/gui-client/src-tauri/icons/128x128@2x.png
diff --git a/rust/windows-client/src-tauri/icons/32x32.png b/rust/gui-client/src-tauri/icons/32x32.png
similarity index 100%
rename from rust/windows-client/src-tauri/icons/32x32.png
rename to rust/gui-client/src-tauri/icons/32x32.png
diff --git a/rust/windows-client/src-tauri/icons/Square107x107Logo.png b/rust/gui-client/src-tauri/icons/Square107x107Logo.png
similarity index 100%
rename from rust/windows-client/src-tauri/icons/Square107x107Logo.png
rename to rust/gui-client/src-tauri/icons/Square107x107Logo.png
diff --git a/rust/windows-client/src-tauri/icons/Square142x142Logo.png b/rust/gui-client/src-tauri/icons/Square142x142Logo.png
similarity index 100%
rename from rust/windows-client/src-tauri/icons/Square142x142Logo.png
rename to rust/gui-client/src-tauri/icons/Square142x142Logo.png
diff --git a/rust/windows-client/src-tauri/icons/Square150x150Logo.png b/rust/gui-client/src-tauri/icons/Square150x150Logo.png
similarity index 100%
rename from rust/windows-client/src-tauri/icons/Square150x150Logo.png
rename to rust/gui-client/src-tauri/icons/Square150x150Logo.png
diff --git a/rust/windows-client/src-tauri/icons/Square284x284Logo.png b/rust/gui-client/src-tauri/icons/Square284x284Logo.png
similarity index 100%
rename from rust/windows-client/src-tauri/icons/Square284x284Logo.png
rename to rust/gui-client/src-tauri/icons/Square284x284Logo.png
diff --git a/rust/windows-client/src-tauri/icons/Square30x30Logo.png b/rust/gui-client/src-tauri/icons/Square30x30Logo.png
similarity index 100%
rename from rust/windows-client/src-tauri/icons/Square30x30Logo.png
rename to rust/gui-client/src-tauri/icons/Square30x30Logo.png
diff --git a/rust/windows-client/src-tauri/icons/Square310x310Logo.png b/rust/gui-client/src-tauri/icons/Square310x310Logo.png
similarity index 100%
rename from rust/windows-client/src-tauri/icons/Square310x310Logo.png
rename to rust/gui-client/src-tauri/icons/Square310x310Logo.png
diff --git a/rust/windows-client/src-tauri/icons/Square44x44Logo.png b/rust/gui-client/src-tauri/icons/Square44x44Logo.png
similarity index 100%
rename from rust/windows-client/src-tauri/icons/Square44x44Logo.png
rename to rust/gui-client/src-tauri/icons/Square44x44Logo.png
diff --git a/rust/windows-client/src-tauri/icons/Square71x71Logo.png b/rust/gui-client/src-tauri/icons/Square71x71Logo.png
similarity index 100%
rename from rust/windows-client/src-tauri/icons/Square71x71Logo.png
rename to rust/gui-client/src-tauri/icons/Square71x71Logo.png
diff --git a/rust/windows-client/src-tauri/icons/Square89x89Logo.png b/rust/gui-client/src-tauri/icons/Square89x89Logo.png
similarity index 100%
rename from rust/windows-client/src-tauri/icons/Square89x89Logo.png
rename to rust/gui-client/src-tauri/icons/Square89x89Logo.png
diff --git a/rust/windows-client/src-tauri/icons/StoreLogo.png b/rust/gui-client/src-tauri/icons/StoreLogo.png
similarity index 100%
rename from rust/windows-client/src-tauri/icons/StoreLogo.png
rename to rust/gui-client/src-tauri/icons/StoreLogo.png
diff --git a/rust/windows-client/src-tauri/icons/firezone.ico b/rust/gui-client/src-tauri/icons/firezone.ico
similarity index 100%
rename from rust/windows-client/src-tauri/icons/firezone.ico
rename to rust/gui-client/src-tauri/icons/firezone.ico
diff --git a/rust/windows-client/src-tauri/icons/icon.icns b/rust/gui-client/src-tauri/icons/icon.icns
similarity index 100%
rename from rust/windows-client/src-tauri/icons/icon.icns
rename to rust/gui-client/src-tauri/icons/icon.icns
diff --git a/rust/windows-client/src-tauri/icons/icon.ico b/rust/gui-client/src-tauri/icons/icon.ico
similarity index 100%
rename from rust/windows-client/src-tauri/icons/icon.ico
rename to rust/gui-client/src-tauri/icons/icon.ico
diff --git a/rust/windows-client/src-tauri/icons/icon.png b/rust/gui-client/src-tauri/icons/icon.png
similarity index 100%
rename from rust/windows-client/src-tauri/icons/icon.png
rename to rust/gui-client/src-tauri/icons/icon.png
diff --git a/rust/windows-client/src-tauri/src/client.rs b/rust/gui-client/src-tauri/src/client.rs
similarity index 99%
rename from rust/windows-client/src-tauri/src/client.rs
rename to rust/gui-client/src-tauri/src/client.rs
index 8f23744ce..459029bd9 100644
--- a/rust/windows-client/src-tauri/src/client.rs
+++ b/rust/gui-client/src-tauri/src/client.rs
@@ -128,6 +128,7 @@ fn run_gui(cli: Cli) -> Result<()> {
 
 fn show_error_dialog(error: &gui::Error) -> Result<()> {
     let error_msg = match error {
+        // TODO: Update this URL
         gui::Error::WebViewNotInstalled => "Firezone cannot start because WebView2 is not installed. Follow the instructions at <https://www.firezone.dev/kb/user-guides/windows-client>.".to_string(),
         gui::Error::DeepLink(deep_link::Error::CantListen) => "Firezone is already running. If it's not responding, force-stop it.".to_string(),
         error => error.to_string(),
diff --git a/rust/windows-client/src-tauri/src/client/about.rs b/rust/gui-client/src-tauri/src/client/about.rs
similarity index 100%
rename from rust/windows-client/src-tauri/src/client/about.rs
rename to rust/gui-client/src-tauri/src/client/about.rs
diff --git a/rust/windows-client/src-tauri/src/client/auth.rs b/rust/gui-client/src-tauri/src/client/auth.rs
similarity index 100%
rename from rust/windows-client/src-tauri/src/client/auth.rs
rename to rust/gui-client/src-tauri/src/client/auth.rs
diff --git a/rust/windows-client/src-tauri/src/client/auth/token_storage_keyring.rs b/rust/gui-client/src-tauri/src/client/auth/token_storage_keyring.rs
similarity index 100%
rename from rust/windows-client/src-tauri/src/client/auth/token_storage_keyring.rs
rename to rust/gui-client/src-tauri/src/client/auth/token_storage_keyring.rs
diff --git a/rust/windows-client/src-tauri/src/client/auth/token_storage_mock.rs b/rust/gui-client/src-tauri/src/client/auth/token_storage_mock.rs
similarity index 100%
rename from rust/windows-client/src-tauri/src/client/auth/token_storage_mock.rs
rename to rust/gui-client/src-tauri/src/client/auth/token_storage_mock.rs
diff --git a/rust/windows-client/src-tauri/src/client/crash_handling.rs b/rust/gui-client/src-tauri/src/client/crash_handling.rs
similarity index 100%
rename from rust/windows-client/src-tauri/src/client/crash_handling.rs
rename to rust/gui-client/src-tauri/src/client/crash_handling.rs
diff --git a/rust/windows-client/src-tauri/src/client/debug_commands.rs b/rust/gui-client/src-tauri/src/client/debug_commands.rs
similarity index 100%
rename from rust/windows-client/src-tauri/src/client/debug_commands.rs
rename to rust/gui-client/src-tauri/src/client/debug_commands.rs
diff --git a/rust/windows-client/src-tauri/src/client/deep_link.rs b/rust/gui-client/src-tauri/src/client/deep_link.rs
similarity index 100%
rename from rust/windows-client/src-tauri/src/client/deep_link.rs
rename to rust/gui-client/src-tauri/src/client/deep_link.rs
diff --git a/rust/windows-client/src-tauri/src/client/device_id.rs b/rust/gui-client/src-tauri/src/client/device_id.rs
similarity index 100%
rename from rust/windows-client/src-tauri/src/client/device_id.rs
rename to rust/gui-client/src-tauri/src/client/device_id.rs
diff --git a/rust/windows-client/src-tauri/src/client/elevation.rs b/rust/gui-client/src-tauri/src/client/elevation.rs
similarity index 100%
rename from rust/windows-client/src-tauri/src/client/elevation.rs
rename to rust/gui-client/src-tauri/src/client/elevation.rs
diff --git a/rust/windows-client/src-tauri/src/client/gui.rs b/rust/gui-client/src-tauri/src/client/gui.rs
similarity index 100%
rename from rust/windows-client/src-tauri/src/client/gui.rs
rename to rust/gui-client/src-tauri/src/client/gui.rs
diff --git a/rust/windows-client/src-tauri/src/client/gui/system_tray_menu.rs b/rust/gui-client/src-tauri/src/client/gui/system_tray_menu.rs
similarity index 100%
rename from rust/windows-client/src-tauri/src/client/gui/system_tray_menu.rs
rename to rust/gui-client/src-tauri/src/client/gui/system_tray_menu.rs
diff --git a/rust/windows-client/src-tauri/src/client/logging.rs b/rust/gui-client/src-tauri/src/client/logging.rs
similarity index 100%
rename from rust/windows-client/src-tauri/src/client/logging.rs
rename to rust/gui-client/src-tauri/src/client/logging.rs
diff --git a/rust/windows-client/src-tauri/src/client/network_changes.rs b/rust/gui-client/src-tauri/src/client/network_changes.rs
similarity index 100%
rename from rust/windows-client/src-tauri/src/client/network_changes.rs
rename to rust/gui-client/src-tauri/src/client/network_changes.rs
diff --git a/rust/windows-client/src-tauri/src/client/resolvers.rs b/rust/gui-client/src-tauri/src/client/resolvers.rs
similarity index 100%
rename from rust/windows-client/src-tauri/src/client/resolvers.rs
rename to rust/gui-client/src-tauri/src/client/resolvers.rs
diff --git a/rust/windows-client/src-tauri/src/client/settings.rs b/rust/gui-client/src-tauri/src/client/settings.rs
similarity index 89%
rename from rust/windows-client/src-tauri/src/client/settings.rs
rename to rust/gui-client/src-tauri/src/client/settings.rs
index 04b4e42ff..8384e819e 100644
--- a/rust/windows-client/src-tauri/src/client/settings.rs
+++ b/rust/gui-client/src-tauri/src/client/settings.rs
@@ -22,7 +22,7 @@ impl Default for AdvancedSettings {
         Self {
             auth_base_url: Url::parse("https://app.firez.one").unwrap(),
             api_url: Url::parse("wss://api.firez.one").unwrap(),
-            log_filter: "firezone_windows_client=debug,firezone_tunnel=trace,phoenix_channel=debug,connlib_shared=debug,connlib_client_shared=debug,snownet=debug,str0m=info,warn".to_string(),
+            log_filter: "firezone_gui_client=debug,firezone_tunnel=trace,phoenix_channel=debug,connlib_shared=debug,connlib_client_shared=debug,snownet=debug,str0m=info,warn".to_string(),
         }
     }
 }
@@ -33,7 +33,7 @@ impl Default for AdvancedSettings {
         Self {
             auth_base_url: Url::parse("https://app.firezone.dev").unwrap(),
             api_url: Url::parse("wss://api.firezone.dev").unwrap(),
-            log_filter: "firezone_windows_client=info,firezone_tunnel=trace,phoenix_channel=info,connlib_shared=info,connlib_client_shared=info,snownet=debug,str0m=info,warn".to_string(),
+            log_filter: "firezone_gui_client=info,firezone_tunnel=trace,phoenix_channel=info,connlib_shared=info,connlib_client_shared=info,snownet=debug,str0m=info,warn".to_string(),
         }
     }
 }
diff --git a/rust/windows-client/src-tauri/src/client/updates.rs b/rust/gui-client/src-tauri/src/client/updates.rs
similarity index 96%
rename from rust/windows-client/src-tauri/src/client/updates.rs
rename to rust/gui-client/src-tauri/src/client/updates.rs
index 298304835..bd6ba04ab 100644
--- a/rust/windows-client/src-tauri/src/client/updates.rs
+++ b/rust/gui-client/src-tauri/src/client/updates.rs
@@ -9,7 +9,7 @@ use url::Url;
 pub(crate) struct Release {
     /// URL that will instantly try to download the MSI to disk
     ///
-    /// e.g. <https://github.com/firezone/firezone/releases/download/1.0.0-pre.8/windows-client-x64.msi>
+    /// e.g. <https://github.com/firezone/firezone/releases/download/1.0.0-pre.8/gui-client-x64.msi>
     pub browser_download_url: Url,
     /// Git tag name
     ///
@@ -68,7 +68,8 @@ const GITHUB_API_VERSION: &str = "2022-11-28";
 /// The name of the Windows MSI asset.
 ///
 /// This ultimately comes from `cd.yml`
-const MSI_ASSET_NAME: &str = "firezone-windows-client-x64.msi";
+// TODO: Remove 'windows'
+const MSI_ASSET_NAME: &str = "firezone-gui-client-windows-x64.msi";
 
 /// Returns the latest release, even if ours is already newer
 pub(crate) async fn check() -> Result<Release, Error> {
@@ -77,6 +78,7 @@ pub(crate) async fn check() -> Result<Release, Error> {
     // <https://docs.github.com/en/rest/using-the-rest-api/getting-started-with-the-rest-api?apiVersion=2022-11-28#user-agent-required>
     // This would change for aarch64 support
     let user_agent = format!(
+        // TODO: remove 'windows'
         "Firezone Client/{:?} (Windows; Win64; x64)",
         current_version()
     );
@@ -168,7 +170,7 @@ mod tests {
                 "url": "https://api.github.com/repos/firezone/firezone/releases/assets/147443612",
                 "id": 147443612,
                 "node_id": "RA_kwDOD12Hpc4Iyc-c",
-                "name": "firezone-windows-client-x64.msi",
+                "name": "firezone-gui-client-windows-x64.msi",
                 "label": "",
                 "uploader": {
                     "login": "github-actions[bot]",
@@ -196,7 +198,7 @@ mod tests {
                 "download_count": 10,
                 "created_at": "2024-01-24T04:33:53Z",
                 "updated_at": "2024-01-24T04:33:53Z",
-                "browser_download_url": "https://github.com/firezone/firezone/releases/download/1.0.0-pre.8/firezone-windows-client-x64.msi"
+                "browser_download_url": "https://github.com/firezone/firezone/releases/download/1.0.0-pre.8/firezone-gui-client-windows-x64.msi"
             }
         ]
     }"#;
@@ -204,7 +206,7 @@ mod tests {
     #[test]
     fn test() {
         let release = super::Release::from_str(RELEASES_LATEST_JSON).unwrap();
-        assert_eq!(release.browser_download_url.to_string(), "https://github.com/firezone/firezone/releases/download/1.0.0-pre.8/firezone-windows-client-x64.msi");
+        assert_eq!(release.browser_download_url.to_string(), "https://github.com/firezone/firezone/releases/download/1.0.0-pre.8/firezone-gui-client-windows-x64.msi");
         assert_eq!(release.tag_name.to_string(), "1.0.0-pre.8");
 
         assert!(
diff --git a/rust/windows-client/src-tauri/src/client/wintun_install.rs b/rust/gui-client/src-tauri/src/client/wintun_install.rs
similarity index 100%
rename from rust/windows-client/src-tauri/src/client/wintun_install.rs
rename to rust/gui-client/src-tauri/src/client/wintun_install.rs
diff --git a/rust/windows-client/src-tauri/src/main.rs b/rust/gui-client/src-tauri/src/main.rs
similarity index 100%
rename from rust/windows-client/src-tauri/src/main.rs
rename to rust/gui-client/src-tauri/src/main.rs
diff --git a/rust/windows-client/src-tauri/tauri.conf.json b/rust/gui-client/src-tauri/tauri.conf.json
similarity index 100%
rename from rust/windows-client/src-tauri/tauri.conf.json
rename to rust/gui-client/src-tauri/tauri.conf.json
diff --git a/rust/windows-client/src/about.html b/rust/gui-client/src/about.html
similarity index 100%
rename from rust/windows-client/src/about.html
rename to rust/gui-client/src/about.html
diff --git a/rust/windows-client/src/about.ts b/rust/gui-client/src/about.ts
similarity index 100%
rename from rust/windows-client/src/about.ts
rename to rust/gui-client/src/about.ts
diff --git a/rust/windows-client/src/input.css b/rust/gui-client/src/input.css
similarity index 100%
rename from rust/windows-client/src/input.css
rename to rust/gui-client/src/input.css
diff --git a/rust/windows-client/src/logo.png b/rust/gui-client/src/logo.png
similarity index 100%
rename from rust/windows-client/src/logo.png
rename to rust/gui-client/src/logo.png
diff --git a/rust/windows-client/src/settings.html b/rust/gui-client/src/settings.html
similarity index 100%
rename from rust/windows-client/src/settings.html
rename to rust/gui-client/src/settings.html
diff --git a/rust/windows-client/src/settings.ts b/rust/gui-client/src/settings.ts
similarity index 100%
rename from rust/windows-client/src/settings.ts
rename to rust/gui-client/src/settings.ts
diff --git a/rust/windows-client/src/tauri_stub.ts b/rust/gui-client/src/tauri_stub.ts
similarity index 100%
rename from rust/windows-client/src/tauri_stub.ts
rename to rust/gui-client/src/tauri_stub.ts
diff --git a/rust/windows-client/tailwind.config.js b/rust/gui-client/tailwind.config.js
similarity index 100%
rename from rust/windows-client/tailwind.config.js
rename to rust/gui-client/tailwind.config.js
diff --git a/rust/windows-client/tsconfig.json b/rust/gui-client/tsconfig.json
similarity index 100%
rename from rust/windows-client/tsconfig.json
rename to rust/gui-client/tsconfig.json
diff --git a/rust/windows-client/wintun/README.md b/rust/gui-client/wintun/README.md
similarity index 100%
rename from rust/windows-client/wintun/README.md
rename to rust/gui-client/wintun/README.md
diff --git a/rust/windows-client/wintun/bin/amd64/wintun.dll b/rust/gui-client/wintun/bin/amd64/wintun.dll
similarity index 100%
rename from rust/windows-client/wintun/bin/amd64/wintun.dll
rename to rust/gui-client/wintun/bin/amd64/wintun.dll
diff --git a/rust/windows-client/wintun/bin/arm64/wintun.dll b/rust/gui-client/wintun/bin/arm64/wintun.dll
similarity index 100%
rename from rust/windows-client/wintun/bin/arm64/wintun.dll
rename to rust/gui-client/wintun/bin/arm64/wintun.dll