9 files changed, 16 insertions, 16 deletions
diff --git a/cppe/test/IceE/exceptions/Collocated.cpp b/cppe/test/IceE/exceptions/Collocated.cpp
index bdb0458a70b..2322be95baa 100644
--- a/cppe/test/IceE/exceptions/Collocated.cpp
+++ b/cppe/test/IceE/exceptions/Collocated.cpp
@@ -29,7 +29,7 @@ public:
 	Ice::PropertiesPtr properties = Ice::createProperties();
 
 	properties->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
-        properties->setProperty("IceE.Warn.Dispatch", "0");
+        properties->setProperty("Ice.Warn.Dispatch", "0");
 
         loadConfig(properties);
         setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
diff --git a/cppe/test/IceE/exceptions/Server.cpp b/cppe/test/IceE/exceptions/Server.cpp
index f26d5a76cd8..465b0bb0096 100644
--- a/cppe/test/IceE/exceptions/Server.cpp
+++ b/cppe/test/IceE/exceptions/Server.cpp
@@ -26,7 +26,7 @@ public:
     run(int argc, char* argv[])
     {
 	Ice::PropertiesPtr properties = Ice::createProperties();
-        properties->setProperty("IceE.Warn.Dispatch", "0");
+        properties->setProperty("Ice.Warn.Dispatch", "0");
         properties->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
 
         loadConfig(properties);
diff --git a/cppe/test/IceE/faultTolerance/Client.cpp b/cppe/test/IceE/faultTolerance/Client.cpp
index c203d59f42d..45e5d24f350 100644
--- a/cppe/test/IceE/faultTolerance/Client.cpp
+++ b/cppe/test/IceE/faultTolerance/Client.cpp
@@ -38,7 +38,7 @@ public:
 	//
 	// This test aborts servers, so we don't want warnings.
 	//
-	properties->setProperty("IceE.Warn.Connections", "0");
+	properties->setProperty("Ice.Warn.Connections", "0");
 
         vector<int> ports;
         for(int i = 1; i < argc; ++i)
diff --git a/cppe/test/IceE/location/Client.cpp b/cppe/test/IceE/location/Client.cpp
index 83e48ae2a59..cc97c0f6b37 100644
--- a/cppe/test/IceE/location/Client.cpp
+++ b/cppe/test/IceE/location/Client.cpp
@@ -29,7 +29,7 @@ public:
     run(int argc, char* argv[])
     {
 	Ice::PropertiesPtr properties = Ice::createProperties();
-	properties->setProperty("IceE.Default.Locator", "locator:default -p 12345");
+	properties->setProperty("Ice.Default.Locator", "locator:default -p 12345");
 
         loadConfig(properties);
         setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
diff --git a/cppe/test/IceE/location/TestI.cpp b/cppe/test/IceE/location/TestI.cpp
index 3491ace7713..872c94debd9 100644
--- a/cppe/test/IceE/location/TestI.cpp
+++ b/cppe/test/IceE/location/TestI.cpp
@@ -32,7 +32,7 @@ ServerManagerI::startServer(const Ice::Current&)
     //
     // Simulate a server: create a new communicator and object
     // adapter. The object adapter is started on a system allocated
-    // port. The configuration used here contains the IceE.Locator
+    // port. The configuration used here contains the Ice.Locator
     // configuration variable. The new object adapter will register
     // its endpoints with the locator and create references containing
     // the adapter id instead of the endpoints.
diff --git a/cppe/test/IceE/operations/Client.cpp b/cppe/test/IceE/operations/Client.cpp
index 818a6287713..96f16bc27e3 100644
--- a/cppe/test/IceE/operations/Client.cpp
+++ b/cppe/test/IceE/operations/Client.cpp
@@ -29,12 +29,12 @@ public:
 	Ice::PropertiesPtr properties = Ice::createProperties();
 	//
 	// We must set MessageSizeMax to an explicit values, because
-	// we run tests to check whether IceE.MemoryLimitException is
+	// we run tests to check whether Ice.MemoryLimitException is
 	// raised as expected.
 	//
-	properties->setProperty("IceE.MessageSizeMax", "100");
-	//properties->setProperty("IceE.Trace.Network", "5");
-	//properties->setProperty("IceE.Trace.Protocol", "5");
+	properties->setProperty("Ice.MessageSizeMax", "100");
+	//properties->setProperty("Ice.Trace.Network", "5");
+	//properties->setProperty("Ice.Trace.Protocol", "5");
 	
 	loadConfig(properties);
 	setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
diff --git a/cppe/test/IceE/operations/Collocated.cpp b/cppe/test/IceE/operations/Collocated.cpp
index 0e4052540f4..7aa133f8b8e 100644
--- a/cppe/test/IceE/operations/Collocated.cpp
+++ b/cppe/test/IceE/operations/Collocated.cpp
@@ -30,13 +30,13 @@ public:
 
 	//
 	// We must set MessageSizeMax to an explicit values, because
-	// we run tests to check whether IceE.MemoryLimitException is
+	// we run tests to check whether Ice.MemoryLimitException is
 	// raised as expected.
 	//
-	properties->setProperty("IceE.MessageSizeMax", "100");
+	properties->setProperty("Ice.MessageSizeMax", "100");
 	properties->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
-	//properties->setProperty("IceE.Trace.Network", "5");
-	//properties->setProperty("IceE.Trace.Protocol", "5");
+	//properties->setProperty("Ice.Trace.Network", "5");
+	//properties->setProperty("Ice.Trace.Protocol", "5");
 
 	loadConfig(properties);
 	setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
diff --git a/cppe/test/IceE/operations/Server.cpp b/cppe/test/IceE/operations/Server.cpp
index 1f2ef9254a9..8d8c5fa6be2 100644
--- a/cppe/test/IceE/operations/Server.cpp
+++ b/cppe/test/IceE/operations/Server.cpp
@@ -29,8 +29,8 @@ public:
 	Ice::PropertiesPtr properties = Ice::createProperties();
 
 	properties->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
-	//properties->setProperty("IceE.Trace.Network", "5");
-	//properties->setProperty("IceE.Trace.Protocol", "5");
+	//properties->setProperty("Ice.Trace.Network", "5");
+	//properties->setProperty("Ice.Trace.Protocol", "5");
 
 	loadConfig(properties);
 	setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
diff --git a/cppe/test/IceE/slicing/Server.cpp b/cppe/test/IceE/slicing/Server.cpp
index 170fb362e92..9cfe03d688d 100644
--- a/cppe/test/IceE/slicing/Server.cpp
+++ b/cppe/test/IceE/slicing/Server.cpp
@@ -29,7 +29,7 @@ public:
         loadConfig(properties);
         setCommunicator(Ice::initializeWithProperties(argc, argv, properties));
 
-        properties->setProperty("IceE.Warn.Dispatch", "0");
+        properties->setProperty("Ice.Warn.Dispatch", "0");
         properties->setProperty("TestAdapter.Endpoints", "default -p 12345 -t 2000");
         Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
         Ice::ObjectPtr object = new TestI(adapter);