diff --git a/javascript/ql/src/semmle/javascript/AST.qll b/javascript/ql/src/semmle/javascript/AST.qll
index 1d6d90d9e1a..e87d5d92385 100644
--- a/javascript/ql/src/semmle/javascript/AST.qll
+++ b/javascript/ql/src/semmle/javascript/AST.qll
@@ -350,7 +350,7 @@ class Externs extends TopLevel {
  * i = 9
  * ```
  */
-class ExprOrStmt extends @exprorstmt, ControlFlowNode, ASTNode { }
+class ExprOrStmt extends @expr_or_stmt, ControlFlowNode, ASTNode { }
 
 /**
  * A program element that contains statements, but isn't itself
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme b/javascript/ql/src/semmlecode.javascript.dbscheme
index 89a04b25086..b68dcb42eba 100644
--- a/javascript/ql/src/semmlecode.javascript.dbscheme
+++ b/javascript/ql/src/semmlecode.javascript.dbscheme
@@ -228,9 +228,9 @@ array_size (unique int ae: @arraylike ref,
 
 is_delegating (int yield: @yieldexpr ref);
 
-@exprorstmt = @expr | @stmt;
+@expr_or_stmt = @expr | @stmt;
 @exprortype = @expr | @typeexpr;
-@exprparent = @exprorstmt | @property | @functiontypeexpr;
+@exprparent = @expr_or_stmt | @property | @functiontypeexpr;
 @arraylike = @arrayexpr | @arraypattern;
 @type_annotation = @typeexpr | @jsdoc_type_expr;
 @node_in_stmt_container = @cfg_node | @type_annotation | @toplevel;