-Resolved conflicts with service names.