Fix service name (not sure about this)