Renamed some function names to be easily recognized