Renamed a couple of functions.