Callback interface rename and other minor fixes.