Merge "Convert service_name to underscore syntax"