Remove dedicated callback function types. Improve consistency of callback function names.