diff --git a/config/ibm/50001000.json b/config/ibm/50001000.json
index e8a50ee..84f51d5 100644
--- a/config/ibm/50001000.json
+++ b/config/ibm/50001000.json
@@ -35,7 +35,7 @@
                         "LocationCode": "Ufcs-P0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "System Backplane"
+                        "PrettyName": "System backplane"
                     }
                 }
             },
@@ -104,7 +104,7 @@
                         "LocationCode": "Ufcs-P0-C0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -121,7 +121,7 @@
                         "LocationCode": "Ufcs-P0-C1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x8 adapter"
                     }
                 }
             },
@@ -138,7 +138,7 @@
                         "LocationCode": "Ufcs-P0-C2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -155,7 +155,7 @@
                         "LocationCode": "Ufcs-P0-C3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -172,7 +172,7 @@
                         "LocationCode": "Ufcs-P0-C4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -189,7 +189,7 @@
                         "LocationCode": "Ufcs-P0-C6"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Card Slot"
+                        "PrettyName": "OpenCAPI adapter"
                     }
                 }
             },
@@ -206,7 +206,7 @@
                         "LocationCode": "Ufcs-P0-C7"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -223,7 +223,7 @@
                         "LocationCode": "Ufcs-P0-C8"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x8 adapter"
                     }
                 }
             },
@@ -240,7 +240,7 @@
                         "LocationCode": "Ufcs-P0-C9"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -257,7 +257,7 @@
                         "LocationCode": "Ufcs-P0-C10"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -274,7 +274,7 @@
                         "LocationCode": "Ufcs-P0-C11"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -290,7 +290,7 @@
                         "LocationCode": "Ufcs-P0-T18"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Dummy PCIe USB Adapter Slot"
+                        "PrettyName": "USB 3.0 port"
                     }
                 }
             },
@@ -306,7 +306,7 @@
                         "SlotNumber": 12
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Dummy PCIe USB Adapter"
+                        "PrettyName": "USB 3.0 port"
                     }
                 }
             },
@@ -542,7 +542,7 @@
                         "LocationCode": "Ufcs-P0-E0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Time Of Day Battery"
+                        "PrettyName": "Time-of-day battery"
                     }
                 }
             },
@@ -555,7 +555,7 @@
                         "LocationCode": "Ufcs-P0-T0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Connector for OpenCAPI Port DCM-0 P0 OP3B"
                     }
                 }
             },
@@ -568,7 +568,7 @@
                         "LocationCode": "Ufcs-P0-T1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Connector for OpenCAPI Port DCM-0 P0 OP3A"
                     }
                 }
             },
@@ -581,7 +581,7 @@
                         "LocationCode": "Ufcs-P0-T2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Connector for OpenCAPI Port DCM-0 P1 OP0B"
                     }
                 }
             },
@@ -594,7 +594,7 @@
                         "LocationCode": "Ufcs-P0-T3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Connector for OpenCAPI Port DCM-0 P1 OP0A"
                     }
                 }
             },
@@ -607,7 +607,7 @@
                         "LocationCode": "Ufcs-P0-T4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Power Distribution Board Signals Cable Connector"
+                        "PrettyName": "Power signal cable port"
                     }
                 }
             },
@@ -620,7 +620,7 @@
                         "LocationCode": "Ufcs-P0-T5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Connector for OpenCAPI Port DCM-1 P0 OP3A"
                     }
                 }
             },
@@ -633,7 +633,7 @@
                         "LocationCode": "Ufcs-P0-T6"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Connector for OpenCAPI Port DCM-1 P1 OP0B"
                     }
                 }
             },
@@ -646,7 +646,7 @@
                         "LocationCode": "Ufcs-P0-T7"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Front Host USB 3.0 and RDX Connector"
+                        "PrettyName": "USB 3.0 port"
                     }
                 }
             },
@@ -659,7 +659,7 @@
                         "LocationCode": "Ufcs-P0-T8"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane Signal Cable Connector"
+                        "PrettyName": "Drive backplane signal cable port"
                     }
                 }
             },
@@ -672,7 +672,7 @@
                         "LocationCode": "Ufcs-P0-T9"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane Signal Cable Connector"
+                        "PrettyName": "Drive backplane signal cable port"
                     }
                 }
             },
@@ -685,7 +685,7 @@
                         "LocationCode": "Ufcs-P0-T10"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Fan Card Connector"
+                        "PrettyName": "Drive backplane signal cable port"
                     }
                 }
             },
@@ -698,7 +698,7 @@
                         "LocationCode": "Ufcs-P0-T11"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Op Panel Cable Connector"
+                        "PrettyName": "Control panel cable port"
                     }
                 }
             },
@@ -711,7 +711,7 @@
                         "LocationCode": "Ufcs-P0-T12"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Fan Card Signal Cable Connector"
+                        "PrettyName": "Fan signal cable port"
                     }
                 }
             },
@@ -724,7 +724,7 @@
                         "LocationCode": "Ufcs-P0-T13"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Op Panel LCD Display cable Connector"
+                        "PrettyName": "Control panel display cable port"
                     }
                 }
             },
@@ -737,7 +737,7 @@
                         "LocationCode": "Ufcs-P0-T14"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane Power Cable Connector"
+                        "PrettyName": "Drive backplane power cable port"
                     }
                 }
             },
@@ -750,7 +750,7 @@
                         "LocationCode": "Ufcs-P0-T15"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane Power Cable Connector"
+                        "PrettyName": "Drive backplane power cable port"
                     }
                 }
             },
@@ -763,7 +763,7 @@
                         "LocationCode": "Ufcs-P0-T16"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane Power Cable Connector"
+                        "PrettyName": "Drive backplane power cable port"
                     }
                 }
             },
@@ -776,7 +776,7 @@
                         "LocationCode": "Ufcs-P0-T17"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Fan Card Signal Cable Connector"
+                        "PrettyName": "Fan signal cable port"
                     }
                 }
             },
@@ -789,7 +789,7 @@
                         "LocationCode": "Ufcs-P0-T18"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Front USB Connector"
+                        "PrettyName": "USB 3.0 port"
                     }
                 }
             },
@@ -802,7 +802,7 @@
                         "LocationCode": "Ufcs-P0-T19"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Upper Blower Connector"
+                        "PrettyName": "Fan cable port"
                     }
                 }
             },
@@ -815,7 +815,7 @@
                         "LocationCode": "Ufcs-P0-T20"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Upper Blower Connector"
+                        "PrettyName": "Fan cable port"
                     }
                 }
             },
@@ -828,7 +828,7 @@
                         "LocationCode": "Ufcs-P0-T21"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "RDX Power Cable Connector"
+                        "PrettyName": "Internal RDX power cable port"
                     }
                 }
             },
@@ -856,7 +856,7 @@
                         "LocationCode": "Ufcs-P4-D0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "RDX Drive"
+                        "PrettyName": "RDX removable disk drive"
                     }
                 }
             },
@@ -870,7 +870,7 @@
                         "LocationCode": "Ufcs-P4-T0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "RDX Power Connector"
+                        "PrettyName": "Power connector for RDX"
                     }
                 }
             },
@@ -884,7 +884,7 @@
                         "LocationCode": "Ufcs-P4-T1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "RDX USB Connector"
+                        "PrettyName": "USB connector for RDX"
                     }
                 }
             }
@@ -898,7 +898,7 @@
                         "LocationCode": "Ufcs-P0-C5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "BMC Card"
+                        "PrettyName": "eBMC card"
                     }
                 }
             },
@@ -920,7 +920,7 @@
                         }
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "HMC Ethernet Connector"
+                        "PrettyName": "HMC port 0"
                     }
                 }
             },
@@ -942,7 +942,7 @@
                         }
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "HMC Ethernet Connector"
+                        "PrettyName": "HMC port 1"
                     }
                 }
             },
@@ -955,7 +955,7 @@
                         "LocationCode": "Ufcs-P0-C5-T2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "BMC USB Connector"
+                        "PrettyName": "USB 3.0 port"
                     }
                 }
             },
@@ -968,7 +968,7 @@
                         "LocationCode": "Ufcs-P0-C5-T3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Display Port Connector"
+                        "PrettyName": "Display Port"
                     }
                 }
             },
@@ -981,7 +981,7 @@
                         "LocationCode": "Ufcs-P0-C5-T4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "BMC USB Connector"
+                        "PrettyName": "USB 2.0 port"
                     }
                 }
             }
@@ -995,7 +995,7 @@
                         "LocationCode": "Ufcs-P0-C22"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "TPM Card"
+                        "PrettyName": "Trusted platform module card"
                     }
                 }
             }
@@ -1010,7 +1010,7 @@
                         "LocationCode": "Ufcs-D0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Operator Panel Base"
+                        "PrettyName": "Control panel"
                     }
                 }
             }
@@ -1043,7 +1043,7 @@
                         "LocationCode": "Ufcs-D1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Operator Panel LCD"
+                        "PrettyName": "Control panel display"
                     }
                 }
             }
@@ -1057,7 +1057,7 @@
                         "LocationCode": "Ufcs-P0-C14"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Voltage regulator module for system processor module 0"
                     }
                 }
             }
@@ -1071,7 +1071,7 @@
                         "LocationCode": "Ufcs-P0-C23"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Voltage regulator module for system processor module 1"
                     }
                 }
             }
@@ -1090,7 +1090,7 @@
                         "LocationCode": "Ufcs-P0-C15"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 0"
                     }
                 }
             },
@@ -1243,7 +1243,7 @@
                         "LocationCode": "Ufcs-P0-C15"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 0"
                     }
                 }
             },
@@ -1396,7 +1396,7 @@
                         "LocationCode": "Ufcs-P0-C24"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 1"
                     }
                 }
             },
@@ -1549,7 +1549,7 @@
                         "LocationCode": "Ufcs-P0-C24"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 1"
                     }
                 }
             },
@@ -1722,7 +1722,7 @@
                         "SlotNumber": 0
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -1790,7 +1790,7 @@
                         "SlotNumber": 3
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -1855,7 +1855,7 @@
                         "Address": 81
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -1923,7 +1923,7 @@
                         "SlotNumber": 10
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -2050,7 +2050,7 @@
                         "SlotNumber": 2
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             }
@@ -2079,7 +2079,7 @@
                         "LocationCode": "Ufcs-P0-C6"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "OpenCAPI adapter"
                     }
                 }
             }
@@ -2116,7 +2116,7 @@
                         "SlotNumber": 7
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             }
@@ -2153,7 +2153,7 @@
                         "SlotNumber": 9
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             }
@@ -2191,7 +2191,7 @@
                         "SlotNumber": 11
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -2288,7 +2288,7 @@
                         "SlotNumber": 1
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x8 adapter"
                     }
                 }
             }
@@ -2326,7 +2326,7 @@
                         "SlotNumber": 8
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x8 adapter"
                     }
                 }
             },
@@ -2401,7 +2401,7 @@
                         "LocationCode": "Ufcs-P1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane"
+                        "PrettyName": "Drive backplane 0"
                     }
                 }
             },
@@ -2418,7 +2418,7 @@
                         "LocationCode": "Ufcs-P1-C0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 0"
                     }
                 }
             },
@@ -2436,7 +2436,7 @@
                         "LocationCode": "Ufcs-P1-C0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 0"
                     }
                 }
             },
@@ -2453,7 +2453,7 @@
                         "LocationCode": "Ufcs-P1-C1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 1"
                     }
                 }
             },
@@ -2471,7 +2471,7 @@
                         "LocationCode": "Ufcs-P1-C1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 1"
                     }
                 }
             },
@@ -2488,7 +2488,7 @@
                         "LocationCode": "Ufcs-P1-C2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 2"
                     }
                 }
             },
@@ -2506,7 +2506,7 @@
                         "LocationCode": "Ufcs-P1-C2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 2"
                     }
                 }
             },
@@ -2523,7 +2523,7 @@
                         "LocationCode": "Ufcs-P1-C3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 3"
                     }
                 }
             },
@@ -2541,7 +2541,7 @@
                         "LocationCode": "Ufcs-P1-C3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 3"
                     }
                 }
             },
@@ -2558,7 +2558,7 @@
                         "LocationCode": "Ufcs-P1-C4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 4"
                     }
                 }
             },
@@ -2576,7 +2576,7 @@
                         "LocationCode": "Ufcs-P1-C4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 4"
                     }
                 }
             },
@@ -2593,7 +2593,7 @@
                         "LocationCode": "Ufcs-P1-C5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 5"
                     }
                 }
             },
@@ -2611,7 +2611,7 @@
                         "LocationCode": "Ufcs-P1-C5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 5"
                     }
                 }
             },
@@ -2628,7 +2628,7 @@
                         "LocationCode": "Ufcs-P1-C6"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 6"
                     }
                 }
             },
@@ -2646,7 +2646,7 @@
                         "LocationCode": "Ufcs-P1-C6"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 6"
                     }
                 }
             },
@@ -2663,7 +2663,7 @@
                         "LocationCode": "Ufcs-P1-C7"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 7"
                     }
                 }
             },
@@ -2681,7 +2681,7 @@
                         "LocationCode": "Ufcs-P1-C7"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 7"
                     }
                 }
             },
@@ -2694,7 +2694,7 @@
                         "LocationCode": "Ufcs-P1-T0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -2707,7 +2707,7 @@
                         "LocationCode": "Ufcs-P1-T1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -2720,7 +2720,7 @@
                         "LocationCode": "Ufcs-P1-T2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -2733,7 +2733,7 @@
                         "LocationCode": "Ufcs-P1-T3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -2747,7 +2747,7 @@
                         "LocationCode": "Ufcs-P1-T4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive backplane signal cable port"
                     }
                 }
             },
@@ -2761,7 +2761,7 @@
                         "LocationCode": "Ufcs-P1-T5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive backplane power cable port"
                     }
                 }
             },
@@ -2820,7 +2820,7 @@
                         "LocationCode": "Ufcs-P2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane"
+                        "PrettyName": "Drive backplane 1"
                     }
                 }
             },
@@ -2836,7 +2836,7 @@
                         "LocationCode": "Ufcs-P2-C8"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 8"
                     }
                 }
             },
@@ -2854,7 +2854,7 @@
                         "LocationCode": "Ufcs-P2-C8"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 8"
                     }
                 }
             },
@@ -2870,7 +2870,7 @@
                         "LocationCode": "Ufcs-P2-C9"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 9"
                     }
                 }
             },
@@ -2888,7 +2888,7 @@
                         "LocationCode": "Ufcs-P2-C9"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 9"
                     }
                 }
             },
@@ -2904,7 +2904,7 @@
                         "LocationCode": "Ufcs-P2-C10"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 10"
                     }
                 }
             },
@@ -2922,7 +2922,7 @@
                         "LocationCode": "Ufcs-P2-C10"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 10"
                     }
                 }
             },
@@ -2938,7 +2938,7 @@
                         "LocationCode": "Ufcs-P2-C11"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 11"
                     }
                 }
             },
@@ -2956,7 +2956,7 @@
                         "LocationCode": "Ufcs-P2-C11"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 11"
                     }
                 }
             },
@@ -2972,7 +2972,7 @@
                         "LocationCode": "Ufcs-P2-C12"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 12"
                     }
                 }
             },
@@ -2990,7 +2990,7 @@
                         "LocationCode": "Ufcs-P2-C12"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 12"
                     }
                 }
             },
@@ -3006,7 +3006,7 @@
                         "LocationCode": "Ufcs-P2-C13"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 13"
                     }
                 }
             },
@@ -3024,7 +3024,7 @@
                         "LocationCode": "Ufcs-P2-C13"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 13"
                     }
                 }
             },
@@ -3040,7 +3040,7 @@
                         "LocationCode": "Ufcs-P2-C14"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 14"
                     }
                 }
             },
@@ -3058,7 +3058,7 @@
                         "LocationCode": "Ufcs-P2-C14"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 14"
                     }
                 }
             },
