Updates to remove header, force name and ip to match