Renamed more stuff for consistency