diff --git a/libpldmresponder/bios_config.cpp b/libpldmresponder/bios_config.cpp
index 5910af6..b66e12a 100644
--- a/libpldmresponder/bios_config.cpp
+++ b/libpldmresponder/bios_config.cpp
@@ -225,7 +225,7 @@
                 pldm_bios_table_attr_entry_enum_decode_pv_num(entry, &pvNum);
                 std::vector<uint16_t> pvHandls(pvNum);
                 // Preconditions are upheld therefore no error check necessary
-                pldm_bios_table_attr_entry_enum_decode_pv_hdls_check(
+                pldm_bios_table_attr_entry_enum_decode_pv_hdls(
                     entry, pvHandls.data(), pvHandls.size());
                 uint8_t defNum;
                 pldm_bios_table_attr_entry_enum_decode_def_num(entry, &defNum);
@@ -377,7 +377,7 @@
                                                               &pvNum);
                 std::vector<uint16_t> pvHandls(pvNum);
                 // Preconditions are upheld therefore no error check necessary
-                pldm_bios_table_attr_entry_enum_decode_pv_hdls_check(
+                pldm_bios_table_attr_entry_enum_decode_pv_hdls(
                     attrEntry, pvHandls.data(), pvHandls.size());
 
                 // get possible_value
@@ -742,8 +742,8 @@
 
     std::vector<uint16_t> pvHandls(pvNum);
     // Preconditions are upheld therefore no error check necessary
-    pldm_bios_table_attr_entry_enum_decode_pv_hdls_check(
-        attrEntry, pvHandls.data(), pvHandls.size());
+    pldm_bios_table_attr_entry_enum_decode_pv_hdls(attrEntry, pvHandls.data(),
+                                                   pvHandls.size());
 
     std::string displayString = std::to_string(pvHandls[index]);
 
diff --git a/libpldmresponder/bios_table.cpp b/libpldmresponder/bios_table.cpp
index c4a0b74..092af32 100644
--- a/libpldmresponder/bios_table.cpp
+++ b/libpldmresponder/bios_table.cpp
@@ -251,8 +251,7 @@
     }
     std::vector<uint16_t> pvHdls(pvNum, 0);
     // Preconditions are upheld therefore no error check necessary
-    pldm_bios_table_attr_entry_enum_decode_pv_hdls_check(entry, pvHdls.data(),
-                                                         pvNum);
+    pldm_bios_table_attr_entry_enum_decode_pv_hdls(entry, pvHdls.data(), pvNum);
     // Preconditions are upheld therefore no error check necessary
     uint8_t defNum;
     pldm_bios_table_attr_entry_enum_decode_def_num(entry, &defNum);
diff --git a/pldmtool/pldm_bios_cmd.cpp b/pldmtool/pldm_bios_cmd.cpp
index 68e251e..b096591 100644
--- a/pldmtool/pldm_bios_cmd.cpp
+++ b/pldmtool/pldm_bios_cmd.cpp
@@ -342,7 +342,7 @@
         }
         std::vector<uint16_t> pvHandls(pvNum);
         // Preconditions are upheld therefore no error check necessary
-        pldm_bios_table_attr_entry_enum_decode_pv_hdls_check(
+        pldm_bios_table_attr_entry_enum_decode_pv_hdls(
             attrEntry, pvHandls.data(), pvHandls.size());
         return displayStringHandle(pvHandls[index], stringTable, false);
     }
@@ -563,7 +563,7 @@
                     std::vector<uint16_t> pvHandls(pvNum);
                     // Preconditions are upheld therefore no error check
                     // necessary
-                    pldm_bios_table_attr_entry_enum_decode_pv_hdls_check(
+                    pldm_bios_table_attr_entry_enum_decode_pv_hdls(
                         entry, pvHandls.data(), pvHandls.size());
                     uint8_t defNum;
                     // Preconditions are upheld therefore no error check
@@ -824,7 +824,7 @@
                                                               &pvNum);
                 std::vector<uint16_t> pvHdls(pvNum, 0);
                 // Preconditions are upheld therefore no error check necessary
-                pldm_bios_table_attr_entry_enum_decode_pv_hdls_check(
+                pldm_bios_table_attr_entry_enum_decode_pv_hdls(
                     attrEntry, pvHdls.data(), pvNum);
                 auto stringEntry = pldm_bios_table_string_find_by_string(
                     stringTable->data(), stringTable->size(),