Renamed a bunch of functions