diff --git a/.github/actions/build-electron/action.yml b/.github/actions/build-electron/action.yml
index 9e5b1670b..93772d7d9 100644
--- a/.github/actions/build-electron/action.yml
+++ b/.github/actions/build-electron/action.yml
@@ -85,7 +85,7 @@ runs:
       APPLE_ID: ${{ env.APPLE_ID }}
       APPLE_ID_PASSWORD: ${{ env.APPLE_ID_PASSWORD }}
       WINDOWS_SIGN_EXECUTABLE: ${{ env.WINDOWS_SIGN_EXECUTABLE }}
-      TRILIUM_ARTIFACT_NAME_HINT: TriliumNextNotes-${{ github.ref_name }}-${{ inputs.os }}-${{ inputs.arch }}
+      TRILIUM_ARTIFACT_NAME_HINT: TriliumNotes-${{ github.ref_name }}-${{ inputs.os }}-${{ inputs.arch }}
     run: pnpm nx --project=desktop electron-forge:make -- --arch=${{ inputs.arch }} --platform=${{ inputs.forge_platform }}
 
   # Add DMG signing step
diff --git a/.github/actions/build-server/action.yml b/.github/actions/build-server/action.yml
index c3c6288bc..b0ab05212 100644
--- a/.github/actions/build-server/action.yml
+++ b/.github/actions/build-server/action.yml
@@ -30,4 +30,4 @@ runs:
       mkdir -p upload
       file=$(find ./apps/server/out -name '*.tar.xz' -print -quit)
       name=${{ github.ref_name }}
-      cp "$file" "upload/TriliumNextNotes-Server-${name//\//-}-${{ inputs.os }}-${{ inputs.arch }}.tar.xz"
+      cp "$file" "upload/TriliumNotes-Server-${name//\//-}-${{ inputs.os }}-${{ inputs.arch }}.tar.xz"
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 1f370c360..990c8dfb9 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -92,7 +92,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ github.event_name == 'pull_request' }}
         with:
-          name: TriliumNextNotes ${{ matrix.os.name }} ${{ matrix.arch }}
+          name: TriliumNotes ${{ matrix.os.name }} ${{ matrix.arch }}
           path: apps/desktop/upload
 
   nightly-server:
diff --git a/apps/server/scripts/build-server.sh b/apps/server/scripts/build-server.sh
index b81e2901a..115a441cb 100644
--- a/apps/server/scripts/build-server.sh
+++ b/apps/server/scripts/build-server.sh
@@ -48,7 +48,7 @@ chmod 755 $BUILD_DIR/trilium.sh
 
 VERSION=`jq -r ".version" package.json`
 
-ARCHIVE_NAME="TriliumNextNotes-Server-${VERSION}-linux-${ARCH}"
+ARCHIVE_NAME="TriliumNotes-Server-${VERSION}-linux-${ARCH}"
 echo "Creating Archive $ARCHIVE_NAME..."
 
 mkdir $DIST_DIR
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux.html
index 6d92fef26..8cff3851b 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux.html	
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux.html	
@@ -3,10 +3,10 @@
 <h2>Steps</h2>
 <ul>
   <li>SSH into your server</li>
