From 6c7fab0e31b129c17631eca3e43c74621a919c5b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Nov 2016 19:20:21 +0900
Subject: [PATCH] Fix some remaining naming discrepancies.

---
 osu.Game.Mode.Osu/OsuRuleset.cs                            | 7 ++++---
 .../UI/{ScoreOverlayOsu.cs => OsuScoreOverlay.cs}          | 2 +-
 osu.Game.Mode.Osu/osu.Game.Modes.Osu.csproj                | 4 ++--
 osu.Game.Modes.Catch/CatchRuleset.cs                       | 2 +-
 osu.Game.Modes.Mania/ManiaRuleset.cs                       | 2 +-
 osu.Game.Modes.Taiko/TaikoRuleset.cs                       | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)
 rename osu.Game.Mode.Osu/UI/{ScoreOverlayOsu.cs => OsuScoreOverlay.cs} (94%)

diff --git a/osu.Game.Mode.Osu/OsuRuleset.cs b/osu.Game.Mode.Osu/OsuRuleset.cs
index 27154fa646..666f51f041 100644
--- a/osu.Game.Mode.Osu/OsuRuleset.cs
+++ b/osu.Game.Mode.Osu/OsuRuleset.cs
@@ -8,9 +8,10 @@ using osu.Game.Modes.UI;
 
 namespace osu.Game.Modes.Osu
 {
-    class OsuRuleset : Ruleset
+    public class OsuRuleset : Ruleset
     {
-        public override ScoreOverlay CreateScoreOverlay() => new ScoreOverlayOsu();
+        public override ScoreOverlay CreateScoreOverlay() => new OsuScoreOverlay();
 
         public override HitRenderer CreateHitRendererWith(List<HitObject> objects) => new UI.OsuHitRenderer { Objects = objects };
-    }}
+    }
+}
diff --git a/osu.Game.Mode.Osu/UI/ScoreOverlayOsu.cs b/osu.Game.Mode.Osu/UI/OsuScoreOverlay.cs
similarity index 94%
rename from osu.Game.Mode.Osu/UI/ScoreOverlayOsu.cs
rename to osu.Game.Mode.Osu/UI/OsuScoreOverlay.cs
index 911a462ca2..dd1b3739c2 100644
--- a/osu.Game.Mode.Osu/UI/ScoreOverlayOsu.cs
+++ b/osu.Game.Mode.Osu/UI/OsuScoreOverlay.cs
@@ -9,7 +9,7 @@ using OpenTK.Input;
 
 namespace osu.Game.Modes.Osu.UI
 {
-    public class ScoreOverlayOsu : ScoreOverlay
+    public class OsuScoreOverlay : ScoreOverlay
     {
         protected override PercentageCounter CreateAccuracyCounter() => new PercentageCounter()
         {
diff --git a/osu.Game.Mode.Osu/osu.Game.Modes.Osu.csproj b/osu.Game.Mode.Osu/osu.Game.Modes.Osu.csproj
index e53a760db6..2c38463e9d 100644
--- a/osu.Game.Mode.Osu/osu.Game.Modes.Osu.csproj
+++ b/osu.Game.Mode.Osu/osu.Game.Modes.Osu.csproj
@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>osu.Game.Modes.Osu</RootNamespace>
-    <AssemblyName>osu.Game.Mode.Osu</AssemblyName>
+    <AssemblyName>osu.Game.Modes.Osu</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
@@ -52,7 +52,7 @@
     <Compile Include="Objects\Slider.cs" />
     <Compile Include="Objects\Spinner.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UI\ScoreOverlayOsu.cs" />
+    <Compile Include="UI\OsuScoreOverlay.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj">
diff --git a/osu.Game.Modes.Catch/CatchRuleset.cs b/osu.Game.Modes.Catch/CatchRuleset.cs
index 91385155b8..992d0fff59 100644
--- a/osu.Game.Modes.Catch/CatchRuleset.cs
+++ b/osu.Game.Modes.Catch/CatchRuleset.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Modes.Catch
 {
     class CatchRuleset : Ruleset
     {
-        public override ScoreOverlay CreateScoreOverlay() => new ScoreOverlayOsu();
+        public override ScoreOverlay CreateScoreOverlay() => new OsuScoreOverlay();
 
         public override HitRenderer CreateHitRendererWith(List<HitObject> objects) => new CatchHitRenderer { Objects = objects };
     }
diff --git a/osu.Game.Modes.Mania/ManiaRuleset.cs b/osu.Game.Modes.Mania/ManiaRuleset.cs
index 5dd9167e75..07f2545fd3 100644
--- a/osu.Game.Modes.Mania/ManiaRuleset.cs
+++ b/osu.Game.Modes.Mania/ManiaRuleset.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Modes.Mania
 {
     class ManiaRuleset : Ruleset
     {
-        public override ScoreOverlay CreateScoreOverlay() => new ScoreOverlayOsu();
+        public override ScoreOverlay CreateScoreOverlay() => new OsuScoreOverlay();
 
         public override HitRenderer CreateHitRendererWith(List<HitObject> objects) => new ManiaHitRenderer { Objects = objects };
     }
diff --git a/osu.Game.Modes.Taiko/TaikoRuleset.cs b/osu.Game.Modes.Taiko/TaikoRuleset.cs
index 1764b542da..f8322e32dc 100644
--- a/osu.Game.Modes.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Modes.Taiko/TaikoRuleset.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Modes.Taiko
 {
     class TaikoRuleset : Ruleset
     {
-        public override ScoreOverlay CreateScoreOverlay() => new ScoreOverlayOsu();
+        public override ScoreOverlay CreateScoreOverlay() => new OsuScoreOverlay();
 
         public override HitRenderer CreateHitRendererWith(List<HitObject> objects) => new TaikoHitRenderer { Objects = objects };
     }