diff --git a/osu.Game.Rulesets.Taiko.Tests/TestCaseTaikoPlayfield.cs b/osu.Game.Rulesets.Taiko.Tests/TestCaseTaikoPlayfield.cs
index b002c2abab..fc103e4c72 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestCaseTaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestCaseTaikoPlayfield.cs
@@ -155,7 +155,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
             var h = new DrawableTestHit(hit) { X = RNG.NextSingle(hitResult == HitResult.Good ? -0.1f : -0.05f, hitResult == HitResult.Good ? 0.1f : 0.05f) };
 
             ((TaikoPlayfield)rulesetContainer.Playfield).OnNewResult(h, new JudgementResult(new TaikoJudgement()) { Type = hitResult });
-            ((TaikoPlayfield)rulesetContainer.Playfield).OnNewResult(new TestStrongHandler(h), new JudgementResult(new TaikoStrongJudgement()) { Type = HitResult.Great });
+            ((TaikoPlayfield)rulesetContainer.Playfield).OnNewResult(new TestStrongNestedHit(h), new JudgementResult(new TaikoStrongJudgement()) { Type = HitResult.Great });
         }
 
         private void addMissJudgement()
@@ -226,9 +226,9 @@ namespace osu.Game.Rulesets.Taiko.Tests
             rulesetContainer.Playfield.Add(new DrawableRimHit(h));
         }
 
-        private class TestStrongHandler : DrawableStrongHandler
+        private class TestStrongNestedHit : DrawableStrongNestedHit
         {
-            public TestStrongHandler(DrawableHitObject mainObject)
+            public TestStrongNestedHit(DrawableHitObject mainObject)
                 : base(null, mainObject)
             {
             }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 0fb2405f77..5142f125ac 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -99,11 +99,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             }
         }
 
-        protected override DrawableStrongHandler CreateStrongHandler(StrongHitObject hitObject) => new StrongHandler(hitObject, this);
+        protected override DrawableStrongNestedHit CreateStrongHit(StrongHitObject hitObject) => new StrongNestedHit(hitObject, this);
 
-        private class StrongHandler : DrawableStrongHandler
+        private class StrongNestedHit : DrawableStrongNestedHit
         {
-            public StrongHandler(StrongHitObject strong, DrawableDrumRoll drumRoll)
+            public StrongNestedHit(StrongHitObject strong, DrawableDrumRoll drumRoll)
                 : base(strong, drumRoll)
             {
             }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index ff1cce24b6..a70d7bde0e 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -51,11 +51,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         public override bool OnPressed(TaikoAction action) => UpdateResult(true);
 
-        protected override DrawableStrongHandler CreateStrongHandler(StrongHitObject hitObject) => new StrongHandler(hitObject, this);
+        protected override DrawableStrongNestedHit CreateStrongHit(StrongHitObject hitObject) => new StrongNestedHit(hitObject, this);
 
-        private class StrongHandler : DrawableStrongHandler
+        private class StrongNestedHit : DrawableStrongNestedHit
         {
-            public StrongHandler(StrongHitObject strong, DrawableDrumRollTick tick)
+            public StrongNestedHit(StrongHitObject strong, DrawableDrumRollTick tick)
                 : base(strong, tick)
             {
             }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 6181b74822..f59dc8c1ee 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -127,9 +127,9 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             }
         }
 
-        protected override DrawableStrongHandler CreateStrongHandler(StrongHitObject hitObject) => new StrongHandler(hitObject, this);
+        protected override DrawableStrongNestedHit CreateStrongHit(StrongHitObject hitObject) => new StrongNestedHit(hitObject, this);
 
-        private class StrongHandler : DrawableStrongHandler
+        private class StrongNestedHit : DrawableStrongNestedHit
         {
             /// <summary>
             /// The lenience for the second key press.
@@ -139,7 +139,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
             public new DrawableHit MainObject => (DrawableHit)base.MainObject;
 
-            public StrongHandler(StrongHitObject strong, DrawableHit hit)
+            public StrongNestedHit(StrongHitObject strong, DrawableHit hit)
                 : base(strong, hit)
             {
             }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongHandler.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongHandler.cs
index 6408b7b369..b27de3832a 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongHandler.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongHandler.cs
@@ -9,11 +9,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
     /// <summary>
     /// Used as a nested hitobject to provide <see cref="TaikoStrongJudgement"/>s for <see cref="DrawableTaikoHitObject"/>s.
     /// </summary>
-    public abstract class DrawableStrongHandler : DrawableTaikoHitObject
+    public abstract class DrawableStrongNestedHit : DrawableTaikoHitObject
     {
         public readonly DrawableHitObject MainObject;
 
-        protected DrawableStrongHandler(StrongHitObject strong, DrawableHitObject mainObject)
+        protected DrawableStrongNestedHit(StrongHitObject strong, DrawableHitObject mainObject)
             : base(strong)
         {
             MainObject = mainObject;
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index 6d19c99b9c..bb63bd58cf 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -105,7 +105,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             var strongObject = HitObject.NestedHitObjects.OfType<StrongHitObject>().FirstOrDefault();
             if (strongObject != null)
             {
-                var vis = CreateStrongHandler(strongObject);
+                var vis = CreateStrongHit(strongObject);
                 if (vis != null)
                 {
                     AddNested(vis);
@@ -127,6 +127,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         /// </summary>
         /// <param name="hitObject">The strong hitobject.</param>
         /// <returns>The strong hitobject handler.</returns>
-        protected virtual DrawableStrongHandler CreateStrongHandler(StrongHitObject hitObject) => null;
+        protected virtual DrawableStrongNestedHit CreateStrongHit(StrongHitObject hitObject) => null;
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 8973a4ef35..325beb38a5 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -236,7 +236,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             {
                 case TaikoStrongJudgement _:
                     if (result.IsHit)
-                        hitExplosionContainer.Children.FirstOrDefault(e => e.JudgedObject == ((DrawableStrongHandler)judgedObject).MainObject)?.VisualiseSecondHit();
+                        hitExplosionContainer.Children.FirstOrDefault(e => e.JudgedObject == ((DrawableStrongNestedHit)judgedObject).MainObject)?.VisualiseSecondHit();
                     break;
                 default:
                     judgementContainer.Add(new DrawableTaikoJudgement(result, judgedObject)