Replace host with hostname for better switch match