Renamed things to better confide with the naming scheme.