doc: more name tweaks