Clean up by renaming files