renamed the master callback classes