diff --git a/src/olsr/model/olsr-routing-protocol.cc b/src/olsr/model/olsr-routing-protocol.cc
index b35c23895..88cdb7fc6 100644
--- a/src/olsr/model/olsr-routing-protocol.cc
+++ b/src/olsr/model/olsr-routing-protocol.cc
@@ -638,7 +638,7 @@ CoverTwoHopNeighbors (Ipv4Address neighborMainAddr, TwoHopNeighborSet & N2)
         }
     }
 }
-} // anonymous namespace
+}  // unnamed namespace
 
 void
 RoutingProtocol::MprComputation ()
diff --git a/src/stats/examples/file-aggregator-example.cc b/src/stats/examples/file-aggregator-example.cc
index 8312d75f5..62a224d33 100644
--- a/src/stats/examples/file-aggregator-example.cc
+++ b/src/stats/examples/file-aggregator-example.cc
@@ -160,7 +160,7 @@ void CreateFormattedFile ()
 }
 
 
-} // anonymous namespace
+}  // unnamed namespace
 
 
 int main (int argc, char *argv[])
diff --git a/src/stats/examples/gnuplot-aggregator-example.cc b/src/stats/examples/gnuplot-aggregator-example.cc
index 027bfbb2b..56cbe2377 100644
--- a/src/stats/examples/gnuplot-aggregator-example.cc
+++ b/src/stats/examples/gnuplot-aggregator-example.cc
@@ -80,7 +80,7 @@ void Create2dPlot ()
 }
 
 
-} // anonymous namespace
+}  // unnamed namespace
 
 
 int main (int argc, char *argv[])
diff --git a/src/stats/examples/gnuplot-example.cc b/src/stats/examples/gnuplot-example.cc
index 2bd0c71a8..5a2c7bafd 100644
--- a/src/stats/examples/gnuplot-example.cc
+++ b/src/stats/examples/gnuplot-example.cc
@@ -253,7 +253,7 @@ void Create3DPlotFile ()
   plotFile.close ();
 }
 
-} // anonymous namespace
+}  // unnamed namespace
 
 
 int main (int argc, char *argv[])
diff --git a/src/test/traced/traced-callback-typedef-test-suite.cc b/src/test/traced/traced-callback-typedef-test-suite.cc
index f6af3c72d..a0864af02 100644
--- a/src/test/traced/traced-callback-typedef-test-suite.cc
+++ b/src/test/traced/traced-callback-typedef-test-suite.cc
@@ -276,7 +276,7 @@ public:
 /** @} */
 
 
-}  // anonymous namespace
+}  // unnamed namespace
 
 
 /*
diff --git a/src/test/traced/traced-value-callback-typedef-test-suite.cc b/src/test/traced/traced-value-callback-typedef-test-suite.cc
index 98ac42f4a..0c7f1c04b 100644
--- a/src/test/traced/traced-value-callback-typedef-test-suite.cc
+++ b/src/test/traced/traced-value-callback-typedef-test-suite.cc
@@ -105,7 +105,7 @@ void TracedValueCbSink<SequenceNumber32> (SequenceNumber32 oldValue,
 }
 
 
-}  // anonymous namespace
+}  // unnamed namespace
 
   
 class TracedValueCallbackTestCase : public TestCase