pedagogue -- a teacher; school teacher; teaching

pedagogy -- 1) the function or work of a teacher; teaching; 2) the art of science or teaching; education; instructional methods

[definitions Random House Webster's College Dictionary,1995)