A bit of renaming logic