Update names for Win 2000 boxes again so they include the platform bits