diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeForAllQueueMode.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneAllPlayersQueueMode.cs
similarity index 96%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneFreeForAllQueueMode.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneAllPlayersQueueMode.cs
index 967b9221bb..05cfd784eb 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeForAllQueueMode.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneAllPlayersQueueMode.cs
@@ -12,9 +12,9 @@ using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneFreeForAllQueueMode : QueueModeTestScene
+    public class TestSceneAllPlayersQueueMode : QueueModeTestScene
     {
-        protected override QueueMode Mode => QueueMode.FreeForAll;
+        protected override QueueMode Mode => QueueMode.AllPlayers;
 
         [Test]
         public void TestFirstItemSelectedByDefault()
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index cf14bfa312..b828379848 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
@@ -588,7 +588,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 roomManager.AddServerSideRoom(new Room
                 {
                     Name = { Value = "Test Room" },
-                    QueueMode = { Value = QueueMode.FreeForAll },
+                    QueueMode = { Value = QueueMode.AllPlayers },
                     Playlist =
                     {
                         new PlaylistItem
diff --git a/osu.Game/Online/Multiplayer/QueueMode.cs b/osu.Game/Online/Multiplayer/QueueMode.cs
index 3a9ea93658..026025890b 100644
--- a/osu.Game/Online/Multiplayer/QueueMode.cs
+++ b/osu.Game/Online/Multiplayer/QueueMode.cs
@@ -12,10 +12,10 @@ namespace osu.Game.Online.Multiplayer
         [Description("Host only")]
         HostOnly,
 
-        [Description("Free-for-all")]
-        FreeForAll,
+        [Description("All players")]
+        AllPlayers,
 
-        [Description("Fair rotate")]
-        FairRotate
+        [Description("All players (round robin)")]
+        AllPlayersRR
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 7a840a05cd..142beab024 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -392,8 +392,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                     AddOrEditPlaylistButton.Alpha = client.IsHost ? 1 : 0;
                     break;
 
-                case QueueMode.FreeForAll:
-                case QueueMode.FairRotate:
+                case QueueMode.AllPlayers:
+                case QueueMode.AllPlayersRR:
                     AddOrEditPlaylistButton.Text = "Add beatmap";
                     AddOrEditPlaylistButton.Alpha = 1;
                     break;
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 7e0312e566..e617ec3562 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -442,7 +442,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     newItem = room.Playlist.FirstOrDefault(i => !i.Expired) ?? room.Playlist.Last();
                     break;
 
-                case QueueMode.FairRotate:
+                case QueueMode.AllPlayersRR:
                     // Group playlist items by (user_id -> count_expired), and select the first available playlist item from a user that has available beatmaps where count_expired is the lowest.
                     throw new NotImplementedException();
             }