diff --git a/grammars/elixir.cson b/grammars/elixir.cson
index 5e7c7f0..3b67d9e 100644
--- a/grammars/elixir.cson
+++ b/grammars/elixir.cson
@@ -61,9 +61,17 @@
     'name': 'keyword.other.special-method.elixir'
   }
   {
-    'match': '(?<!\\.)\\b(do|end|case|bc|lc|for|if|cond|with|unless|try|receive|fn|defmodule|defp?|defprotocol|defimpl|defrecord|defstruct|defmacrop?|defdelegate|defcallback|defexception|defoverridable|exit|after|rescue|catch|else|raise|throw|quote|unquote|super|when)\\b(?![?!])'
+    'match': '(?<!\\.)\\b(do|end|case|bc|lc|for|if|cond|with|unless|try|receive|fn|defmodule|defprotocol|defimpl|defrecord|defstruct|defdelegate|defcallback|defexception|defoverridable|exit|after|rescue|catch|else|raise|throw|quote|unquote|super|when)\\b(?![?!])'
     'name': 'keyword.control.elixir'
   }
+  {
+    'comment': 'functions and arguments'
+    'match': '\\b(defp?|defmacrop?)\\b\\s*([_$a-zA-Z][$\\w]*[!?]?)?'
+    'captures': {
+      '1': { 'name': 'keyword.control.elixir' }
+      '2': { 'name': 'entity.name.function.elixir' }
+    }
+  }
   {
     'comment': ' as above, just doesn\'t need a \'end\' and does a logic operation'
     'match': '(?<!\\.)\\b(and|not|or|when|xor|in|inlist|inbits)\\b'
diff --git a/snippets/language-elixir.cson b/snippets/language-elixir.cson
index 92924fd..1ba73e5 100644
--- a/snippets/language-elixir.cson
+++ b/snippets/language-elixir.cson
@@ -7,22 +7,22 @@
     'body': 'cond do\n\t$0\nend'
   'def':
     'prefix': 'def'
-    'body': 'def $1 do\n\t$0\nend'
+    'body': 'def ${1:function_name} do\n\t$0\nend'
+  'defp':
+    'prefix': 'defp'
+    'body': 'defp ${1:function_name} do\n\t$0\nend'
   'defmacro':
     'prefix': 'defmacro'
-    'body': 'defmacro $1 do\n\t$0\nend'
+    'body': 'defmacro ${1:macro_name} do\n\t$0\nend'
   'defmacrop':
     'prefix': 'defmacrop'
-    'body': 'defmacrop $1 do\n\t$0\nend'
+    'body': 'defmacrop ${1:macro_name} do\n\t$0\nend'
   'defmodule':
     'prefix': 'defmodule'
     'body': 'defmodule $1 do\n\t$0\nend'
   'defstruct':
     'prefix': 'defstruct'
     'body': 'defstruct [$1]'
-  'defp':
-    'prefix': 'defp'
-    'body': 'defp $1 do\n\t$0\nend'
   'do':
     'prefix': 'do'
     'body': 'do\n\t$0\nend'