Harry Potter - was gregorovitch and olivander two different wand makers?

just confused as to who voldemort killed and who was the guy that stole the elder wand? did voldemort kill him?