feat(client): change Resolve
to be Service<Name>
#2011
Merged
Resolve
to be Service<Name>
#2011