Doc and name tweaks