Few renaming tweaks.