fix service name bugs