diff --git a/Foundation/samples/NotificationQueue/src/NotificationQueue.cpp b/Foundation/samples/NotificationQueue/src/NotificationQueue.cpp
index d6a5af3c3..e1412ec4f 100644
--- a/Foundation/samples/NotificationQueue/src/NotificationQueue.cpp
+++ b/Foundation/samples/NotificationQueue/src/NotificationQueue.cpp
@@ -39,8 +39,8 @@ class WorkNotification: public Notification
 public:
 	typedef AutoPtr<WorkNotification> Ptr;
 	
-	WorkNotification(int data):
-		_data(data)
+	WorkNotification(int workData):
+		_data(workData)
 	{
 	}
 	
diff --git a/Foundation/testsuite/src/ActiveDispatcherTest.cpp b/Foundation/testsuite/src/ActiveDispatcherTest.cpp
index 0c62a15d1..bf82d7f19 100644
--- a/Foundation/testsuite/src/ActiveDispatcherTest.cpp
+++ b/Foundation/testsuite/src/ActiveDispatcherTest.cpp
@@ -90,7 +90,7 @@ namespace
 }
 
 
-ActiveDispatcherTest::ActiveDispatcherTest(const std::string& name): CppUnit::TestCase(name)
+ActiveDispatcherTest::ActiveDispatcherTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/ActiveMethodTest.cpp b/Foundation/testsuite/src/ActiveMethodTest.cpp
index 821c0d506..57aec68e6 100644
--- a/Foundation/testsuite/src/ActiveMethodTest.cpp
+++ b/Foundation/testsuite/src/ActiveMethodTest.cpp
@@ -92,7 +92,7 @@ namespace
 }
 
 
-ActiveMethodTest::ActiveMethodTest(const std::string& name): CppUnit::TestCase(name)
+ActiveMethodTest::ActiveMethodTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/ActivityTest.cpp b/Foundation/testsuite/src/ActivityTest.cpp
index df548318d..621c0444d 100644
--- a/Foundation/testsuite/src/ActivityTest.cpp
+++ b/Foundation/testsuite/src/ActivityTest.cpp
@@ -60,7 +60,7 @@ namespace
 }
  
 
-ActivityTest::ActivityTest(const std::string& name): CppUnit::TestCase(name)
+ActivityTest::ActivityTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/AnyTest.cpp b/Foundation/testsuite/src/AnyTest.cpp
index 046f9479f..db6dc7fcc 100644
--- a/Foundation/testsuite/src/AnyTest.cpp
+++ b/Foundation/testsuite/src/AnyTest.cpp
@@ -42,7 +42,7 @@ public:
 };
 
 
-AnyTest::AnyTest(const std::string& name): CppUnit::TestCase(name)
+AnyTest::AnyTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/ArrayTest.cpp b/Foundation/testsuite/src/ArrayTest.cpp
index 0a72165f9..5434f6b94 100644
--- a/Foundation/testsuite/src/ArrayTest.cpp
+++ b/Foundation/testsuite/src/ArrayTest.cpp
@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <functional>
 
-ArrayTest::ArrayTest(const std::string& name): CppUnit::TestCase(name)
+ArrayTest::ArrayTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/AutoPtrTest.cpp b/Foundation/testsuite/src/AutoPtrTest.cpp
index fee0ee70b..a1150ba5f 100644
--- a/Foundation/testsuite/src/AutoPtrTest.cpp
+++ b/Foundation/testsuite/src/AutoPtrTest.cpp
@@ -67,7 +67,7 @@ namespace
 }
 
 
-AutoPtrTest::AutoPtrTest(const std::string& name): CppUnit::TestCase(name)
+AutoPtrTest::AutoPtrTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/AutoReleasePoolTest.cpp b/Foundation/testsuite/src/AutoReleasePoolTest.cpp
index 66eec9e5f..41c130897 100644
--- a/Foundation/testsuite/src/AutoReleasePoolTest.cpp
+++ b/Foundation/testsuite/src/AutoReleasePoolTest.cpp
@@ -65,7 +65,7 @@ namespace
 }
 
 
-AutoReleasePoolTest::AutoReleasePoolTest(const std::string& name): CppUnit::TestCase(name)
+AutoReleasePoolTest::AutoReleasePoolTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/Base32Test.cpp b/Foundation/testsuite/src/Base32Test.cpp
index 397f78c54..f044ffa23 100644
--- a/Foundation/testsuite/src/Base32Test.cpp
+++ b/Foundation/testsuite/src/Base32Test.cpp
@@ -24,7 +24,7 @@ using Poco::Base32Decoder;
 using Poco::DataFormatException;
 
 
-Base32Test::Base32Test(const std::string& name): CppUnit::TestCase(name)
+Base32Test::Base32Test(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/Base64Test.cpp b/Foundation/testsuite/src/Base64Test.cpp
index a03b0602f..d991709b3 100644
--- a/Foundation/testsuite/src/Base64Test.cpp
+++ b/Foundation/testsuite/src/Base64Test.cpp
@@ -24,7 +24,7 @@ using Poco::Base64Decoder;
 using Poco::DataFormatException;
 
 
-Base64Test::Base64Test(const std::string& name): CppUnit::TestCase(name)
+Base64Test::Base64Test(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/BasicEventTest.cpp b/Foundation/testsuite/src/BasicEventTest.cpp
index f925c75dc..0c278a149 100644
--- a/Foundation/testsuite/src/BasicEventTest.cpp
+++ b/Foundation/testsuite/src/BasicEventTest.cpp
@@ -27,7 +27,7 @@ using namespace Poco;
 #define LARGEINC 100
 
 
-BasicEventTest::BasicEventTest(const std::string& name): CppUnit::TestCase(name)
+BasicEventTest::BasicEventTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/BinaryReaderWriterTest.cpp b/Foundation/testsuite/src/BinaryReaderWriterTest.cpp
index 5f43f5f11..1ec3d323f 100644
--- a/Foundation/testsuite/src/BinaryReaderWriterTest.cpp
+++ b/Foundation/testsuite/src/BinaryReaderWriterTest.cpp
@@ -30,7 +30,7 @@ using Poco::Int64;
 using Poco::UInt64;
 
 
-BinaryReaderWriterTest::BinaryReaderWriterTest(const std::string& name): CppUnit::TestCase(name)
+BinaryReaderWriterTest::BinaryReaderWriterTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/ByteOrderTest.cpp b/Foundation/testsuite/src/ByteOrderTest.cpp
index 613053481..7f829910b 100644
--- a/Foundation/testsuite/src/ByteOrderTest.cpp
+++ b/Foundation/testsuite/src/ByteOrderTest.cpp
@@ -27,7 +27,7 @@ using Poco::UInt64;
 #endif
 
 
-ByteOrderTest::ByteOrderTest(const std::string& name): CppUnit::TestCase(name)
+ByteOrderTest::ByteOrderTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/ChannelTest.cpp b/Foundation/testsuite/src/ChannelTest.cpp
index 8f5281025..546c0ebee 100644
--- a/Foundation/testsuite/src/ChannelTest.cpp
+++ b/Foundation/testsuite/src/ChannelTest.cpp
@@ -47,7 +47,7 @@ public:
 };
 
 
-ChannelTest::ChannelTest(const std::string& name): CppUnit::TestCase(name)
+ChannelTest::ChannelTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/ClassLoaderTest.cpp b/Foundation/testsuite/src/ClassLoaderTest.cpp
index b631d75c1..8340a4d01 100644
--- a/Foundation/testsuite/src/ClassLoaderTest.cpp
+++ b/Foundation/testsuite/src/ClassLoaderTest.cpp
@@ -27,7 +27,7 @@ using Poco::NotFoundException;
 using Poco::InvalidAccessException;
 
 
-ClassLoaderTest::ClassLoaderTest(const std::string& name): CppUnit::TestCase(name)
+ClassLoaderTest::ClassLoaderTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/ClockTest.cpp b/Foundation/testsuite/src/ClockTest.cpp
index 4b1e4f85a..944e0167c 100644
--- a/Foundation/testsuite/src/ClockTest.cpp
+++ b/Foundation/testsuite/src/ClockTest.cpp
@@ -22,7 +22,7 @@ using Poco::Clock;
 using Poco::Thread;
 
 
-ClockTest::ClockTest(const std::string& name): CppUnit::TestCase(name)
+ClockTest::ClockTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/ConditionTest.cpp b/Foundation/testsuite/src/ConditionTest.cpp
index a3e2b62ce..943a6c4ae 100644
--- a/Foundation/testsuite/src/ConditionTest.cpp
+++ b/Foundation/testsuite/src/ConditionTest.cpp
@@ -92,7 +92,7 @@ namespace
 }
 
 
