key server -> key service
more app server -> app service
Merge branch 'master' of https://github.com/simonsdave/yar