@@ -3074,7 +3074,7 @@
                         "LocationCode": "Ufcs-P2-C15"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 15"
                     }
                 }
             },
@@ -3092,7 +3092,7 @@
                         "LocationCode": "Ufcs-P2-C15"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 15"
                     }
                 }
             },
@@ -3105,7 +3105,7 @@
                         "LocationCode": "Ufcs-P2-T0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -3118,7 +3118,7 @@
                         "LocationCode": "Ufcs-P2-T1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -3131,7 +3131,7 @@
                         "LocationCode": "Ufcs-P2-T2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -3144,7 +3144,7 @@
                         "LocationCode": "Ufcs-P2-T3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -3158,7 +3158,7 @@
                         "LocationCode": "Ufcs-P2-T4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive backplane signal cable port"
                     }
                 }
             },
@@ -3172,7 +3172,7 @@
                         "LocationCode": "Ufcs-P2-T5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive backplane power cable port"
                     }
                 }
             },
@@ -3230,7 +3230,7 @@
                         "LocationCode": "Ufcs-P0-C12"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 0"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3283,7 +3283,7 @@
                         "LocationCode": "Ufcs-P0-C13"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 1"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3336,7 +3336,7 @@
                         "LocationCode": "Ufcs-P0-C16"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 2"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3389,7 +3389,7 @@
                         "LocationCode": "Ufcs-P0-C17"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 3"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3442,7 +3442,7 @@
                         "LocationCode": "Ufcs-P0-C18"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 4"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3495,7 +3495,7 @@
                         "LocationCode": "Ufcs-P0-C19"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 5"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3548,7 +3548,7 @@
                         "LocationCode": "Ufcs-P0-C20"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 6"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3601,7 +3601,7 @@
                         "LocationCode": "Ufcs-P0-C21"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 7"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3654,7 +3654,7 @@
                         "LocationCode": "Ufcs-P0-C25"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 8"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3707,7 +3707,7 @@
                         "LocationCode": "Ufcs-P0-C26"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 9"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3760,7 +3760,7 @@
                         "LocationCode": "Ufcs-P0-C27"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 10"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3813,7 +3813,7 @@
                         "LocationCode": "Ufcs-P0-C28"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 11"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3866,7 +3866,7 @@
                         "LocationCode": "Ufcs-P0-C29"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 12"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3919,7 +3919,7 @@
                         "LocationCode": "Ufcs-P0-C30"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 13"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3972,7 +3972,7 @@
                         "LocationCode": "Ufcs-P0-C31"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 14"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4025,7 +4025,7 @@
                         "LocationCode": "Ufcs-P0-C32"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 15"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4078,7 +4078,7 @@
                         "LocationCode": "Ufcs-P0-C33"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 16"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4131,7 +4131,7 @@
                         "LocationCode": "Ufcs-P0-C34"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 17"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4184,7 +4184,7 @@
                         "LocationCode": "Ufcs-P0-C35"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 18"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4237,7 +4237,7 @@
                         "LocationCode": "Ufcs-P0-C36"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 19"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4290,7 +4290,7 @@
                         "LocationCode": "Ufcs-P0-C37"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 20"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4343,7 +4343,7 @@
                         "LocationCode": "Ufcs-P0-C38"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 21"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4396,7 +4396,7 @@
                         "LocationCode": "Ufcs-P0-C39"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 22"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4449,7 +4449,7 @@
                         "LocationCode": "Ufcs-P0-C40"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 23"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4502,7 +4502,7 @@
                         "LocationCode": "Ufcs-P0-C41"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 24"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4555,7 +4555,7 @@
                         "LocationCode": "Ufcs-P0-C42"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 25"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4608,7 +4608,7 @@
                         "LocationCode": "Ufcs-P0-C43"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 26"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4661,7 +4661,7 @@
                         "LocationCode": "Ufcs-P0-C44"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 27"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4714,7 +4714,7 @@
                         "LocationCode": "Ufcs-P0-C45"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 28"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4767,7 +4767,7 @@
                         "LocationCode": "Ufcs-P0-C46"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 29"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4820,7 +4820,7 @@
                         "LocationCode": "Ufcs-P0-C47"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 30"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4873,7 +4873,7 @@
                         "LocationCode": "Ufcs-P0-C48"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 31"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
diff --git a/config/ibm/50001000_v2.json b/config/ibm/50001000_v2.json
index 178d670..8621194 100644
--- a/config/ibm/50001000_v2.json
+++ b/config/ibm/50001000_v2.json
@@ -57,7 +57,7 @@
                         "LocationCode": "Ufcs-P0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "System Backplane"
+                        "PrettyName": "System backplane"
                     }
                 }
             },
@@ -126,7 +126,7 @@
                         "LocationCode": "Ufcs-P0-C0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -143,7 +143,7 @@
                         "LocationCode": "Ufcs-P0-C1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x8 adapter"
                     }
                 }
             },
@@ -160,7 +160,7 @@
                         "LocationCode": "Ufcs-P0-C2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -177,7 +177,7 @@
                         "LocationCode": "Ufcs-P0-C3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -194,7 +194,7 @@
                         "LocationCode": "Ufcs-P0-C4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -211,7 +211,7 @@
                         "LocationCode": "Ufcs-P0-C6"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "OpenCAPI adapter"
                     }
                 }
             },
@@ -228,7 +228,7 @@
                         "LocationCode": "Ufcs-P0-C7"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -245,7 +245,7 @@
                         "LocationCode": "Ufcs-P0-C8"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x8 adapter"
                     }
                 }
             },
@@ -262,7 +262,7 @@
                         "LocationCode": "Ufcs-P0-C9"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -279,7 +279,7 @@
                         "LocationCode": "Ufcs-P0-C10"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -296,7 +296,7 @@
                         "LocationCode": "Ufcs-P0-C11"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -312,7 +312,7 @@
                         "LocationCode": "Ufcs-P0-T18"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Dummy PCIe USB Adapter Slot"
+                        "PrettyName": "USB 3.0 port"
                     }
                 }
             },
@@ -328,7 +328,7 @@
                         "SlotNumber": 12
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Dummy PCIe USB Adapter"
+                        "PrettyName": "USB 3.0 port"
                     }
                 }
             },
@@ -564,7 +564,7 @@
                         "LocationCode": "Ufcs-P0-E0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Time Of Day Battery"
+                        "PrettyName": "Time-of-day battery"
                     }
                 }
             },
@@ -577,7 +577,7 @@
                         "LocationCode": "Ufcs-P0-T0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Connector for OpenCAPI Port DCM-0 P0 OP3B"
                     }
                 }
             },
@@ -590,7 +590,7 @@
                         "LocationCode": "Ufcs-P0-T1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Connector for OpenCAPI Port DCM-0 P0 OP3A"
                     }
                 }
             },
@@ -603,7 +603,7 @@
                         "LocationCode": "Ufcs-P0-T2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Connector for OpenCAPI Port DCM-0 P1 OP0B"
                     }
                 }
             },
@@ -616,7 +616,7 @@
                         "LocationCode": "Ufcs-P0-T3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Connector for OpenCAPI Port DCM-0 P1 OP0A"
                     }
                 }
             },
@@ -629,7 +629,7 @@
                         "LocationCode": "Ufcs-P0-T4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Power Distribution Board Signals Cable Connector"
+                        "PrettyName": "Power signal cable port"
                     }
                 }
             },
@@ -642,7 +642,7 @@
                         "LocationCode": "Ufcs-P0-T5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Connector for OpenCAPI Port DCM-1 P0 OP3A"
                     }
                 }
             },
@@ -655,7 +655,7 @@
                         "LocationCode": "Ufcs-P0-T6"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Connector for OpenCAPI Port DCM-1 P1 OP0B"
                     }
                 }
             },
@@ -668,7 +668,7 @@
                         "LocationCode": "Ufcs-P0-T7"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Front Host USB Connector"
+                        "PrettyName": "USB 3.0 port"
                     }
                 }
             },
@@ -681,7 +681,7 @@
                         "LocationCode": "Ufcs-P0-T8"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane Connector"
+                        "PrettyName": "Drive backplane signal cable port"
                     }
                 }
             },
@@ -694,7 +694,7 @@
                         "LocationCode": "Ufcs-P0-T9"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane Connector"
+                        "PrettyName": "Drive backplane signal cable port"
                     }
                 }
             },
@@ -707,7 +707,7 @@
                         "LocationCode": "Ufcs-P0-T10"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Fan Card Connector"
+                        "PrettyName": "Drive backplane signal cable port"
                     }
                 }
             },
@@ -720,7 +720,7 @@
                         "LocationCode": "Ufcs-P0-T11"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Op Panel Cable Connector"
+                        "PrettyName": "Control panel cable port"
                     }
                 }
             },
@@ -733,7 +733,7 @@
                         "LocationCode": "Ufcs-P0-T12"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Fan Card Signal Cable Connector"
+                        "PrettyName": "Fan signal cable port"
                     }
                 }
             },
@@ -746,7 +746,7 @@
                         "LocationCode": "Ufcs-P0-T13"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Op Panel LCD Display cable Connector"
+                        "PrettyName": "Control panel display cable port"
                     }
                 }
             },
@@ -759,7 +759,7 @@
                         "LocationCode": "Ufcs-P0-T14"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane Power Cable Connector"
+                        "PrettyName": "Drive backplane power cable port"
                     }
                 }
             },
@@ -772,7 +772,7 @@
                         "LocationCode": "Ufcs-P0-T15"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane Power Cable Connector"
+                        "PrettyName": "Drive backplane power cable port"
                     }
                 }
             },
@@ -785,7 +785,7 @@
                         "LocationCode": "Ufcs-P0-T16"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane Power Cable Connector"
+                        "PrettyName": "Drive backplane power cable port"
                     }
                 }
             },
@@ -798,7 +798,7 @@
                         "LocationCode": "Ufcs-P0-T17"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Fan Card Signal Cable Connector"
+                        "PrettyName": "Fan signal cable port"
                     }
                 }
             },
@@ -811,7 +811,7 @@
                         "LocationCode": "Ufcs-P0-T18"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Front USB Connector"
+                        "PrettyName": "USB 3.0 port"
                     }
                 }
             },
@@ -824,7 +824,7 @@
                         "LocationCode": "Ufcs-P0-T19"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Upper Blower Connector"
+                        "PrettyName": "Fan cable port"
                     }
                 }
             },
@@ -837,7 +837,7 @@
                         "LocationCode": "Ufcs-P0-T20"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Upper Blower Connector"
+                        "PrettyName": "Fan cable port"
                     }
                 }
             },
@@ -850,7 +850,7 @@
                         "LocationCode": "Ufcs-P0-T21"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "RDX Power Cable Connector"
+                        "PrettyName": "Internal RDX power cable port"
                     }
                 }
             },
@@ -878,7 +878,7 @@
                         "LocationCode": "Ufcs-P4-D0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "RDX Drive"
+                        "PrettyName": "RDX removable disk drive"
                     }
                 }
             },
@@ -892,7 +892,7 @@
                         "LocationCode": "Ufcs-P4-T0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "RDX Power Connector"
+                        "PrettyName": "Power connector for RDX"
                     }
                 }
             },
@@ -906,7 +906,7 @@
                         "LocationCode": "Ufcs-P4-T1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "RDX USB Connector"
+                        "PrettyName": "USB connector for RDX"
                     }
                 }
             }
@@ -920,7 +920,7 @@
                         "LocationCode": "Ufcs-P0-C5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "BMC Card"
+                        "PrettyName": "eBMC card"
                     }
                 }
             },
@@ -942,7 +942,7 @@
                         }
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "HMC Ethernet Connector"
+                        "PrettyName": "HMC port 0"
                     }
                 }
             },
@@ -964,7 +964,7 @@
                         }
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "HMC Ethernet Connector"
+                        "PrettyName": "HMC port 1"
                     }
                 }
             },
@@ -977,7 +977,7 @@
                         "LocationCode": "Ufcs-P0-C5-T2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "BMC USB Connector"
+                        "PrettyName": "USB 3.0 port"
                     }
                 }
             },
@@ -990,7 +990,7 @@
                         "LocationCode": "Ufcs-P0-C5-T3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Display Port Connector"
+                        "PrettyName": "Display Port"
                     }
                 }
             },
@@ -1003,7 +1003,7 @@
                         "LocationCode": "Ufcs-P0-C5-T4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "BMC USB Connector"
+                        "PrettyName": "USB 2.0 port"
                     }
                 }
             }
@@ -1017,7 +1017,7 @@
                         "LocationCode": "Ufcs-P0-C22"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "TPM Card"
+                        "PrettyName": "Trusted platform module card"
                     }
                 }
             }
@@ -1032,7 +1032,7 @@
                         "LocationCode": "Ufcs-D0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Operator Panel Base"
+                        "PrettyName": "Control panel"
                     }
                 }
             }
@@ -1065,7 +1065,7 @@
                         "LocationCode": "Ufcs-D1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Operator Panel LCD"
+                        "PrettyName": "Control panel display"
                     }
                 }
             }
@@ -1079,7 +1079,7 @@
                         "LocationCode": "Ufcs-P0-C14"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Voltage regulator module for system processor module 0"
                     }
                 }
             }
@@ -1093,7 +1093,7 @@
                         "LocationCode": "Ufcs-P0-C23"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Voltage regulator module for system processor module 1"
                     }
                 }
             }
@@ -1112,7 +1112,7 @@
                         "LocationCode": "Ufcs-P0-C15"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 0"
                     }
                 }
             },
@@ -1265,7 +1265,7 @@
                         "LocationCode": "Ufcs-P0-C15"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 0"
                     }
                 }
             },
@@ -1418,7 +1418,7 @@
                         "LocationCode": "Ufcs-P0-C24"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 1"
                     }
                 }
             },
@@ -1571,7 +1571,7 @@
                         "LocationCode": "Ufcs-P0-C24"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 1"
                     }
                 }
             },
@@ -1749,7 +1749,7 @@
                         "SlotNumber": 0
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -1822,7 +1822,7 @@
                         "SlotNumber": 3
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -1895,7 +1895,7 @@
                         "SlotNumber": 4
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -1968,7 +1968,7 @@
                         "SlotNumber": 10
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -2100,7 +2100,7 @@
                         "SlotNumber": 2
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             }
@@ -2134,7 +2134,7 @@
                         "LocationCode": "Ufcs-P0-C6"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "OpenCAPI adapter"
                     }
                 }
             }
@@ -2176,7 +2176,7 @@
                         "SlotNumber": 7
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             }
@@ -2218,7 +2218,7 @@
                         "SlotNumber": 9
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             }
@@ -2261,7 +2261,7 @@
                         "SlotNumber": 11
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -2363,7 +2363,7 @@
                         "SlotNumber": 1
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x8 adapter"
                     }
                 }
             }
@@ -2406,7 +2406,7 @@
                         "SlotNumber": 8
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x8 adapter"
                     }
                 }
             },
@@ -2481,7 +2481,7 @@
                         "LocationCode": "Ufcs-P1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane"
+                        "PrettyName": "Drive backplane 0"
                     }
                 }
             },
@@ -2498,7 +2498,7 @@
                         "LocationCode": "Ufcs-P1-C0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 0"
                     }
                 }
             },
@@ -2516,7 +2516,7 @@
                         "LocationCode": "Ufcs-P1-C0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 0"
                     }
                 }
             },
@@ -2533,7 +2533,7 @@
                         "LocationCode": "Ufcs-P1-C1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 1"
                     }
                 }
             },
@@ -2551,7 +2551,7 @@
                         "LocationCode": "Ufcs-P1-C1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 1"
                     }
                 }
             },
@@ -2568,7 +2568,7 @@
                         "LocationCode": "Ufcs-P1-C2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 2"
                     }
                 }
             },
@@ -2586,7 +2586,7 @@
                         "LocationCode": "Ufcs-P1-C2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 2"
                     }
                 }
             },
