diff --git a/CMakeModules/NameConfiguration.cmake b/CMakeModules/NameConfiguration.cmake
index b611fa2..5491ede 100644
--- a/CMakeModules/NameConfiguration.cmake
+++ b/CMakeModules/NameConfiguration.cmake
@@ -1,5 +1,8 @@
 set(MAIN_TARGET JellyfinDesktop)
 
+# Display name (window title, application name)
+set(DISPLAY_NAME "Jellyfin Desktop")
+
 # Name of the output binary and data directories
 set(MAIN_NAME jellyfin-desktop)
 set(DATA_NAME jellyfin-desktop)
@@ -10,6 +13,6 @@ if(APPLE)
 elseif(WIN32)
   set(MAIN_NAME "Jellyfin Desktop")
   set(DATA_NAME "Jellyfin Desktop")
-endif(APPLE)
+endif()
 
-configure_file(src/shared/Names.cpp.in src/shared/Names.cpp @ONLY)
\ No newline at end of file
+configure_file(src/shared/Names.cpp.in src/shared/Names.cpp @ONLY)
diff --git a/bundle/win/Bundle.wxs b/bundle/win/Bundle.wxs
index 87ec36c..669b3c2 100644
--- a/bundle/win/Bundle.wxs
+++ b/bundle/win/Bundle.wxs
@@ -38,16 +38,16 @@
                          Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\Packages\Package_for_KB2919355~31bf3856ad364e35~x86~~6.3.1.14"
                          Value="CurrentState"
                          />
-    <bal:Condition Message="Jellyfin can only be installed on Windows 7 or newer.">
+    <bal:Condition Message="Jellyfin Desktop can only be installed on Windows 7 or newer.">
       <![CDATA[VersionNT >= v6.1]]>
     </bal:Condition>
     <!-- Checking for prerequisites for windows versions where they are required -->
     <!-- We need to check for when ServicePackLevel is not defined as well, with (NOT ServicePackLevel) -->
-    <bal:Condition Message="Jellyfin on Windows 7 or Windows Server 2008 R2 requires Service Pack 1.">
+    <bal:Condition Message="Jellyfin Desktop on Windows 7 or Windows Server 2008 R2 requires Service Pack 1.">
       <![CDATA[NOT ((VersionNT = v6.1) AND ((NOT ServicePackLevel) OR (ServicePackLevel < 1)))]]>
     </bal:Condition>
     <!-- Windows 8 and 2012 have no prerequisites -->
-    <bal:Condition Message="Jellyfin on Windows 8.1 or Windows Server 2012 R2 requires KB2919355 installed.">
+    <bal:Condition Message="Jellyfin Desktop on Windows 8.1 or Windows Server 2012 R2 requires KB2919355 installed.">
       <![CDATA[NOT ((VersionNT = v6.3) AND (KB2919355_x86 <> 112 AND KB2919355_amd64 <> 112))]]>
     </bal:Condition>
 
