diff --git a/src/gpu/core/Output/NeighborDebugWriter.cpp b/src/gpu/core/Output/NeighborDebugWriter.cpp
index b28e7dc77f7e538bebdb20589ca4a4868fee8b53..6c710461c49ec9d4c0075cdbee99669e77ef012b 100644
--- a/src/gpu/core/Output/NeighborDebugWriter.cpp
+++ b/src/gpu/core/Output/NeighborDebugWriter.cpp
@@ -44,7 +44,7 @@
 #include "StringUtilities/StringUtil.h"
 #include "Utilities/FindNeighbors.h"
 
-namespace NeighborDebugWriter
+namespace neighbor_debug_writer
 {
 
 void writeNeighborLinkLinesForDirection(LBMSimulationParameter* parH, int direction, const std::string& filePath, WbWriter* writer)
@@ -129,6 +129,6 @@ void writeBoundaryConditionNeighbors(QforBoundaryConditions* boundaryCondition,
                                     filePathBase);
 }
 
-} // namespace NeighborDebugWriter
+} // namespace neighbor_debug_writer
 
 //! \}
diff --git a/src/gpu/core/Output/NeighborDebugWriter.h b/src/gpu/core/Output/NeighborDebugWriter.h
index e4b9cdf7f34620d060785af13696418a149de68c..7d2e74396d000f2ad5f375817290c5f51456ad50 100644
--- a/src/gpu/core/Output/NeighborDebugWriter.h
+++ b/src/gpu/core/Output/NeighborDebugWriter.h
@@ -43,7 +43,7 @@ class WbWriter;
 struct QforDirectionalBoundaryCondition;
 struct QforBoundaryConditions;
 
-namespace NeighborDebugWriter
+namespace neighbor_debug_writer
 {
 
 //! \brief Write the links to the neighbors as lines for all 27 directions.
@@ -59,7 +59,7 @@ void writeBoundaryConditionNeighbors(QforDirectionalBoundaryCondition* boundaryC
 void writeBoundaryConditionNeighbors(QforBoundaryConditions* boundaryCondition, LBMSimulationParameter* parH,
                                      std::string& filePathBase);
 
-} // namespace NeighborDebugWriter
+} // namespace neighbor_debug_writer
 
 #endif
 
diff --git a/tests/unit-tests/gpu/core/Output/NeighborDebugWriterTest.cpp b/tests/unit-tests/gpu/core/Output/NeighborDebugWriterTest.cpp
index 06b71c0bd5caa2069da89f912332eb3915ac4962..0e01fa8969866d03c6739b771f78f0f122ba609c 100644
--- a/tests/unit-tests/gpu/core/Output/NeighborDebugWriterTest.cpp
+++ b/tests/unit-tests/gpu/core/Output/NeighborDebugWriterTest.cpp
@@ -89,7 +89,7 @@ TEST_F(NeighborDebugWriterTest, writeNeighborLinkLines_onlyFLuidNodes_writesAllN
     std::vector<UbTupleFloat3> expectedNodes = { oneCoord, threeCoord, oneCoord, threeCoord, threeCoord, threeCoord };
     std::vector<UbTupleInt2> expectedLines = { UbTupleInt2(0, 1), UbTupleInt2(2, 3), UbTupleInt2(4, 5) };
 
-    NeighborDebugWriter::writeNeighborLinkLinesForDirection(parH.get(), direction, "name", &writerSpy);
+    neighbor_debug_writer::writeNeighborLinkLinesForDirection(parH.get(), direction, "name", &writerSpy);
 
     EXPECT_THAT(writerSpy.nodes.size(), testing::Eq(numberOfNodes * 2));
     EXPECT_THAT(writerSpy.lines.size(), testing::Eq(numberOfNodes));
@@ -106,7 +106,7 @@ TEST_F(NeighborDebugWriterTest, writeNeighborLinkLines_fluidAndSolidNodes_writes
     std::vector<UbTupleFloat3> expectedNodes = { oneCoord, threeCoord, oneCoord, threeCoord};
     std::vector<UbTupleInt2> expectedLines = { UbTupleInt2(0, 1), UbTupleInt2(2, 3)};
 
-    NeighborDebugWriter::writeNeighborLinkLinesForDirection(parH.get(), direction, "name", &writerSpy);
+    neighbor_debug_writer::writeNeighborLinkLinesForDirection(parH.get(), direction, "name", &writerSpy);
 
     EXPECT_THAT(writerSpy.nodes.size(), testing::Eq((numberOfNodes-1) * 2));
     EXPECT_THAT(writerSpy.lines.size(), testing::Eq(numberOfNodes-1));