diff --git a/include/oemcommands.hpp b/include/oemcommands.hpp
index 7486576..9020498 100644
--- a/include/oemcommands.hpp
+++ b/include/oemcommands.hpp
@@ -19,6 +19,8 @@
 #include <user_channel/user_layer.hpp>
 enum class IPMINetfnIntelOEMGeneralCmd
 {
+    cmdGetSmSignal = 0x14,
+    cmdSetSmSignal = 0x15,
     cmdSetBIOSID = 0x26,
     cmdGetOEMDeviceInfo = 0x27,
     cmdSetColdRedundancyConfig = 0x2d,
@@ -48,6 +50,8 @@
     cmdGetProcessorErrConfig = 0x9A,
     cmdSetProcessorErrConfig = 0x9B,
     cmdGetLEDStatus = 0xB0,
+    cmdControlBmcServices = 0xB1,
+    cmdGetBmcServiceStatus = 0xB2,
     cmdMtmKeepAlive = 0xB5,
     cmdGetNmiStatus = 0xE5,
     cmdSetNmiStatus = 0xED,
@@ -404,12 +408,3 @@
     MDRII_DATA_DONE = 0x3c,
     MDRII_SEND_DATA_BLOCK = 0x3d,
 };
-
-enum class IPMINetFnIntelOemGeneralCmds
-{
-    GetSmSignal = 0x14,
-    SetSmSignal = 0x15,
-    controlBmcServices = 0xB1,
-    getBmcServiceStatus = 0xB2,
-    SetSensorOverride = 0xEE,
-};
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(