Renamed two function names.