Renamed functions for consistancy's sake