diff --git a/src/bmccontrolservices.cpp b/src/bmccontrolservices.cpp
index 8386899..159df91 100644
--- a/src/bmccontrolservices.cpp
+++ b/src/bmccontrolservices.cpp
@@ -201,15 +201,16 @@
 
 void register_netfn_bmc_control_functions()
 {
-    ipmi::registerHandler(ipmi::prioOpenBmcBase, netfnIntcOEMGeneral,
-                          static_cast<ipmi_cmd_t>(
-                              IPMINetFnIntelOemGeneralCmds::controlBmcServices),
-                          ipmi::Privilege::Admin, setBmcControlServices);
+    ipmi::registerHandler(
+        ipmi::prioOpenBmcBase, netfnIntcOEMGeneral,
+        static_cast<ipmi::Cmd>(
+            IPMINetfnIntelOEMGeneralCmd::cmdControlBmcServices),
+        ipmi::Privilege::Admin, setBmcControlServices);
 
     ipmi::registerHandler(
         ipmi::prioOpenBmcBase, netfnIntcOEMGeneral,
-        static_cast<ipmi_cmd_t>(
-            IPMINetFnIntelOemGeneralCmds::getBmcServiceStatus),
+        static_cast<ipmi::Cmd>(
+            IPMINetfnIntelOEMGeneralCmd::cmdGetBmcServiceStatus),
         ipmi::Privilege::User, getBmcControlServices);
 }
 } // namespace ipmi
diff --git a/src/manufacturingcommands.cpp b/src/manufacturingcommands.cpp
index 1bbe14c..50c91b9 100644
--- a/src/manufacturingcommands.cpp
+++ b/src/manufacturingcommands.cpp
@@ -595,12 +595,12 @@
     // <Get SM Signal>
     ipmi::registerHandler(
         ipmi::prioOemBase, ipmi::netFnOemOne,
-        static_cast<ipmi::Cmd>(IPMINetFnIntelOemGeneralCmds::GetSmSignal),
+        static_cast<ipmi::Cmd>(IPMINetfnIntelOEMGeneralCmd::cmdGetSmSignal),
         ipmi::Privilege::Admin, ipmi::appMTMGetSignal);
 
     ipmi::registerHandler(
         ipmi::prioOemBase, ipmi::netFnOemOne,
-        static_cast<ipmi::Cmd>(IPMINetFnIntelOemGeneralCmds::SetSmSignal),
+        static_cast<ipmi::Cmd>(IPMINetfnIntelOEMGeneralCmd::cmdSetSmSignal),
         ipmi::Privilege::Admin, ipmi::appMTMSetSignal);
 
     ipmi::registerHandler(