You're right on one side. Male witches are called warlocks and female wizards are just called wizards. Witches/warlocks have nothing to do with wizards, too, considering that wizards have to actually study magic while warlocks resort to their patrons. JK Rowling literally JK trolled everyone with her filfthy lies so that the REAL community of spellcasters could remain hidden from society.