diff --git a/osu.Game/Graphics/Cursor/OsuCursorContainer.cs b/osu.Game/Graphics/Cursor/OsuCursorVisualiser.cs
similarity index 85%
rename from osu.Game/Graphics/Cursor/OsuCursorContainer.cs
rename to osu.Game/Graphics/Cursor/OsuCursorVisualiser.cs
index bc4e084813..2b2ab593aa 100644
--- a/osu.Game/Graphics/Cursor/OsuCursorContainer.cs
+++ b/osu.Game/Graphics/Cursor/OsuCursorVisualiser.cs
@@ -9,7 +9,10 @@ using osu.Framework.Input;
 
 namespace osu.Game.Graphics.Cursor
 {
-    public class OsuCursorContainer : Container, IProvideCursor
+    /// <summary>
+    /// Visualises different cursors depending on the currently-hovered <see cref="Drawable"/>s.
+    /// </summary>
+    public class OsuCursorVisualiser : Container, IProvideCursor
     {
         protected override Container<Drawable> Content => content;
         private readonly Container content;
@@ -22,7 +25,7 @@ namespace osu.Game.Graphics.Cursor
         public CursorContainer Cursor { get; }
         public bool ProvidesUserCursor => true;
 
-        public OsuCursorContainer()
+        public OsuCursorVisualiser()
         {
             AddRangeInternal(new Drawable[]
             {
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index fb20fd57fa..3dda26fc02 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -445,7 +445,7 @@ namespace osu.Game
 
             mainContent.Padding = new MarginPadding { Top = ToolbarOffset };
 
-            CursorContainer.CanShowCursor = currentScreen?.CursorVisible ?? false;
+            CursorVisualiser.CanShowCursor = currentScreen?.CursorVisible ?? false;
         }
 
         private void screenAdded(Screen newScreen)
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index c615b212c3..61ad4024f0 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -44,7 +44,7 @@ namespace osu.Game
 
         protected KeyBindingStore KeyBindingStore;
 
-        protected OsuCursorContainer CursorContainer;
+        protected OsuCursorVisualiser CursorVisualiser;
 
         protected override string MainResourceFile => @"osu.Game.Resources.dll";
 
@@ -211,14 +211,14 @@ namespace osu.Game
 
             GlobalKeyBindingInputManager globalBinding;
 
-            CursorContainer = new OsuCursorContainer { RelativeSizeAxes = Axes.Both };
-            CursorContainer.Child = globalBinding = new GlobalKeyBindingInputManager(this)
+            CursorVisualiser = new OsuCursorVisualiser { RelativeSizeAxes = Axes.Both };
+            CursorVisualiser.Child = globalBinding = new GlobalKeyBindingInputManager(this)
             {
                 RelativeSizeAxes = Axes.Both,
-                Child = content = new OsuTooltipContainer(CursorContainer.Cursor) { RelativeSizeAxes = Axes.Both　}
+                Child = content = new OsuTooltipContainer(CursorVisualiser.Cursor) { RelativeSizeAxes = Axes.Both　}
             };
 
-            base.Content.Add(new DrawSizePreservingFillContainer { Child = CursorContainer });
+            base.Content.Add(new DrawSizePreservingFillContainer { Child = CursorVisualiser });
 
             KeyBindingStore.Register(globalBinding);
             dependencies.Cache(globalBinding);
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 7175e813f4..fd53a211e0 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -377,7 +377,7 @@
     <Compile Include="Graphics\Cursor\IProvideCursor.cs" />
     <Compile Include="Graphics\Cursor\MenuCursor.cs" />
     <Compile Include="Graphics\Cursor\OsuContextMenuContainer.cs" />
-    <Compile Include="Graphics\Cursor\OsuCursorContainer.cs" />
+    <Compile Include="Graphics\Cursor\OsuCursorVisualiser.cs" />
     <Compile Include="Graphics\Cursor\OsuTooltipContainer.cs" />
     <Compile Include="Graphics\IHasAccentColour.cs" />
     <Compile Include="Graphics\OsuColour.cs" />