Merge "Rename CallbackRecord to CallbackEntry"