diff --git a/castor/exception/ExceptionTest.cpp b/castor/exception/ExceptionTest.cpp
index e99311e5f12faf7b54cf5cc54012ec95322f20c7..ca88e636557f29cf396c645539349acd5ba3dd3e 100644
--- a/castor/exception/ExceptionTest.cpp
+++ b/castor/exception/ExceptionTest.cpp
@@ -29,7 +29,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock-cardinalities.h>
 
-namespace UnitTests {
+namespace unitTests {
   class Nested {
   public:
     void f1();
diff --git a/castor/server/DaemonTest.cpp b/castor/server/DaemonTest.cpp
index 467b6eed11a6e7ca84983d1f08cf6dcf92ef5a16..791ff471370a7235134093c2982d9f054a12ac18 100644
--- a/castor/server/DaemonTest.cpp
+++ b/castor/server/DaemonTest.cpp
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <string.h>
 
-namespace UnitTests {
+namespace unitTests {
 
 class castor_server_DaemonTest : public ::testing::Test {
 protected:
@@ -99,4 +99,4 @@ TEST_F(castor_server_DaemonTest, parseFOnCmdLine) {
   ASSERT_EQ(true, daemon.getForeground());
 }
 
-} // namespace UnitTests
+} // namespace unitTests
diff --git a/castor/tape/tapeserver/SCSI/DeviceTest.cpp b/castor/tape/tapeserver/SCSI/DeviceTest.cpp
index 4d410efe8ac53aaebb6a614a9ff2d9e9523d5526..621d62086e1c1115ad3f51a0014c39874e27961b 100644
--- a/castor/tape/tapeserver/SCSI/DeviceTest.cpp
+++ b/castor/tape/tapeserver/SCSI/DeviceTest.cpp
@@ -31,7 +31,7 @@ using ::testing::AtLeast;
 using ::testing::Return;
 using ::testing::_;
 
-namespace UnitTests {
+namespace unitTests {
 castor::tape::System::mockWrapper sysWrapper;
 
 TEST(castor_tape_SCSI_DeviceList, TriesToFind) {
diff --git a/castor/tape/tapeserver/SCSI/StructuresTest.cpp b/castor/tape/tapeserver/SCSI/StructuresTest.cpp
index 78e56a895b064d921f69ea40913947c7606ca997..64f3e4ebd25323bb79f2478c8a6bd8054bbe8fcc 100644
--- a/castor/tape/tapeserver/SCSI/StructuresTest.cpp
+++ b/castor/tape/tapeserver/SCSI/StructuresTest.cpp
@@ -33,7 +33,7 @@ using ::testing::AtLeast;
 using ::testing::Return;
 using ::testing::_;
 
-namespace UnitTests {
+namespace unitTests {
   TEST(castor_tape_SCSI_Structures, inquiryData_t_multi_byte_numbers_strings) {
     /* Validate the bit field behavior of the struct inquiryData_t,
      which represents the standard INQUIRY data format as defined in 
diff --git a/castor/tape/tapeserver/drive/DriveTest.cpp b/castor/tape/tapeserver/drive/DriveTest.cpp
index bf11f2a23551bd973e8a346891d52c06133c6da8..55ffd055bfe406ef96d2c5251b8f62c356f6f075 100644
--- a/castor/tape/tapeserver/drive/DriveTest.cpp
+++ b/castor/tape/tapeserver/drive/DriveTest.cpp
@@ -34,7 +34,7 @@ using ::testing::Return;
 using ::testing::_;
 using ::testing::An;
 
-namespace UnitTests {
+namespace unitTests {
 
 TEST(castor_tape_drives_Drive, OpensCorrectly) {
   /* Prepare the test harness */
diff --git a/castor/tape/tapeserver/exception/ExceptionTest.cpp b/castor/tape/tapeserver/exception/ExceptionTest.cpp
index e98bc30a9ae0aa3ff2578c47d02a8fc751892122..042dd9003ae2b858a7dfee823f24941a9223442d 100644
--- a/castor/tape/tapeserver/exception/ExceptionTest.cpp
+++ b/castor/tape/tapeserver/exception/ExceptionTest.cpp
@@ -27,5 +27,5 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock-cardinalities.h>
 
-namespace UnitTests {
+namespace unitTests {
 }
diff --git a/castor/tape/tapeserver/file/StructuresTest.cpp b/castor/tape/tapeserver/file/StructuresTest.cpp
index ebd2c25ba28761d5cd462087bb2ac84ea8184e79..5125bc8a3caca4ba3132d7d745b000928448161c 100644
--- a/castor/tape/tapeserver/file/StructuresTest.cpp
+++ b/castor/tape/tapeserver/file/StructuresTest.cpp
@@ -26,7 +26,7 @@
 #include <gmock/gmock-cardinalities.h>
 #include "Structures.hpp"
 
-namespace UnitTests {
+namespace unitTests {
 
   TEST(castor_tape_AULFile, VOL1) {
     castor::tape::AULFile::VOL1 vol1Label;
diff --git a/castor/tape/tapeserver/threading/ThreadingTests.cpp b/castor/tape/tapeserver/threading/ThreadingTests.cpp
index 8e5fc533451a5ae2a8677999d00cfc10d3e2ebe4..ecdcecb6e46cb725bb0be302db590947df813083 100644
--- a/castor/tape/tapeserver/threading/ThreadingTests.cpp
+++ b/castor/tape/tapeserver/threading/ThreadingTests.cpp
@@ -30,7 +30,7 @@
 /* Note: those tests create multi threading errors on purpose and should not
  * be run in helgrind */
 
-namespace UnitTests {
+namespace unitTests {
   TEST(castor_tape_threading, Mutex_properly_throws_exceptions) {
     /* Check that we properly get exception when doing wrong semaphore 
      operations */
@@ -97,4 +97,4 @@ namespace UnitTests {
       ASSERT_NE(std::string::npos, w.find("Exception in child thread"));
     }
   }
-} // namespace UnitTests
+} // namespace unitTests
diff --git a/castor/tape/tapeserver/utils/RegexTest.cpp b/castor/tape/tapeserver/utils/RegexTest.cpp
index b02f8cf6c84e710ebf3e71c67b7c9de13d00421b..b6d868630b53c04be459ae472209b3833d012bde 100644
--- a/castor/tape/tapeserver/utils/RegexTest.cpp
+++ b/castor/tape/tapeserver/utils/RegexTest.cpp
@@ -31,7 +31,7 @@ using ::testing::AtLeast;
 using ::testing::Return;
 using ::testing::_;
 
-namespace UnitTests {
+namespace unitTests {
 
 TEST(castor_tape_utils_Regex, BasicFunctionality) {
   castor::tape::utils::Regex re("a(b)");
diff --git a/castor/utils/UtilsTest.cpp b/castor/utils/UtilsTest.cpp
index dc4429398ba4e6ad8af9788cc33f65da09276d11..3713d95d0d90b7bf0449a07e04f956a67e14b0d0 100644
--- a/castor/utils/UtilsTest.cpp
+++ b/castor/utils/UtilsTest.cpp
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #include <vector>
 
-namespace UnitTests {
+namespace unitTests {
 
 /**
  * Tests the good day senario of passing a multi-column string to the
@@ -200,4 +200,4 @@ TEST(castor_utils, testTimevalToDouble) {
   ASSERT_EQ(expected, actual);
 }
 
-} // namespace UnitTests
+} // namespace unitTests