Variable renames and doc fixes.