diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd-layout/layout.yaml b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd-layout/layout.yaml
index 5e24fc4..ce11f2e 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd-layout/layout.yaml
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd-layout/layout.yaml
@@ -1,14 +1,14 @@
 BMC:
     xyz.openbmc_project.Inventory.Decorator.Asset:
-        PartNumber: VINI,PN
-        SerialNumber: VINI,SN
-        Manufacturer: OPFR,VN
+        VINI,PN: PartNumber
+        VINI,SN: SerialNumber
+        OPFR,VN: Manufacturer
     xyz.openbmc_project.Inventory.Item:
-        PrettyName: VINI,DR
+        VINI,DR: PrettyName
     xyz.openbmc_project.Common.UUID:
-        UUID: OPFR,UD
+        OPFR,UD: UUID
 
 
 ETHERNET:
     xyz.openbmc_project.Inventory.Item.NetworkInterface:
-        MACAddress: VINI,B1
+        VINI,B1: MACAddress
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd.inc b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd.inc
index e3b9cb0..6766418 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd.inc
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd.inc
@@ -2,4 +2,4 @@
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 SRC_URI += "git://github.com/openbmc/openpower-vpd-parser"
-SRCREV = "d47f1030c1e77c7c2b40defe705be76c321c3464"
+SRCREV = "db12d763fba2c781af3490b01edc1a5e8f393426"