Changed renaming process