Fix namespace for callback classes