diff --git a/osu.Game.Rulesets.Osu/Edit/Masks/HitCircle/Components/HitCircleMask.cs b/osu.Game.Rulesets.Osu/Edit/Masks/HitCircle/Components/HitCirclePiece.cs
similarity index 92%
rename from osu.Game.Rulesets.Osu/Edit/Masks/HitCircle/Components/HitCircleMask.cs
rename to osu.Game.Rulesets.Osu/Edit/Masks/HitCircle/Components/HitCirclePiece.cs
index b43399ff18..7f6ee32427 100644
--- a/osu.Game.Rulesets.Osu/Edit/Masks/HitCircle/Components/HitCircleMask.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Masks/HitCircle/Components/HitCirclePiece.cs
@@ -11,11 +11,11 @@ using OpenTK;
 
 namespace osu.Game.Rulesets.Osu.Edit.Masks.HitCircle.Components
 {
-    public class HitCircleMask : CompositeDrawable
+    public class HitCirclePiece : CompositeDrawable
     {
         private readonly Objects.HitCircle hitCircle;
 
-        public HitCircleMask(Objects.HitCircle hitCircle)
+        public HitCirclePiece(Objects.HitCircle hitCircle)
         {
             this.hitCircle = hitCircle;
 
diff --git a/osu.Game.Rulesets.Osu/Edit/Masks/HitCircle/HitCirclePlacementMask.cs b/osu.Game.Rulesets.Osu/Edit/Masks/HitCircle/HitCirclePlacementMask.cs
index c7bc7decc4..d172b87b44 100644
--- a/osu.Game.Rulesets.Osu/Edit/Masks/HitCircle/HitCirclePlacementMask.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Masks/HitCircle/HitCirclePlacementMask.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Masks.HitCircle
         public HitCirclePlacementMask()
             : base(new Objects.HitCircle())
         {
-            InternalChild = new HitCircleMask(HitObject);
+            InternalChild = new HitCirclePiece(HitObject);
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game.Rulesets.Osu/Edit/Masks/HitCircle/HitCircleSelectionMask.cs b/osu.Game.Rulesets.Osu/Edit/Masks/HitCircle/HitCircleSelectionMask.cs
index dd6bcc6fad..eb9696baa0 100644
--- a/osu.Game.Rulesets.Osu/Edit/Masks/HitCircle/HitCircleSelectionMask.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Masks/HitCircle/HitCircleSelectionMask.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Masks.HitCircle
         public HitCircleSelectionMask(DrawableHitCircle hitCircle)
             : base(hitCircle)
         {
-            InternalChild = new HitCircleMask((Objects.HitCircle)hitCircle.HitObject);
+            InternalChild = new HitCirclePiece((Objects.HitCircle)hitCircle.HitObject);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Masks/Slider/Components/SliderBodyMask.cs b/osu.Game.Rulesets.Osu/Edit/Masks/Slider/Components/BodyPiece.cs
similarity index 92%
rename from osu.Game.Rulesets.Osu/Edit/Masks/Slider/Components/SliderBodyMask.cs
rename to osu.Game.Rulesets.Osu/Edit/Masks/Slider/Components/BodyPiece.cs
index 733a777dff..ddf591b401 100644
--- a/osu.Game.Rulesets.Osu/Edit/Masks/Slider/Components/SliderBodyMask.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Masks/Slider/Components/BodyPiece.cs
@@ -9,12 +9,12 @@ using OpenTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Edit.Masks.Slider.Components
 {
-    public class SliderBodyMask : CompositeDrawable
+    public class BodyPiece : CompositeDrawable
     {
         private readonly Objects.Slider slider;
         private readonly SliderBody body;
 
-        public SliderBodyMask(Objects.Slider slider)
+        public BodyPiece(Objects.Slider slider)
         {
             this.slider = slider;
             InternalChild = body = new SliderBody(slider)
diff --git a/osu.Game.Rulesets.Osu/Edit/Masks/Slider/Components/SliderCircleMask.cs b/osu.Game.Rulesets.Osu/Edit/Masks/Slider/Components/SliderCirclePiece.cs
similarity index 87%
rename from osu.Game.Rulesets.Osu/Edit/Masks/Slider/Components/SliderCircleMask.cs
rename to osu.Game.Rulesets.Osu/Edit/Masks/Slider/Components/SliderCirclePiece.cs
index 37c0846285..b1c05574d4 100644
--- a/osu.Game.Rulesets.Osu/Edit/Masks/Slider/Components/SliderCircleMask.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Masks/Slider/Components/SliderCirclePiece.cs
@@ -5,12 +5,12 @@ using osu.Game.Rulesets.Osu.Edit.Masks.HitCircle.Components;
 
 namespace osu.Game.Rulesets.Osu.Edit.Masks.Slider.Components
 {
-    public class SliderCircleMask : HitCircleMask
+    public class SliderCirclePiece : HitCirclePiece
     {
         private readonly Objects.Slider slider;
         private readonly SliderPosition position;
 
-        public SliderCircleMask(Objects.Slider slider, SliderPosition position)
+        public SliderCirclePiece(Objects.Slider slider, SliderPosition position)
             : base(slider.HeadCircle)
         {
             this.slider = slider;
diff --git a/osu.Game.Rulesets.Osu/Edit/Masks/Slider/SliderCircleSelectionMask.cs b/osu.Game.Rulesets.Osu/Edit/Masks/Slider/SliderCircleSelectionMask.cs
index 22aadba478..e65a3f2665 100644
--- a/osu.Game.Rulesets.Osu/Edit/Masks/Slider/SliderCircleSelectionMask.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Masks/Slider/SliderCircleSelectionMask.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Masks.Slider
         public SliderCircleSelectionMask(DrawableOsuHitObject hitObject, Objects.Slider slider, SliderPosition position)
             : base(hitObject)
         {
-            InternalChild = new SliderCircleMask(slider, position);
+            InternalChild = new SliderCirclePiece(slider, position);
 
             Select();
         }
diff --git a/osu.Game.Rulesets.Osu/Edit/Masks/Slider/SliderSelectionMask.cs b/osu.Game.Rulesets.Osu/Edit/Masks/Slider/SliderSelectionMask.cs
index e22a8119f9..e7a8652ed7 100644
--- a/osu.Game.Rulesets.Osu/Edit/Masks/Slider/SliderSelectionMask.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Masks/Slider/SliderSelectionMask.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Masks.Slider
 
             InternalChildren = new Drawable[]
             {
-                new SliderBodyMask(sliderObject),
+                new BodyPiece(sliderObject),
                 headMask = new SliderCircleSelectionMask(slider.HeadCircle, sliderObject, SliderPosition.Start),
                 new SliderCircleSelectionMask(slider.TailCircle, sliderObject, SliderPosition.End),
             };
diff --git a/osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs b/osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
index 8b7355e456..482e801563 100644
--- a/osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
+++ b/osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Tests.Visual
             typeof(OsuHitObjectComposer),
             typeof(HitObjectMaskLayer),
             typeof(NotNullAttribute),
-            typeof(HitCircleMask),
+            typeof(HitCirclePiece),
             typeof(HitCircleSelectionMask),
             typeof(HitCirclePlacementMask),
         };