Fix more names