API names refactor