Fixing a regex for service names