-ConditionTest::ConditionTest(const std::string& name): CppUnit::TestCase(name)
+ConditionTest::ConditionTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/CoreTest.cpp b/Foundation/testsuite/src/CoreTest.cpp
index 01166429c..5d279da1e 100644
--- a/Foundation/testsuite/src/CoreTest.cpp
+++ b/Foundation/testsuite/src/CoreTest.cpp
@@ -112,7 +112,7 @@ struct Large
 #define ENABLE_BUGCHECK_TEST 0
 
 
-CoreTest::CoreTest(const std::string& name): CppUnit::TestCase(name)
+CoreTest::CoreTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/CountingStreamTest.cpp b/Foundation/testsuite/src/CountingStreamTest.cpp
index 859268406..dd95edc54 100644
--- a/Foundation/testsuite/src/CountingStreamTest.cpp
+++ b/Foundation/testsuite/src/CountingStreamTest.cpp
@@ -21,7 +21,7 @@ using Poco::CountingInputStream;
 using Poco::CountingOutputStream;
 
 
-CountingStreamTest::CountingStreamTest(const std::string& name): CppUnit::TestCase(name)
+CountingStreamTest::CountingStreamTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/DateTimeFormatterTest.cpp b/Foundation/testsuite/src/DateTimeFormatterTest.cpp
index b0b949665..aa72d70d4 100644
--- a/Foundation/testsuite/src/DateTimeFormatterTest.cpp
+++ b/Foundation/testsuite/src/DateTimeFormatterTest.cpp
@@ -25,8 +25,8 @@ using Poco::DateTimeFormat;
 using Poco::DateTimeFormatter;
 
 
-DateTimeFormatterTest::DateTimeFormatterTest(const std::string& name)
-	: CppUnit::TestCase(name)
+DateTimeFormatterTest::DateTimeFormatterTest(const std::string& rName)
+	: CppUnit::TestCase(rName)
 {
 	// Linker regresion SF #3288584
 	std::string message;
diff --git a/Foundation/testsuite/src/DateTimeParserTest.cpp b/Foundation/testsuite/src/DateTimeParserTest.cpp
index 0a58e7038..2f5066d6c 100644
--- a/Foundation/testsuite/src/DateTimeParserTest.cpp
+++ b/Foundation/testsuite/src/DateTimeParserTest.cpp
@@ -27,7 +27,7 @@ using Poco::Timestamp;
 using Poco::SyntaxException;
 
 
-DateTimeParserTest::DateTimeParserTest(const std::string& name): CppUnit::TestCase(name)
+DateTimeParserTest::DateTimeParserTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/DateTimeTest.cpp b/Foundation/testsuite/src/DateTimeTest.cpp
index 9261e8324..35c482777 100644
--- a/Foundation/testsuite/src/DateTimeTest.cpp
+++ b/Foundation/testsuite/src/DateTimeTest.cpp
@@ -25,7 +25,7 @@ using Poco::Timespan;
 using Poco::AssertionViolationException;
 
 
-DateTimeTest::DateTimeTest(const std::string& name): CppUnit::TestCase(name)
+DateTimeTest::DateTimeTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/DigestStreamTest.cpp b/Foundation/testsuite/src/DigestStreamTest.cpp
index 540745b75..eaf90f44a 100644
--- a/Foundation/testsuite/src/DigestStreamTest.cpp
+++ b/Foundation/testsuite/src/DigestStreamTest.cpp
@@ -25,7 +25,7 @@ using Poco::DigestEngine;
 using Poco::MD5Engine;
 
 
-DigestStreamTest::DigestStreamTest(const std::string& name): CppUnit::TestCase(name)
+DigestStreamTest::DigestStreamTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/DirectoryIteratorsTest.cpp b/Foundation/testsuite/src/DirectoryIteratorsTest.cpp
index d95d7aa7d..2a126c65d 100644
--- a/Foundation/testsuite/src/DirectoryIteratorsTest.cpp
+++ b/Foundation/testsuite/src/DirectoryIteratorsTest.cpp
@@ -23,8 +23,8 @@
 using namespace Poco;
 
 
-DirectoryIteratorsTest::DirectoryIteratorsTest(const std::string& name):
-	CppUnit::TestCase(name)
+DirectoryIteratorsTest::DirectoryIteratorsTest(const std::string& rName):
+	CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/DirectoryWatcherTest.cpp b/Foundation/testsuite/src/DirectoryWatcherTest.cpp
index 603d402e3..41a806e58 100644
--- a/Foundation/testsuite/src/DirectoryWatcherTest.cpp
+++ b/Foundation/testsuite/src/DirectoryWatcherTest.cpp
@@ -26,8 +26,8 @@
 using Poco::DirectoryWatcher;
 
 
-DirectoryWatcherTest::DirectoryWatcherTest(const std::string& name): 
-	CppUnit::TestCase(name),
+DirectoryWatcherTest::DirectoryWatcherTest(const std::string& rName): 
+	CppUnit::TestCase(rName),
 	_error(false)
 {
 }
diff --git a/Foundation/testsuite/src/DynamicFactoryTest.cpp b/Foundation/testsuite/src/DynamicFactoryTest.cpp
index 3a1e0f829..132eb3297 100644
--- a/Foundation/testsuite/src/DynamicFactoryTest.cpp
+++ b/Foundation/testsuite/src/DynamicFactoryTest.cpp
@@ -46,7 +46,7 @@ namespace
 }
 
 
-DynamicFactoryTest::DynamicFactoryTest(const std::string& name): CppUnit::TestCase(name)
+DynamicFactoryTest::DynamicFactoryTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/ExpireCacheTest.cpp b/Foundation/testsuite/src/ExpireCacheTest.cpp
index ef65623f4..8b3bc6c6d 100644
--- a/Foundation/testsuite/src/ExpireCacheTest.cpp
+++ b/Foundation/testsuite/src/ExpireCacheTest.cpp
@@ -28,7 +28,7 @@ using namespace Poco;
 #define DURWAIT  300
 
 
-ExpireCacheTest::ExpireCacheTest(const std::string& name): CppUnit::TestCase(name)
+ExpireCacheTest::ExpireCacheTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/ExpireLRUCacheTest.cpp b/Foundation/testsuite/src/ExpireLRUCacheTest.cpp
index 8631ebe83..524ecec52 100644
--- a/Foundation/testsuite/src/ExpireLRUCacheTest.cpp
+++ b/Foundation/testsuite/src/ExpireLRUCacheTest.cpp
@@ -28,7 +28,7 @@ using namespace Poco;
 #define DURWAIT  300
 
 
-ExpireLRUCacheTest::ExpireLRUCacheTest(const std::string& name): CppUnit::TestCase(name)
+ExpireLRUCacheTest::ExpireLRUCacheTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/FIFOBufferStreamTest.cpp b/Foundation/testsuite/src/FIFOBufferStreamTest.cpp
index 67683dc3c..4c0053edd 100644
--- a/Foundation/testsuite/src/FIFOBufferStreamTest.cpp
+++ b/Foundation/testsuite/src/FIFOBufferStreamTest.cpp
@@ -23,7 +23,7 @@ using Poco::FIFOBufferStream;
 using Poco::delegate;
 
 
-FIFOBufferStreamTest::FIFOBufferStreamTest(const std::string& name): CppUnit::TestCase(name)
+FIFOBufferStreamTest::FIFOBufferStreamTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/FIFOBufferTest.cpp b/Foundation/testsuite/src/FIFOBufferTest.cpp
index 2bde55d36..22306431b 100644
--- a/Foundation/testsuite/src/FIFOBufferTest.cpp
+++ b/Foundation/testsuite/src/FIFOBufferTest.cpp
@@ -31,8 +31,8 @@ using Poco::delegate;
 using std::memcpy;
 
 
-FIFOBufferTest::FIFOBufferTest(const std::string& name): 
-	CppUnit::TestCase(name),
+FIFOBufferTest::FIFOBufferTest(const std::string& rName): 
+	CppUnit::TestCase(rName),
 	_notToReadable(0),
 	_notToWritable(0),
 	_readableToNot(0),
diff --git a/Foundation/testsuite/src/FIFOEventTest.cpp b/Foundation/testsuite/src/FIFOEventTest.cpp
index 8951a78ad..b24658eee 100644
--- a/Foundation/testsuite/src/FIFOEventTest.cpp
+++ b/Foundation/testsuite/src/FIFOEventTest.cpp
@@ -26,7 +26,7 @@ using namespace Poco;
 #define LARGEINC 100
 
 
-FIFOEventTest::FIFOEventTest(const std::string& name): CppUnit::TestCase(name)
+FIFOEventTest::FIFOEventTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/FPETest.cpp b/Foundation/testsuite/src/FPETest.cpp
index c398587d0..be3c748b6 100644
--- a/Foundation/testsuite/src/FPETest.cpp
+++ b/Foundation/testsuite/src/FPETest.cpp
@@ -19,7 +19,7 @@
 using Poco::FPE;
 
 
-FPETest::FPETest(const std::string& name): CppUnit::TestCase(name)
+FPETest::FPETest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/FileChannelTest.cpp b/Foundation/testsuite/src/FileChannelTest.cpp
index c13d7aa1a..ce07b4c59 100644
--- a/Foundation/testsuite/src/FileChannelTest.cpp
+++ b/Foundation/testsuite/src/FileChannelTest.cpp
@@ -48,7 +48,7 @@ using Poco::DirectoryIterator;
 using Poco::InvalidArgumentException;
 
 
-FileChannelTest::FileChannelTest(const std::string& name): CppUnit::TestCase(name)
+FileChannelTest::FileChannelTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/FileStreamTest.cpp b/Foundation/testsuite/src/FileStreamTest.cpp
index 757f95e21..9b818e746 100644
--- a/Foundation/testsuite/src/FileStreamTest.cpp
+++ b/Foundation/testsuite/src/FileStreamTest.cpp
@@ -19,7 +19,7 @@
 #include "Poco/Exception.h"
 
 
-FileStreamTest::FileStreamTest(const std::string& name): CppUnit::TestCase(name)
+FileStreamTest::FileStreamTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/FileTest.cpp b/Foundation/testsuite/src/FileTest.cpp
index 99929ba1c..0e68e6ba4 100644
--- a/Foundation/testsuite/src/FileTest.cpp
+++ b/Foundation/testsuite/src/FileTest.cpp
@@ -30,7 +30,7 @@ using Poco::Timestamp;
 using Poco::Thread;
 
 
-FileTest::FileTest(const std::string& name): CppUnit::TestCase(name)
+FileTest::FileTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/FormatTest.cpp b/Foundation/testsuite/src/FormatTest.cpp
index 44a228ee5..2f4d883ef 100644
--- a/Foundation/testsuite/src/FormatTest.cpp
+++ b/Foundation/testsuite/src/FormatTest.cpp
@@ -24,7 +24,7 @@ using Poco::Int64;
 using Poco::UInt64;
 
 
-FormatTest::FormatTest(const std::string& name): CppUnit::TestCase(name)
+FormatTest::FormatTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/GlobTest.cpp b/Foundation/testsuite/src/GlobTest.cpp
index 6b2892537..a20e42899 100644
--- a/Foundation/testsuite/src/GlobTest.cpp
+++ b/Foundation/testsuite/src/GlobTest.cpp
@@ -24,7 +24,7 @@ using Poco::File;
 using Poco::Path;
 
 
-GlobTest::GlobTest(const std::string& name): CppUnit::TestCase(name)
+GlobTest::GlobTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/HMACEngineTest.cpp b/Foundation/testsuite/src/HMACEngineTest.cpp
index befeada21..089c16d40 100644
--- a/Foundation/testsuite/src/HMACEngineTest.cpp
+++ b/Foundation/testsuite/src/HMACEngineTest.cpp
@@ -22,7 +22,7 @@ using Poco::MD5Engine;
 using Poco::DigestEngine;
 
 
-HMACEngineTest::HMACEngineTest(const std::string& name): CppUnit::TestCase(name)
+HMACEngineTest::HMACEngineTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/HashMapTest.cpp b/Foundation/testsuite/src/HashMapTest.cpp
index 8725bf277..8240e05d1 100644
--- a/Foundation/testsuite/src/HashMapTest.cpp
+++ b/Foundation/testsuite/src/HashMapTest.cpp
@@ -21,7 +21,7 @@
 using Poco::HashMap;
 
 
-HashMapTest::HashMapTest(const std::string& name): CppUnit::TestCase(name)
+HashMapTest::HashMapTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/HashSetTest.cpp b/Foundation/testsuite/src/HashSetTest.cpp
index a24bb8c65..f6a2cb6db 100644
--- a/Foundation/testsuite/src/HashSetTest.cpp
+++ b/Foundation/testsuite/src/HashSetTest.cpp
@@ -21,7 +21,7 @@ using Poco::Hash;
 using Poco::HashSet;
 
 
-HashSetTest::HashSetTest(const std::string& name): CppUnit::TestCase(name)
+HashSetTest::HashSetTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/HashTableTest.cpp b/Foundation/testsuite/src/HashTableTest.cpp
index 3152e63e6..97a6348b8 100644
--- a/Foundation/testsuite/src/HashTableTest.cpp
+++ b/Foundation/testsuite/src/HashTableTest.cpp
@@ -20,7 +20,7 @@
 using namespace Poco;
 
 
-HashTableTest::HashTableTest(const std::string& name): CppUnit::TestCase(name)
+HashTableTest::HashTableTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/HexBinaryTest.cpp b/Foundation/testsuite/src/HexBinaryTest.cpp
index ad5951e1a..460dfc816 100644
--- a/Foundation/testsuite/src/HexBinaryTest.cpp
+++ b/Foundation/testsuite/src/HexBinaryTest.cpp
@@ -24,7 +24,7 @@ using Poco::HexBinaryDecoder;
 using Poco::DataFormatException;
 
 
-HexBinaryTest::HexBinaryTest(const std::string& name): CppUnit::TestCase(name)
+HexBinaryTest::HexBinaryTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/LRUCacheTest.cpp b/Foundation/testsuite/src/LRUCacheTest.cpp
index 068eaf1fe..ca2ca5c50 100644
--- a/Foundation/testsuite/src/LRUCacheTest.cpp
+++ b/Foundation/testsuite/src/LRUCacheTest.cpp
@@ -22,7 +22,7 @@
 using namespace Poco;
 
 
-LRUCacheTest::LRUCacheTest(const std::string& name): CppUnit::TestCase(name)
+LRUCacheTest::LRUCacheTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/LineEndingConverterTest.cpp b/Foundation/testsuite/src/LineEndingConverterTest.cpp
index 2179accfa..d551110a9 100644
--- a/Foundation/testsuite/src/LineEndingConverterTest.cpp
+++ b/Foundation/testsuite/src/LineEndingConverterTest.cpp
@@ -24,7 +24,7 @@ using Poco::OutputLineEndingConverter;
 using Poco::StreamCopier;
 
 
-LineEndingConverterTest::LineEndingConverterTest(const std::string& name): CppUnit::TestCase(name)
+LineEndingConverterTest::LineEndingConverterTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/LinearHashTableTest.cpp b/Foundation/testsuite/src/LinearHashTableTest.cpp
index 1f6b98c1d..ed935a12d 100644
--- a/Foundation/testsuite/src/LinearHashTableTest.cpp
+++ b/Foundation/testsuite/src/LinearHashTableTest.cpp
@@ -28,7 +28,7 @@ using Poco::Stopwatch;
 using Poco::NumberFormatter;
 
 
-LinearHashTableTest::LinearHashTableTest(const std::string& name): CppUnit::TestCase(name)
+LinearHashTableTest::LinearHashTableTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/ListMapTest.cpp b/Foundation/testsuite/src/ListMapTest.cpp
index 42e47cf48..194ea9541 100644
--- a/Foundation/testsuite/src/ListMapTest.cpp
+++ b/Foundation/testsuite/src/ListMapTest.cpp
@@ -21,7 +21,7 @@
 using Poco::ListMap;
 
 
-ListMapTest::ListMapTest(const std::string& name): CppUnit::TestCase(name)
+ListMapTest::ListMapTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/LocalDateTimeTest.cpp b/Foundation/testsuite/src/LocalDateTimeTest.cpp
index b4d06f8b2..8c9fccc6a 100644
--- a/Foundation/testsuite/src/LocalDateTimeTest.cpp
+++ b/Foundation/testsuite/src/LocalDateTimeTest.cpp
@@ -36,7 +36,7 @@ using std::strftime;
 #endif
 
 
-LocalDateTimeTest::LocalDateTimeTest(const std::string& name): CppUnit::TestCase(name)
+LocalDateTimeTest::LocalDateTimeTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/LogStreamTest.cpp b/Foundation/testsuite/src/LogStreamTest.cpp
index d62cf3ac7..e31a4f181 100644
--- a/Foundation/testsuite/src/LogStreamTest.cpp
+++ b/Foundation/testsuite/src/LogStreamTest.cpp
@@ -26,7 +26,7 @@ using Poco::Message;
 using Poco::AutoPtr;
 
 
-LogStreamTest::LogStreamTest(const std::string& name): CppUnit::TestCase(name)
+LogStreamTest::LogStreamTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/LoggerTest.cpp b/Foundation/testsuite/src/LoggerTest.cpp
index 3ae79b37f..d68c53c79 100644
--- a/Foundation/testsuite/src/LoggerTest.cpp
+++ b/Foundation/testsuite/src/LoggerTest.cpp
@@ -24,7 +24,7 @@ using Poco::Message;
 using Poco::AutoPtr;
 
 
-LoggerTest::LoggerTest(const std::string& name): CppUnit::TestCase(name)
+LoggerTest::LoggerTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/LoggingFactoryTest.cpp b/Foundation/testsuite/src/LoggingFactoryTest.cpp
index f11eafb8c..cc1470db7 100644
--- a/Foundation/testsuite/src/LoggingFactoryTest.cpp
+++ b/Foundation/testsuite/src/LoggingFactoryTest.cpp
@@ -61,7 +61,7 @@ namespace
 }
 
 
-LoggingFactoryTest::LoggingFactoryTest(const std::string& name): CppUnit::TestCase(name)
+LoggingFactoryTest::LoggingFactoryTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/LoggingRegistryTest.cpp b/Foundation/testsuite/src/LoggingRegistryTest.cpp
index 7d306c758..8aee33681 100644
--- a/Foundation/testsuite/src/LoggingRegistryTest.cpp
+++ b/Foundation/testsuite/src/LoggingRegistryTest.cpp
@@ -27,7 +27,7 @@ using Poco::PatternFormatter;
 using Poco::AutoPtr;
 
 
-LoggingRegistryTest::LoggingRegistryTest(const std::string& name): CppUnit::TestCase(name)
+LoggingRegistryTest::LoggingRegistryTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/MD4EngineTest.cpp b/Foundation/testsuite/src/MD4EngineTest.cpp
index a4702738c..6e8246884 100644
--- a/Foundation/testsuite/src/MD4EngineTest.cpp
+++ b/Foundation/testsuite/src/MD4EngineTest.cpp
@@ -20,7 +20,7 @@ using Poco::MD4Engine;
 using Poco::DigestEngine;
 
 
-MD4EngineTest::MD4EngineTest(const std::string& name): CppUnit::TestCase(name)
+MD4EngineTest::MD4EngineTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/MD5EngineTest.cpp b/Foundation/testsuite/src/MD5EngineTest.cpp
index cf9af69e1..101fc679b 100644
--- a/Foundation/testsuite/src/MD5EngineTest.cpp
+++ b/Foundation/testsuite/src/MD5EngineTest.cpp
@@ -20,7 +20,7 @@ using Poco::MD5Engine;
 using Poco::DigestEngine;
 
 
-MD5EngineTest::MD5EngineTest(const std::string& name): CppUnit::TestCase(name)
+MD5EngineTest::MD5EngineTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/ManifestTest.cpp b/Foundation/testsuite/src/ManifestTest.cpp
index a4ddd09fd..a025025ae 100644
--- a/Foundation/testsuite/src/ManifestTest.cpp
+++ b/Foundation/testsuite/src/ManifestTest.cpp
@@ -32,7 +32,7 @@ class MfTestObject: public MfTestBase
 };
 
 
-ManifestTest::ManifestTest(const std::string& name): CppUnit::TestCase(name)
+ManifestTest::ManifestTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/MemoryPoolTest.cpp b/Foundation/testsuite/src/MemoryPoolTest.cpp
index ca8a9b246..4fc2ba347 100644
--- a/Foundation/testsuite/src/MemoryPoolTest.cpp
+++ b/Foundation/testsuite/src/MemoryPoolTest.cpp
@@ -20,7 +20,7 @@
 using Poco::MemoryPool;
 
 
-MemoryPoolTest::MemoryPoolTest(const std::string& name): CppUnit::TestCase(name)
+MemoryPoolTest::MemoryPoolTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/MemoryStreamTest.cpp b/Foundation/testsuite/src/MemoryStreamTest.cpp
index 480bafcc3..f2d0d7164 100644
--- a/Foundation/testsuite/src/MemoryStreamTest.cpp
+++ b/Foundation/testsuite/src/MemoryStreamTest.cpp
@@ -22,7 +22,7 @@ using Poco::MemoryInputStream;
 using Poco::MemoryOutputStream;
 
 
-MemoryStreamTest::MemoryStreamTest(const std::string& name): CppUnit::TestCase(name)
+MemoryStreamTest::MemoryStreamTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/MutexTest.cpp b/Foundation/testsuite/src/MutexTest.cpp
index b248ddb70..7e89e588f 100644
--- a/Foundation/testsuite/src/MutexTest.cpp
+++ b/Foundation/testsuite/src/MutexTest.cpp
@@ -62,7 +62,7 @@ namespace
 }
 
 
-MutexTest::MutexTest(const std::string& name): CppUnit::TestCase(name)
+MutexTest::MutexTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/NDCTest.cpp b/Foundation/testsuite/src/NDCTest.cpp
index 94c13418e..aa450a06b 100644
--- a/Foundation/testsuite/src/NDCTest.cpp
+++ b/Foundation/testsuite/src/NDCTest.cpp
@@ -20,7 +20,7 @@
 using Poco::NDC;
 
 
-NDCTest::NDCTest(const std::string& name): CppUnit::TestCase(name)
+NDCTest::NDCTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/NamedEventTest.cpp b/Foundation/testsuite/src/NamedEventTest.cpp
index 320082dfa..690d2f1ae 100644
--- a/Foundation/testsuite/src/NamedEventTest.cpp
+++ b/Foundation/testsuite/src/NamedEventTest.cpp
@@ -51,7 +51,7 @@ namespace
 }
 
 
-NamedEventTest::NamedEventTest(const std::string& name): CppUnit::TestCase(name)
+NamedEventTest::NamedEventTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/NamedMutexTest.cpp b/Foundation/testsuite/src/NamedMutexTest.cpp
index 41e5f2719..84381a4d7 100644
--- a/Foundation/testsuite/src/NamedMutexTest.cpp
+++ b/Foundation/testsuite/src/NamedMutexTest.cpp
@@ -77,7 +77,7 @@ namespace
 }
 
 
-NamedMutexTest::NamedMutexTest(const std::string& name): CppUnit::TestCase(name)
+NamedMutexTest::NamedMutexTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/NamedTuplesTest.cpp b/Foundation/testsuite/src/NamedTuplesTest.cpp
index 4ebafc8a0..6dba626c9 100644
--- a/Foundation/testsuite/src/NamedTuplesTest.cpp
+++ b/Foundation/testsuite/src/NamedTuplesTest.cpp
@@ -34,7 +34,7 @@ using Poco::NotFoundException;
 using Poco::InvalidArgumentException;
 
 
-NamedTuplesTest::NamedTuplesTest(const std::string& name): CppUnit::TestCase(name)
+NamedTuplesTest::NamedTuplesTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/NotificationCenterTest.cpp b/Foundation/testsuite/src/NotificationCenterTest.cpp
index bc0d932f7..47e82d89f 100644
--- a/Foundation/testsuite/src/NotificationCenterTest.cpp
+++ b/Foundation/testsuite/src/NotificationCenterTest.cpp
@@ -31,7 +31,7 @@ class TestNotification: public Notification
 };
 
 
-NotificationCenterTest::NotificationCenterTest(const std::string& name): CppUnit::TestCase(name)
+NotificationCenterTest::NotificationCenterTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/NotificationQueueTest.cpp b/Foundation/testsuite/src/NotificationQueueTest.cpp
index 3b3669989..1c2fe5caa 100644
--- a/Foundation/testsuite/src/NotificationQueueTest.cpp
+++ b/Foundation/testsuite/src/NotificationQueueTest.cpp
@@ -49,7 +49,7 @@ namespace
 }
 
 
-NotificationQueueTest::NotificationQueueTest(const std::string& name): CppUnit::TestCase(name)
+NotificationQueueTest::NotificationQueueTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/NullStreamTest.cpp b/Foundation/testsuite/src/NullStreamTest.cpp
index cdd941a65..3f7f9a8a9 100644
--- a/Foundation/testsuite/src/NullStreamTest.cpp
+++ b/Foundation/testsuite/src/NullStreamTest.cpp
@@ -20,7 +20,7 @@ using Poco::NullInputStream;
 using Poco::NullOutputStream;
 
 
-NullStreamTest::NullStreamTest(const std::string& name): CppUnit::TestCase(name)
+NullStreamTest::NullStreamTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/NumberFormatterTest.cpp b/Foundation/testsuite/src/NumberFormatterTest.cpp
index a88fa09c3..194230456 100644
--- a/Foundation/testsuite/src/NumberFormatterTest.cpp
+++ b/Foundation/testsuite/src/NumberFormatterTest.cpp
@@ -21,7 +21,7 @@ using Poco::Int64;
 using Poco::UInt64;
 
 
-NumberFormatterTest::NumberFormatterTest(const std::string& name): CppUnit::TestCase(name)
+NumberFormatterTest::NumberFormatterTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/NumberParserTest.cpp b/Foundation/testsuite/src/NumberParserTest.cpp
index 1071d40ff..c2a01e654 100644
--- a/Foundation/testsuite/src/NumberParserTest.cpp
+++ b/Foundation/testsuite/src/NumberParserTest.cpp
@@ -42,7 +42,7 @@ using Poco::decimalSeparator;
 using Poco::thousandSeparator;
 
 
-NumberParserTest::NumberParserTest(const std::string& name): CppUnit::TestCase(name)
+NumberParserTest::NumberParserTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/ObjectPoolTest.cpp b/Foundation/testsuite/src/ObjectPoolTest.cpp
index 6f7a602b8..d05344ebd 100644
--- a/Foundation/testsuite/src/ObjectPoolTest.cpp
+++ b/Foundation/testsuite/src/ObjectPoolTest.cpp
@@ -20,7 +20,7 @@
 using Poco::ObjectPool;
 
 
-ObjectPoolTest::ObjectPoolTest(const std::string& name): CppUnit::TestCase(name)
+ObjectPoolTest::ObjectPoolTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/PBKDF2EngineTest.cpp b/Foundation/testsuite/src/PBKDF2EngineTest.cpp
index a3e004bab..ba0136dcf 100644
--- a/Foundation/testsuite/src/PBKDF2EngineTest.cpp
+++ b/Foundation/testsuite/src/PBKDF2EngineTest.cpp
@@ -24,7 +24,7 @@ using Poco::SHA1Engine;
 using Poco::DigestEngine;
 
 
-PBKDF2EngineTest::PBKDF2EngineTest(const std::string& name): CppUnit::TestCase(name)
+PBKDF2EngineTest::PBKDF2EngineTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/PathTest.cpp b/Foundation/testsuite/src/PathTest.cpp
index ac8a92506..c2e07f829 100644
--- a/Foundation/testsuite/src/PathTest.cpp
+++ b/Foundation/testsuite/src/PathTest.cpp
@@ -34,7 +34,7 @@ using Poco::PathSyntaxException;
 using Poco::Environment;
 
 
-PathTest::PathTest(const std::string& name): CppUnit::TestCase(name)
+PathTest::PathTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/PatternFormatterTest.cpp b/Foundation/testsuite/src/PatternFormatterTest.cpp
index 120a4ae8f..44e092cf4 100644
--- a/Foundation/testsuite/src/PatternFormatterTest.cpp
+++ b/Foundation/testsuite/src/PatternFormatterTest.cpp
@@ -23,7 +23,7 @@ using Poco::Message;
 using Poco::DateTime;
 
 
-PatternFormatterTest::PatternFormatterTest(const std::string& name): CppUnit::TestCase(name)
+PatternFormatterTest::PatternFormatterTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/PriorityEventTest.cpp b/Foundation/testsuite/src/PriorityEventTest.cpp
index 82037c571..9af24f2ca 100644
--- a/Foundation/testsuite/src/PriorityEventTest.cpp
+++ b/Foundation/testsuite/src/PriorityEventTest.cpp
@@ -26,7 +26,7 @@ using namespace Poco;
 #define LARGEINC 100
 
 
-PriorityEventTest::PriorityEventTest(const std::string& name): CppUnit::TestCase(name)
+PriorityEventTest::PriorityEventTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/PriorityNotificationQueueTest.cpp b/Foundation/testsuite/src/PriorityNotificationQueueTest.cpp
index e8be40a1f..9ad49892a 100644
--- a/Foundation/testsuite/src/PriorityNotificationQueueTest.cpp
+++ b/Foundation/testsuite/src/PriorityNotificationQueueTest.cpp
@@ -49,7 +49,7 @@ namespace
 }
 
 
-PriorityNotificationQueueTest::PriorityNotificationQueueTest(const std::string& name): CppUnit::TestCase(name)
+PriorityNotificationQueueTest::PriorityNotificationQueueTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/ProcessTest.cpp b/Foundation/testsuite/src/ProcessTest.cpp
index 18e8511dd..bf3a8d137 100644
--- a/Foundation/testsuite/src/ProcessTest.cpp
+++ b/Foundation/testsuite/src/ProcessTest.cpp
@@ -27,7 +27,7 @@ using Poco::PipeInputStream;
 using Poco::PipeOutputStream;
 
 
-ProcessTest::ProcessTest(const std::string& name): CppUnit::TestCase(name)
+ProcessTest::ProcessTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/RWLockTest.cpp b/Foundation/testsuite/src/RWLockTest.cpp
index 0c66064cc..1a3c110af 100644
--- a/Foundation/testsuite/src/RWLockTest.cpp
+++ b/Foundation/testsuite/src/RWLockTest.cpp
@@ -121,7 +121,7 @@ private:
 };
 
 
-RWLockTest::RWLockTest(const std::string& name): CppUnit::TestCase(name)
+RWLockTest::RWLockTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/RandomStreamTest.cpp b/Foundation/testsuite/src/RandomStreamTest.cpp
index e549a92fd..acda506f3 100644
--- a/Foundation/testsuite/src/RandomStreamTest.cpp
+++ b/Foundation/testsuite/src/RandomStreamTest.cpp
@@ -21,7 +21,7 @@
 using Poco::RandomInputStream;
 
 
-RandomStreamTest::RandomStreamTest(const std::string& name): CppUnit::TestCase(name)
+RandomStreamTest::RandomStreamTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/RandomTest.cpp b/Foundation/testsuite/src/RandomTest.cpp
index 1825600e3..9b944d622 100644
--- a/Foundation/testsuite/src/RandomTest.cpp
+++ b/Foundation/testsuite/src/RandomTest.cpp
@@ -21,7 +21,7 @@
 using Poco::UInt32;
 
 
-RandomTest::RandomTest(const std::string& name): CppUnit::TestCase(name)
+RandomTest::RandomTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/RegularExpressionTest.cpp b/Foundation/testsuite/src/RegularExpressionTest.cpp
index 3f749e4af..f56f041a9 100644
--- a/Foundation/testsuite/src/RegularExpressionTest.cpp
+++ b/Foundation/testsuite/src/RegularExpressionTest.cpp
@@ -21,7 +21,7 @@ using Poco::RegularExpression;
 using Poco::RegularExpressionException;
 
 
-RegularExpressionTest::RegularExpressionTest(const std::string& name): CppUnit::TestCase(name)
+RegularExpressionTest::RegularExpressionTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/SHA1EngineTest.cpp b/Foundation/testsuite/src/SHA1EngineTest.cpp
index 8d5ae0e51..a321de20b 100644
--- a/Foundation/testsuite/src/SHA1EngineTest.cpp
+++ b/Foundation/testsuite/src/SHA1EngineTest.cpp
@@ -20,7 +20,7 @@ using Poco::SHA1Engine;
 using Poco::DigestEngine;
 
 
-SHA1EngineTest::SHA1EngineTest(const std::string& name): CppUnit::TestCase(name)
+SHA1EngineTest::SHA1EngineTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/SemaphoreTest.cpp b/Foundation/testsuite/src/SemaphoreTest.cpp
index 4d0a7dde6..1083d8a4a 100644
--- a/Foundation/testsuite/src/SemaphoreTest.cpp
+++ b/Foundation/testsuite/src/SemaphoreTest.cpp
@@ -69,7 +69,7 @@ private:
 };
 
 
-SemaphoreTest::SemaphoreTest(const std::string& name): CppUnit::TestCase(name)
+SemaphoreTest::SemaphoreTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/SharedLibraryTest.cpp b/Foundation/testsuite/src/SharedLibraryTest.cpp
index 4808f0ba5..1201ff1da 100644
--- a/Foundation/testsuite/src/SharedLibraryTest.cpp
+++ b/Foundation/testsuite/src/SharedLibraryTest.cpp
@@ -26,7 +26,7 @@ using Poco::LibraryAlreadyLoadedException;
 typedef int (*GimmeFiveFunc)();
 
 
-SharedLibraryTest::SharedLibraryTest(const std::string& name): CppUnit::TestCase(name)
+SharedLibraryTest::SharedLibraryTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/SharedMemoryTest.cpp b/Foundation/testsuite/src/SharedMemoryTest.cpp
index d91f6049f..0c4905ceb 100644
--- a/Foundation/testsuite/src/SharedMemoryTest.cpp
+++ b/Foundation/testsuite/src/SharedMemoryTest.cpp
@@ -25,7 +25,7 @@
 using Poco::SharedMemory;
 
 
-SharedMemoryTest::SharedMemoryTest(const std::string& name): CppUnit::TestCase(name)
+SharedMemoryTest::SharedMemoryTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/SharedPtrTest.cpp b/Foundation/testsuite/src/SharedPtrTest.cpp
index 68bc8190d..5c0baa314 100644
--- a/Foundation/testsuite/src/SharedPtrTest.cpp
+++ b/Foundation/testsuite/src/SharedPtrTest.cpp
@@ -26,7 +26,7 @@ namespace
 	class TestObject
 	{
 	public:
-		TestObject(const std::string& data): _data(data)
+		TestObject(const std::string& rData): _data(rData)
 		{
 			++_count;
 		}
@@ -71,7 +71,7 @@ namespace
 }
 
 
-SharedPtrTest::SharedPtrTest(const std::string& name): CppUnit::TestCase(name)
+SharedPtrTest::SharedPtrTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/SimpleFileChannelTest.cpp b/Foundation/testsuite/src/SimpleFileChannelTest.cpp
index eb080b746..248a10680 100644
--- a/Foundation/testsuite/src/SimpleFileChannelTest.cpp
+++ b/Foundation/testsuite/src/SimpleFileChannelTest.cpp
@@ -33,7 +33,7 @@ using Poco::DateTimeFormatter;
 using Poco::AutoPtr;
 
 
-SimpleFileChannelTest::SimpleFileChannelTest(const std::string& name): CppUnit::TestCase(name)
+SimpleFileChannelTest::SimpleFileChannelTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/SimpleHashTableTest.cpp b/Foundation/testsuite/src/SimpleHashTableTest.cpp
index 05710fbf0..28c802f3e 100644
--- a/Foundation/testsuite/src/SimpleHashTableTest.cpp
+++ b/Foundation/testsuite/src/SimpleHashTableTest.cpp
@@ -20,7 +20,7 @@
 using namespace Poco;
 
 
-SimpleHashTableTest::SimpleHashTableTest(const std::string& name): CppUnit::TestCase(name)
+SimpleHashTableTest::SimpleHashTableTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/StopwatchTest.cpp b/Foundation/testsuite/src/StopwatchTest.cpp
index 164a47b0a..e40cb7942 100644
--- a/Foundation/testsuite/src/StopwatchTest.cpp
+++ b/Foundation/testsuite/src/StopwatchTest.cpp
@@ -23,7 +23,7 @@ using Poco::Timestamp;
 using Poco::Thread;
 
 
-StopwatchTest::StopwatchTest(const std::string& name): CppUnit::TestCase(name)
+StopwatchTest::StopwatchTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/StreamConverterTest.cpp b/Foundation/testsuite/src/StreamConverterTest.cpp
index d6be3c896..593e01284 100644
--- a/Foundation/testsuite/src/StreamConverterTest.cpp
+++ b/Foundation/testsuite/src/StreamConverterTest.cpp
@@ -29,7 +29,7 @@ using Poco::ASCIIEncoding;
 using Poco::StreamCopier;
 
 
-StreamConverterTest::StreamConverterTest(const std::string& name): CppUnit::TestCase(name)
+StreamConverterTest::StreamConverterTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/StreamCopierTest.cpp b/Foundation/testsuite/src/StreamCopierTest.cpp
index b16a242cc..c9dd2cf08 100644
--- a/Foundation/testsuite/src/StreamCopierTest.cpp
+++ b/Foundation/testsuite/src/StreamCopierTest.cpp
@@ -20,7 +20,7 @@
 using Poco::StreamCopier;
 
 
-StreamCopierTest::StreamCopierTest(const std::string& name): CppUnit::TestCase(name)
+StreamCopierTest::StreamCopierTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/StreamTokenizerTest.cpp b/Foundation/testsuite/src/StreamTokenizerTest.cpp
index 935f902a3..e0427b0ee 100644
--- a/Foundation/testsuite/src/StreamTokenizerTest.cpp
+++ b/Foundation/testsuite/src/StreamTokenizerTest.cpp
@@ -105,7 +105,7 @@ public:
 };
 
 
-StreamTokenizerTest::StreamTokenizerTest(const std::string& name): CppUnit::TestCase(name)
+StreamTokenizerTest::StreamTokenizerTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/StringTest.cpp b/Foundation/testsuite/src/StringTest.cpp
index 5a1431cfb..52a11d493 100644
--- a/Foundation/testsuite/src/StringTest.cpp
+++ b/Foundation/testsuite/src/StringTest.cpp
@@ -64,7 +64,7 @@ using Poco::Stopwatch;
 using Poco::RangeException;
 
 
-StringTest::StringTest(const std::string& name): CppUnit::TestCase(name)
+StringTest::StringTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/StringTokenizerTest.cpp b/Foundation/testsuite/src/StringTokenizerTest.cpp
index 3885ab433..3c75f7e67 100644
--- a/Foundation/testsuite/src/StringTokenizerTest.cpp
+++ b/Foundation/testsuite/src/StringTokenizerTest.cpp
@@ -22,7 +22,7 @@ using Poco::RangeException;
 using Poco::NotFoundException;
 
 
-StringTokenizerTest::StringTokenizerTest(const std::string& name): CppUnit::TestCase(name)
+StringTokenizerTest::StringTokenizerTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/TaskManagerTest.cpp b/Foundation/testsuite/src/TaskManagerTest.cpp
index 8bdc3fe2c..d71cf4f9d 100644
--- a/Foundation/testsuite/src/TaskManagerTest.cpp
+++ b/Foundation/testsuite/src/TaskManagerTest.cpp
@@ -234,7 +234,7 @@ namespace
 }
 
 
