diff --git a/sensordatahandler.cpp b/sensordatahandler.cpp
index 2485071..05471b1 100644
--- a/sensordatahandler.cpp
+++ b/sensordatahandler.cpp
@@ -42,7 +42,7 @@
     {
         lg2::error("Error in D-Bus call: {ERROR}", "ERROR", e);
         commit<InternalFailure>();
-        return IPMI_CC_UNSPECIFIED_ERROR;
+        return ipmi::ccUnspecifiedError;
     }
     return ipmi::ccSuccess;
 }
@@ -212,7 +212,7 @@
         if (iter == std::get<OffsetValueMap>(property.second).end())
         {
             lg2::error("Invalid event data");
-            return IPMI_CC_PARM_OUT_OF_RANGE;
+            return ipmi::ccParmOutOfRange;
         }
         msg.append(iter->second.assert);
     }