8 files changed, 8 insertions, 8 deletions
diff --git a/cpp/demo/IceGrid/allocate/Server.cpp b/cpp/demo/IceGrid/allocate/Server.cpp
index a2a578e2b5e..e18c25aa933 100644
--- a/cpp/demo/IceGrid/allocate/Server.cpp
+++ b/cpp/demo/IceGrid/allocate/Server.cpp
@@ -40,7 +40,7 @@ Server::run(int argc, char* argv[])
     Ice::PropertiesPtr properties = communicator()->getProperties();
     Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Hello");
     Ice::Identity id = communicator()->stringToIdentity(properties->getProperty("Identity"));
-    adapter->add(new HelloI(properties->getProperty("Ice.ServerId")), id);
+    adapter->add(new HelloI(properties->getProperty("Ice.ProgramName")), id);
     adapter->activate();
     communicator()->waitForShutdown();
     return EXIT_SUCCESS;
diff --git a/cpp/demo/IceGrid/replication/Server.cpp b/cpp/demo/IceGrid/replication/Server.cpp
index a2a578e2b5e..e18c25aa933 100644
--- a/cpp/demo/IceGrid/replication/Server.cpp
+++ b/cpp/demo/IceGrid/replication/Server.cpp
@@ -40,7 +40,7 @@ Server::run(int argc, char* argv[])
     Ice::PropertiesPtr properties = communicator()->getProperties();
     Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Hello");
     Ice::Identity id = communicator()->stringToIdentity(properties->getProperty("Identity"));
-    adapter->add(new HelloI(properties->getProperty("Ice.ServerId")), id);
+    adapter->add(new HelloI(properties->getProperty("Ice.ProgramName")), id);
     adapter->activate();
     communicator()->waitForShutdown();
     return EXIT_SUCCESS;
diff --git a/cpp/demo/IceGrid/sessionActivation/Server.cpp b/cpp/demo/IceGrid/sessionActivation/Server.cpp
index a2a578e2b5e..e18c25aa933 100644
--- a/cpp/demo/IceGrid/sessionActivation/Server.cpp
+++ b/cpp/demo/IceGrid/sessionActivation/Server.cpp
@@ -40,7 +40,7 @@ Server::run(int argc, char* argv[])
     Ice::PropertiesPtr properties = communicator()->getProperties();
     Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Hello");
     Ice::Identity id = communicator()->stringToIdentity(properties->getProperty("Identity"));
-    adapter->add(new HelloI(properties->getProperty("Ice.ServerId")), id);
+    adapter->add(new HelloI(properties->getProperty("Ice.ProgramName")), id);
     adapter->activate();
     communicator()->waitForShutdown();
     return EXIT_SUCCESS;
diff --git a/cpp/demo/IceGrid/simple/Server.cpp b/cpp/demo/IceGrid/simple/Server.cpp
index a2a578e2b5e..e18c25aa933 100644
--- a/cpp/demo/IceGrid/simple/Server.cpp
+++ b/cpp/demo/IceGrid/simple/Server.cpp
@@ -40,7 +40,7 @@ Server::run(int argc, char* argv[])
     Ice::PropertiesPtr properties = communicator()->getProperties();
     Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Hello");
     Ice::Identity id = communicator()->stringToIdentity(properties->getProperty("Identity"));
-    adapter->add(new HelloI(properties->getProperty("Ice.ServerId")), id);
+    adapter->add(new HelloI(properties->getProperty("Ice.ProgramName")), id);
     adapter->activate();
     communicator()->waitForShutdown();
     return EXIT_SUCCESS;
diff --git a/cs/demo/IceGrid/simple/Server.cs b/cs/demo/IceGrid/simple/Server.cs
index 3d51776c79b..9d12542bc67 100644
--- a/cs/demo/IceGrid/simple/Server.cs
+++ b/cs/demo/IceGrid/simple/Server.cs
@@ -20,7 +20,7 @@ public class Server : Ice.Application
         Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Hello");
         Ice.Properties properties = communicator().getProperties();
         Ice.Identity id = communicator().stringToIdentity(properties.getProperty("Identity"));
-        adapter.add(new HelloI(properties.getProperty("Ice.ServerId")), id);
+        adapter.add(new HelloI(properties.getProperty("Ice.ProgramName")), id);
         adapter.activate();
         communicator().waitForShutdown();
         return 0;
diff --git a/java/demo/IceGrid/simple/Server.java b/java/demo/IceGrid/simple/Server.java
index b7b67e2388c..1329cba8383 100644
--- a/java/demo/IceGrid/simple/Server.java
+++ b/java/demo/IceGrid/simple/Server.java
@@ -21,7 +21,7 @@ public class Server extends Ice.Application
         Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Hello");
         Ice.Properties properties = communicator().getProperties();
         Ice.Identity id = communicator().stringToIdentity(properties.getProperty("Identity"));
-        adapter.add(new HelloI(properties.getProperty("Ice.ServerId")), id);
+        adapter.add(new HelloI(properties.getProperty("Ice.ProgramName")), id);
         adapter.activate();
         communicator().waitForShutdown();
         return 0;
diff --git a/py/demo/IceGrid/simple/Server.py b/py/demo/IceGrid/simple/Server.py
index 908e3d9783c..5bd8140b97d 100644
--- a/py/demo/IceGrid/simple/Server.py
+++ b/py/demo/IceGrid/simple/Server.py
@@ -33,7 +33,7 @@ class Server(Ice.Application):
         properties = self.communicator().getProperties()
         adapter = self.communicator().createObjectAdapter("Hello")
         id = self.communicator().stringToIdentity(properties.getProperty("Identity"))
-        adapter.add(HelloI(properties.getProperty("Ice.ServerId")), id)
+        adapter.add(HelloI(properties.getProperty("Ice.ProgramName")), id)
         adapter.activate()
         self.communicator().waitForShutdown()
         return 0
diff --git a/vb/demo/IceGrid/simple/Server.vb b/vb/demo/IceGrid/simple/Server.vb
index eae42b3f1f3..061effb65ce 100755
--- a/vb/demo/IceGrid/simple/Server.vb
+++ b/vb/demo/IceGrid/simple/Server.vb
@@ -16,7 +16,7 @@ Module SimpleIceGridS
             Dim adapter As Ice.ObjectAdapter = communicator().createObjectAdapter("Hello")
             Dim properties As Ice.Properties = communicator().getProperties()
             Dim id As Ice.Identity = communicator().stringToIdentity(properties.getProperty("Identity"))
-            adapter.add(New HelloI(properties.getProperty("Ice.ServerId")), id)
+            adapter.add(New HelloI(properties.getProperty("Ice.ProgramName")), id)
             adapter.activate()
             communicator.waitForShutdown()
             Return 0