Fix network specific names.
Merge branch 'fix_ip_names' into develop