Be more liberal in service name we look for