diff --git a/src/public/app/components/tab_manager.js b/src/public/app/components/tab_manager.js
index 57c9c8c5ca..861a545026 100644
--- a/src/public/app/components/tab_manager.js
+++ b/src/public/app/components/tab_manager.js
@@ -645,7 +645,7 @@ export default class TabManager extends Component {
         const titleFragments = [
             // it helps to navigate in history if note title is included in the title
             await activeNoteContext.getNavigationTitle(),
-            "Trilium Notes"
+            "TriliumNext Notes"
         ].filter(Boolean);
 
         document.title = titleFragments.join(" - ");
diff --git a/src/public/app/widgets/buttons/global_menu.js b/src/public/app/widgets/buttons/global_menu.js
index 35b88923f6..162ad61490 100644
--- a/src/public/app/widgets/buttons/global_menu.js
+++ b/src/public/app/widgets/buttons/global_menu.js
@@ -204,7 +204,7 @@ const TPL = `
 
         <li class="dropdown-item show-about-dialog-button">
             <span class="bx bx-empty"></span>
-            About Trilium Notes
+            About TriliumNext Notes
         </li>
 
         <li class="dropdown-item update-to-latest-version-button" data-trigger-command="downloadLatestVersion">
diff --git a/src/public/app/widgets/dialogs/about.js b/src/public/app/widgets/dialogs/about.js
index 5d2df11454..257f1a6022 100644
--- a/src/public/app/widgets/dialogs/about.js
+++ b/src/public/app/widgets/dialogs/about.js
@@ -7,7 +7,7 @@ const TPL = `
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title mr-auto">About Trilium Notes</h5>
+                <h5 class="modal-title mr-auto">About TriliumNext Notes</h5>
 
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close" style="margin-left: 0;">
                     <span aria-hidden="true">&times;</span>
diff --git a/src/services/app_icon.ts b/src/services/app_icon.ts
index 95438b6524..7a2a7dedfd 100644
--- a/src/services/app_icon.ts
+++ b/src/services/app_icon.ts
@@ -10,7 +10,7 @@ import utils = require('./utils');
 
 const template = `[Desktop Entry]
 Type=Application
-Name=Trilium Notes
+Name=TriliumNext Notes
 Icon=#APP_ROOT_DIR#/icon.png
 Exec=#EXE_PATH#
 Categories=Office
diff --git a/src/services/tray.ts b/src/services/tray.ts
index 48a8ebaae3..70d686adb1 100644
--- a/src/services/tray.ts
+++ b/src/services/tray.ts
@@ -98,7 +98,7 @@ function createTray() {
     }
 
     tray = new Tray(getIconPath());
-    tray.setToolTip('Trilium Notes')
+    tray.setToolTip('TriliumNext Notes')
     // Restore focus
     tray.on('click', changeVisibility)
     updateTrayMenu();
diff --git a/src/services/window.ts b/src/services/window.ts
index a901d79a8d..ecc6395fb2 100644
--- a/src/services/window.ts
+++ b/src/services/window.ts
@@ -22,7 +22,7 @@ async function createExtraWindow(extraWindowHash: string) {
     const win = new BrowserWindow({
         width: 1000,
         height: 800,
-        title: 'Trilium Notes',
+        title: 'TriliumNext Notes',
         webPreferences: {
             nodeIntegration: true,
             contextIsolation: false,
@@ -60,7 +60,7 @@ async function createMainWindow(app: App) {
         y: mainWindowState.y,
         width: mainWindowState.width,
         height: mainWindowState.height,
-        title: 'Trilium Notes',
+        title: 'TriliumNext Notes',
         webPreferences: {
             nodeIntegration: true,
             contextIsolation: false,
@@ -132,7 +132,7 @@ async function createSetupWindow() {
     setupWindow = new BrowserWindow({
         width: 800,
         height: 800,
-        title: 'Trilium Notes Setup',
+        title: 'TriliumNext Notes Setup',
         icon: getIcon(),
         webPreferences: {
             // necessary for e.g. utils.isElectron()
diff --git a/src/views/desktop.ejs b/src/views/desktop.ejs
index cb56ecc60d..12d831f2a3 100644
--- a/src/views/desktop.ejs
+++ b/src/views/desktop.ejs
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <link rel="shortcut icon" href="favicon.ico">
     <link rel="manifest" crossorigin="use-credentials" href="manifest.webmanifest">
-    <title>Trilium Notes</title>
+    <title>TriliumNext Notes</title>
 </head>
 <body class="desktop heading-style-<%= headingStyle %>">
 <noscript>Trilium requires JavaScript to be enabled.</noscript>
diff --git a/src/views/mobile.ejs b/src/views/mobile.ejs
index a84a7486a5..ebb7e98fde 100644
--- a/src/views/mobile.ejs
+++ b/src/views/mobile.ejs
@@ -5,7 +5,7 @@
     <link rel="shortcut icon" href="favicon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <meta name="theme-color" content="#fff">
-    <title>Trilium Notes</title>
+    <title>TriliumNext Notes</title>
     <link rel="manifest" crossorigin="use-credentials" href="manifest.webmanifest">
 
     <style>
diff --git a/src/views/setup.ejs b/src/views/setup.ejs
index 4c5f5ac265..099d88c23a 100644
--- a/src/views/setup.ejs
+++ b/src/views/setup.ejs
@@ -47,7 +47,7 @@
 <noscript>Trilium requires JavaScript to be enabled.</noscript>
 <div class="container">
     <div id="setup-dialog" class="col-md-12 col-lg-8 col-xl-6 mx-auto" style="padding-top: 25px; font-size: larger; display: none;">
-        <h1>Trilium Notes setup</h1>
+        <h1>TriliumNext Notes setup</h1>
 
         <div class="alert alert-warning" id="alert" style="display: none;">
         </div>
@@ -92,7 +92,7 @@
             <p>This setup needs to be initiated from the desktop instance:</p>
 
             <ol>
-                <li>Open your desktop instance of Trilium Notes.</li>
+                <li>Open your desktop instance of TriliumNext Notes.</li>
                 <li>From the Trilium Menu, click Options.</li>
                 <li>Click on Sync tab.</li>
                 <li>Change server instance address to: <span id="current-host"></span> and click save.</li>