diff --git a/.ci/macos-universal.sh b/.ci/macos-universal.sh
index b6be26965..65ed3435e 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=(lime lime-room lime-qt.app/Contents/MacOS/lime-qt)
+BIN_PATHS=(lime3ds-cli lime3ds-room lime3ds-gui.app/Contents/MacOS/lime3ds-gui)
 
 # 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=(lime lime-room lime-qt.app)
+APP_PATHS=(lime3ds-cli lime3ds-room lime3ds-gui.app)
 for APP_PATH in "${APP_PATHS[@]}"; do
     codesign --deep -fs - $BUNDLE_DIR/$APP_PATH
 done
diff --git a/dist/lime3ds-cli.desktop b/dist/lime3ds-cli.desktop
index eb372be45..dd8b5b1d2 100644
--- a/dist/lime3ds-cli.desktop
+++ b/dist/lime3ds-cli.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=lime
-Exec=lime %f
+TryExec=lime3ds-cli
+Exec=lime3ds-cli %f
 Categories=Game;Emulator;
 MimeType=application/x-ctr-3dsx;application/x-ctr-cci;application/x-ctr-cia;application/x-ctr-cxi;
 Keywords=3DS;Nintendo;
diff --git a/dist/lime3ds-gui.desktop b/dist/lime3ds-gui.desktop
index 291907376..1a3632510 100644
--- a/dist/lime3ds-gui.desktop
+++ b/dist/lime3ds-gui.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=lime-qt
-Exec=lime-qt %f
+TryExec=lime3ds-gui
+Exec=lime3ds-gui %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/dist/lime3ds-room.desktop b/dist/lime3ds-room.desktop
index f4a6b207c..66df1a369 100644
--- a/dist/lime3ds-room.desktop
+++ b/dist/lime3ds-room.desktop
@@ -4,7 +4,7 @@ Type=Application
 Name=Lime3DS Room
 Comment=Multiplayer room host for Lime3DS
 Icon=lime
-TryExec=lime-room
-Exec=lime-room %f
+TryExec=lime3ds-room
+Exec=lime3ds-room %f
 Categories=Game;Emulator;
 Keywords=3DS;Nintendo
diff --git a/src/dedicated_room/CMakeLists.txt b/src/dedicated_room/CMakeLists.txt
index d796403f9..1a3462b8e 100644
--- a/src/dedicated_room/CMakeLists.txt
+++ b/src/dedicated_room/CMakeLists.txt
@@ -6,6 +6,8 @@ add_executable(lime-room
     lime-room.rc
 )
 
+set_target_properties(lime-room PROPERTIES OUTPUT_NAME "lime3ds-room")
+
 create_target_directory_groups(lime-room)
 
 target_link_libraries(lime-room PRIVATE lime_common network)
diff --git a/src/lime/CMakeLists.txt b/src/lime/CMakeLists.txt
index f27b72d96..64201e887 100644
--- a/src/lime/CMakeLists.txt
+++ b/src/lime/CMakeLists.txt
@@ -12,6 +12,8 @@ add_executable(lime
     resource.h
 )
 
+set_target_properties(lime PROPERTIES OUTPUT_NAME "lime3ds-cli")
+
 if (ENABLE_SOFTWARE_RENDERER)
     target_sources(lime PRIVATE
         emu_window/emu_window_sdl2_sw.cpp
diff --git a/src/lime_qt/CMakeLists.txt b/src/lime_qt/CMakeLists.txt
index 13ea48982..6463726fe 100644
--- a/src/lime_qt/CMakeLists.txt
+++ b/src/lime_qt/CMakeLists.txt
@@ -191,6 +191,8 @@ add_executable(lime-qt
     util/util.h
 )
 
+set_target_properties(lime-qt PROPERTIES OUTPUT_NAME "lime3ds-gui")
+
 file(GLOB COMPAT_LIST
      ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc
      ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json)