reorder parameters and fix CF notation about FQDNs