As you say, this changed (I think at least). Originally in ADnD you only had a Magier (Wizard), and Zauberer was the name for the Enchanter specialization of the Wizard in German. Hexenmeister is often used for a Warlocks because in many cases in English it's used for the male version of a Witch which often has the same connotations to Fey, Demons magic etc. in fantasy games.
And you are right, in 3 or 3.5 Sorcerers were called Hexenmeister German if I remember correctly.
Anyway there is no 100% right way to do this. You could also call a Wizard a Zauberer. It's all about a convention within a game setting, which can change.
