Change some API names