diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe6a363e..32972485 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,7 +98,6 @@ qt_add_qml_module(chat
 )
 
 set_target_properties(chat PROPERTIES
-    OUTPUT_NAME gpt4all
     MACOSX_BUNDLE_GUI_IDENTIFIER gpt4all
     MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
     MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
@@ -106,6 +105,12 @@ set_target_properties(chat PROPERTIES
     WIN32_EXECUTABLE TRUE
 )
 
+if(${CMAKE_SYSTEM_NAME} MATCHES Darwin)
+    set_target_properties(chat PROPERTIES
+        OUTPUT_NAME gpt4all
+    )
+endif()
+
 target_compile_definitions(chat
     PRIVATE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>)
 target_link_libraries(chat
diff --git a/cmake/deploy-qt-linux.cmake.in b/cmake/deploy-qt-linux.cmake.in
index d38588aa..3fb0825c 100644
--- a/cmake/deploy-qt-linux.cmake.in
+++ b/cmake/deploy-qt-linux.cmake.in
@@ -5,7 +5,7 @@ set(DATA_DIR ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/packages/${COMPONENT_NAME_MAIN
 set(BIN_DIR ${DATA_DIR}/bin)
 set(Qt6_ROOT_DIR "@Qt6_ROOT_DIR@")
 set(ENV{LD_LIBRARY_PATH} "${BIN_DIR}:${Qt6_ROOT_DIR}/../lib/")
-execute_process(COMMAND ${LINUXDEPLOYQT} ${BIN_DIR}/gpt4all -qmldir=${CMAKE_CURRENT_SOURCE_DIR} -bundle-non-qt-libs -qmake=${Qt6_ROOT_DIR}/bin/qmake -verbose=2)
+execute_process(COMMAND ${LINUXDEPLOYQT} ${BIN_DIR}/chat -qmldir=${CMAKE_CURRENT_SOURCE_DIR} -bundle-non-qt-libs -qmake=${Qt6_ROOT_DIR}/bin/qmake -verbose=2)
 file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/icons/logo-16.png"
      DESTINATION ${DATA_DIR})
 file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/icons/logo-32.png"
diff --git a/cmake/installerscript.qs b/cmake/installerscript.qs
index 902060a0..9ce639da 100644
--- a/cmake/installerscript.qs
+++ b/cmake/installerscript.qs
@@ -16,7 +16,7 @@ Component.prototype.createOperations = function()
                 var userProfile = installer.environmentVariable("USERPROFILE");
                 installer.setValue("UserProfile", userProfile);
                 component.addOperation("CreateShortcut",
-                    targetDirectory + "/bin/gpt4all.exe",
+                    targetDirectory + "/bin/chat.exe",
                     "@UserProfile@/Desktop/GPT4All.lnk",
                     "workingDirectory=" + targetDirectory + "/bin",
                     "iconPath=" + targetDirectory + "/favicon.ico",
@@ -25,7 +25,7 @@ Component.prototype.createOperations = function()
                 print("ERROR: creating desktop shortcut" + e);
             }
             component.addOperation("CreateShortcut",
-                targetDirectory + "/bin/gpt4all.exe",
+                targetDirectory + "/bin/chat.exe",
                 "@StartMenuDir@/GPT4All.lnk",
                 "workingDirectory=" + targetDirectory + "/bin",
                 "iconPath=" + targetDirectory + "/favicon.ico",
@@ -38,7 +38,7 @@ Component.prototype.createOperations = function()
                 component.addOperation("CreateDesktopEntry",
                     homeDir + "/Desktop/GPT4All.desktop",
                     "Type=Application\nTerminal=false\nExec=\"" + targetDirectory +
-                    "/bin/gpt4all\"\nName=GPT4All\nIcon=" + targetDirectory +
+                    "/bin/chat\"\nName=GPT4All\nIcon=" + targetDirectory +
                     "/logo-48.png\nName[en_US]=GPT4All");
             }
         }