diff --git a/conf.hpp b/conf.hpp
index 01968cb..6e2dc32 100644
--- a/conf.hpp
+++ b/conf.hpp
@@ -10,7 +10,7 @@
 /*
  * General sensor structure used for configuration.
  */
-struct sensor
+struct SensorConfig
 {
     /* Used for listen if readpath is passive. */
     std::string type;
@@ -26,7 +26,7 @@
 /*
  * Structure for holding the configuration of a PID.
  */
-struct controller_info
+struct ControllerInfo
 {
     std::string type;                // fan or margin or temp?
     std::vector<std::string> inputs; // one or more sensors.
@@ -43,7 +43,7 @@
  * and a set of configuration settings.  This structure gets filled out with
  * the zone configuration settings and not the PID details.
  */
-struct zone
+struct ZoneConfig
 {
     /* The minimum RPM value we would ever want. */
     float minthermalrpm;
@@ -52,4 +52,4 @@
     float failsafepercent;
 };
 
-using PIDConf = std::map<std::string, struct controller_info>;
+using PIDConf = std::map<std::string, struct ControllerInfo>;