diff --git a/osu.Desktop.VisualTests/Tests/TestCaseReplaySettingsOverlay.cs b/osu.Desktop.VisualTests/Tests/TestCaseReplaySettingsOverlay.cs
index 5716d8f89f..b2c211b7f0 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseReplaySettingsOverlay.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseReplaySettingsOverlay.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.ReplaySettings;
 
 namespace osu.Desktop.VisualTests.Tests
@@ -32,7 +33,7 @@ namespace osu.Desktop.VisualTests.Tests
                 Text = @"Button",
             }));
 
-            AddStep(@"Add checkbox", () => container.Add(new ReplaySettingsCheckbox
+            AddStep(@"Add checkbox", () => container.Add(new ReplayCheckbox
             {
                 LabelText = "Checkbox",
             }));
@@ -46,7 +47,7 @@ namespace osu.Desktop.VisualTests.Tests
             }));
         }
 
-        private class ExampleContainer : ReplaySettingsGroup
+        private class ExampleContainer : ReplayGroup
         {
             protected override string Title => @"example";
         }
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index ccbb36fd03..2151386fc3 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -14,7 +14,6 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play.HUD;
 using OpenTK.Input;
-using osu.Game.Screens.Play.ReplaySettings;
 
 namespace osu.Game.Screens.Play
 {
diff --git a/osu.Game/Screens/Play/ReplaySettings/CollectionSettings.cs b/osu.Game/Screens/Play/ReplaySettings/CollectionSettings.cs
index 729324950e..482581abca 100644
--- a/osu.Game/Screens/Play/ReplaySettings/CollectionSettings.cs
+++ b/osu.Game/Screens/Play/ReplaySettings/CollectionSettings.cs
@@ -9,7 +9,7 @@ using System.Collections.Generic;
 
 namespace osu.Game.Screens.Play.ReplaySettings
 {
-    public class CollectionSettings : ReplaySettingsGroup
+    public class CollectionSettings : ReplayGroup
     {
         protected override string Title => @"collections";
 
diff --git a/osu.Game/Screens/Play/ReplaySettings/DiscussionSettings.cs b/osu.Game/Screens/Play/ReplaySettings/DiscussionSettings.cs
index ac21a11e63..9c4fb03517 100644
--- a/osu.Game/Screens/Play/ReplaySettings/DiscussionSettings.cs
+++ b/osu.Game/Screens/Play/ReplaySettings/DiscussionSettings.cs
@@ -8,7 +8,7 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Screens.Play.ReplaySettings
 {
-    public class DiscussionSettings : ReplaySettingsGroup
+    public class DiscussionSettings : ReplayGroup
     {
         protected override string Title => @"discussions";
 
@@ -17,7 +17,7 @@ namespace osu.Game.Screens.Play.ReplaySettings
         {
             Children = new Drawable[]
             {
-                new ReplaySettingsCheckbox
+                new ReplayCheckbox
                 {
                     LabelText = "Show floating comments",
                     Bindable = config.GetBindable<bool>(OsuSetting.FloatingComments)
diff --git a/osu.Game/Screens/Play/ReplaySettings/PlaybackSettings.cs b/osu.Game/Screens/Play/ReplaySettings/PlaybackSettings.cs
index da97664933..7f69d3109c 100644
--- a/osu.Game/Screens/Play/ReplaySettings/PlaybackSettings.cs
+++ b/osu.Game/Screens/Play/ReplaySettings/PlaybackSettings.cs
@@ -7,7 +7,7 @@ using osu.Framework.Graphics;
 
 namespace osu.Game.Screens.Play.ReplaySettings
 {
-    public class PlaybackSettings : ReplaySettingsGroup
+    public class PlaybackSettings : ReplayGroup
     {
         protected override string Title => @"playback";
 
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.Play.ReplaySettings
         {
             Children = new Drawable[]
             {
-                new ReplaySettingsSliderBar<double>()
+                new ReplaySliderBar<double>()
                 {
                     LabelText = "Playback speed",
                     Bindable = config.GetBindable<double>(OsuSetting.PlaybackSpeed)
diff --git a/osu.Game/Screens/Play/ReplaySettings/ReplaySettingsCheckbox.cs b/osu.Game/Screens/Play/ReplaySettings/ReplayCheckbox.cs
similarity index 88%
rename from osu.Game/Screens/Play/ReplaySettings/ReplaySettingsCheckbox.cs
rename to osu.Game/Screens/Play/ReplaySettings/ReplayCheckbox.cs
index c3a55a668b..7ad1e4f527 100644
--- a/osu.Game/Screens/Play/ReplaySettings/ReplaySettingsCheckbox.cs
+++ b/osu.Game/Screens/Play/ReplaySettings/ReplayCheckbox.cs
@@ -7,7 +7,7 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Screens.Play.ReplaySettings
 {
-    public class ReplaySettingsCheckbox : OsuCheckbox
+    public class ReplayCheckbox : OsuCheckbox
     {
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
diff --git a/osu.Game/Screens/Play/ReplaySettings/ReplaySettingsGroup.cs b/osu.Game/Screens/Play/ReplaySettings/ReplayGroup.cs
similarity index 95%
rename from osu.Game/Screens/Play/ReplaySettings/ReplaySettingsGroup.cs
rename to osu.Game/Screens/Play/ReplaySettings/ReplayGroup.cs
index 47820ff462..3e4c0dca5c 100644
--- a/osu.Game/Screens/Play/ReplaySettings/ReplaySettingsGroup.cs
+++ b/osu.Game/Screens/Play/ReplaySettings/ReplayGroup.cs
@@ -13,7 +13,7 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Screens.Play.ReplaySettings
 {
-    public abstract class ReplaySettingsGroup : Container
+    public abstract class ReplayGroup : Container
     {
         /// <summary>
         /// The title to be displayed in the header of this group.
@@ -33,7 +33,7 @@ namespace osu.Game.Screens.Play.ReplaySettings
 
         private Color4 buttonActiveColour;
 
-        protected ReplaySettingsGroup()
+        protected ReplayGroup()
         {
             AutoSizeAxes = Axes.Y;
             Width = container_width;
diff --git a/osu.Game/Screens/Play/ReplaySettings/ReplaySettingsSliderBar.cs b/osu.Game/Screens/Play/ReplaySettings/ReplaySliderBar.cs
similarity index 91%
rename from osu.Game/Screens/Play/ReplaySettings/ReplaySettingsSliderBar.cs
rename to osu.Game/Screens/Play/ReplaySettings/ReplaySliderBar.cs
index f2c1ed090a..4992c3a1e7 100644
--- a/osu.Game/Screens/Play/ReplaySettings/ReplaySettingsSliderBar.cs
+++ b/osu.Game/Screens/Play/ReplaySettings/ReplaySliderBar.cs
@@ -10,7 +10,7 @@ using osu.Game.Overlays.Settings;
 
 namespace osu.Game.Screens.Play.ReplaySettings
 {
-    public class ReplaySettingsSliderBar<T> : SettingsSlider<T>
+    public class ReplaySliderBar<T> : SettingsSlider<T>
         where T : struct, IEquatable<T>
     {
         protected override Drawable CreateControl() => new Sliderbar()
diff --git a/osu.Game/Screens/Play/ReplaySettings/ReplaySettingsOverlay.cs b/osu.Game/Screens/Play/ReplaySettingsOverlay.cs
similarity index 86%
rename from osu.Game/Screens/Play/ReplaySettings/ReplaySettingsOverlay.cs
rename to osu.Game/Screens/Play/ReplaySettingsOverlay.cs
index 925b760a5b..ab9892b2fa 100644
--- a/osu.Game/Screens/Play/ReplaySettings/ReplaySettingsOverlay.cs
+++ b/osu.Game/Screens/Play/ReplaySettingsOverlay.cs
@@ -1,11 +1,12 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Screens.Play.ReplaySettings;
+using OpenTK;
 
-namespace osu.Game.Screens.Play.ReplaySettings
+namespace osu.Game.Screens.Play
 {
     public class ReplaySettingsOverlay : FillFlowContainer
     {
diff --git a/osu.Game/Screens/Play/StandardHUDOverlay.cs b/osu.Game/Screens/Play/StandardHUDOverlay.cs
index 79683123a5..4349da1197 100644
--- a/osu.Game/Screens/Play/StandardHUDOverlay.cs
+++ b/osu.Game/Screens/Play/StandardHUDOverlay.cs
@@ -8,7 +8,6 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
 using OpenTK;
-using osu.Game.Screens.Play.ReplaySettings;
 
 namespace osu.Game.Screens.Play
 {
@@ -46,7 +45,7 @@ namespace osu.Game.Screens.Play
             Anchor = Anchor.BottomRight,
             Origin = Anchor.BottomRight,
             Margin = new MarginPadding(10),
-            Y = - TwoLayerButton.SIZE_RETRACTED.Y,
+            Y = -TwoLayerButton.SIZE_RETRACTED.Y,
         };
 
         protected override ScoreCounter CreateScoreCounter() => new ScoreCounter(6)
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 6f4e301641..25504f44d7 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -244,11 +244,11 @@
     <Compile Include="Screens\Play\HotkeyRetryOverlay.cs" />
     <Compile Include="Screens\Play\ReplaySettings\CollectionSettings.cs" />
     <Compile Include="Screens\Play\ReplaySettings\DiscussionSettings.cs" />
-    <Compile Include="Screens\Play\ReplaySettings\ReplaySettingsGroup.cs" />
-    <Compile Include="Screens\Play\ReplaySettings\ReplaySettingsOverlay.cs" />
-    <Compile Include="Screens\Play\ReplaySettings\ReplaySettingsSliderBar.cs" />
+    <Compile Include="Screens\Play\ReplaySettings\ReplayGroup.cs" />
+    <Compile Include="Screens\Play\ReplaySettingsOverlay.cs" />
+    <Compile Include="Screens\Play\ReplaySettings\ReplaySliderBar.cs" />
     <Compile Include="Screens\Play\ReplaySettings\PlaybackSettings.cs" />
-    <Compile Include="Screens\Play\ReplaySettings\ReplaySettingsCheckbox.cs" />
+    <Compile Include="Screens\Play\ReplaySettings\ReplayCheckbox.cs" />
     <Compile Include="Screens\Play\PauseContainer.cs" />
     <Compile Include="Screens\Play\SongProgressInfo.cs" />
     <Compile Include="Screens\Play\HUD\ModDisplay.cs" />