diff --git a/Util/include/Poco/Util/AbstractConfiguration.h b/Util/include/Poco/Util/AbstractConfiguration.h
index c7d2183a3..49e92b9e1 100644
--- a/Util/include/Poco/Util/AbstractConfiguration.h
+++ b/Util/include/Poco/Util/AbstractConfiguration.h
@@ -54,9 +54,9 @@ public:
 		/// A key-value pair, used as event argument.
 	{
 	public:
-		KeyValue(const std::string& rKey, std::string& rValue):
-			_key(rKey),
-			_value(rValue)
+		KeyValue(const std::string& key, std::string& value):
+			_key(key),
+			_value(value)
 		{
 		}
 		
diff --git a/Util/src/AbstractConfiguration.cpp b/Util/src/AbstractConfiguration.cpp
index 7398f347d..6b4f07f37 100644
--- a/Util/src/AbstractConfiguration.cpp
+++ b/Util/src/AbstractConfiguration.cpp
@@ -423,11 +423,11 @@ std::string AbstractConfiguration::internalExpand(const std::string& value) cons
 }
 
 
-std::string AbstractConfiguration::uncheckedExpand(const std::string& rValue) const
+std::string AbstractConfiguration::uncheckedExpand(const std::string& value) const
 {
 	std::string result;
-	std::string::const_iterator it  = rValue.begin();
-	std::string::const_iterator end = rValue.end();
+	std::string::const_iterator it  = value.begin();
+	std::string::const_iterator end = value.end();
 	while (it != end)
 	{
 		if (*it == '$')
diff --git a/Util/src/Option.cpp b/Util/src/Option.cpp
index 9ef2db5f8..8d6bc3eb4 100644
--- a/Util/src/Option.cpp
+++ b/Util/src/Option.cpp
@@ -60,9 +60,9 @@ Option::Option(const Option& option):
 }
 
 
-Option::Option(const std::string& rFullName, const std::string& rShortName):
-	_shortName(rShortName),
-	_fullName(rFullName),
+Option::Option(const std::string& fullName, const std::string& shortName):
+	_shortName(shortName),
+	_fullName(fullName),
 	_required(false),
 	_repeatable(false),
 	_argRequired(false),
@@ -73,11 +73,11 @@ Option::Option(const std::string& rFullName, const std::string& rShortName):
 }
 
 
-Option::Option(const std::string& rFullName, const std::string& rShortName, const std::string& rDescription, bool isRequired):
-	_shortName(rShortName),
-	_fullName(rFullName),
-	_description(rDescription),
-	_required(isRequired),
+Option::Option(const std::string& fullName, const std::string& shortName, const std::string& description, bool required):
+	_shortName(shortName),
+	_fullName(fullName),
+	_description(description),
+	_required(required),
 	_repeatable(false),
 	_argRequired(false),
 	_pValidator(0),
@@ -87,11 +87,11 @@ Option::Option(const std::string& rFullName, const std::string& rShortName, cons
 }
 
 
-Option::Option(const std::string& rFullName, const std::string& rShortName, const std::string& rDescription, bool isRequired, const std::string& argName, bool argRequired):
-	_shortName(rShortName),
-	_fullName(rFullName),
-	_description(rDescription),
-	_required(isRequired),
+Option::Option(const std::string& fullName, const std::string& shortName, const std::string& description, bool required, const std::string& argName, bool argRequired):
+	_shortName(shortName),
+	_fullName(fullName),
+	_description(description),
+	_required(required),
 	_repeatable(false),
 	_argName(argName),
 	_argRequired(argRequired),
@@ -189,9 +189,9 @@ Option& Option::noArgument()
 }
 
 
-Option& Option::group(const std::string& rGroup)
+Option& Option::group(const std::string& group)
 {
-	_group = rGroup;
+	_group = group;
 	return *this;
 }
 
diff --git a/Util/src/Timer.cpp b/Util/src/Timer.cpp
index 93c3210a0..479645eb5 100644
--- a/Util/src/Timer.cpp
+++ b/Util/src/Timer.cpp
@@ -30,8 +30,8 @@ namespace Util {
 class TimerNotification: public Poco::Notification
 {
 public:
-	TimerNotification(Poco::TimedNotificationQueue& rQueue):
-		_queue(rQueue)
+	TimerNotification(Poco::TimedNotificationQueue& queue):
+		_queue(queue)
 	{
 	}
 	
@@ -54,8 +54,8 @@ private:
 class StopNotification: public TimerNotification
 {
 public:
-	StopNotification(Poco::TimedNotificationQueue& rQueue):
-		TimerNotification(rQueue)
+	StopNotification(Poco::TimedNotificationQueue& queue):
+		TimerNotification(queue)
 	{
 	}
 	
@@ -74,8 +74,8 @@ public:
 class CancelNotification: public TimerNotification
 {
 public:
-	CancelNotification(Poco::TimedNotificationQueue& rQueue):
-		TimerNotification(rQueue)
+	CancelNotification(Poco::TimedNotificationQueue& queue):
+		TimerNotification(queue)
 	{
 	}
 	
@@ -103,8 +103,8 @@ private:
 class TaskNotification: public TimerNotification
 {
 public:
-	TaskNotification(Poco::TimedNotificationQueue& rQueue, TimerTask::Ptr pTask):
-		TimerNotification(rQueue),
+	TaskNotification(Poco::TimedNotificationQueue& queue, TimerTask::Ptr pTask):
+		TimerNotification(queue),
 		_pTask(pTask)
 	{
 	}
@@ -151,8 +151,8 @@ private:
 class PeriodicTaskNotification: public TaskNotification
 {
 public:
-	PeriodicTaskNotification(Poco::TimedNotificationQueue& rQueue, TimerTask::Ptr pTask, long interval):
-		TaskNotification(rQueue, pTask),
+	PeriodicTaskNotification(Poco::TimedNotificationQueue& queue, TimerTask::Ptr pTask, long interval):
+		TaskNotification(queue, pTask),
 		_interval(interval)
 	{
 	}
@@ -185,8 +185,8 @@ private:
 class FixedRateTaskNotification: public TaskNotification
 {
 public:
-	FixedRateTaskNotification(Poco::TimedNotificationQueue& rQueue, TimerTask::Ptr pTask, long interval, Poco::Clock clock):
-		TaskNotification(rQueue, pTask),
+	FixedRateTaskNotification(Poco::TimedNotificationQueue& queue, TimerTask::Ptr pTask, long interval, Poco::Clock clock):
+		TaskNotification(queue, pTask),
 		_interval(interval),
 		_nextExecution(clock)
 	{