diff --git a/system_state.h b/system_state.h
index 21aeabd..65d4e48 100644
--- a/system_state.h
+++ b/system_state.h
@@ -25,7 +25,7 @@
 // any circular references in header file inclusion. Hence forward-declaring
 // the required classes.
 class ClockInterface;
-class ConnectionManager;
+class ConnectionManagerInterface;
 class GpioHandler;
 class HardwareInterface;
 class OmahaRequestParams;
@@ -54,7 +54,7 @@
   virtual ClockInterface* clock() = 0;
 
   // Gets the connection manager object.
-  virtual ConnectionManager* connection_manager() = 0;
+  virtual ConnectionManagerInterface* connection_manager() = 0;
 
   // Gets the hardware interface object.
   virtual HardwareInterface* hardware() = 0;