Renamed properties back to Ice.

28 files changed, 81 insertions, 81 deletions

diff --git a/cppe/config/TestUtil.py b/cppe/config/TestUtil.py
index cfc77aa8bb2..8a1b7a6ffde 100644
--- a/cppe/config/TestUtil.py
+++ b/cppe/config/TestUtil.py
@@ -185,14 +185,14 @@ serverProtocol = ""
 clientServerProtocol = ""
 
 if host != "":
-    defaultHost = " --IceE.Default.Host=" + host
+    defaultHost = " --Ice.Default.Host=" + host
 else:
     defaultHost = ""
 
-commonClientOptions = " --IceE.NullHandleAbort --IceE.Warn.Connections"
+commonClientOptions = " --Ice.NullHandleAbort --Ice.Warn.Connections"
 
-commonServerOptions = " --IceE.PrintProcessId --IceE.PrintAdapterReady --IceE.NullHandleAbort" + \
-                      " --IceE.Warn.Connections"
+commonServerOptions = " --Ice.PrintProcessId --Ice.PrintAdapterReady --Ice.NullHandleAbort" + \
+                      " --Ice.Warn.Connections"
 
 clientOptions = clientProtocol + defaultHost + commonClientOptions
 serverOptions = serverProtocol + defaultHost + commonServerOptions
diff --git a/cppe/demo/IceE/MFC/client/config b/cppe/demo/IceE/MFC/client/config
index c639566f5ed..814c478cc87 100644
--- a/cppe/demo/IceE/MFC/client/config
+++ b/cppe/demo/IceE/MFC/client/config
@@ -7,7 +7,7 @@ Hello.Proxy=hello:tcp -p 10000
 #
 # Warn about connection exceptions
 #
-IceE.Warn.Connections=1
+Ice.Warn.Connections=1
 
 #
 # Network Tracing
@@ -17,7 +17,7 @@ IceE.Warn.Connections=1
 # 2 = like 1, but more detailed
 # 3 = like 2, but also trace data transfer
 #
-IceE.Trace.Network=0
+Ice.Trace.Network=0
 
 #
 # Protocol Tracing
@@ -25,4 +25,4 @@ IceE.Trace.Network=0
 # 0 = no protocol tracing
 # 1 = trace protocol messages
 #
-IceE.Trace.Protocol=0
+Ice.Trace.Protocol=0
diff --git a/cppe/demo/IceE/MFC/server/config b/cppe/demo/IceE/MFC/server/config
index 05c4fd39044..aea4c3e6fae 100644
--- a/cppe/demo/IceE/MFC/server/config
+++ b/cppe/demo/IceE/MFC/server/config
@@ -8,7 +8,7 @@ Hello.Endpoints=tcp -p 10000
 #
 # Warn about connection exceptions
 #
-IceE.Warn.Connections=1
+Ice.Warn.Connections=1
 
 #
 # 0 = no network tracing
@@ -16,7 +16,7 @@ IceE.Warn.Connections=1
 # 2 = like 1, but more detailed
 # 3 = like 2, but also trace data transfer
 #
-IceE.Trace.Network=1
+Ice.Trace.Network=1
 
 #
 # Protocol Tracing
@@ -24,4 +24,4 @@ IceE.Trace.Network=1
 # 0 = no protocol tracing
 # 1 = trace protocol messages
 #
-IceE.Trace.Protocol=0
+Ice.Trace.Protocol=0
diff --git a/cppe/demo/IceE/bidir/config b/cppe/demo/IceE/bidir/config
index 677117fa2eb..d194f5d3765 100644
--- a/cppe/demo/IceE/bidir/config
+++ b/cppe/demo/IceE/bidir/config
@@ -2,6 +2,6 @@ Callback.Client.CallbackServer=sender:tcp -p 10000
 Callback.Client.Endpoints=
 Callback.Server.Endpoints=tcp -p 10000
 
-#IceE.Trace.Network=1
-#IceE.Trace.Protocol=1
-IceE.Warn.Connections=1
+#Ice.Trace.Network=1
+#Ice.Trace.Protocol=1
+Ice.Warn.Connections=1
diff --git a/cppe/demo/IceE/callback/config b/cppe/demo/IceE/callback/config
index 37ced55978d..3b224be4236 100644
--- a/cppe/demo/IceE/callback/config
+++ b/cppe/demo/IceE/callback/config
@@ -2,6 +2,6 @@ Callback.Client.CallbackServer=callback:tcp -p 10000
 Callback.Client.Endpoints=tcp
 Callback.Server.Endpoints=tcp -p 10000
 
-#IceE.Trace.Network=1
-#IceE.Trace.Protocol=1
-IceE.Warn.Connections=1
+#Ice.Trace.Network=1
+#Ice.Trace.Protocol=1
+Ice.Warn.Connections=1
diff --git a/cppe/demo/IceE/chat/config b/cppe/demo/IceE/chat/config
index 49989b0bed5..5ae3d2bac21 100644
--- a/cppe/demo/IceE/chat/config
+++ b/cppe/demo/IceE/chat/config
@@ -2,7 +2,7 @@
 # The proxy to the Glacier2 router for all outgoing connections. This
 # must match the value of Glacier2.Client.Endpoints in config.glacier2.
 #
-IceE.Default.Router=Glacier2/router:tcp -p 10005
+Ice.Default.Router=Glacier2/router:tcp -p 10005
 
 #
 # The proxy for the Glacier2 router, installed in the client's
@@ -22,12 +22,12 @@ Chat.Client.Endpoints=
 # Connection retry is not possible with Glacier2. Connections must
 # remain established.
 #
-IceE.RetryIntervals=-1
+Ice.RetryIntervals=-1
 
 #
 # Other settings.
 #
 
-#IceE.Trace.Network=1
-#IceE.Trace.Protocol=1
-#IceE.Warn.Connections=1
+#Ice.Trace.Network=1
+#Ice.Trace.Protocol=1
+#Ice.Warn.Connections=1
diff --git a/cppe/demo/IceE/hello/config b/cppe/demo/IceE/hello/config
index ec00dc681e1..9a0c897c2d4 100644
--- a/cppe/demo/IceE/hello/config
+++ b/cppe/demo/IceE/hello/config
@@ -14,7 +14,7 @@ Hello.Endpoints=tcp -p 10000
 #
 # Warn about connection exceptions
 #
-IceE.Warn.Connections=1
+Ice.Warn.Connections=1
 
 #
 # Network Tracing
@@ -24,7 +24,7 @@ IceE.Warn.Connections=1
 # 2 = like 1, but more detailed
 # 3 = like 2, but also trace data transfer
 #
-IceE.Trace.Network=0
+Ice.Trace.Network=0
 
 #
 # Protocol Tracing
@@ -32,4 +32,4 @@ IceE.Trace.Network=0
 # 0 = no protocol tracing
 # 1 = trace protocol messages
 #
-IceE.Trace.Protocol=0
+Ice.Trace.Protocol=0
diff --git a/cppe/demo/IceE/minimal/config b/cppe/demo/IceE/minimal/config
index ec00dc681e1..9a0c897c2d4 100644
--- a/cppe/demo/IceE/minimal/config
+++ b/cppe/demo/IceE/minimal/config
@@ -14,7 +14,7 @@ Hello.Endpoints=tcp -p 10000
 #
 # Warn about connection exceptions
 #
-IceE.Warn.Connections=1
+Ice.Warn.Connections=1
 
 #
 # Network Tracing
@@ -24,7 +24,7 @@ IceE.Warn.Connections=1
 # 2 = like 1, but more detailed
 # 3 = like 2, but also trace data transfer
 #
-IceE.Trace.Network=0
+Ice.Trace.Network=0
 
 #
 # Protocol Tracing
@@ -32,4 +32,4 @@ IceE.Trace.Network=0
 # 0 = no protocol tracing
 # 1 = trace protocol messages
 #
-IceE.Trace.Protocol=0
+Ice.Trace.Protocol=0
diff --git a/cppe/src/IceE/Communicator.cpp b/cppe/src/IceE/Communicator.cpp
index 9c074ca2b42..7771bf6f96a 100755
--- a/cppe/src/IceE/Communicator.cpp
+++ b/cppe/src/IceE/Communicator.cpp
@@ -219,13 +219,13 @@ Ice::Communicator::~Communicator()
     if(_instance->__getRef() > 1)
     {
 	PropertiesPtr properties = _instance->properties();
-	if(properties->getPropertyAsIntWithDefault("IceE.Warn.Leaks", 1) > 0)
+	if(properties->getPropertyAsIntWithDefault("Ice.Warn.Leaks", 1) > 0)
 	{
 	    Warning warn(_instance->logger());
 	    warn <<
 		"The communicator is not the last Ice object that is\n"
 		"deleted. (You can disable this warning by setting the\n"
-		"property `IceE.Warn.Leaks' to 0.)";
+		"property `Ice.Warn.Leaks' to 0.)";
 	}
     }
 }
diff --git a/cppe/src/IceE/Connection.cpp b/cppe/src/IceE/Connection.cpp
index 04caf842b6e..fecc9664de2 100755
--- a/cppe/src/IceE/Connection.cpp
+++ b/cppe/src/IceE/Connection.cpp
@@ -716,7 +716,7 @@ Ice::Connection::Connection(const InstancePtr& instance,
 #endif

     _logger(_instance->logger()), // Cached for better performance.
     _traceLevels(_instance->traceLevels()), // Cached for better performance.
-    _warn(_instance->properties()->getPropertyAsInt("IceE.Warn.Connections") > 0),
+    _warn(_instance->properties()->getPropertyAsInt("Ice.Warn.Connections") > 0),
     _requestHdr(headerSize + sizeof(Int), 0),
 #ifdef ICEE_HAS_BATCH
     _requestBatchHdr(headerSize + sizeof(Int), 0),
diff --git a/cppe/src/IceE/DefaultsAndOverrides.cpp b/cppe/src/IceE/DefaultsAndOverrides.cpp
index b9b61e2b75c..65ee47b79fc 100644
--- a/cppe/src/IceE/DefaultsAndOverrides.cpp
+++ b/cppe/src/IceE/DefaultsAndOverrides.cpp
@@ -24,33 +24,33 @@ IceInternal::DefaultsAndOverrides::DefaultsAndOverrides(const PropertiesPtr& pro
     overrideConnectTimeout(false),
     overrideConnectTimeoutValue(-1)
 {
-    const_cast<string&>(defaultHost) = properties->getProperty("IceE.Default.Host");
+    const_cast<string&>(defaultHost) = properties->getProperty("Ice.Default.Host");
     if(defaultHost.empty())
     {
 	const_cast<string&>(defaultHost) = getLocalHost(true);
     }
 
 #ifdef ICEE_HAS_ROUTER
-    const_cast<string&>(defaultRouter) = properties->getProperty("IceE.Default.Router");
+    const_cast<string&>(defaultRouter) = properties->getProperty("Ice.Default.Router");
 #endif
 
     string value;
     
-    value = properties->getProperty("IceE.Override.Timeout");
+    value = properties->getProperty("Ice.Override.Timeout");
     if(!value.empty())
     {
 	const_cast<bool&>(overrideTimeout) = true;
-	const_cast<Int&>(overrideTimeoutValue) = properties->getPropertyAsInt("IceE.Override.Timeout");
+	const_cast<Int&>(overrideTimeoutValue) = properties->getPropertyAsInt("Ice.Override.Timeout");
     }
 
-    value = properties->getProperty("IceE.Override.ConnectTimeout");
+    value = properties->getProperty("Ice.Override.ConnectTimeout");
     if(!value.empty())
     {
 	const_cast<bool&>(overrideConnectTimeout) = true;
-	const_cast<Int&>(overrideConnectTimeoutValue) = properties->getPropertyAsInt("IceE.Override.ConnectTimeout");
+	const_cast<Int&>(overrideConnectTimeoutValue) = properties->getPropertyAsInt("Ice.Override.ConnectTimeout");
     }
 
 #ifdef ICEE_HAS_LOCATOR
-    const_cast<string&>(defaultLocator) = properties->getProperty("IceE.Default.Locator");
+    const_cast<string&>(defaultLocator) = properties->getProperty("Ice.Default.Locator");
 #endif
 }
diff --git a/cppe/src/IceE/Incoming.cpp b/cppe/src/IceE/Incoming.cpp
index 648a3b658df..90ca9c8dabb 100644
--- a/cppe/src/IceE/Incoming.cpp
+++ b/cppe/src/IceE/Incoming.cpp
@@ -169,7 +169,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager)
 	    ex.operation = _current.operation;
 	}
 
-	if(_os.instance()->properties()->getPropertyAsIntWithDefault("IceE.Warn.Dispatch", 1) > 1)
+	if(_os.instance()->properties()->getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 1)
 	{
 	    __warning(ex);
 	}
@@ -226,7 +226,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager)
     {
 	_is.endReadEncaps();
 
-	if(_os.instance()->properties()->getPropertyAsIntWithDefault("IceE.Warn.Dispatch", 1) > 0)
+	if(_os.instance()->properties()->getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 0)
 	{
 	    __warning(ex);
 	}
@@ -250,7 +250,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager)
     {
 	_is.endReadEncaps();
 
-	if(_os.instance()->properties()->getPropertyAsIntWithDefault("IceE.Warn.Dispatch", 1) > 0)
+	if(_os.instance()->properties()->getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 0)
 	{
 	    __warning(ex);
 	}
@@ -274,7 +274,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager)
     {
 	_is.endReadEncaps();
 
-	if(_os.instance()->properties()->getPropertyAsIntWithDefault("IceE.Warn.Dispatch", 1) > 0)
+	if(_os.instance()->properties()->getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 0)
 	{
 	    __warning(ex);
 	}
@@ -298,7 +298,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager)
     {
 	_is.endReadEncaps();
 
-	if(_os.instance()->properties()->getPropertyAsIntWithDefault("IceE.Warn.Dispatch", 1) > 0)
+	if(_os.instance()->properties()->getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 0)
 	{
 	    __warning(ex);
 	}
@@ -322,7 +322,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager)
     {
 	_is.endReadEncaps();
 
-	if(_os.instance()->properties()->getPropertyAsIntWithDefault("IceE.Warn.Dispatch", 1) > 0)
+	if(_os.instance()->properties()->getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 0)
 	{
 	    __warning(ex);
 	}
@@ -346,7 +346,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager)
     {
 	_is.endReadEncaps();
 
-	if(_os.instance()->properties()->getPropertyAsIntWithDefault("IceE.Warn.Dispatch", 1) > 0)
+	if(_os.instance()->properties()->getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 0)
 	{
 	    __warning(ex);
 	}
@@ -370,7 +370,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager)
     {
 	_is.endReadEncaps();
 
-	if(_os.instance()->properties()->getPropertyAsIntWithDefault("IceE.Warn.Dispatch", 1) > 0)
+	if(_os.instance()->properties()->getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 0)
 	{
 	    __warning(string("std::exception: ") + ex.what());
 	}
@@ -395,7 +395,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager)
     {
 	_is.endReadEncaps();
 
-	if(_os.instance()->properties()->getPropertyAsIntWithDefault("IceE.Warn.Dispatch", 1) > 0)
+	if(_os.instance()->properties()->getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 0)
 	{
 	    __warning("unknown c++ exception");
 	}
diff --git a/cppe/src/IceE/IncomingConnectionFactory.cpp b/cppe/src/IceE/IncomingConnectionFactory.cpp
index 23a0275c40e..bf34201befa 100644
--- a/cppe/src/IceE/IncomingConnectionFactory.cpp
+++ b/cppe/src/IceE/IncomingConnectionFactory.cpp
@@ -187,7 +187,7 @@ IceInternal::IncomingConnectionFactory::IncomingConnectionFactory(const Instance
     _instance(instance),
     _endpoint(endpoint),
     _adapter(adapter),
-    _warn(_instance->properties()->getPropertyAsInt("IceE.Warn.Connections") > 0),
+    _warn(_instance->properties()->getPropertyAsInt("Ice.Warn.Connections") > 0),
     _state(StateHolding)
 {
     if(_instance->defaultsAndOverrides()->overrideTimeout)
diff --git a/cppe/src/IceE/Instance.cpp b/cppe/src/IceE/Instance.cpp
index 0b860a15b1a..4c53df751a2 100644
--- a/cppe/src/IceE/Instance.cpp
+++ b/cppe/src/IceE/Instance.cpp
@@ -284,8 +284,8 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Prope
 	    // StdOut and StdErr redirection
 	    //
 
-	    string stdOutFilename = _properties->getProperty("IceE.StdOut");
-	    string stdErrFilename = _properties->getProperty("IceE.StdErr");
+	    string stdOutFilename = _properties->getProperty("Ice.StdOut");
+	    string stdErrFilename = _properties->getProperty("Ice.StdErr");
 	    
 	    if(stdOutFilename != "")
 	    {
@@ -331,13 +331,13 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Prope
 	    srand48(seed);
 #endif
 	    
-	    if(_properties->getPropertyAsInt("IceE.NullHandleAbort") > 0)
+	    if(_properties->getPropertyAsInt("Ice.NullHandleAbort") > 0)
 	    {
 		IceUtil::nullHandleAbort = true;
 	    }
 	    
 #ifndef _WIN32
-	    string newUser = _properties->getProperty("IceE.ChangeUser");
+	    string newUser = _properties->getProperty("Ice.ChangeUser");
 	    if(!newUser.empty())
 	    {
 		struct passwd* pw = getpwnam(newUser.c_str());
@@ -392,7 +392,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Prope
 	sync.release();
 	
 
-	_logger = new LoggerI(_properties->getProperty("IceE.ProgramName"));
+	_logger = new LoggerI(_properties->getProperty("Ice.ProgramName"));
 
 	const_cast<TraceLevelsPtr&>(_traceLevels) = new TraceLevels(_properties);
 
@@ -400,7 +400,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Prope
 
 	{
 	    static const int defaultMessageSizeMax = 1024;
-	    Int num = _properties->getPropertyAsIntWithDefault("IceE.MessageSizeMax", defaultMessageSizeMax);
+	    Int num = _properties->getPropertyAsIntWithDefault("Ice.MessageSizeMax", defaultMessageSizeMax);
 	    if(num < 1)
 	    {
 		const_cast<size_t&>(_messageSizeMax) = defaultMessageSizeMax * 1024; // Ignore stupid values.
@@ -417,7 +417,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Prope
 	}
 
 	{
-	    Int stackSize = _properties->getPropertyAsInt("IceE.ThreadPerConnection.StackSize");
+	    Int stackSize = _properties->getPropertyAsInt("Ice.ThreadPerConnection.StackSize");
 	    if(stackSize < 0)
 	    {
 		stackSize = 0;
@@ -521,7 +521,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[])
     // Show process id if requested (but only once).
     //
     bool printProcessId = false;
-    if(!printProcessIdDone && _properties->getPropertyAsInt("IceE.PrintProcessId") > 0)
+    if(!printProcessIdDone && _properties->getPropertyAsInt("Ice.PrintProcessId") > 0)
     {
 	//
 	// Safe double-check locking (no dependent variable!)
diff --git a/cppe/src/IceE/ObjectAdapter.cpp b/cppe/src/IceE/ObjectAdapter.cpp
index d7ed371305d..8b9b5558bc2 100644
--- a/cppe/src/IceE/ObjectAdapter.cpp
+++ b/cppe/src/IceE/ObjectAdapter.cpp
@@ -106,7 +106,7 @@ Ice::ObjectAdapter::activate()
 		locatorRegistry = _locatorInfo->getLocatorRegistry();
 	    }
 #endif
-	    printAdapterReady = _instance->properties()->getPropertyAsInt("IceE.PrintAdapterReady") > 0;
+	    printAdapterReady = _instance->properties()->getPropertyAsInt("Ice.PrintAdapterReady") > 0;
 	    _printAdapterReadyDone = true;
 	}
 	
diff --git a/cppe/src/IceE/Properties.cpp b/cppe/src/IceE/Properties.cpp
index 0ca5d214305..ea261eb7b41 100644
--- a/cppe/src/IceE/Properties.cpp
+++ b/cppe/src/IceE/Properties.cpp
@@ -171,7 +171,7 @@ Ice::Properties::parseCommandLineOptions(const string& prefix, const StringSeq&
 StringSeq
 Ice::Properties::parseIceCommandLineOptions(const StringSeq& options)
 {
-    return parseCommandLineOptions("IceE", options);
+    return parseCommandLineOptions("Ice", options);
 }
 
 void
@@ -217,19 +217,19 @@ Ice::Properties::Properties(StringSeq& args)
     if(q != args.end())
     {
         //
-        // Use the first argument as the value for IceE.ProgramName. Replace
+        // Use the first argument as the value for Ice.ProgramName. Replace
         // any backslashes in this value with forward slashes, in case this
         // value is used by the event logger.
         //
         string name = *q;
         replace(name.begin(), name.end(), '\\', '/');
-	setProperty("IceE.ProgramName", name);
+	setProperty("Ice.ProgramName", name);
     }
     StringSeq tmp;
     while(q != args.end())
     {
         string s = *q;
-        if(s.find("--IceE.Config") == 0)
+        if(s.find("--Ice.Config") == 0)
         {
             if(s.find('=') == string::npos)
             {
@@ -303,7 +303,7 @@ Ice::Properties::parseLine(const string& line)
 void
 Ice::Properties::loadConfig()
 {
-    string value = getProperty("IceE.Config");
+    string value = getProperty("Ice.Config");
 
 #ifndef _WIN32_WCE
     if(value.empty() || value == "1")
@@ -338,5 +338,5 @@ Ice::Properties::loadConfig()
         }
     }
 
-    setProperty("IceE.Config", value);
+    setProperty("Ice.Config", value);
 }
diff --git a/cppe/src/IceE/ProxyFactory.cpp b/cppe/src/IceE/ProxyFactory.cpp
index aee5e73fe2d..361e90a7585 100644
--- a/cppe/src/IceE/ProxyFactory.cpp
+++ b/cppe/src/IceE/ProxyFactory.cpp
@@ -167,7 +167,7 @@ IceInternal::ProxyFactory::checkRetryAfterException(const LocalException& ex, co
 IceInternal::ProxyFactory::ProxyFactory(const InstancePtr& instance) :
     _instance(instance)
 {
-    string str = _instance->properties()->getPropertyWithDefault("IceE.RetryIntervals", "0");
+    string str = _instance->properties()->getPropertyWithDefault("Ice.RetryIntervals", "0");
 
     string::size_type beg;
     string::size_type end = 0;
diff --git a/cppe/src/IceE/ReferenceFactory.cpp b/cppe/src/IceE/ReferenceFactory.cpp
index 1e221884d28..6188c4936da 100644
--- a/cppe/src/IceE/ReferenceFactory.cpp
+++ b/cppe/src/IceE/ReferenceFactory.cpp
@@ -442,7 +442,7 @@ IceInternal::ReferenceFactory::create(const string& str)
 		throw ex;
 	    }
 	    else if(unknownEndpoints.size() != 0 &&
-	            _instance->properties()->getPropertyAsIntWithDefault("IceE.Warn.Endpoints", 1) > 0)
+	            _instance->properties()->getPropertyAsIntWithDefault("Ice.Warn.Endpoints", 1) > 0)
 	    {
 	        Warning out(_instance->logger());
 		out << "Proxy contains unknown endpoints:";
diff --git a/cppe/src/IceE/TraceLevels.cpp b/cppe/src/IceE/TraceLevels.cpp
index 1dc8683ba4d..2e07ee18e0b 100644
--- a/cppe/src/IceE/TraceLevels.cpp
+++ b/cppe/src/IceE/TraceLevels.cpp
@@ -27,7 +27,7 @@ IceInternal::TraceLevels::TraceLevels(const PropertiesPtr& properties) :
     location(0),
     locationCat("Location")
 {
-    const string keyBase = "IceE.Trace.";
+    const string keyBase = "Ice.Trace.";
     const_cast<int&>(network) = properties->getPropertyAsInt(keyBase + networkCat);
     const_cast<int&>(protocol) = properties->getPropertyAsInt(keyBase + protocolCat);
     const_cast<int&>(retry) = properties->getPropertyAsInt(keyBase + retryCat);
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);