Fix more name aliasing...