Renamed a few functions!