Well, off the top of my head and without going any googling at all, Dungeons & Dragons uses Wizards as a gender neutral term, and that's at least a valid source as the Harry Potter books and films. The Baba Yaga is also sometimes referred to as a Wizard (although she's referred to as a Witch, Sorceress and other titles even more often). My point was that the term isn't gender neutral, despite that it's most commonly used to refer to male characters. As for Witch/Warlock, I think it just depends on what you're reading. Authors make stuff up, and one author's fiction doesn't take precedent over another. Some with religion and spiritual practices. So if author A decided that in her book all male Witches are Warlocks, that's just in her book. Author B could decide the opposite and wouldn't be wrong.