diff --git a/extensions/openpower-pels/src.cpp b/extensions/openpower-pels/src.cpp
index 19d140d..f0f530e 100644
--- a/extensions/openpower-pels/src.cpp
+++ b/extensions/openpower-pels/src.cpp
@@ -1276,6 +1276,13 @@
     {
         auto procedure = jsonCallout.at("Procedure").get<std::string>();
 
+        // If it's the registry name instead of the raw name, convert.
+        if (pv::maintenanceProcedures.find(procedure) !=
+            pv::maintenanceProcedures.end())
+        {
+            procedure = pv::maintenanceProcedures.at(procedure);
+        }
+
         callout = std::make_unique<src::Callout>(
             static_cast<CalloutPriority>(priority), procedure,
             src::CalloutValueType::raw);
@@ -1284,6 +1291,12 @@
     {
         auto fru = jsonCallout.at("SymbolicFRU").get<std::string>();
 
+        // If it's the registry name instead of the raw name, convert.
+        if (pv::symbolicFRUs.find(fru) != pv::symbolicFRUs.end())
+        {
+            fru = pv::symbolicFRUs.at(fru);
+        }
+
         bool trusted = false;
         if (jsonCallout.contains("TrustedLocationCode") && !locCode.empty())
         {
