diff --git a/snippets/after-each-hook copy.sublime-snippet b/snippets/after-each-hook.sublime-snippet
similarity index 100%
rename from snippets/after-each-hook copy.sublime-snippet
rename to snippets/after-each-hook.sublime-snippet
diff --git a/snippets/ava.sublime-snippet b/snippets/ava.sublime-snippet
index e5a9f86..96709c1 100644
--- a/snippets/ava.sublime-snippet
+++ b/snippets/ava.sublime-snippet
@@ -1,9 +1,9 @@
 <snippet>
     <content><![CDATA[
 import test from 'ava';
-import $1 from '$2';
+import $1 from ${2:'${1/([A-Z])/-\l$1/g}'};
 
-test('${3:title}', t => {
+test(${3/.+/'/}${3:title}${3/.+/', /}t => {
 	t.is($1(), '$4');
 });
 ]]></content>
diff --git a/snippets/test-async.sublime-snippet b/snippets/test-async.sublime-snippet
index bf635e1..76aeffb 100644
--- a/snippets/test-async.sublime-snippet
+++ b/snippets/test-async.sublime-snippet
@@ -1,6 +1,6 @@
 <snippet>
     <content><![CDATA[
-test('${1:title}', async t => {
+test(${1/.+/'/}${1:title}${1/.+/', /}async t => {
 	$2
 });
 ]]></content>
diff --git a/snippets/test-cb.sublime-snippet b/snippets/test-cb.sublime-snippet
index e46df40..d1a4b98 100644
--- a/snippets/test-cb.sublime-snippet
+++ b/snippets/test-cb.sublime-snippet
@@ -1,6 +1,6 @@
 <snippet>
     <content><![CDATA[
-test.cb('${1:title}', t => {
+test.cb(${1/.+/'/}${1:title}${1/.+/', /}t => {
 	$2
 });
 ]]></content>
diff --git a/snippets/test-serial.sublime-snippet b/snippets/test-serial.sublime-snippet
index 4f20bf3..7022474 100644
--- a/snippets/test-serial.sublime-snippet
+++ b/snippets/test-serial.sublime-snippet
@@ -1,6 +1,6 @@
 <snippet>
     <content><![CDATA[
-test.serial('${1:title}', t => {
+test.serial(${1/.+/'/}${1:title}${1/.+/', /}t => {
 	$2
 });
 ]]></content>
diff --git a/snippets/test.sublime-snippet b/snippets/test.sublime-snippet
index a1d9d87..4817069 100644
--- a/snippets/test.sublime-snippet
+++ b/snippets/test.sublime-snippet
@@ -1,6 +1,6 @@
 <snippet>
     <content><![CDATA[
-test('${1:title}', t => {
+test(${1/.+/'/}${1:title}${1/.+/', /}t => {
 	$2
 });
 ]]></content>