Add better merging for names.