better handling of names across hosts