Merge "Update api name for clarity"