Fix Stephen's last name. Readjust team names.