Service name fix