diff --git a/NitroxClient/GameLogic/Settings/NitroxSettingsManager.cs b/NitroxClient/GameLogic/Settings/NitroxSettingsManager.cs
index 5f6bc9b82d..e0b0bf43bf 100644
--- a/NitroxClient/GameLogic/Settings/NitroxSettingsManager.cs
+++ b/NitroxClient/GameLogic/Settings/NitroxSettingsManager.cs
@@ -27,7 +27,7 @@ private void MakeSettings()
             AddSetting("Nitrox_StreamerSettings", new Setting("Nitrox_HideIp", NitroxPrefs.HideIp, hide =>
             {
                 NitroxPrefs.HideIp.Value = hide;
-                MainMenuMultiplayerPanel.Main.RefreshServerEntries();
+                MainMenuServerListPanel.Main.RefreshServerEntries();
             }));
         }
 
diff --git a/NitroxClient/MonoBehaviours/Discord/DiscordClient.cs b/NitroxClient/MonoBehaviours/Discord/DiscordClient.cs
index 0ac714497b..ec0548a5b2 100644
--- a/NitroxClient/MonoBehaviours/Discord/DiscordClient.cs
+++ b/NitroxClient/MonoBehaviours/Discord/DiscordClient.cs
@@ -73,7 +73,7 @@ private void ActivityJoin(string secret)
     {
         Log.Info("[Discord] Joining Server");
 
-        if (SceneManager.GetActiveScene().name != "StartScreen" || !MainMenuMultiplayerPanel.Main)
+        if (SceneManager.GetActiveScene().name != "StartScreen" || !MainMenuServerListPanel.Main)
         {
             Log.InGame(Language.main.Get("Nitrox_DiscordMultiplayerMenu"));
             Log.Warn("[Discord] Can't join a server outside of the main-menu.");
diff --git a/NitroxClient/MonoBehaviours/Gui/MainMenu/JoinServer.cs b/NitroxClient/MonoBehaviours/Gui/MainMenu/JoinServer.cs
index f277ba06a2..a3fe84e940 100644
--- a/NitroxClient/MonoBehaviours/Gui/MainMenu/JoinServer.cs
+++ b/NitroxClient/MonoBehaviours/Gui/MainMenu/JoinServer.cs
@@ -84,7 +84,7 @@ private void Hide()
     private void Update()
     {
         if (multiplayerSession.CurrentState.CurrentStage != MultiplayerSessionConnectionStage.AWAITING_RESERVATION_CREDENTIALS ||
-            gameObject.GetComponent<MainMenuNotification>())
+            gameObject.GetComponent<JoinServerNotification>())
         {
             return;
         }
@@ -243,16 +243,16 @@ private void SessionConnectionStateChangedHandler(IMultiplayerSessionConnectionS
 
     private void NotifyUser(string notificationMessage, Action continuationAction = null)
     {
-        if (gameObject.GetComponent<MainMenuNotification>())
+        if (gameObject.GetComponent<JoinServerNotification>())
         {
             return;
         }
 
-        MainMenuNotification notificationDialog = gameObject.AddComponent<MainMenuNotification>();
+        JoinServerNotification notificationDialog = gameObject.AddComponent<JoinServerNotification>();
         notificationDialog.ShowNotification(notificationMessage, () =>
         {
             continuationAction?.Invoke();
-            Destroy(gameObject.GetComponent<MainMenuNotification>(), 0.0001f);
+            Destroy(gameObject.GetComponent<JoinServerNotification>(), 0.0001f);
         });
     }
 
diff --git a/NitroxClient/MonoBehaviours/Gui/MainMenu/MainMenuNotification.cs b/NitroxClient/MonoBehaviours/Gui/MainMenu/JoinServerNotification.cs
similarity index 98%
rename from NitroxClient/MonoBehaviours/Gui/MainMenu/MainMenuNotification.cs
rename to NitroxClient/MonoBehaviours/Gui/MainMenu/JoinServerNotification.cs
index 72ae15cd5b..7043064606 100644
--- a/NitroxClient/MonoBehaviours/Gui/MainMenu/MainMenuNotification.cs
+++ b/NitroxClient/MonoBehaviours/Gui/MainMenu/JoinServerNotification.cs
@@ -5,7 +5,7 @@
 namespace NitroxClient.MonoBehaviours.Gui.MainMenu
 {
     //I'd like to see about skinning this behavior with the notification window that appears at the bottom of the screen during certain story events in the game.
-    public class MainMenuNotification : MonoBehaviour
+    public class JoinServerNotification : MonoBehaviour
     {
         private bool awaitingAcknowledgement;
         private Action continuationAction;
diff --git a/NitroxClient/MonoBehaviours/Gui/MainMenu/MainMenuCreateServerPanel.cs b/NitroxClient/MonoBehaviours/Gui/MainMenu/MainMenuCreateServerPanel.cs
index aac77486c8..6209dbaa59 100644
--- a/NitroxClient/MonoBehaviours/Gui/MainMenu/MainMenuCreateServerPanel.cs
+++ b/NitroxClient/MonoBehaviours/Gui/MainMenu/MainMenuCreateServerPanel.cs
@@ -97,7 +97,7 @@ private void SaveServer()
         }
 
         int serverPort = int.Parse(serverPortText);
-        MainMenuMultiplayerPanel.Main.CreateServerButton(serverNameText, serverHostText, serverPort);
+        MainMenuServerListPanel.Main.CreateServerButton(serverNameText, serverHostText, serverPort);
         ServerList.Instance.Add(new ServerList.Entry(serverNameText, serverHostText, serverPort));
         ServerList.Instance.Save();
         OnBack();
@@ -163,11 +163,11 @@ public void SelectItem(object item)
         }
         else
         {
-            selectedItem.transform.GetChild(0).GetComponent<Image>().sprite = MainMenuMultiplayerPanel.SelectedSprite;
+            selectedItem.transform.GetChild(0).GetComponent<Image>().sprite = MainMenuServerListPanel.SelectedSprite;
         }
 
         selectedItem.GetComponentsInChildren<TextMeshProUGUI>().ForEach(txt => txt.color = Color.black);
-        RuntimeManager.PlayOneShot(MainMenuMultiplayerPanel.HoverSound.path);
+        RuntimeManager.PlayOneShot(MainMenuServerListPanel.HoverSound.path);
     }
 
     public void DeselectItem()
@@ -184,7 +184,7 @@ public void DeselectItem()
         }
         else
         {
-            selectedItem.transform.GetChild(0).GetComponent<Image>().sprite = MainMenuMultiplayerPanel.NormalSprite;
+            selectedItem.transform.GetChild(0).GetComponent<Image>().sprite = MainMenuServerListPanel.NormalSprite;
         }
 
         selectedItem.GetComponentsInChildren<TextMeshProUGUI>().ForEach(txt => txt.color = Color.white);
diff --git a/NitroxClient/MonoBehaviours/Gui/MainMenu/MainMenuMods.cs b/NitroxClient/MonoBehaviours/Gui/MainMenu/MainMenuMods.cs
deleted file mode 100644
index adc5e4ebdd..0000000000
--- a/NitroxClient/MonoBehaviours/Gui/MainMenu/MainMenuMods.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using NitroxClient.MonoBehaviours.Discord;
-using NitroxClient.Unity.Helper;
-using TMPro;
-using UnityEngine;
-using UnityEngine.SceneManagement;
-using UnityEngine.UI;
-
-namespace NitroxClient.MonoBehaviours.Gui.MainMenu
-{
-    public class MainMenuMods : MonoBehaviour
-    {
-        private MainMenuRightSide rightSide;
-
-        private void OnEnable()
-        {
-            SceneManager.sceneLoaded += SceneManager_sceneLoaded;
-        }
-
-        private void OnDisable()
-        {
-            SceneManager.sceneLoaded -= SceneManager_sceneLoaded;
-        }
-
-        private void SceneManager_sceneLoaded(Scene scene, LoadSceneMode loadMode)
-        {
-            if (scene.name == "XMenu")
-            {
-                rightSide = MainMenuRightSide.main;
-                MultiplayerMenuMods();
-                DiscordClient.InitializeRPMenu();
-            }
-        }
-
-        private void MultiplayerMenuMods()
-        {
-            GameObject startButton = GameObjectHelper.RequireGameObject("Menu canvas/Panel/MainMenu/PrimaryOptions/MenuButtons/ButtonPlay");
-            GameObject showLoadedMultiplayer = Instantiate(startButton, startButton.transform.parent);
-            showLoadedMultiplayer.name = "ButtonMultiplayer";
-            showLoadedMultiplayer.transform.SetSiblingIndex(3);
-
-            TextMeshProUGUI buttonText = showLoadedMultiplayer.RequireGameObject("Circle/Bar/Text").GetComponent<TextMeshProUGUI>();
-            buttonText.text = Language.main.Get("Nitrox_Multiplayer");
-            buttonText.GetComponent<TranslationLiveUpdate>().translationKey = "Nitrox_Multiplayer";
-
-
-            Button showLoadedMultiplayerButton = showLoadedMultiplayer.GetComponent<Button>();
-            showLoadedMultiplayerButton.onClick.RemoveAllListeners();
-            showLoadedMultiplayerButton.onClick.AddListener(ShowMultiplayerMenu);
-
-            GameObject savedGamesRef = rightSide.gameObject.RequireGameObject("SavedGames");
-
-            GameObject CloneMainMenuLoadPanel(string panelName, string translationKey)
-            {
-                GameObject menuPanel = Instantiate(savedGamesRef, rightSide.transform);
-                menuPanel.name = panelName;
-                Transform header = menuPanel.RequireTransform("Header");
-                header.GetComponent<TextMeshProUGUI>().text = Language.main.Get(translationKey);
-                header.GetComponent<TranslationLiveUpdate>().translationKey = translationKey;
-                Destroy(menuPanel.RequireGameObject("Scroll View/Viewport/SavedGameAreaContent/NewGame"));
-                Destroy(menuPanel.GetComponent<MainMenuLoadPanel>());
-                Destroy(menuPanel.GetComponentInChildren<MainMenuLoadMenu>());
-
-                rightSide.groups.Add(menuPanel.GetComponent<MainMenuGroup>());
-                return menuPanel;
-            }
-
-            GameObject serverList = CloneMainMenuLoadPanel("MultiplayerServerList", "Nitrox_Multiplayer");
-            serverList.AddComponent<MainMenuMultiplayerPanel>().Setup(savedGamesRef);
-
-            GameObject serverCreate = CloneMainMenuLoadPanel("MultiplayerCreateServer", "Nitrox_AddServer");
-            serverCreate.AddComponent<MainMenuCreateServerPanel>().Setup(savedGamesRef);
-
-
-#if RELEASE
-            // Remove singleplayer button because SP is broken when Nitrox is injected. TODO: Allow SP to work and co-exist with Nitrox MP in the future
-            startButton.SetActive(false);
-#endif
-        }
-
-        private void ShowMultiplayerMenu()
-        {
-            rightSide.OpenGroup("MultiplayerServerList");
-        }
-    }
-}
diff --git a/NitroxClient/MonoBehaviours/Gui/MainMenu/MainMenuServerButton.cs b/NitroxClient/MonoBehaviours/Gui/MainMenu/MainMenuServerButton.cs
index 1cc4dae13c..cadd56411f 100644
--- a/NitroxClient/MonoBehaviours/Gui/MainMenu/MainMenuServerButton.cs
+++ b/NitroxClient/MonoBehaviours/Gui/MainMenu/MainMenuServerButton.cs
@@ -55,10 +55,10 @@ public void RequestDelete()
         ServerList.Instance.RemoveAt(transform.GetSiblingIndex() - 1);
         ServerList.Instance.Save();
 
-        int scrollIndex = MainMenuMultiplayerPanel.Main.GetSelectedIndex();
-        if (GameInput.IsPrimaryDeviceGamepad() && !MainMenuMultiplayerPanel.Main.SelectItemInYDirection(scrollIndex, 1))
+        int scrollIndex = MainMenuServerListPanel.Main.GetSelectedIndex();
+        if (GameInput.IsPrimaryDeviceGamepad() && !MainMenuServerListPanel.Main.SelectItemInYDirection(scrollIndex, 1))
         {
-            MainMenuMultiplayerPanel.Main.SelectItemInYDirection(scrollIndex, -1);
+            MainMenuServerListPanel.Main.SelectItemInYDirection(scrollIndex, -1);
         }
 
         Destroy(gameObject);
@@ -66,22 +66,22 @@ public void RequestDelete()
 
     public async void OnJoinButtonClicked()
     {
-        if (MainMenuMultiplayerPanel.Main.IsJoining)
+        if (MainMenuServerListPanel.Main.IsJoining)
         {
             // Do not attempt to join multiple servers.
             return;
         }
 
-        MainMenuMultiplayerPanel.Main.IsJoining = true;
+        MainMenuServerListPanel.Main.IsJoining = true;
 
-        await OpenJoinServerMenuAsync(joinIp, joinPort).ContinueWith(_ => { MainMenuMultiplayerPanel.Main.IsJoining = false; });
+        await OpenJoinServerMenuAsync(joinIp, joinPort).ContinueWith(_ => { MainMenuServerListPanel.Main.IsJoining = false; });
     }
 
     public static async System.Threading.Tasks.Task OpenJoinServerMenuAsync(string serverIp, int serverPort)
     {
-        if (!MainMenuMultiplayerPanel.Main)
+        if (!MainMenuServerListPanel.Main)
         {
-            Log.Error("MainMenuMultiplayerPanel is not instantiated although OpenJoinServerMenuAsync is called.");
+            Log.Error("MainMenuServerListPanel is not instantiated although OpenJoinServerMenuAsync is called.");
             return;
         }
 
@@ -92,7 +92,7 @@ public static async System.Threading.Tasks.Task OpenJoinServerMenuAsync(string s
             return;
         }
 
-        await MainMenuMultiplayerPanel.Main.JoinServer.ShowAsync(endpoint.Address.ToString(), endpoint.Port);
+        await MainMenuServerListPanel.Main.JoinServer.ShowAsync(endpoint.Address.ToString(), endpoint.Port);
     }
 
     private static IPEndPoint ResolveIPEndPoint(string serverIp, int serverPort)
diff --git a/NitroxClient/MonoBehaviours/Gui/MainMenu/MainMenuMultiplayerPanel.cs b/NitroxClient/MonoBehaviours/Gui/MainMenu/MainMenuServerListPanel.cs
similarity index 98%
rename from NitroxClient/MonoBehaviours/Gui/MainMenu/MainMenuMultiplayerPanel.cs
rename to NitroxClient/MonoBehaviours/Gui/MainMenu/MainMenuServerListPanel.cs
index cd1baf7f08..3b744fd1b2 100644
--- a/NitroxClient/MonoBehaviours/Gui/MainMenu/MainMenuMultiplayerPanel.cs
+++ b/NitroxClient/MonoBehaviours/Gui/MainMenu/MainMenuServerListPanel.cs
@@ -10,9 +10,9 @@
 
 namespace NitroxClient.MonoBehaviours.Gui.MainMenu;
 
-public class MainMenuMultiplayerPanel : MonoBehaviour, uGUI_INavigableIconGrid, uGUI_IButtonReceiver
+public class MainMenuServerListPanel : MonoBehaviour, uGUI_INavigableIconGrid, uGUI_IButtonReceiver
 {
-    public static MainMenuMultiplayerPanel Main;
+    public static MainMenuServerListPanel Main;
     public static Sprite NormalSprite;
     public static Sprite SelectedSprite;
     public static FMODAsset HoverSound;
diff --git a/NitroxClient/MonoBehaviours/Gui/MainMenu/NitroxMainMenuModifications.cs b/NitroxClient/MonoBehaviours/Gui/MainMenu/NitroxMainMenuModifications.cs
new file mode 100644
index 0000000000..b6a8e9c7ca
--- /dev/null
+++ b/NitroxClient/MonoBehaviours/Gui/MainMenu/NitroxMainMenuModifications.cs
@@ -0,0 +1,82 @@
+using NitroxClient.MonoBehaviours.Discord;
+using NitroxClient.Unity.Helper;
+using TMPro;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+using UnityEngine.UI;
+
+namespace NitroxClient.MonoBehaviours.Gui.MainMenu;
+
+public class NitroxMainMenuModifications : MonoBehaviour
+{
+    private MainMenuRightSide rightSide;
+
+    private void OnEnable()
+    {
+        SceneManager.sceneLoaded += SceneManager_sceneLoaded;
+    }
+
+    private void OnDisable()
+    {
+        SceneManager.sceneLoaded -= SceneManager_sceneLoaded;
+    }
+
+    private void SceneManager_sceneLoaded(Scene scene, LoadSceneMode loadMode)
+    {
+        if (scene.name == "XMenu")
+        {
+            rightSide = MainMenuRightSide.main;
+            MultiplayerMenuMods();
+            DiscordClient.InitializeRPMenu();
+        }
+    }
+
+    private void MultiplayerMenuMods()
+    {
+        GameObject startButton = GameObjectHelper.RequireGameObject("Menu canvas/Panel/MainMenu/PrimaryOptions/MenuButtons/ButtonPlay");
+        GameObject showLoadedMultiplayer = Instantiate(startButton, startButton.transform.parent);
+        showLoadedMultiplayer.name = "ButtonMultiplayer";
+        showLoadedMultiplayer.transform.SetSiblingIndex(3);
+
+        TextMeshProUGUI buttonText = showLoadedMultiplayer.RequireGameObject("Circle/Bar/Text").GetComponent<TextMeshProUGUI>();
+        buttonText.text = Language.main.Get("Nitrox_Multiplayer");
+        buttonText.GetComponent<TranslationLiveUpdate>().translationKey = "Nitrox_Multiplayer";
+
+        Button showLoadedMultiplayerButton = showLoadedMultiplayer.GetComponent<Button>();
+        showLoadedMultiplayerButton.onClick.RemoveAllListeners();
+        showLoadedMultiplayerButton.onClick.AddListener(ShowMultiplayerServerList);
+
+        GameObject savedGamesRef = rightSide.gameObject.RequireGameObject("SavedGames");
+
+        GameObject CloneMainMenuLoadPanel(string panelName, string translationKey)
+        {
+            GameObject menuPanel = Instantiate(savedGamesRef, rightSide.transform);
+            menuPanel.name = panelName;
+            Transform header = menuPanel.RequireTransform("Header");
+            header.GetComponent<TextMeshProUGUI>().text = Language.main.Get(translationKey);
+            header.GetComponent<TranslationLiveUpdate>().translationKey = translationKey;
+            Destroy(menuPanel.RequireGameObject("Scroll View/Viewport/SavedGameAreaContent/NewGame"));
+            Destroy(menuPanel.GetComponent<MainMenuLoadPanel>());
+            Destroy(menuPanel.GetComponentInChildren<MainMenuLoadMenu>());
+
+            rightSide.groups.Add(menuPanel.GetComponent<MainMenuGroup>());
+            return menuPanel;
+        }
+
+        GameObject serverList = CloneMainMenuLoadPanel("MultiplayerServerList", "Nitrox_Multiplayer");
+        serverList.AddComponent<MainMenuServerListPanel>().Setup(savedGamesRef);
+
+        GameObject serverCreate = CloneMainMenuLoadPanel("MultiplayerCreateServer", "Nitrox_AddServer");
+        serverCreate.AddComponent<MainMenuCreateServerPanel>().Setup(savedGamesRef);
+
+#if RELEASE
+            // Remove singleplayer button because SP is broken when Nitrox is injected. TODO: Allow SP to work and co-exist with Nitrox MP in the future
+            startButton.SetActive(false);
+#endif
+    }
+
+    private void ShowMultiplayerServerList()
+    {
+        rightSide.OpenGroup("MultiplayerServerList");
+    }
+}
diff --git a/NitroxClient/MonoBehaviours/NitroxBootstrapper.cs b/NitroxClient/MonoBehaviours/NitroxBootstrapper.cs
index 3bed75a1d3..6eca6fba68 100644
--- a/NitroxClient/MonoBehaviours/NitroxBootstrapper.cs
+++ b/NitroxClient/MonoBehaviours/NitroxBootstrapper.cs
@@ -12,7 +12,7 @@ private void Awake()
             DontDestroyOnLoad(gameObject);
             Instance = this;
             gameObject.AddComponent<SceneCleanerPreserve>();
-            gameObject.AddComponent<MainMenuMods>();
+            gameObject.AddComponent<NitroxMainMenuModifications>();
             gameObject.AddComponent<DiscordClient>();
 
 #if DEBUG
diff --git a/NitroxPatcher/Patches/Persistent/MainMenuRightSide_OpenGroup_Patch.cs b/NitroxPatcher/Patches/Persistent/MainMenuRightSide_OpenGroup_Patch.cs
index 036feefa57..c1aa3b2cd1 100644
--- a/NitroxPatcher/Patches/Persistent/MainMenuRightSide_OpenGroup_Patch.cs
+++ b/NitroxPatcher/Patches/Persistent/MainMenuRightSide_OpenGroup_Patch.cs
@@ -13,9 +13,9 @@ public static void Prefix(string target)
         {
             // Don't stop the client if the client is trying to connect (in the case: target = "Join Server")
             // We can detect that the Join Server tab is still available because the gameobject is activated only when the tab is opened
-            if (MainMenuMultiplayerPanel.Main.JoinServer.gameObject.activeSelf && !target.Equals(MainMenuMultiplayerPanel.Main.JoinServer.MenuName))
+            if (MainMenuServerListPanel.Main.JoinServer.gameObject.activeSelf && !target.Equals(MainMenuServerListPanel.Main.JoinServer.MenuName))
             {
-                MainMenuMultiplayerPanel.Main.JoinServer.StopMultiplayerClient();
+                MainMenuServerListPanel.Main.JoinServer.StopMultiplayerClient();
             }
         }