Fix more aliases.