Change service name to service ID.

I believe this is part of #1135.