diff --git a/libpldm/platform.h b/libpldm/platform.h
index be55d4f..546712d 100644
--- a/libpldm/platform.h
+++ b/libpldm/platform.h
@@ -73,29 +73,18 @@
 
 enum effecter_state { PLDM_INVALID_VALUE = 0xFF };
 
-enum sensor_operational_state {
-	ENABLED = 0x00,
-	DISABLED = 0x01,
-	UNAVAILABLE = 0x02,
-	STATUSUNKNOWN = 0x03,
-	FAILED = 0x04,
-	INITIALIZING = 0x05,
-	SHUTTINGDOWN = 0x06,
-	INTEST = 0x07
-};
-
-enum present_state {
-	UNKNOWN = 0x0,
-	NORMAL = 0x01,
-	WARNING = 0x02,
-	CRITICAL = 0x03,
-	FATAL = 0x04,
-	LOWERWARNING = 0x05,
-	LOWERCRITICAL = 0x06,
-	LOWERFATAL = 0x07,
-	UPPERWARNING = 0x08,
-	UPPERCRITICAL = 0x09,
-	UPPERFATAL = 0x0a
+enum pldm_sensor_present_state {
+	PLDM_SENSOR_UNKNOWN = 0x0,
+	PLDM_SENSOR_NORMAL = 0x01,
+	PLDM_SENSOR_WARNING = 0x02,
+	PLDM_SENSOR_CRITICAL = 0x03,
+	PLDM_SENSOR_FATAL = 0x04,
+	PLDM_SENSOR_LOWERWARNING = 0x05,
+	PLDM_SENSOR_LOWERCRITICAL = 0x06,
+	PLDM_SENSOR_LOWERFATAL = 0x07,
+	PLDM_SENSOR_UPPERWARNING = 0x08,
+	PLDM_SENSOR_UPPERCRITICAL = 0x09,
+	PLDM_SENSOR_UPPERFATAL = 0x0a
 };
 
 enum pldm_sensor_event_message_enable {
diff --git a/libpldm/tests/libpldm_platform_test.cpp b/libpldm/tests/libpldm_platform_test.cpp
index d19ebf5..992d74a 100644
--- a/libpldm/tests/libpldm_platform_test.cpp
+++ b/libpldm/tests/libpldm_platform_test.cpp
@@ -558,8 +558,10 @@
     uint8_t comp_sensorCnt = 0x2;
 
     std::array<get_sensor_state_field, 2> stateField{};
-    stateField[0] = {ENABLED, NORMAL, WARNING, UNKNOWN};
-    stateField[1] = {FAILED, UPPERFATAL, UPPERCRITICAL, FATAL};
+    stateField[0] = {PLDM_SENSOR_ENABLED, PLDM_SENSOR_NORMAL,
+                     PLDM_SENSOR_WARNING, PLDM_SENSOR_UNKNOWN};
+    stateField[1] = {PLDM_SENSOR_FAILED, PLDM_SENSOR_UPPERFATAL,
+                     PLDM_SENSOR_UPPERCRITICAL, PLDM_SENSOR_FATAL};
 
     auto rc = encode_get_state_sensor_readings_resp(
         0, PLDM_SUCCESS, comp_sensorCnt, stateField.data(), response);
@@ -598,8 +600,10 @@
     uint8_t comp_sensorCnt = 2;
 
     std::array<get_sensor_state_field, 2> stateField{};
-    stateField[0] = {DISABLED, UNKNOWN, UNKNOWN, UNKNOWN};
-    stateField[1] = {ENABLED, LOWERFATAL, LOWERCRITICAL, WARNING};
+    stateField[0] = {PLDM_SENSOR_DISABLED, PLDM_SENSOR_UNKNOWN,
+                     PLDM_SENSOR_UNKNOWN, PLDM_SENSOR_UNKNOWN};
+    stateField[1] = {PLDM_SENSOR_ENABLED, PLDM_SENSOR_LOWERFATAL,
+                     PLDM_SENSOR_LOWERCRITICAL, PLDM_SENSOR_WARNING};
 
     uint8_t retcompletion_code = 0;
     uint8_t retcomp_sensorCnt = 2;
@@ -648,7 +652,8 @@
     uint8_t comp_sensorCnt = 1;
 
     std::array<get_sensor_state_field, 1> stateField{};
-    stateField[0] = {ENABLED, UPPERFATAL, UPPERCRITICAL, WARNING};
+    stateField[0] = {PLDM_SENSOR_ENABLED, PLDM_SENSOR_UPPERFATAL,
+                     PLDM_SENSOR_UPPERCRITICAL, PLDM_SENSOR_WARNING};
 
     uint8_t retcompletion_code = 0;
     uint8_t retcomp_sensorCnt = 0;
@@ -1686,9 +1691,9 @@
     uint8_t sensor_dataSize = PLDM_EFFECTER_DATA_SIZE_UINT8;
     uint8_t sensor_operationalState = PLDM_SENSOR_ENABLED;
     uint8_t sensor_event_messageEnable = PLDM_NO_EVENT_GENERATION;
-    uint8_t presentState = NORMAL;
-    uint8_t previousState = WARNING;
-    uint8_t eventState = UPPERWARNING;
+    uint8_t presentState = PLDM_SENSOR_NORMAL;
+    uint8_t previousState = PLDM_SENSOR_WARNING;
+    uint8_t eventState = PLDM_SENSOR_UPPERWARNING;
     uint8_t presentReading = 0x21;
 
     auto rc = encode_get_sensor_reading_resp(
@@ -1751,9 +1756,9 @@
     uint8_t sensor_dataSize = PLDM_EFFECTER_DATA_SIZE_UINT32;
     uint8_t sensor_operationalState = PLDM_SENSOR_STATUSUNKOWN;
     uint8_t sensor_event_messageEnable = PLDM_EVENTS_ENABLED;
-    uint8_t presentState = CRITICAL;
-    uint8_t previousState = UPPERCRITICAL;
-    uint8_t eventState = WARNING;
+    uint8_t presentState = PLDM_SENSOR_CRITICAL;
+    uint8_t previousState = PLDM_SENSOR_UPPERCRITICAL;
+    uint8_t eventState = PLDM_SENSOR_WARNING;
     uint32_t presentReading = 0xABCDEF11;
 
     uint8_t retcompletionCode;
@@ -1813,11 +1818,11 @@
 
     uint8_t completionCode = 0;
     uint8_t sensor_dataSize = PLDM_EFFECTER_DATA_SIZE_UINT8;
-    uint8_t sensor_operationalState = INTEST;
+    uint8_t sensor_operationalState = PLDM_SENSOR_INTEST;
     uint8_t sensor_event_messageEnable = PLDM_EVENTS_DISABLED;
-    uint8_t presentState = FATAL;
-    uint8_t previousState = UPPERFATAL;
-    uint8_t eventState = WARNING;
+    uint8_t presentState = PLDM_SENSOR_FATAL;
+    uint8_t previousState = PLDM_SENSOR_UPPERFATAL;
+    uint8_t eventState = PLDM_SENSOR_WARNING;
     uint8_t presentReading = 0xA;
 
     uint8_t retcompletionCode;