@@ -2603,7 +2603,7 @@
                         "LocationCode": "Ufcs-P1-C3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 3"
                     }
                 }
             },
@@ -2621,7 +2621,7 @@
                         "LocationCode": "Ufcs-P1-C3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 3"
                     }
                 }
             },
@@ -2638,7 +2638,7 @@
                         "LocationCode": "Ufcs-P1-C4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 4"
                     }
                 }
             },
@@ -2656,7 +2656,7 @@
                         "LocationCode": "Ufcs-P1-C4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 4"
                     }
                 }
             },
@@ -2673,7 +2673,7 @@
                         "LocationCode": "Ufcs-P1-C5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 5"
                     }
                 }
             },
@@ -2691,7 +2691,7 @@
                         "LocationCode": "Ufcs-P1-C5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 5"
                     }
                 }
             },
@@ -2708,7 +2708,7 @@
                         "LocationCode": "Ufcs-P1-C6"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 6"
                     }
                 }
             },
@@ -2726,7 +2726,7 @@
                         "LocationCode": "Ufcs-P1-C6"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 6"
                     }
                 }
             },
@@ -2743,7 +2743,7 @@
                         "LocationCode": "Ufcs-P1-C7"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 7"
                     }
                 }
             },
@@ -2761,7 +2761,7 @@
                         "LocationCode": "Ufcs-P1-C7"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 7"
                     }
                 }
             },
@@ -2774,7 +2774,7 @@
                         "LocationCode": "Ufcs-P1-T0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -2787,7 +2787,7 @@
                         "LocationCode": "Ufcs-P1-T1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -2800,7 +2800,7 @@
                         "LocationCode": "Ufcs-P1-T2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -2813,7 +2813,7 @@
                         "LocationCode": "Ufcs-P1-T3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -2827,7 +2827,7 @@
                         "LocationCode": "Ufcs-P1-T4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive backplane signal cable port"
                     }
                 }
             },
@@ -2841,7 +2841,7 @@
                         "LocationCode": "Ufcs-P1-T5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive backplane power cable port"
                     }
                 }
             },
@@ -2900,7 +2900,7 @@
                         "LocationCode": "Ufcs-P2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane"
+                        "PrettyName": "Drive backplane 1"
                     }
                 }
             },
@@ -2917,7 +2917,7 @@
                         "LocationCode": "Ufcs-P2-C8"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 8"
                     }
                 }
             },
@@ -2935,7 +2935,7 @@
                         "LocationCode": "Ufcs-P2-C8"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 8"
                     }
                 }
             },
@@ -2952,7 +2952,7 @@
                         "LocationCode": "Ufcs-P2-C9"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 9"
                     }
                 }
             },
@@ -2970,7 +2970,7 @@
                         "LocationCode": "Ufcs-P2-C9"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 9"
                     }
                 }
             },
@@ -2987,7 +2987,7 @@
                         "LocationCode": "Ufcs-P2-C10"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 10"
                     }
                 }
             },
@@ -3005,7 +3005,7 @@
                         "LocationCode": "Ufcs-P2-C10"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 10"
                     }
                 }
             },
@@ -3022,7 +3022,7 @@
                         "LocationCode": "Ufcs-P2-C11"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 11"
                     }
                 }
             },
@@ -3040,7 +3040,7 @@
                         "LocationCode": "Ufcs-P2-C11"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 11"
                     }
                 }
             },
@@ -3057,7 +3057,7 @@
                         "LocationCode": "Ufcs-P2-C12"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 12"
                     }
                 }
             },
@@ -3075,7 +3075,7 @@
                         "LocationCode": "Ufcs-P2-C12"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 12"
                     }
                 }
             },
@@ -3092,7 +3092,7 @@
                         "LocationCode": "Ufcs-P2-C13"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 13"
                     }
                 }
             },
@@ -3110,7 +3110,7 @@
                         "LocationCode": "Ufcs-P2-C13"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 13"
                     }
                 }
             },
@@ -3127,7 +3127,7 @@
                         "LocationCode": "Ufcs-P2-C14"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 14"
                     }
                 }
             },
@@ -3145,7 +3145,7 @@
                         "LocationCode": "Ufcs-P2-C14"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 14"
                     }
                 }
             },
@@ -3162,7 +3162,7 @@
                         "LocationCode": "Ufcs-P2-C15"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 15"
                     }
                 }
             },
@@ -3180,7 +3180,7 @@
                         "LocationCode": "Ufcs-P2-C15"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 15"
                     }
                 }
             },
@@ -3193,7 +3193,7 @@
                         "LocationCode": "Ufcs-P2-T0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -3206,7 +3206,7 @@
                         "LocationCode": "Ufcs-P2-T1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -3219,7 +3219,7 @@
                         "LocationCode": "Ufcs-P2-T2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -3232,7 +3232,7 @@
                         "LocationCode": "Ufcs-P2-T3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -3246,7 +3246,7 @@
                         "LocationCode": "Ufcs-P2-T4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive backplane signal cable port"
                     }
                 }
             },
@@ -3260,7 +3260,7 @@
                         "LocationCode": "Ufcs-P2-T5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive backplane power cable port"
                     }
                 }
             },
@@ -3318,7 +3318,7 @@
                         "LocationCode": "Ufcs-P0-C12"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 0"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3371,7 +3371,7 @@
                         "LocationCode": "Ufcs-P0-C13"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 1"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3424,7 +3424,7 @@
                         "LocationCode": "Ufcs-P0-C16"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 2"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3477,7 +3477,7 @@
                         "LocationCode": "Ufcs-P0-C17"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 3"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3530,7 +3530,7 @@
                         "LocationCode": "Ufcs-P0-C18"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 4"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3583,7 +3583,7 @@
                         "LocationCode": "Ufcs-P0-C19"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 5"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3636,7 +3636,7 @@
                         "LocationCode": "Ufcs-P0-C20"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 6"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3689,7 +3689,7 @@
                         "LocationCode": "Ufcs-P0-C21"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 7"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3742,7 +3742,7 @@
                         "LocationCode": "Ufcs-P0-C25"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 8"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3795,7 +3795,7 @@
                         "LocationCode": "Ufcs-P0-C26"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 9"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3848,7 +3848,7 @@
                         "LocationCode": "Ufcs-P0-C27"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 10"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3901,7 +3901,7 @@
                         "LocationCode": "Ufcs-P0-C28"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 11"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3954,7 +3954,7 @@
                         "LocationCode": "Ufcs-P0-C29"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 12"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4007,7 +4007,7 @@
                         "LocationCode": "Ufcs-P0-C30"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 13"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4060,7 +4060,7 @@
                         "LocationCode": "Ufcs-P0-C31"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 14"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4113,7 +4113,7 @@
                         "LocationCode": "Ufcs-P0-C32"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 15"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4166,7 +4166,7 @@
                         "LocationCode": "Ufcs-P0-C33"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 16"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4219,7 +4219,7 @@
                         "LocationCode": "Ufcs-P0-C34"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 17"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4272,7 +4272,7 @@
                         "LocationCode": "Ufcs-P0-C35"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 18"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4325,7 +4325,7 @@
                         "LocationCode": "Ufcs-P0-C36"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 19"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4378,7 +4378,7 @@
                         "LocationCode": "Ufcs-P0-C37"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 20"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4431,7 +4431,7 @@
                         "LocationCode": "Ufcs-P0-C38"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 21"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4484,7 +4484,7 @@
                         "LocationCode": "Ufcs-P0-C39"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 22"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4537,7 +4537,7 @@
                         "LocationCode": "Ufcs-P0-C40"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 23"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4590,7 +4590,7 @@
                         "LocationCode": "Ufcs-P0-C41"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 24"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4643,7 +4643,7 @@
                         "LocationCode": "Ufcs-P0-C42"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 25"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4696,7 +4696,7 @@
                         "LocationCode": "Ufcs-P0-C43"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 26"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4749,7 +4749,7 @@
                         "LocationCode": "Ufcs-P0-C44"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 27"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4802,7 +4802,7 @@
                         "LocationCode": "Ufcs-P0-C45"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 28"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4855,7 +4855,7 @@
                         "LocationCode": "Ufcs-P0-C46"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 29"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4908,7 +4908,7 @@
                         "LocationCode": "Ufcs-P0-C47"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 30"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4961,7 +4961,7 @@
                         "LocationCode": "Ufcs-P0-C48"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 31"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
diff --git a/config/ibm/50001001.json b/config/ibm/50001001.json
index bca94bb..051671f 100644
--- a/config/ibm/50001001.json
+++ b/config/ibm/50001001.json
@@ -35,7 +35,7 @@
                         "LocationCode": "Ufcs-P0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "System Backplane"
+                        "PrettyName": "System backplane"
                     }
                 }
             },
@@ -104,7 +104,7 @@
                         "LocationCode": "Ufcs-P0-C0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -121,7 +121,7 @@
                         "LocationCode": "Ufcs-P0-C1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x8 adapter"
                     }
                 }
             },
@@ -138,7 +138,7 @@
                         "LocationCode": "Ufcs-P0-C2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -155,7 +155,7 @@
                         "LocationCode": "Ufcs-P0-C3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -172,7 +172,7 @@
                         "LocationCode": "Ufcs-P0-C4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -189,7 +189,7 @@
                         "LocationCode": "Ufcs-P0-C6"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "OpenCAPI adapter"
                     }
                 }
             },
@@ -206,7 +206,7 @@
                         "LocationCode": "Ufcs-P0-C7"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -223,7 +223,7 @@
                         "LocationCode": "Ufcs-P0-C8"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x8 adapter"
                     }
                 }
             },
@@ -240,7 +240,7 @@
                         "LocationCode": "Ufcs-P0-C9"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -257,7 +257,7 @@
                         "LocationCode": "Ufcs-P0-C10"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -274,7 +274,7 @@
                         "LocationCode": "Ufcs-P0-C11"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -290,7 +290,7 @@
                         "LocationCode": "Ufcs-P0-T18"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Dummy PCIe USB Adapter Slot"
+                        "PrettyName": "USB 3.0 port"
                     }
                 }
             },
@@ -306,7 +306,7 @@
                         "SlotNumber": 12
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Dummy PCIe USB Adapter"
+                        "PrettyName": "USB 3.0 port"
                     }
                 }
             },
@@ -520,7 +520,7 @@
                         "LocationCode": "Ufcs-P0-E0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Time Of Day Battery"
+                        "PrettyName": "Time-of-day battery"
                     }
                 }
             },
@@ -533,7 +533,7 @@
                         "LocationCode": "Ufcs-P0-T0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Connector for OpenCAPI Port DCM-0 P0 OP3B"
                     }
                 }
             },
@@ -546,7 +546,7 @@
                         "LocationCode": "Ufcs-P0-T1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Connector for OpenCAPI Port DCM-0 P0 OP3A"
                     }
                 }
             },
@@ -559,7 +559,7 @@
                         "LocationCode": "Ufcs-P0-T2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Connector for OpenCAPI Port DCM-0 P1 OP0B"
                     }
                 }
             },
@@ -572,7 +572,7 @@
                         "LocationCode": "Ufcs-P0-T3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Connector for OpenCAPI Port DCM-0 P1 OP0A"
                     }
                 }
             },
@@ -585,7 +585,7 @@
                         "LocationCode": "Ufcs-P0-T4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Power Distribution Board Signals Cable Connector"
+                        "PrettyName": "Power signal cable port"
                     }
                 }
             },
@@ -598,7 +598,7 @@
                         "LocationCode": "Ufcs-P0-T5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Connector for OpenCAPI Port DCM-1 P0 OP3A"
                     }
                 }
             },
@@ -611,7 +611,7 @@
                         "LocationCode": "Ufcs-P0-T6"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Connector for OpenCAPI Port DCM-1 P1 OP0B"
                     }
                 }
             },
@@ -624,7 +624,7 @@
                         "LocationCode": "Ufcs-P0-T7"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Front Host USB 3.0 Connector"
+                        "PrettyName": "USB 3.0 port"
                     }
                 }
             },
@@ -637,7 +637,7 @@
                         "LocationCode": "Ufcs-P0-T8"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane Signal Cable Connector"
+                        "PrettyName": "Drive backplane signal cable port"
                     }
                 }
             },
@@ -650,7 +650,7 @@
                         "LocationCode": "Ufcs-P0-T9"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane Signal Cable Connector"
+                        "PrettyName": "Drive backplane signal cable port"
                     }
                 }
             },
@@ -663,7 +663,7 @@
                         "LocationCode": "Ufcs-P0-T11"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Op Panel Cable Connector"
+                        "PrettyName": "Control panel cable port"
                     }
                 }
             },
@@ -676,7 +676,7 @@
                         "LocationCode": "Ufcs-P0-T12"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Fan Card Signal Cable Connector"
+                        "PrettyName": "Fan signal cable port"
                     }
                 }
             },
@@ -689,7 +689,7 @@
                         "LocationCode": "Ufcs-P0-T13"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Op Panel LCD Display cable Connector"
+                        "PrettyName": "Control panel display cable port"
                     }
                 }
             },
@@ -702,7 +702,7 @@
                         "LocationCode": "Ufcs-P0-T14"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane Power Cable Connector"
+                        "PrettyName": "Drive backplane power cable port"
                     }
                 }
             },
@@ -715,7 +715,7 @@
                         "LocationCode": "Ufcs-P0-T15"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane Power Cable Connector"
+                        "PrettyName": "Drive backplane power cable port"
                     }
                 }
             },
@@ -728,7 +728,7 @@
                         "LocationCode": "Ufcs-P0-T17"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Fan Card Signal Cable Connector"
+                        "PrettyName": "Fan signal cable port"
                     }
                 }
             },
@@ -741,7 +741,7 @@
                         "LocationCode": "Ufcs-P0-T18"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Front USB Connector"
+                        "PrettyName": "USB 3.0 port"
                     }
                 }
             }
@@ -755,7 +755,7 @@
                         "LocationCode": "Ufcs-P0-C5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "BMC Card"
+                        "PrettyName": "eBMC card"
                     }
                 }
             },
@@ -777,7 +777,7 @@
                         }
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "HMC Ethernet Connector"
+                        "PrettyName": "HMC port 0"
                     }
                 }
             },
@@ -799,7 +799,7 @@
                         }
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "HMC Ethernet Connector"
+                        "PrettyName": "HMC port 1"
                     }
                 }
             },
@@ -812,7 +812,7 @@
                         "LocationCode": "Ufcs-P0-C5-T2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "BMC USB Connector"
+                        "PrettyName": "USB 3.0 port"
                     }
                 }
             },
@@ -825,7 +825,7 @@
                         "LocationCode": "Ufcs-P0-C5-T3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Display Port Connector"
+                        "PrettyName": "Display Port"
                     }
                 }
             },
@@ -838,7 +838,7 @@
                         "LocationCode": "Ufcs-P0-C5-T4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "BMC USB Connector"
+                        "PrettyName": "USB 2.0 port"
                     }
                 }
             }
@@ -852,7 +852,7 @@
                         "LocationCode": "Ufcs-P0-C22"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "TPM Card"
+                        "PrettyName": "Trusted platform module card"
                     }
                 }
             }
@@ -867,7 +867,7 @@
                         "LocationCode": "Ufcs-D0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Operator Panel Base"
+                        "PrettyName": "Control panel"
                     }
                 }
             }
@@ -900,7 +900,7 @@
                         "LocationCode": "Ufcs-D1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Operator Panel LCD"
+                        "PrettyName": "Control panel display"
                     }
                 }
             }
@@ -914,7 +914,7 @@
                         "LocationCode": "Ufcs-P0-C14"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Voltage regulator module for system processor module 0"
                     }
                 }
             }
@@ -928,7 +928,7 @@
                         "LocationCode": "Ufcs-P0-C23"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Voltage regulator module for system processor module 1"
                     }
                 }
             }
