When addressing either male or female it is still Witch. The word Warlock translates to "oathbreaker". If you call a male Witch a warlock, he's going to get angry at you. The word Warlock was made popular by movies and media. (There is no such thing as a "warlock"). It sounds very mysterious and magical and makes for good movies. *shrug* As usual, Hollywoods poetic license I suppose.