Fix api inconsistencies

There are a few renamings of things I'd like to do to get sapphire's api to look more consistent.