-  <li>use <code>wget</code> (or <code>curl</code>) to download latest <code>TriliumNextNotes-Server-[VERSION]-linux-x64.tar.xz</code> (copy
+  <li>use <code>wget</code> (or <code>curl</code>) to download latest <code>TriliumNotes-Server-[VERSION]-linux-x64.tar.xz</code> (copy
     link from <a href="https://github.com/TriliumNext/Notes/releases">release page</a>,
     notice <code>-Server</code> suffix) on your server.</li>
-  <li>unpack the archive, e.g. using <code>tar -xf -d TriliumNextNotes-Server-[VERSION]-linux-x64.tar.xz</code>
+  <li>unpack the archive, e.g. using <code>tar -xf -d TriliumNotes-Server-[VERSION]-linux-x64.tar.xz</code>
   </li>
   <li><code>cd trilium-linux-x64-server</code>
   </li>
@@ -27,7 +27,7 @@
 <h2>Configure Trilium to auto-run on boot with systemd</h2>
 <ul>
   <li>After downloading, extract and move Trilium:</li>
-</ul><pre><code class="language-text-x-trilium-auto">tar -xvf TriliumNextNotes-Server-[VERSION]-linux-x64.tar.xz
+</ul><pre><code class="language-text-x-trilium-auto">tar -xvf TriliumNotes-Server-[VERSION]-linux-x64.tar.xz
 sudo mv trilium-linux-x64-server /opt/trilium</code></pre>
 <ul>
   <li>Create the service:</li>
diff --git a/apps/website/src/lib/download-helper.ts b/apps/website/src/lib/download-helper.ts
index 8f19b7020..4e2b5597c 100644
--- a/apps/website/src/lib/download-helper.ts
+++ b/apps/website/src/lib/download-helper.ts
@@ -117,11 +117,11 @@ export const downloadMatrix: DownloadMatrix = {
                 },
                 tarX64: {
                     name: "x86 (.tar.xz)",
-                    url: `https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-Server-v${version}-linux-x64.tar.xz`
+                    url: `https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-x64.tar.xz`
                 },
                 tarArm64: {
                     name: "ARM (.tar.xz)",
-                    url: `https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-Server-v${version}-linux-arm64.tar.xz`
+                    url: `https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-arm64.tar.xz`
                 },
                 nixos: {
                     name: "NixOS module",
@@ -150,7 +150,7 @@ export const downloadMatrix: DownloadMatrix = {
 export function buildDownloadUrl(app: App, platform: Platform, format: string, architecture: Architecture): string {
     if (app === "desktop") {
         return downloadMatrix.desktop[platform]?.downloads[format].url ??
-            `https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-v${version}-${platform}-${architecture}.${format}`;
+            `https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNotes-v${version}-${platform}-${architecture}.${format}`;
     } else if (app === "server") {
         return downloadMatrix.server[platform]?.downloads[format].url ?? "#";
     } else {
diff --git a/docs/Developer Guide/Developer Guide/Old documentation/Installation/Download latest nightly and in.md b/docs/Developer Guide/Developer Guide/Old documentation/Installation/Download latest nightly and in.md
index 5ec7fd1e0..90a7740be 100644
--- a/docs/Developer Guide/Developer Guide/Old documentation/Installation/Download latest nightly and in.md	
+++ b/docs/Developer Guide/Developer Guide/Old documentation/Installation/Download latest nightly and in.md	
@@ -4,7 +4,7 @@ On Ubuntu:
 ```
 #!/usr/bin/env bash
 
-name=TriliumNextNotes-linux-x64-nightly.deb
+name=TriliumNotes-linux-x64-nightly.deb
 rm -f $name*
 wget https://github.com/TriliumNext/Notes/releases/download/nightly/$name
 sudo apt-get install ./$name
diff --git a/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux.md b/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux.md
index a1326d1c9..88386a9f3 100644
--- a/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux.md	
+++ b/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux.md	
@@ -4,8 +4,8 @@ This is essentially Trilium sources + node modules + node.js runtime packaged in
 ## Steps
 
 *   SSH into your server
-*   use `wget` (or `curl`) to download latest `TriliumNextNotes-Server-[VERSION]-linux-x64.tar.xz` (copy link from [release page](https://github.com/TriliumNext/Notes/releases), notice `-Server` suffix) on your server.
-*   unpack the archive, e.g. using `tar -xf -d TriliumNextNotes-Server-[VERSION]-linux-x64.tar.xz`
+*   use `wget` (or `curl`) to download latest `TriliumNotes-Server-[VERSION]-linux-x64.tar.xz` (copy link from [release page](https://github.com/TriliumNext/Notes/releases), notice `-Server` suffix) on your server.
+*   unpack the archive, e.g. using `tar -xf -d TriliumNotes-Server-[VERSION]-linux-x64.tar.xz`
 *   `cd trilium-linux-x64-server`
 *   `./trilium.sh`
 *   you can open the browser and open http://\[your-server-hostname\]:8080 and you should see Trilium initialization page
@@ -20,7 +20,7 @@ The problem with above steps is that once you close the SSH connection, the Tril
 *   After downloading, extract and move Trilium:
 
 ```
-tar -xvf TriliumNextNotes-Server-[VERSION]-linux-x64.tar.xz
+tar -xvf TriliumNotes-Server-[VERSION]-linux-x64.tar.xz
 sudo mv trilium-linux-x64-server /opt/trilium
 ```