Minor docstring and naming fixes.