Merge "Consistent mode names."