Fix more renames