diff --git a/c++-mode/const_[] b/c++-mode/const_[]
deleted file mode 100644
index 57eed01..0000000
--- a/c++-mode/const_[]
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: const_[]
-# key: c[
-# uuid: c[
-# --
-const ${1:Type}& operator[](${2:int index}) const
-{
-        $0
-}
\ No newline at end of file
diff --git a/c++-mode/copy_ostream_iter b/c++-mode/copy_ostream_iter
index d836ecb..90ae29a 100644
--- a/c++-mode/copy_ostream_iter
+++ b/c++-mode/copy_ostream_iter
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
-# name: copy
+# name: copy_ostream_iter
 # key: oit
 # --
 std::copy(std::begin(${1:container}), std::end($1), std::ostream_iterator<$2>{
diff --git a/c++-mode/d_operator b/c++-mode/d_operator
deleted file mode 100644
index b92780d..0000000
--- a/c++-mode/d_operator
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: d_operator<<
-# key: <<
-# uuid: <<
-# --
-friend std::ostream& operator<<(std::ostream&, const ${1:Class}&);
\ No newline at end of file
diff --git a/c++-mode/erase b/c++-mode/erase
index 4ab6679..4afa41c 100644
--- a/c++-mode/erase
+++ b/c++-mode/erase
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
-# name: remove
+# name: erase
 # key: erm
 # --
 ${1:container}.erase(std::remove(std::begin($1), std::end($1), $2), std::end($1));
\ No newline at end of file
diff --git a/c++-mode/erase_find_last_not_of b/c++-mode/erase_find_last_not_of
index d2cf0b1..d240330 100644
--- a/c++-mode/erase_find_last_not_of
+++ b/c++-mode/erase_find_last_not_of
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
-# name: generate_n
+# name: erase_find_last_not_of
 # key: erf
 # --
 ${1:container}.erase($1.find_last_not_of(" \t\n\r") + 1);
\ No newline at end of file
diff --git a/c++-mode/operator_ostream b/c++-mode/operator_ostream
deleted file mode 100644
index 9463e2c..0000000
--- a/c++-mode/operator_ostream
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-# name: operator<<
-# key: <<
-# uuid: <<
-# group: operator overloading
-# --
-std::ostream& operator<<(std::ostream& s, const ${1:type}& ${2:c})
-{
-         $0
-         return s;
-}
\ No newline at end of file
diff --git a/c++-mode/transform-with-closure b/c++-mode/transform-with-closure
index 51427c7..1802465 100644
--- a/c++-mode/transform-with-closure
+++ b/c++-mode/transform-with-closure
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
-# name: transform
+# name: transform-with-closure
 # key: upr
 # --
 std::transform(std::begin(${1:container}), std::end($1), std::begin($1), [](char c) {