Doc fixes.
Rename for clarity.