diff --git a/snippets/html-mode/header/h1 b/snippets/html-mode/header/h1
index cbc3010..e32f576 100644
--- a/snippets/html-mode/header/h1
+++ b/snippets/html-mode/header/h1
@@ -1,5 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <h1>...</h1>
-# key: headerh1
+# key: h1
 # --
 <h1>$1</h1>
\ No newline at end of file
diff --git a/snippets/html-mode/header/h2 b/snippets/html-mode/header/h2
index dc25597..9455b95 100644
--- a/snippets/html-mode/header/h2
+++ b/snippets/html-mode/header/h2
@@ -1,5 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <h2>...</h2>
-# key: headerh2
+# key: h2
 # --
 <h2>$1</h2>
\ No newline at end of file
diff --git a/snippets/html-mode/header/h3 b/snippets/html-mode/header/h3
index a9e448d..ce40bd6 100644
--- a/snippets/html-mode/header/h3
+++ b/snippets/html-mode/header/h3
@@ -1,5 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <h3>...</h3>
-# key: headerh3
+# key: h3
 # --
 <h3>$1</h3>
\ No newline at end of file
diff --git a/snippets/html-mode/header/h4 b/snippets/html-mode/header/h4
index bffaa87..83ccd06 100644
--- a/snippets/html-mode/header/h4
+++ b/snippets/html-mode/header/h4
@@ -1,5 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <h4>...</h4>
-# key: headerh4
+# key: h4
 # --
 <h4>$1</h4>
\ No newline at end of file
diff --git a/snippets/html-mode/header/h5 b/snippets/html-mode/header/h5
index 140deb9..ea4ae11 100644
--- a/snippets/html-mode/header/h5
+++ b/snippets/html-mode/header/h5
@@ -1,5 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <h5>...</h5>
-# key: headerh5
+# key: h5
 # --
 <h5>$1</h5>
\ No newline at end of file
diff --git a/snippets/html-mode/header/h6 b/snippets/html-mode/header/h6
index f486317..14cf49e 100644
--- a/snippets/html-mode/header/h6
+++ b/snippets/html-mode/header/h6
@@ -1,5 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <h6>...</h6>
-# key: headerh6
+# key: h6
 # --
 <h6>$1</h6>
\ No newline at end of file
diff --git a/snippets/html-mode/list/dd b/snippets/html-mode/list/dd
index 9c84939..863180e 100644
--- a/snippets/html-mode/list/dd
+++ b/snippets/html-mode/list/dd
@@ -1,5 +1,5 @@
 #contributor : Rodrigo Setti <rodrigosetti@gmail.com>
 #name : <dd> ... </dd>
-# key: listdd
+# key: dd
 # --
 <dd>$1</dd>
\ No newline at end of file
diff --git a/snippets/html-mode/list/dl b/snippets/html-mode/list/dl
index 6980cf9..c3bcde6 100644
--- a/snippets/html-mode/list/dl
+++ b/snippets/html-mode/list/dl
@@ -1,6 +1,6 @@
 #contributor : Rodrigo Setti <rodrigosetti@gmail.com>
 #name : <dl> ... </dl>
-# key: listdl
+# key: dl
 # --
 <dl>
     $0
diff --git a/snippets/html-mode/list/dl.id b/snippets/html-mode/list/dl.id
index f19cbc2..1b84706 100644
--- a/snippets/html-mode/list/dl.id
+++ b/snippets/html-mode/list/dl.id
@@ -1,6 +1,6 @@
 #contributor : Rodrigo Setti <rodrigosetti@gmail.com>
 #name : <dl> ... </dl>
-# key: listdl
+# key: dl
 # --
 <dl id="$1">
     $0
diff --git a/snippets/html-mode/list/dt b/snippets/html-mode/list/dt
index 796b289..5448c20 100644
--- a/snippets/html-mode/list/dt
+++ b/snippets/html-mode/list/dt
@@ -1,5 +1,5 @@
 #contributor : Rodrigo Setti <rodrigosetti@gmail.com>
 #name : <dt> ... </dt>
-# key: listdt
+# key: dt
 # --
 <dt>$1</dt>
