Renamed stuff for consistency.