expand the regex for service names