diff --git a/code/Memory/MemUtils.cpp b/code/Memory/MemUtils.cpp
index e420d4d..25c28a6 100644
--- a/code/Memory/MemUtils.cpp
+++ b/code/Memory/MemUtils.cpp
@@ -22,10 +22,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 -----------------------------------------------------------------------------------------------*/
 #include <cppcore/Memory/MemUtils.h>
 
-namespace CPPCore {
+namespace cppcore {
     
 void MemUtils::clearMemory( void *buffer, size_t size ) {
     ::memset( buffer, 0, size );
 }
 
-} // Namespace CPPCore 
+} // Namespace cppcore 
diff --git a/code/Random/RandomGenerator.cpp b/code/Random/RandomGenerator.cpp
index c95c552..43b39fe 100644
--- a/code/Random/RandomGenerator.cpp
+++ b/code/Random/RandomGenerator.cpp
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <time.h>
 #include <cassert>
 
-namespace CPPCore {
+namespace cppcore {
 
 static const unsigned int N = 624;
 static const unsigned int M = 397;
@@ -98,4 +98,4 @@ int RandomGenerator::get( int lower, int upper ) {
     return ret;
 }
 
-} // Namespace CPPCore
+} // Namespace cppcore
diff --git a/include/cppcore/CPPCoreCommon.h b/include/cppcore/CPPCoreCommon.h
index 7239212..51f8bbc 100644
--- a/include/cppcore/CPPCoreCommon.h
+++ b/include/cppcore/CPPCoreCommon.h
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <stdio.h>
 #include <stdarg.h>
 
-namespace CPPCore {
+namespace cppcore {
 
 #if defined( _WIN32 ) || defined( _WIN64 )
 #   define CPPCORE_WINDOWS
@@ -103,4 +103,4 @@ public: \
 //-------------------------------------------------------------------------------------------------
 #define CPPCORE_ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
-} // Namespace CPPCore
+} // Namespace cppcore
diff --git a/include/cppcore/Common/Hash.h b/include/cppcore/Common/Hash.h
index 8a9dc4d..981122b 100644
--- a/include/cppcore/Common/Hash.h
+++ b/include/cppcore/Common/Hash.h
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <cppcore/CPPCoreCommon.h>
 
-namespace CPPCore {
+namespace cppcore {
 
 //-------------------------------------------------------------------------------------------------
 ///	@class		Hash
@@ -122,4 +122,4 @@ inline unsigned int Hash::hashValue() const {
     return m_hash;
 }
 
-} // Namespace CPPCore
+} // Namespace cppcore
diff --git a/include/cppcore/Common/TBitField.h b/include/cppcore/Common/TBitField.h
index 15ca555..83fc445 100644
--- a/include/cppcore/Common/TBitField.h
+++ b/include/cppcore/Common/TBitField.h
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <cppcore/CPPCoreCommon.h>
 #include <cassert>
 
-namespace CPPCore {
+namespace cppcore {
 
 //-------------------------------------------------------------------------------------------------
 ///	@class		TBitField
@@ -135,4 +135,4 @@ inline size_t TBitField<T>::maxBits() const {
     return numBits;
 }
 
-} // namespace CPPCore
+} // namespace cppcore
diff --git a/include/cppcore/Common/TOptional.h b/include/cppcore/Common/TOptional.h
index 140e837..a20d8a0 100644
--- a/include/cppcore/Common/TOptional.h
+++ b/include/cppcore/Common/TOptional.h
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <cppcore/CPPCoreCommon.h>
 
-namespace CPPCore {
+namespace cppcore {
 
 //-------------------------------------------------------------------------------------------------
 ///	@class		TOptional
@@ -101,4 +101,4 @@ inline T &TOptional<T>::operator = (const T &value) {
     return *this;
 }
 
-}
+} // namespace cppcore
diff --git a/include/cppcore/Common/TSharedPtr.h b/include/cppcore/Common/TSharedPtr.h
index 0eec425..7d7c044 100644
--- a/include/cppcore/Common/TSharedPtr.h
+++ b/include/cppcore/Common/TSharedPtr.h
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <cppcore/CPPCoreCommon.h>
 
