Renamed services
Changed internal references to service
Merge pull request #144 from leebyp/bug/userclient

Bug/userclient