diff --git a/snippets/cache.sublime-snippet b/snippets/cache.sublime-snippet
index 6cc47ef..5709609 100644
--- a/snippets/cache.sublime-snippet
+++ b/snippets/cache.sublime-snippet
@@ -2,7 +2,7 @@
 	<content><![CDATA[
 // WPCS: cache ok.
 ]]></content>
-	<tabTrigger>wpcs</tabTrigger>
+	<tabTrigger>wpcs cache</tabTrigger>
 	<scope>source.php</scope>
 	<description>WPCS: cache ok</description>
 </snippet>
diff --git a/snippets/csrf.sublime-snippet b/snippets/csrf.sublime-snippet
index 74fd31f..97e05de 100644
--- a/snippets/csrf.sublime-snippet
+++ b/snippets/csrf.sublime-snippet
@@ -2,7 +2,7 @@
 	<content><![CDATA[
 // WPCS: CSRF ok.
 ]]></content>
-	<tabTrigger>wpcs</tabTrigger>
+	<tabTrigger>wpcs csrf</tabTrigger>
 	<scope>source.php</scope>
 	<description>WPCS: CSRF ok</description>
 </snippet>
diff --git a/snippets/db-call.sublime-snippet b/snippets/db-call.sublime-snippet
index 7c9bd58..50f0ac5 100644
--- a/snippets/db-call.sublime-snippet
+++ b/snippets/db-call.sublime-snippet
@@ -2,7 +2,7 @@
 	<content><![CDATA[
 // WPCS: db call ok.
 ]]></content>
-	<tabTrigger>wpcs</tabTrigger>
-	<scope>source.php</scope>
+	<tabTrigger>wpcs db call</tabTrigger>
+	<scope>source.php, comment</scope>
 	<description>WPCS: db call ok</description>
 </snippet>
diff --git a/snippets/input-var.sublime-snippet b/snippets/input-var.sublime-snippet
index 8eb0f4c..3ea33a7 100644
--- a/snippets/input-var.sublime-snippet
+++ b/snippets/input-var.sublime-snippet
@@ -2,7 +2,7 @@
 	<content><![CDATA[
 // WPCS: input var okay.
 ]]></content>
-	<tabTrigger>wpcs</tabTrigger>
+	<tabTrigger>wpcs input var</tabTrigger>
 	<scope>source.php</scope>
 	<description>WPCS: input var okay</description>
 </snippet>
diff --git a/snippets/loose-comparison.sublime-snippet b/snippets/loose-comparison.sublime-snippet
index a0acc62..9a514df 100644
--- a/snippets/loose-comparison.sublime-snippet
+++ b/snippets/loose-comparison.sublime-snippet
@@ -2,7 +2,7 @@
 	<content><![CDATA[
 // WPCS: loose comparison ok.
 ]]></content>
-	<tabTrigger>wpcs</tabTrigger>
+	<tabTrigger>wpcs loose comparison</tabTrigger>
 	<scope>source.php</scope>
 	<description>WPCS: loose comparison ok</description>
 </snippet>
diff --git a/snippets/override.sublime-snippet b/snippets/override.sublime-snippet
index 7710454..5f1d49a 100644
--- a/snippets/override.sublime-snippet
+++ b/snippets/override.sublime-snippet
@@ -2,7 +2,7 @@
 	<content><![CDATA[
 // WPCS: override ok.
 ]]></content>
-	<tabTrigger>wpcs</tabTrigger>
+	<tabTrigger>wpcs override</tabTrigger>
 	<scope>source.php</scope>
 	<description>WPCS: override ok</description>
 </snippet>
diff --git a/snippets/precision-alignment.sublime-snippet b/snippets/precision-alignment.sublime-snippet
index 17caae7..cb9d87f 100644
--- a/snippets/precision-alignment.sublime-snippet
+++ b/snippets/precision-alignment.sublime-snippet
@@ -2,7 +2,7 @@
 	<content><![CDATA[
 // WPCS: precision alignment ok.
 ]]></content>