@@ -947,7 +947,7 @@
                         "LocationCode": "Ufcs-P0-C15"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 0"
                     }
                 }
             },
@@ -1100,7 +1100,7 @@
                         "LocationCode": "Ufcs-P0-C15"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 0"
                     }
                 }
             },
@@ -1253,7 +1253,7 @@
                         "LocationCode": "Ufcs-P0-C24"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 1"
                     }
                 }
             },
@@ -1406,7 +1406,7 @@
                         "LocationCode": "Ufcs-P0-C24"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 1"
                     }
                 }
             },
@@ -1579,7 +1579,7 @@
                         "SlotNumber": 0
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -1647,7 +1647,7 @@
                         "SlotNumber": 3
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -1715,7 +1715,7 @@
                         "SlotNumber": 4
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -1783,7 +1783,7 @@
                         "SlotNumber": 10
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -1910,7 +1910,7 @@
                         "SlotNumber": 2
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             }
@@ -1939,7 +1939,7 @@
                         "LocationCode": "Ufcs-P0-C6"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "OpenCAPI adapter"
                     }
                 }
             }
@@ -1976,7 +1976,7 @@
                         "SlotNumber": 7
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             }
@@ -2013,7 +2013,7 @@
                         "SlotNumber": 9
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             }
@@ -2051,7 +2051,7 @@
                         "SlotNumber": 11
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -2148,7 +2148,7 @@
                         "SlotNumber": 1
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x8 adapter"
                     }
                 }
             }
@@ -2186,7 +2186,7 @@
                         "SlotNumber": 8
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x8 adapter"
                     }
                 }
             },
@@ -2261,7 +2261,7 @@
                         "LocationCode": "Ufcs-P1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane"
+                        "PrettyName": "Drive backplane 0"
                     }
                 }
             },
@@ -2278,7 +2278,7 @@
                         "LocationCode": "Ufcs-P1-C2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 0"
                     }
                 }
             },
@@ -2296,7 +2296,7 @@
                         "LocationCode": "Ufcs-P1-C2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 0"
                     }
                 }
             },
@@ -2313,7 +2313,7 @@
                         "LocationCode": "Ufcs-P1-C3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 1"
                     }
                 }
             },
@@ -2331,7 +2331,7 @@
                         "LocationCode": "Ufcs-P1-C3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 1"
                     }
                 }
             },
@@ -2348,7 +2348,7 @@
                         "LocationCode": "Ufcs-P1-C4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 2"
                     }
                 }
             },
@@ -2366,7 +2366,7 @@
                         "LocationCode": "Ufcs-P1-C4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 2"
                     }
                 }
             },
@@ -2383,7 +2383,7 @@
                         "LocationCode": "Ufcs-P1-C5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 3"
                     }
                 }
             },
@@ -2401,7 +2401,7 @@
                         "LocationCode": "Ufcs-P1-C5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 3"
                     }
                 }
             },
@@ -2414,7 +2414,7 @@
                         "LocationCode": "Ufcs-P1-T1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -2427,7 +2427,7 @@
                         "LocationCode": "Ufcs-P1-T2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -2441,7 +2441,7 @@
                         "LocationCode": "Ufcs-P1-T4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive backplane signal cable port"
                     }
                 }
             },
@@ -2455,7 +2455,7 @@
                         "LocationCode": "Ufcs-P1-T5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive backplane power cable port"
                     }
                 }
             },
@@ -2492,7 +2492,7 @@
                         "LocationCode": "Ufcs-P2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane"
+                        "PrettyName": "Drive backplane 1"
                     }
                 }
             },
@@ -2509,7 +2509,7 @@
                         "LocationCode": "Ufcs-P2-C10"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 4"
                     }
                 }
             },
@@ -2527,7 +2527,7 @@
                         "LocationCode": "Ufcs-P2-C10"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 4"
                     }
                 }
             },
@@ -2544,7 +2544,7 @@
                         "LocationCode": "Ufcs-P2-C11"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 5"
                     }
                 }
             },
@@ -2562,7 +2562,7 @@
                         "LocationCode": "Ufcs-P2-C11"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 5"
                     }
                 }
             },
@@ -2579,7 +2579,7 @@
                         "LocationCode": "Ufcs-P2-C12"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 6"
                     }
                 }
             },
@@ -2597,7 +2597,7 @@
                         "LocationCode": "Ufcs-P2-C12"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 6"
                     }
                 }
             },
@@ -2614,7 +2614,7 @@
                         "LocationCode": "Ufcs-P2-C13"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 7"
                     }
                 }
             },
@@ -2632,7 +2632,7 @@
                         "LocationCode": "Ufcs-P2-C13"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 7"
                     }
                 }
             },
@@ -2645,7 +2645,7 @@
                         "LocationCode": "Ufcs-P2-T1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -2658,7 +2658,7 @@
                         "LocationCode": "Ufcs-P2-T2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -2672,7 +2672,7 @@
                         "LocationCode": "Ufcs-P2-T4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive backplane signal cable port"
                     }
                 }
             },
@@ -2686,7 +2686,7 @@
                         "LocationCode": "Ufcs-P2-T5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive backplane power cable port"
                     }
                 }
             },
@@ -2722,7 +2722,7 @@
                         "LocationCode": "Ufcs-P0-C12"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 0"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -2775,7 +2775,7 @@
                         "LocationCode": "Ufcs-P0-C13"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 1"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -2828,7 +2828,7 @@
                         "LocationCode": "Ufcs-P0-C16"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 2"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -2881,7 +2881,7 @@
                         "LocationCode": "Ufcs-P0-C17"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 3"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -2934,7 +2934,7 @@
                         "LocationCode": "Ufcs-P0-C18"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 4"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -2987,7 +2987,7 @@
                         "LocationCode": "Ufcs-P0-C19"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 5"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3040,7 +3040,7 @@
                         "LocationCode": "Ufcs-P0-C20"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 6"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3093,7 +3093,7 @@
                         "LocationCode": "Ufcs-P0-C21"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 7"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3146,7 +3146,7 @@
                         "LocationCode": "Ufcs-P0-C25"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 8"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3199,7 +3199,7 @@
                         "LocationCode": "Ufcs-P0-C26"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 9"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3252,7 +3252,7 @@
                         "LocationCode": "Ufcs-P0-C27"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 10"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3305,7 +3305,7 @@
                         "LocationCode": "Ufcs-P0-C28"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 11"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3358,7 +3358,7 @@
                         "LocationCode": "Ufcs-P0-C29"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 12"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3411,7 +3411,7 @@
                         "LocationCode": "Ufcs-P0-C30"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 13"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3464,7 +3464,7 @@
                         "LocationCode": "Ufcs-P0-C31"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 14"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3517,7 +3517,7 @@
                         "LocationCode": "Ufcs-P0-C32"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 15"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3570,7 +3570,7 @@
                         "LocationCode": "Ufcs-P0-C33"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 16"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3623,7 +3623,7 @@
                         "LocationCode": "Ufcs-P0-C34"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 17"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3676,7 +3676,7 @@
                         "LocationCode": "Ufcs-P0-C35"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 18"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3729,7 +3729,7 @@
                         "LocationCode": "Ufcs-P0-C36"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 19"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3782,7 +3782,7 @@
                         "LocationCode": "Ufcs-P0-C37"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 20"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3835,7 +3835,7 @@
                         "LocationCode": "Ufcs-P0-C38"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 21"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3888,7 +3888,7 @@
                         "LocationCode": "Ufcs-P0-C39"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 22"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3941,7 +3941,7 @@
                         "LocationCode": "Ufcs-P0-C40"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 23"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3994,7 +3994,7 @@
                         "LocationCode": "Ufcs-P0-C41"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 24"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4047,7 +4047,7 @@
                         "LocationCode": "Ufcs-P0-C42"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 25"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4100,7 +4100,7 @@
                         "LocationCode": "Ufcs-P0-C43"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 26"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4153,7 +4153,7 @@
                         "LocationCode": "Ufcs-P0-C44"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 27"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4206,7 +4206,7 @@
                         "LocationCode": "Ufcs-P0-C45"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 28"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4259,7 +4259,7 @@
                         "LocationCode": "Ufcs-P0-C46"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 29"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4312,7 +4312,7 @@
                         "LocationCode": "Ufcs-P0-C47"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 30"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4365,7 +4365,7 @@
                         "LocationCode": "Ufcs-P0-C48"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 31"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
diff --git a/config/ibm/50001001_v2.json b/config/ibm/50001001_v2.json
index e522d46..752430f 100644
--- a/config/ibm/50001001_v2.json
+++ b/config/ibm/50001001_v2.json
@@ -57,7 +57,7 @@
                         "LocationCode": "Ufcs-P0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "System Backplane"
+                        "PrettyName": "System backplane"
                     }
                 }
             },
@@ -126,7 +126,7 @@
                         "LocationCode": "Ufcs-P0-C0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -143,7 +143,7 @@
                         "LocationCode": "Ufcs-P0-C1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x8 adapter"
                     }
                 }
             },
@@ -160,7 +160,7 @@
                         "LocationCode": "Ufcs-P0-C2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -177,7 +177,7 @@
                         "LocationCode": "Ufcs-P0-C3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -194,7 +194,7 @@
                         "LocationCode": "Ufcs-P0-C4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -211,7 +211,7 @@
                         "LocationCode": "Ufcs-P0-C6"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "OpenCAPI adapter"
                     }
                 }
             },
@@ -228,7 +228,7 @@
                         "LocationCode": "Ufcs-P0-C7"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -245,7 +245,7 @@
                         "LocationCode": "Ufcs-P0-C8"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x8 adapter"
                     }
                 }
             },
@@ -262,7 +262,7 @@
                         "LocationCode": "Ufcs-P0-C9"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -279,7 +279,7 @@
                         "LocationCode": "Ufcs-P0-C10"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -296,7 +296,7 @@
                         "LocationCode": "Ufcs-P0-C11"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -312,7 +312,7 @@
                         "LocationCode": "Ufcs-P0-T18"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Dummy PCIe USB Adapter Slot"
+                        "PrettyName": "USB 3.0 port"
                     }
                 }
             },
@@ -328,7 +328,7 @@
                         "SlotNumber": 12
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Dummy PCIe USB Adapter"
+                        "PrettyName": "USB 3.0 port"
                     }
                 }
             },
@@ -542,7 +542,7 @@
                         "LocationCode": "Ufcs-P0-E0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Time Of Day Battery"
+                        "PrettyName": "Time-of-day battery"
                     }
                 }
             },
@@ -555,7 +555,7 @@
                         "LocationCode": "Ufcs-P0-T0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Connector for OpenCAPI Port DCM-0 P0 OP3B"
                     }
                 }
             },
@@ -568,7 +568,7 @@
                         "LocationCode": "Ufcs-P0-T1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Connector for OpenCAPI Port DCM-0 P0 OP3A"
                     }
                 }
             },
@@ -581,7 +581,7 @@
                         "LocationCode": "Ufcs-P0-T2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Connector for OpenCAPI Port DCM-0 P1 OP0B"
                     }
                 }
             },
@@ -594,7 +594,7 @@
                         "LocationCode": "Ufcs-P0-T3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Connector for OpenCAPI Port DCM-0 P1 OP0A"
                     }
                 }
             },
@@ -607,7 +607,7 @@
                         "LocationCode": "Ufcs-P0-T4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Power Distribution Board Signals Cable Connector"
+                        "PrettyName": "Power signal cable port"
                     }
                 }
             },
@@ -620,7 +620,7 @@
                         "LocationCode": "Ufcs-P0-T5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Connector for OpenCAPI Port DCM-1 P0 OP3A"
                     }
                 }
             },
@@ -633,7 +633,7 @@
                         "LocationCode": "Ufcs-P0-T6"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Connector for OpenCAPI Port DCM-1 P1 OP0B"
                     }
                 }
             },
@@ -646,7 +646,7 @@
                         "LocationCode": "Ufcs-P0-T7"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Front Host USB 3.0 Connector"
+                        "PrettyName": "USB 3.0 port"
                     }
                 }
             },
@@ -659,7 +659,7 @@
                         "LocationCode": "Ufcs-P0-T8"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane Signal Cable Connector"
+                        "PrettyName": "Drive backplane signal cable port"
                     }
                 }
             },
@@ -672,7 +672,7 @@
                         "LocationCode": "Ufcs-P0-T9"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane Signal Cable Connector"
+                        "PrettyName": "Drive backplane signal cable port"
                     }
                 }
             },
@@ -685,7 +685,7 @@
                         "LocationCode": "Ufcs-P0-T11"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Op Panel Cable Connector"
+                        "PrettyName": "Control panel cable port"
                     }
                 }
             },
@@ -698,7 +698,7 @@
                         "LocationCode": "Ufcs-P0-T12"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Fan Card Signal Cable Connector"
+                        "PrettyName": "Fan signal cable port"
                     }
                 }
             },
@@ -711,7 +711,7 @@
                         "LocationCode": "Ufcs-P0-T13"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Op Panel LCD Display cable Connector"
+                        "PrettyName": "Control panel display cable port"
                     }
                 }
             },
@@ -724,7 +724,7 @@
                         "LocationCode": "Ufcs-P0-T14"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane Power Cable Connector"
+                        "PrettyName": "Drive backplane power cable port"
                     }
                 }
             },
@@ -737,7 +737,7 @@
                         "LocationCode": "Ufcs-P0-T15"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane Power Cable Connector"
+                        "PrettyName": "Drive backplane power cable port"
                     }
                 }
             },
@@ -750,7 +750,7 @@
                         "LocationCode": "Ufcs-P0-T17"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Fan Card Signal Cable Connector"
+                        "PrettyName": "Fan signal cable port"
                     }
                 }
             },
@@ -763,7 +763,7 @@
                         "LocationCode": "Ufcs-P0-T18"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Front USB Connector"
+                        "PrettyName": "USB 3.0 por"
                     }
                 }
             }
@@ -777,7 +777,7 @@
                         "LocationCode": "Ufcs-P0-C5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "BMC Card"
+                        "PrettyName": "eBMC card"
                     }
                 }
             },
@@ -799,7 +799,7 @@
                         }
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "HMC Ethernet Connector"
+                        "PrettyName": "HMC port 0"
                     }
                 }
             },
@@ -821,7 +821,7 @@
                         }
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "HMC Ethernet Connector"
+                        "PrettyName": "HMC port 1"
                     }
                 }
             },
@@ -834,7 +834,7 @@
                         "LocationCode": "Ufcs-P0-C5-T2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "BMC USB Connector"
+                        "PrettyName": "USB 3.0 port"
                     }
                 }
             },
@@ -847,7 +847,7 @@
                         "LocationCode": "Ufcs-P0-C5-T3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Display Port Connector"
+                        "PrettyName": "Display Port"
                     }
                 }
             },
@@ -860,7 +860,7 @@
                         "LocationCode": "Ufcs-P0-C5-T4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "BMC USB Connector"
+                        "PrettyName": "USB 2.0 port"
                     }
                 }
             }
@@ -874,7 +874,7 @@
                         "LocationCode": "Ufcs-P0-C22"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "TPM Card"
+                        "PrettyName": "Trusted platform module card"
                     }
                 }
             }
@@ -889,7 +889,7 @@
                         "LocationCode": "Ufcs-D0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Operator Panel Base"
+                        "PrettyName": "Control panel"
                     }
                 }
             }
@@ -922,7 +922,7 @@
                         "LocationCode": "Ufcs-D1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Operator Panel LCD"
+                        "PrettyName": "Control panel display"
                     }
                 }
             }
@@ -936,7 +936,7 @@
                         "LocationCode": "Ufcs-P0-C14"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Voltage regulator module for system processor module 0"
                     }
                 }
             }
@@ -950,7 +950,7 @@
                         "LocationCode": "Ufcs-P0-C23"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Voltage regulator module for system processor module 1"
                     }
                 }
             }
@@ -969,7 +969,7 @@
                         "LocationCode": "Ufcs-P0-C15"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 0"
                     }
                 }
             },
@@ -1122,7 +1122,7 @@
                         "LocationCode": "Ufcs-P0-C15"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 0"
                     }
                 }
             },
@@ -1275,7 +1275,7 @@
                         "LocationCode": "Ufcs-P0-C24"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 1"
                     }
                 }
             },
@@ -1428,7 +1428,7 @@
                         "LocationCode": "Ufcs-P0-C24"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 1"
                     }
                 }
             },
@@ -1606,7 +1606,7 @@
                         "SlotNumber": 0
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -1679,7 +1679,7 @@
                         "SlotNumber": 3
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -1752,7 +1752,7 @@
                         "SlotNumber": 4
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -1825,7 +1825,7 @@
                         "SlotNumber": 10
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -1957,7 +1957,7 @@
                         "SlotNumber": 2
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             }
@@ -1991,7 +1991,7 @@
                         "LocationCode": "Ufcs-P0-C6"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "OpenCAPI adapter"
                     }
                 }
             }
@@ -2033,7 +2033,7 @@
                         "SlotNumber": 7
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             }
@@ -2075,7 +2075,7 @@
                         "SlotNumber": 9
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             }
@@ -2118,7 +2118,7 @@
                         "SlotNumber": 11
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -2220,7 +2220,7 @@
                         "SlotNumber": 1
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x8 adapter"
                     }
                 }
             }
@@ -2263,7 +2263,7 @@
                         "SlotNumber": 8
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x8 adapter"
                     }
                 }
             },
@@ -2338,7 +2338,7 @@
                         "LocationCode": "Ufcs-P1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane"
+                        "PrettyName": "Drive backplane 0"
                     }
                 }
             },
@@ -2355,7 +2355,7 @@
                         "LocationCode": "Ufcs-P1-C2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 0"
                     }
                 }
             },
@@ -2373,7 +2373,7 @@
                         "LocationCode": "Ufcs-P1-C2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 0"
                     }
                 }
             },
@@ -2390,7 +2390,7 @@
                         "LocationCode": "Ufcs-P1-C3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 1"
                     }
                 }
             },
@@ -2408,7 +2408,7 @@
                         "LocationCode": "Ufcs-P1-C3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 1"
                     }
                 }
             },
@@ -2425,7 +2425,7 @@
                         "LocationCode": "Ufcs-P1-C4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 2"
                     }
                 }
             },
@@ -2443,7 +2443,7 @@
                         "LocationCode": "Ufcs-P1-C4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 2"
                     }
                 }
             },
@@ -2460,7 +2460,7 @@
                         "LocationCode": "Ufcs-P1-C5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 3"
                     }
                 }
             },
@@ -2478,7 +2478,7 @@
                         "LocationCode": "Ufcs-P1-C5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 3"
                     }
                 }
             },
@@ -2491,7 +2491,7 @@
                         "LocationCode": "Ufcs-P1-T1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -2504,7 +2504,7 @@
                         "LocationCode": "Ufcs-P1-T2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -2518,7 +2518,7 @@
                         "LocationCode": "Ufcs-P1-T4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive backplane signal cable port"
                     }
                 }
             },
@@ -2532,7 +2532,7 @@
                         "LocationCode": "Ufcs-P1-T5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive backplane power cable port"
                     }
                 }
             },
@@ -2569,7 +2569,7 @@
                         "LocationCode": "Ufcs-P2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane"
+                        "PrettyName": "Drive backplane 1"
                     }
                 }
             },
@@ -2586,7 +2586,7 @@
                         "LocationCode": "Ufcs-P2-C10"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 4"
                     }
                 }
             },
@@ -2604,7 +2604,7 @@
                         "LocationCode": "Ufcs-P2-C10"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 4"
                     }
                 }
             },
@@ -2621,7 +2621,7 @@
                         "LocationCode": "Ufcs-P2-C11"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 5"
                     }
                 }
             },
@@ -2639,7 +2639,7 @@
                         "LocationCode": "Ufcs-P2-C11"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 5"
                     }
                 }
             },
@@ -2656,7 +2656,7 @@
                         "LocationCode": "Ufcs-P2-C12"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 6"
                     }
                 }
             },
@@ -2674,7 +2674,7 @@
                         "LocationCode": "Ufcs-P2-C12"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 6"
                     }
                 }
             },
@@ -2691,7 +2691,7 @@
                         "LocationCode": "Ufcs-P2-C13"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 7"
                     }
                 }
             },
@@ -2709,7 +2709,7 @@
                         "LocationCode": "Ufcs-P2-C13"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 7"
                     }
                 }
             },
@@ -2722,7 +2722,7 @@
                         "LocationCode": "Ufcs-P2-T1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -2735,7 +2735,7 @@
                         "LocationCode": "Ufcs-P2-T2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -2749,7 +2749,7 @@
                         "LocationCode": "Ufcs-P2-T4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive backplane signal cable port"
                     }
                 }
             },
@@ -2763,7 +2763,7 @@
                         "LocationCode": "Ufcs-P2-T5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive backplane power cable port"
                     }
                 }
             },
@@ -2799,7 +2799,7 @@
                         "LocationCode": "Ufcs-P0-C12"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 0"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -2852,7 +2852,7 @@
                         "LocationCode": "Ufcs-P0-C13"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 1"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -2905,7 +2905,7 @@
                         "LocationCode": "Ufcs-P0-C16"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 2"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -2958,7 +2958,7 @@
                         "LocationCode": "Ufcs-P0-C17"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 3"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3011,7 +3011,7 @@
                         "LocationCode": "Ufcs-P0-C18"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 4"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3064,7 +3064,7 @@
                         "LocationCode": "Ufcs-P0-C19"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 5"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3117,7 +3117,7 @@
                         "LocationCode": "Ufcs-P0-C20"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 6"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3170,7 +3170,7 @@
                         "LocationCode": "Ufcs-P0-C21"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 7"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3223,7 +3223,7 @@
                         "LocationCode": "Ufcs-P0-C25"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 8"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3276,7 +3276,7 @@
                         "LocationCode": "Ufcs-P0-C26"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 9"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3329,7 +3329,7 @@
                         "LocationCode": "Ufcs-P0-C27"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 10"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3382,7 +3382,7 @@
                         "LocationCode": "Ufcs-P0-C28"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 11"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3435,7 +3435,7 @@
                         "LocationCode": "Ufcs-P0-C29"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 12"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3488,7 +3488,7 @@
                         "LocationCode": "Ufcs-P0-C30"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 13"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3541,7 +3541,7 @@
                         "LocationCode": "Ufcs-P0-C31"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 14"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3594,7 +3594,7 @@
                         "LocationCode": "Ufcs-P0-C32"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 15"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3647,7 +3647,7 @@
                         "LocationCode": "Ufcs-P0-C33"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 16"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3700,7 +3700,7 @@
                         "LocationCode": "Ufcs-P0-C34"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 17"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3753,7 +3753,7 @@
                         "LocationCode": "Ufcs-P0-C35"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 18"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3806,7 +3806,7 @@
                         "LocationCode": "Ufcs-P0-C36"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 19"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3859,7 +3859,7 @@
                         "LocationCode": "Ufcs-P0-C37"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 20"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3912,7 +3912,7 @@
                         "LocationCode": "Ufcs-P0-C38"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 21"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3965,7 +3965,7 @@
                         "LocationCode": "Ufcs-P0-C39"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 22"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4018,7 +4018,7 @@
                         "LocationCode": "Ufcs-P0-C40"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 23"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4071,7 +4071,7 @@
                         "LocationCode": "Ufcs-P0-C41"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 24"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4124,7 +4124,7 @@
                         "LocationCode": "Ufcs-P0-C42"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 25"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4177,7 +4177,7 @@
                         "LocationCode": "Ufcs-P0-C43"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 26"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4230,7 +4230,7 @@
                         "LocationCode": "Ufcs-P0-C44"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 27"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4283,7 +4283,7 @@
                         "LocationCode": "Ufcs-P0-C45"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 28"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4336,7 +4336,7 @@
                         "LocationCode": "Ufcs-P0-C46"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 29"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4389,7 +4389,7 @@
                         "LocationCode": "Ufcs-P0-C47"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 30"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4442,7 +4442,7 @@
                         "LocationCode": "Ufcs-P0-C48"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 31"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
diff --git a/config/ibm/50001002.json b/config/ibm/50001002.json
index 6e9ae63..cd6ff8a 100644
--- a/config/ibm/50001002.json
+++ b/config/ibm/50001002.json
@@ -47,7 +47,7 @@
                         "LocationCode": "Ufcs-P0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "System Backplane"
+                        "PrettyName": "System backplane"
                     }
                 }
             },
@@ -116,7 +116,7 @@
                         "LocationCode": "Ufcs-P0-C6"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "OpenCAPI adapter"
                     }
                 }
             },
@@ -133,7 +133,7 @@
                         "LocationCode": "Ufcs-P0-C7"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -150,7 +150,7 @@
                         "LocationCode": "Ufcs-P0-C8"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x8 adapter"
                     }
                 }
             },
@@ -167,7 +167,7 @@
                         "LocationCode": "Ufcs-P0-C9"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -184,7 +184,7 @@
                         "LocationCode": "Ufcs-P0-C10"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -201,7 +201,7 @@
                         "LocationCode": "Ufcs-P0-C11"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -217,7 +217,7 @@
                         "LocationCode": "Ufcs-P0-T18"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Dummy PCIe USB Adapter Slot"
+                        "PrettyName": "USB 3.0 port"
                     }
                 }
             },
@@ -233,7 +233,7 @@
                         "SlotNumber": 12
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Dummy PCIe USB Adapter"
+                        "PrettyName": "USB 3.0 port"
                     }
                 }
             },
@@ -409,7 +409,7 @@
                         "LocationCode": "Ufcs-P0-E0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Time Of Day Battery"
+                        "PrettyName": "Time-of-day battery"
                     }
                 }
             },
@@ -422,7 +422,7 @@
                         "LocationCode": "Ufcs-P0-T0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Connector for OpenCAPI Port DCM-0 P0 OP3B"
                     }
                 }
             },
@@ -435,7 +435,7 @@
                         "LocationCode": "Ufcs-P0-T1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Connector for OpenCAPI Port DCM-0 P0 OP3A"
                     }
                 }
             },
@@ -448,7 +448,7 @@
                         "LocationCode": "Ufcs-P0-T2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Connector for OpenCAPI Port DCM-0 P1 OP0B"
                     }
                 }
             },
@@ -461,7 +461,7 @@
                         "LocationCode": "Ufcs-P0-T3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Connector for OpenCAPI Port DCM-0 P1 OP0A"
                     }
                 }
             },
@@ -474,7 +474,7 @@
                         "LocationCode": "Ufcs-P0-T4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Power Distribution Board Signals Cable Connector"
+                        "PrettyName": "Power signal cable port"
                     }
                 }
             },
@@ -487,7 +487,7 @@
                         "LocationCode": "Ufcs-P0-T7"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Front Host USB 3.0 Connector"
+                        "PrettyName": "USB 3.0 port"
                     }
                 }
             },
@@ -500,7 +500,7 @@
                         "LocationCode": "Ufcs-P0-T8"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane Signal Cable Connector"
+                        "PrettyName": "Drive backplane signal cable port"
                     }
                 }
             },
@@ -513,7 +513,7 @@
                         "LocationCode": "Ufcs-P0-T9"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane Signal Cable Connector"
+                        "PrettyName": "Drive backplane signal cable port"
                     }
                 }
             },
@@ -526,7 +526,7 @@
                         "LocationCode": "Ufcs-P0-T11"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Op Panel Cable Connector"
+                        "PrettyName": "Control panel cable port"
                     }
                 }
             },
@@ -539,7 +539,7 @@
                         "LocationCode": "Ufcs-P0-T12"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Fan Card Signal Cable Connector"
+                        "PrettyName": "Fan signal cable port"
                     }
                 }
             },
@@ -552,7 +552,7 @@
                         "LocationCode": "Ufcs-P0-T13"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Op Panel LCD Display cable Connector"
+                        "PrettyName": "Control panel display cable port"
                     }
                 }
             },
@@ -565,7 +565,7 @@
                         "LocationCode": "Ufcs-P0-T14"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane Power Cable Connector"
+                        "PrettyName": "Drive backplane power cable port"
                     }
                 }
             },
@@ -578,7 +578,7 @@
                         "LocationCode": "Ufcs-P0-T15"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane Power Cable Connector"
+                        "PrettyName": "Drive backplane power cable port"
                     }
                 }
             },
@@ -591,7 +591,7 @@
                         "LocationCode": "Ufcs-P0-T17"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Fan Card Signal Cable Connector"
+                        "PrettyName": "Fan signal cable port"
                     }
                 }
             },
@@ -604,7 +604,7 @@
                         "LocationCode": "Ufcs-P0-T18"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Front USB Connector"
+                        "PrettyName": "USB 3.0 port"
                     }
                 }
             },
@@ -632,7 +632,7 @@
                         "LocationCode": "Ufcs-P4-D0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "RDX Drive"
+                        "PrettyName": "RDX removable disk drive"
                     }
                 }
             },
@@ -646,7 +646,7 @@
                         "LocationCode": "Ufcs-P4-T0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "RDX Power Connector"
+                        "PrettyName": "Power connector for RDX"
                     }
                 }
             },
@@ -660,7 +660,7 @@
                         "LocationCode": "Ufcs-P4-T1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "RDX USB Connector"
+                        "PrettyName": "USB connector for RDX"
                     }
                 }
             }
@@ -674,7 +674,7 @@
                         "LocationCode": "Ufcs-P0-C5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "BMC Card"
+                        "PrettyName": "eBMC card"
                     }
                 }
             },
@@ -696,7 +696,7 @@
                         }
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "HMC Ethernet Connector"
+                        "PrettyName": "HMC port 0"
                     }
                 }
             },
@@ -717,7 +717,7 @@
                             "encoding": "MAC"
                         },
                         "xyz.openbmc_project.Inventory.Item": {
-                            "PrettyName": "HMC Ethernet Connector"
+                            "PrettyName": "HMC port 1"
                         }
                     }
                 }
@@ -731,7 +731,7 @@
                         "LocationCode": "Ufcs-P0-C5-T2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "BMC USB Connector"
+                        "PrettyName": "USB 3.0 port"
                     }
                 }
             },
@@ -744,7 +744,7 @@
                         "LocationCode": "Ufcs-P0-C5-T3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Display Port Connector"
+                        "PrettyName": "Display Port"
                     }
                 }
             },
@@ -757,7 +757,7 @@
                         "LocationCode": "Ufcs-P0-C5-T4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "BMC USB Connector"
+                        "PrettyName": "USB 2.0 port"
                     }
                 }
             }
@@ -771,7 +771,7 @@
                         "LocationCode": "Ufcs-P0-C22"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "TPM Card"
+                        "PrettyName": "Trusted platform module card"
                     }
                 }
             }
@@ -786,7 +786,7 @@
                         "LocationCode": "Ufcs-D0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Operator Panel Base"
+                        "PrettyName": "Control panel"
                     }
                 }
             }
@@ -819,7 +819,7 @@
                         "LocationCode": "Ufcs-D1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Operator Panel LCD"
+                        "PrettyName": "Control panel display"
                     }
                 }
             }
@@ -833,7 +833,7 @@
                         "LocationCode": "Ufcs-P0-C14"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Voltage regulator module for system processor module 0"
                     }
                 }
             }
@@ -852,7 +852,7 @@
                         "LocationCode": "Ufcs-P0-C15"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 0"
                     }
                 }
             },
@@ -1005,7 +1005,7 @@
                         "LocationCode": "Ufcs-P0-C15"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 0"
                     }
                 }
             },
@@ -1183,7 +1183,7 @@
                         "SlotNumber": 10
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -1307,7 +1307,7 @@
                         "LocationCode": "Ufcs-P0-C6"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "OpenCAPI adapter"
                     }
                 }
             }
@@ -1349,7 +1349,7 @@
                         "SlotNumber": 7
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             }
@@ -1391,7 +1391,7 @@
                         "SlotNumber": 9
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             }
@@ -1434,7 +1434,7 @@
                         "SlotNumber": 11
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -1537,7 +1537,7 @@
                         "SlotNumber": 8
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x8 adapter"
                     }
                 }
             },
@@ -1612,7 +1612,7 @@
                         "LocationCode": "Ufcs-P1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane"
+                        "PrettyName": "Drive backplane 0"
                     }
                 }
             },
@@ -1629,7 +1629,7 @@
                         "LocationCode": "Ufcs-P1-C0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 0"
                     }
                 }
             },
@@ -1647,7 +1647,7 @@
                         "LocationCode": "Ufcs-P1-C0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 0"
                     }
                 }
             },
@@ -1664,7 +1664,7 @@
                         "LocationCode": "Ufcs-P1-C1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 1"
                     }
                 }
             },
@@ -1682,7 +1682,7 @@
                         "LocationCode": "Ufcs-P1-C1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 1"
                     }
                 }
             },
@@ -1699,7 +1699,7 @@
                         "LocationCode": "Ufcs-P1-C2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 2"
                     }
                 }
             },
@@ -1717,7 +1717,7 @@
                         "LocationCode": "Ufcs-P1-C2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 2"
                     }
                 }
             },
@@ -1734,7 +1734,7 @@
                         "LocationCode": "Ufcs-P1-C3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 3"
                     }
                 }
             },
@@ -1752,7 +1752,7 @@
                         "LocationCode": "Ufcs-P1-C3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 3"
                     }
                 }
             },
@@ -1769,7 +1769,7 @@
                         "LocationCode": "Ufcs-P1-C4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 4"
                     }
                 }
             },
@@ -1787,7 +1787,7 @@
                         "LocationCode": "Ufcs-P1-C4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 4"
                     }
                 }
             },
@@ -1804,7 +1804,7 @@
                         "LocationCode": "Ufcs-P1-C5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 5"
                     }
                 }
             },
@@ -1822,7 +1822,7 @@
                         "LocationCode": "Ufcs-P1-C5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 5"
                     }
                 }
             },
@@ -1839,7 +1839,7 @@
                         "LocationCode": "Ufcs-P1-C6"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 6"
                     }
                 }
             },
@@ -1857,7 +1857,7 @@
                         "LocationCode": "Ufcs-P1-C6"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 6"
                     }
                 }
             },
@@ -1874,7 +1874,7 @@
                         "LocationCode": "Ufcs-P1-C7"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 7"
                     }
                 }
             },
@@ -1892,7 +1892,7 @@
                         "LocationCode": "Ufcs-P1-C7"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 7"
                     }
                 }
             },
@@ -1905,7 +1905,7 @@
                         "LocationCode": "Ufcs-P1-T0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -1918,7 +1918,7 @@
                         "LocationCode": "Ufcs-P1-T1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -1931,7 +1931,7 @@
                         "LocationCode": "Ufcs-P1-T2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -1944,7 +1944,7 @@
                         "LocationCode": "Ufcs-P1-T3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -1958,7 +1958,7 @@
                         "LocationCode": "Ufcs-P1-T4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive backplane signal cable port"
                     }
                 }
             },
@@ -1972,7 +1972,7 @@
                         "LocationCode": "Ufcs-P1-T5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive backplane power cable port"
                     }
                 }
             },
@@ -2031,7 +2031,7 @@
                         "LocationCode": "Ufcs-P2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane"
+                        "PrettyName": "Drive backplane 1"
                     }
                 }
             },
@@ -2048,7 +2048,7 @@
                         "LocationCode": "Ufcs-P2-C8"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 8"
                     }
                 }
             },
@@ -2066,7 +2066,7 @@
                         "LocationCode": "Ufcs-P2-C8"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 8"
                     }
                 }
             },
@@ -2083,7 +2083,7 @@
                         "LocationCode": "Ufcs-P2-C9"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 9"
                     }
                 }
             },
@@ -2101,7 +2101,7 @@
                         "LocationCode": "Ufcs-P2-C9"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 9"
                     }
                 }
             },
@@ -2118,7 +2118,7 @@
                         "LocationCode": "Ufcs-P2-C10"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 10"
                     }
                 }
             },
@@ -2136,7 +2136,7 @@
                         "LocationCode": "Ufcs-P2-C10"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 10"
                     }
                 }
             },
@@ -2153,7 +2153,7 @@
                         "LocationCode": "Ufcs-P2-C11"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 11"
                     }
                 }
             },
@@ -2171,7 +2171,7 @@
                         "LocationCode": "Ufcs-P2-C11"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 11"
                     }
                 }
             },
@@ -2188,7 +2188,7 @@
                         "LocationCode": "Ufcs-P2-C12"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 12"
                     }
                 }
             },
@@ -2206,7 +2206,7 @@
                         "LocationCode": "Ufcs-P2-C12"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 12"
                     }
                 }
             },
@@ -2223,7 +2223,7 @@
                         "LocationCode": "Ufcs-P2-C13"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 13"
                     }
                 }
             },
@@ -2241,7 +2241,7 @@
                         "LocationCode": "Ufcs-P2-C13"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 13"
                     }
                 }
             },
@@ -2258,7 +2258,7 @@
                         "LocationCode": "Ufcs-P2-C14"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 14"
                     }
                 }
             },
@@ -2276,7 +2276,7 @@
                         "LocationCode": "Ufcs-P2-C14"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 14"
                     }
                 }
             },
@@ -2293,7 +2293,7 @@
                         "LocationCode": "Ufcs-P2-C15"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 15"
                     }
                 }
             },
@@ -2311,7 +2311,7 @@
                         "LocationCode": "Ufcs-P2-C15"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 15"
                     }
                 }
             },
@@ -2324,7 +2324,7 @@
                         "LocationCode": "Ufcs-P2-T0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -2337,7 +2337,7 @@
                         "LocationCode": "Ufcs-P2-T1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -2350,7 +2350,7 @@
                         "LocationCode": "Ufcs-P2-T2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -2363,7 +2363,7 @@
                         "LocationCode": "Ufcs-P2-T3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive cable port"
                     }
                 }
             },
@@ -2377,7 +2377,7 @@
                         "LocationCode": "Ufcs-P2-T4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive backplane signal cable port"
                     }
                 }
             },
@@ -2391,7 +2391,7 @@
                         "LocationCode": "Ufcs-P2-T5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Internal Connector"
+                        "PrettyName": "Drive backplane power cable port"
                     }
                 }
             },
@@ -2449,7 +2449,7 @@
                         "LocationCode": "Ufcs-P0-C12"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 0"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -2502,7 +2502,7 @@
                         "LocationCode": "Ufcs-P0-C13"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 1"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -2555,7 +2555,7 @@
                         "LocationCode": "Ufcs-P0-C27"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 10"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -2608,7 +2608,7 @@
                         "LocationCode": "Ufcs-P0-C28"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 11"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -2661,7 +2661,7 @@
                         "LocationCode": "Ufcs-P0-C29"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 12"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -2714,7 +2714,7 @@
                         "LocationCode": "Ufcs-P0-C30"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 13"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -2767,7 +2767,7 @@
                         "LocationCode": "Ufcs-P0-C31"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 14"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -2820,7 +2820,7 @@
                         "LocationCode": "Ufcs-P0-C32"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 15"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
diff --git a/config/ibm/50003000.json b/config/ibm/50003000.json
index 355d25a..6d91774 100644
--- a/config/ibm/50003000.json
+++ b/config/ibm/50003000.json
@@ -52,7 +52,7 @@
                         "LocationCode": "Ufcs-P0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "System Backplane"
+                        "PrettyName": "System backplanev"
                     }
                 }
             },
@@ -121,7 +121,7 @@
                         "LocationCode": "Ufcs-P0-C1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x8 adapter"
                     }
                 }
             },
@@ -138,7 +138,7 @@
                         "LocationCode": "Ufcs-P0-C2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -155,7 +155,7 @@
                         "LocationCode": "Ufcs-P0-C3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -172,7 +172,7 @@
                         "LocationCode": "Ufcs-P0-C4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -189,7 +189,7 @@
                         "LocationCode": "Ufcs-P0-C5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -206,7 +206,7 @@
                         "LocationCode": "Ufcs-P0-C6"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x8 adapter"
                     }
                 }
             },
@@ -223,7 +223,7 @@
                         "LocationCode": "Ufcs-P0-C7"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -240,7 +240,7 @@
                         "LocationCode": "Ufcs-P0-C8"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -257,7 +257,7 @@
                         "LocationCode": "Ufcs-P0-C9"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x8 adapter"
                     }
                 }
             },
@@ -274,7 +274,7 @@
                         "LocationCode": "Ufcs-P0-C10"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -291,7 +291,7 @@
                         "LocationCode": "Ufcs-P0-C11"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -307,7 +307,7 @@
                         "LocationCode": "Ufcs-P1-T1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Dummy PCIe USB Adapter Slot"
+                        "PrettyName": "USB 3.0 port 2"
                     }
                 }
             },
@@ -323,7 +323,7 @@
                         "SlotNumber": 12
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Dummy PCIe USB Adapter"
+                        "PrettyName": "USB 3.0 port 2"
                     }
                 }
             },
@@ -380,7 +380,7 @@
                         "LocationCode": "Ufcs-P0-T0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Open CAPI Conn 0"
                     }
                 }
             },
@@ -393,7 +393,7 @@
                         "LocationCode": "Ufcs-P0-T1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Open CAPI Conn 1"
                     }
                 }
             },
@@ -406,7 +406,7 @@
                         "LocationCode": "Ufcs-P0-T2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Open CAPI Conn 2"
                     }
                 }
             },
@@ -419,7 +419,7 @@
                         "LocationCode": "Ufcs-P0-T3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Open CAPI Conn 3"
                     }
                 }
             },
@@ -432,7 +432,7 @@
                         "LocationCode": "Ufcs-P0-T4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Open CAPI Conn 4"
                     }
                 }
             },
@@ -445,7 +445,7 @@
                         "LocationCode": "Ufcs-P0-T5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "Open CAPI Conn 5"
                     }
                 }
             }
@@ -459,7 +459,7 @@
                         "LocationCode": "Ufcs-P0-C0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "BMC Card"
+                        "PrettyName": "eBMC card assembly"
                     }
                 }
             },
@@ -481,7 +481,7 @@
                         }
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "HMC Ethernet Connector"
+                        "PrettyName": "HMC port 1"
                     }
                 }
             },
@@ -503,7 +503,7 @@
                         }
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "HMC Ethernet Connector"
+                        "PrettyName": "HMC port 2"
                     }
                 }
             },
@@ -515,7 +515,7 @@
                         "LocationCode": "Ufcs-P0-C0-T0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Rear OS USB Top Connector"
+                        "PrettyName": "USB 3.0 port 1"
                     }
                 }
             },
@@ -527,7 +527,7 @@
                         "LocationCode": "Ufcs-P0-C0-T1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Rear OS USB Bottom Connector"
+                        "PrettyName": "USB 3.0 port 2"
                     }
                 }
             },
@@ -539,7 +539,7 @@
                         "LocationCode": "Ufcs-P0-C0-T4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "BMC USB Connector"
+                        "PrettyName": "USB 2.0 port 1"
                     }
                 }
             },
@@ -551,7 +551,7 @@
                         "LocationCode": "Ufcs-P0-C0-T5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "BMC USB Connector"
+                        "PrettyName": "USB 2.0 port 2"
                     }
                 }
             },
@@ -563,7 +563,7 @@
                         "LocationCode": "Ufcs-P0-C0-E0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Time Of Day Battery"
+                        "PrettyName": "Time-of-day battery"
                     }
                 }
             }
@@ -577,7 +577,7 @@
                         "LocationCode": "Ufcs-P0-C54"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Miscellaneous voltage regulator module for system processor module 3"
                     }
                 }
             }
@@ -591,7 +591,7 @@
                         "LocationCode": "Ufcs-P0-C55"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Processor voltage regulator module for system processor module 3"
                     }
                 }
             }
@@ -605,7 +605,7 @@
                         "LocationCode": "Ufcs-P0-C57"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Processor voltage regulator module for system processor module 3"
                     }
                 }
             }
@@ -619,7 +619,7 @@
                         "LocationCode": "Ufcs-P0-C58"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Shared voltage regulator module"
                     }
                 }
             }
@@ -633,7 +633,7 @@
                         "LocationCode": "Ufcs-P0-C12"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Miscellaneous voltage regulator module for system processor module 1"
                     }
                 }
             }
@@ -647,7 +647,7 @@
                         "LocationCode": "Ufcs-P0-C13"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Processor voltage regulator module for system processor module 1"
                     }
                 }
             }
@@ -661,7 +661,7 @@
                         "LocationCode": "Ufcs-P0-C15"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Processor voltage regulator module for system processor module 1"
                     }
                 }
             }
@@ -675,7 +675,7 @@
                         "LocationCode": "Ufcs-P0-C16"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Shared voltage regulator module"
                     }
                 }
             }
@@ -689,7 +689,7 @@
                         "LocationCode": "Ufcs-P0-C59"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "I/O and standby voltage regulator module"
                     }
                 }
             }
@@ -703,7 +703,7 @@
                         "LocationCode": "Ufcs-P0-C60"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Processor voltage regulator module for system processor module 0"
                     }
                 }
             }
@@ -717,7 +717,7 @@
                         "LocationCode": "Ufcs-P0-C62"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Processor voltage regulator module for system processor module 0"
                     }
                 }
             }
@@ -731,7 +731,7 @@
                         "LocationCode": "Ufcs-P0-C63"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Miscellaneous voltage regulator module for system processor module 0"
                     }
                 }
             }
@@ -745,7 +745,7 @@
                         "LocationCode": "Ufcs-P0-C17"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "I/O and standby voltage regulator module"
                     }
                 }
             }
@@ -759,7 +759,7 @@
                         "LocationCode": "Ufcs-P0-C18"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Processor voltage regulator module for system processor module 2"
                     }
                 }
             }
@@ -773,7 +773,7 @@
                         "LocationCode": "Ufcs-P0-C20"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Processor voltage regulator module for system processor module 2"
                     }
                 }
             }
@@ -787,7 +787,7 @@
                         "LocationCode": "Ufcs-P0-C21"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Miscellaneous voltage regulator module for system processor module 2"
                     }
                 }
             }
@@ -801,7 +801,7 @@
                         "LocationCode": "Ufcs-P0-C96"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "TPM Card"
+                        "PrettyName": "Trusted platform module card"
                     }
                 }
             }
@@ -818,7 +818,7 @@
                         "LocationCode": "Ufcs-P0-C61"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 0"
                     }
                 }
             },
@@ -970,7 +970,7 @@
                         "LocationCode": "Ufcs-P0-C61"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 0"
                     }
                 }
             },
@@ -1123,7 +1123,7 @@
                         "LocationCode": "Ufcs-P0-C14"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 1"
                     }
                 }
             },
@@ -1275,7 +1275,7 @@
                         "LocationCode": "Ufcs-P0-C14"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 1"
                     }
                 }
             },
@@ -1427,7 +1427,7 @@
                         "LocationCode": "Ufcs-P0-C19"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 2"
                     }
                 }
             },
@@ -1579,7 +1579,7 @@
                         "LocationCode": "Ufcs-P0-C19"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 2"
                     }
                 }
             },
@@ -1731,7 +1731,7 @@
                         "LocationCode": "Ufcs-P0-C56"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 3"
                     }
                 }
             },
@@ -1883,7 +1883,7 @@
                         "LocationCode": "Ufcs-P0-C56"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 3"
                     }
                 }
             },
@@ -2032,7 +2032,7 @@
                         "LocationCode": "Ufcs-P1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane"
