Renamed services for consistency
merged branch WouterJ/issue_87 (PR #89)

This PR was merged into the master branch.

Discussion
----------

Renamed services for consistency

Fixes #87

Commits
-------

0cec43e Renamed services for consistency