diff --git a/queries/r/highlights.scm b/queries/r/highlights.scm
index 11f355e83..cae023896 100755
--- a/queries/r/highlights.scm
+++ b/queries/r/highlights.scm
@@ -1,8 +1,8 @@
 ; highlights.scm
 
 (call function: (identifier) @function)
-(namespace_get function: (identifier) @function.method)
-(namespace_get_internal function: (identifier) @function.method)
+(namespace_get function: (identifier) @method)
+(namespace_get_internal function: (identifier) @method)
 
 ; Literals
 
@@ -16,7 +16,7 @@
 
 (comment) @comment
 
-(formal_parameters (identifier) @variable.parameter)
+(formal_parameters (identifier) @parameter)
 
 (identifier) @variable
 
diff --git a/queries/r/locals.scm b/queries/r/locals.scm
index be6cc6379..6fe20f53f 100755
--- a/queries/r/locals.scm
+++ b/queries/r/locals.scm
@@ -1,11 +1,11 @@
 ; locals.scm
 
-(function_definition) @local.scope
+(function_definition) @scope
 
-(formal_parameters (identifier) @local.definition)
+(formal_parameters (identifier) @definition)
 
-(left_assignment name: (identifier) @local.definition)
-(equals_assignment name: (identifier) @local.definition)
-(right_assignment name: (identifier) @local.definition)
+(left_assignment name: (identifier) @definition)
+(equals_assignment name: (identifier) @definition)
+(right_assignment name: (identifier) @definition)
 
-(identifier) @local.reference
+(identifier) @reference