Fix more var names