Fix service name matcher in console