Rename API call names to be less ambiguous