8 files changed, 10 insertions, 10 deletions
diff --git a/cpp/demo/Glacier/session/HelloSession.ice b/cpp/demo/Glacier/session/HelloSession.ice
index c1fc78774d3..b4c1723bd94 100644
--- a/cpp/demo/Glacier/session/HelloSession.ice
+++ b/cpp/demo/Glacier/session/HelloSession.ice
@@ -12,7 +12,7 @@
 
 #include <Glacier/Session.ice>
 
-interface HelloSession implements Glacier::Session
+interface HelloSession extends Glacier::Session
 {
     void hello();
 };
diff --git a/cpp/demo/Glacier2/callback/Callback.ice b/cpp/demo/Glacier2/callback/Callback.ice
index d275d358d91..6138731b5c0 100644
--- a/cpp/demo/Glacier2/callback/Callback.ice
+++ b/cpp/demo/Glacier2/callback/Callback.ice
@@ -10,12 +10,12 @@
 #ifndef CALLBACK_ICE
 #define CALLBACK_ICE
 
-class CallbackReceiver
+interface CallbackReceiver
 {
     void callback();
 };
 
-class Callback
+interface Callback
 {
     void initiateCallback(CallbackReceiver* proxy);
     void shutdown();
diff --git a/cpp/demo/Ice/callback/Callback.ice b/cpp/demo/Ice/callback/Callback.ice
index d275d358d91..6138731b5c0 100644
--- a/cpp/demo/Ice/callback/Callback.ice
+++ b/cpp/demo/Ice/callback/Callback.ice
@@ -10,12 +10,12 @@
 #ifndef CALLBACK_ICE
 #define CALLBACK_ICE
 
-class CallbackReceiver
+interface CallbackReceiver
 {
     void callback();
 };
 
-class Callback
+interface Callback
 {
     void initiateCallback(CallbackReceiver* proxy);
     void shutdown();
diff --git a/cpp/demo/Ice/hello/Hello.ice b/cpp/demo/Ice/hello/Hello.ice
index 10a98cc1ad3..9b532a2e9a8 100644
--- a/cpp/demo/Ice/hello/Hello.ice
+++ b/cpp/demo/Ice/hello/Hello.ice
@@ -10,7 +10,7 @@
 #ifndef HELLO_ICE
 #define HELLO_ICE
 
-class Hello
+interface Hello
 {
     nonmutating void sayHello();
     idempotent void shutdown();
diff --git a/cpp/demo/Ice/latency/Latency.ice b/cpp/demo/Ice/latency/Latency.ice
index 04c9673ec48..1343c63878c 100644
--- a/cpp/demo/Ice/latency/Latency.ice
+++ b/cpp/demo/Ice/latency/Latency.ice
@@ -10,7 +10,7 @@
 #ifndef LATENCY_ICE
 #define LATENCY_ICE
 
-class Ping
+interface Ping
 {
 };
 
diff --git a/cpp/demo/Ice/nested/Nested.ice b/cpp/demo/Ice/nested/Nested.ice
index aaa52fd6780..916d80d0a12 100644
--- a/cpp/demo/Ice/nested/Nested.ice
+++ b/cpp/demo/Ice/nested/Nested.ice
@@ -10,7 +10,7 @@
 #ifndef NESTED_ICE
 #define NESTED_ICE
 
-class Nested
+interface Nested
 {
     void nestedCall(int level, Nested* proxy);
 };
diff --git a/cpp/demo/IceBox/hello/Hello.ice b/cpp/demo/IceBox/hello/Hello.ice
index 0ae5c36e63f..f7344f0d112 100644
--- a/cpp/demo/IceBox/hello/Hello.ice
+++ b/cpp/demo/IceBox/hello/Hello.ice
@@ -10,7 +10,7 @@
 #ifndef HELLO_ICE
 #define HELLO_ICE
 
-class Hello
+interface Hello
 {
     void sayHello();
     void shutdown();
diff --git a/cpp/demo/IcePack/simple/Hello.ice b/cpp/demo/IcePack/simple/Hello.ice
index 10a98cc1ad3..9b532a2e9a8 100644
--- a/cpp/demo/IcePack/simple/Hello.ice
+++ b/cpp/demo/IcePack/simple/Hello.ice
@@ -10,7 +10,7 @@
 #ifndef HELLO_ICE
 #define HELLO_ICE
 
-class Hello
+interface Hello
 {
     nonmutating void sayHello();
     idempotent void shutdown();