Merge "Do not assume network names"