changing machinetag to machineTag for POR-2233