Renamed services for consistency

Fixes #87