Var name fixes for Reek.