diff --git a/extensions/openpower-pels/pel_values.cpp b/extensions/openpower-pels/pel_values.cpp
index 1a0343b..368dbe7 100644
--- a/extensions/openpower-pels/pel_values.cpp
+++ b/extensions/openpower-pels/pel_values.cpp
@@ -29,20 +29,20 @@
  * The possible values for the subsystem field  in the User Header.
  */
 const PELValues subsystemValues = {
-    {0x10, "processor", "Processor Subsystem"},
+    {0x10, "processor", "Processor"},
     {0x11, "processor_fru", "Processor FRU"},
     {0x12, "processor_chip", "Processor Chip Cache"},
     {0x13, "processor_unit", "Processor Unit (CPU)"},
     {0x14, "processor_bus", "Processor Bus Controller"},
 
-    {0x20, "memory", "Memory Subsystem"},
+    {0x20, "memory", "Memory "},
     {0x21, "memory_ctlr", "Memory Controller"},
     {0x22, "memory_bus", "Memory Bus Interface"},
     {0x23, "memory_dimm", "Memory DIMM"},
     {0x24, "memory_fru", "Memory Card/FRU"},
     {0x25, "external_cache", "External Cache"},
 
-    {0x30, "io", "I/O Subsystem"},
+    {0x30, "io", "I/O"},
     {0x31, "io_hub", "I/O Hub"},
     {0x32, "io_bridge", "I/O Bridge"},
     {0x33, "io_bus", "I/O bus interface"},
@@ -50,40 +50,40 @@
     {0x35, "io_hub_other", "SMA Hub"},
     {0x38, "phb", "PCI Bridge Chip"},
 
-    {0x40, "io_adapter", "I/O Adapter Subsystem"},
+    {0x40, "io_adapter", "I/O Adapter"},
     {0x41, "io_adapter_comm", "I/O Adapter Communication"},
-    {0x46, "io_device", "I/O Device Subsystem"},
+    {0x46, "io_device", "I/O Device"},
     {0x47, "io_device_dasd", "I/O Device Disk"},
     {0x4C, "io_external_general", "I/O External Peripheral"},
     {0x4D, "io_external_workstation",
      "I/O External Peripheral Local Work Station"},
-    {0x4E, "io_storage_mezz", "I/O Storage Mezza Expansion Subsystem"},
+    {0x4E, "io_storage_mezz", "I/O Storage Mezza Expansion"},
 
-    {0x50, "cec_hardware", "CEC Hardware Subsystem"},
-    {0x51, "cec_sp_a", "CEC Hardware: Service Processor A"},
-    {0x52, "cec_sp_b", "CEC Hardware: Service Processor B"},
-    {0x53, "cec_node_controller", "CEC Hardware: Node Controller"},
-    {0x55, "cec_vpd", "CEC Hardware: VPD Interface"},
-    {0x56, "cec_i2c", "CEC Hardware: I2C Devices"},
-    {0x57, "cec_chip_iface", "CEC Hardware: CEC Chip Interface"},
-    {0x58, "cec_clocks", "CEC Hardware: Clock"},
-    {0x59, "cec_op_panel", "CEC Hardware: Operator Panel"},
-    {0x5A, "cec_tod", "CEC Hardware: Time-Of-Day Hardware"},
-    {0x5B, "cec_storage_device", "CEC Hardware: Memory Device"},
+    {0x50, "cec_hardware", "CEC Hardware"},
+    {0x51, "cec_sp_a", "CEC Hardware - Service Processor A"},
+    {0x52, "cec_sp_b", "CEC Hardware - Service Processor B"},
+    {0x53, "cec_node_controller", "CEC Hardware - Node Controller"},
+    {0x55, "cec_vpd", "CEC Hardware - VPD Interface"},
+    {0x56, "cec_i2c", "CEC Hardware - I2C Devices"},
+    {0x57, "cec_chip_iface", "CEC Hardware - CEC Chip Interface"},
+    {0x58, "cec_clocks", "CEC Hardware - Clock"},
+    {0x59, "cec_op_panel", "CEC Hardware - Operator Panel"},
+    {0x5A, "cec_tod", "CEC Hardware - Time-Of-Day Hardware"},
+    {0x5B, "cec_storage_device", "CEC Hardware - Memory Device"},
     {0x5C, "cec_sp_hyp_iface",
-     "CEC Hardware: Hypervisor-Service Processor Interface"},
-    {0x5D, "cec_service_network", "CEC Hardware: Service Network"},
+     "CEC Hardware - Hypervisor<->Service Processor Interface"},
+    {0x5D, "cec_service_network", "CEC Hardware - Service Network"},
     {0x5E, "cec_sp_hostboot_iface",
-     "CEC Hardware: Hostboot-Service Processor Interface"},
+     "CEC Hardware - Hostboot-Service Processor Interface"},
 
-    {0x60, "power", "Power/Cooling Subsystem"},
+    {0x60, "power", "Power/Cooling"},
     {0x61, "power_supply", "Power Supply"},
     {0x62, "power_control_hw", "Power Control Hardware"},
     {0x63, "power_fans", "Fan (AMD)"},
-    {0x64, "power_sequencer", "Digital Power Supply Subsystem"},
+    {0x64, "power_sequencer", "Digital Power Supply"},
 
     {0x70, "others", "Miscellaneous"},
-    {0x71, "other_hmc", "HMC Subsystem & Hardware"},
+    {0x71, "other_hmc", "HMC & Hardware"},
     {0x72, "other_test_tool", "Test Tool"},
     {0x73, "other_media", "Removable Media"},
     {0x74, "other_multiple_subsystems", "Multiple Subsystems"},