More product configuration name changes for consistency and clarity

Change-Id: I7637c7d8651d9a298fff1a5e6de1918cd6b7c3f4
3 files changed