Fixing various naming conventions and changing the way we fetch skins for performance