Change renaming behavior