Issue 5890 make identifiers match when fixing folder integrity conflicts