A bit more progress with renaming.