Bug 1022971 - Rename follow-up for merge conflicts r=me