diff --git a/grammars/rust.cson b/grammars/rust.cson
index 7af0148..14567be 100644
--- a/grammars/rust.cson
+++ b/grammars/rust.cson
@@ -385,7 +385,7 @@
     'end': '[\\{;]'
     'beginCaptures': {
       '1': { 'name': 'keyword.other.fn.rust' }
-      '2': { 'name': 'entity.name.function.rust' }
+      '2': { 'name': 'entity.name.function.rust meta.definition.function.rust' }
     }
     'patterns': [
       { 'include': '#block_comment' }
@@ -417,7 +417,7 @@
     'end': '[\\{\\(;]'
     'beginCaptures': {
       '1': { 'name': 'storage.type.rust' }
-      '2': { 'name': 'entity.name.type.rust' }
+      '2': { 'name': 'entity.name.type.rust meta.definition.type.rust' }
     }
     'patterns': [
       { 'include': '#block_comment' }
@@ -437,7 +437,7 @@
     'end': ';'
     'beginCaptures': {
       '1': { 'name': 'storage.type.rust' }
-      '2': { 'name': 'entity.name.type.rust' }
+      '2': { 'name': 'entity.name.type.rust meta.definition.type.rust' }
     }
     'patterns': [
       { 'include': '#block_comment' }
diff --git a/spec/rust-spec.coffee b/spec/rust-spec.coffee
index 0b736bf..b3ed857 100644
--- a/spec/rust-spec.coffee
+++ b/spec/rust-spec.coffee
@@ -412,7 +412,7 @@ describe 'Rust grammar', ->
       ''')
     expect(tokens[0][0]).toEqual value: 'pub', scopes: ['source.rust', 'storage.modifier.visibility.rust']
     expect(tokens[0][2]).toEqual value: 'enum', scopes: ['source.rust', 'storage.type.rust']
-    expect(tokens[0][4]).toEqual value: 'MyEnum', scopes: ['source.rust', 'entity.name.type.rust']
+    expect(tokens[0][4]).toEqual value: 'MyEnum', scopes: ['source.rust', 'entity.name.type.rust meta.definition.type.rust']
 
   it 'tokenizes structs', ->
     tokens = grammar.tokenizeLines('''
@@ -424,7 +424,7 @@ describe 'Rust grammar', ->
       ''')
     expect(tokens[0][0]).toEqual value: 'pub', scopes: ['source.rust', 'storage.modifier.visibility.rust']
     expect(tokens[0][2]).toEqual value: 'struct', scopes: ['source.rust', 'storage.type.rust']
-    expect(tokens[0][4]).toEqual value: 'MyStruct', scopes: ['source.rust', 'entity.name.type.rust']
+    expect(tokens[0][4]).toEqual value: 'MyStruct', scopes: ['source.rust', 'entity.name.type.rust meta.definition.type.rust']
     expect(tokens[0][5]).toEqual value: '<', scopes: ['source.rust', 'meta.type_params.rust']
     expect(tokens[0][6]).toEqual value: '\'', scopes: ['source.rust', 'meta.type_params.rust', 'storage.modifier.lifetime.rust']
     expect(tokens[0][7]).toEqual value: 'foo', scopes: ['source.rust', 'meta.type_params.rust', 'storage.modifier.lifetime.rust', 'entity.name.lifetime.rust']
@@ -438,7 +438,7 @@ describe 'Rust grammar', ->
     {tokens} = grammar.tokenizeLine('pub struct MyTupleStruct(pub i32, u32);')
     expect(tokens[0]).toEqual value: 'pub', scopes: ['source.rust', 'storage.modifier.visibility.rust']
     expect(tokens[2]).toEqual value: 'struct', scopes: ['source.rust', 'storage.type.rust']
-    expect(tokens[4]).toEqual value: 'MyTupleStruct', scopes: ['source.rust', 'entity.name.type.rust']
+    expect(tokens[4]).toEqual value: 'MyTupleStruct', scopes: ['source.rust', 'entity.name.type.rust meta.definition.type.rust']
     expect(tokens[6]).toEqual value: 'pub', scopes: ['source.rust', 'storage.modifier.visibility.rust']
 
   it 'tokenizes unions', ->
@@ -451,7 +451,7 @@ describe 'Rust grammar', ->
       ''')
     expect(tokens[0][0]).toEqual value: 'pub', scopes: ['source.rust', 'storage.modifier.visibility.rust']
     expect(tokens[0][2]).toEqual value: 'union', scopes: ['source.rust', 'storage.type.rust']
-    expect(tokens[0][4]).toEqual value: 'MyUnion', scopes: ['source.rust', 'entity.name.type.rust']
+    expect(tokens[0][4]).toEqual value: 'MyUnion', scopes: ['source.rust', 'entity.name.type.rust meta.definition.type.rust']
     expect(tokens[0][5]).toEqual value: '<', scopes: ['source.rust', 'meta.type_params.rust']
     expect(tokens[0][6]).toEqual value: '\'', scopes: ['source.rust', 'meta.type_params.rust', 'storage.modifier.lifetime.rust']
     expect(tokens[0][7]).toEqual value: 'foo', scopes: ['source.rust', 'meta.type_params.rust', 'storage.modifier.lifetime.rust', 'entity.name.lifetime.rust']
@@ -465,7 +465,7 @@ describe 'Rust grammar', ->
   it 'tokenizes type aliases', ->
     {tokens} = grammar.tokenizeLine('type MyType = u32;')
     expect(tokens[0]).toEqual value: 'type', scopes: ['source.rust', 'storage.type.rust']
-    expect(tokens[2]).toEqual value: 'MyType', scopes: ['source.rust', 'entity.name.type.rust']
+    expect(tokens[2]).toEqual value: 'MyType', scopes: ['source.rust', 'entity.name.type.rust meta.definition.type.rust']
     expect(tokens[4]).toEqual value: 'u32', scopes: ['source.rust', 'storage.type.core.rust']
 
   it 'tokenizes constants', ->
@@ -485,7 +485,7 @@ describe 'Rust grammar', ->
       ''')
     expect(tokens[0][0]).toEqual value: 'pub', scopes: ['source.rust', 'storage.modifier.visibility.rust']
     expect(tokens[0][2]).toEqual value: 'trait', scopes: ['source.rust', 'storage.type.rust']
-    expect(tokens[0][4]).toEqual value: 'MyTrait', scopes: ['source.rust', 'entity.name.type.rust']
+    expect(tokens[0][4]).toEqual value: 'MyTrait', scopes: ['source.rust', 'entity.name.type.rust meta.definition.type.rust']
     expect(tokens[1][1]).toEqual value: 'fn', scopes: ['source.rust', 'keyword.other.fn.rust']
     expect(tokens[1][12]).toEqual value: 'Option', scopes: ['source.rust', 'storage.type.core.rust']
     expect(tokens[1][14]).toEqual value: 'Self', scopes: ['source.rust', 'meta.type_params.rust', 'storage.type.core.rust']
@@ -658,7 +658,7 @@ describe 'Rust grammar', ->
     {tokens} = grammar.tokenizeLine('fn foo(fn_x: ()) {}')
     expect(tokens[0]).toEqual value: 'fn', scopes: ['source.rust', 'keyword.other.fn.rust']
     expect(tokens[1]).toEqual value: ' ', scopes: ['source.rust']
-    expect(tokens[2]).toEqual value : 'foo', scopes : [ 'source.rust', 'entity.name.function.rust' ]
+    expect(tokens[2]).toEqual value : 'foo', scopes : [ 'source.rust', 'entity.name.function.rust meta.definition.function.rust' ]
     expect(tokens[3]).toEqual value : '(fn_x: ()) ', scopes : [ 'source.rust' ]
 
   it 'tokenizes function calls with type arguments (issue \\#98)', ->
@@ -752,7 +752,7 @@ describe 'Rust grammar', ->
           fn clone(&self) {}
       }
     ''')
-    expect(tokens[0][2]).toEqual value: 'MyObject', scopes: ['source.rust', 'entity.name.type.rust']
+    expect(tokens[0][2]).toEqual value: 'MyObject', scopes: ['source.rust', 'entity.name.type.rust meta.definition.type.rust']
     expect(tokens[3][6]).toEqual value: 'MyObject', scopes: ['source.rust', 'entity.name.type.rust']
     expect(tokens[6][6]).toEqual value: 'Clone', scopes: ['source.rust', 'support.type.core.rust']
     expect(tokens[6][10]).toEqual value: 'MyObject', scopes: ['source.rust', 'entity.name.type.rust']