+                        "PrettyName": "Drive backplane"
                     }
                 }
             },
@@ -2049,7 +2049,7 @@
                         "LocationCode": "Ufcs-P1-C0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 0"
                     }
                 }
             },
@@ -2067,7 +2067,7 @@
                         "LocationCode": "Ufcs-P1-C0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 0"
                     }
                 }
             },
@@ -2084,7 +2084,7 @@
                         "LocationCode": "Ufcs-P1-C1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 1"
                     }
                 }
             },
@@ -2102,7 +2102,7 @@
                         "LocationCode": "Ufcs-P1-C1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 1"
                     }
                 }
             },
@@ -2119,7 +2119,7 @@
                         "LocationCode": "Ufcs-P1-C2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 2"
                     }
                 }
             },
@@ -2137,7 +2137,7 @@
                         "LocationCode": "Ufcs-P1-C2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 2"
                     }
                 }
             },
@@ -2154,7 +2154,7 @@
                         "LocationCode": "Ufcs-P1-C3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 3"
                     }
                 }
             },
@@ -2172,7 +2172,7 @@
                         "LocationCode": "Ufcs-P1-C3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 3"
                     }
                 }
             },
@@ -2189,7 +2189,7 @@
                         "LocationCode": "Ufcs-P1-C4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 4"
                     }
                 }
             },
@@ -2207,7 +2207,7 @@
                         "LocationCode": "Ufcs-P1-C4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 4"
                     }
                 }
             },
@@ -2224,7 +2224,7 @@
                         "LocationCode": "Ufcs-P1-C5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 5"
                     }
                 }
             },
@@ -2242,7 +2242,7 @@
                         "LocationCode": "Ufcs-P1-C5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 5"
                     }
                 }
             },
@@ -2259,7 +2259,7 @@
                         "LocationCode": "Ufcs-P1-C6"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 6"
                     }
                 }
             },
@@ -2277,7 +2277,7 @@
                         "LocationCode": "Ufcs-P1-C6"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 6"
                     }
                 }
             },
@@ -2294,7 +2294,7 @@
                         "LocationCode": "Ufcs-P1-C7"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 7"
                     }
                 }
             },
@@ -2312,7 +2312,7 @@
                         "LocationCode": "Ufcs-P1-C7"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 7"
                     }
                 }
             },
@@ -2329,7 +2329,7 @@
                         "LocationCode": "Ufcs-P1-C8"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 8"
                     }
                 }
             },
@@ -2347,7 +2347,7 @@
                         "LocationCode": "Ufcs-P1-C8"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 8"
                     }
                 }
             },
@@ -2364,7 +2364,7 @@
                         "LocationCode": "Ufcs-P1-C9"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 9"
                     }
                 }
             },
@@ -2382,7 +2382,7 @@
                         "LocationCode": "Ufcs-P1-C9"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 9"
                     }
                 }
             },
@@ -2395,7 +2395,7 @@
                         "LocationCode": "Ufcs-P1-T0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Front OS USB Top Connector"
+                        "PrettyName": "USB 3.0 port 1"
                     }
                 }
             },
@@ -2408,7 +2408,7 @@
                         "LocationCode": "Ufcs-P1-T1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Front OS USB Bot Connector"
+                        "PrettyName": "USB 3.0 port 2"
                     }
                 }
             }
@@ -2427,7 +2427,7 @@
                         "LocationCode": "Ufcs-D1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Operator Panel LCD"
+                        "PrettyName": "Control panel display"
                     }
                 }
             }
@@ -2446,7 +2446,7 @@
                         "LocationCode": "Ufcs-D0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Operator Panel Base"
+                        "PrettyName": "Control panel"
                     }
                 }
             }
@@ -2505,8 +2505,8 @@
                 "devAddress": "34-0050",
                 "driverType": "at24",
                 "busType": "i2c",
-                "handlePresence": false,
                 "concurrentlyMaintainable": true,
+                "handlePresence": false,
                 "extraInterfaces": {
                     "xyz.openbmc_project.Inventory.Item.Fan": null,
                     "com.ibm.ipzvpd.Location": {
@@ -2548,7 +2548,7 @@
                         "SlotNumber": 1
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x8 adapter"
                     }
                 }
             },
@@ -2614,7 +2614,7 @@
                         "SlotNumber": 2
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -2680,7 +2680,7 @@
                         "SlotNumber": 3
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -2746,7 +2746,7 @@
                         "SlotNumber": 4
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -2812,7 +2812,7 @@
                         "SlotNumber": 5
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -2877,7 +2877,7 @@
                         "SlotNumber": 6
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x8 adapter"
                     }
                 }
             }
@@ -2915,7 +2915,7 @@
                         "SlotNumber": 7
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -2981,7 +2981,7 @@
                         "SlotNumber": 8
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -3046,7 +3046,7 @@
                         "SlotNumber": 9
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x8 adapter"
                     }
                 }
             }
@@ -3084,7 +3084,7 @@
                         "SlotNumber": 10
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -3150,7 +3150,7 @@
                         "SlotNumber": 11
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -3192,7 +3192,7 @@
                         "LocationCode": "Ufcs-P0-C22"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 0"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3245,7 +3245,7 @@
                         "LocationCode": "Ufcs-P0-C23"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 1"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3298,7 +3298,7 @@
                         "LocationCode": "Ufcs-P0-C24"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 2"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3351,7 +3351,7 @@
                         "LocationCode": "Ufcs-P0-C25"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 3"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3404,7 +3404,7 @@
                         "LocationCode": "Ufcs-P0-C26"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 4"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3457,7 +3457,7 @@
                         "LocationCode": "Ufcs-P0-C27"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 5"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3510,7 +3510,7 @@
                         "LocationCode": "Ufcs-P0-C28"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 6"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3563,7 +3563,7 @@
                         "LocationCode": "Ufcs-P0-C29"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 7"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3616,7 +3616,7 @@
                         "LocationCode": "Ufcs-P0-C30"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 8"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3669,7 +3669,7 @@
                         "LocationCode": "Ufcs-P0-C31"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 9"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3722,7 +3722,7 @@
                         "LocationCode": "Ufcs-P0-C32"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 10"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3775,7 +3775,7 @@
                         "LocationCode": "Ufcs-P0-C33"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 11"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3828,7 +3828,7 @@
                         "LocationCode": "Ufcs-P0-C34"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 12"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3881,7 +3881,7 @@
                         "LocationCode": "Ufcs-P0-C35"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 13"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3934,7 +3934,7 @@
                         "LocationCode": "Ufcs-P0-C36"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 14"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3987,7 +3987,7 @@
                         "LocationCode": "Ufcs-P0-C37"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 15"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4040,7 +4040,7 @@
                         "LocationCode": "Ufcs-P0-C38"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 16"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4093,7 +4093,7 @@
                         "LocationCode": "Ufcs-P0-C39"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 17"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4146,7 +4146,7 @@
                         "LocationCode": "Ufcs-P0-C40"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 18"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4199,7 +4199,7 @@
                         "LocationCode": "Ufcs-P0-C41"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 19"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4252,7 +4252,7 @@
                         "LocationCode": "Ufcs-P0-C42"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 20"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4305,7 +4305,7 @@
                         "LocationCode": "Ufcs-P0-C43"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 21"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4358,7 +4358,7 @@
                         "LocationCode": "Ufcs-P0-C44"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 22"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4411,7 +4411,7 @@
                         "LocationCode": "Ufcs-P0-C45"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 23"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4464,7 +4464,7 @@
                         "LocationCode": "Ufcs-P0-C46"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 24"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4517,7 +4517,7 @@
                         "LocationCode": "Ufcs-P0-C47"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 25"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4570,7 +4570,7 @@
                         "LocationCode": "Ufcs-P0-C48"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 26"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4623,7 +4623,7 @@
                         "LocationCode": "Ufcs-P0-C49"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 27"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4676,7 +4676,7 @@
                         "LocationCode": "Ufcs-P0-C50"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 28"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4729,7 +4729,7 @@
                         "LocationCode": "Ufcs-P0-C51"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 29"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4782,7 +4782,7 @@
                         "LocationCode": "Ufcs-P0-C52"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 30"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4835,7 +4835,7 @@
                         "LocationCode": "Ufcs-P0-C53"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 31"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4888,7 +4888,7 @@
                         "LocationCode": "Ufcs-P0-C64"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 32"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4941,7 +4941,7 @@
                         "LocationCode": "Ufcs-P0-C65"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 34"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4994,7 +4994,7 @@
                         "LocationCode": "Ufcs-P0-C66"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 34"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5047,7 +5047,7 @@
                         "LocationCode": "Ufcs-P0-C67"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 35"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5100,7 +5100,7 @@
                         "LocationCode": "Ufcs-P0-C68"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 36"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5153,7 +5153,7 @@
                         "LocationCode": "Ufcs-P0-C69"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 37"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5206,7 +5206,7 @@
                         "LocationCode": "Ufcs-P0-C70"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 38"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5259,7 +5259,7 @@
                         "LocationCode": "Ufcs-P0-C71"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "DDIMM 39"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5312,7 +5312,7 @@
                         "LocationCode": "Ufcs-P0-C72"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 40"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5365,7 +5365,7 @@
                         "LocationCode": "Ufcs-P0-C73"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 41"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5418,7 +5418,7 @@
                         "LocationCode": "Ufcs-P0-C74"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 40"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5471,7 +5471,7 @@
                         "LocationCode": "Ufcs-P0-C75"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 43"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5524,7 +5524,7 @@
                         "LocationCode": "Ufcs-P0-C76"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 44"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5577,7 +5577,7 @@
                         "LocationCode": "Ufcs-P0-C77"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 45"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5630,7 +5630,7 @@
                         "LocationCode": "Ufcs-P0-C78"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 46"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5683,7 +5683,7 @@
                         "LocationCode": "Ufcs-P0-C79"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 47"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5736,7 +5736,7 @@
                         "LocationCode": "Ufcs-P0-C80"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 48"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5789,7 +5789,7 @@
                         "LocationCode": "Ufcs-P0-C81"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 49"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5842,7 +5842,7 @@
                         "LocationCode": "Ufcs-P0-C82"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 50"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5895,7 +5895,7 @@
                         "LocationCode": "Ufcs-P0-C83"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 51"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5948,7 +5948,7 @@
                         "LocationCode": "Ufcs-P0-C84"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 52"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -6001,7 +6001,7 @@
                         "LocationCode": "Ufcs-P0-C85"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 53"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -6054,7 +6054,7 @@
                         "LocationCode": "Ufcs-P0-C86"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 54"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -6107,7 +6107,7 @@
                         "LocationCode": "Ufcs-P0-C87"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 55"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -6160,7 +6160,7 @@
                         "LocationCode": "Ufcs-P0-C88"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 56"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -6213,7 +6213,7 @@
                         "LocationCode": "Ufcs-P0-C89"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 57"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -6266,7 +6266,7 @@
                         "LocationCode": "Ufcs-P0-C90"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 58"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -6319,7 +6319,7 @@
                         "LocationCode": "Ufcs-P0-C91"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 59"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -6372,7 +6372,7 @@
                         "LocationCode": "Ufcs-P0-C92"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 60"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -6425,7 +6425,7 @@
                         "LocationCode": "Ufcs-P0-C93"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 61"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -6478,7 +6478,7 @@
                         "LocationCode": "Ufcs-P0-C94"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 62"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -6531,7 +6531,7 @@
                         "LocationCode": "Ufcs-P0-C95"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 63"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
diff --git a/config/ibm/50003000_v2.json b/config/ibm/50003000_v2.json
index 010e423..cec0b7f 100644
--- a/config/ibm/50003000_v2.json
+++ b/config/ibm/50003000_v2.json
@@ -52,7 +52,7 @@
                         "LocationCode": "Ufcs-P0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "System Backplane"
+                        "PrettyName": "System backplane"
                     }
                 }
             },
@@ -121,7 +121,7 @@
                         "LocationCode": "Ufcs-P0-C1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x8 adapter"
                     }
                 }
             },
@@ -138,7 +138,7 @@
                         "LocationCode": "Ufcs-P0-C2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -155,7 +155,7 @@
                         "LocationCode": "Ufcs-P0-C3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -172,7 +172,7 @@
                         "LocationCode": "Ufcs-P0-C4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -189,7 +189,7 @@
                         "LocationCode": "Ufcs-P0-C5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -206,7 +206,7 @@
                         "LocationCode": "Ufcs-P0-C6"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x8 adapter"
                     }
                 }
             },
@@ -223,7 +223,7 @@
                         "LocationCode": "Ufcs-P0-C7"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -240,7 +240,7 @@
                         "LocationCode": "Ufcs-P0-C8"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -257,7 +257,7 @@
                         "LocationCode": "Ufcs-P0-C9"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x8 adapter"
                     }
                 }
             },
@@ -274,7 +274,7 @@
                         "LocationCode": "Ufcs-P0-C10"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -291,7 +291,7 @@
                         "LocationCode": "Ufcs-P0-C11"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Slot"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -307,7 +307,7 @@
                         "LocationCode": "Ufcs-P1-T1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Dummy PCIe USB Adapter Slot"
+                        "PrettyName": "USB 3.0 port 2"
                     }
                 }
             },
@@ -323,7 +323,7 @@
                         "SlotNumber": 12
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Dummy PCIe USB Adapter"
+                        "PrettyName": "USB 3.0 port 2"
                     }
                 }
             },
@@ -380,7 +380,7 @@
                         "LocationCode": "Ufcs-P0-T0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "OpenCAPI Port Conn 0"
                     }
                 }
             },
@@ -393,7 +393,7 @@
                         "LocationCode": "Ufcs-P0-T1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "OpenCAPI Port Conn 1"
                     }
                 }
             },
@@ -406,7 +406,7 @@
                         "LocationCode": "Ufcs-P0-T2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "OpenCAPI Port Conn 2"
                     }
                 }
             },
@@ -419,7 +419,7 @@
                         "LocationCode": "Ufcs-P0-T3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "OpenCAPI Port Conn 3"
                     }
                 }
             },
@@ -432,7 +432,7 @@
                         "LocationCode": "Ufcs-P0-T4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "OpenCAPI Port Conn 4"
                     }
                 }
             },
@@ -445,7 +445,7 @@
                         "LocationCode": "Ufcs-P0-T5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "OpenCAPI Port Connector"
+                        "PrettyName": "OpenCAPI Port Conn 5"
                     }
                 }
             }
@@ -459,7 +459,7 @@
                         "LocationCode": "Ufcs-P0-C0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "BMC Card"
+                        "PrettyName": "eBMC card assembly"
                     }
                 }
             },
@@ -481,7 +481,7 @@
                         }
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "HMC Ethernet Connector"
+                        "PrettyName": "HMC port 1"
                     }
                 }
             },
@@ -503,7 +503,7 @@
                         }
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "HMC Ethernet Connector"
+                        "PrettyName": "HMC port 2"
                     }
                 }
             },
@@ -515,7 +515,7 @@
                         "LocationCode": "Ufcs-P0-C0-T0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Rear OS USB Top Connector"
+                        "PrettyName": "USB 3.0 port 1"
                     }
                 }
             },
@@ -527,7 +527,7 @@
                         "LocationCode": "Ufcs-P0-C0-T1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Rear OS USB Bottom Connector"
+                        "PrettyName": "USB 3.0 port 2"
                     }
                 }
             },
@@ -539,7 +539,7 @@
                         "LocationCode": "Ufcs-P0-C0-T4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "BMC USB Connector"
+                        "PrettyName": "USB 2.0 port 1"
                     }
                 }
             },
@@ -551,7 +551,7 @@
                         "LocationCode": "Ufcs-P0-C0-T5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "BMC USB Connector"
+                        "PrettyName": "USB 2.0 port 2"
                     }
                 }
             },
@@ -563,7 +563,7 @@
                         "LocationCode": "Ufcs-P0-C0-E0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Time Of Day Battery"
