Renamed a few functions