Merge "Rename callback to reflect HAL version"