diff --git a/native/nativeshell.js b/native/nativeshell.js
index abfba22..46085e8 100644
--- a/native/nativeshell.js
+++ b/native/nativeshell.js
@@ -167,7 +167,7 @@ function getDeviceProfile() {
     }
 
     return {
-        'Name': 'Jellyfin',
+        'Name': 'Jellyfin Desktop',
         'MaxStaticBitrate': 1000000000,
         'MusicStreamingTranscodingBitrate': 1280000,
         'TimelineOffsetSeconds': 5,
diff --git a/native/updatePlugin.js b/native/updatePlugin.js
index 7bf7075..a4e668d 100644
--- a/native/updatePlugin.js
+++ b/native/updatePlugin.js
@@ -30,7 +30,7 @@ class updatePlugin {
 
                     await confirm({
                         title: "Update Available",
-                        text: `Jellyfin version ${version} is available.`,
+                        text: `Jellyfin Desktop version ${version} is available.`,
                         cancelText: "Ignore",
                         confirmText: "Download"
                     });
diff --git a/resources/meta/org.jellyfin.JellyfinDesktop.appdata.xml b/resources/meta/org.jellyfin.JellyfinDesktop.appdata.xml
index 90dc4d1..2362734 100644
--- a/resources/meta/org.jellyfin.JellyfinDesktop.appdata.xml
+++ b/resources/meta/org.jellyfin.JellyfinDesktop.appdata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
   <id>org.jellyfin.JellyfinDesktop</id>
-  <name>Jellyfin</name>
+  <name>Jellyfin Desktop</name>
   <summary>Desktop client for Jellyfin media server</summary>
   <developer id="org.jellyfin">
     <name>Jellyfin</name>
diff --git a/resources/meta/org.jellyfin.JellyfinDesktop.desktop b/resources/meta/org.jellyfin.JellyfinDesktop.desktop
index 9573d4a..5700516 100644
--- a/resources/meta/org.jellyfin.JellyfinDesktop.desktop
+++ b/resources/meta/org.jellyfin.JellyfinDesktop.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Version=1.0
-Name=Jellyfin
+Name=Jellyfin Desktop
 Comment=Desktop client for Jellyfin
 Exec=jellyfin-desktop
 Icon=org.jellyfin.JellyfinDesktop
diff --git a/src/mpris/MprisComponent.h b/src/mpris/MprisComponent.h
index a3de63b..fd4c982 100644
--- a/src/mpris/MprisComponent.h
+++ b/src/mpris/MprisComponent.h
@@ -37,7 +37,7 @@ public:
   bool fullscreen() const;
   void setFullscreen(bool value);
   bool hasTrackList() const { return false; }
-  QString identity() const { return "Jellyfin"; }
+  QString identity() const { return "Jellyfin Desktop"; }
   QString desktopEntry() const { return "org.jellyfin.JellyfinDesktop"; }
   QStringList supportedUriSchemes() const { return QStringList(); }
   QStringList supportedMimeTypes() const { return QStringList(); }
@@ -160,4 +160,4 @@ private:
   QNetworkReply* m_pendingArtReply;
 };
 
-#endif // MPRISCOMPONENT_H
\ No newline at end of file
+#endif // MPRISCOMPONENT_H
diff --git a/src/shared/Names.cpp.in b/src/shared/Names.cpp.in
index 4cd09ca..2ae6c94 100644
--- a/src/shared/Names.cpp.in
+++ b/src/shared/Names.cpp.in
@@ -6,7 +6,7 @@
 
 QString Names::MainName()
 {
-  return QString("@MAIN_NAME@");
+  return QString("@DISPLAY_NAME@");
 }
 
 QString Names::DataName()
diff --git a/src/ui/ErrorMessage.cpp b/src/ui/ErrorMessage.cpp
index 09331de..cab3d6d 100644
--- a/src/ui/ErrorMessage.cpp
+++ b/src/ui/ErrorMessage.cpp
@@ -15,12 +15,12 @@ ErrorMessage::ErrorMessage(const QString& errorMessage, bool allowResetConfig)
   : QMessageBox(nullptr)
 {
   setIcon(Critical);
-  setText("Jellyfin encountered a fatal error and must exit");
+  setText("Jellyfin Desktop encountered a fatal error and must exit");
   setDetailedText(errorMessage);
   setInformativeText("Press help below to be redirected to our friendly support forums." \
                      "Press reset to reset configuration to the default and try again." \
                      "Press abort to exit.");
-  setWindowTitle("PMP Fatal Error!");
+  setWindowTitle("Jellyfin Desktop Fatal Error!");
 
   auto exitButton = addButton(Abort);
   auto helpButton = addButton(Help);
diff --git a/src/ui/webview.qml b/src/ui/webview.qml
index 4fe3583..00f0234 100644
--- a/src/ui/webview.qml
+++ b/src/ui/webview.qml
@@ -8,7 +8,7 @@ import QtQuick.Controls 6.0
 Window
 {
   id: mainWindow
-  title: "Jellyfin"
+  title: "Jellyfin Desktop"
   objectName: "mainWindow"
   width: 1280
   height: 720