Index: source/ariba/overlay/modules/OverlayInterface.h
===================================================================
--- source/ariba/overlay/modules/OverlayInterface.h	(revision 2473)
+++ source/ariba/overlay/modules/OverlayInterface.h	(revision 3055)
@@ -40,12 +40,12 @@
 #define __OVERLAY_INTERFACE_H
 
+#include "ariba/CommunicationListener.h"
 #include "ariba/communication/EndpointDescriptor.h"
-#include "ariba/interface/ServiceInterface.h"
 #include "ariba/overlay/modules/OverlayStructureEvents.h"
 #include "ariba/utility/types/NodeID.h"
 #include "ariba/utility/types/ServiceID.h"
 
+using ariba::CommunicationListener;
 using ariba::communication::EndpointDescriptor;
-using ariba::interface::ServiceInterface;
 using ariba::overlay::OverlayStructureEvents;
 using ariba::utility::NodeID;
@@ -57,5 +57,5 @@
 class BaseOverlay;
 
-class OverlayInterface : public ServiceInterface {
+class OverlayInterface : public CommunicationListener {
 public:
 	OverlayInterface(
Index: source/ariba/overlay/modules/onehop/OneHop.h
===================================================================
--- source/ariba/overlay/modules/onehop/OneHop.h	(revision 2473)
+++ source/ariba/overlay/modules/onehop/OneHop.h	(revision 3055)
@@ -85,5 +85,5 @@
 
 	//
-	// see ServiceInterface.h and OverlayInterface.h
+	// see CommunicationListener.h and OverlayInterface.h
 	//