Minor tweaks and renames to the API