diff --git a/runtime/queries/c/highlights.scm b/runtime/queries/c/highlights.scm
index 258e07e72..2c42710f9 100644
--- a/runtime/queries/c/highlights.scm
+++ b/runtime/queries/c/highlights.scm
@@ -61,7 +61,7 @@
 
 (null) @constant
 (number_literal) @number
-(char_literal) @number
+(char_literal) @string
 
 (call_expression
   function: (identifier) @function)
diff --git a/runtime/queries/javascript/highlights.scm b/runtime/queries/javascript/highlights.scm
index a18c38d97..e29829bfc 100644
--- a/runtime/queries/javascript/highlights.scm
+++ b/runtime/queries/javascript/highlights.scm
@@ -87,7 +87,7 @@
   (template_string)
 ] @string
 
-(regex) @string.special
+(regex) @string.regexp
 (number) @number
 
 ; Tokens
diff --git a/runtime/queries/lua/highlights.scm b/runtime/queries/lua/highlights.scm
index 4e68cd666..756ab3b72 100644
--- a/runtime/queries/lua/highlights.scm
+++ b/runtime/queries/lua/highlights.scm
@@ -23,27 +23,27 @@
   "for"
   "do"
   "end"
-] @keyword.control.loop)
+] @keyword.control.repeat)
 
 (for_in_statement
 [
   "for"
   "do"
   "end"
-] @keyword.control.loop)
+] @keyword.control.repeat)
 
 (while_statement
 [
   "while"
   "do"
   "end"
-] @keyword.control.loop)
+] @keyword.control.repeat)
 
 (repeat_statement
 [
   "repeat"
   "until"
-] @keyword.control.loop)
+] @keyword.control.repeat)
 
 (do_statement
 [
diff --git a/runtime/queries/ruby/highlights.scm b/runtime/queries/ruby/highlights.scm
index 7f296f3bd..8617d6f0c 100644
--- a/runtime/queries/ruby/highlights.scm
+++ b/runtime/queries/ruby/highlights.scm
@@ -100,7 +100,7 @@
   (bare_symbol)
 ] @string.special.symbol
 
-(regex) @string.special.regex
+(regex) @string.regexp
 (escape_sequence) @escape
 
 [