Fix more badly named vars