Renamed things to make more sense.