diff --git a/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs b/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
index 0df6605cdd..f24589ed35 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Tests.Visual.Menus
         {
             typeof(ToolbarButton),
             typeof(ToolbarRulesetSelector),
-            typeof(ToolbarRulesetButton),
+            typeof(ToolbarRulesetTabButton),
             typeof(ToolbarNotificationButton),
         };
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneToolbarRulesetSelector.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneToolbarRulesetSelector.cs
index 7d0491aa60..3e61da73a5 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneToolbarRulesetSelector.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneToolbarRulesetSelector.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(ToolbarRulesetSelector),
-            typeof(ToolbarRulesetButton),
+            typeof(ToolbarRulesetTabButton),
         };
 
         public TestSceneToolbarRulesetSelector()
diff --git a/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs b/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
index 1f35d0f293..63cf2bba9c 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays.Toolbar
 
         protected override Dropdown<RulesetInfo> CreateDropdown() => null;
 
-        protected override TabItem<RulesetInfo> CreateTabItem(RulesetInfo value) => new ToolbarRulesetButton(value);
+        protected override TabItem<RulesetInfo> CreateTabItem(RulesetInfo value) => new ToolbarRulesetTabButton(value);
 
         public ToolbarRulesetSelector()
         {
diff --git a/osu.Game/Overlays/Toolbar/ToolbarRulesetButton.cs b/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
similarity index 88%
rename from osu.Game/Overlays/Toolbar/ToolbarRulesetButton.cs
rename to osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
index defe1da5bf..a5194ea752 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarRulesetButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
@@ -10,16 +10,16 @@ using osu.Framework.Input.Events;
 
 namespace osu.Game.Overlays.Toolbar
 {
-    public class ToolbarRulesetButton : TabItem<RulesetInfo>
+    public class ToolbarRulesetTabButton : TabItem<RulesetInfo>
     {
-        private readonly DrawableRuleset ruleset;
+        private readonly RulesetButton ruleset;
 
-        public ToolbarRulesetButton(RulesetInfo value)
+        public ToolbarRulesetTabButton(RulesetInfo value)
             : base(value)
         {
             AutoSizeAxes = Axes.X;
             RelativeSizeAxes = Axes.Y;
-            Child = ruleset = new DrawableRuleset
+            Child = ruleset = new RulesetButton
             {
                 Active = false,
             };
@@ -35,7 +35,7 @@ namespace osu.Game.Overlays.Toolbar
 
         protected override void OnDeactivated() => ruleset.Active = false;
 
-        private class DrawableRuleset : ToolbarButton
+        private class RulesetButton : ToolbarButton
         {
             public bool Active
             {