Renamed some functions