Rename public api to something more reasonable