16 files changed, 19 insertions, 19 deletions
diff --git a/py/demo/Glacier2/callback/config.client b/py/demo/Glacier2/callback/config.client
index b5b1b6d19a0..80783ab4894 100644
--- a/py/demo/Glacier2/callback/config.client
+++ b/py/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/py/demo/Glacier2/callback/config.glacier2 b/py/demo/Glacier2/callback/config.glacier2
index cde23b9a94e..f4e6b214d14 100644
--- a/py/demo/Glacier2/callback/config.glacier2
+++ b/py/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/py/demo/Glacier2/callback/config.server b/py/demo/Glacier2/callback/config.server
index 78e95043136..033b969d997 100644
--- a/py/demo/Glacier2/callback/config.server
+++ b/py/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/py/demo/Glacier2/callback/config.sessionserver b/py/demo/Glacier2/callback/config.sessionserver
index 864d6bd5720..3662d7fcea7 100644
--- a/py/demo/Glacier2/callback/config.sessionserver
+++ b/py/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/py/demo/Ice/async/config.server b/py/demo/Ice/async/config.server
index fd72066f5a5..c7d7b368b1b 100644
--- a/py/demo/Ice/async/config.server
+++ b/py/demo/Ice/async/config.server
@@ -3,7 +3,7 @@
 # "Queue". The following line sets the endpoints for this
 # adapter.
 #
-Queue.Endpoints=tcp -p 10000
+Ice.OA.Queue.Endpoints=tcp -p 10000
 
 #
 # Warn about connection exceptions
diff --git a/py/demo/Ice/bidir/config.server b/py/demo/Ice/bidir/config.server
index c36f2405d66..e81cb4a8e39 100644
--- a/py/demo/Ice/bidir/config.server
+++ b/py/demo/Ice/bidir/config.server
@@ -1,4 +1,4 @@
-Callback.Server.Endpoints=tcp -p 10000
+Ice.OA.Callback.Server.Endpoints=tcp -p 10000
 
 #
 # Warn about connection exceptions
diff --git a/py/demo/Ice/callback/config.client b/py/demo/Ice/callback/config.client
index a4b00fb2984..95caf8d3eae 100644
--- a/py/demo/Ice/callback/config.client
+++ b/py/demo/Ice/callback/config.client
@@ -1,5 +1,5 @@
 Callback.Client.CallbackServer=callback:tcp -p 10000:udp -p 10000:ssl -p 10001
-Callback.Client.Endpoints=tcp:udp:ssl
+Ice.OA.Callback.Client.Endpoints=tcp:udp:ssl
 
 #
 # Warn about connection exceptions
diff --git a/py/demo/Ice/callback/config.server b/py/demo/Ice/callback/config.server
index deaef3f87de..795a07e8f27 100644
--- a/py/demo/Ice/callback/config.server
+++ b/py/demo/Ice/callback/config.server
@@ -1,4 +1,4 @@
-Callback.Server.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
+Ice.OA.Callback.Server.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
 
 #
 # Warn about connection exceptions
diff --git a/py/demo/Ice/hello/config.server b/py/demo/Ice/hello/config.server
index bb2040f2cdc..aeff24452ac 100644
--- a/py/demo/Ice/hello/config.server
+++ b/py/demo/Ice/hello/config.server
@@ -3,7 +3,7 @@
 # "Hello". The following line sets the endpoints for this
 # adapter.
 #
-Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
+Ice.OA.Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
 
 #
 # Warn about connection exceptions
diff --git a/py/demo/Ice/latency/config.server b/py/demo/Ice/latency/config.server
index f79409c7738..449847f90e6 100644
--- a/py/demo/Ice/latency/config.server
+++ b/py/demo/Ice/latency/config.server
@@ -1,4 +1,4 @@
-Latency.Endpoints=default -p 10000 -h 127.0.0.1
+Ice.OA.Latency.Endpoints=default -p 10000 -h 127.0.0.1
 
 #Ice.Plugin.IceSSL=IceSSL:createIceSSL
 IceSSL.DefaultDir=../../../certs
