diff --git a/cmake/Definitions.cmake b/cmake/Definitions.cmake
index a9d4f8e72..fd14fa1d5 100644
--- a/cmake/Definitions.cmake
+++ b/cmake/Definitions.cmake
@@ -54,10 +54,6 @@ endmacro()
 
 macro(configure_meta)
 
-  set(DESKFLOW_AUTHOR_NAME
-      "Deskflow"
-      CACHE STRING "Author name (also used as organization name)")
-
   set(DESKFLOW_MAINTAINER
       "Deskflow <maintainers@deskflow.org>"
       CACHE STRING "Maintainer email address in RFC 5322 mailbox format")
@@ -86,7 +82,6 @@ macro(configure_meta)
       true
       CACHE BOOL "Show developer thanks message")
 
-  message(VERBOSE "Author name: ${DESKFLOW_AUTHOR_NAME}")
   message(VERBOSE "Maintainer: ${DESKFLOW_MAINTAINER}")
   message(VERBOSE "Website URL: ${DESKFLOW_WEBSITE_URL}")
   message(VERBOSE "Version URL: ${DESKFLOW_VERSION_URL}")
@@ -96,7 +91,6 @@ macro(configure_meta)
   message(VERBOSE "Show dev thanks: ${DESKFLOW_SHOW_DEV_THANKS}")
 
   # TODO: We need to move this to configure_file() in the future, which is much cleaner.
-  add_definitions(-DDESKFLOW_AUTHOR_NAME="${DESKFLOW_AUTHOR_NAME}")
   add_definitions(-DDESKFLOW_MAINTAINER="${DESKFLOW_MAINTAINER}")
   add_definitions(-DDESKFLOW_WEBSITE_URL="${DESKFLOW_WEBSITE_URL}")
   add_definitions(-DDESKFLOW_VERSION_URL="${DESKFLOW_VERSION_URL}")
diff --git a/cmake/Packaging.cmake b/cmake/Packaging.cmake
index 8493341f7..e99ba28df 100644
--- a/cmake/Packaging.cmake
+++ b/cmake/Packaging.cmake
@@ -16,7 +16,7 @@ macro(configure_packaging)
     set(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME})
     set(CPACK_PACKAGE_CONTACT ${DESKFLOW_MAINTAINER})
     set(CPACK_PACKAGE_DESCRIPTION ${CMAKE_PROJECT_DESCRIPTION})
-    set(CPACK_PACKAGE_VENDOR ${DESKFLOW_AUTHOR_NAME})
+    set(CPACK_PACKAGE_VENDOR "Deskflow")
     set(CPACK_RESOURCE_FILE_LICENSE ${PROJECT_SOURCE_DIR}/LICENSE)
 
     set(CPACK_PACKAGE_VERSION ${CMAKE_PROJECT_VERSION})
diff --git a/deploy/dist/wix/Include.wxi.in b/deploy/dist/wix/Include.wxi.in
index 874669f87..2e3d581de 100644
--- a/deploy/dist/wix/Include.wxi.in
+++ b/deploy/dist/wix/Include.wxi.in
@@ -3,7 +3,7 @@
     <?define AppId="deskflow"?>
     <?define Name="Deskflow"?>
     <?define Version="@DESKFLOW_VERSION@"?>
-    <?define Author="@DESKFLOW_AUTHOR_NAME@"?>
+    <?define Author="Deskflow"?>
     <?define BinDir="@CMAKE_RUNTIME_OUTPUT_DIRECTORY@"?>
     <?define ProjectIcon="@CMAKE_SOURCE_DIR@/src/gui/src/deskflow.ico"?>
     <?define DeployResDir="@DESKFLOW_DEPLOY_RES_DIR@"?>
diff --git a/deploy/version.rc.in b/deploy/version.rc.in
index a88298227..815bbee79 100644
--- a/deploy/version.rc.in
+++ b/deploy/version.rc.in
@@ -12,7 +12,7 @@ https://learn.microsoft.com/en-us/windows/win32/menurc/versioninfo-resource?redi
 #define VER_PRODUCTVERSION          @DESKFLOW_VERSION_MS_CSV@
 #define VER_PRODUCTVERSION_STR      "@DESKFLOW_VERSION@\0"
 
-#define VER_COMPANYNAME_STR         "@DESKFLOW_AUTHOR_NAME@\0"
+#define VER_COMPANYNAME_STR         "Deskflow\0"
 #define VER_FILEDESCRIPTION_STR     "Deskflow\0"
 #define VER_INTERNALNAME_STR        "Deskflow\0"
 #define VER_LEGALCOPYRIGHT_STR      "© 2024 Deskflow Developers\0"
diff --git a/src/lib/deskflow/win32/AppUtilWindows.cpp b/src/lib/deskflow/win32/AppUtilWindows.cpp
index f2c4a9690..92c43760c 100644
--- a/src/lib/deskflow/win32/AppUtilWindows.cpp
+++ b/src/lib/deskflow/win32/AppUtilWindows.cpp
@@ -255,7 +255,8 @@ void AppUtilWindows::showNotification(const String &title, const String &text) c
     WinToastLib::WinToast::instance()->setAppName(L""
                                                   "Deskflow");
     const auto aumi = WinToastLib::WinToast::configureAUMI(
-        L"" DESKFLOW_AUTHOR_NAME,
+        L""
+        "Deskflow Developers",
         L""
         "Deskflow",
         L""