Witch

the most widely accepted and generally safe term to use no matter what class or creed of magic folk you're referring to. Warlocks are witches who may have made deals with greater beings in order to further their own magical abilities.