diff --git a/pid/builder.cpp b/pid/builder.cpp
index 2faa1cc..1fbfbd4 100644
--- a/pid/builder.cpp
+++ b/pid/builder.cpp
@@ -36,8 +36,8 @@
 }
 
 std::unordered_map<int64_t, std::unique_ptr<PIDZone>>
-    buildZones(std::map<int64_t, PIDConf>& zonePids,
-               std::map<int64_t, struct ZoneConfig>& zoneConfigs,
+    buildZones(std::map<int64_t, conf::PIDConf>& zonePids,
+               std::map<int64_t, struct conf::ZoneConfig>& zoneConfigs,
                SensorManager& mgr, sdbusplus::bus::bus& modeControlBus)
 {
     std::unordered_map<int64_t, std::unique_ptr<PIDZone>> zones;
@@ -60,7 +60,7 @@
             throw std::runtime_error(err);
         }
 
-        const PIDConf& pidConfig = zi.second;
+        const conf::PIDConf& pidConfig = zi.second;
 
         auto zone = std::make_unique<PIDZone>(
             zoneId, zoneConf->second.minThermalOutput,
@@ -74,7 +74,7 @@
         {
             std::vector<std::string> inputs;
             std::string name = pit.first;
-            const struct ControllerInfo* info = &pit.second;
+            const struct conf::ControllerInfo* info = &pit.second;
 
             std::cerr << "PID name: " << name << "\n";