diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index ab0e9ab1c0..620540b8ef 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -35,10 +35,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 switch (osuComponent.Component)
                 {
                     case OsuSkinComponents.FollowPoint:
-                        return this.GetAnimation(lookup.LookupName, true, true, true, startAtCurrentTime: false);
+                        return this.GetAnimation("followpoint", true, true, true, startAtCurrentTime: false);
 
                     case OsuSkinComponents.SliderScorePoint:
-                        return this.GetAnimation(lookup.LookupName, false, false);
+                        return this.GetAnimation("sliderscorepoint", false, false);
 
                     case OsuSkinComponents.SliderFollowCircle:
                         var followCircleContent = this.GetAnimation("sliderfollowcircle", true, true, true);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
index e050273652..97974d2368 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
@@ -289,7 +289,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             }
 
             public Drawable GetDrawableComponent(ISkinComponentLookup componentLookupName) =>
-                componentLookupName.LookupName == "available"
+                (componentLookupName as TestSkinComponentLookup)?.LookupName == "available"
                     ? new DrawWidthBox
                     {
                         Colour = Color4.Yellow,
diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index c3361093a9..a2eb07eba3 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -7,7 +7,6 @@ using JetBrains.Annotations;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
 using osu.Game.Beatmaps.Formats;
@@ -88,6 +87,16 @@ namespace osu.Game.Skinning
 
             switch (lookup)
             {
+                case SkinnableSprite.SpriteComponentLookup spriteLookup:
+                    switch (spriteLookup.LookupName)
+                    {
+                        // Temporary until default skin has a valid hit lighting.
+                        case @"lighting":
+                            return Drawable.Empty();
+                    }
+
+                    break;
+
                 case GlobalSkinComponentLookup globalLookup:
                     switch (globalLookup.Lookup)
                     {
@@ -178,16 +187,6 @@ namespace osu.Game.Skinning
                     return null;
             }
 
-            switch (lookup.LookupName)
-            {
-                // Temporary until default skin has a valid hit lighting.
-                case @"lighting":
-                    return Drawable.Empty();
-            }
-
-            if (GetTexture(lookup.LookupName) is Texture t)
-                return new Sprite { Texture = t };
-
             return null;
         }
 
diff --git a/osu.Game/Skinning/GlobalSkinComponentLookup.cs b/osu.Game/Skinning/GlobalSkinComponentLookup.cs
index 3d8b61eba2..7dcc3c4f14 100644
--- a/osu.Game/Skinning/GlobalSkinComponentLookup.cs
+++ b/osu.Game/Skinning/GlobalSkinComponentLookup.cs
@@ -7,8 +7,6 @@ namespace osu.Game.Skinning
     {
         public readonly LookupType Lookup;
 
-        public string LookupName => Lookup.ToString();
-
         public GlobalSkinComponentLookup(LookupType lookup)
         {
             Lookup = lookup;
diff --git a/osu.Game/Skinning/ISkinComponentLookup.cs b/osu.Game/Skinning/ISkinComponentLookup.cs
index ae56fb0b1c..be4043d7cf 100644
--- a/osu.Game/Skinning/ISkinComponentLookup.cs
+++ b/osu.Game/Skinning/ISkinComponentLookup.cs
@@ -16,6 +16,5 @@ namespace osu.Game.Skinning
     /// </remarks>
     public interface ISkinComponentLookup
     {
-        string LookupName { get; }
     }
 }
diff --git a/osu.Game/Skinning/SkinnableSprite.cs b/osu.Game/Skinning/SkinnableSprite.cs
index 43fec11b14..7fd0e43562 100644
--- a/osu.Game/Skinning/SkinnableSprite.cs
+++ b/osu.Game/Skinning/SkinnableSprite.cs
@@ -55,10 +55,10 @@ namespace osu.Game.Skinning
 
         protected override Drawable CreateDefault(ISkinComponentLookup lookup)
         {
-            var texture = textures.Get(lookup.LookupName);
+            var texture = textures.Get(((SpriteComponentLookup)lookup).LookupName);
 
             if (texture == null)
-                return new SpriteNotFound(lookup.LookupName);
+                return new SpriteNotFound(((SpriteComponentLookup)lookup).LookupName);
 
             return new Sprite { Texture = texture };
         }
diff --git a/osu.Game/Skinning/TrianglesSkin.cs b/osu.Game/Skinning/TrianglesSkin.cs
index 3df85b6880..2075cfb6f2 100644
--- a/osu.Game/Skinning/TrianglesSkin.cs
+++ b/osu.Game/Skinning/TrianglesSkin.cs
@@ -7,7 +7,6 @@ using JetBrains.Annotations;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
 using osu.Game.Beatmaps.Formats;
@@ -66,6 +65,16 @@ namespace osu.Game.Skinning
 
             switch (lookup)
             {
+                case SkinnableSprite.SpriteComponentLookup spriteLookup:
+                    switch (spriteLookup.LookupName)
+                    {
+                        // Temporary until default skin has a valid hit lighting.
+                        case @"lighting":
+                            return Drawable.Empty();
+                    }
+
+                    break;
+
                 case GlobalSkinComponentLookup target:
                     switch (target.Lookup)
                     {
@@ -156,16 +165,6 @@ namespace osu.Game.Skinning
                     return null;
             }
 
-            switch (lookup.LookupName)
-            {
-                // Temporary until default skin has a valid hit lighting.
-                case @"lighting":
-                    return Drawable.Empty();
-            }
-
-            if (GetTexture(lookup.LookupName) is Texture t)
-                return new Sprite { Texture = t };
-
             return null;
         }
 
diff --git a/osu.Game/Skinning/UnsupportedSkinComponentException.cs b/osu.Game/Skinning/UnsupportedSkinComponentException.cs
index 1fb6641668..b8dfb7a31d 100644
--- a/osu.Game/Skinning/UnsupportedSkinComponentException.cs
+++ b/osu.Game/Skinning/UnsupportedSkinComponentException.cs
@@ -8,7 +8,7 @@ namespace osu.Game.Skinning
     public class UnsupportedSkinComponentException : Exception
     {
         public UnsupportedSkinComponentException(ISkinComponentLookup lookup)
-            : base($@"Unsupported component type: {lookup.GetType()} (lookup: ""{lookup.LookupName}"").")
+            : base($@"Unsupported component type: {lookup.GetType()} (lookup: ""{lookup}"").")
         {
         }
     }