Renamed some utility functions.