diff --git a/ipmi_fru_info_area.cpp b/ipmi_fru_info_area.cpp
index 47a8a8e..85d2007 100644
--- a/ipmi_fru_info_area.cpp
+++ b/ipmi_fru_info_area.cpp
@@ -13,12 +13,12 @@
 using namespace phosphor::logging;
 
 // Property variables
-static constexpr auto partNumber = "PartNumber";
-static constexpr auto serialNumber = "SerialNumber";
+static constexpr auto partNumber = "Part Number";
+static constexpr auto serialNumber = "Serial Number";
 static constexpr auto manufacturer = "Manufacturer";
-static constexpr auto buildDate = "BuildDate";
+static constexpr auto buildDate = "Mfg Date";
 static constexpr auto model = "Model";
-static constexpr auto prettyName = "PrettyName";
+static constexpr auto prettyName = "Name";
 static constexpr auto version = "Version";
 static constexpr auto type = "Type";
 
diff --git a/read_fru_data.cpp b/read_fru_data.cpp
index 1a1949d..327f552 100644
--- a/read_fru_data.cpp
+++ b/read_fru_data.cpp
@@ -138,8 +138,9 @@
                 if (iter != allProp.end())
                 {
                     data[properties.second.section].emplace(
-                        properties.first, std::move(std::get<std::string>(
-                                              allProp[properties.first])));
+                        properties.second.property,
+                        std::move(
+                            std::get<std::string>(allProp[properties.first])));
                 }
             }
         }