diff --git a/osu.Game.Tests/Visual/Gameplay/TestCaseKeyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestCaseKeyCounter.cs
index f616ffe4ed..4b55879224 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestCaseKeyCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestCaseKeyCounter.cs
@@ -20,13 +20,13 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             typeof(KeyCounterKeyboard),
             typeof(KeyCounterMouse),
-            typeof(KeyCounterCollection)
+            typeof(KeyCounterDisplay)
         };
 
         public TestCaseKeyCounter()
         {
             KeyCounterKeyboard rewindTestKeyCounterKeyboard;
-            KeyCounterCollection kc = new KeyCounterCollection
+            KeyCounterDisplay kc = new KeyCounterDisplay
             {
                 Origin = Anchor.Centre,
                 Anchor = Anchor.Centre,
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 9efc0b1f4e..6e4a9cfc0a 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -211,7 +211,7 @@ namespace osu.Game.Rulesets.UI
         /// <returns>The DrawableHitObject.</returns>
         public abstract DrawableHitObject<TObject> GetVisualRepresentation(TObject h);
 
-        public void Attach(KeyCounterCollection keyCounter) =>
+        public void Attach(KeyCounterDisplay keyCounter) =>
             (KeyBindingInputManager as ICanAttachKeyCounter)?.Attach(keyCounter);
 
         /// <summary>
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index f88c8e024e..b4271085f5 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -40,8 +40,9 @@ namespace osu.Game.Rulesets.UI
 
         protected RulesetInputManager(RulesetInfo ruleset, int variant, SimultaneousBindingMode unique)
         {
-            InternalChild = KeyBindingContainer = CreateKeyBindingContainer(ruleset, variant, unique)
-                .WithChild(content = new Container { RelativeSizeAxes = Axes.Both });
+            InternalChild = KeyBindingContainer =
+                CreateKeyBindingContainer(ruleset, variant, unique)
+                    .WithChild(content = new Container { RelativeSizeAxes = Axes.Both });
         }
 
         [BackgroundDependencyLoader(true)]
@@ -118,18 +119,19 @@ namespace osu.Game.Rulesets.UI
 
         #region Key Counter Attachment
 
-        public void Attach(KeyCounterCollection keyCounter)
+        public void Attach(KeyCounterDisplay keyCounter)
         {
             var receptor = new ActionReceptor(keyCounter);
-            Add(receptor);
-            keyCounter.SetReceptor(receptor);
 
+            KeyBindingContainer.Add(receptor);
+
+            keyCounter.SetReceptor(receptor);
             keyCounter.AddRange(KeyBindingContainer.DefaultKeyBindings.Select(b => b.GetAction<T>()).Distinct().Select(b => new KeyCounterAction<T>(b)));
         }
 
-        public class ActionReceptor : KeyCounterCollection.Receptor, IKeyBindingHandler<T>
+        public class ActionReceptor : KeyCounterDisplay.Receptor, IKeyBindingHandler<T>
         {
-            public ActionReceptor(KeyCounterCollection target)
+            public ActionReceptor(KeyCounterDisplay target)
                 : base(target)
             {
             }
@@ -162,12 +164,12 @@ namespace osu.Game.Rulesets.UI
     }
 
     /// <summary>
-    /// Supports attaching a <see cref="KeyCounterCollection"/>.
+    /// Supports attaching a <see cref="KeyCounterDisplay"/>.
     /// Keys will be populated automatically and a receptor will be injected inside.
     /// </summary>
     public interface ICanAttachKeyCounter
     {
-        void Attach(KeyCounterCollection keyCounter);
+        void Attach(KeyCounterDisplay keyCounter);
     }
 
     public class RulesetInputManagerInputState<T> : InputState
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 285e6eab23..a7b7f96e7a 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.Play
     {
         private const int duration = 100;
 
-        public readonly KeyCounterCollection KeyCounter;
+        public readonly KeyCounterDisplay KeyCounter;
         public readonly RollingCounter<int> ComboCounter;
         public readonly ScoreCounter ScoreCounter;
         public readonly RollingCounter<double> AccuracyCounter;
@@ -201,7 +201,7 @@ namespace osu.Game.Screens.Play
             Margin = new MarginPadding { Top = 20 }
         };
 
-        protected virtual KeyCounterCollection CreateKeyCounter() => new KeyCounterCollection
+        protected virtual KeyCounterDisplay CreateKeyCounter() => new KeyCounterDisplay
         {
             FadeTime = 50,
             Anchor = Anchor.BottomRight,
diff --git a/osu.Game/Screens/Play/KeyCounterCollection.cs b/osu.Game/Screens/Play/KeyCounterDisplay.cs
similarity index 95%
rename from osu.Game/Screens/Play/KeyCounterCollection.cs
rename to osu.Game/Screens/Play/KeyCounterDisplay.cs
index 1b43737731..d5967f5899 100644
--- a/osu.Game/Screens/Play/KeyCounterCollection.cs
+++ b/osu.Game/Screens/Play/KeyCounterDisplay.cs
@@ -14,14 +14,14 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play
 {
-    public class KeyCounterCollection : FillFlowContainer<KeyCounter>
+    public class KeyCounterDisplay : FillFlowContainer<KeyCounter>
     {
         private const int duration = 100;
 
         public readonly Bindable<bool> Visible = new Bindable<bool>(true);
         private readonly Bindable<bool> configVisibility = new Bindable<bool>();
 
-        public KeyCounterCollection()
+        public KeyCounterDisplay()
         {
             Direction = FillDirection.Horizontal;
             AutoSizeAxes = Axes.Both;
@@ -138,9 +138,9 @@ namespace osu.Game.Screens.Play
 
         public class Receptor : Drawable
         {
-            protected readonly KeyCounterCollection Target;
+            protected readonly KeyCounterDisplay Target;
 
-            public Receptor(KeyCounterCollection target)
+            public Receptor(KeyCounterDisplay target)
             {
                 RelativeSizeAxes = Axes.Both;
                 Depth = float.MinValue;