callbacks: fix bugs, do some clean up and renamimg

Signed-off-by: Peter Williams <pwil3058@gmail.com>