diff --git a/Terraform.YAML-tmLanguage b/Terraform.YAML-tmLanguage
index 99451f7..366499e 100644
--- a/Terraform.YAML-tmLanguage
+++ b/Terraform.YAML-tmLanguage
@@ -32,23 +32,23 @@ patterns:
   match: \b(0x[0-9A-Fa-f]+)([kKmMgG]b?)?\b
 
 - name: meta.resource.terraform
-  match: (resource)\s+(")(\w+)(")\s+(")(.+)(")\s+({)
+  match: (resource)\s+(")(\w+)(")\s+(")([\w-]+)(")\s+({)
   captures:
     '1': {name: storage.type.function.terraform}
-    '2': {name: punctuation.definition.string.begin.terraform}
+    '2': {name: string.terraform punctuation.definition.string.begin.terraform}
     '3': {name: string.value.terraform}
-    '4': {name: punctuation.definition.string.end.terraform}
-    '5': {name: punctuation.definition.string.begin.terraform}
+    '4': {name: string.terraform punctuation.definition.string.end.terraform}
+    '5': {name: string.terraform punctuation.definition.string.begin.terraform}
     '6': {name: string.value.terraform}
-    '7': {name: punctuation.definition.string.end.terraform}
+    '7': {name: string.terraform punctuation.definition.string.end.terraform}
     '8': {name: punctuation.definition.tag.terraform}
 
 - match: (provider|provisioner|variable|output|module|atlas)\s+(")([\w-]+)(")\s+({)
   captures:
     '1': {name: storage.type.function.terraform}
-    '2': {name: punctuation.definition.string.begin.terraform}
+    '2': {name: string.terraform punctuation.definition.string.begin.terraform}
     '3': {name: string.value.terraform}
-    '4': {name: punctuation.definition.string.end.terraform}
+    '4': {name: string.terraform punctuation.definition.string.end.terraform}
     '5': {name: punctuation.definition.tag.terraform}
 
 - comment: Value assignments (left hand side not in double quotes)
@@ -75,7 +75,7 @@ patterns:
   name: string.quoted.double.terraform
   begin: \"
   beginCaptures:
-    '0': {name: punctuation.definition.string.begin.terraform}
+    '0': {name: string.terraform punctuation.definition.string.begin.terraform}
   end: \"
   endCaptures:
-    '0': {name: punctuation.definition.string.end.terraform}
+    '0': {name: string.terraform punctuation.definition.string.end.terraform}
diff --git a/Terraform.tmLanguage b/Terraform.tmLanguage
index 60a926b..aca68c3 100644
--- a/Terraform.tmLanguage
+++ b/Terraform.tmLanguage
@@ -82,7 +82,7 @@
 				<key>2</key>
 				<dict>
 					<key>name</key>
-					<string>punctuation.definition.string.begin.terraform</string>
+					<string>string.terraform punctuation.definition.string.begin.terraform</string>
 				</dict>
 				<key>3</key>
 				<dict>
@@ -92,12 +92,12 @@
 				<key>4</key>
 				<dict>
 					<key>name</key>
-					<string>punctuation.definition.string.end.terraform</string>
+					<string>string.terraform punctuation.definition.string.end.terraform</string>
 				</dict>
 				<key>5</key>
 				<dict>
 					<key>name</key>
-					<string>punctuation.definition.string.begin.terraform</string>
+					<string>string.terraform punctuation.definition.string.begin.terraform</string>
 				</dict>
 				<key>6</key>
 				<dict>
@@ -107,7 +107,7 @@
 				<key>7</key>
 				<dict>
 					<key>name</key>
-					<string>punctuation.definition.string.end.terraform</string>
+					<string>string.terraform punctuation.definition.string.end.terraform</string>
 				</dict>
 				<key>8</key>
 				<dict>
@@ -116,7 +116,7 @@
 				</dict>
 			</dict>
 			<key>match</key>
-			<string>(resource)\s+(")(\w+)(")\s+(")(.+)(")\s+({)</string>
+			<string>(resource)\s+(")(\w+)(")\s+(")([\w-]+)(")\s+({)</string>
 			<key>name</key>
 			<string>meta.resource.terraform</string>
 		</dict>
@@ -131,7 +131,7 @@
 				<key>2</key>
 				<dict>
 					<key>name</key>
-					<string>punctuation.definition.string.begin.terraform</string>
+					<string>string.terraform punctuation.definition.string.begin.terraform</string>
 				</dict>
 				<key>3</key>
 				<dict>
@@ -141,7 +141,7 @@
 				<key>4</key>
 				<dict>
 					<key>name</key>
-					<string>punctuation.definition.string.end.terraform</string>
+					<string>string.terraform punctuation.definition.string.end.terraform</string>
 				</dict>
 				<key>5</key>
 				<dict>
@@ -227,7 +227,7 @@
 				<key>0</key>
 				<dict>
 					<key>name</key>
-					<string>punctuation.definition.string.begin.terraform</string>
+					<string>string.terraform punctuation.definition.string.begin.terraform</string>
 				</dict>
 			</dict>
 			<key>comment</key>
@@ -239,7 +239,7 @@
 				<key>0</key>
 				<dict>
 					<key>name</key>
-					<string>punctuation.definition.string.end.terraform</string>
+					<string>string.terraform punctuation.definition.string.end.terraform</string>
 				</dict>
 			</dict>
 			<key>name</key>