Time-consuming but from what you say seemingly unavoidable ... The standard practice is given name first in the text ('As William Shakespeare says ...) but surname in the bibliography (Shakespeare, William: Hamlet). Surprised that there appears to be no ready way to move between these.