[Service] Rename the ServiceId
proto to Service
#150
Merged
ServiceId
proto to Service
#150