So I actually am un-doing that change in the next push.

I put that in there because there is a disconnect between serviceNames and serviceName.  However it looks like serviceName is used for the ui, and It's probably better to just take note of the weirdness and keep the user experience better.