diff --git a/osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs b/osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs
index 83627a519a..9e8083310c 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs
@@ -14,9 +14,9 @@ using osu.Game;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.Chat;
-using osu.Game.Online.Chat.Display;
 using OpenTK;
 using osu.Framework.Allocation;
+using osu.Game.Online.Chat.Drawables;
 
 namespace osu.Desktop.VisualTests.Tests
 {
diff --git a/osu.Game/Online/Chat/Display/ChannelDisplay.cs b/osu.Game/Online/Chat/Drawables/ChannelDisplay.cs
similarity index 92%
rename from osu.Game/Online/Chat/Display/ChannelDisplay.cs
rename to osu.Game/Online/Chat/Drawables/ChannelDisplay.cs
index 93e235f3f3..041163b19a 100644
--- a/osu.Game/Online/Chat/Display/ChannelDisplay.cs
+++ b/osu.Game/Online/Chat/Drawables/ChannelDisplay.cs
@@ -4,15 +4,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transformations;
 using OpenTK;
-using osu.Framework;
-using osu.Framework.Allocation;
 
-namespace osu.Game.Online.Chat.Display
+namespace osu.Game.Online.Chat.Drawables
 {
     public class ChannelDisplay : Container
     {
diff --git a/osu.Game/Online/Chat/Display/ChatLine.cs b/osu.Game/Online/Chat/Drawables/ChatLine.cs
similarity index 95%
rename from osu.Game/Online/Chat/Display/ChatLine.cs
rename to osu.Game/Online/Chat/Drawables/ChatLine.cs
index b582bc5a6d..454f7beed7 100644
--- a/osu.Game/Online/Chat/Display/ChatLine.cs
+++ b/osu.Game/Online/Chat/Drawables/ChatLine.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Sprites;
 using OpenTK;
 using OpenTK.Graphics;
 
-namespace osu.Game.Online.Chat.Display
+namespace osu.Game.Online.Chat.Drawables
 {
     public class ChatLine : Container
     {
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 3c5c27ecb9..1067f271ba 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -30,7 +30,7 @@ namespace osu.Game
     {
         public Toolbar Toolbar;
 
-        private ChatConsole chat;
+        private ChatOverlay chat;
 
         private MusicController musicController;
 
@@ -115,7 +115,7 @@ namespace osu.Game
             });
 
             //overlay elements
-            (chat = new ChatConsole(API) { Depth = 0 }).Preload(this, overlayContent.Add);
+            (chat = new ChatOverlay { Depth = 0 }).Preload(this, overlayContent.Add);
             (Options = new OptionsOverlay { Depth = -1 }).Preload(this, overlayContent.Add);
             (musicController = new MusicController() { Depth = -3 }).Preload(this, overlayContent.Add);
             (Toolbar = new Toolbar
diff --git a/osu.Game/Overlays/ChatConsole.cs b/osu.Game/Overlays/ChatOverlay.cs
similarity index 90%
rename from osu.Game/Overlays/ChatConsole.cs
rename to osu.Game/Overlays/ChatOverlay.cs
index 255cf4589c..a0d7384583 100644
--- a/osu.Game/Overlays/ChatConsole.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -6,7 +6,6 @@ using System.Diagnostics;
 using System.Linq;
 using OpenTK;
 using OpenTK.Graphics;
-using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -16,11 +15,11 @@ using osu.Framework.Threading;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.Chat;
-using osu.Game.Online.Chat.Display;
+using osu.Game.Online.Chat.Drawables;
 
 namespace osu.Game.Overlays
 {
-    public class ChatConsole : OverlayContainer
+    public class ChatOverlay : OverlayContainer, IOnlineComponent
     {
         private ChannelDisplay channelDisplay;
 
@@ -32,7 +31,7 @@ namespace osu.Game.Overlays
 
         private APIAccess api;
 
-        public ChatConsole()
+        public ChatOverlay()
         {
             RelativeSizeAxes = Axes.X;
             Size = new Vector2(1, 300);
@@ -148,5 +147,10 @@ namespace osu.Game.Overlays
             MoveToY(DrawSize.Y, transition_length, EasingTypes.InSine);
             FadeOut(transition_length, EasingTypes.InSine);
         }
+
+        public void APIStateChanged(APIAccess api, APIState state)
+        {
+            throw new System.NotImplementedException();
+        }
     }
 }
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 2c28be06b1..581ab7916d 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -151,13 +151,13 @@
     <Compile Include="Online\API\SecurePassword.cs" />
     <Compile Include="Online\API\Requests\ListChannels.cs" />
     <Compile Include="Online\Chat\Channel.cs" />
-    <Compile Include="Online\Chat\Display\ChannelDisplay.cs" />
-    <Compile Include="Online\Chat\Display\ChatLine.cs" />
+    <Compile Include="Online\Chat\Drawables\ChannelDisplay.cs" />
+    <Compile Include="Online\Chat\Drawables\ChatLine.cs" />
     <Compile Include="Online\Chat\Message.cs" />
     <Compile Include="Online\User.cs" />
     <Compile Include="OsuGame.cs" />
     <Compile Include="OsuGameBase.cs" />
-    <Compile Include="Overlays\ChatConsole.cs" />
+    <Compile Include="Overlays\ChatOverlay.cs" />
     <Compile Include="Overlays\OptionsOverlay.cs" />
     <Compile Include="Overlays\Toolbar.cs" />
     <Compile Include="Overlays\ToolbarButton.cs" />