diff --git a/UltiSnips/cpp.snippets b/UltiSnips/cpp.snippets
index 7539cd3..3e31a95 100644
--- a/UltiSnips/cpp.snippets
+++ b/UltiSnips/cpp.snippets
@@ -36,9 +36,9 @@ template <class ${1:type}>$0
 endsnippet
 
 snippet namespace "Named or anonymous namespace"
-namespace ${1:}${1/\w+/ /}{
+namespace $1${1/(\w+)/ /}{
 $0
-}${1/\w+/  \/\/ $0/}
+}  // ${1/(\w*)/(?1:$1:anonymous)/}
 endsnippet
 
 snippet const_cast "Const cast" i