fixed some naming issues in callback parameters