refactor API calls names