Revert "Adding support for custom service name"

This reverts commit 2bfc8a2edb34bc133f958593a71eaf419cdf9c51.