diff --git a/packaging/macos/CMakeLists.txt b/packaging/macos/CMakeLists.txt
index 735683a2..d6e93db8 100644
--- a/packaging/macos/CMakeLists.txt
+++ b/packaging/macos/CMakeLists.txt
@@ -2,9 +2,11 @@ set(_icon_file AppIcon)
 set(MACOSX_BUNDLE_GUI_IDENTIFIER ${APP_ID})
 set(MACOSX_BUNDLE_COPYRIGHT ${APP_SPDX})
 set(ISLE_TARGET_NAME isle)
+set(MACOSX_ISLE_BUNDLE_NAME ${APP_NAME}) # Do note that it can be up to 15 characters long
 set(MACOSX_ISLE_BUNDLE_DISPLAY_NAME ${APP_NAME})
 set(CONFIG_TARGET_NAME isle-config)
-set(MACOSX_CONFIG_BUNDLE_DISPLAY_NAME "Configure LEGO Island")
+set(MACOSX_CONFIG_BUNDLE_NAME "Config Isle") # Do note that it can be up to 15 characters long
+set(MACOSX_CONFIG_BUNDLE_DISPLAY_NAME "Configure ${APP_NAME}")
 set(MACOSX_BUNDLE_INFO_STRING ${PROJECT_VERSION})
 set(MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION})
 set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION})
@@ -39,6 +41,11 @@ if(ISLE_BUILD_APP)
       --force --deep --sign - --timestamp
       \"\$\{CMAKE_INSTALL_PREFIX\}/${ISLE_TARGET_NAME}.app/Contents/MacOS/${ISLE_TARGET_NAME}\")
   ")
+  install(CODE "
+    file(RENAME
+      \"\$\{CMAKE_INSTALL_PREFIX\}/${ISLE_TARGET_NAME}.app\"
+      \"\$\{CMAKE_INSTALL_PREFIX\}/${MACOSX_ISLE_BUNDLE_DISPLAY_NAME}.app\")
+  ")
 endif()
 if(ISLE_BUILD_CONFIG)
   configure_file(
@@ -76,6 +83,11 @@ if(ISLE_BUILD_CONFIG)
       --force --deep --sign - --timestamp
       \"\$\{CMAKE_INSTALL_PREFIX\}/${CONFIG_TARGET_NAME}.app/Contents/MacOS/${CONFIG_TARGET_NAME}\")
   ")
+  install(CODE "
+    file(RENAME
+      \"\$\{CMAKE_INSTALL_PREFIX\}/${CONFIG_TARGET_NAME}.app\"
+      \"\$\{CMAKE_INSTALL_PREFIX\}/${MACOSX_CONFIG_BUNDLE_DISPLAY_NAME}.app\")
+  ")
 endif()
 
 install(CODE "
diff --git a/packaging/macos/config/Info.plist.in b/packaging/macos/config/Info.plist.in
index 8d64c087..d128adc0 100644
--- a/packaging/macos/config/Info.plist.in
+++ b/packaging/macos/config/Info.plist.in
@@ -17,7 +17,7 @@
 	<key>CFBundleLongVersionString</key>
 	<string>@MACOSX_BUNDLE_LONG_VERSION_STRING@</string>
 	<key>CFBundleName</key>
-	<string>@CONFIG_TARGET_NAME@</string>
+	<string>@MACOSX_CONFIG_BUNDLE_NAME@</string>
 	<key>CFBundleDisplayName</key>
 	<string>@MACOSX_CONFIG_BUNDLE_DISPLAY_NAME@</string>
 	<key>CFBundlePackageType</key>
diff --git a/packaging/macos/isle/Info.plist.in b/packaging/macos/isle/Info.plist.in
index de886e4d..2ca3d26e 100644
--- a/packaging/macos/isle/Info.plist.in
+++ b/packaging/macos/isle/Info.plist.in
@@ -17,7 +17,7 @@
 	<key>CFBundleLongVersionString</key>
 	<string>@MACOSX_BUNDLE_LONG_VERSION_STRING@</string>
 	<key>CFBundleName</key>
-	<string>@ISLE_TARGET_NAME@</string>
+	<string>@MACOSX_ISLE_BUNDLE_NAME@</string>
 	<key>CFBundleDisplayName</key>
 	<string>@MACOSX_ISLE_BUNDLE_DISPLAY_NAME@</string>
 	<key>CFBundlePackageType</key>