Replaced OriginatingMachine and ProcessingMachine headers with OriginatingHostId and ProcessingHostId