diff --git a/configurations/fru_master.json b/configurations/fru_master.json
index 5a87eb7..92f3843 100644
--- a/configurations/fru_master.json
+++ b/configurations/fru_master.json
@@ -15,7 +15,6 @@
                         "xyz.openbmc_project.Inventory.Item.Bmc": 137,
                         "xyz.openbmc_project.Inventory.Item.Connector": 185,
                         "xyz.openbmc_project.Inventory.Item.PCIeSlot": 186,
-                        "xyz.openbmc_project.Inventory.Item.System": 11521,
-                        "xyz.openbmc_project.Inventory.Item.Tpm": 24576
+                        "xyz.openbmc_project.Inventory.Item.System": 11521
            }
 }
diff --git a/oem/ibm/libpldm/entity_oem_ibm.h b/oem/ibm/libpldm/entity_oem_ibm.h
index 636167b..dd80f56 100644
--- a/oem/ibm/libpldm/entity_oem_ibm.h
+++ b/oem/ibm/libpldm/entity_oem_ibm.h
@@ -6,6 +6,7 @@
 #endif
 
 enum pldm_oem_ibm_entity_id_codes {
+	PLDM_OEM_IBM_ENTITY_TPM = 24576,
 	PLDM_OEM_IBM_ENTITY_FIRMWARE_UPDATE = 24577,
 };
 
diff --git a/pldmtool/oem/ibm/oem_ibm_state_set.hpp b/pldmtool/oem/ibm/oem_ibm_state_set.hpp
index 25045b5..d69e2fc 100644
--- a/pldmtool/oem/ibm/oem_ibm_state_set.hpp
+++ b/pldmtool/oem/ibm/oem_ibm_state_set.hpp
@@ -3,15 +3,6 @@
 #include <libpldm/entity.h>
 #include <libpldm/entity_oem_ibm.h>
 
-/** @brief PLDM OEM State Set range as per DSP0249_1.1.0 specification
- */
-enum pldm_oem_state_set_id_codes
-{
-    PLDM_OEM_STATE_SET_START = 32768,
-    PLDM_OEM_STATE_SET_END = 65535,
-
-};
-
 /** @brief PLDM OEM IBM Code Update possible state set values
  */
 enum pldm_oem_ibm_cu_state_set_values
@@ -53,9 +44,7 @@
  */
 extern const std::map<uint8_t, std::string> OemIBMEntityType{
     {PLDM_OEM_IBM_ENTITY_FIRMWARE_UPDATE, "OEM IBM Firmware Update"},
-    {PLDM_OEM_ENTITY_TYPE_START, "OEM IBM Entity Type Start"},
-    {PLDM_OEM_ENTITY_TYPE_END, "OEM IBM Entity Type End"},
-};
+    {PLDM_OEM_IBM_ENTITY_TPM, "OEM IBM Trusted Platform Module"}};
 
 /** @brief Map for PLDM OEM IBM State Sets
  */