#73 Better delegate callback names