Rename API functions and throw errors

done