Renamed some API's