Minor documentation and naming fixes.