Fix service naming issue.