Renamed some API functions