Rename functions, update API