Renamed some drawing functions, for consistency.