-namespace CPPCore {
+namespace cppcore {
 
 //-------------------------------------------------------------------------------------------------
 ///	@class		TSharedPtr
@@ -160,4 +160,4 @@ inline bool TSharedPtr<T>::operator!=(const TSharedPtr<T> &rhs) const {
     return !(*this == rhs);
 }
 
-} // Namespace CPPCore
+} // Namespace cppcore
diff --git a/include/cppcore/Common/TStringBase.h b/include/cppcore/Common/TStringBase.h
index 40ed2fc..2b8aa6d 100644
--- a/include/cppcore/Common/TStringBase.h
+++ b/include/cppcore/Common/TStringBase.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <cppcore/CPPCoreCommon.h>
 #include <malloc.h>
 
-namespace CPPCore {
+namespace cppcore {
 
 template <class T>
 struct Allocator {
@@ -189,4 +189,3 @@ template <class TCharType>
 inline TCharType *TStringView<TCharType>::data() const {
 }
 
-} // Namespace CPPCore
diff --git a/include/cppcore/Common/Variant.h b/include/cppcore/Common/Variant.h
index 1750a73..e90fed4 100644
--- a/include/cppcore/Common/Variant.h
+++ b/include/cppcore/Common/Variant.h
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <cassert>
 #include <string>
 
-namespace CPPCore {
+namespace cppcore {
 
 //-------------------------------------------------------------------------------------------------
 ///	@class		Variant
@@ -530,4 +530,4 @@ inline void Variant::reserve(Type type, size_t size) {
     m_Type = type;
 }
 
-} // Namespace CPPCore
+} // Namespace cppcore
diff --git a/include/cppcore/Container/TArray.h b/include/cppcore/Container/TArray.h
index 1f63203..1ebbca8 100644
--- a/include/cppcore/Container/TArray.h
+++ b/include/cppcore/Container/TArray.h
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <cppcore/CPPCoreCommon.h>
 #include <cppcore/Memory/TDefaultAllocator.h>
 
-namespace CPPCore {
+namespace cppcore {
 namespace Details {
 
 inline static size_t getGrowing(size_t size) {
@@ -532,4 +532,4 @@ inline bool TArray<T, TAlloc>::operator == (const TArray<T, TAlloc> &rhs) const
     return true;
 }
 
-} // Namespace CPPCore
+} // Namespace cppcore
diff --git a/include/cppcore/Container/THashMap.h b/include/cppcore/Container/THashMap.h
index 49e0f5f..9c1ffca 100644
--- a/include/cppcore/Container/THashMap.h
+++ b/include/cppcore/Container/THashMap.h
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <cppcore/Common/Hash.h>
 #include <cppcore/Memory/TDefaultAllocator.h>
 
-namespace CPPCore {
+namespace cppcore {
 
 //-------------------------------------------------------------------------------------------------
 ///	@class		THashMap
@@ -360,4 +360,4 @@ inline void THashMap<T, U, TAlloc>::Node::releaseList() {
     }
 }
 
-} // Namespace CPPCore
+} // Namespace cppcore
diff --git a/include/cppcore/Container/TList.h b/include/cppcore/Container/TList.h
index a2a5ece..69c3177 100644
--- a/include/cppcore/Container/TList.h
+++ b/include/cppcore/Container/TList.h
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <cppcore/CPPCoreCommon.h>
 #include <cppcore/Memory/TDefaultAllocator.h>
 
-namespace CPPCore {
+namespace cppcore {
 
 //-------------------------------------------------------------------------------------------------
 ///	@class		TList
@@ -474,4 +474,4 @@ inline T &TList<T, TAlloc>::Iterator::operator*() const {
     return m_pNode->m_Item;
 }
 
-} // Namespace CPPCore
+} // Namespace cppcore
diff --git a/include/cppcore/Container/TQueue.h b/include/cppcore/Container/TQueue.h
index 63c32fc..9bb6ab2 100644
--- a/include/cppcore/Container/TQueue.h
+++ b/include/cppcore/Container/TQueue.h
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <cppcore/Container/TList.h>
 #include <cppcore/Memory/TDefaultAllocator.h>
 
-namespace CPPCore {
+namespace cppcore {
 
 //-------------------------------------------------------------------------------------------------
 ///	@class		TQueue
@@ -150,4 +150,4 @@ inline bool TQueue<T, TAlloc>::operator == ( const TQueue<T, TAlloc> &rhs ) cons
     return m_QueueData == rhs.m_QueueData;
 }
 
-} // Namespace CPPCore
+} // Namespace cppcore
diff --git a/include/cppcore/Container/TStaticArray.h b/include/cppcore/Container/TStaticArray.h
index 8accb39..be555c0 100644
--- a/include/cppcore/Container/TStaticArray.h
+++ b/include/cppcore/Container/TStaticArray.h
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <string.h>
 #include <cassert>
 
-namespace CPPCore {
+namespace cppcore {
 
 //-------------------------------------------------------------------------------------------------
 ///	@class		TArray
@@ -153,4 +153,4 @@ inline TStaticArray<T, len> &TStaticArray<T, len>::operator=(const TStaticArray<
     return *this;
 }
 
-} // namespace CPPCore
+} // namespace cppcore
diff --git a/include/cppcore/IO/FileSystem.h b/include/cppcore/IO/FileSystem.h
index 7ce67c6..5ecf330 100644
--- a/include/cppcore/IO/FileSystem.h
+++ b/include/cppcore/IO/FileSystem.h
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <sys/statvfs.h>
 #endif
 
-namespace CPPCore {
+namespace cppcore {
 
 /// @brief  The file-system space info.
 struct FSSpace {
@@ -99,4 +99,4 @@ inline FSSpace *FileSystem::getFreeDiskSpace() {
     return &m_fsSpace;
 }
 
-} // Namespace CPPCore
+} // Namespace cppcore
diff --git a/include/cppcore/Memory/MemUtils.h b/include/cppcore/Memory/MemUtils.h
index 311c3fe..e0b57a7 100644
--- a/include/cppcore/Memory/MemUtils.h
+++ b/include/cppcore/Memory/MemUtils.h
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <string.h>
 #include <cinttypes>
 
-namespace CPPCore {
+namespace cppcore {
 
 #define ALIGN_MASK(value, mask) (((value) + (mask)) & ((~0) & (~(mask))))
 
@@ -78,4 +78,4 @@ inline const void *MemUtils::alignPtr(void *ptr, size_t extra, size_t align) {
     return unaligned.mPtr;
 }
 
-} // Namespace CPPCore
+} // Namespace cppcore
diff --git a/include/cppcore/Memory/TDefaultAllocator.h b/include/cppcore/Memory/TDefaultAllocator.h
index c0fb3de..f7182ab 100644
--- a/include/cppcore/Memory/TDefaultAllocator.h
+++ b/include/cppcore/Memory/TDefaultAllocator.h
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <string>
 
-namespace CPPCore {
+namespace cppcore {
 
 //-------------------------------------------------------------------------------------------------
 /// @class      TDefaultAllocator
@@ -129,4 +129,4 @@ inline void TDefaultAllocator<T>::dumpAllocations(std::string &allocs) {
     // empty
 }
 
-} // Namespace CPPCore
+} // Namespace cppcore
diff --git a/include/cppcore/Memory/TPoolAllocator.h b/include/cppcore/Memory/TPoolAllocator.h
index c534aa5..565fd93 100644
--- a/include/cppcore/Memory/TPoolAllocator.h
+++ b/include/cppcore/Memory/TPoolAllocator.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <string>
 
-namespace CPPCore {
+namespace cppcore {
 
 //-------------------------------------------------------------------------------------------------
 ///	@class		TPoolAllocator
@@ -283,4 +283,4 @@ void TPoolAllocator<T>::reset() {
     m_current = m_first;
 }
 
-} // Namespace CPPCore
+} // Namespace cppcore
diff --git a/include/cppcore/Memory/TStackAllocator.h b/include/cppcore/Memory/TStackAllocator.h
index f93cc0b..8d9a701 100644
--- a/include/cppcore/Memory/TStackAllocator.h
+++ b/include/cppcore/Memory/TStackAllocator.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <string>
 
-namespace CPPCore {
+namespace cppcore {
 
 //-------------------------------------------------------------------------------------------------
 ///	@class		TStackAllocator
@@ -214,4 +214,4 @@ inline void TStackAllocator<T>::dumpAllocations(std::string &allocs) {
     allocs += "\n";
 }
 
-} // Namespace CPPCore
+} // Namespace cppcorecppcore
diff --git a/include/cppcore/Random/RandomGenerator.h b/include/cppcore/Random/RandomGenerator.h
index 8ccf7f2..fade09d 100644
--- a/include/cppcore/Random/RandomGenerator.h
+++ b/include/cppcore/Random/RandomGenerator.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <memory>
 
-namespace CPPCore {
+namespace cppcore {
     
 //-------------------------------------------------------------------------------------------------
 ///	@class		RandomGenerator
@@ -63,4 +63,4 @@ class DLL_CPPCORE_EXPORT RandomGenerator {
     GeneratorType m_type;
 };
 
-} // Namespace CPPCore
+} // Namespace cppcore
diff --git a/test/CPPCoreCommonTest.cpp b/test/CPPCoreCommonTest.cpp
index 456e028..cfbc593 100644
--- a/test/CPPCoreCommonTest.cpp
+++ b/test/CPPCoreCommonTest.cpp
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "gtest/gtest.h"
 
-using namespace CPPCore;
+using namespace cppcore;
 
 //---------------------------------------------------------------------------------------------
 class CPPCoreCommonTest : public testing::Test {
diff --git a/test/Random/RandomGeneratorTest.cpp b/test/Random/RandomGeneratorTest.cpp
index d58fb1c..9bc5f6d 100644
--- a/test/Random/RandomGeneratorTest.cpp
+++ b/test/Random/RandomGeneratorTest.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <cppcore/Random/RandomGenerator.h>
 #include <gtest/gtest.h>
 
-using namespace CPPCore;
+using namespace cppcore;
 
 class RandomGeneratorTest : public testing::Test {
     // empty
diff --git a/test/common/HashTest.cpp b/test/common/HashTest.cpp
index 9012458..7a11107 100644
--- a/test/common/HashTest.cpp
+++ b/test/common/HashTest.cpp
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "gtest/gtest.h"
 
-using namespace CPPCore;
+using namespace cppcore;
 
 class HashTest : public testing::Test {
 protected:
diff --git a/test/common/TBitFieldTest.cpp b/test/common/TBitFieldTest.cpp
index f5fd998..9509f7f 100644
--- a/test/common/TBitFieldTest.cpp
+++ b/test/common/TBitFieldTest.cpp
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "gtest/gtest.h"
 
-using namespace CPPCore;
+using namespace cppcore;
 
 class TBitFieldTest : public testing::Test {
     // empty
diff --git a/test/common/TOptionalTest.cpp b/test/common/TOptionalTest.cpp
index d177dad..4be341d 100644
--- a/test/common/TOptionalTest.cpp
+++ b/test/common/TOptionalTest.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <gtest/gtest.h>
 #include <cppcore/Common/TOptional.h>
 
-using namespace ::CPPCore;
+using namespace ::cppcore;
 
 class TOptionalTest : public ::testing::Test {
     // empty
diff --git a/test/common/TSharedPtrTest.cpp b/test/common/TSharedPtrTest.cpp
index ca309fd..7e4228d 100644
--- a/test/common/TSharedPtrTest.cpp
+++ b/test/common/TSharedPtrTest.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <cppcore/Common/TSharedPtr.h>
 
-using namespace ::CPPCore;
+using namespace ::cppcore;
 
 class TSharedPtrTest : public ::testing::Test {
     // empty
diff --git a/test/common/VariantTest.cpp b/test/common/VariantTest.cpp
index e37c0ab..f191d8a 100644
--- a/test/common/VariantTest.cpp
+++ b/test/common/VariantTest.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <cppcore/Common/Variant.h>
 
-using namespace CPPCore;
+using namespace cppcore;
 
 //-------------------------------------------------------------------------------------------------
 ///	@class		::VariantTest
diff --git a/test/container/TArrayTest.cpp b/test/container/TArrayTest.cpp
index 44b44b4..f6b64ae 100644
--- a/test/container/TArrayTest.cpp
+++ b/test/container/TArrayTest.cpp
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <sstream>
 #include <iostream>
 
-using namespace CPPCore;
+using namespace cppcore;
 
 // Some test-data
 static const size_t ArraySize = 4;
diff --git a/test/container/THashMapTest.cpp b/test/container/THashMapTest.cpp
index 549a973..d9eb493 100644
--- a/test/container/THashMapTest.cpp
+++ b/test/container/THashMapTest.cpp
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "gtest/gtest.h"
 
-using namespace ::CPPCore;
+using namespace ::cppcore;
 
 class THashMapTest : public ::testing::Test {
     // empty
diff --git a/test/container/TListTest.cpp b/test/container/TListTest.cpp
index 5848207..bb1a51e 100644
--- a/test/container/TListTest.cpp
+++ b/test/container/TListTest.cpp
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <iostream>
 #include <vector>
 
-using namespace CPPCore;
+using namespace cppcore;
 
 //-------------------------------------------------------------------------------------------------
 ///	@class		TListTest
diff --git a/test/container/TQueueTest.cpp b/test/container/TQueueTest.cpp
index 23cba59..1de3679 100644
--- a/test/container/TQueueTest.cpp
+++ b/test/container/TQueueTest.cpp
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "gtest/gtest.h"
 
-using namespace CPPCore;
+using namespace cppcore;
 
 class TQueueTest : public testing::Test {
     // empty
diff --git a/test/container/TStaticArrayTest.cpp b/test/container/TStaticArrayTest.cpp
index 9083af5..4e9ab13 100644
--- a/test/container/TStaticArrayTest.cpp
+++ b/test/container/TStaticArrayTest.cpp
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <string>
 
-using namespace CPPCore;
+using namespace cppcore;
 
 //-------------------------------------------------------------------------------------------------
 ///	@class		TStaticArrayTest
diff --git a/test/memory/TPoolAllocatorTest.cpp b/test/memory/TPoolAllocatorTest.cpp
index 88e9915..eec71d3 100644
--- a/test/memory/TPoolAllocatorTest.cpp
+++ b/test/memory/TPoolAllocatorTest.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <gtest/gtest.h>
 
-using namespace CPPCore;
+using namespace cppcore;
 
 class TPoolAllocatorTest : public testing::Test {
 protected:
diff --git a/test/memory/TStackAllocatorTest.cpp b/test/memory/TStackAllocatorTest.cpp
index d39a474..9633ffe 100644
--- a/test/memory/TStackAllocatorTest.cpp
+++ b/test/memory/TStackAllocatorTest.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <gtest/gtest.h>
 
-using namespace CPPCore;
+using namespace cppcore;
 
 class TStackAllocatorTest : public testing::Test {
 protected: