Merge branch 'net-Manufacturer-names-and-spelling-fixes'