diff --git a/SDL/CocoaBarItems.mm b/SDL/CocoaBarItems.mm
index ee7f246fde..e518c2ab12 100644
--- a/SDL/CocoaBarItems.mm
+++ b/SDL/CocoaBarItems.mm
@@ -452,7 +452,7 @@ void OSXOpenURL(const char *url) {
 
 -(void)chatAction: (NSMenuItem *)item {
     if (GetUIState() == UISTATE_INGAME) {
-        System_PostUIMessage(UIMessage::REQUEST_CHAT_SCREEN);
+        System_PostUIMessage(UIMessage::SHOW_CHAT_SCREEN);
     }
 }
 
@@ -631,14 +631,14 @@ TOGGLE_METHOD(FullScreen, g_Config.bFullScreen, System_MakeRequest(SystemRequest
 }
 
 -(void)openRecentItem: (NSMenuItem *)item {
-    System_PostUIMessage(UIMessage::REQUEST_BOOT_GAME, g_Config.RecentIsos()[item.tag].c_str());
+    System_PostUIMessage(UIMessage::REQUEST_GAME_BOOT, g_Config.RecentIsos()[item.tag].c_str());
 }
 
 -(void)openSystemFileBrowser {
     int g = 0;
     DarwinDirectoryPanelCallback callback = [g] (bool succ, Path thePathChosen) {
         if (succ)
-            System_PostUIMessage(UIMessage::REQUEST_BOOT_GAME, thePathChosen.c_str());
+            System_PostUIMessage(UIMessage::REQUEST_GAME_BOOT, thePathChosen.c_str());
     };
     
     DarwinFileSystemServices services;
diff --git a/UWP/UWPHelpers/LaunchItem.cpp b/UWP/UWPHelpers/LaunchItem.cpp
index d2c11610fd..4f06c173d3 100644
--- a/UWP/UWPHelpers/LaunchItem.cpp
+++ b/UWP/UWPHelpers/LaunchItem.cpp
@@ -95,7 +95,7 @@ public:
 				std::string path = GetFilePath();
 				// Delay to be able to launch on startup too
 				std::this_thread::sleep_for(std::chrono::milliseconds(100));
-				System_PostUIMessage("boot", path.c_str());
+				System_PostUIMessage(UIMessage::REQUEST_GAME_BOOT, path);
 			});
 		}
 	}
diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp
index 2e17b9d32e..38de01c013 100644
--- a/Windows/MainWindowMenu.cpp
+++ b/Windows/MainWindowMenu.cpp
@@ -457,8 +457,8 @@ namespace MainWindow {
 
 		case ID_TOGGLE_BREAK:
 			if (GetUIState() == UISTATE_PAUSEMENU) {
-				// Causes hang
-				//System_PostUIMessage("run", "");
+				// Causes hang (outdated comment?)
+				// System_PostUIMessage(UIMessage::REQUEST_GAME_RUN, "");
 
 				if (disasmWindow)
 					SendMessage(disasmWindow->GetDlgHandle(), WM_COMMAND, IDC_STOPGO, 0);