One that does appear to go against the previous norm is acting,
we once had the “male” Actor.
and the “female” Actress.
but Actress was dropped and now both sexes are known as Actors, perhaps that may be a generic route to follow. After all in a similar way they dropped the W from WRAF.