diff --git a/.ci/macos-universal.sh b/.ci/macos-universal.sh
index df831ea30..e67b73396 100755
--- a/.ci/macos-universal.sh
+++ b/.ci/macos-universal.sh
@@ -11,7 +11,7 @@ BASE_ARTIFACT_ARCH="${BASE_ARTIFACT##*-}"
 mv $BASE_ARTIFACT $BUNDLE_DIR
 
 # Executable binary paths that need to be combined.
-BIN_PATHS=(lime3ds-room lime3ds-gui.app/Contents/MacOS/lime3ds-gui)
+BIN_PATHS=(lime3ds-room lime3ds.app/Contents/MacOS/lime3ds)
 
 # Dylib paths that need to be combined.
 IFS=$'\n'
@@ -37,7 +37,7 @@ for OTHER_ARTIFACT in "${ARTIFACTS_LIST[@]:1}"; do
 done
 
 # Re-sign executables and bundles after combining.
-APP_PATHS=(lime3ds-room lime3ds-gui.app)
+APP_PATHS=(lime3ds-room lime3ds.app)
 for APP_PATH in "${APP_PATHS[@]}"; do
     codesign --deep -fs - $BUNDLE_DIR/$APP_PATH
 done
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ccd147793..099cf226e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -435,7 +435,7 @@ endif()
 # http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
 # http://standards.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html
 if(ENABLE_QT AND UNIX AND NOT APPLE)
-    install(FILES "${PROJECT_SOURCE_DIR}/dist/lime3ds-gui.desktop"
+    install(FILES "${PROJECT_SOURCE_DIR}/dist/lime3ds.desktop"
             DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
     install(FILES "${PROJECT_SOURCE_DIR}/dist/lime.svg"
             DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps")
diff --git a/dist/lime3ds-gui.desktop b/dist/lime3ds.desktop
similarity index 90%
rename from dist/lime3ds-gui.desktop
rename to dist/lime3ds.desktop
index 1a3632510..7439efd30 100644
--- a/dist/lime3ds-gui.desktop
+++ b/dist/lime3ds.desktop
@@ -7,8 +7,8 @@ GenericName[fr]=Émulateur 3DS
 Comment=Nintendo 3DS video game console emulator
 Comment[fr]=Émulateur de console de jeu Nintendo 3DS
 Icon=lime
-TryExec=lime3ds-gui
-Exec=lime3ds-gui %f
+TryExec=lime3ds
+Exec=lime3ds %f
 Categories=Game;Emulator;Qt;
 MimeType=application/x-ctr-3dsx;application/x-ctr-cci;application/x-ctr-cia;application/x-ctr-cxi;
 Keywords=3DS;Nintendo;
diff --git a/src/lime_qt/CMakeLists.txt b/src/lime_qt/CMakeLists.txt
index f31ca9061..b5af9fe97 100644
--- a/src/lime_qt/CMakeLists.txt
+++ b/src/lime_qt/CMakeLists.txt
@@ -191,7 +191,7 @@ add_executable(lime-qt
     util/util.h
 )
 
-set_target_properties(lime-qt PROPERTIES OUTPUT_NAME "lime3ds-gui")
+set_target_properties(lime-qt PROPERTIES OUTPUT_NAME "lime3ds")
 
 file(GLOB COMPAT_LIST
      ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc