Change win.cpu tags to use DeviceID instead of Name and strip off leading CPU to match Processor PerfRawData tags