-TaskManagerTest::TaskManagerTest(const std::string& name): CppUnit::TestCase(name)
+TaskManagerTest::TaskManagerTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/TaskTest.cpp b/Foundation/testsuite/src/TaskTest.cpp
index 16bdbf93a..8836680ad 100644
--- a/Foundation/testsuite/src/TaskTest.cpp
+++ b/Foundation/testsuite/src/TaskTest.cpp
@@ -58,7 +58,7 @@ namespace
 }
 
 
-TaskTest::TaskTest(const std::string& name): CppUnit::TestCase(name)
+TaskTest::TaskTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/TeeStreamTest.cpp b/Foundation/testsuite/src/TeeStreamTest.cpp
index 40470b021..a5726550b 100644
--- a/Foundation/testsuite/src/TeeStreamTest.cpp
+++ b/Foundation/testsuite/src/TeeStreamTest.cpp
@@ -21,7 +21,7 @@ using Poco::TeeInputStream;
 using Poco::TeeOutputStream;
 
 
-TeeStreamTest::TeeStreamTest(const std::string& name): CppUnit::TestCase(name)
+TeeStreamTest::TeeStreamTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/TextBufferIteratorTest.cpp b/Foundation/testsuite/src/TextBufferIteratorTest.cpp
index 7c010f74d..54345da9b 100644
--- a/Foundation/testsuite/src/TextBufferIteratorTest.cpp
+++ b/Foundation/testsuite/src/TextBufferIteratorTest.cpp
@@ -25,7 +25,7 @@ using Poco::UTF8Encoding;
 using Poco::UTF16Encoding;
 
 
-TextBufferIteratorTest::TextBufferIteratorTest(const std::string& name): CppUnit::TestCase(name)
+TextBufferIteratorTest::TextBufferIteratorTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/TextConverterTest.cpp b/Foundation/testsuite/src/TextConverterTest.cpp
index 308493a05..76b6466e0 100644
--- a/Foundation/testsuite/src/TextConverterTest.cpp
+++ b/Foundation/testsuite/src/TextConverterTest.cpp
@@ -27,7 +27,7 @@
 using namespace Poco;
 
 
-TextConverterTest::TextConverterTest(const std::string& name): CppUnit::TestCase(name)
+TextConverterTest::TextConverterTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/TextEncodingTest.cpp b/Foundation/testsuite/src/TextEncodingTest.cpp
index 8de11b392..61cde30cb 100644
--- a/Foundation/testsuite/src/TextEncodingTest.cpp
+++ b/Foundation/testsuite/src/TextEncodingTest.cpp
@@ -26,7 +26,7 @@
 using namespace Poco;
 
 
-TextEncodingTest::TextEncodingTest(const std::string& name): CppUnit::TestCase(name)
+TextEncodingTest::TextEncodingTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/TextIteratorTest.cpp b/Foundation/testsuite/src/TextIteratorTest.cpp
index d17d393a6..1c3035437 100644
--- a/Foundation/testsuite/src/TextIteratorTest.cpp
+++ b/Foundation/testsuite/src/TextIteratorTest.cpp
@@ -25,7 +25,7 @@ using Poco::UTF8Encoding;
 using Poco::UTF16Encoding;
 
 
-TextIteratorTest::TextIteratorTest(const std::string& name): CppUnit::TestCase(name)
+TextIteratorTest::TextIteratorTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/ThreadLocalTest.cpp b/Foundation/testsuite/src/ThreadLocalTest.cpp
index f051260f7..c51d5c23d 100644
--- a/Foundation/testsuite/src/ThreadLocalTest.cpp
+++ b/Foundation/testsuite/src/ThreadLocalTest.cpp
@@ -60,7 +60,7 @@ struct TLTestStruct
 ThreadLocal<int> TLTestRunnable::_count;
 
 
-ThreadLocalTest::ThreadLocalTest(const std::string& name): CppUnit::TestCase(name)
+ThreadLocalTest::ThreadLocalTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/ThreadPoolTest.cpp b/Foundation/testsuite/src/ThreadPoolTest.cpp
index ba9177050..e52dcf54b 100644
--- a/Foundation/testsuite/src/ThreadPoolTest.cpp
+++ b/Foundation/testsuite/src/ThreadPoolTest.cpp
@@ -25,7 +25,7 @@ using Poco::RunnableAdapter;
 using Poco::Thread;
 
 
-ThreadPoolTest::ThreadPoolTest(const std::string& name): CppUnit::TestCase(name), _event(Event::EVENT_MANUALRESET)
+ThreadPoolTest::ThreadPoolTest(const std::string& rName): CppUnit::TestCase(rName), _event(Event::EVENT_MANUALRESET)
 {
 }
 
diff --git a/Foundation/testsuite/src/ThreadTest.cpp b/Foundation/testsuite/src/ThreadTest.cpp
index ad4f5df98..b1602e1bd 100644
--- a/Foundation/testsuite/src/ThreadTest.cpp
+++ b/Foundation/testsuite/src/ThreadTest.cpp
@@ -148,7 +148,7 @@ private:
 };
 
 
-ThreadTest::ThreadTest(const std::string& name): CppUnit::TestCase(name)
+ThreadTest::ThreadTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/TimedNotificationQueueTest.cpp b/Foundation/testsuite/src/TimedNotificationQueueTest.cpp
index 52418d19b..c2b08950b 100644
--- a/Foundation/testsuite/src/TimedNotificationQueueTest.cpp
+++ b/Foundation/testsuite/src/TimedNotificationQueueTest.cpp
@@ -45,7 +45,7 @@ namespace
 }
 
 
-TimedNotificationQueueTest::TimedNotificationQueueTest(const std::string& name): CppUnit::TestCase(name)
+TimedNotificationQueueTest::TimedNotificationQueueTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/TimerTest.cpp b/Foundation/testsuite/src/TimerTest.cpp
index 1707a8562..0ac75f43c 100644
--- a/Foundation/testsuite/src/TimerTest.cpp
+++ b/Foundation/testsuite/src/TimerTest.cpp
@@ -23,7 +23,7 @@ using Poco::Thread;
 using Poco::Stopwatch;
 
 
-TimerTest::TimerTest(const std::string& name): CppUnit::TestCase(name)
+TimerTest::TimerTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/TimespanTest.cpp b/Foundation/testsuite/src/TimespanTest.cpp
index 1f146ee29..3af7608a7 100644
--- a/Foundation/testsuite/src/TimespanTest.cpp
+++ b/Foundation/testsuite/src/TimespanTest.cpp
@@ -19,7 +19,7 @@
 using Poco::Timespan;
 
 
-TimespanTest::TimespanTest(const std::string& name): CppUnit::TestCase(name)
+TimespanTest::TimespanTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/TimestampTest.cpp b/Foundation/testsuite/src/TimestampTest.cpp
index a4e010ad8..254cad5f9 100644
--- a/Foundation/testsuite/src/TimestampTest.cpp
+++ b/Foundation/testsuite/src/TimestampTest.cpp
@@ -21,7 +21,7 @@ using Poco::Timestamp;
 using Poco::Thread;
 
 
-TimestampTest::TimestampTest(const std::string& name): CppUnit::TestCase(name)
+TimestampTest::TimestampTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/TimezoneTest.cpp b/Foundation/testsuite/src/TimezoneTest.cpp
index b9b4818d0..08ffb2dce 100644
--- a/Foundation/testsuite/src/TimezoneTest.cpp
+++ b/Foundation/testsuite/src/TimezoneTest.cpp
@@ -20,7 +20,7 @@
 using Poco::Timezone;
 
 
