I agree. So, if it turns out to be hard to create a new name correctly without clashing with anything, maybe we could commit this patch as a temporary fix. But we should consider avoiding using original names, because they usually sound like iterator names. http://llvm-reviews.chandlerc.com/D484