diff --git a/dbus-sdr/sdrutils.cpp b/dbus-sdr/sdrutils.cpp
index 9523593..7bfa1ed 100644
--- a/dbus-sdr/sdrutils.cpp
+++ b/dbus-sdr/sdrutils.cpp
@@ -50,7 +50,7 @@
                                      SensorEventTypeCodes::threshold)},
          {"fan_pwm", std::make_pair(SensorTypeCodes::fan,
                                     SensorEventTypeCodes::threshold)},
-         {"intrusion", std::make_pair(SensorTypeCodes::physical_security,
+         {"intrusion", std::make_pair(SensorTypeCodes::physicalSecurity,
                                       SensorEventTypeCodes::sensorSpecified)},
          {"processor", std::make_pair(SensorTypeCodes::processor,
                                       SensorEventTypeCodes::sensorSpecified)},
@@ -58,7 +58,7 @@
                                   SensorEventTypeCodes::threshold)},
          {"memory", std::make_pair(SensorTypeCodes::memory,
                                    SensorEventTypeCodes::sensorSpecified)},
-         {"state", std::make_pair(SensorTypeCodes::power_unit,
+         {"state", std::make_pair(SensorTypeCodes::powerUnit,
                                   SensorEventTypeCodes::sensorSpecified)},
          {"buttons", std::make_pair(SensorTypeCodes::buttons,
                                     SensorEventTypeCodes::sensorSpecified)},
diff --git a/dbus-sdr/sensorcommands.cpp b/dbus-sdr/sensorcommands.cpp
index 816c9b2..9f33dcd 100644
--- a/dbus-sdr/sensorcommands.cpp
+++ b/dbus-sdr/sensorcommands.cpp
@@ -363,10 +363,10 @@
             "/xyz/openbmc_project/sensors",
             "/xyz/openbmc_project/vr",
         };
-        constexpr size_t num_paths = sizeof(paths) / sizeof(paths[0]);
+        constexpr size_t numPaths = sizeof(paths) / sizeof(paths[0]);
         ObjectValueTree allManagedObjects;
 
-        for (size_t i = 0; i < num_paths; i++)
+        for (size_t i = 0; i < numPaths; i++)
         {
             ObjectValueTree managedObjects;
             boost::system::error_code ec = getManagedObjects(
@@ -2086,8 +2086,8 @@
     // sensor path. This is because VR control is allocated in an independent
     // path(/xyz/openbmc_project/vr/profile/...) which is not categorized by
     // types.
-    static constexpr const uint8_t module_board_type = 0x15;
-    record.body.sensor_type = module_board_type;
+    static constexpr const uint8_t moduleBoardType = 0x15;
+    record.body.sensor_type = moduleBoardType;
     record.body.event_reading_type = 0x00;
 
     record.body.sensor_record_sharing_1 = 0x00;
diff --git a/include/dbus-sdr/sdrutils.hpp b/include/dbus-sdr/sdrutils.hpp
index b52351d..dcbaf59 100644
--- a/include/dbus-sdr/sdrutils.hpp
+++ b/include/dbus-sdr/sdrutils.hpp
@@ -308,9 +308,9 @@
     voltage = 0x02,
     current = 0x03,
     fan = 0x04,
-    physical_security = 0x5,
+    physicalSecurity = 0x5,
     processor = 0x07,
-    power_unit = 0x09,
+    powerUnit = 0x09,
     other = 0x0b,
     memory = 0x0c,
     buttons = 0x14,