Still more tweaks to renaming.