modifications on service names