Fix service names