Refactor for Service Names.