minor mods to rename