diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 887346b5df..a10e91dae8 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Screens.Play
 
         private bool holdingForHUD;
 
-        private readonly SkinnableElementTargetContainer mainComponents;
+        private readonly SkinnableTargetContainer mainComponents;
 
         private IEnumerable<Drawable> hideTargets => new Drawable[] { visibilityContainer, KeyCounter, topRightElements };
 
@@ -97,7 +97,7 @@ namespace osu.Game.Screens.Play
                                     RelativeSizeAxes = Axes.Both,
                                     Children = new Drawable[]
                                     {
-                                        mainComponents = new SkinnableElementTargetContainer(SkinnableTarget.MainHUDComponents)
+                                        mainComponents = new SkinnableTargetContainer(SkinnableTarget.MainHUDComponents)
                                         {
                                             RelativeSizeAxes = Axes.Both,
                                         },
diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index bf9a6464d0..67285987ef 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -181,7 +181,7 @@ namespace osu.Game.Skinning.Editor
 
         private void revert()
         {
-            SkinnableElementTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();
+            SkinnableTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableTargetContainer>().ToArray();
 
             foreach (var t in targetContainers)
             {
@@ -194,7 +194,7 @@ namespace osu.Game.Skinning.Editor
 
         private void save()
         {
-            SkinnableElementTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();
+            SkinnableTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableTargetContainer>().ToArray();
 
             foreach (var t in targetContainers)
                 currentSkin.Value.UpdateDrawableTarget(t);
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 4890524b90..3a16cb5818 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Skinning
         /// Remove all stored customisations for the provided target.
         /// </summary>
         /// <param name="targetContainer">The target container to reset.</param>
-        public void ResetDrawableTarget(SkinnableElementTargetContainer targetContainer)
+        public void ResetDrawableTarget(SkinnableTargetContainer targetContainer)
         {
             DrawableComponentInfo.Remove(targetContainer.Target);
         }
@@ -74,7 +74,7 @@ namespace osu.Game.Skinning
         /// Update serialised information for the provided target.
         /// </summary>
         /// <param name="targetContainer">The target container to serialise to this skin.</param>
-        public void UpdateDrawableTarget(SkinnableElementTargetContainer targetContainer)
+        public void UpdateDrawableTarget(SkinnableTargetContainer targetContainer)
         {
             DrawableComponentInfo[targetContainer.Target] = targetContainer.CreateSkinnableInfo().ToArray();
         }
diff --git a/osu.Game/Skinning/SkinnableElementTargetContainer.cs b/osu.Game/Skinning/SkinnableTargetContainer.cs
similarity index 94%
rename from osu.Game/Skinning/SkinnableElementTargetContainer.cs
rename to osu.Game/Skinning/SkinnableTargetContainer.cs
index 2a76d3bf7c..daf54277fd 100644
--- a/osu.Game/Skinning/SkinnableElementTargetContainer.cs
+++ b/osu.Game/Skinning/SkinnableTargetContainer.cs
@@ -11,7 +11,7 @@ using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Skinning
 {
-    public class SkinnableElementTargetContainer : SkinReloadableDrawable, ISkinnableTarget
+    public class SkinnableTargetContainer : SkinReloadableDrawable, ISkinnableTarget
     {
         private SkinnableTargetWrapper content;
 
@@ -21,7 +21,7 @@ namespace osu.Game.Skinning
 
         private readonly BindableList<ISkinnableDrawable> components = new BindableList<ISkinnableDrawable>();
 
-        public SkinnableElementTargetContainer(SkinnableTarget target)
+        public SkinnableTargetContainer(SkinnableTarget target)
         {
             Target = target;
         }