diff --git a/pid/builderconfig.cpp b/pid/builderconfig.cpp
index c72ef9e..4909713 100644
--- a/pid/builderconfig.cpp
+++ b/pid/builderconfig.cpp
@@ -35,7 +35,7 @@
     // zone -> pids
     std::map<int64_t, PIDConf> pidConfig;
     // zone -> configs
-    std::map<int64_t, struct zone> zoneConfig;
+    std::map<int64_t, struct ZoneConfig> zoneConfig;
 
     std::cerr << "entered BuildZonesFromConfig\n";
 
@@ -72,7 +72,7 @@
 
             int id;
             PIDConf thisZone;
-            struct zone thisZoneConfig;
+            struct ZoneConfig thisZoneConfig;
 
             zoneSettings.lookupValue("id", id);
 
@@ -88,7 +88,7 @@
                 const Setting& pid = pids[j];
 
                 std::string name;
-                controller_info info;
+                struct ControllerInfo info;
 
                 /*
                  * Mysteriously if you use lookupValue on these, and the type