diff --git a/UltiSnips/sm_vim.snippets b/UltiSnips/sm_vim.snippets
deleted file mode 100644
index feb4a35..0000000
--- a/UltiSnips/sm_vim.snippets
+++ /dev/null
@@ -1,40 +0,0 @@
-snippet header
-" File: ${1:`expand('%:t')`}
-" Author: ${2:`g:snips_author`}
-" Description: ${3}
-${4:" Last Modified: `strftime("%B %d, %Y")`}
-endsnippet
-snippet guard
-if exists('${1:did_`Filename()`}') || &cp${2: || version < 700}
-	finish
-endif
-let $1 = 1${3}
-endsnippet
-snippet f
-fun ${1:function_name}(${2})
-	${3:" code}
-endf
-endsnippet
-snippet for
-for ${1:needle} in ${2:haystack}
-	${3:" code}
-endfor
-endsnippet
-snippet wh
-while ${1:condition}
-	${2:" code}
-endw
-endsnippet
-snippet if
-if ${1:condition}
-	${2:" code}
-endif
-endsnippet
-snippet ife
-if ${1:condition}
-	${2}
-else
-	${3}
-endif
-endsnippet
-
diff --git a/UltiSnips/vim.snippets b/UltiSnips/vim.snippets
new file mode 100644
index 0000000..5fd1f36
--- /dev/null
+++ b/UltiSnips/vim.snippets
@@ -0,0 +1,51 @@
+###########################################################################
+#                            SnipMate Snippets                            #
+###########################################################################
+snippet header
+" File: ${1:`!v expand('%:t')`}
+" Author: ${2:`!v g:snips_author`}
+" Description: ${3}
+${4:" Last Modified: `!v strftime("%B %d, %Y")`}
+
+$0
+endsnippet
+
+snippet guard
+if exists('${1:did_`!p res=fn.replace('.','_')`}') || &cp${2: || version < 700}
+	finish
+endif
+let $1 = 1${3}
+endsnippet
+
+snippet f
+fun ${1:function_name}(${2})
+	${3:" code}
+endf
+endsnippet
+
+snippet for
+for ${1:needle} in ${2:haystack}
+	${3:" code}
+endfor
+endsnippet
+
+snippet wh
+while ${1:condition}
+	${2:" code}
+endw
+endsnippet
+
+snippet if
+if ${1:condition}
+	${2:" code}
+endif
+endsnippet
+
+snippet ife
+if ${1:condition}
+	${2}
+else
+	${3}
+endif
+endsnippet
+