diff --git a/java-ecosystem/libs/ast-parser/src/main/resources/queries/javascript/scopes.scm b/java-ecosystem/libs/ast-parser/src/main/resources/queries/javascript/scopes.scm
index 3956695c..b7383bdd 100644
--- a/java-ecosystem/libs/ast-parser/src/main/resources/queries/javascript/scopes.scm
+++ b/java-ecosystem/libs/ast-parser/src/main/resources/queries/javascript/scopes.scm
@@ -10,7 +10,7 @@
 
 (arrow_function) @function.def
 
-(function) @function.def
+(function_expression) @function.def
 
 (generator_function_declaration
   name: (identifier) @name) @function.def
@@ -19,7 +19,7 @@
 (class_declaration
   name: (identifier) @name) @class.def
 
-(class) @class.def
+(class_expression) @class.def
 
 ; ── Control-flow blocks ──────────────────────────────────────────────
 (if_statement) @block.def
diff --git a/java-ecosystem/libs/ast-parser/src/main/resources/queries/tsx/scopes.scm b/java-ecosystem/libs/ast-parser/src/main/resources/queries/tsx/scopes.scm
index ad2dbff4..3b5ab65a 100644
--- a/java-ecosystem/libs/ast-parser/src/main/resources/queries/tsx/scopes.scm
+++ b/java-ecosystem/libs/ast-parser/src/main/resources/queries/tsx/scopes.scm
@@ -10,7 +10,7 @@
 
 (arrow_function) @function.def
 
-(function) @function.def
+(function_expression) @function.def
 
 ; ── Classes & Interfaces ─────────────────────────────────────────────
 (class_declaration
diff --git a/java-ecosystem/libs/ast-parser/src/main/resources/queries/typescript/scopes.scm b/java-ecosystem/libs/ast-parser/src/main/resources/queries/typescript/scopes.scm
index c3c4e1c0..01113f21 100644
--- a/java-ecosystem/libs/ast-parser/src/main/resources/queries/typescript/scopes.scm
+++ b/java-ecosystem/libs/ast-parser/src/main/resources/queries/typescript/scopes.scm
@@ -10,7 +10,7 @@
 
 (arrow_function) @function.def
 
-(function) @function.def
+(function_expression) @function.def
 
 (generator_function_declaration
   name: (identifier) @name) @function.def