Renamed some functions to match the source file.