rename and clean up callbacks