diff --git a/src/node_win32_etw_provider.cc b/src/node_win32_etw_provider.cc
index 6877f1977dae8b..3aa8578db029d3 100644
--- a/src/node_win32_etw_provider.cc
+++ b/src/node_win32_etw_provider.cc
@@ -187,4 +187,5 @@ void shutdown_etw() {
     advapi = nullptr;
   }
 }
-}
+
+}  // namespace node
diff --git a/src/spawn_sync.h b/src/spawn_sync.h
index 9f53f0a22bcab9..8ddba479f31e1b 100644
--- a/src/spawn_sync.h
+++ b/src/spawn_sync.h
@@ -222,7 +222,8 @@ class SyncProcessRunner {
 
   Environment* env_;
 };
-}
+
+}  // namespace node
 
 #endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
diff --git a/src/string_search.cc b/src/string_search.cc
index 530a0e54684db8..326fba7c4abf05 100644
--- a/src/string_search.cc
+++ b/src/string_search.cc
@@ -6,5 +6,6 @@ namespace stringsearch {
 int StringSearchBase::kBadCharShiftTable[kUC16AlphabetSize];
 int StringSearchBase::kGoodSuffixShiftTable[kBMMaxShift + 1];
 int StringSearchBase::kSuffixTable[kBMMaxShift + 1];
-}
-}  // namespace node::stringsearch
+
+}  // namespace stringsearch
+}  // namespace node
diff --git a/src/string_search.h b/src/string_search.h
index 7827fe153e69c0..b4cc9d6ac9fb16 100644
--- a/src/string_search.h
+++ b/src/string_search.h
@@ -623,8 +623,8 @@ size_t SearchString(Vector<const Char> subject,
   StringSearch<Char> search(pattern);
   return search.Search(subject, start_index);
 }
-}
-}  // namespace node::stringsearch
+}  // namespace stringsearch
+}  // namespace node
 
 namespace node {
 using node::stringsearch::Vector;
diff --git a/test/addons/make-callback-recurse/binding.cc b/test/addons/make-callback-recurse/binding.cc
index 1c575910ef66f5..1195dbe2ff7e4c 100644
--- a/test/addons/make-callback-recurse/binding.cc
+++ b/test/addons/make-callback-recurse/binding.cc
@@ -26,6 +26,6 @@ void Initialize(Local<Object> target) {
   NODE_SET_METHOD(target, "makeCallback", MakeCallback);
 }
 
-}  // namespace anonymous
+}  // namespace
 
 NODE_MODULE(binding, Initialize)
diff --git a/test/addons/make-callback/binding.cc b/test/addons/make-callback/binding.cc
index 3012a39ff70a73..a1adb997bbf9b9 100644
--- a/test/addons/make-callback/binding.cc
+++ b/test/addons/make-callback/binding.cc
@@ -35,6 +35,6 @@ void Initialize(v8::Local<v8::Object> target) {
   NODE_SET_METHOD(target, "makeCallback", MakeCallback);
 }
 
-}  // namespace anonymous
+}  // namespace
 
 NODE_MODULE(binding, Initialize)