Adjust productnames

Change-Id: I020407d0a7a77ef8f46ab72aab0b892276e55aab
switch back product names

Change-Id: Ie12d5fa087c1b1e8301f4e777ae93022345f8700