diff --git a/Terraform.sublime-syntax b/Terraform.sublime-syntax
index baabba7..8d4447d 100644
--- a/Terraform.sublime-syntax
+++ b/Terraform.sublime-syntax
@@ -700,16 +700,16 @@ contexts:
   #
   # https://github.com/hashicorp/hcl2/blob/master/hcl/hclsyntax/spec.md#structural-elements
   block:
-    # Special case heuristic for the AWS two-term resources
+    # Special case heuristic for the AWS and friends two-term resources
     - match: (\b(resource)\s+(")({{identifier}})(")\s+(")({{identifier}})("))\s*(\{)
       captures:
         1: meta.type.terraform
         2: keyword.declaration.terraform
         3: punctuation.definition.begin.terraform
-        4: support.type.aws
+        4: support.type.terraform
         5: punctuation.definition.end.terraform
         6: punctuation.definition.begin.terraform
-        7: entity.name.type.aws
+        7: entity.name.type.terraform
         8: punctuation.definition.end.terraform
         9: meta.block.terraform punctuation.section.block.begin.terraform
       push: block-body
diff --git a/tests/syntax_test_scope.tf b/tests/syntax_test_scope.tf
index dc4e171..3bdddd9 100644
--- a/tests/syntax_test_scope.tf
+++ b/tests/syntax_test_scope.tf
@@ -3001,10 +3001,10 @@
 #                                           ^^ meta.block.terraform - meta.type
 #   ^^^^^^^^ keyword.declaration.terraform
 #            ^ punctuation.definition.begin.terraform
-#             ^^^^^^^^^^^^^^^^^^ support.type.aws
+#             ^^^^^^^^^^^^^^^^^^ support.type.terraform
 #                               ^ punctuation.definition.end.terraform
 #                                 ^ punctuation.definition.begin.terraform
-#                                  ^^^^^^^ entity.name.type.aws
+#                                  ^^^^^^^ entity.name.type.terraform
 #                                         ^ punctuation.definition.end.terraform
 #                                           ^ punctuation.section.block.begin.terraform
       name = "example"