Configurable service name

Rebased #455 and addressed the feedback I'd left.

Closes #455