Renamed some functions.