diff --git a/test/controller_mock.hpp b/test/controller_mock.hpp
index f1c9d56..63353a1 100644
--- a/test/controller_mock.hpp
+++ b/test/controller_mock.hpp
@@ -12,7 +12,7 @@
   public:
     virtual ~ControllerMock() = default;
 
-    ControllerMock(const std::string& id, PIDZone* owner) :
+    ControllerMock(const std::string& id, DbusPidZone* owner) :
         PIDController(id, owner)
     {}
 
diff --git a/test/pid_zone_unittest.cpp b/test/pid_zone_unittest.cpp
index d7ae9ec..97b7f10 100644
--- a/test/pid_zone_unittest.cpp
+++ b/test/pid_zone_unittest.cpp
@@ -56,8 +56,8 @@
     SetupDbusObject(&sdbus_mock_mode, defer, objPath, modeInterface, properties,
                     &d);
 
-    PIDZone p(zone, minThermalOutput, failSafePercent, m, bus_mock_mode,
-              objPath, defer);
+    DbusPidZone p(zone, minThermalOutput, failSafePercent, m, bus_mock_mode,
+                  objPath, defer);
     // Success.
 }
 
@@ -86,9 +86,9 @@
         SetupDbusObject(&sdbus_mock_mode, defer, objPath, modeInterface,
                         properties, &property_index);
 
-        zone =
-            std::make_unique<PIDZone>(zoneId, minThermalOutput, failSafePercent,
-                                      mgr, bus_mock_mode, objPath, defer);
+        zone = std::make_unique<DbusPidZone>(zoneId, minThermalOutput,
+                                             failSafePercent, mgr,
+                                             bus_mock_mode, objPath, defer);
     }
 
     // unused
@@ -105,7 +105,7 @@
     const char* objPath = "/path/";
     SensorManager mgr;
 
-    std::unique_ptr<PIDZone> zone;
+    std::unique_ptr<DbusPidZone> zone;
 };
 
 TEST_F(PidZoneTest, GetZoneId_ReturnsExpected)