override

22 files changed, 122 insertions, 122 deletions

diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py
index 89a4cf383fa..d5975d3a433 100644
--- a/cpp/config/TestUtil.py
+++ b/cpp/config/TestUtil.py
@@ -54,9 +54,9 @@ else:
     clientServerProtocol = ""
 
 if compress:
-    clientProtocol += " --Ice.Overwrite.Compress"
-    serverProtocol += " --Ice.Overwrite.Compress"
-    clientServerProtocol += " --Ice.Overwrite.Compress"
+    clientProtocol += " --Ice.Override.Compress"
+    serverProtocol += " --Ice.Override.Compress"
+    clientServerProtocol += " --Ice.Override.Compress"
 
 if host != "":
     defaultHost = " --Ice.Default.Host=" + host
diff --git a/cpp/doc/Properties.sgml b/cpp/doc/Properties.sgml
index b6f453fa365..a4cac8547e6 100644
--- a/cpp/doc/Properties.sgml
+++ b/cpp/doc/Properties.sgml
@@ -250,7 +250,7 @@ method invocations). </para></note>
 </section>
 
 <!-- ********************************************************************** -->
-<section><title>&Ice; Default and Overwrite Properties</title>
+<section><title>&Ice; Default and Override Properties</title>
 <!-- ********************************************************************** -->
 
 <section><title>Ice.Default.Protocol</title>
@@ -304,32 +304,32 @@ router.
 </section>
 </section>
 
-<section><title>Ice.Overwrite.Timeout</title>
+<section><title>Ice.Override.Timeout</title>
 <section><title>Synopsis</title>
 <synopsis>
-Ice.Overwrite.Timeout=<replaceable>num</replaceable>
+Ice.Override.Timeout=<replaceable>num</replaceable>
 </synopsis>
 </section>
 <section>
 <title>Description</title>
 <para>
-If set, this property overwrites timeout settings in all
+If set, this property overrides timeout settings in all
 endpoints. <replaceable>num</replaceable> is the timeout value in
 milliseconds, or -1 for no timeout.
 </para>
 </section>
 </section>
 
-<section><title>Ice.Overwrite.Compression</title>
+<section><title>Ice.Override.Compression</title>
 <section><title>Synopsis</title>
 <synopsis>
-Ice.Overwrite.Compression=<replaceable>num</replaceable>
+Ice.Override.Compression=<replaceable>num</replaceable>
 </synopsis>
 </section>
 <section>
 <title>Description</title>
 <para>
-If set, this property overwrites compession settings in all
+If set, this property overrides compession settings in all
 proxies. If <replaceable>num</replaceable> is set to a value larger
 than zero, compression is enabled. If zero, compression is disabled.
 </para>
@@ -1164,10 +1164,10 @@ default is <literal>glacier</literal>. (Unix only.)
 </section>
 </section>
 
-<section><title>Glacier.Starter.PropertiesOverwrite</title>
+<section><title>Glacier.Starter.PropertiesOverride</title>
 <section><title>Synopsis</title>
 <synopsis>
-Glacier.Starter.PropertiesOverwrite=<replaceable>overwrites</replaceable>
+Glacier.Starter.PropertiesOverride=<replaceable>overrides</replaceable>
 </synopsis>
 </section>
 <section>
@@ -1175,14 +1175,14 @@ Glacier.Starter.PropertiesOverwrite=<replaceable>overwrites</replaceable>
 <para>
 By default, the &Glacier; router starter starts new routers with the
 exact same property set as for the router
-starter. <replaceable>overwrites</replaceable> can contain a list
+starter. <replaceable>overrides</replaceable> can contain a list
 (separated by whitespace) of properties for the router, which are used
-in addition to the router starter's properties, or which overwrite the
+in addition to the router starter's properties, or which override the
 router starter's properties. For example, in many cases it is
 desirable to set the property <literal>Ice.ServerIdleTime</literal>
 for the router, but not for the router starter. For an idle time of 60
 seconds, this can be done by setting
-<literal>Glacier.Starter.PropertiesOverwrite=Ice.SeverIdleTime=60</literal>. (Unix
+<literal>Glacier.Starter.PropertiesOverride=Ice.SeverIdleTime=60</literal>. (Unix
 only.)
 </para>
 </section>
diff --git a/cpp/src/Ice/Connection.cpp b/cpp/src/Ice/Connection.cpp
index b3aff7f0b2f..044c36f549f 100644
--- a/cpp/src/Ice/Connection.cpp
+++ b/cpp/src/Ice/Connection.cpp
@@ -13,7 +13,7 @@
 #include <Ice/LoggerUtil.h>
 #include <Ice/Properties.h>
 #include <Ice/TraceUtil.h>
-#include <Ice/DefaultsAndOverwrites.h>
+#include <Ice/DefaultsAndOverrides.h>
 #include <Ice/Transceiver.h>
 #include <Ice/ThreadPool.h>
 #include <Ice/ObjectAdapter.h>
@@ -123,9 +123,9 @@ IceInternal::Connection::sendRequest(Outgoing* out, bool oneway, bool comp)
 	}
 	else
 	{
-	    if (_defaultsAndOverwrites->overwriteCompress)
+	    if (_defaultsAndOverrides->overrideComppress)
 	    {
-		comp = _defaultsAndOverwrites->overwriteCompressValue;
+		comp = _defaultsAndOverrides->overrideComppressValue;
 	    }
 	}
 
@@ -263,9 +263,9 @@ IceInternal::Connection::flushBatchRequest(bool comp)
 	}
 	else
 	{
-	    if (_defaultsAndOverwrites->overwriteCompress)
+	    if (_defaultsAndOverrides->overrideComppress)
 	    {
-		comp = _defaultsAndOverwrites->overwriteCompressValue;
+		comp = _defaultsAndOverrides->overrideComppressValue;
 	    }
 	}
 
@@ -674,9 +674,9 @@ IceInternal::Connection::message(BasicStream& stream, const ThreadPoolPtr& threa
 		}
 		else
 		{
-		    if (_defaultsAndOverwrites->overwriteCompress)
+		    if (_defaultsAndOverrides->overrideComppress)
 		    {
-			comp = _defaultsAndOverwrites->overwriteCompressValue;
+			comp = _defaultsAndOverrides->overrideComppressValue;
 		    }
 		}
 
@@ -796,7 +796,7 @@ IceInternal::Connection::Connection(const InstancePtr& instance,
     _adapter(adapter),
     _logger(_instance->logger()),
     _traceLevels(_instance->traceLevels()),
-    _defaultsAndOverwrites(_instance->defaultsAndOverwrites()),
+    _defaultsAndOverrides(_instance->defaultsAndOverrides()),
     _nextRequestId(1),
     _requestsHint(_requests.end()),
     _batchStream(_instance),
diff --git a/cpp/src/Ice/Connection.h b/cpp/src/Ice/Connection.h
index 7ab305c5f5b..ffa47bafc89 100644
--- a/cpp/src/Ice/Connection.h
+++ b/cpp/src/Ice/Connection.h
@@ -22,7 +22,7 @@
 #include <Ice/ThreadPoolF.h>
 #include <Ice/LoggerF.h>
 #include <Ice/TraceLevelsF.h>
-#include <Ice/DefaultsAndOverwritesF.h>
+#include <Ice/DefaultsAndOverridesF.h>
 #include <Ice/EventHandler.h>
 
 namespace Ice
@@ -101,7 +101,7 @@ private:
     ::Ice::ObjectAdapterPtr _adapter;
     ::Ice::LoggerPtr _logger;
     TraceLevelsPtr _traceLevels;
-    DefaultsAndOverwritesPtr _defaultsAndOverwrites;
+    DefaultsAndOverridesPtr _defaultsAndOverrides;
     ThreadPoolPtr _clientThreadPool;
     ThreadPoolPtr _serverThreadPool;
     ::Ice::Int _nextRequestId;
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
index 2c8a07ba7a9..bcf4844848f 100644
--- a/cpp/src/Ice/ConnectionFactory.cpp
+++ b/cpp/src/Ice/ConnectionFactory.cpp
@@ -13,7 +13,7 @@
 #include <Ice/Instance.h>
 #include <Ice/LoggerUtil.h>
 #include <Ice/TraceLevels.h>
-#include <Ice/DefaultsAndOverwrites.h>
+#include <Ice/DefaultsAndOverrides.h>
 #include <Ice/Properties.h>
 #include <Ice/Transceiver.h>
 #include <Ice/Connector.h>
@@ -67,14 +67,14 @@ IceInternal::OutgoingConnectionFactory::create(const vector<EndpointPtr>& endpoi
     //
     // Search for existing connections.
     //
-    DefaultsAndOverwritesPtr defaultsAndOverwrites = _instance->defaultsAndOverwrites();
+    DefaultsAndOverridesPtr defaultsAndOverrides = _instance->defaultsAndOverrides();
     vector<EndpointPtr>::const_iterator q;
     for (q = endpoints.begin(); q != endpoints.end(); ++q)
     {
 	EndpointPtr endpoint = *q;
-	if (defaultsAndOverwrites->overwriteTimeout)
+	if (defaultsAndOverrides->overrideTimeout)
 	{
-	    endpoint = endpoint->timeout(defaultsAndOverwrites->overwriteTimeoutValue);
+	    endpoint = endpoint->timeout(defaultsAndOverrides->overrideTimeoutValue);
 	}
 
 	map<EndpointPtr, ConnectionPtr>::const_iterator r = _connections.find(endpoint);
@@ -96,9 +96,9 @@ IceInternal::OutgoingConnectionFactory::create(const vector<EndpointPtr>& endpoi
     while (q != endpoints.end())
     {
 	EndpointPtr endpoint = *q;
-	if (defaultsAndOverwrites->overwriteTimeout)
+	if (defaultsAndOverrides->overrideTimeout)
 	{
-	    endpoint = endpoint->timeout(defaultsAndOverwrites->overwriteTimeoutValue);
+	    endpoint = endpoint->timeout(defaultsAndOverrides->overrideTimeoutValue);
 	}
 
 	try
@@ -177,14 +177,14 @@ IceInternal::OutgoingConnectionFactory::setRouter(const RouterPrx& router)
 	//
 	ObjectPrx proxy = routerInfo->getClientProxy();
 	ObjectAdapterPtr adapter = routerInfo->getAdapter();
-	DefaultsAndOverwritesPtr defaultsAndOverwrites = _instance->defaultsAndOverwrites();
+	DefaultsAndOverridesPtr defaultsAndOverrides = _instance->defaultsAndOverrides();
 	vector<EndpointPtr>::const_iterator p;
 	for (p = proxy->__reference()->endpoints.begin(); p != proxy->__reference()->endpoints.end(); ++p)
 	{
 	    EndpointPtr endpoint = *p;
-	    if (defaultsAndOverwrites->overwriteTimeout)
+	    if (defaultsAndOverrides->overrideTimeout)
 	    {
-		endpoint = endpoint->timeout(defaultsAndOverwrites->overwriteTimeoutValue);
+		endpoint = endpoint->timeout(defaultsAndOverrides->overrideTimeoutValue);
 	    }
 
 	    map<EndpointPtr, ConnectionPtr>::const_iterator q = _connections.find(endpoint);
@@ -430,10 +430,10 @@ IceInternal::IncomingConnectionFactory::IncomingConnectionFactory(const Instance
     _adapter(adapter),
     _state(StateHolding)
 {
-    DefaultsAndOverwritesPtr defaultsAndOverwrites = _instance->defaultsAndOverwrites();
-    if (defaultsAndOverwrites->overwriteTimeout)
+    DefaultsAndOverridesPtr defaultsAndOverrides = _instance->defaultsAndOverrides();
+    if (defaultsAndOverrides->overrideTimeout)
     {
-	_endpoint = _endpoint->timeout(defaultsAndOverwrites->overwriteTimeoutValue);
+	_endpoint = _endpoint->timeout(defaultsAndOverrides->overrideTimeoutValue);
     }
 
     _warn = _instance->properties()->getPropertyAsInt("Ice.ConnectionWarnings") > 0;
diff --git a/cpp/src/Ice/DefaultsAndOverwrites.cpp b/cpp/src/Ice/DefaultsAndOverrides.cpp
index d757af2eb17..66ffa96bab0 100644
--- a/cpp/src/Ice/DefaultsAndOverwrites.cpp
+++ b/cpp/src/Ice/DefaultsAndOverrides.cpp
@@ -8,7 +8,7 @@
 //
 // **********************************************************************
 
-#include <Ice/DefaultsAndOverwrites.h>
+#include <Ice/DefaultsAndOverrides.h>
 #include <Ice/Properties.h>
 #include <Ice/Network.h>
 
@@ -16,14 +16,14 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
-void IceInternal::incRef(DefaultsAndOverwrites* p) { p->__incRef(); }
-void IceInternal::decRef(DefaultsAndOverwrites* p) { p->__decRef(); }
+void IceInternal::incRef(DefaultsAndOverrides* p) { p->__incRef(); }
+void IceInternal::decRef(DefaultsAndOverrides* p) { p->__decRef(); }
 
-IceInternal::DefaultsAndOverwrites::DefaultsAndOverwrites(const PropertiesPtr& properties) :
-    overwriteTimeout(false),
-    overwriteTimeoutValue(-1),
-    overwriteCompress(false),
-    overwriteCompressValue(false)
+IceInternal::DefaultsAndOverrides::DefaultsAndOverrides(const PropertiesPtr& properties) :
+    overrideTimeout(false),
+    overrideTimeoutValue(-1),
+    overrideComppress(false),
+    overrideComppressValue(false)
 {
     const_cast<string&>(defaultProtocol) = properties->getPropertyWithDefault("Ice.Default.Protocol", "tcp");
 
@@ -37,17 +37,17 @@ IceInternal::DefaultsAndOverwrites::DefaultsAndOverwrites(const PropertiesPtr& p
 
     string value;
     
-    value = properties->getProperty("Ice.Overwrite.Timeout");
+    value = properties->getProperty("Ice.Override.Timeout");
     if (!value.empty())
     {
-	const_cast<bool&>(overwriteTimeout) = true;
-	const_cast<Int&>(overwriteTimeoutValue) = atoi(value.c_str());
+	const_cast<bool&>(overrideTimeout) = true;
+	const_cast<Int&>(overrideTimeoutValue) = atoi(value.c_str());
     }
 
-    value = properties->getProperty("Ice.Overwrite.Compress");
+    value = properties->getProperty("Ice.Override.Compress");
     if (!value.empty())
     {
-	const_cast<bool&>(overwriteCompress) = true;
-	const_cast<bool&>(overwriteCompressValue) = atoi(value.c_str());
+	const_cast<bool&>(overrideComppress) = true;
+	const_cast<bool&>(overrideComppressValue) = atoi(value.c_str());
     }
 }
diff --git a/cpp/src/Ice/DefaultsAndOverwrites.h b/cpp/src/Ice/DefaultsAndOverrides.h
index 99c5a0e297b..911b16da870 100644
--- a/cpp/src/Ice/DefaultsAndOverwrites.h
+++ b/cpp/src/Ice/DefaultsAndOverrides.h
@@ -8,30 +8,30 @@
 //
 // **********************************************************************
 
-#ifndef ICE_ICE_DEFAULTS_AND_OVERWRITES_F_H
-#define ICE_ICE_DEFAULTS_AND_OVERWRITES_F_H
+#ifndef ICE_ICE_DEFAULTS_AND_OVERRIDES_F_H
+#define ICE_ICE_DEFAULTS_AND_OVERRIDES_F_H
 
 #include <IceUtil/Shared.h>
-#include <Ice/DefaultsAndOverwritesF.h>
+#include <Ice/DefaultsAndOverridesF.h>
 #include <Ice/PropertiesF.h>
 
 namespace IceInternal
 {
 
-class DefaultsAndOverwrites : public ::IceUtil::Shared
+class DefaultsAndOverrides : public ::IceUtil::Shared
 {
 public:
 
-    DefaultsAndOverwrites(const ::Ice::PropertiesPtr&);
+    DefaultsAndOverrides(const ::Ice::PropertiesPtr&);
 
     std::string defaultHost;
     std::string defaultProtocol;
     std::string defaultRouter;
 
-    bool overwriteTimeout;
-    Ice::Int overwriteTimeoutValue;
-    bool overwriteCompress;
-    bool overwriteCompressValue;
+    bool overrideTimeout;
+    Ice::Int overrideTimeoutValue;
+    bool overrideComppress;
+    bool overrideComppressValue;
 };
 
 }
diff --git a/cpp/src/Ice/DefaultsAndOverwritesF.h b/cpp/src/Ice/DefaultsAndOverridesF.h
index 9c3cf35a152..0772a93ee72 100644
--- a/cpp/src/Ice/DefaultsAndOverwritesF.h
+++ b/cpp/src/Ice/DefaultsAndOverridesF.h
@@ -8,18 +8,18 @@
 //
 // **********************************************************************
 
-#ifndef ICE_DEFAULTS_AND_OVERWRITES_F_H
-#define ICE_DEFAULTS_AND_OVERWRITES_F_H
+#ifndef ICE_DEFAULTS_AND_OVERRIDES_F_H
+#define ICE_DEFAULTS_AND_OVERRIDES_F_H
 
 #include <Ice/Handle.h>
 
 namespace IceInternal
 {
 
-class DefaultsAndOverwrites;
-void incRef(DefaultsAndOverwrites*);
-void decRef(DefaultsAndOverwrites*);
-typedef Handle<DefaultsAndOverwrites> DefaultsAndOverwritesPtr;
+class DefaultsAndOverrides;
+void incRef(DefaultsAndOverrides*);
+void decRef(DefaultsAndOverrides*);
+typedef Handle<DefaultsAndOverrides> DefaultsAndOverridesPtr;
 
 }
 
diff --git a/cpp/src/Ice/EndpointFactoryManager.cpp b/cpp/src/Ice/EndpointFactoryManager.cpp
index 67084de0056..d8f3cc93a07 100644
--- a/cpp/src/Ice/EndpointFactoryManager.cpp
+++ b/cpp/src/Ice/EndpointFactoryManager.cpp
@@ -14,7 +14,7 @@
 #include <Ice/BasicStream.h>
 #include <Ice/LocalException.h>
 #include <Ice/Instance.h>
-#include <Ice/DefaultsAndOverwrites.h>
+#include <Ice/DefaultsAndOverrides.h>
 
 using namespace std;
 using namespace Ice;
@@ -87,7 +87,7 @@ IceInternal::EndpointFactoryManager::create(const string& str) const
 
     if (protocol == "default")
     {
-        protocol = _instance->defaultsAndOverwrites()->defaultProtocol;
+        protocol = _instance->defaultsAndOverrides()->defaultProtocol;
     }
 
     //
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index 4750b0b2999..e1c87922d90 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -10,7 +10,7 @@
 
 #include <Ice/Instance.h>
 #include <Ice/TraceLevels.h>
-#include <Ice/DefaultsAndOverwrites.h>
+#include <Ice/DefaultsAndOverrides.h>
 #include <Ice/RouterInfo.h>
 #include <Ice/ReferenceFactory.h>
 #include <Ice/ProxyFactory.h>
@@ -107,11 +107,11 @@ IceInternal::Instance::traceLevels()
     return _traceLevels;
 }
 
-DefaultsAndOverwritesPtr
-IceInternal::Instance::defaultsAndOverwrites()
+DefaultsAndOverridesPtr
+IceInternal::Instance::defaultsAndOverrides()
 {
     // No mutex lock, immutable.
-    return _defaultsAndOverwrites;
+    return _defaultsAndOverrides;
 }
 
 RouterManagerPtr
@@ -304,7 +304,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, int& argc,
 
 	_traceLevels = new TraceLevels(_properties);
 
-	_defaultsAndOverwrites = new DefaultsAndOverwrites(_properties);
+	_defaultsAndOverrides = new DefaultsAndOverrides(_properties);
 
 	_routerManager = new RouterManager;
 
@@ -320,10 +320,10 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, int& argc,
 
         _pluginManager = new PluginManagerI(this);
 
-	if (!_defaultsAndOverwrites->defaultRouter.empty())
+	if (!_defaultsAndOverrides->defaultRouter.empty())
 	{
 	    _referenceFactory->setDefaultRouter(
-		RouterPrx::uncheckedCast(_proxyFactory->stringToProxy(_defaultsAndOverwrites->defaultRouter)));
+		RouterPrx::uncheckedCast(_proxyFactory->stringToProxy(_defaultsAndOverrides->defaultRouter)));
 	}
 
 	_outgoingConnectionFactory = new OutgoingConnectionFactory(this);
diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h
index f6b37cc8e0b..7cc4ec3ff0b 100644
--- a/cpp/src/Ice/Instance.h
+++ b/cpp/src/Ice/Instance.h
@@ -19,7 +19,7 @@
 #include <Ice/PropertiesF.h>
 #include <Ice/LoggerF.h>
 #include <Ice/TraceLevelsF.h>
-#include <Ice/DefaultsAndOverwritesF.h>
+#include <Ice/DefaultsAndOverridesF.h>
 #include <Ice/RouterInfoF.h>
 #include <Ice/ReferenceFactoryF.h>
 #include <Ice/ProxyFactoryF.h>
@@ -51,7 +51,7 @@ public:
     ::Ice::LoggerPtr logger();
     void logger(const ::Ice::LoggerPtr&);
     TraceLevelsPtr traceLevels();
-    DefaultsAndOverwritesPtr defaultsAndOverwrites();
+    DefaultsAndOverridesPtr defaultsAndOverrides();
     RouterManagerPtr routerManager();
     ReferenceFactoryPtr referenceFactory();
     ProxyFactoryPtr proxyFactory();
@@ -76,7 +76,7 @@ private:
     ::Ice::PropertiesPtr _properties; // Immutable, not reset by destroy().
     ::Ice::LoggerPtr _logger; // Not reset by destroy().
     TraceLevelsPtr _traceLevels; // Immutable, not reset by destroy().
-    DefaultsAndOverwritesPtr _defaultsAndOverwrites; // Immutable, not reset by destroy().
+    DefaultsAndOverridesPtr _defaultsAndOverrides; // Immutable, not reset by destroy().
     RouterManagerPtr _routerManager;
     ReferenceFactoryPtr _referenceFactory;
     ProxyFactoryPtr _proxyFactory;
diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile
index 0d83e41a672..7ada271cf6d 100644
--- a/cpp/src/Ice/Makefile
+++ b/cpp/src/Ice/Makefile
@@ -31,7 +31,7 @@ OBJS		= Initialize.o \
 		  Stream.o \
 		  BuiltinSequences.o \
 		  BasicStream.o \
-		  DefaultsAndOverwrites.o \
+		  DefaultsAndOverrides.o \
 		  TraceLevels.o \
 		  TraceUtil.o \
 		  Instance.o \
diff --git a/cpp/src/Ice/ProtocolPluginFacade.cpp b/cpp/src/Ice/ProtocolPluginFacade.cpp
index 857a8b80900..6542a0be844 100644
--- a/cpp/src/Ice/ProtocolPluginFacade.cpp
+++ b/cpp/src/Ice/ProtocolPluginFacade.cpp
@@ -13,7 +13,7 @@
 #include <Ice/EndpointFactoryManager.h>
 #include <Ice/TraceLevels.h>
 #include <Ice/Initialize.h>
-#include <Ice/DefaultsAndOverwrites.h>
+#include <Ice/DefaultsAndOverrides.h>
 
 using namespace std;
 using namespace Ice;
@@ -42,7 +42,7 @@ IceInternal::ProtocolPluginFacade::getCommunicator() const
 string
 IceInternal::ProtocolPluginFacade::getDefaultHost() const
 {
-    return _instance->defaultsAndOverwrites()->defaultHost;
+    return _instance->defaultsAndOverrides()->defaultHost;
 }
 
 int
diff --git a/cpp/src/Ice/TcpEndpoint.cpp b/cpp/src/Ice/TcpEndpoint.cpp
index 55a9459e071..8f2a21b8b32 100644
--- a/cpp/src/Ice/TcpEndpoint.cpp
+++ b/cpp/src/Ice/TcpEndpoint.cpp
@@ -16,7 +16,7 @@
 #include <Ice/BasicStream.h>
 #include <Ice/LocalException.h>
 #include <Ice/Instance.h>
-#include <Ice/DefaultsAndOverwrites.h>
+#include <Ice/DefaultsAndOverrides.h>
 
 using namespace std;
 using namespace Ice;
@@ -114,7 +114,7 @@ IceInternal::TcpEndpoint::TcpEndpoint(const InstancePtr& instance, const string&
 
     if (_host.empty())
     {
-	const_cast<string&>(_host) = _instance->defaultsAndOverwrites()->defaultHost;
+	const_cast<string&>(_host) = _instance->defaultsAndOverrides()->defaultHost;
     }
 }
 
diff --git a/cpp/src/Ice/UdpEndpoint.cpp b/cpp/src/Ice/UdpEndpoint.cpp
index 66f8a8b89d9..62c84ff7aca 100644
--- a/cpp/src/Ice/UdpEndpoint.cpp
+++ b/cpp/src/Ice/UdpEndpoint.cpp
@@ -14,7 +14,7 @@
 #include <Ice/BasicStream.h>
 #include <Ice/LocalException.h>
 #include <Ice/Instance.h>
-#include <Ice/DefaultsAndOverwrites.h>
+#include <Ice/DefaultsAndOverrides.h>
 
 using namespace std;
 using namespace Ice;
@@ -112,7 +112,7 @@ IceInternal::UdpEndpoint::UdpEndpoint(const InstancePtr& instance, const string&
 
     if (_host.empty())
     {
-	const_cast<string&>(_host) = _instance->defaultsAndOverwrites()->defaultHost;
+	const_cast<string&>(_host) = _instance->defaultsAndOverrides()->defaultHost;
     }
 }
 
diff --git a/java/src/IceInternal/DefaultsAndOverwrites.java b/java/src/IceInternal/DefaultsAndOverrides.java
index 2bcfe5a50c6..070c40b9300 100644
--- a/java/src/IceInternal/DefaultsAndOverwrites.java
+++ b/java/src/IceInternal/DefaultsAndOverrides.java
@@ -10,9 +10,9 @@
 
 package IceInternal;
 
-public final class DefaultsAndOverwrites
+public final class DefaultsAndOverrides
 {
-    DefaultsAndOverwrites(Ice.Properties properties)
+    DefaultsAndOverrides(Ice.Properties properties)
     {
 	String value;
 	
@@ -30,28 +30,28 @@ public final class DefaultsAndOverwrites
 	
 	defaultRouter = properties.getProperty("Ice.Default.Router");
 	
-	value = properties.getProperty("Ice.Overwrite.Timeout");
+	value = properties.getProperty("Ice.Override.Timeout");
 	if (value.length() > 0)
 	{
-	    overwriteTimeout = true;
-	    overwriteTimeoutValue = properties.getPropertyAsInt("Ice.Overwrite.Timeout");
+	    overrideTimeout = true;
+	    overrideTimeoutValue = properties.getPropertyAsInt("Ice.Override.Timeout");
 	}
 	else
 	{
-	    overwriteTimeout = false;
-	    overwriteTimeoutValue = -1;
+	    overrideTimeout = false;
+	    overrideTimeoutValue = -1;
 	}
 
-	value = properties.getProperty("Ice.Overwrite.Compress");
+	value = properties.getProperty("Ice.Override.Compress");
 	if (value.length() > 0)
 	{
-	    overwriteCompress = true;
-	    overwriteCompressValue = properties.getPropertyAsInt("Ice.Overwrite.Compress") != 0;
+	    overrideComppress = true;
+	    overrideComppressValue = properties.getPropertyAsInt("Ice.Override.Compress") != 0;
 	}
 	else
 	{
-	    overwriteCompress = false;
-	    overwriteCompressValue = false;
+	    overrideComppress = false;
+	    overrideComppressValue = false;
 	}
     }
 
@@ -59,8 +59,8 @@ public final class DefaultsAndOverwrites
     final public String defaultProtocol;
     final public String defaultRouter;
 
-    final public boolean overwriteTimeout;
-    final public int overwriteTimeoutValue;
-    final public boolean overwriteCompress;
-    final public boolean overwriteCompressValue;
+    final public boolean overrideTimeout;
+    final public int overrideTimeoutValue;
+    final public boolean overrideComppress;
+    final public boolean overrideComppressValue;
 }
diff --git a/java/src/IceInternal/EndpointFactoryManager.java b/java/src/IceInternal/EndpointFactoryManager.java
index 6eaf1bfb8b4..8156a8c0afb 100644
--- a/java/src/IceInternal/EndpointFactoryManager.java
+++ b/java/src/IceInternal/EndpointFactoryManager.java
@@ -63,7 +63,7 @@ public final class EndpointFactoryManager
 
         if (protocol.equals("default"))
         {
-            protocol = _instance.defaultsAndOverwrites().defaultProtocol;
+            protocol = _instance.defaultsAndOverrides().defaultProtocol;
         }
 
         for (int i = 0; i < _factories.size(); i++)
diff --git a/java/src/IceInternal/IncomingConnectionFactory.java b/java/src/IceInternal/IncomingConnectionFactory.java
index f5a44a5c7db..a4cacda340e 100644
--- a/java/src/IceInternal/IncomingConnectionFactory.java
+++ b/java/src/IceInternal/IncomingConnectionFactory.java
@@ -201,10 +201,10 @@ public class IncomingConnectionFactory extends EventHandler
     {
         super(instance);
         _endpoint = endpoint;
-	DefaultsAndOverwrites defaultsAndOverwrites = _instance.defaultsAndOverwrites();
-	if (defaultsAndOverwrites.overwriteTimeout)
+	DefaultsAndOverrides defaultsAndOverrides = _instance.defaultsAndOverrides();
+	if (defaultsAndOverrides.overrideTimeout)
 	{
-	    _endpoint = _endpoint.timeout(defaultsAndOverwrites.overwriteTimeoutValue);
+	    _endpoint = _endpoint.timeout(defaultsAndOverrides.overrideTimeoutValue);
 	}
         _adapter = adapter;
         _state = StateHolding;
diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java
index 7420af631d9..d42681f0cd1 100644
--- a/java/src/IceInternal/Instance.java
+++ b/java/src/IceInternal/Instance.java
@@ -44,11 +44,11 @@ public class Instance
         return _traceLevels;
     }
 
-    public DefaultsAndOverwrites
-    defaultsAndOverwrites()
+    public DefaultsAndOverrides
+    defaultsAndOverrides()
     {
 	// No mutex lock, immutable.
-        return _defaultsAndOverwrites;
+        return _defaultsAndOverrides;
     }
 
     public synchronized RouterManager
@@ -160,7 +160,7 @@ public class Instance
 
             _traceLevels = new TraceLevels(_properties);
 
-            _defaultsAndOverwrites = new DefaultsAndOverwrites(_properties);
+            _defaultsAndOverrides = new DefaultsAndOverrides(_properties);
 
             _routerManager = new RouterManager();
 
@@ -176,10 +176,10 @@ public class Instance
 
             _pluginManager = new Ice.PluginManagerI(this);
 
-            if (_defaultsAndOverwrites.defaultRouter.length() > 0)
+            if (_defaultsAndOverrides.defaultRouter.length() > 0)
             {
                 _referenceFactory.setDefaultRouter(Ice.RouterPrxHelper.uncheckedCast(
-		    _proxyFactory.stringToProxy(_defaultsAndOverwrites.defaultRouter)));
+		    _proxyFactory.stringToProxy(_defaultsAndOverrides.defaultRouter)));
             }
 
             _outgoingConnectionFactory = new OutgoingConnectionFactory(this);
@@ -348,7 +348,7 @@ public class Instance
     private Ice.Properties _properties; // Immutable, not reset by destroy().
     private Ice.Logger _logger; // Not reset by destroy().
     private TraceLevels _traceLevels; // Immutable, not reset by destroy().
-    private DefaultsAndOverwrites _defaultsAndOverwrites; // Immutable, not reset by destroy().
+    private DefaultsAndOverrides _defaultsAndOverrides; // Immutable, not reset by destroy().
     private RouterManager _routerManager;
     private ReferenceFactory _referenceFactory;
     private ProxyFactory _proxyFactory;
diff --git a/java/src/IceInternal/OutgoingConnectionFactory.java b/java/src/IceInternal/OutgoingConnectionFactory.java
index 5a36de0e9da..aff6d4ab87a 100644
--- a/java/src/IceInternal/OutgoingConnectionFactory.java
+++ b/java/src/IceInternal/OutgoingConnectionFactory.java
@@ -38,13 +38,13 @@ public class OutgoingConnectionFactory
         //
         // Search for existing connections.
         //
-	DefaultsAndOverwrites defaultsAndOverwrites = _instance.defaultsAndOverwrites();
+	DefaultsAndOverrides defaultsAndOverrides = _instance.defaultsAndOverrides();
         for (int i = 0; i < endpoints.length; i++)
         {
 	    Endpoint endpoint = endpoints[i];
-	    if (defaultsAndOverwrites.overwriteTimeout)
+	    if (defaultsAndOverrides.overrideTimeout)
 	    {
-		endpoint = endpoint.timeout(defaultsAndOverwrites.overwriteTimeoutValue);
+		endpoint = endpoint.timeout(defaultsAndOverrides.overrideTimeoutValue);
 	    }
 
             Connection connection = (Connection)_connections.get(endpoints);
@@ -65,9 +65,9 @@ public class OutgoingConnectionFactory
         for (int i = 0; i < endpoints.length; i++)
         {
   	    Endpoint endpoint = endpoints[i];
-	    if (defaultsAndOverwrites.overwriteTimeout)
+	    if (defaultsAndOverrides.overrideTimeout)
 	    {
-		endpoint = endpoint.timeout(defaultsAndOverwrites.overwriteTimeoutValue);
+		endpoint = endpoint.timeout(defaultsAndOverrides.overrideTimeoutValue);
 	    }
 	    
 	    try
@@ -149,14 +149,14 @@ public class OutgoingConnectionFactory
             //
             Ice.ObjectPrx proxy = routerInfo.getClientProxy();
             Ice.ObjectAdapter adapter = routerInfo.getAdapter();
-	    DefaultsAndOverwrites defaultsAndOverwrites = _instance.defaultsAndOverwrites();
+	    DefaultsAndOverrides defaultsAndOverrides = _instance.defaultsAndOverrides();
             Endpoint[] endpoints = ((Ice.ObjectPrxHelper)proxy).__reference().endpoints;
             for (int i = 0; i < endpoints.length; i++)
             {
 		Endpoint endpoint = endpoints[i];
-		if (defaultsAndOverwrites.overwriteTimeout)
+		if (defaultsAndOverrides.overrideTimeout)
 		{
-		    endpoint = endpoint.timeout(defaultsAndOverwrites.overwriteTimeoutValue);
+		    endpoint = endpoint.timeout(defaultsAndOverrides.overrideTimeoutValue);
 		}
 
                 Connection connection = (Connection)_connections.get(endpoint);
diff --git a/java/src/IceInternal/TcpEndpoint.java b/java/src/IceInternal/TcpEndpoint.java
index 6d1655c499b..a40adcd5ffb 100644
--- a/java/src/IceInternal/TcpEndpoint.java
+++ b/java/src/IceInternal/TcpEndpoint.java
@@ -115,7 +115,7 @@ final class TcpEndpoint implements Endpoint
 
         if (_host == null)
         {
-            _host = _instance.defaultsAndOverwrites().defaultHost;
+            _host = _instance.defaultsAndOverrides().defaultHost;
         }
 
         calcHashValue();
diff --git a/java/src/IceInternal/UdpEndpoint.java b/java/src/IceInternal/UdpEndpoint.java
index a391c265c23..e1b06e7f656 100644
--- a/java/src/IceInternal/UdpEndpoint.java
+++ b/java/src/IceInternal/UdpEndpoint.java
@@ -107,7 +107,7 @@ final class UdpEndpoint implements Endpoint
 
         if (_host == null)
         {
-            _host = instance.defaultsAndOverwrites().defaultHost;
+            _host = instance.defaultsAndOverrides().defaultHost;
         }
 
         calcHashValue();