Renamed scruffy client classes