getting rid of hard-coded callback names