fix up file renaming code a little bit