Fix typo from remnaming optional var.
Fix style in more files

Found 2 typos that could potentially can prevent proper work and one
rename plus deps update.