diff --git a/examples/echo/echo-client.h b/examples/echo/echo-client.h
index abfb620..54401ec 100644
--- a/examples/echo/echo-client.h
+++ b/examples/echo/echo-client.h
@@ -5,7 +5,7 @@
 #include "echo-client-glue.h"
 
 class EchoClient
-: public org::freedesktop::DBus::EchoDemo,
+: public org::freedesktop::DBus::EchoDemo_proxy,
   public DBus::IntrospectableProxy,
   public DBus::ObjectProxy
 {
diff --git a/examples/echo/echo-server.h b/examples/echo/echo-server.h
index 94d597e..3f0be58 100644
--- a/examples/echo/echo-server.h
+++ b/examples/echo/echo-server.h
@@ -5,7 +5,7 @@
 #include "echo-server-glue.h"
 
 class EchoServer
-: public org::freedesktop::DBus::EchoDemo,
+: public org::freedesktop::DBus::EchoDemo_adaptor,
   public DBus::IntrospectableAdaptor,
   public DBus::ObjectAdaptor
 {
diff --git a/examples/properties/props-server.h b/examples/properties/props-server.h
index cf9ba83..574ec40 100644
--- a/examples/properties/props-server.h
+++ b/examples/properties/props-server.h
@@ -5,7 +5,7 @@
 #include "props-glue.h"
 
 class PropsServer
-: public org::freedesktop::DBus::PropsDemo,
+: public org::freedesktop::DBus::PropsDemo_adaptor,
   public DBus::IntrospectableAdaptor,
   public DBus::PropertiesAdaptor,
   public DBus::ObjectAdaptor