\ No newline at end of file
diff --git a/snippets/html-mode/list/li b/snippets/html-mode/list/li
index 2d34695..a48c983 100644
--- a/snippets/html-mode/list/li
+++ b/snippets/html-mode/list/li
@@ -1,5 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <li>...</li>
-# key: listli
+# key: li
 # --
 <li>$1</li>
\ No newline at end of file
diff --git a/snippets/html-mode/list/li.class b/snippets/html-mode/list/li.class
index 728c3da..6ecc961 100644
--- a/snippets/html-mode/list/li.class
+++ b/snippets/html-mode/list/li.class
@@ -1,5 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <li class="...">...</li>
-# key: listli
+# key: li
 # --
 <li class="$1">$2</li>
\ No newline at end of file
diff --git a/snippets/html-mode/list/ol b/snippets/html-mode/list/ol
index 51473d6..28ba541 100644
--- a/snippets/html-mode/list/ol
+++ b/snippets/html-mode/list/ol
@@ -1,6 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <ol>...</ol>
-# key: listol
+# key: ol
 # --
 <ol>
   $0
diff --git a/snippets/html-mode/list/ol.class b/snippets/html-mode/list/ol.class
index 5d8bc50..6d21989 100644
--- a/snippets/html-mode/list/ol.class
+++ b/snippets/html-mode/list/ol.class
@@ -1,6 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <ol class="...">...</ol>
-# key: listol
+# key: ol
 # --
 <ol class="$1">
   $0
diff --git a/snippets/html-mode/list/ol.id b/snippets/html-mode/list/ol.id
index f2cb04f..19b4cfa 100644
--- a/snippets/html-mode/list/ol.id
+++ b/snippets/html-mode/list/ol.id
@@ -1,6 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <ol id="...">...</ol>
-# key: listol
+# key: ol
 # --
 <ol id="$1">
   $0
diff --git a/snippets/html-mode/list/ul b/snippets/html-mode/list/ul
index 9e58a38..f1a088d 100644
--- a/snippets/html-mode/list/ul
+++ b/snippets/html-mode/list/ul
@@ -1,6 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <ul>...</ul>
-# key: listul
+# key: ul
 # --
 <ul>
   $0
diff --git a/snippets/html-mode/list/ul.class b/snippets/html-mode/list/ul.class
index 35560f6..672293f 100644
--- a/snippets/html-mode/list/ul.class
+++ b/snippets/html-mode/list/ul.class
@@ -1,6 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <ul class="...">...</ul>
-# key: listul
+# key: ul
 # --
 <ul class="$1">
   $0
diff --git a/snippets/html-mode/list/ul.id b/snippets/html-mode/list/ul.id
index 0860f5f..a5e753c 100644
--- a/snippets/html-mode/list/ul.id
+++ b/snippets/html-mode/list/ul.id
@@ -1,6 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <ul id="...">...</ul>
-# key: listul
+# key: ul
 # --
 <ul id="$1">
   $0
diff --git a/snippets/html-mode/meta/doctype b/snippets/html-mode/meta/doctype
index 544fb3b..bfcfb68 100644
--- a/snippets/html-mode/meta/doctype
+++ b/snippets/html-mode/meta/doctype
@@ -1,4 +1,4 @@
 #name : Doctype HTML 4.01 Strict
-# key: metadoctype
+# key: doctype
 # --
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
\ No newline at end of file
diff --git a/snippets/html-mode/meta/doctype.xhml1 b/snippets/html-mode/meta/doctype.xhml1
index a941879..ca04ac5 100644
--- a/snippets/html-mode/meta/doctype.xhml1
+++ b/snippets/html-mode/meta/doctype.xhml1
@@ -1,4 +1,4 @@
 #name : DocType XHTML 1.0 frameset
-# key: metadoctype
+# key: doctype
 # --
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
\ No newline at end of file
diff --git a/snippets/html-mode/meta/doctype.xhtml1_1 b/snippets/html-mode/meta/doctype.xhtml1_1
index c3c932d..b7e98a6 100644
--- a/snippets/html-mode/meta/doctype.xhtml1_1
+++ b/snippets/html-mode/meta/doctype.xhtml1_1
@@ -1,4 +1,4 @@
 #name : DocType XHTML 1.1
