Change remaining 'client' to 'driver'