Renamed things to better reflect what they are.