Minor doc fixes and renaming