doc++
name tweaks