Fix bug 1402: sdn infra collector names changed to match RO names