+                        "PrettyName": "Time-of-day battery"
                     }
                 }
             }
@@ -577,7 +577,7 @@
                         "LocationCode": "Ufcs-P0-C54"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Miscellaneous voltage regulator module for system processor module 3"
                     }
                 }
             }
@@ -591,7 +591,7 @@
                         "LocationCode": "Ufcs-P0-C55"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Processor voltage regulator module for system processor module 3"
                     }
                 }
             }
@@ -605,7 +605,7 @@
                         "LocationCode": "Ufcs-P0-C57"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Processor voltage regulator module for system processor module 3"
                     }
                 }
             }
@@ -619,7 +619,7 @@
                         "LocationCode": "Ufcs-P0-C58"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Shared voltage regulator module"
                     }
                 }
             }
@@ -633,7 +633,7 @@
                         "LocationCode": "Ufcs-P0-C12"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Miscellaneous voltage regulator module for system processor module 1"
                     }
                 }
             }
@@ -647,7 +647,7 @@
                         "LocationCode": "Ufcs-P0-C13"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Processor voltage regulator module for system processor module 1"
                     }
                 }
             }
@@ -661,7 +661,7 @@
                         "LocationCode": "Ufcs-P0-C15"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Processor voltage regulator module for system processor module 1"
                     }
                 }
             }
@@ -675,7 +675,7 @@
                         "LocationCode": "Ufcs-P0-C16"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Shared voltage regulator module"
                     }
                 }
             }
@@ -689,7 +689,7 @@
                         "LocationCode": "Ufcs-P0-C59"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "I/O and standby voltage regulator module"
                     }
                 }
             }
@@ -703,7 +703,7 @@
                         "LocationCode": "Ufcs-P0-C60"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Processor voltage regulator module for system processor module 0"
                     }
                 }
             }
@@ -717,7 +717,7 @@
                         "LocationCode": "Ufcs-P0-C62"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Processor voltage regulator module for system processor module 0"
                     }
                 }
             }
@@ -731,7 +731,7 @@
                         "LocationCode": "Ufcs-P0-C63"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Miscellaneous voltage regulator module for system processor module 0"
                     }
                 }
             }
@@ -745,7 +745,7 @@
                         "LocationCode": "Ufcs-P0-C17"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "I/O and standby voltage regulator module"
                     }
                 }
             }
@@ -759,7 +759,7 @@
                         "LocationCode": "Ufcs-P0-C18"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Processor voltage regulator module for system processor module 2"
                     }
                 }
             }
@@ -773,7 +773,7 @@
                         "LocationCode": "Ufcs-P0-C20"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Processor voltage regulator module for system processor module 2"
                     }
                 }
             }
@@ -787,7 +787,7 @@
                         "LocationCode": "Ufcs-P0-C21"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Voltage Regulator Module"
+                        "PrettyName": "Miscellaneous voltage regulator module for system processor module 2"
                     }
                 }
             }
@@ -801,7 +801,7 @@
                         "LocationCode": "Ufcs-P0-C96"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "TPM Card"
+                        "PrettyName": "Trusted platform module card"
                     }
                 }
             }
@@ -818,7 +818,7 @@
                         "LocationCode": "Ufcs-P0-C61"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 0"
                     }
                 }
             },
@@ -970,7 +970,7 @@
                         "LocationCode": "Ufcs-P0-C61"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 0"
                     }
                 }
             },
@@ -1123,7 +1123,7 @@
                         "LocationCode": "Ufcs-P0-C14"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 1"
                     }
                 }
             },
@@ -1275,7 +1275,7 @@
                         "LocationCode": "Ufcs-P0-C14"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 1"
                     }
                 }
             },
@@ -1427,7 +1427,7 @@
                         "LocationCode": "Ufcs-P0-C19"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 2"
                     }
                 }
             },
@@ -1579,7 +1579,7 @@
                         "LocationCode": "Ufcs-P0-C19"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 2"
                     }
                 }
             },
@@ -1731,7 +1731,7 @@
                         "LocationCode": "Ufcs-P0-C56"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 3"
                     }
                 }
             },
@@ -1883,7 +1883,7 @@
                         "LocationCode": "Ufcs-P0-C56"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Processor Module"
+                        "PrettyName": "System processor module 3"
                     }
                 }
             },
@@ -2032,7 +2032,7 @@
                         "LocationCode": "Ufcs-P1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Backplane"
+                        "PrettyName": "Drive backplane"
                     }
                 }
             },
@@ -2049,7 +2049,7 @@
                         "LocationCode": "Ufcs-P1-C0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 0"
                     }
                 }
             },
@@ -2067,7 +2067,7 @@
                         "LocationCode": "Ufcs-P1-C0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 0"
                     }
                 }
             },
@@ -2084,7 +2084,7 @@
                         "LocationCode": "Ufcs-P1-C1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 1"
                     }
                 }
             },
@@ -2102,7 +2102,7 @@
                         "LocationCode": "Ufcs-P1-C1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 1"
                     }
                 }
             },
@@ -2119,7 +2119,7 @@
                         "LocationCode": "Ufcs-P1-C2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 2"
                     }
                 }
             },
@@ -2137,7 +2137,7 @@
                         "LocationCode": "Ufcs-P1-C2"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 2"
                     }
                 }
             },
@@ -2154,7 +2154,7 @@
                         "LocationCode": "Ufcs-P1-C3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 3"
                     }
                 }
             },
@@ -2172,7 +2172,7 @@
                         "LocationCode": "Ufcs-P1-C3"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 3"
                     }
                 }
             },
@@ -2189,7 +2189,7 @@
                         "LocationCode": "Ufcs-P1-C4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 4"
                     }
                 }
             },
@@ -2207,7 +2207,7 @@
                         "LocationCode": "Ufcs-P1-C4"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 4"
                     }
                 }
             },
@@ -2224,7 +2224,7 @@
                         "LocationCode": "Ufcs-P1-C5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 5"
                     }
                 }
             },
@@ -2242,7 +2242,7 @@
                         "LocationCode": "Ufcs-P1-C5"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 5"
                     }
                 }
             },
@@ -2259,7 +2259,7 @@
                         "LocationCode": "Ufcs-P1-C6"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 6"
                     }
                 }
             },
@@ -2277,7 +2277,7 @@
                         "LocationCode": "Ufcs-P1-C6"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 6"
                     }
                 }
             },
@@ -2294,7 +2294,7 @@
                         "LocationCode": "Ufcs-P1-C7"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 7"
                     }
                 }
             },
@@ -2312,7 +2312,7 @@
                         "LocationCode": "Ufcs-P1-C7"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 7"
                     }
                 }
             },
@@ -2329,7 +2329,7 @@
                         "LocationCode": "Ufcs-P1-C8"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 8"
                     }
                 }
             },
@@ -2347,7 +2347,7 @@
                         "LocationCode": "Ufcs-P1-C8"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 8"
                     }
                 }
             },
@@ -2364,7 +2364,7 @@
                         "LocationCode": "Ufcs-P1-C9"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "U.2 PCIe Slot"
+                        "PrettyName": "NVMe U.2 drive 9"
                     }
                 }
             },
@@ -2382,7 +2382,7 @@
                         "LocationCode": "Ufcs-P1-C9"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "NVMe Drive"
+                        "PrettyName": "NVMe U.2 drive 9"
                     }
                 }
             },
@@ -2395,7 +2395,7 @@
                         "LocationCode": "Ufcs-P1-T0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Front OS USB Top Connector"
+                        "PrettyName": "USB 3.0 port 1"
                     }
                 }
             },
@@ -2408,7 +2408,7 @@
                         "LocationCode": "Ufcs-P1-T1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Front OS USB Bot Connector"
+                        "PrettyName": "USB 3.0 port 2"
                     }
                 }
             }
@@ -2427,7 +2427,7 @@
                         "LocationCode": "Ufcs-D1"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Operator Panel LCD"
+                        "PrettyName": "Control panel display"
                     }
                 }
             }
@@ -2446,7 +2446,7 @@
                         "LocationCode": "Ufcs-D0"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Operator Panel Base"
+                        "PrettyName": "Control panel"
                     }
                 }
             }
@@ -2553,7 +2553,7 @@
                         "SlotNumber": 1
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x8 adapter"
                     }
                 }
             },
@@ -2624,7 +2624,7 @@
                         "SlotNumber": 2
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -2695,7 +2695,7 @@
                         "SlotNumber": 3
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -2766,7 +2766,7 @@
                         "SlotNumber": 4
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -2837,7 +2837,7 @@
                         "SlotNumber": 5
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -2907,7 +2907,7 @@
                         "SlotNumber": 6
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x8 adapter"
                     }
                 }
             }
@@ -2950,7 +2950,7 @@
                         "SlotNumber": 7
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -3021,7 +3021,7 @@
                         "SlotNumber": 8
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -3091,7 +3091,7 @@
                         "SlotNumber": 9
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x8 adapter"
                     }
                 }
             }
@@ -3134,7 +3134,7 @@
                         "SlotNumber": 10
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe5 x8 adapter"
                     }
                 }
             },
@@ -3205,7 +3205,7 @@
                         "SlotNumber": 11
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "PCIe Card"
+                        "PrettyName": "PCIe4 x16 or PCIe5 x8 adapter"
                     }
                 }
             },
@@ -3247,7 +3247,7 @@
                         "LocationCode": "Ufcs-P0-C22"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 0"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3300,7 +3300,7 @@
                         "LocationCode": "Ufcs-P0-C23"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 1"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3353,7 +3353,7 @@
                         "LocationCode": "Ufcs-P0-C24"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 2"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3406,7 +3406,7 @@
                         "LocationCode": "Ufcs-P0-C25"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 3"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3459,7 +3459,7 @@
                         "LocationCode": "Ufcs-P0-C26"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 4"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3512,7 +3512,7 @@
                         "LocationCode": "Ufcs-P0-C27"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 5"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3565,7 +3565,7 @@
                         "LocationCode": "Ufcs-P0-C28"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 6"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3618,7 +3618,7 @@
                         "LocationCode": "Ufcs-P0-C29"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 7"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3671,7 +3671,7 @@
                         "LocationCode": "Ufcs-P0-C30"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 8"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3724,7 +3724,7 @@
                         "LocationCode": "Ufcs-P0-C31"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 9"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3777,7 +3777,7 @@
                         "LocationCode": "Ufcs-P0-C32"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 10"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3830,7 +3830,7 @@
                         "LocationCode": "Ufcs-P0-C33"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 11"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3883,7 +3883,7 @@
                         "LocationCode": "Ufcs-P0-C34"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 12"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3936,7 +3936,7 @@
                         "LocationCode": "Ufcs-P0-C35"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 13"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -3989,7 +3989,7 @@
                         "LocationCode": "Ufcs-P0-C36"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 14"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4042,7 +4042,7 @@
                         "LocationCode": "Ufcs-P0-C37"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 15"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4095,7 +4095,7 @@
                         "LocationCode": "Ufcs-P0-C38"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 16"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4148,7 +4148,7 @@
                         "LocationCode": "Ufcs-P0-C39"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 17"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4201,7 +4201,7 @@
                         "LocationCode": "Ufcs-P0-C40"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 18"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4254,7 +4254,7 @@
                         "LocationCode": "Ufcs-P0-C41"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 19"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4307,7 +4307,7 @@
                         "LocationCode": "Ufcs-P0-C42"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 20"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4360,7 +4360,7 @@
                         "LocationCode": "Ufcs-P0-C43"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 21"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4413,7 +4413,7 @@
                         "LocationCode": "Ufcs-P0-C44"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 22"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4466,7 +4466,7 @@
                         "LocationCode": "Ufcs-P0-C45"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 23"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4519,7 +4519,7 @@
                         "LocationCode": "Ufcs-P0-C46"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 24"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4572,7 +4572,7 @@
                         "LocationCode": "Ufcs-P0-C47"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 25"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4625,7 +4625,7 @@
                         "LocationCode": "Ufcs-P0-C48"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 26"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4678,7 +4678,7 @@
                         "LocationCode": "Ufcs-P0-C49"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 27"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4731,7 +4731,7 @@
                         "LocationCode": "Ufcs-P0-C50"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 28"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4784,7 +4784,7 @@
                         "LocationCode": "Ufcs-P0-C51"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 29"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4837,7 +4837,7 @@
                         "LocationCode": "Ufcs-P0-C52"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 30"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4890,7 +4890,7 @@
                         "LocationCode": "Ufcs-P0-C53"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 31"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4943,7 +4943,7 @@
                         "LocationCode": "Ufcs-P0-C64"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 32"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -4996,7 +4996,7 @@
                         "LocationCode": "Ufcs-P0-C65"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 33"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5049,7 +5049,7 @@
                         "LocationCode": "Ufcs-P0-C66"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 34"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5102,7 +5102,7 @@
                         "LocationCode": "Ufcs-P0-C67"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 35"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5155,7 +5155,7 @@
                         "LocationCode": "Ufcs-P0-C68"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 36"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5208,7 +5208,7 @@
                         "LocationCode": "Ufcs-P0-C69"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 37"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5261,7 +5261,7 @@
                         "LocationCode": "Ufcs-P0-C70"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 38"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5314,7 +5314,7 @@
                         "LocationCode": "Ufcs-P0-C71"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 39"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5367,7 +5367,7 @@
                         "LocationCode": "Ufcs-P0-C72"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 40"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5420,7 +5420,7 @@
                         "LocationCode": "Ufcs-P0-C73"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 41"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5473,7 +5473,7 @@
                         "LocationCode": "Ufcs-P0-C74"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 42"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5526,7 +5526,7 @@
                         "LocationCode": "Ufcs-P0-C75"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 43"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5579,7 +5579,7 @@
                         "LocationCode": "Ufcs-P0-C76"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 44"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5632,7 +5632,7 @@
                         "LocationCode": "Ufcs-P0-C77"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 45"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5685,7 +5685,7 @@
                         "LocationCode": "Ufcs-P0-C78"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 46"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5738,7 +5738,7 @@
                         "LocationCode": "Ufcs-P0-C79"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 47"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5791,7 +5791,7 @@
                         "LocationCode": "Ufcs-P0-C80"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 48"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5844,7 +5844,7 @@
                         "LocationCode": "Ufcs-P0-C81"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 49"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5897,7 +5897,7 @@
                         "LocationCode": "Ufcs-P0-C82"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 50"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -5950,7 +5950,7 @@
                         "LocationCode": "Ufcs-P0-C83"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 51"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -6003,7 +6003,7 @@
                         "LocationCode": "Ufcs-P0-C84"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 52"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -6056,7 +6056,7 @@
                         "LocationCode": "Ufcs-P0-C85"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 53"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -6109,7 +6109,7 @@
                         "LocationCode": "Ufcs-P0-C86"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 54"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -6162,7 +6162,7 @@
                         "LocationCode": "Ufcs-P0-C87"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 55"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -6215,7 +6215,7 @@
                         "LocationCode": "Ufcs-P0-C88"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 56"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -6268,7 +6268,7 @@
                         "LocationCode": "Ufcs-P0-C89"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 57"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -6321,7 +6321,7 @@
                         "LocationCode": "Ufcs-P0-C90"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 58"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -6374,7 +6374,7 @@
                         "LocationCode": "Ufcs-P0-C91"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 59"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -6427,7 +6427,7 @@
                         "LocationCode": "Ufcs-P0-C92"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 60"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -6480,7 +6480,7 @@
                         "LocationCode": "Ufcs-P0-C93"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 61"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -6533,7 +6533,7 @@
                         "LocationCode": "Ufcs-P0-C94"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 62"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false
@@ -6586,7 +6586,7 @@
                         "LocationCode": "Ufcs-P0-C95"
                     },
                     "xyz.openbmc_project.Inventory.Item": {
-                        "PrettyName": "Memory DIMM"
+                        "PrettyName": "Memory module 63"
                     },
                     "xyz.openbmc_project.State.Decorator.Availability": {
                         "Available": false