-TimezoneTest::TimezoneTest(const std::string& name): CppUnit::TestCase(name)
+TimezoneTest::TimezoneTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
@@ -32,10 +32,10 @@ TimezoneTest::~TimezoneTest()
 
 void TimezoneTest::testTimezone()
 {
-	std::string name = Timezone::name();
+	std::string timezoneName = Timezone::name();
 	std::string stdName = Timezone::standardName();
 	std::string dstName = Timezone::dstName();
-	std::cout << "Timezone Names: " << name << ", " << stdName << ", " << dstName << std::endl;
+	std::cout << "Timezone Names: " << timezoneName << ", " << stdName << ", " << dstName << std::endl;
 	int utcOffset = Timezone::utcOffset();
 	std::cout << "UTC Offset: " << utcOffset << std::endl;
 	int dst = Timezone::dst();
diff --git a/Foundation/testsuite/src/TuplesTest.cpp b/Foundation/testsuite/src/TuplesTest.cpp
index 810de7751..4ff85e9b5 100644
--- a/Foundation/testsuite/src/TuplesTest.cpp
+++ b/Foundation/testsuite/src/TuplesTest.cpp
@@ -46,7 +46,7 @@ using Poco::Int32;
 using Poco::UInt32;
 
 
-TuplesTest::TuplesTest(const std::string& name): CppUnit::TestCase(name)
+TuplesTest::TuplesTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/TypeListTest.cpp b/Foundation/testsuite/src/TypeListTest.cpp
index e101666b0..3f22fd994 100644
--- a/Foundation/testsuite/src/TypeListTest.cpp
+++ b/Foundation/testsuite/src/TypeListTest.cpp
@@ -51,7 +51,7 @@ using Poco::UInt32;
 using Poco::Void;
 
 
-TypeListTest::TypeListTest(const std::string& name): CppUnit::TestCase(name)
+TypeListTest::TypeListTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/URIStreamOpenerTest.cpp b/Foundation/testsuite/src/URIStreamOpenerTest.cpp
index 295b715e3..575ba6a6f 100644
--- a/Foundation/testsuite/src/URIStreamOpenerTest.cpp
+++ b/Foundation/testsuite/src/URIStreamOpenerTest.cpp
@@ -46,7 +46,7 @@ namespace
 }
 
 
-URIStreamOpenerTest::URIStreamOpenerTest(const std::string& name): CppUnit::TestCase(name)
+URIStreamOpenerTest::URIStreamOpenerTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/URITest.cpp b/Foundation/testsuite/src/URITest.cpp
index 0a5bd774c..7adf13b67 100644
--- a/Foundation/testsuite/src/URITest.cpp
+++ b/Foundation/testsuite/src/URITest.cpp
@@ -21,7 +21,7 @@ using Poco::URI;
 using Poco::Path;
 
 
-URITest::URITest(const std::string& name): CppUnit::TestCase(name)
+URITest::URITest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/UTF8StringTest.cpp b/Foundation/testsuite/src/UTF8StringTest.cpp
index 118db736b..dfde0572a 100644
--- a/Foundation/testsuite/src/UTF8StringTest.cpp
+++ b/Foundation/testsuite/src/UTF8StringTest.cpp
@@ -19,7 +19,7 @@
 using Poco::UTF8;
 
 
-UTF8StringTest::UTF8StringTest(const std::string& name): CppUnit::TestCase(name)
+UTF8StringTest::UTF8StringTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/UUIDGeneratorTest.cpp b/Foundation/testsuite/src/UUIDGeneratorTest.cpp
index 86a84080e..e49922f12 100644
--- a/Foundation/testsuite/src/UUIDGeneratorTest.cpp
+++ b/Foundation/testsuite/src/UUIDGeneratorTest.cpp
@@ -23,7 +23,7 @@ using Poco::UUIDGenerator;
 using Poco::UUID;
 
 
-UUIDGeneratorTest::UUIDGeneratorTest(const std::string& name): CppUnit::TestCase(name)
+UUIDGeneratorTest::UUIDGeneratorTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/UUIDTest.cpp b/Foundation/testsuite/src/UUIDTest.cpp
index a5297608b..9558a76d7 100644
--- a/Foundation/testsuite/src/UUIDTest.cpp
+++ b/Foundation/testsuite/src/UUIDTest.cpp
@@ -20,7 +20,7 @@
 using Poco::UUID;
 
 
-UUIDTest::UUIDTest(const std::string& name): CppUnit::TestCase(name)
+UUIDTest::UUIDTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/UnicodeConverterTest.cpp b/Foundation/testsuite/src/UnicodeConverterTest.cpp
index 1d26fef62..83da547fb 100644
--- a/Foundation/testsuite/src/UnicodeConverterTest.cpp
+++ b/Foundation/testsuite/src/UnicodeConverterTest.cpp
@@ -27,7 +27,7 @@ using Poco::UTF32Char;
 using Poco::UTF32String;
 
 
-UnicodeConverterTest::UnicodeConverterTest(const std::string& name): CppUnit::TestCase(name)
+UnicodeConverterTest::UnicodeConverterTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/UniqueExpireCacheTest.cpp b/Foundation/testsuite/src/UniqueExpireCacheTest.cpp
index e992fd745..e2d3c82f7 100644
--- a/Foundation/testsuite/src/UniqueExpireCacheTest.cpp
+++ b/Foundation/testsuite/src/UniqueExpireCacheTest.cpp
@@ -47,7 +47,7 @@ typedef AccessExpirationDecorator<int> DIntVal;
 #define DURWAIT  300
 
 
-UniqueExpireCacheTest::UniqueExpireCacheTest(const std::string& name): CppUnit::TestCase(name)
+UniqueExpireCacheTest::UniqueExpireCacheTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/UniqueExpireLRUCacheTest.cpp b/Foundation/testsuite/src/UniqueExpireLRUCacheTest.cpp
index d63bd3108..1a8484730 100644
--- a/Foundation/testsuite/src/UniqueExpireLRUCacheTest.cpp
+++ b/Foundation/testsuite/src/UniqueExpireLRUCacheTest.cpp
@@ -48,7 +48,7 @@ typedef AccessExpirationDecorator<int> DIntVal;
 #define DURWAIT  300
 
 
-UniqueExpireLRUCacheTest::UniqueExpireLRUCacheTest(const std::string& name): CppUnit::TestCase(name)
+UniqueExpireLRUCacheTest::UniqueExpireLRUCacheTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/VarTest.cpp b/Foundation/testsuite/src/VarTest.cpp
index e1743f985..f473990e0 100644
--- a/Foundation/testsuite/src/VarTest.cpp
+++ b/Foundation/testsuite/src/VarTest.cpp
@@ -58,7 +58,7 @@ private:
 };
 
 
-VarTest::VarTest(const std::string& name): CppUnit::TestCase(name)
+VarTest::VarTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/Foundation/testsuite/src/ZLibTest.cpp b/Foundation/testsuite/src/ZLibTest.cpp
index 44656eb7e..0579629df 100644
--- a/Foundation/testsuite/src/ZLibTest.cpp
+++ b/Foundation/testsuite/src/ZLibTest.cpp
@@ -30,7 +30,7 @@ using Poco::DeflatingStreamBuf;
 using Poco::StreamCopier;
 
 
-ZLibTest::ZLibTest(const std::string& name): CppUnit::TestCase(name)
+ZLibTest::ZLibTest(const std::string& rName): CppUnit::TestCase(rName)
 {
 }
 
diff --git a/build/config/iPhone b/build/config/iPhone
index 84f3d1d8c..157da92b7 100644
--- a/build/config/iPhone
+++ b/build/config/iPhone
@@ -31,7 +31,7 @@ IPHONE_SDK_VERSION_MIN ?= $(patsubst %.sdk,%,$(patsubst $(IPHONE_SDK_ROOT_DIR)%,
 POCO_TARGET_OSNAME     ?= $(IPHONE_SDK)
 POCO_TARGET_OSARCH     ?= armv6
 TOOL_PREFIX            ?= $(shell xcode-select -print-path)/Platforms/$(IPHONE_SDK).platform/Developer/usr/bin
-OSFLAGS                ?= -arch $(POCO_TARGET_OSARCH) -isysroot $(IPHONE_SDK_BASE) -mthumb -miphoneos-version-min=$(IPHONE_SDK_VERSION_MIN)
+OSFLAGS                ?= -arch $(POCO_TARGET_OSARCH) -isysroot $(IPHONE_SDK_BASE) -mthumb -miphoneos-version-min=$(IPHONE_SDK_VERSION_MIN) -fembed-bitcode
 
 #
 # Tools