Merge "Change callback names"