Fix more renaming typos