diff --git a/oem/ibm/libpldmresponder/oem_ibm_handler.cpp b/oem/ibm/libpldmresponder/oem_ibm_handler.cpp
index 4a0c8c6..582a3df 100644
--- a/oem/ibm/libpldmresponder/oem_ibm_handler.cpp
+++ b/oem/ibm/libpldmresponder/oem_ibm_handler.cpp
@@ -172,7 +172,7 @@
     pdr->hdr.type = PLDM_STATE_EFFECTER_PDR;
     pdr->hdr.record_change_num = 0;
     pdr->hdr.length = sizeof(pldm_state_effecter_pdr) - sizeof(pldm_pdr_hdr);
-    pdr->terminus_handle = pdr::BmcPldmTerminusHandle;
+    pdr->terminus_handle = TERMINUS_HANDLE;
     pdr->effecter_id = platformHandler->getNextEffecterId();
     pdr->entity_type = entityType;
     pdr->entity_instance = entityInstance;
@@ -223,7 +223,7 @@
     pdr->hdr.type = PLDM_STATE_SENSOR_PDR;
     pdr->hdr.record_change_num = 0;
     pdr->hdr.length = sizeof(pldm_state_sensor_pdr) - sizeof(pldm_pdr_hdr);
-    pdr->terminus_handle = pdr::BmcPldmTerminusHandle;
+    pdr->terminus_handle = TERMINUS_HANDLE;
     pdr->sensor_id = platformHandler->getNextSensorId();
     pdr->entity_type = entityType;
     pdr->entity_instance = entityInstance;
diff --git a/oem/ibm/test/libpldmresponder_oem_platform_test.cpp b/oem/ibm/test/libpldmresponder_oem_platform_test.cpp
index b2eec24..d124a39 100644
--- a/oem/ibm/test/libpldmresponder_oem_platform_test.cpp
+++ b/oem/ibm/test/libpldmresponder_oem_platform_test.cpp
@@ -213,7 +213,7 @@
     ASSERT_EQ(pdr->hdr.type, PLDM_STATE_EFFECTER_PDR);
     ASSERT_EQ(pdr->hdr.record_change_num, 0);
     ASSERT_EQ(pdr->hdr.length, 16);
-    ASSERT_EQ(pdr->terminus_handle, BmcPldmTerminusHandle);
+    ASSERT_EQ(pdr->terminus_handle, TERMINUS_HANDLE);
     ASSERT_EQ(pdr->entity_type, PLDM_OEM_IBM_ENTITY_FIRMWARE_UPDATE);
     ASSERT_EQ(pdr->entity_instance, 0);
     ASSERT_EQ(pdr->container_id, 0);
@@ -240,7 +240,7 @@
     ASSERT_EQ(pdr->hdr.type, PLDM_STATE_EFFECTER_PDR);
     ASSERT_EQ(pdr->hdr.record_change_num, 0);
     ASSERT_EQ(pdr->hdr.length, 16);
-    ASSERT_EQ(pdr->terminus_handle, BmcPldmTerminusHandle);
+    ASSERT_EQ(pdr->terminus_handle, TERMINUS_HANDLE);
     ASSERT_EQ(pdr->entity_type, PLDM_OEM_IBM_ENTITY_FIRMWARE_UPDATE);
     ASSERT_EQ(pdr->entity_instance, 1);
     ASSERT_EQ(pdr->container_id, 0);
@@ -267,7 +267,7 @@
     ASSERT_EQ(pdr->hdr.type, PLDM_STATE_EFFECTER_PDR);
     ASSERT_EQ(pdr->hdr.record_change_num, 0);
     ASSERT_EQ(pdr->hdr.length, 16);
-    ASSERT_EQ(pdr->terminus_handle, BmcPldmTerminusHandle);
+    ASSERT_EQ(pdr->terminus_handle, TERMINUS_HANDLE);
     ASSERT_EQ(pdr->entity_type, PLDM_OEM_IBM_ENTITY_FIRMWARE_UPDATE);
     ASSERT_EQ(pdr->entity_instance, 0);
     ASSERT_EQ(pdr->container_id, 0);
@@ -318,7 +318,7 @@
     ASSERT_EQ(pdr->hdr.type, PLDM_STATE_SENSOR_PDR);
     ASSERT_EQ(pdr->hdr.record_change_num, 0);
     ASSERT_EQ(pdr->hdr.length, 14);
-    ASSERT_EQ(pdr->terminus_handle, BmcPldmTerminusHandle);
+    ASSERT_EQ(pdr->terminus_handle, TERMINUS_HANDLE);
     ASSERT_EQ(pdr->entity_type, PLDM_OEM_IBM_ENTITY_FIRMWARE_UPDATE);
     ASSERT_EQ(pdr->entity_instance, 0);
     ASSERT_EQ(pdr->container_id, 0);
@@ -344,7 +344,7 @@
     ASSERT_EQ(pdr->hdr.type, PLDM_STATE_SENSOR_PDR);
     ASSERT_EQ(pdr->hdr.record_change_num, 0);
     ASSERT_EQ(pdr->hdr.length, 14);
-    ASSERT_EQ(pdr->terminus_handle, BmcPldmTerminusHandle);
+    ASSERT_EQ(pdr->terminus_handle, TERMINUS_HANDLE);
     ASSERT_EQ(pdr->entity_type, PLDM_OEM_IBM_ENTITY_FIRMWARE_UPDATE);
     ASSERT_EQ(pdr->entity_instance, 1);
     ASSERT_EQ(pdr->container_id, 0);
@@ -370,7 +370,7 @@
     ASSERT_EQ(pdr->hdr.type, PLDM_STATE_SENSOR_PDR);
     ASSERT_EQ(pdr->hdr.record_change_num, 0);
     ASSERT_EQ(pdr->hdr.length, 14);
-    ASSERT_EQ(pdr->terminus_handle, BmcPldmTerminusHandle);
+    ASSERT_EQ(pdr->terminus_handle, TERMINUS_HANDLE);
     ASSERT_EQ(pdr->entity_type, PLDM_OEM_IBM_ENTITY_FIRMWARE_UPDATE);
     ASSERT_EQ(pdr->entity_instance, 0);
     ASSERT_EQ(pdr->container_id, 0);