diff --git a/CodeAnalysis/osu.ruleset b/CodeAnalysis/osu.ruleset
index 0ec2f24797..d497365f87 100644
--- a/CodeAnalysis/osu.ruleset
+++ b/CodeAnalysis/osu.ruleset
@@ -17,7 +17,6 @@
     <Rule Id="CA1707" Action="None" />
     <Rule Id="CA1710" Action="None" />
     <Rule Id="CA1714" Action="None" />
-    <Rule Id="CA1715" Action="None" />
     <Rule Id="CA1716" Action="None" />
     <Rule Id="CA1717" Action="None" />
     <Rule Id="CA1720" Action="None" />
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index 0db6498c12..2da5a9c403 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -105,19 +105,19 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         }
     }
 
-    public abstract class DrawableTaikoHitObject<TaikoHitType> : DrawableTaikoHitObject
-        where TaikoHitType : TaikoHitObject
+    public abstract class DrawableTaikoHitObject<TTaikoHit> : DrawableTaikoHitObject
+        where TTaikoHit : TaikoHitObject
     {
         public override Vector2 OriginPosition => new Vector2(DrawHeight / 2);
 
-        public new TaikoHitType HitObject;
+        public new TTaikoHit HitObject;
 
         protected readonly Vector2 BaseSize;
         protected readonly TaikoPiece MainPiece;
 
         private readonly Container<DrawableStrongNestedHit> strongHitContainer;
 
-        protected DrawableTaikoHitObject(TaikoHitType hitObject)
+        protected DrawableTaikoHitObject(TTaikoHit hitObject)
             : base(hitObject)
         {
             HitObject = hitObject;
diff --git a/osu.Game/Database/MutableDatabaseBackedStoreWithFileIncludes.cs b/osu.Game/Database/MutableDatabaseBackedStoreWithFileIncludes.cs
index 5d6ff6b09b..102081cd65 100644
--- a/osu.Game/Database/MutableDatabaseBackedStoreWithFileIncludes.cs
+++ b/osu.Game/Database/MutableDatabaseBackedStoreWithFileIncludes.cs
@@ -7,9 +7,9 @@ using osu.Framework.Platform;
 
 namespace osu.Game.Database
 {
-    public abstract class MutableDatabaseBackedStoreWithFileIncludes<T, U> : MutableDatabaseBackedStore<T>
-        where T : class, IHasPrimaryKey, ISoftDelete, IHasFiles<U>
-        where U : INamedFileInfo
+    public abstract class MutableDatabaseBackedStoreWithFileIncludes<T, TFileInfo> : MutableDatabaseBackedStore<T>
+        where T : class, IHasPrimaryKey, ISoftDelete, IHasFiles<TFileInfo>
+        where TFileInfo : INamedFileInfo
     {
         protected MutableDatabaseBackedStoreWithFileIncludes(IDatabaseContextFactory contextFactory, Storage storage = null)
             : base(contextFactory, storage)
diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledComponent.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledComponent.cs
index 1819b36667..dd6a902989 100644
--- a/osu.Game/Graphics/UserInterfaceV2/LabelledComponent.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledComponent.cs
@@ -7,15 +7,15 @@ using osu.Framework.Graphics.UserInterface;
 
 namespace osu.Game.Graphics.UserInterfaceV2
 {
-    public abstract class LabelledComponent<T, U> : LabelledDrawable<T>, IHasCurrentValue<U>
-        where T : Drawable, IHasCurrentValue<U>
+    public abstract class LabelledComponent<TDrawable, TValue> : LabelledDrawable<TDrawable>, IHasCurrentValue<TValue>
+        where TDrawable : Drawable, IHasCurrentValue<TValue>
     {
         protected LabelledComponent(bool padded)
             : base(padded)
         {
         }
 
-        public Bindable<U> Current
+        public Bindable<TValue> Current
         {
             get => Component.Current;
             set => Component.Current = value;
diff --git a/osu.Game/IO/Legacy/SerializationReader.cs b/osu.Game/IO/Legacy/SerializationReader.cs
index aeb3ce754d..17cbd19838 100644
--- a/osu.Game/IO/Legacy/SerializationReader.cs
+++ b/osu.Game/IO/Legacy/SerializationReader.cs
@@ -116,13 +116,13 @@ namespace osu.Game.IO.Legacy
         }
 
         /// <summary> Reads a generic Dictionary from the buffer. </summary>
-        public IDictionary<T, U> ReadDictionary<T, U>()
+        public IDictionary<TKey, TValue> ReadDictionary<TKey, TValue>()
         {
             int count = ReadInt32();
             if (count < 0) return null;
 
-            IDictionary<T, U> d = new Dictionary<T, U>();
-            for (int i = 0; i < count; i++) d[(T)ReadObject()] = (U)ReadObject();
+            IDictionary<TKey, TValue> d = new Dictionary<TKey, TValue>();
+            for (int i = 0; i < count; i++) d[(TKey)ReadObject()] = (TValue)ReadObject();
             return d;
         }
 
diff --git a/osu.Game/IO/Legacy/SerializationWriter.cs b/osu.Game/IO/Legacy/SerializationWriter.cs
index f30e4492af..c75de93bc8 100644
--- a/osu.Game/IO/Legacy/SerializationWriter.cs
+++ b/osu.Game/IO/Legacy/SerializationWriter.cs
@@ -102,7 +102,7 @@ namespace osu.Game.IO.Legacy
         }
 
         /// <summary> Writes a generic IDictionary to the buffer. </summary>
-        public void Write<T, U>(IDictionary<T, U> d)
+        public void Write<TKey, TValue>(IDictionary<TKey, TValue> d)
         {
             if (d == null)
             {
@@ -112,7 +112,7 @@ namespace osu.Game.IO.Legacy
             {
                 Write(d.Count);
 
-                foreach (KeyValuePair<T, U> kvp in d)
+                foreach (KeyValuePair<TKey, TValue> kvp in d)
                 {
                     WriteObject(kvp.Key);
                     WriteObject(kvp.Value);
diff --git a/osu.Game/Online/Leaderboards/Leaderboard.cs b/osu.Game/Online/Leaderboards/Leaderboard.cs
index 94c50185da..9c48ebd09b 100644
--- a/osu.Game/Online/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Online/Leaderboards/Leaderboard.cs
@@ -19,7 +19,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Online.Leaderboards
 {
-    public abstract class Leaderboard<TScope, ScoreInfo> : Container, IOnlineComponent
+    public abstract class Leaderboard<TScope, TScoreInfo> : Container, IOnlineComponent
     {
         private const double fade_duration = 300;
 
@@ -39,9 +39,9 @@ namespace osu.Game.Online.Leaderboards
 
         protected override Container<Drawable> Content => content;
 
-        private IEnumerable<ScoreInfo> scores;
+        private IEnumerable<TScoreInfo> scores;
 
-        public IEnumerable<ScoreInfo> Scores
+        public IEnumerable<TScoreInfo> Scores
         {
             get => scores;
             set
@@ -288,7 +288,7 @@ namespace osu.Game.Online.Leaderboards
         /// </summary>
         /// <param name="scoresCallback">A callback which should be called when fetching is completed. Scheduling is not required.</param>
         /// <returns>An <see cref="APIRequest"/> responsible for the fetch operation. This will be queued and performed automatically.</returns>
-        protected abstract APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback);
+        protected abstract APIRequest FetchScores(Action<IEnumerable<TScoreInfo>> scoresCallback);
 
         private Placeholder currentPlaceholder;
 
@@ -359,6 +359,6 @@ namespace osu.Game.Online.Leaderboards
             }
         }
 
-        protected abstract LeaderboardScore CreateDrawableScore(ScoreInfo model, int index);
+        protected abstract LeaderboardScore CreateDrawableScore(TScoreInfo model, int index);
     }
 }
diff --git a/osu.Game/Overlays/OverlayHeaderTabControl.cs b/osu.Game/Overlays/OverlayHeaderTabControl.cs
index 5b56771dc1..7d0cdad6d8 100644
--- a/osu.Game/Overlays/OverlayHeaderTabControl.cs
+++ b/osu.Game/Overlays/OverlayHeaderTabControl.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Overlays
             AccentColour = AccentColour,
         };
 
-        private class OverlayHeaderTabItem : OverlayTabItem<string>
+        private class OverlayHeaderTabItem : OverlayTabItem
         {
             public OverlayHeaderTabItem(string value)
                 : base(value)
diff --git a/osu.Game/Overlays/OverlayTabControl.cs b/osu.Game/Overlays/OverlayTabControl.cs
index 20649c8a74..4c396eabc1 100644
--- a/osu.Game/Overlays/OverlayTabControl.cs
+++ b/osu.Game/Overlays/OverlayTabControl.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Overlays
 
                 foreach (TabItem<T> tabItem in TabContainer)
                 {
-                    ((OverlayTabItem<T>)tabItem).AccentColour = value;
+                    ((OverlayTabItem)tabItem).AccentColour = value;
                 }
             }
         }
@@ -59,9 +59,9 @@ namespace osu.Game.Overlays
 
         protected override Dropdown<T> CreateDropdown() => null;
 
-        protected override TabItem<T> CreateTabItem(T value) => new OverlayTabItem<T>(value);
+        protected override TabItem<T> CreateTabItem(T value) => new OverlayTabItem(value);
 
-        protected class OverlayTabItem<U> : TabItem<U>
+        protected class OverlayTabItem : TabItem<T>
         {
             private readonly ExpandingBar bar;
 
@@ -84,7 +84,7 @@ namespace osu.Game.Overlays
                 }
             }
 
-            public OverlayTabItem(U value)
+            public OverlayTabItem(T value)
                 : base(value)
             {
                 AutoSizeAxes = Axes.X;
diff --git a/osu.Game/Overlays/Settings/SettingsSlider.cs b/osu.Game/Overlays/Settings/SettingsSlider.cs
index 20e08c0cd8..96c0279a7b 100644
--- a/osu.Game/Overlays/Settings/SettingsSlider.cs
+++ b/osu.Game/Overlays/Settings/SettingsSlider.cs
@@ -12,11 +12,11 @@ namespace osu.Game.Overlays.Settings
     {
     }
 
-    public class SettingsSlider<T, U> : SettingsItem<T>
-        where T : struct, IEquatable<T>, IComparable<T>, IConvertible
-        where U : OsuSliderBar<T>, new()
+    public class SettingsSlider<TValue, TSlider> : SettingsItem<TValue>
+        where TValue : struct, IEquatable<TValue>, IComparable<TValue>, IConvertible
+        where TSlider : OsuSliderBar<TValue>, new()
     {
-        protected override Drawable CreateControl() => new U
+        protected override Drawable CreateControl() => new TSlider
         {
             Margin = new MarginPadding { Top = 5, Bottom = 5 },
             RelativeSizeAxes = Axes.X
@@ -24,14 +24,14 @@ namespace osu.Game.Overlays.Settings
 
         public bool TransferValueOnCommit
         {
-            get => ((U)Control).TransferValueOnCommit;
-            set => ((U)Control).TransferValueOnCommit = value;
+            get => ((TSlider)Control).TransferValueOnCommit;
+            set => ((TSlider)Control).TransferValueOnCommit = value;
         }
 
         public float KeyboardStep
         {
-            get => ((U)Control).KeyboardStep;
-            set => ((U)Control).KeyboardStep = value;
+            get => ((TSlider)Control).KeyboardStep;
+            set => ((TSlider)Control).KeyboardStep = value;
         }
     }
 }
diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index b5e7b8bedb..a34fc619a8 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -165,7 +165,7 @@ namespace osu.Game.Overlays
                 AccentColour = colours.Seafoam;
             }
 
-            private class ProfileTabItem : OverlayTabItem<ProfileSection>
+            private class ProfileTabItem : OverlayTabItem
             {
                 public ProfileTabItem(ProfileSection value)
                     : base(value)