Store service name in client class, small refactor to help test mocking.