Nick, I'm sorry about that. Your suggestion on naming seems reasonable to me, I'll make the change accordingly. I think I can do that with Perl one-liner. http://llvm-reviews.chandlerc.com/D1302