Doc update, renaming variables