Doc fixes, variable renaming