(PDB-663) More work

Signed-off-by: Ken Barber <ken@bob.sh>
(PDB-663) Switch product-name for PE

Signed-off-by: Ken Barber <ken@bob.sh>