Renamed some utility functions