diff --git a/tools/rosemacs/snippets/c++/wgh.yasnippet b/tools/rosemacs/snippets/c++-mode/rh.yasnippet
similarity index 87%
rename from tools/rosemacs/snippets/c++/wgh.yasnippet
rename to tools/rosemacs/snippets/c++-mode/rh.yasnippet
index fc3e7b73..8daa9b74 100644
--- a/tools/rosemacs/snippets/c++/wgh.yasnippet
+++ b/tools/rosemacs/snippets/c++-mode/rh.yasnippet
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
-# name: willow header file with copyright, include guards
+# name: header file with include guards, namespace
 # expand-env: ((pkg (ros-package-for-buffer (current-buffer) t)) (fname (file-name-nondirectory (file-name-sans-extension (buffer-file-name (current-buffer))))))
 # --
 /**
diff --git a/tools/rosemacs/snippets/c++/wg.yasnippet b/tools/rosemacs/snippets/c++-mode/roscpp.yasnippet
similarity index 91%
rename from tools/rosemacs/snippets/c++/wg.yasnippet
rename to tools/rosemacs/snippets/c++-mode/roscpp.yasnippet
index cca3693e..b555c82e 100644
--- a/tools/rosemacs/snippets/c++/wg.yasnippet
+++ b/tools/rosemacs/snippets/c++-mode/roscpp.yasnippet
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
-# name: willow copyright notice
+# name: Ros source file
 # expand-env: ((pkg (ros-package-for-buffer (current-buffer) t)) (fname (file-name-nondirectory (file-name-sans-extension (buffer-file-name (current-buffer))))))
 # --
 /**
diff --git a/tools/rosemacs/snippets/c++/rosmain.yasnippet b/tools/rosemacs/snippets/c++-mode/rosmain.yasnippet
similarity index 100%
rename from tools/rosemacs/snippets/c++/rosmain.yasnippet
rename to tools/rosemacs/snippets/c++-mode/rosmain.yasnippet