Hm.  Walk me through this.  In the old code we fixed conflicts in the name before copying the data file over.  But now we're copying the data file over before we check for conflicts.  Then we check for conflicts, update the name and save again, and in the update code we rename the datafile to the new non-conflicted name (line 454 in your version).  Does that sound right to you?