Upstream/id

finishes changes to service name storage