Actually use service name + better usage error reporting