Merge pull request #726 from leider/master

global rename: ...API now ...Service