Core api rename

Opening a PR for review and suggestions, don't want to commit it to master right away.