Added network_name concept and defaulted to hostname