7 files changed, 11 insertions, 11 deletions
diff --git a/cpp/demo/Glacier2/callback/config.client b/cpp/demo/Glacier2/callback/config.client
index b5b1b6d19a0..80783ab4894 100644
--- a/cpp/demo/Glacier2/callback/config.client
+++ b/cpp/demo/Glacier2/callback/config.client
@@ -9,14 +9,14 @@ Ice.Default.Router=DemoGlacier2/router:ssl -p 10005 -h 127.0.0.1
 # object adapter named Callback.Client. This router proxy must
 # match the value of Glacier2.Client.Endpoints.
 #
-Callback.Client.Router=DemoGlacier2/router:ssl -p 10005 -h 127.0.0.1
+Ice.OA.Callback.Client.Router=DemoGlacier2/router:ssl -p 10005 -h 127.0.0.1
 
 #
 # We don't need any endpoints for the client if we use a
 # router. Incoming requests are received through connections
 # established from the client to the router.
 #
-Callback.Client.Endpoints=
+Ice.OA.Callback.Client.Endpoints=
 
 #
 # This must match the value of Callback.Server.Endpoints in
diff --git a/cpp/demo/Glacier2/callback/config.glacier2 b/cpp/demo/Glacier2/callback/config.glacier2
index cde23b9a94e..f4e6b214d14 100644
--- a/cpp/demo/Glacier2/callback/config.glacier2
+++ b/cpp/demo/Glacier2/callback/config.glacier2
@@ -18,7 +18,7 @@ Ice.ThreadPerConnection.StackSize=262144
 # The client-visible endpoint of Glacier2. This should be an endpoint
 # visible from the public Internet, and it should be secure.
 # 
-Glacier2.Client.Endpoints=ssl -p 10005 -h 127.0.0.1
+Ice.OA.Glacier2.Client.Endpoints=ssl -p 10005 -h 127.0.0.1
 
 #
 # The server-visible endpoint of Glacier2. This endpoint is only
@@ -27,7 +27,7 @@ Glacier2.Client.Endpoints=ssl -p 10005 -h 127.0.0.1
 # on the loopback, so that the server is not directly accessible from
 # the Internet.
 #
-Glacier2.Server.Endpoints=tcp -h 127.0.0.1
+Ice.OA.Glacier2.Server.Endpoints=tcp -h 127.0.0.1
 
 # 
 # The configures the session manager. If no external session manager
diff --git a/cpp/demo/Glacier2/callback/config.server b/cpp/demo/Glacier2/callback/config.server
index f79e0e891f7..5dafe9342dd 100644
--- a/cpp/demo/Glacier2/callback/config.server
+++ b/cpp/demo/Glacier2/callback/config.server
@@ -4,7 +4,7 @@
 # loopback, so that the server is not directly accessible from the
 # Internet.
 #
-Callback.Server.Endpoints=tcp -h 127.0.0.1 -p 10000
+Ice.OA.Callback.Server.Endpoints=tcp -h 127.0.0.1 -p 10000
 
 #
 # Warn about connection exceptions
diff --git a/cpp/demo/Glacier2/callback/config.sessionserver b/cpp/demo/Glacier2/callback/config.sessionserver
index d5329e88926..8bfd51c9b3f 100644
--- a/cpp/demo/Glacier2/callback/config.sessionserver
+++ b/cpp/demo/Glacier2/callback/config.sessionserver
@@ -4,7 +4,7 @@
 # loopback, so that the session server is not directly accessible from
 # the Internet.
 #
-SessionServer.Endpoints=tcp -h 127.0.0.1 -p 10001
+Ice.OA.SessionServer.Endpoints=tcp -h 127.0.0.1 -p 10001
 
 #
 # Warn about connection exceptions
diff --git a/cpp/demo/Glacier2/chat/config.client b/cpp/demo/Glacier2/chat/config.client
index 4edc4c3c42b..b5c3978cbcf 100644
--- a/cpp/demo/Glacier2/chat/config.client
+++ b/cpp/demo/Glacier2/chat/config.client
@@ -9,14 +9,14 @@ Ice.Default.Router=DemoGlacier2/router:ssl -p 10005 -h 127.0.0.1
 # object adapter named Chat.Client. This router proxy must
 # match the value of Glacier2.Client.Endpoints.
 #
-Chat.Client.Router=DemoGlacier2/router:ssl -p 10005 -h 127.0.0.1
+Ice.OA.Chat.Client.Router=DemoGlacier2/router:ssl -p 10005 -h 127.0.0.1
 
 #
 # We don't need any endpoints for the client if we use a
 # router. Incoming requests are received through connections
 # established from the client to the router.
 #
-Chat.Client.Endpoints=
+Ice.OA.Chat.Client.Endpoints=
 
 #
 # No active connection management is permitted with Glacier2.
diff --git a/cpp/demo/Glacier2/chat/config.glacier2 b/cpp/demo/Glacier2/chat/config.glacier2
index a29d4a25a0e..d35d2a53ff2 100644
--- a/cpp/demo/Glacier2/chat/config.glacier2
+++ b/cpp/demo/Glacier2/chat/config.glacier2
@@ -4,7 +4,7 @@ Glacier2.InstanceName=DemoGlacier2
 # The client-visible endpoint of Glacier2. This should be an endpoint
 # visible from the public Internet, and it should be secure.
 # 
-Glacier2.Client.Endpoints=ssl -p 10005 -h 127.0.0.1
+Ice.OA.Glacier2.Client.Endpoints=ssl -p 10005 -h 127.0.0.1
 
 #
 # The server-visible endpoint of Glacier2. This endpoint is only
@@ -13,7 +13,7 @@ Glacier2.Client.Endpoints=ssl -p 10005 -h 127.0.0.1
 # on the loopback, so that the server is not directly accessible from
 # the Internet.
 #
-Glacier2.Server.Endpoints=tcp -h 127.0.0.1
+Ice.OA.Glacier2.Server.Endpoints=tcp -h 127.0.0.1
 
 # 
 # The proxy of the session manager.
diff --git a/cpp/demo/Glacier2/chat/config.server b/cpp/demo/Glacier2/chat/config.server
index b77909532ea..21e486c5ffa 100644
--- a/cpp/demo/Glacier2/chat/config.server
+++ b/cpp/demo/Glacier2/chat/config.server
@@ -4,7 +4,7 @@
 # loopback, so that the session server is not directly accessible from
 # the Internet.
 #
-ChatServer.Endpoints=tcp -h 127.0.0.1 -p 10001
+Ice.OA.ChatServer.Endpoints=tcp -h 127.0.0.1 -p 10001
 
 #
 # Warn about connection exceptions