diff --git a/osu.Desktop.VisualTests/Tests/TestCaseDrawableMultiplayerRoom.cs b/osu.Desktop.VisualTests/Tests/TestCaseDrawableRoom.cs
similarity index 89%
rename from osu.Desktop.VisualTests/Tests/TestCaseDrawableMultiplayerRoom.cs
rename to osu.Desktop.VisualTests/Tests/TestCaseDrawableRoom.cs
index 1c6c0d6420..8150de9fb8 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseDrawableMultiplayerRoom.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseDrawableRoom.cs
@@ -11,7 +11,7 @@ using osu.Game.Database;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    internal class TestCaseDrawableMultiplayerRoom : TestCase
+    internal class TestCaseDrawableRoom : TestCase
     {
         public override string Description => @"Select your favourite room";
 
@@ -19,7 +19,7 @@ namespace osu.Desktop.VisualTests.Tests
         {
             base.Reset();
 
-            DrawableMultiplayerRoom p;
+            DrawableRoom p;
             Add(new FillFlowContainer
             {
                 Anchor = Anchor.Centre,
@@ -29,14 +29,14 @@ namespace osu.Desktop.VisualTests.Tests
                 Direction = FillDirection.Vertical,
                 Children = new Drawable[]
                 {
-                    p = new DrawableMultiplayerRoom(new MultiplayerRoom
+                    p = new DrawableRoom(new Room
                     {
                         Name = @"Great Room Right Here",
                         Host = new User { Username = @"Naeferith", Id = 9492835, Country = new Country { FlagName = @"FR" }},
                         Status = MultiplayerRoomStatus.Open,
                         CurrentBeatmap = new BeatmapMetadata { Title = @"Seiryu", Artist = @"Critical Crystal" },
                     }),
-                    new DrawableMultiplayerRoom(new MultiplayerRoom
+                    new DrawableRoom(new Room
                     {
                         Name = @"Relax It's The Weekend",
                         Host = new User{ Username = @"peppy", Id = 2, Country = new Country { FlagName = @"AU" }},
diff --git a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
index fa507527aa..6e6f0a691d 100644
--- a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
+++ b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
@@ -220,7 +220,7 @@
     <Compile Include="Tests\TestCaseLeaderboard.cs" />
     <Compile Include="Beatmaps\TestWorkingBeatmap.cs" />
     <Compile Include="Tests\TestCaseBeatmapDetailArea.cs" />
-    <Compile Include="Tests\TestCaseDrawableMultiplayerRoom.cs" />
+    <Compile Include="Tests\TestCaseDrawableRoom.cs" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup />
diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoom.cs b/osu.Game/Online/Multiplayer/Room.cs
similarity index 91%
rename from osu.Game/Online/Multiplayer/MultiplayerRoom.cs
rename to osu.Game/Online/Multiplayer/Room.cs
index 5c9e72bcf2..9def99386d 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/Multiplayer/Room.cs
@@ -7,7 +7,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Online.Multiplayer
 {
-    public class MultiplayerRoom
+    public class Room
     {
         public string Name { get; set; }
         public User Host { get; set; }
diff --git a/osu.Game/Screens/Multiplayer/DrawableMultiplayerRoom.cs b/osu.Game/Screens/Multiplayer/DrawableRoom.cs
similarity index 95%
rename from osu.Game/Screens/Multiplayer/DrawableMultiplayerRoom.cs
rename to osu.Game/Screens/Multiplayer/DrawableRoom.cs
index 37182cb692..4a7622b888 100644
--- a/osu.Game/Screens/Multiplayer/DrawableMultiplayerRoom.cs
+++ b/osu.Game/Screens/Multiplayer/DrawableRoom.cs
@@ -18,7 +18,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Screens.Multiplayer
 {
-    public class DrawableMultiplayerRoom : ClickableContainer
+    public class DrawableRoom : ClickableContainer
     {
         private const float content_padding = 5;
         private const float height = 90;
@@ -39,11 +39,11 @@ namespace osu.Game.Screens.Multiplayer
         private Color4 playingColour;
         private LocalisationEngine localisation;
 
-        public readonly Bindable<MultiplayerRoom> Room;
+        public readonly Bindable<Room> Room;
 
-        public DrawableMultiplayerRoom(MultiplayerRoom room)
+        public DrawableRoom(Room room)
         {
-            Room = new Bindable<MultiplayerRoom>(room);
+            Room = new Bindable<Room>(room);
 
             RelativeSizeAxes = Axes.X;
             Height = height;
@@ -206,7 +206,7 @@ namespace osu.Game.Screens.Multiplayer
             Room.TriggerChange();
         }
 
-        private void displayRoom(MultiplayerRoom room)
+        private void displayRoom(Room room)
         {
             name.Text = room.Name;
             status.Text = room.Status.GetDescription();
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 27bcb8fa39..7af7bdf1e6 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -425,8 +425,8 @@
     <Compile Include="Overlays\Music\PlaylistOverlay.cs" />
     <Compile Include="Rulesets\Replays\IAutoGenerator.cs" />
     <Compile Include="Rulesets\Replays\AutoGenerator.cs" />
-    <Compile Include="Screens\Multiplayer\DrawableMultiplayerRoom.cs" />
-    <Compile Include="Online\Multiplayer\MultiplayerRoom.cs" />
+    <Compile Include="Screens\Multiplayer\DrawableRoom.cs" />
+    <Compile Include="Online\Multiplayer\Room.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj">