diff -ur log4cxx-0.9.7/include/log4cxx/appenderskeleton.h log4cxx-0.9.7-local/include/log4cxx/appenderskeleton.h
--- log4cxx-0.9.7/include/log4cxx/appenderskeleton.h	2004-10-21 14:22:02.000000000 +0200
+++ log4cxx-0.9.7-local/include/log4cxx/appenderskeleton.h	2004-10-21 14:20:08.000000000 +0200
@@ -84,7 +84,7 @@
 		requires it.
 		*/
 		void activateOptions() {}
-		void setOption(const String& name, const String& value);
+		void setOption(const String& option, const String& value);
 
 		/**
 		Add a filter to end of the filter list.
diff -ur log4cxx-0.9.7/include/log4cxx/config/propertysetter.h log4cxx-0.9.7-local/include/log4cxx/config/propertysetter.h
--- log4cxx-0.9.7/include/log4cxx/config/propertysetter.h	2004-05-10 14:40:54.000000000 +0200
+++ log4cxx-0.9.7-local/include/log4cxx/config/propertysetter.h	2004-10-21 14:21:20.000000000 +0200
@@ -85,10 +85,10 @@
 Object supports the spi::OptionHandler interface, the 
 {@link spi::OptionHandler#setOption setOption} method is called.
 
-@param name    name of the property
+@param option  name of the property/option
 @param value   String value of the property
 */
-			void setProperty(const String& name, const String& value);
+			void setProperty(const String& option, const String& value);
 
 			void activate();
 		}; // class PropertySetter
diff -ur log4cxx-0.9.7/include/log4cxx/helpers/onlyonceerrorhandler.h log4cxx-0.9.7-local/include/log4cxx/helpers/onlyonceerrorhandler.h
--- log4cxx-0.9.7/include/log4cxx/helpers/onlyonceerrorhandler.h	2004-05-10 14:41:19.000000000 +0200
+++ log4cxx-0.9.7-local/include/log4cxx/helpers/onlyonceerrorhandler.h	2004-10-21 14:21:35.000000000 +0200
@@ -62,7 +62,7 @@
             No options to activate.
             */
             void activateOptions();
-            void setOption(const String& name, const String& value);
+            void setOption(const String& option, const String& value);
 
 
             /**
diff -ur log4cxx-0.9.7/include/log4cxx/varia/fallbackerrorhandler.h log4cxx-0.9.7-local/include/log4cxx/varia/fallbackerrorhandler.h
--- log4cxx-0.9.7/include/log4cxx/varia/fallbackerrorhandler.h	2004-05-10 14:41:59.000000000 +0200
+++ log4cxx-0.9.7-local/include/log4cxx/varia/fallbackerrorhandler.h	2004-10-21 14:19:58.000000000 +0200
@@ -65,7 +65,7 @@
 			No options to activate.
 			*/
             void activateOptions();
-            void setOption(const String& name, const String& value);
+            void setOption(const String& option, const String& value);
 
 
 			/**
diff -ur log4cxx-0.9.7/src/fallbackerrorhandler.cpp log4cxx-0.9.7-local/src/fallbackerrorhandler.cpp
--- log4cxx-0.9.7/src/fallbackerrorhandler.cpp	2004-05-10 14:37:33.000000000 +0200
+++ log4cxx-0.9.7-local/src/fallbackerrorhandler.cpp	2004-10-21 14:16:31.000000000 +0200
@@ -81,7 +81,7 @@
 {
 }
 
-void FallbackErrorHandler::setOption(const String& name, const String& value)
+void FallbackErrorHandler::setOption(const String& option, const String& value)
 {
 }
 
diff -ur log4cxx-0.9.7/src/fileappender.cpp log4cxx-0.9.7-local/src/fileappender.cpp
--- log4cxx-0.9.7/src/fileappender.cpp	2004-05-10 14:37:34.000000000 +0200
+++ log4cxx-0.9.7-local/src/fileappender.cpp	2004-10-21 14:19:30.000000000 +0200
@@ -163,7 +163,7 @@
 	}
 	else
 	{
-		WriterAppender::setOption(name, value);
+		WriterAppender::setOption(option, value);
 	}
 }
 
diff -ur log4cxx-0.9.7/src/odbcappender.cpp log4cxx-0.9.7-local/src/odbcappender.cpp
--- log4cxx-0.9.7/src/odbcappender.cpp	2004-05-10 14:37:49.000000000 +0200
+++ log4cxx-0.9.7-local/src/odbcappender.cpp	2004-10-21 14:16:07.000000000 +0200
@@ -72,7 +72,7 @@
 	}
 	else
 	{
-		AppenderSkeleton::setOption(name, value);
+		AppenderSkeleton::setOption(option, value);
 	}
 }
 
diff -ur log4cxx-0.9.7/src/onlyonceerrorhandler.cpp log4cxx-0.9.7-local/src/onlyonceerrorhandler.cpp
--- log4cxx-0.9.7/src/onlyonceerrorhandler.cpp	2004-05-10 14:37:49.000000000 +0200
+++ log4cxx-0.9.7-local/src/onlyonceerrorhandler.cpp	2004-10-21 14:16:19.000000000 +0200
@@ -40,7 +40,7 @@
 {
 }
 
-void OnlyOnceErrorHandler::setOption(const String& name, const String& value)
+void OnlyOnceErrorHandler::setOption(const String& option, const String& value)
 {
 }
 
diff -ur log4cxx-0.9.7/src/propertysetter.cpp log4cxx-0.9.7-local/src/propertysetter.cpp
--- log4cxx-0.9.7/src/propertysetter.cpp	2004-05-10 14:37:55.000000000 +0200
+++ log4cxx-0.9.7-local/src/propertysetter.cpp	2004-10-21 14:18:12.000000000 +0200
@@ -71,7 +71,7 @@
 	activate();
 }
 
-void PropertySetter::setProperty(const String& name, const String& value)
+void PropertySetter::setProperty(const String& option, const String& value)
 {
 	if (value.empty())
 		return;
@@ -79,8 +79,8 @@
 	if (obj->instanceof(OptionHandler::getStaticClass()))
 	{
 		LogLog::debug(_T("Setting option name=[") + 
-			name + _T("], value=[") + value + _T("]"));
-		OptionHandlerPtr(obj)->setOption(name, value);
+			option + _T("], value=[") + value + _T("]"));
+		OptionHandlerPtr(obj)->setOption(option, value);
 	}
 }
 
diff -ur log4cxx-0.9.7/src/smtpappender.cpp log4cxx-0.9.7-local/src/smtpappender.cpp
--- log4cxx-0.9.7/src/smtpappender.cpp	2004-05-10 14:38:01.000000000 +0200
+++ log4cxx-0.9.7-local/src/smtpappender.cpp	2004-10-21 14:16:48.000000000 +0200
@@ -103,7 +103,7 @@
 	}
 	else
 	{
-		AppenderSkeleton::setOption(name, value);
+		AppenderSkeleton::setOption(option, value);
 	}
 }
 
diff -ur log4cxx-0.9.7/src/socketappender.cpp log4cxx-0.9.7-local/src/socketappender.cpp
--- log4cxx-0.9.7/src/socketappender.cpp	2004-05-10 14:38:02.000000000 +0200
+++ log4cxx-0.9.7-local/src/socketappender.cpp	2004-10-21 14:19:10.000000000 +0200
@@ -89,7 +89,7 @@
 	}
 	else
 	{
-		AppenderSkeleton::setOption(name, value);
+		AppenderSkeleton::setOption(option, value);
 	}
 }
 
diff -ur log4cxx-0.9.7/src/sockethubappender.cpp log4cxx-0.9.7-local/src/sockethubappender.cpp
--- log4cxx-0.9.7/src/sockethubappender.cpp	2004-05-10 14:38:03.000000000 +0200
+++ log4cxx-0.9.7-local/src/sockethubappender.cpp	2004-10-21 14:17:33.000000000 +0200
@@ -66,7 +66,7 @@
 	}
 	else
 	{
-		AppenderSkeleton::setOption(name, value);
+		AppenderSkeleton::setOption(option, value);
 	}
 }
 
diff -ur log4cxx-0.9.7/src/syslogappender.cpp log4cxx-0.9.7-local/src/syslogappender.cpp
--- log4cxx-0.9.7/src/syslogappender.cpp	2004-05-10 14:38:09.000000000 +0200
+++ log4cxx-0.9.7-local/src/syslogappender.cpp	2004-10-21 14:18:53.000000000 +0200
@@ -304,7 +304,7 @@
 	}
 	else
 	{
-		AppenderSkeleton::setOption(name, value);
+		AppenderSkeleton::setOption(option, value);
 	}
 }
 
diff -ur log4cxx-0.9.7/src/telnetappender.cpp log4cxx-0.9.7-local/src/telnetappender.cpp
--- log4cxx-0.9.7/src/telnetappender.cpp	2004-05-10 14:38:10.000000000 +0200
+++ log4cxx-0.9.7-local/src/telnetappender.cpp	2004-10-21 14:17:04.000000000 +0200
@@ -60,7 +60,7 @@
 	}
 	else
 	{
-		AppenderSkeleton::setOption(name, value);
+		AppenderSkeleton::setOption(option, value);
 	}
 }
 
diff -ur log4cxx-0.9.7/src/xmlsocketappender.cpp log4cxx-0.9.7-local/src/xmlsocketappender.cpp
--- log4cxx-0.9.7/src/xmlsocketappender.cpp	2004-05-10 14:38:16.000000000 +0200
+++ log4cxx-0.9.7-local/src/xmlsocketappender.cpp	2004-10-21 14:18:40.000000000 +0200
@@ -98,7 +98,7 @@
 	}
 	else
 	{
-		AppenderSkeleton::setOption(name, value);
+		AppenderSkeleton::setOption(option, value);
 	}
 }