Mecheon
Sacabambaspis
I mean, if we're doing that...Regardless, its irrelevant. A Warlock is a Witch. In name and in fluff.
Paladins should just be the twelve knights of Charlemagne's court.
Barbarians should just be, non-Romans (So basically everyone in D&D)
The modern terms of warlock and witch have evolved far beyond the days when they were just gender orientated, and witch has been used to refer to male figures in works for decades now.
The words may have ment different genders once, but that is no longer the case, and if we're applying outdated terminology to other things it looks ridiculous