Waltz... I just did some looking around at the Win32_ComputerSystemProduct key you provided, and I found something interesting.
That info appears to be static from the time of install, I was looking through a Latitude notebook WMI at that key and it is filled in with the info from the compaq deskpro that was used to master the image that was applied to my laptops (and other desktops)...
You may want to look into that.
