Bug 1094064 - More descriptive names for merges