Do terms like "best man" and "maid / matron of honor" really fit in today's world?

The term "actress" seems to have been replaced by "actor" and "comedienne" by "comedian." Long ago terms like "Negress" and "Jewess" seemed to disappear. Since the roles of Best Man and Maid (or Matron) of Honor are mostly to be official witnesses at a wedding ceremony, do you think it's high time those terms were changed to reflect the current reality? I have heard Ministers refer to the "Official Witnesses" at a wedding service. Seems to make sense to me. The very term BEST Man can be offensive to a person who believes himself to be closer to the Groom, yet passed over in favor of a sibling, father or other individual. Maid or Matron of Honor seems to have less of a negative impact since it is far less judgmental than calling one person the "BEST." Though "Matron" today, when speaking of a married woman seems to conjure up images of a PRISON Matron or guard of old!

What do you think? I am trying to help a young couple struggling with the issues of inclusion and PC in their upcoming wedding.