13 files changed, 13 insertions, 13 deletions
diff --git a/java/demo/Ice/async/config.server b/java/demo/Ice/async/config.server
index fd72066f5a5..c7d7b368b1b 100644
--- a/java/demo/Ice/async/config.server
+++ b/java/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/java/demo/Ice/bidir/config.server b/java/demo/Ice/bidir/config.server
index 1e6ffd5e484..fa3219299a2 100755
--- a/java/demo/Ice/bidir/config.server
+++ b/java/demo/Ice/bidir/config.server
@@ -1,4 +1,4 @@
-Callback.Server.Endpoints=tcp -p 10000
+Ice.OA.Callback.Server.Endpoints=tcp -p 10000
 
 # Active connection management must be disabled when using
 # bidirectional connections.
diff --git a/java/demo/Ice/callback/config.client b/java/demo/Ice/callback/config.client
index 289b0bc9e6f..a3289d5e0b7 100644
--- a/java/demo/Ice/callback/config.client
+++ b/java/demo/Ice/callback/config.client
@@ -1,5 +1,5 @@
 Callback.Client.CallbackServer=callback:tcp -p 12000: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/java/demo/Ice/callback/config.server b/java/demo/Ice/callback/config.server
index 10d65a443ba..cf17b1509c2 100644
--- a/java/demo/Ice/callback/config.server
+++ b/java/demo/Ice/callback/config.server
@@ -1,4 +1,4 @@
-Callback.Server.Endpoints=tcp -p 12000:udp -p 10000:ssl -p 10001
+Ice.OA.Callback.Server.Endpoints=tcp -p 12000:udp -p 10000:ssl -p 10001
 
 #
 # Warn about connection exceptions
diff --git a/java/demo/Ice/hello/config.server b/java/demo/Ice/hello/config.server
index 665fc131088..907e2a13a55 100644
--- a/java/demo/Ice/hello/config.server
+++ b/java/demo/Ice/hello/config.server
@@ -3,7 +3,7 @@
 # "helloadapater". 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/java/demo/Ice/invoke/config.server b/java/demo/Ice/invoke/config.server
index 0978234e8c4..e925636df8d 100644
--- a/java/demo/Ice/invoke/config.server
+++ b/java/demo/Ice/invoke/config.server
@@ -3,7 +3,7 @@
 # "helloadapater". The following line sets the endpoints for this
 # adapter
 #
-Printer.Endpoints=default -p 10000
+Ice.OA.Printer.Endpoints=default -p 10000
 
 #
 # Warn about connection exceptions
diff --git a/java/demo/Ice/latency/config.server b/java/demo/Ice/latency/config.server
index 6d82f1a7f2e..33cbd33492e 100644
--- a/java/demo/Ice/latency/config.server
+++ b/java/demo/Ice/latency/config.server
@@ -1 +1 @@
-Latency.Endpoints=default -p 10000 -h 127.0.0.1
+Ice.OA.Latency.Endpoints=default -p 10000 -h 127.0.0.1
diff --git a/java/demo/Ice/nested/config.client b/java/demo/Ice/nested/config.client
index a895324d0b5..cc7b8c0a0fb 100644
--- a/java/demo/Ice/nested/config.client
+++ b/java/demo/Ice/nested/config.client
@@ -1,5 +1,5 @@
 Nested.Client.NestedServer=nestedServer:default -p 10000 -t 10000
-Nested.Client.Endpoints=default -t 10000
+Ice.OA.Nested.Client.Endpoints=default -t 10000
 
 Ice.ThreadPool.Server.Size=5
 Ice.ThreadPool.Server.SizeWarn=5
diff --git a/java/demo/Ice/nested/config.server b/java/demo/Ice/nested/config.server
index e0073284155..87c9057ed0d 100644
--- a/java/demo/Ice/nested/config.server
+++ b/java/demo/Ice/nested/config.server
@@ -1,4 +1,4 @@
-Nested.Server.Endpoints=default -p 10000 -t 10000
+Ice.OA.Nested.Server.Endpoints=default -p 10000 -t 10000
 
 Ice.ThreadPool.Server.Size=5
 Ice.ThreadPool.Server.SizeWarn=5
diff --git a/java/demo/Ice/session/config.server b/java/demo/Ice/session/config.server
index 8aa8dfac36f..2731a988e56 100644
--- a/java/demo/Ice/session/config.server
+++ b/java/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/java/demo/Ice/throughput/config.client b/java/demo/Ice/throughput/config.client
index 3391b2ff0bb..df84838f465 100644
--- a/java/demo/Ice/throughput/config.client
+++ b/java/demo/Ice/throughput/config.client
@@ -1,5 +1,5 @@
 Throughput.Throughput=throughput:default -p 10000 -h 127.0.0.1
-Throughput.Endpoints=default -p 10000
+Ice.OA.Throughput.Endpoints=default -p 10000
 
 Ice.ACM.Client=0
 Ice.ACM.Server=0
diff --git a/java/demo/Ice/throughput/config.server b/java/demo/Ice/throughput/config.server
index 3391b2ff0bb..df84838f465 100644
--- a/java/demo/Ice/throughput/config.server
+++ b/java/demo/Ice/throughput/config.server
@@ -1,5 +1,5 @@
 Throughput.Throughput=throughput:default -p 10000 -h 127.0.0.1
-Throughput.Endpoints=default -p 10000
+Ice.OA.Throughput.Endpoints=default -p 10000
 
 Ice.ACM.Client=0
 Ice.ACM.Server=0
diff --git a/java/demo/Ice/value/config.server b/java/demo/Ice/value/config.server
index 4d7f600e5d7..3c7afee33aa 100644
--- a/java/demo/Ice/value/config.server
+++ b/java/demo/Ice/value/config.server
@@ -1,4 +1,4 @@
-Value.Endpoints=default -p 10000
+Ice.OA.Value.Endpoints=default -p 10000
 
 #
 # SSL Configuration