Yeah, good idea. Let's try to bury this `client_id` detail in the network API client, and use `service` consistently elsewhere.