Renamed things so it makes more sense.