Do some cleanup, bringing the APIs up to date with the wiki design