Renaming enhancement