Cleanup authenticate callback argument names