diff --git a/py/demo/Ice/session/config.server b/py/demo/Ice/session/config.server
index 8aa8dfac36f..2731a988e56 100644
--- a/py/demo/Ice/session/config.server
+++ b/py/demo/Ice/session/config.server
@@ -3,7 +3,7 @@
 # "SessionFactory". The following line sets the endpoints for this
 # adapter.
 #
-SessionFactory.Endpoints=default -p 10000
+Ice.OA.SessionFactory.Endpoints=default -p 10000
 
 #
 # Warn about connection exceptions
diff --git a/py/demo/Ice/throughput/config.server b/py/demo/Ice/throughput/config.server
index ddae4a1a27a..3b9fd7e7c6f 100644
--- a/py/demo/Ice/throughput/config.server
+++ b/py/demo/Ice/throughput/config.server
@@ -1,4 +1,4 @@
-Throughput.Endpoints=default -p 10000 -h 127.0.0.1
+Ice.OA.Throughput.Endpoints=default -p 10000 -h 127.0.0.1
 
 #Ice.Plugin.IceSSL=IceSSL:createIceSSL
 IceSSL.DefaultDir=../../../certs
diff --git a/py/demo/Ice/value/config.server b/py/demo/Ice/value/config.server
index 8f2cf355ffc..52e81b9e331 100644
--- a/py/demo/Ice/value/config.server
+++ b/py/demo/Ice/value/config.server
@@ -1 +1 @@
-Value.Endpoints=default -p 10000
+Ice.OA.Value.Endpoints=default -p 10000
diff --git a/py/demo/IceStorm/clock/config.icebox b/py/demo/IceStorm/clock/config.icebox
index 07fb2e3cb6c..cd05e35ff37 100644
--- a/py/demo/IceStorm/clock/config.icebox
+++ b/py/demo/IceStorm/clock/config.icebox
@@ -1,7 +1,7 @@
 #
 # The IceBox server endpoint configuration
 #
-IceBox.ServiceManager.Endpoints=tcp -p 9998
+Ice.OA.IceBox.ServiceManager.Endpoints=tcp -p 9998
 
 #
 # The IceStorm service
diff --git a/py/demo/IceStorm/clock/config.service b/py/demo/IceStorm/clock/config.service
index 539369861b0..4f1edc9ad3f 100644
--- a/py/demo/IceStorm/clock/config.service
+++ b/py/demo/IceStorm/clock/config.service
@@ -7,7 +7,7 @@ IceStorm.TopicManager.Proxy=DemoIceStorm/TopicManager:default -p 10000
 # This property defines the endpoints on which the IceStorm
 # TopicManager listens.
 #
-IceStorm.TopicManager.Endpoints=default -p 10000
+Ice.OA.IceStorm.TopicManager.Endpoints=default -p 10000
 
 #
 # The IceStorm service instance name.
@@ -20,7 +20,7 @@ IceStorm.InstanceName=DemoIceStorm
 # IceStorm instances this must run on a fixed port (or use
 # IceGrid).
 #
-IceStorm.Publish.Endpoints=default -p 10001
+Ice.OA.IceStorm.Publish.Endpoints=default -p 10001
 
 #
 # TopicManager Tracing
diff --git a/py/demo/IceStorm/clock/config.sub b/py/demo/IceStorm/clock/config.sub
index d383e34e641..cb6b50d94f0 100644
--- a/py/demo/IceStorm/clock/config.sub
+++ b/py/demo/IceStorm/clock/config.sub
@@ -2,7 +2,7 @@
 # This property is used to configure the endpoints of the clock
 # subscriber adapter.
 #
-Clock.Subscriber.Endpoints=tcp
+Ice.OA.Clock.Subscriber.Endpoints=tcp
 
 #
 # This property is used by the clients to connect to IceStorm.