Doc fixes, one more rename.