Missed some renames (#1).