-	<tabTrigger>wpcs</tabTrigger>
+	<tabTrigger>wpcs precision alignment</tabTrigger>
 	<scope>source.php</scope>
 	<description>WPCS: precision alignment ok</description>
 </snippet>
diff --git a/snippets/prefix.sublime-snippet b/snippets/prefix.sublime-snippet
index 76f8c72..0266fec 100644
--- a/snippets/prefix.sublime-snippet
+++ b/snippets/prefix.sublime-snippet
@@ -2,7 +2,7 @@
 	<content><![CDATA[
 // WPCS: prefix ok.
 ]]></content>
-	<tabTrigger>wpcs</tabTrigger>
+	<tabTrigger>wpcs prefix</tabTrigger>
 	<scope>source.php</scope>
 	<description>WPCS: prefix ok</description>
 </snippet>
diff --git a/snippets/sanitization.sublime-snippet b/snippets/sanitization.sublime-snippet
index 9aed40c..d2747ed 100644
--- a/snippets/sanitization.sublime-snippet
+++ b/snippets/sanitization.sublime-snippet
@@ -2,7 +2,7 @@
 	<content><![CDATA[
 // WPCS: sanitization ok.
 ]]></content>
-	<tabTrigger>wpcs</tabTrigger>
+	<tabTrigger>wpcs sanitization</tabTrigger>
 	<scope>source.php</scope>
 	<description>WPCS: sanitization ok</description>
 </snippet>
diff --git a/snippets/slow-query.sublime-snippet b/snippets/slow-query.sublime-snippet
index 2ba62b9..8bdc6d5 100644
--- a/snippets/slow-query.sublime-snippet
+++ b/snippets/slow-query.sublime-snippet
@@ -2,7 +2,7 @@
 	<content><![CDATA[
 // WPCS: slow query ok.
 ]]></content>
-	<tabTrigger>wpcs</tabTrigger>
+	<tabTrigger>wpcs slow query</tabTrigger>
 	<scope>source.php</scope>
 	<description>WPCS: slow query ok</description>
 </snippet>
diff --git a/snippets/spelling.sublime-snippet b/snippets/spelling.sublime-snippet
index ac8b362..56672b5 100644
--- a/snippets/spelling.sublime-snippet
+++ b/snippets/spelling.sublime-snippet
@@ -2,7 +2,7 @@
 	<content><![CDATA[
 // WPCS: spelling ok.
 ]]></content>
-	<tabTrigger>wpcs</tabTrigger>
+	<tabTrigger>wpcs spelling</tabTrigger>
 	<scope>source.php</scope>
 	<description>WPCS: spelling ok</description>
 </snippet>
diff --git a/snippets/unprepared-sql.sublime-snippet b/snippets/unprepared-sql.sublime-snippet
index b879be9..7262544 100644
--- a/snippets/unprepared-sql.sublime-snippet
+++ b/snippets/unprepared-sql.sublime-snippet
@@ -2,7 +2,7 @@
 	<content><![CDATA[
 // WPCS: unprepared SQL ok.
 ]]></content>
-	<tabTrigger>wpcs</tabTrigger>
+	<tabTrigger>wpcs unprepared sql</tabTrigger>
 	<scope>source.php</scope>
 	<description>WPCS: unprepared SQL ok</description>
 </snippet>
diff --git a/snippets/xss.sublime-snippet b/snippets/xss.sublime-snippet
index 72eecf8..b2e5b4b 100644
--- a/snippets/xss.sublime-snippet
+++ b/snippets/xss.sublime-snippet
@@ -2,7 +2,7 @@
 	<content><![CDATA[
 // WPCS: XSS ok.
 ]]></content>
-	<tabTrigger>wpcs</tabTrigger>
+	<tabTrigger>wpcs xss</tabTrigger>
 	<scope>source.php</scope>
 	<description>WPCS: XSS ok</description>
 </snippet>