Fixup egg names.