diff --git a/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs b/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs
index 064f114f22..8d0acf98f0 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs
@@ -23,8 +23,8 @@ namespace osu.Desktop.Tests
                 IsCounting = true
             };
             Add(kc);
-            kc.AddKey(new KeyCounterKeyBoard(@"Z", Key.Z));
-            kc.AddKey(new KeyCounterKeyBoard(@"X", Key.X));
+            kc.AddKey(new KeyCounterKeyboard(@"Z", Key.Z));
+            kc.AddKey(new KeyCounterKeyboard(@"X", Key.X));
             kc.AddKey(new KeyCounterMouse(@"M1", MouseButton.Left));
             kc.AddKey(new KeyCounterMouse(@"M2", MouseButton.Right));
         }
diff --git a/osu.Game/Graphics/UserInterface/KeyCounter.cs b/osu.Game/Graphics/UserInterface/KeyCounter.cs
index 4a22ae48c4..d89791d98f 100644
--- a/osu.Game/Graphics/UserInterface/KeyCounter.cs
+++ b/osu.Game/Graphics/UserInterface/KeyCounter.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Graphics.UserInterface
                 }
             };
             //Set this manually because an element with Alpha=0 won't take it size to AutoSizeContainer,
-            //so the size can be changing between buttonSpirit and glowSpirit.
+            //so the size can be changing between buttonSprite and glowSprite.
             Height = buttonSprite.Height;
             Width = buttonSprite.Width;
         }
diff --git a/osu.Game/Graphics/UserInterface/KeyCounterKeyBoard.cs b/osu.Game/Graphics/UserInterface/KeyCounterKeyboard.cs
similarity index 84%
rename from osu.Game/Graphics/UserInterface/KeyCounterKeyBoard.cs
rename to osu.Game/Graphics/UserInterface/KeyCounterKeyboard.cs
index c58515658f..9b75924cb6 100644
--- a/osu.Game/Graphics/UserInterface/KeyCounterKeyBoard.cs
+++ b/osu.Game/Graphics/UserInterface/KeyCounterKeyboard.cs
@@ -7,10 +7,10 @@ using osu.Framework.Input;
 
 namespace osu.Game.Graphics.UserInterface
 {
-    public class KeyCounterKeyBoard : KeyCounter
+    public class KeyCounterKeyboard : KeyCounter
     {
         public Key Key { get; }
-        public KeyCounterKeyBoard(string name, Key key) : base(name)
+        public KeyCounterKeyboard(string name, Key key) : base(name)
         {
             Key = key;
         }
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index b33493bd3d..9510df2932 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -54,7 +54,7 @@
     <Compile Include="Graphics\Processing\RatioAdjust.cs" />
     <Compile Include="Graphics\TextAwesome.cs" />
     <Compile Include="Graphics\UserInterface\KeyCounter.cs" />
-    <Compile Include="Graphics\UserInterface\KeyCounterKeyBoard.cs" />
+    <Compile Include="Graphics\UserInterface\KeyCounterKeyboard.cs" />
     <Compile Include="Graphics\UserInterface\KeyCounterCollection.cs" />
     <Compile Include="Graphics\UserInterface\KeyCounterMouse.cs" />
     <Compile Include="Online\API\APIAccess.cs" />