-# key: metadoctype
+# key: doctype
 # --
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
\ No newline at end of file
diff --git a/snippets/html-mode/meta/doctype.xhtml1_strict b/snippets/html-mode/meta/doctype.xhtml1_strict
index b34d05f..d494b77 100644
--- a/snippets/html-mode/meta/doctype.xhtml1_strict
+++ b/snippets/html-mode/meta/doctype.xhtml1_strict
@@ -1,4 +1,4 @@
 #name : DocType XHTML 1.0 Strict
-# key: metadoctype
+# key: doctype
 # --
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
\ No newline at end of file
diff --git a/snippets/html-mode/meta/doctype.xhtml1_transitional b/snippets/html-mode/meta/doctype.xhtml1_transitional
index 416d507..4ddb313 100644
--- a/snippets/html-mode/meta/doctype.xhtml1_transitional
+++ b/snippets/html-mode/meta/doctype.xhtml1_transitional
@@ -1,4 +1,4 @@
 #name : DocType XHTML 1.0 Transitional
-# key: metadoctype
+# key: doctype
 # --
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
\ No newline at end of file
diff --git a/snippets/html-mode/meta/meta b/snippets/html-mode/meta/meta
index 919f2ee..13d5b71 100644
--- a/snippets/html-mode/meta/meta
+++ b/snippets/html-mode/meta/meta
@@ -1,5 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <meta name="..." content="..." />
-# key: metameta
+# key: meta
 # --
 <meta name="${1:generator}" content="${2:content}" />
\ No newline at end of file
diff --git a/snippets/html-mode/meta/meta.http-equiv b/snippets/html-mode/meta/meta.http-equiv
index 06c0395..2024b1f 100644
--- a/snippets/html-mode/meta/meta.http-equiv
+++ b/snippets/html-mode/meta/meta.http-equiv
@@ -1,5 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <meta http-equiv="..." content="..." />
-# key: metameta
+# key: meta
 # --
 <meta http-equiv="${1:Content-Type}" content="${2:text/html; charset=UTF-8}" />
\ No newline at end of file
diff --git a/snippets/html-mode/table/table b/snippets/html-mode/table/table
index c3011ae..2a71664 100644
--- a/snippets/html-mode/table/table
+++ b/snippets/html-mode/table/table
@@ -1,6 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <table ...>...</table>
-# key: tabletable
+# key: table
 # --
 <table width="$1" cellspacing="$2" cellpadding="$3" border="$4">
   $0
diff --git a/snippets/html-mode/table/td b/snippets/html-mode/table/td
index 2edd0d2..d5355e8 100644
--- a/snippets/html-mode/table/td
+++ b/snippets/html-mode/table/td
@@ -1,5 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <td>...</td>
-# key: tabletd
+# key: td
 # --
 <td$1>$2</td>
\ No newline at end of file
diff --git a/snippets/html-mode/table/th b/snippets/html-mode/table/th
index a5198b8..70bb4ff 100644
--- a/snippets/html-mode/table/th
+++ b/snippets/html-mode/table/th
@@ -1,5 +1,5 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <th>...</th>
-# key: tableth
+# key: th
 # --
 <th$1>$2</th>
\ No newline at end of file
diff --git a/snippets/html-mode/table/tr b/snippets/html-mode/table/tr
index 9666d07..f9ffc0f 100644
--- a/snippets/html-mode/table/tr
+++ b/snippets/html-mode/table/tr
@@ -1,6 +1,6 @@
 #contributor : Jimmy Wu <frozenthrone88@gmail.com>
 #name : <tr>...</tr>
-# key: tabletr
+# key: tr
 # --
 <tr>
   $0
diff --git a/snippets/nxml-mode/header/h1 b/snippets/nxml-mode/header/h1
index 9809014..9d9f03f 100644
--- a/snippets/nxml-mode/header/h1
+++ b/snippets/nxml-mode/header/h1
@@ -1,5 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <h1>...</h1>
-# key: headerh1
+# key: h1
 # --
 <h1>$1</h1>
