Thaumaturge
Wandering. Not lost. (He/they)
I never bothered to look or pay attention on 2e books, but I'm sure 4e and the srd spell it as "staffs", both are practically indistinguishable from each other when spoken out loud anyway.
I did some quick searches to back up my memory, but I can't quickly find anything.
My memory tells me the change happened from 3e to 3.5.
Thaumaturge.