Changed renaming policy