[Avatars] Revert PR #50557 If two avatars, use Name 1 & Name 2 pattern.

[Avatars] Revert PR #50557 If two avatars, use Name 1 & Name 2 pattern. #63078