diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
index da6e1edf08..775cb27ee8 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
             FillMode = FillMode.Fit;
 
-            Content.Add(spinnerBody = new SkinnableDrawable(new TaikoSkinComponentLookup(TaikoSkinComponents.Swell), _ => new DefaultSwell())
+            Content.Add(spinnerBody = new SkinnableDrawable(new TaikoSkinComponentLookup(TaikoSkinComponents.SwellBody), _ => new DefaultSwell())
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
@@ -113,7 +113,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
                 int numHits = ticks.Count(r => r.IsHit);
 
-                (spinnerBody.Drawable as ISkinnableSwell)?.OnUserInput(this, numHits, MainPiece);
+                (spinnerBody.Drawable as ISkinnableSwell)?.AnimateSwellProgress(this, numHits, MainPiece);
 
                 if (numHits == HitObject.RequiredHits)
                     ApplyResult(r => r.Type = r.Judgement.MaxResult);
@@ -145,7 +145,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
             base.UpdateStartTimeStateTransforms();
 
-            (spinnerBody.Drawable as ISkinnableSwell)?.ApplyPassiveTransforms(this, MainPiece);
+            (spinnerBody.Drawable as ISkinnableSwell)?.AnimateSwellStart(this, MainPiece);
         }
 
         protected override void UpdateHitStateTransforms(ArmedState state)
@@ -153,16 +153,19 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             switch (state)
             {
                 case ArmedState.Idle:
+                    // Only for rewind support. Reallows user inputs if swell is rewound from being hit/missed to being idle.
                     HandleUserInput = true;
                     break;
 
                 case ArmedState.Miss:
                 case ArmedState.Hit:
+                    const int clear_animation_duration = 1200;
+
                     // Postpone drawable hitobject expiration until it has animated/faded out. Inputs on the object are disallowed during this delay.
-                    LifetimeEnd = Time.Current + 1200;
+                    LifetimeEnd = Time.Current + clear_animation_duration;
                     HandleUserInput = false;
 
-                    (spinnerBody.Drawable as ISkinnableSwell)?.OnHitObjectEnd(state, MainPiece);
+                    (spinnerBody.Drawable as ISkinnableSwell)?.AnimateSwellCompletion(state, MainPiece);
                     break;
             }
         }
diff --git a/osu.Game.Rulesets.Taiko/Objects/ISkinnableSwell.cs b/osu.Game.Rulesets.Taiko/Objects/ISkinnableSwell.cs
index 18feff5bb9..3cdb3566fb 100644
--- a/osu.Game.Rulesets.Taiko/Objects/ISkinnableSwell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/ISkinnableSwell.cs
@@ -9,14 +9,10 @@ namespace osu.Game.Rulesets.Taiko.Objects
 {
     public interface ISkinnableSwell
     {
-        void OnUserInput(DrawableTaikoHitObject<Swell> swell, int numHits, SkinnableDrawable mainPiece);
+        void AnimateSwellProgress(DrawableTaikoHitObject<Swell> swell, int numHits, SkinnableDrawable mainPiece);
 
-        void OnHitObjectEnd(ArmedState state, SkinnableDrawable mainPiece);
+        void AnimateSwellCompletion(ArmedState state, SkinnableDrawable mainPiece);
 
-        /// <summary>
-        /// Applies passive transforms on HitObject start. Gets called every time DrawableTaikoHitobject
-        /// changes state. This happens on creation, and when the object is completed (as in hit or missed).
-        /// </summary>
-        void ApplyPassiveTransforms(DrawableTaikoHitObject<Swell> swell, SkinnableDrawable mainPiece);
+        void AnimateSwellStart(DrawableTaikoHitObject<Swell> swell, SkinnableDrawable mainPiece);
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Default/DefaultSwell.cs b/osu.Game.Rulesets.Taiko/Skinning/Default/DefaultSwell.cs
index e525e9873d..cec07d8769 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Default/DefaultSwell.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Default/DefaultSwell.cs
@@ -106,7 +106,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Default
             targetRing.BorderColour = colours.YellowDark.Opacity(0.25f);
         }
 
-        public void OnUserInput(DrawableTaikoHitObject<Swell> swell, int numHits, SkinnableDrawable mainPiece)
+        public void AnimateSwellProgress(DrawableTaikoHitObject<Swell> swell, int numHits, SkinnableDrawable mainPiece)
         {
             float completion = (float)numHits / swell.HitObject.RequiredHits;
 
@@ -120,7 +120,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Default
                 .FadeTo(completion / 8, 2000, Easing.OutQuint);
         }
 
-        public void OnHitObjectEnd(ArmedState state, SkinnableDrawable mainPiece)
+        public void AnimateSwellCompletion(ArmedState state, SkinnableDrawable mainPiece)
         {
             const double transition_duration = 300;
 
@@ -129,7 +129,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Default
             mainPiece.FadeOut(transition_duration, Easing.OutQuad);
         }
 
-        public void ApplyPassiveTransforms(DrawableTaikoHitObject<Swell> swell, SkinnableDrawable mainPiece)
+        public void AnimateSwellStart(DrawableTaikoHitObject<Swell> swell, SkinnableDrawable mainPiece)
         {
             if (swell.IsHit == false)
                 expandingRing.FadeTo(0);
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacySwell.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacySwell.cs
index 240ec71f94..fdddea2df5 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacySwell.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacySwell.cs
@@ -91,13 +91,13 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
             clearSample = skin.GetSample(new SampleInfo("spinner-osu"));
         }
 
-        public void OnUserInput(DrawableTaikoHitObject<Swell> swell, int numHits, SkinnableDrawable mainPiece)
+        public void AnimateSwellProgress(DrawableTaikoHitObject<Swell> swell, int numHits, SkinnableDrawable mainPiece)
         {
             remainingHitsCountdown.Text = $"{swell.HitObject.RequiredHits - numHits}";
             spinnerCircle.RotateTo(180f * numHits, 1000, Easing.OutQuint);
         }
 
-        public void OnHitObjectEnd(ArmedState state, SkinnableDrawable mainPiece)
+        public void AnimateSwellCompletion(ArmedState state, SkinnableDrawable mainPiece)
         {
             const double clear_transition_duration = 300;
 
@@ -118,7 +118,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
             }
         }
 
-        public void ApplyPassiveTransforms(DrawableTaikoHitObject<Swell> swell, SkinnableDrawable mainPiece)
+        public void AnimateSwellStart(DrawableTaikoHitObject<Swell> swell, SkinnableDrawable mainPiece)
         {
             if (swell.IsHit == false)
             {
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
index a2a735b8db..7133229c62 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
                     case TaikoSkinComponents.DrumRollTick:
                         return this.GetAnimation("sliderscorepoint", false, false);
 
-                    case TaikoSkinComponents.Swell:
+                    case TaikoSkinComponents.SwellBody:
                         if (GetTexture("spinner-circle") != null)
                             return new LegacySwell();
 
diff --git a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
index 3cf4660e54..136a7762e6 100644
--- a/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Rulesets.Taiko
         RimHit,
         DrumRollBody,
         DrumRollTick,
-        Swell,
+        SwellBody,
         SwellCirclePiece,
         HitTarget,
         PlayfieldBackgroundLeft,