API name tweaks

Fixes #341  #336  and #332