diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs
index cd30d8df83..1a273153bd 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs
@@ -579,7 +579,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         private void checkNotPressed(OsuAction action) => AddAssert($"Not pressing {action}", () => !osuInputManager.PressedActions.Contains(action));
         private void checkPressed(OsuAction action) => AddAssert($"Is pressing {action}", () => osuInputManager.PressedActions.Contains(action));
 
-        public partial class TestActionKeyCounter : KeyCounter.Trigger, IKeyBindingHandler<OsuAction>
+        public partial class TestActionKeyCounter : KeyCounter.InputTrigger, IKeyBindingHandler<OsuAction>
         {
             public OsuAction Action { get; }
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
index 60ebce4f52..f652a62489 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 kc.Add(kc.CreateKeyCounter(new KeyCounterKeyboard(key)));
             });
 
-            Key testKey = ((KeyCounterKeyboard)kc.Children.First().CounterTrigger).Key;
+            Key testKey = ((KeyCounterKeyboard)kc.Children.First().Trigger).Key;
 
             void addPressKeyStep()
             {
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 0fa1f0b332..22dc6567eb 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -176,14 +176,14 @@ namespace osu.Game.Rulesets.UI
             {
             }
 
-            public bool OnPressed(KeyBindingPressEvent<T> e) => Target.Children.Where(c => c.CounterTrigger is KeyCounterAction<T>)
-                                                                      .Select(c => (KeyCounterAction<T>)c.CounterTrigger)
+            public bool OnPressed(KeyBindingPressEvent<T> e) => Target.Children.Where(c => c.Trigger is KeyCounterAction<T>)
+                                                                      .Select(c => (KeyCounterAction<T>)c.Trigger)
                                                                       .Any(c => c.OnPressed(e.Action, Clock.Rate >= 0));
 
             public void OnReleased(KeyBindingReleaseEvent<T> e)
             {
                 foreach (var c
-                         in Target.Children.Where(c => c.CounterTrigger is KeyCounterAction<T>).Select(c => (KeyCounterAction<T>)c.CounterTrigger))
+                         in Target.Children.Where(c => c.Trigger is KeyCounterAction<T>).Select(c => (KeyCounterAction<T>)c.Trigger))
                     c.OnReleased(e.Action, Clock.Rate >= 0);
             }
         }
diff --git a/osu.Game/Screens/Play/DefaultKeyCounter.cs b/osu.Game/Screens/Play/DefaultKeyCounter.cs
index dcb425ae1d..93dc4abcb5 100644
--- a/osu.Game/Screens/Play/DefaultKeyCounter.cs
+++ b/osu.Game/Screens/Play/DefaultKeyCounter.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Screens.Play
         public Color4 KeyUpTextColor { get; set; } = Color4.White;
         public double FadeTime { get; set; }
 
-        public DefaultKeyCounter(Trigger trigger)
+        public DefaultKeyCounter(InputTrigger trigger)
             : base(trigger)
         {
         }
diff --git a/osu.Game/Screens/Play/KeyCounter.cs b/osu.Game/Screens/Play/KeyCounter.cs
index b111305b22..a1950a49f4 100644
--- a/osu.Game/Screens/Play/KeyCounter.cs
+++ b/osu.Game/Screens/Play/KeyCounter.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Screens.Play
 {
     public abstract partial class KeyCounter : Container
     {
-        public readonly Trigger CounterTrigger;
+        public readonly InputTrigger Trigger;
 
         protected Bindable<bool> IsCountingBindable = new BindableBool(true);
 
@@ -35,7 +35,7 @@ namespace osu.Game.Screens.Play
             private set => PressesCount.Value = value;
         }
 
-        protected KeyCounter(Trigger trigger)
+        protected KeyCounter(InputTrigger trigger)
         {
             InternalChildren = new Drawable[]
             {
@@ -43,10 +43,10 @@ namespace osu.Game.Screens.Play
                 {
                     RelativeSizeAxes = Axes.Both
                 },
-                CounterTrigger = trigger,
+                Trigger = trigger,
             };
 
-            CounterTrigger.Target = this;
+            Trigger.Target = this;
             Name = trigger.Name;
         }
 
@@ -68,9 +68,9 @@ namespace osu.Game.Screens.Play
             CountPresses--;
         }
 
-        protected override bool Handle(UIEvent e) => CounterTrigger.TriggerEvent(e);
+        protected override bool Handle(UIEvent e) => Trigger.TriggerEvent(e);
 
-        public abstract partial class Trigger : Component
+        public abstract partial class InputTrigger : Component
         {
             private KeyCounter? target;
 
@@ -79,7 +79,7 @@ namespace osu.Game.Screens.Play
                 set => target = value;
             }
 
-            protected Trigger(string name)
+            protected InputTrigger(string name)
             {
                 Name = name;
             }
diff --git a/osu.Game/Screens/Play/KeyCounterAction.cs b/osu.Game/Screens/Play/KeyCounterAction.cs
index 058dbb1480..4926970960 100644
--- a/osu.Game/Screens/Play/KeyCounterAction.cs
+++ b/osu.Game/Screens/Play/KeyCounterAction.cs
@@ -7,7 +7,7 @@ using System.Collections.Generic;
 
 namespace osu.Game.Screens.Play
 {
-    public partial class KeyCounterAction<T> : KeyCounter.Trigger
+    public partial class KeyCounterAction<T> : KeyCounter.InputTrigger
         where T : struct
     {
         public T Action { get; }
diff --git a/osu.Game/Screens/Play/KeyCounterDisplay.cs b/osu.Game/Screens/Play/KeyCounterDisplay.cs
index b06d1adfa0..fc6fa12f10 100644
--- a/osu.Game/Screens/Play/KeyCounterDisplay.cs
+++ b/osu.Game/Screens/Play/KeyCounterDisplay.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.Play
             this.receptor = receptor;
         }
 
-        public virtual KeyCounter CreateKeyCounter(KeyCounter.Trigger trigger) => new DefaultKeyCounter(trigger);
+        public virtual KeyCounter CreateKeyCounter(KeyCounter.InputTrigger trigger) => new DefaultKeyCounter(trigger);
 
         public partial class Receptor : Drawable
         {
diff --git a/osu.Game/Screens/Play/KeyCounterKeyboard.cs b/osu.Game/Screens/Play/KeyCounterKeyboard.cs
index 4306efd360..6ae1a2c5bc 100644
--- a/osu.Game/Screens/Play/KeyCounterKeyboard.cs
+++ b/osu.Game/Screens/Play/KeyCounterKeyboard.cs
@@ -8,7 +8,7 @@ using osuTK.Input;
 
 namespace osu.Game.Screens.Play
 {
-    public partial class KeyCounterKeyboard : KeyCounter.Trigger
+    public partial class KeyCounterKeyboard : KeyCounter.InputTrigger
     {
         public Key Key { get; }
 
diff --git a/osu.Game/Screens/Play/KeyCounterMouse.cs b/osu.Game/Screens/Play/KeyCounterMouse.cs
index 00fca47ba2..40674cdbcd 100644
--- a/osu.Game/Screens/Play/KeyCounterMouse.cs
+++ b/osu.Game/Screens/Play/KeyCounterMouse.cs
@@ -9,7 +9,7 @@ using osuTK;
 
 namespace osu.Game.Screens.Play
 {
-    public partial class KeyCounterMouse : KeyCounter.Trigger
+    public partial class KeyCounterMouse : KeyCounter.InputTrigger
     {
         public MouseButton Button { get; }