Merge "Prioritize regular names over phonetic names. P1"