\ No newline at end of file
diff --git a/snippets/nxml-mode/header/h2 b/snippets/nxml-mode/header/h2
index c511a46..01bd314 100644
--- a/snippets/nxml-mode/header/h2
+++ b/snippets/nxml-mode/header/h2
@@ -1,5 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <h2>...</h2>
-# key: headerh2
+# key: h2
 # --
 <h2>$1</h2>
\ No newline at end of file
diff --git a/snippets/nxml-mode/header/h3 b/snippets/nxml-mode/header/h3
index 2feb6aa..3aaa67a 100644
--- a/snippets/nxml-mode/header/h3
+++ b/snippets/nxml-mode/header/h3
@@ -1,5 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <h3>...</h3>
-# key: headerh3
+# key: h3
 # --
 <h3>$1</h3>
\ No newline at end of file
diff --git a/snippets/nxml-mode/header/h4 b/snippets/nxml-mode/header/h4
index 8c5bb45..659e299 100644
--- a/snippets/nxml-mode/header/h4
+++ b/snippets/nxml-mode/header/h4
@@ -1,5 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <h4>...</h4>
-# key: headerh4
+# key: h4
 # --
 <h4>$1</h4>
\ No newline at end of file
diff --git a/snippets/nxml-mode/header/h5 b/snippets/nxml-mode/header/h5
index 682a432..5ef91a6 100644
--- a/snippets/nxml-mode/header/h5
+++ b/snippets/nxml-mode/header/h5
@@ -1,5 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <h5>...</h5>
-# key: headerh5
+# key: h5
 # --
 <h5>$1</h5>
\ No newline at end of file
diff --git a/snippets/nxml-mode/header/h6 b/snippets/nxml-mode/header/h6
index ab2160a..55ca8a0 100644
--- a/snippets/nxml-mode/header/h6
+++ b/snippets/nxml-mode/header/h6
@@ -1,5 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <h6>...</h6>
-# key: headerh6
+# key: h6
 # --
 <h6>$1</h6>
\ No newline at end of file
diff --git a/snippets/nxml-mode/meta/doctype b/snippets/nxml-mode/meta/doctype
index a7fef1f..9e5f848 100644
--- a/snippets/nxml-mode/meta/doctype
+++ b/snippets/nxml-mode/meta/doctype
@@ -1,5 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : DocType XHTML 1.1
-# key: metadoctype
+# key: doctype
 # --
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
\ No newline at end of file
diff --git a/snippets/nxml-mode/meta/doctype.xhtml1_strict b/snippets/nxml-mode/meta/doctype.xhtml1_strict
index c2a1d58..dd8f171 100644
--- a/snippets/nxml-mode/meta/doctype.xhtml1_strict
+++ b/snippets/nxml-mode/meta/doctype.xhtml1_strict
@@ -1,5 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : DocType XHTML 1.0 Strict
-# key: metadoctype
+# key: doctype
 # --
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
\ No newline at end of file
diff --git a/snippets/nxml-mode/meta/doctype.xhtml1_transitional b/snippets/nxml-mode/meta/doctype.xhtml1_transitional
index 62440b1..6e4a0aa 100644
--- a/snippets/nxml-mode/meta/doctype.xhtml1_transitional
+++ b/snippets/nxml-mode/meta/doctype.xhtml1_transitional
@@ -1,5 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : DocType XHTML 1.0 Transitional
-# key: metadoctype
+# key: doctype
 # --
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
\ No newline at end of file
diff --git a/snippets/nxml-mode/meta/meta b/snippets/nxml-mode/meta/meta
index dc28771..fb4bcfd 100644
--- a/snippets/nxml-mode/meta/meta
+++ b/snippets/nxml-mode/meta/meta
@@ -1,5 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <meta name="..." content="..." />
-# key: metameta
+# key: meta
 # --
 <meta name="${1:generator}" content="${2:content}" />
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/all b/snippets/ruby-mode/collections/all
index 3b3b601..3ea385e 100644
--- a/snippets/ruby-mode/collections/all
+++ b/snippets/ruby-mode/collections/all
@@ -1,4 +1,4 @@
 #name : all? { |...| ... }
