Some modern decks have addressed this by creating new, genderless terms for them. Names like "The Mentor" and "The Apprentice" pervade.

While I admire the creativity of such decks, the historical and social context of gender are hard to erase. Names change, but archetypes are what define tarot and those remain.