Doc tweaks, and some function name tweaks