-# key: collectionsall
+# key: all
 # --
 all? { |${e}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/any b/snippets/ruby-mode/collections/any
index 79c3c48..ba3711e 100644
--- a/snippets/ruby-mode/collections/any
+++ b/snippets/ruby-mode/collections/any
@@ -1,4 +1,4 @@
 #name : any? { |...| ... }
-# key: collectionsany
+# key: any
 # --
 any? { |${e}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/classify b/snippets/ruby-mode/collections/classify
index f5ef150..389f4e4 100644
--- a/snippets/ruby-mode/collections/classify
+++ b/snippets/ruby-mode/collections/classify
@@ -1,4 +1,4 @@
 #name : classify { |...| ... }
-# key: collectionsclassify
+# key: classify
 # --
 classify { |${e}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/collect b/snippets/ruby-mode/collections/collect
index a92f326..91b0b2a 100644
--- a/snippets/ruby-mode/collections/collect
+++ b/snippets/ruby-mode/collections/collect
@@ -1,4 +1,4 @@
 #name : collect { |...| ... }
-# key: collectionscollect
+# key: collect
 # --
 collect { |${e}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/deli b/snippets/ruby-mode/collections/deli
index 99f2af5..26e0dfa 100644
--- a/snippets/ruby-mode/collections/deli
+++ b/snippets/ruby-mode/collections/deli
@@ -1,4 +1,4 @@
 #name : delete_if { |...| ... }
-# key: collectionsdeli
+# key: deli
 # --
 delete_if { |${e} $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/det b/snippets/ruby-mode/collections/det
index f65cdfb..45649c8 100644
--- a/snippets/ruby-mode/collections/det
+++ b/snippets/ruby-mode/collections/det
@@ -1,4 +1,4 @@
 #name : detect { |...| ... }
-# key: collectionsdet
+# key: det
 # --
 detect { |${e}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/ea b/snippets/ruby-mode/collections/ea
index fdf7b2a..284a183 100644
--- a/snippets/ruby-mode/collections/ea
+++ b/snippets/ruby-mode/collections/ea
@@ -1,4 +1,4 @@
 #name : each { |...| ... }
-# key: collectionsea
+# key: ea
 # --
 each { |${e}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/eac b/snippets/ruby-mode/collections/eac
index 35d443a..7d12fa7 100644
--- a/snippets/ruby-mode/collections/eac
+++ b/snippets/ruby-mode/collections/eac
@@ -1,4 +1,4 @@
 #name : each_cons(...) { |...| ... }
-# key: collectionseac
+# key: eac
 # --
 each_cons(${1:2}) { |${group}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/eai b/snippets/ruby-mode/collections/eai
index 433a397..9bb0931 100644
--- a/snippets/ruby-mode/collections/eai
+++ b/snippets/ruby-mode/collections/eai
@@ -1,4 +1,4 @@
 #name : each_index { |i| ... }
-# key: collectionseai
+# key: eai
 # --
 each_index { |${i}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/eav b/snippets/ruby-mode/collections/eav
index 4d66ce4..4a16c92 100644
--- a/snippets/ruby-mode/collections/eav
+++ b/snippets/ruby-mode/collections/eav
@@ -1,4 +1,4 @@
 #name : each_value { |val| ... }
-# key: collectionseav
+# key: eav
 # --
 each_value { |${val}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/eawi b/snippets/ruby-mode/collections/eawi
index 38dd622..58b799f 100644
--- a/snippets/ruby-mode/collections/eawi
+++ b/snippets/ruby-mode/collections/eawi
@@ -1,4 +1,4 @@
 #name : each_with_index { |e, i| ... }
-# key: collectionseawi
+# key: eawi
 # --
 each_with_index { |${e}, ${i}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/inject b/snippets/ruby-mode/collections/inject
index 881ea92..5405f86 100644
--- a/snippets/ruby-mode/collections/inject
+++ b/snippets/ruby-mode/collections/inject
@@ -1,4 +1,4 @@
 #name : inject(...) { |...| ... }
-# key: collectionsinject
+# key: inject
 # --
 inject(${1:0}) { |${2:injection}, ${3:element}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/reject b/snippets/ruby-mode/collections/reject
index bc5008c..cbbc995 100644
--- a/snippets/ruby-mode/collections/reject
+++ b/snippets/ruby-mode/collections/reject
@@ -1,4 +1,4 @@
 #name : reject { |...| ... }
-# key: collectionsreject
+# key: reject
 # --
 reject { |${1:element}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/select b/snippets/ruby-mode/collections/select
index 6b4b6a2..5e42b95 100644
--- a/snippets/ruby-mode/collections/select
+++ b/snippets/ruby-mode/collections/select
@@ -1,4 +1,4 @@
 #name : select { |...| ... }
-# key: collectionsselect
+# key: select
 # --
 select { |${1:element}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/definitions/Comp b/snippets/ruby-mode/definitions/Comp
index 385017e..0108f7b 100644
--- a/snippets/ruby-mode/definitions/Comp
+++ b/snippets/ruby-mode/definitions/Comp
@@ -1,5 +1,5 @@
 #name : include Comparable; def <=> ... end
-# key: definitionsComp
+# key: Comp
 # --
 include Comparable
 
diff --git a/snippets/ruby-mode/definitions/am b/snippets/ruby-mode/definitions/am
index 856daac..35798b4 100644
--- a/snippets/ruby-mode/definitions/am
+++ b/snippets/ruby-mode/definitions/am
@@ -1,4 +1,4 @@
 #name : alias_method new, old
-# key: definitionsam
+# key: am
 # --
 alias_method :${new_name}, :${old_name}
\ No newline at end of file
diff --git a/snippets/ruby-mode/definitions/cla b/snippets/ruby-mode/definitions/cla
index 238786f..75bd6ed 100644
--- a/snippets/ruby-mode/definitions/cla
+++ b/snippets/ruby-mode/definitions/cla
@@ -1,5 +1,5 @@
 #name : class << self ... end
-# key: definitionscla
+# key: cla
 # --
 class << ${self}
   $0
diff --git a/snippets/ruby-mode/definitions/cls b/snippets/ruby-mode/definitions/cls
index 682fc4f..3feed25 100644
--- a/snippets/ruby-mode/definitions/cls
+++ b/snippets/ruby-mode/definitions/cls
@@ -1,6 +1,6 @@
 #name : class ... end
 #contributor : hitesh <hitesh.jasani@gmail.com>
-# key: definitionscls
+# key: cls
 # --
 class ${1:`(let ((fn (capitalize (file-name-nondirectory
                                  (file-name-sans-extension
diff --git a/snippets/ruby-mode/definitions/mm b/snippets/ruby-mode/definitions/mm
index 69812d1..fbda615 100644
--- a/snippets/ruby-mode/definitions/mm
+++ b/snippets/ruby-mode/definitions/mm
@@ -1,5 +1,5 @@
 #name : def method_missing ... end
-# key: definitionsmm
+# key: mm
 # --
 def method_missing(method, *args)
   $0
diff --git a/snippets/ruby-mode/definitions/r b/snippets/ruby-mode/definitions/r
index 00e9832..878095a 100644
--- a/snippets/ruby-mode/definitions/r
+++ b/snippets/ruby-mode/definitions/r
@@ -1,4 +1,4 @@
 #name : attr_reader ...
-# key: definitionsr
+# key: r
 # --
 attr_reader :
\ No newline at end of file
diff --git a/snippets/ruby-mode/definitions/rw b/snippets/ruby-mode/definitions/rw
index fecf2ba..52f4d62 100644
--- a/snippets/ruby-mode/definitions/rw
+++ b/snippets/ruby-mode/definitions/rw
@@ -1,4 +1,4 @@
 #name : attr_accessor ...
-# key: definitionsrw
+# key: rw
 # --
 attr_accessor :
\ No newline at end of file
diff --git a/snippets/ruby-mode/definitions/w b/snippets/ruby-mode/definitions/w
index 76d38d2..d0b912c 100644
--- a/snippets/ruby-mode/definitions/w
+++ b/snippets/ruby-mode/definitions/w
@@ -1,4 +1,4 @@
 #name : attr_writer ...
-# key: definitionsw
+# key: w
 # --
 attr_writer :
\ No newline at end of file
diff --git a/snippets/ruby-mode/general/# b/snippets/ruby-mode/general/#
index c69c607..945200a 100644
--- a/snippets/ruby-mode/general/#
+++ b/snippets/ruby-mode/general/#
@@ -1,4 +1,4 @@
 #name : # =>
-# key: general#
+# key: #
 # --
 # => 
\ No newline at end of file
diff --git a/snippets/ruby-mode/general/=b b/snippets/ruby-mode/general/=b
index 7a49261..8147d30 100644
--- a/snippets/ruby-mode/general/=b
+++ b/snippets/ruby-mode/general/=b
@@ -1,5 +1,5 @@
 #name : =begin rdoc ... =end
-# key: general=b
+# key: =b
 # --
 =begin rdoc
   $0
diff --git a/snippets/ruby-mode/general/app b/snippets/ruby-mode/general/app
index fe974a4..6e6cf6b 100644
--- a/snippets/ruby-mode/general/app
+++ b/snippets/ruby-mode/general/app
@@ -1,5 +1,5 @@
 #name : if __FILE__ == $PROGRAM_NAME ... end
-# key: generalapp
+# key: app
 # --
 if __FILE__ == $PROGRAM_NAME
   $0
diff --git a/snippets/ruby-mode/general/bm b/snippets/ruby-mode/general/bm
index 98d98f2..c92641e 100644
--- a/snippets/ruby-mode/general/bm
+++ b/snippets/ruby-mode/general/bm
@@ -1,5 +1,5 @@
 #name : Benchmark.bmbm(...) do ... end
-# key: generalbm
+# key: bm
 # --
 Benchmark.bmbm(${1:10}) do |x|
   $0
diff --git a/snippets/ruby-mode/general/case b/snippets/ruby-mode/general/case
index 2bbc781..90c3d5c 100644
--- a/snippets/ruby-mode/general/case
+++ b/snippets/ruby-mode/general/case
@@ -1,5 +1,5 @@
 #name : case ... end
-# key: generalcase
+# key: case
 # --
 case ${1:object}
 when ${2:condition}
diff --git a/snippets/ruby-mode/general/dee b/snippets/ruby-mode/general/dee
index c488421..05eeb44 100644
--- a/snippets/ruby-mode/general/dee
+++ b/snippets/ruby-mode/general/dee
@@ -1,4 +1,4 @@
 #name : deep_copy(...)
-# key: generaldee
+# key: dee
 # --
 Marshal.load(Marshal.dump($0))
\ No newline at end of file
diff --git a/snippets/ruby-mode/general/rb b/snippets/ruby-mode/general/rb
index 7c776f6..0a303ec 100644
--- a/snippets/ruby-mode/general/rb
+++ b/snippets/ruby-mode/general/rb
@@ -1,4 +1,4 @@
 #name : /usr/bin/ruby -wKU
-# key: generalrb
+# key: rb
 # --
 #!/usr/bin/ruby -wKU
\ No newline at end of file
diff --git a/snippets/ruby-mode/general/req b/snippets/ruby-mode/general/req
index c9231ed..7d3863f 100644
--- a/snippets/ruby-mode/general/req
+++ b/snippets/ruby-mode/general/req
@@ -1,4 +1,4 @@
 #name : require "..."
-# key: generalreq
+# key: req
 # --
 require "$0"
\ No newline at end of file
diff --git a/snippets/ruby-mode/general/rreq b/snippets/ruby-mode/general/rreq
index 762c3b8..7cd88e7 100644
--- a/snippets/ruby-mode/general/rreq
+++ b/snippets/ruby-mode/general/rreq
@@ -1,4 +1,4 @@
 #name : require File.join(File.dirname(__FILE__), ...)
-# key: generalrreq
+# key: rreq
 # --
 require File.join(File.dirname(__FILE__), $0)
\ No newline at end of file
diff --git a/snippets/ruby-mode/general/y b/snippets/ruby-mode/general/y
index 4742581..38ed59a 100644
--- a/snippets/ruby-mode/general/y
+++ b/snippets/ruby-mode/general/y
@@ -1,4 +1,4 @@
 #name : :yields: arguments (rdoc)
-# key: generaly
+# key: y
 # --
 :yields: $0
\ No newline at end of file