diff --git a/cpp/ql/lib/semmle/code/cpp/Print.qll b/cpp/ql/lib/semmle/code/cpp/Print.qll
index 64ae5b960d1..5df8f087689 100644
--- a/cpp/ql/lib/semmle/code/cpp/Print.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Print.qll
@@ -8,9 +8,9 @@ private import PrintAST
 private predicate shouldPrintDeclaration(Declaration decl) {
   not decl instanceof Function
   or
-  not exists(PrintASTConfiguration c)
+  not exists(PrintAstConfiguration c)
   or
-  exists(PrintASTConfiguration config | config.shouldPrintFunction(decl))
+  exists(PrintAstConfiguration config | config.shouldPrintFunction(decl))
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/PrintAST.ql b/cpp/ql/lib/semmle/code/cpp/PrintAST.ql
index e4c53030da5..bf7e345132c 100644
--- a/cpp/ql/lib/semmle/code/cpp/PrintAST.ql
+++ b/cpp/ql/lib/semmle/code/cpp/PrintAST.ql
@@ -12,7 +12,7 @@ import PrintAST
  * Temporarily tweak this class or make a copy to control which functions are
  * printed.
  */
-class Cfg extends PrintASTConfiguration {
+class Cfg extends PrintAstConfiguration {
   /**
    * TWEAK THIS PREDICATE AS NEEDED.
    * Holds if the AST for `func` should be printed.
diff --git a/cpp/ql/lib/semmle/code/cpp/PrintAST.qll b/cpp/ql/lib/semmle/code/cpp/PrintAST.qll
index 86b39a285b0..7658d5cf17a 100644
--- a/cpp/ql/lib/semmle/code/cpp/PrintAST.qll
+++ b/cpp/ql/lib/semmle/code/cpp/PrintAST.qll
@@ -9,12 +9,12 @@
 import cpp
 private import semmle.code.cpp.Print
 
-private newtype TPrintASTConfiguration = MkPrintASTConfiguration()
+private newtype TPrintAstConfiguration = MkPrintAstConfiguration()
 
 /**
  * The query can extend this class to control which functions are printed.
  */
-class PrintASTConfiguration extends TPrintASTConfiguration {
+class PrintAstConfiguration extends TPrintAstConfiguration {
   /**
    * Gets a textual representation of this `PrintASTConfiguration`.
    */
@@ -27,8 +27,11 @@ class PrintASTConfiguration extends TPrintASTConfiguration {
   predicate shouldPrintFunction(Function func) { any() }
 }
 
+/** DEPRECATED: Alias for PrintAstConfiguration */
+deprecated class PrintASTConfiguration = PrintAstConfiguration;
+
 private predicate shouldPrintFunction(Function func) {
-  exists(PrintASTConfiguration config | config.shouldPrintFunction(func))
+  exists(PrintAstConfiguration config | config.shouldPrintFunction(func))
 }
 
 bindingset[s]
@@ -85,8 +88,8 @@ private Function getEnclosingFunction(Locatable ast) {
  * Most nodes are just a wrapper around `Locatable`, but we do synthesize new
  * nodes for things like parameter lists and constructor init lists.
  */
-private newtype TPrintASTNode =
-  TASTNode(Locatable ast) { shouldPrintFunction(getEnclosingFunction(ast)) } or
+private newtype TPrintAstNode =
+  TAstNode(Locatable ast) { shouldPrintFunction(getEnclosingFunction(ast)) } or
   TDeclarationEntryNode(DeclStmt stmt, DeclarationEntry entry) {
     // We create a unique node for each pair of (stmt, entry), to avoid having one node with
     // multiple parents due to extractor bug CPP-413.
@@ -106,7 +109,7 @@ private newtype TPrintASTNode =
 /**
  * A node in the output tree.
  */
-class PrintASTNode extends TPrintASTNode {
+class PrintAstNode extends TPrintAstNode {
   /**
    * Gets a textual representation of this node in the PrintAST output tree.
    */
@@ -116,17 +119,17 @@ class PrintASTNode extends TPrintASTNode {
    * Gets the child node at index `childIndex`. Child indices must be unique,
    * but need not be contiguous.
    */
-  abstract PrintASTNode getChildInternal(int childIndex);
+  abstract PrintAstNode getChildInternal(int childIndex);
 
   /**
    * Gets the child node at index `childIndex`.
    * Adds edges to fully converted expressions, that are not part of the
    * regular parent/child relation traversal.
    */
-  final PrintASTNode getChild(int childIndex) {
+  final PrintAstNode getChild(int childIndex) {
     // The exact value of `childIndex` doesn't matter, as long as we preserve the correct order.
     result =
-      rank[childIndex](PrintASTNode child, int nonConvertedIndex, boolean isConverted |
+      rank[childIndex](PrintAstNode child, int nonConvertedIndex, boolean isConverted |
         childAndAccessorPredicate(child, _, nonConvertedIndex, isConverted)
       |
         // Unconverted children come first, then sort by original child index within each group.
@@ -138,11 +141,11 @@ class PrintASTNode extends TPrintASTNode {
    * Gets the node for the `.getFullyConverted()` version of the child originally at index
    * `childIndex`, if that node has any conversions.
    */
-  private PrintASTNode getConvertedChild(int childIndex) {
+  private PrintAstNode getConvertedChild(int childIndex) {
     exists(Expr expr |
-      expr = getChildInternal(childIndex).(ASTNode).getAST() and
+      expr = getChildInternal(childIndex).(AstNode).getAst() and
       expr.getFullyConverted() instanceof Conversion and
-      result.(ASTNode).getAST() = expr.getFullyConverted() and
+      result.(AstNode).getAst() = expr.getFullyConverted() and
       not expr instanceof Conversion
     )
   }
@@ -166,12 +169,12 @@ class PrintASTNode extends TPrintASTNode {
   /**
    * Gets the children of this node.
    */
-  final PrintASTNode getAChild() { result = getChild(_) }
+  final PrintAstNode getAChild() { result = getChild(_) }
 
   /**
    * Gets the parent of this node, if any.
    */
-  final PrintASTNode getParent() { result.getAChild() = this }
+  final PrintAstNode getParent() { result.getAChild() = this }
 
   /**
    * Gets the location of this node in the source code.
@@ -196,7 +199,7 @@ class PrintASTNode extends TPrintASTNode {
    * one result tuple, with `isConverted = false`.
    */
   private predicate childAndAccessorPredicate(
-    PrintASTNode child, string childPredicate, int nonConvertedIndex, boolean isConverted
+    PrintAstNode child, string childPredicate, int nonConvertedIndex, boolean isConverted
   ) {
     child = getChildInternal(nonConvertedIndex) and
     childPredicate = getChildAccessorPredicateInternal(nonConvertedIndex) and
@@ -234,12 +237,15 @@ class PrintASTNode extends TPrintASTNode {
   private Function getEnclosingFunction() { result = getParent*().(FunctionNode).getFunction() }
 }
 
+/** DEPRECATED: Alias for PrintAstNode */
+deprecated class PrintASTNode = PrintAstNode;
+
 /**
  * Class that restricts the elements that we compute `qlClass` for.
  */
 private class PrintableElement extends Element {
   PrintableElement() {
-    exists(TASTNode(this))
+    exists(TAstNode(this))
     or
     exists(TDeclarationEntryNode(_, this))
     or
@@ -262,7 +268,7 @@ private string qlClass(PrintableElement el) {
 /**
  * A node representing an AST node.
  */
-abstract class BaseASTNode extends PrintASTNode {
+abstract class BaseAstNode extends PrintAstNode {
   Locatable ast;
 
   override string toString() { result = qlClass(ast) + ast.toString() }
@@ -272,25 +278,34 @@ abstract class BaseASTNode extends PrintASTNode {
   /**
    * Gets the AST represented by this node.
    */
-  final Locatable getAST() { result = ast }
+  final Locatable getAst() { result = ast }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated Locatable getAST() { result = getAst() }
 }
 
+/** DEPRECATED: Alias for BaseAstNode */
+deprecated class BaseASTNode = BaseAstNode;
+
 /**
  * A node representing an AST node other than a `DeclarationEntry`.
  */
-abstract class ASTNode extends BaseASTNode, TASTNode {
-  ASTNode() { this = TASTNode(ast) }
+abstract class AstNode extends BaseAstNode, TAstNode {
+  AstNode() { this = TAstNode(ast) }
 }
 
+/** DEPRECATED: Alias for AstNode */
+deprecated class ASTNode = AstNode;
+
 /**
  * A node representing an `Expr`.
  */
-class ExprNode extends ASTNode {
+class ExprNode extends AstNode {
   Expr expr;
 
   ExprNode() { expr = ast }
 
-  override ASTNode getChildInternal(int childIndex) { result.getAST() = expr.getChild(childIndex) }
+  override AstNode getChildInternal(int childIndex) { result.getAst() = expr.getChild(childIndex) }
 
   override string getProperty(string key) {
     result = super.getProperty(key)
@@ -306,7 +321,7 @@ class ExprNode extends ASTNode {
   }
 
   override string getChildAccessorPredicateInternal(int childIndex) {
-    result = getChildAccessorWithoutConversions(ast, getChildInternal(childIndex).getAST())
+    result = getChildAccessorWithoutConversions(ast, getChildInternal(childIndex).getAst())
   }
 
   /**
@@ -334,9 +349,9 @@ class ConversionNode extends ExprNode {
 
   ConversionNode() { conv = expr }
 
-  override ASTNode getChildInternal(int childIndex) {
+  override AstNode getChildInternal(int childIndex) {
     childIndex = 0 and
-    result.getAST() = conv.getExpr() and
+    result.getAst() = conv.getExpr() and
     conv.getExpr() instanceof Conversion
   }
 }
@@ -363,27 +378,27 @@ class CastNode extends ConversionNode {
 class StmtExprNode extends ExprNode {
   override StmtExpr expr;
 
-  override ASTNode getChildInternal(int childIndex) {
+  override AstNode getChildInternal(int childIndex) {
     childIndex = 0 and
-    result.getAST() = expr.getStmt()
+    result.getAst() = expr.getStmt()
   }
 }
 
 /**
  * A node representing a `DeclarationEntry`.
  */
-class DeclarationEntryNode extends BaseASTNode, TDeclarationEntryNode {
+class DeclarationEntryNode extends BaseAstNode, TDeclarationEntryNode {
   override DeclarationEntry ast;
   DeclStmt declStmt;
 
   DeclarationEntryNode() { this = TDeclarationEntryNode(declStmt, ast) }
 
-  override PrintASTNode getChildInternal(int childIndex) { none() }
+  override PrintAstNode getChildInternal(int childIndex) { none() }
 
   override string getChildAccessorPredicateInternal(int childIndex) { none() }
 
   override string getProperty(string key) {
-    result = BaseASTNode.super.getProperty(key)
+    result = BaseAstNode.super.getProperty(key)
     or
     key = "Type" and
     result = qlClass(ast.getType()) + ast.getType().toString()
@@ -396,9 +411,9 @@ class DeclarationEntryNode extends BaseASTNode, TDeclarationEntryNode {
 class VariableDeclarationEntryNode extends DeclarationEntryNode {
   override VariableDeclarationEntry ast;
 
-  override ASTNode getChildInternal(int childIndex) {
+  override AstNode getChildInternal(int childIndex) {
     childIndex = 0 and
-    result.getAST() = ast.getVariable().getInitializer()
+    result.getAst() = ast.getVariable().getInitializer()
   }
 
   override string getChildAccessorPredicateInternal(int childIndex) {
@@ -410,23 +425,23 @@ class VariableDeclarationEntryNode extends DeclarationEntryNode {
 /**
  * A node representing a `Stmt`.
  */
-class StmtNode extends ASTNode {
+class StmtNode extends AstNode {
   Stmt stmt;
 
   StmtNode() { stmt = ast }
 
-  override BaseASTNode getChildInternal(int childIndex) {
+  override BaseAstNode getChildInternal(int childIndex) {
     exists(Locatable child |
       child = stmt.getChild(childIndex) and
       (
-        result.getAST() = child.(Expr) or
-        result.getAST() = child.(Stmt)
+        result.getAst() = child.(Expr) or
+        result.getAst() = child.(Stmt)
       )
     )
   }
 
   override string getChildAccessorPredicateInternal(int childIndex) {
-    result = getChildAccessorWithoutConversions(ast, getChildInternal(childIndex).getAST())
+    result = getChildAccessorWithoutConversions(ast, getChildInternal(childIndex).getAst())
   }
 }
 
@@ -449,12 +464,12 @@ class DeclStmtNode extends StmtNode {
 /**
  * A node representing a `Parameter`.
  */
-class ParameterNode extends ASTNode {
+class ParameterNode extends AstNode {
   Parameter param;
 
   ParameterNode() { param = ast }
 
-  final override PrintASTNode getChildInternal(int childIndex) { none() }
+  final override PrintAstNode getChildInternal(int childIndex) { none() }
 
   final override string getChildAccessorPredicateInternal(int childIndex) { none() }
 
@@ -469,14 +484,14 @@ class ParameterNode extends ASTNode {
 /**
  * A node representing an `Initializer`.
  */
-class InitializerNode extends ASTNode {
+class InitializerNode extends AstNode {
   Initializer init;
 
   InitializerNode() { init = ast }
 
-  override ASTNode getChildInternal(int childIndex) {
+  override AstNode getChildInternal(int childIndex) {
     childIndex = 0 and
-    result.getAST() = init.getExpr()
+    result.getAst() = init.getExpr()
   }
 
   override string getChildAccessorPredicateInternal(int childIndex) {
@@ -488,7 +503,7 @@ class InitializerNode extends ASTNode {
 /**
  * A node representing the parameters of a `Function`.
  */
-class ParametersNode extends PrintASTNode, TParametersNode {
+class ParametersNode extends PrintAstNode, TParametersNode {
   Function func;
 
   ParametersNode() { this = TParametersNode(func) }
@@ -497,8 +512,8 @@ class ParametersNode extends PrintASTNode, TParametersNode {
 
   final override Location getLocation() { result = getRepresentativeLocation(func) }
 
-  override ASTNode getChildInternal(int childIndex) {
-    result.getAST() = func.getParameter(childIndex)
+  override AstNode getChildInternal(int childIndex) {
+    result.getAst() = func.getParameter(childIndex)
   }
 
   override string getChildAccessorPredicateInternal(int childIndex) {
@@ -515,7 +530,7 @@ class ParametersNode extends PrintASTNode, TParametersNode {
 /**
  * A node representing the initializer list of a `Constructor`.
  */
-class ConstructorInitializersNode extends PrintASTNode, TConstructorInitializersNode {
+class ConstructorInitializersNode extends PrintAstNode, TConstructorInitializersNode {
   Constructor ctor;
 
   ConstructorInitializersNode() { this = TConstructorInitializersNode(ctor) }
@@ -524,8 +539,8 @@ class ConstructorInitializersNode extends PrintASTNode, TConstructorInitializers
 
   final override Location getLocation() { result = getRepresentativeLocation(ctor) }
 
-  final override ASTNode getChildInternal(int childIndex) {
-    result.getAST() = ctor.getInitializer(childIndex)
+  final override AstNode getChildInternal(int childIndex) {
+    result.getAst() = ctor.getInitializer(childIndex)
   }
 
   final override string getChildAccessorPredicateInternal(int childIndex) {
@@ -542,7 +557,7 @@ class ConstructorInitializersNode extends PrintASTNode, TConstructorInitializers
 /**
  * A node representing the destruction list of a `Destructor`.
  */
-class DestructorDestructionsNode extends PrintASTNode, TDestructorDestructionsNode {
+class DestructorDestructionsNode extends PrintAstNode, TDestructorDestructionsNode {
   Destructor dtor;
 
   DestructorDestructionsNode() { this = TDestructorDestructionsNode(dtor) }
@@ -551,8 +566,8 @@ class DestructorDestructionsNode extends PrintASTNode, TDestructorDestructionsNo
 
   final override Location getLocation() { result = getRepresentativeLocation(dtor) }
 
-  final override ASTNode getChildInternal(int childIndex) {
-    result.getAST() = dtor.getDestruction(childIndex)
+  final override AstNode getChildInternal(int childIndex) {
+    result.getAst() = dtor.getDestruction(childIndex)
   }
 
   final override string getChildAccessorPredicateInternal(int childIndex) {
@@ -569,14 +584,14 @@ class DestructorDestructionsNode extends PrintASTNode, TDestructorDestructionsNo
 /**
  * A node representing a `Function`.
  */
-class FunctionNode extends ASTNode {
+class FunctionNode extends AstNode {
   Function func;
 
   FunctionNode() { func = ast }
 
   override string toString() { result = qlClass(func) + getIdentityString(func) }
 
-  override PrintASTNode getChildInternal(int childIndex) {
+  override PrintAstNode getChildInternal(int childIndex) {
     childIndex = 0 and
     result.(ParametersNode).getFunction() = func
     or
@@ -584,7 +599,7 @@ class FunctionNode extends ASTNode {
     result.(ConstructorInitializersNode).getConstructor() = func
     or
     childIndex = 2 and
-    result.(ASTNode).getAST() = func.getEntryPoint()
+    result.(AstNode).getAst() = func.getEntryPoint()
     or
     childIndex = 3 and
     result.(DestructorDestructionsNode).getDestructor() = func
@@ -603,7 +618,7 @@ class FunctionNode extends ASTNode {
   private int getOrder() {
     this =
       rank[result](FunctionNode node, Function function, string file, int line, int column |
-        node.getAST() = function and
+        node.getAst() = function and
         locationSortKeys(function, file, line, column)
       |
         node order by file, line, column, getIdentityString(function)
@@ -856,7 +871,7 @@ private predicate namedExprChildPredicates(Expr expr, Element ele, string pred)
 }
 
 /** Holds if `node` belongs to the output tree, and its property `key` has the given `value`. */
-query predicate nodes(PrintASTNode node, string key, string value) {
+query predicate nodes(PrintAstNode node, string key, string value) {
   node.shouldPrint() and
   value = node.getProperty(key)
 }
@@ -865,7 +880,7 @@ query predicate nodes(PrintASTNode node, string key, string value) {
  * Holds if `target` is a child of `source` in the AST, and property `key` of the edge has the
  * given `value`.
  */
-query predicate edges(PrintASTNode source, PrintASTNode target, string key, string value) {
+query predicate edges(PrintAstNode source, PrintAstNode target, string key, string value) {
   exists(int childIndex |
     source.shouldPrint() and
     target.shouldPrint() and
diff --git a/cpp/ql/lib/semmle/code/cpp/XML.qll b/cpp/ql/lib/semmle/code/cpp/XML.qll
index d2e6c44951f..fb781a4683f 100755
--- a/cpp/ql/lib/semmle/code/cpp/XML.qll
+++ b/cpp/ql/lib/semmle/code/cpp/XML.qll
@@ -4,11 +4,11 @@
 
 import semmle.files.FileSystem
 
-private class TXMLLocatable =
+private class TXmlLocatable =
   @xmldtd or @xmlelement or @xmlattribute or @xmlnamespace or @xmlcomment or @xmlcharacters;
 
 /** An XML element that has a location. */
-class XMLLocatable extends @xmllocatable, TXMLLocatable {
+class XMLLocatable extends @xmllocatable, TXmlLocatable {
   /** Gets the source location for this element. */
   Location getLocation() { xmllocations(this, result) }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/controlflow/ControlFlowGraph.qll b/cpp/ql/lib/semmle/code/cpp/controlflow/ControlFlowGraph.qll
index f0903db7082..846d8047982 100644
--- a/cpp/ql/lib/semmle/code/cpp/controlflow/ControlFlowGraph.qll
+++ b/cpp/ql/lib/semmle/code/cpp/controlflow/ControlFlowGraph.qll
@@ -65,7 +65,7 @@ class ControlFlowNode extends Locatable, ControlFlowNodeBase {
    * taken when this expression is true.
    */
   ControlFlowNode getATrueSuccessor() {
-    qlCFGTrueSuccessor(this, result) and
+    qlCfgTrueSuccessor(this, result) and
     result = this.getASuccessor()
   }
 
@@ -74,7 +74,7 @@ class ControlFlowNode extends Locatable, ControlFlowNodeBase {
    * taken when this expression is false.
    */
   ControlFlowNode getAFalseSuccessor() {
-    qlCFGFalseSuccessor(this, result) and
+    qlCfgFalseSuccessor(this, result) and
     result = this.getASuccessor()
   }
 
@@ -121,7 +121,7 @@ abstract class AdditionalControlFlowEdge extends ControlFlowNodeBase {
  * `AdditionalControlFlowEdge`. Use this relation instead of `qlCFGSuccessor`.
  */
 predicate successors_extended(ControlFlowNodeBase source, ControlFlowNodeBase target) {
-  qlCFGSuccessor(source, target)
+  qlCfgSuccessor(source, target)
   or
   source.(AdditionalControlFlowEdge).getAnEdgeTarget() = target
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/controlflow/IRGuards.qll b/cpp/ql/lib/semmle/code/cpp/controlflow/IRGuards.qll
index 2b222376a0b..d12eaa4e238 100644
--- a/cpp/ql/lib/semmle/code/cpp/controlflow/IRGuards.qll
+++ b/cpp/ql/lib/semmle/code/cpp/controlflow/IRGuards.qll
@@ -33,8 +33,8 @@ class GuardCondition extends Expr {
     or
     // the IR short-circuits if(!x)
     // don't produce a guard condition for `y = !x` and other non-short-circuited cases
-    not exists(Instruction inst | this.getFullyConverted() = inst.getAST()) and
-    exists(IRGuardCondition ir | this.(NotExpr).getOperand() = ir.getAST())
+    not exists(Instruction inst | this.getFullyConverted() = inst.getAst()) and
+    exists(IRGuardCondition ir | this.(NotExpr).getOperand() = ir.getAst())
   }
 
   /**
@@ -146,8 +146,8 @@ private class GuardConditionFromBinaryLogicalOperator extends GuardCondition {
  */
 private class GuardConditionFromShortCircuitNot extends GuardCondition, NotExpr {
   GuardConditionFromShortCircuitNot() {
-    not exists(Instruction inst | this.getFullyConverted() = inst.getAST()) and
-    exists(IRGuardCondition ir | this.getOperand() = ir.getAST())
+    not exists(Instruction inst | this.getFullyConverted() = inst.getAst()) and
+    exists(IRGuardCondition ir | this.getOperand() = ir.getAst())
   }
 
   override predicate controls(BasicBlock controlled, boolean testIsTrue) {
@@ -241,7 +241,7 @@ private class GuardConditionFromIR extends GuardCondition {
   private predicate controlsBlock(BasicBlock controlled, boolean testIsTrue) {
     exists(IRBlock irb |
       forex(IRGuardCondition inst | inst = ir | inst.controls(irb, testIsTrue)) and
-      irb.getAnInstruction().getAST().(ControlFlowNode).getBasicBlock() = controlled and
+      irb.getAnInstruction().getAst().(ControlFlowNode).getBasicBlock() = controlled and
       not isUnreachedBlock(irb)
     )
   }
diff --git a/cpp/ql/lib/semmle/code/cpp/controlflow/SSA.qll b/cpp/ql/lib/semmle/code/cpp/controlflow/SSA.qll
index 097087a8778..4732cd06184 100644
--- a/cpp/ql/lib/semmle/code/cpp/controlflow/SSA.qll
+++ b/cpp/ql/lib/semmle/code/cpp/controlflow/SSA.qll
@@ -10,10 +10,13 @@ import SSAUtils
  * The SSA logic comes in two versions: the standard SSA and range-analysis RangeSSA.
  * This class provides the standard SSA logic.
  */
-library class StandardSSA extends SSAHelper {
-  StandardSSA() { this = 0 }
+library class StandardSsa extends SsaHelper {
+  StandardSsa() { this = 0 }
 }
 
+/** DEPRECATED: Alias for StandardSsa */
+deprecated class StandardSSA = StandardSsa;
+
 /**
  * A definition of one or more SSA variables, including phi node definitions.
  * An _SSA variable_, as defined in the literature, is effectively the pair of
@@ -27,22 +30,22 @@ library class StandardSSA extends SSAHelper {
  * statically seen to be unreachable.
  */
 class SsaDefinition extends ControlFlowNodeBase {
-  SsaDefinition() { exists(StandardSSA x | x.ssa_defn(_, this, _, _)) }
+  SsaDefinition() { exists(StandardSsa x | x.ssa_defn(_, this, _, _)) }
 
   /**
    * Gets a variable corresponding to an SSA StackVariable defined by
    * this definition.
    */
-  StackVariable getAVariable() { exists(StandardSSA x | x.ssa_defn(result, this, _, _)) }
+  StackVariable getAVariable() { exists(StandardSsa x | x.ssa_defn(result, this, _, _)) }
 
   /**
    * Gets a string representation of the SSA variable represented by the pair
    * `(this, v)`.
    */
-  string toString(StackVariable v) { exists(StandardSSA x | result = x.toString(this, v)) }
+  string toString(StackVariable v) { exists(StandardSsa x | result = x.toString(this, v)) }
 
   /** Gets a use of the SSA variable represented by the pair `(this, v)`. */
-  VariableAccess getAUse(StackVariable v) { exists(StandardSSA x | result = x.getAUse(this, v)) }
+  VariableAccess getAUse(StackVariable v) { exists(StandardSsa x | result = x.getAUse(this, v)) }
 
   /**
    * Gets the control-flow node for this definition. This will usually be the
@@ -62,7 +65,7 @@ class SsaDefinition extends ControlFlowNodeBase {
   BasicBlock getBasicBlock() { result.contains(this.getDefinition()) }
 
   /** Holds if this definition is a phi node for variable `v`. */
-  predicate isPhiNode(StackVariable v) { exists(StandardSSA x | x.phi_node(v, this)) }
+  predicate isPhiNode(StackVariable v) { exists(StandardSsa x | x.phi_node(v, this)) }
 
   /** Gets the location of this definition. */
   Location getLocation() { result = this.(ControlFlowNode).getLocation() }
@@ -124,7 +127,7 @@ class SsaDefinition extends ControlFlowNodeBase {
 
   /** Holds if `(this, v)` reaches the end of basic block `b`. */
   predicate reachesEndOfBB(StackVariable v, BasicBlock b) {
-    exists(StandardSSA x | x.ssaDefinitionReachesEndOfBB(v, this, b))
+    exists(StandardSsa x | x.ssaDefinitionReachesEndOfBB(v, this, b))
   }
 
   /**
diff --git a/cpp/ql/lib/semmle/code/cpp/controlflow/SSAUtils.qll b/cpp/ql/lib/semmle/code/cpp/controlflow/SSAUtils.qll
index b7d0742fac6..2252864c249 100644
--- a/cpp/ql/lib/semmle/code/cpp/controlflow/SSAUtils.qll
+++ b/cpp/ql/lib/semmle/code/cpp/controlflow/SSAUtils.qll
@@ -114,10 +114,10 @@ private predicate live_at_exit_of_bb(StackVariable v, BasicBlock b) {
 
 /** Common SSA logic for standard SSA and range-analysis SSA. */
 cached
-library class SSAHelper extends int {
+library class SsaHelper extends int {
   /* 0 = StandardSSA, 1 = RangeSSA */
   cached
-  SSAHelper() { this in [0 .. 1] }
+  SsaHelper() { this in [0 .. 1] }
 
   /**
    * Override to insert a custom phi node for variable `v` at the start of
@@ -311,3 +311,6 @@ library class SSAHelper extends int {
     ssa_use(v, result, _, _)
   }
 }
+
+/** DEPRECATED: Alias for SsaHelper */
+deprecated class SSAHelper = SsaHelper;
diff --git a/cpp/ql/lib/semmle/code/cpp/controlflow/internal/CFG.qll b/cpp/ql/lib/semmle/code/cpp/controlflow/internal/CFG.qll
index ca1964a43c3..6ec802cf281 100644
--- a/cpp/ql/lib/semmle/code/cpp/controlflow/internal/CFG.qll
+++ b/cpp/ql/lib/semmle/code/cpp/controlflow/internal/CFG.qll
@@ -1379,7 +1379,7 @@ private module Cached {
    * true-successors and false-successors.
    */
   cached
-  predicate qlCFGSuccessor(Node n1, Node n2) {
+  predicate qlCfgSuccessor(Node n1, Node n2) {
     exists(Node memberNode, Pos memberPos |
       subEdgeIncludingDestructors(any(Pos at | at.isAt()), n1, memberNode, memberPos) and
       normalGroupMember(memberNode, memberPos, n2)
@@ -1388,23 +1388,32 @@ private module Cached {
     conditionalSuccessor(n1, _, n2)
   }
 
+  /** DEPRECATED: Alias for qlCfgSuccessor */
+  deprecated predicate qlCFGSuccessor = qlCfgSuccessor/2;
+
   /**
    * Holds if `n2` is a control-flow node such that the control-flow
    * edge `(n1, n2)` may be taken when `n1` is an expression that is true.
    */
   cached
-  predicate qlCFGTrueSuccessor(Node n1, Node n2) {
+  predicate qlCfgTrueSuccessor(Node n1, Node n2) {
     conditionalSuccessor(n1, true, n2) and
     not conditionalSuccessor(n1, false, n2)
   }
 
+  /** DEPRECATED: Alias for qlCfgTrueSuccessor */
+  deprecated predicate qlCFGTrueSuccessor = qlCfgTrueSuccessor/2;
+
   /**
    * Holds if `n2` is a control-flow node such that the control-flow
    * edge `(n1, n2)` may be taken when `n1` is an expression that is false.
    */
   cached
-  predicate qlCFGFalseSuccessor(Node n1, Node n2) {
+  predicate qlCfgFalseSuccessor(Node n1, Node n2) {
     conditionalSuccessor(n1, false, n2) and
     not conditionalSuccessor(n1, true, n2)
   }
+
+  /** DEPRECATED: Alias for qlCfgFalseSuccessor */
+  deprecated predicate qlCFGFalseSuccessor = qlCfgFalseSuccessor/2;
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/controlflow/internal/ConstantExprs.qll b/cpp/ql/lib/semmle/code/cpp/controlflow/internal/ConstantExprs.qll
index a561771fe01..923533ee2fd 100644
--- a/cpp/ql/lib/semmle/code/cpp/controlflow/internal/ConstantExprs.qll
+++ b/cpp/ql/lib/semmle/code/cpp/controlflow/internal/ConstantExprs.qll
@@ -188,8 +188,8 @@ private predicate nonAnalyzableFunction(Function f) {
  */
 private predicate impossibleFalseEdge(Expr condition, Node succ) {
   conditionAlwaysTrue(condition) and
-  qlCFGFalseSuccessor(condition, succ) and
-  not qlCFGTrueSuccessor(condition, succ)
+  qlCfgFalseSuccessor(condition, succ) and
+  not qlCfgTrueSuccessor(condition, succ)
 }
 
 /**
@@ -197,8 +197,8 @@ private predicate impossibleFalseEdge(Expr condition, Node succ) {
  */
 private predicate impossibleTrueEdge(Expr condition, Node succ) {
   conditionAlwaysFalse(condition) and
-  qlCFGTrueSuccessor(condition, succ) and
-  not qlCFGFalseSuccessor(condition, succ)
+  qlCfgTrueSuccessor(condition, succ) and
+  not qlCfgFalseSuccessor(condition, succ)
 }
 
 /**
@@ -960,9 +960,9 @@ library class ConditionEvaluator extends ExprEvaluator {
   ConditionEvaluator() { this = 0 }
 
   override predicate interesting(Expr e) {
-    qlCFGFalseSuccessor(e, _)
+    qlCfgFalseSuccessor(e, _)
     or
-    qlCFGTrueSuccessor(e, _)
+    qlCfgTrueSuccessor(e, _)
   }
 }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/DefaultTaintTracking.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/DefaultTaintTracking.qll
index c6942b7adfe..be5403734ce 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/DefaultTaintTracking.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/DefaultTaintTracking.qll
@@ -129,11 +129,11 @@ private class FromGlobalVarTaintTrackingCfg extends TaintTracking2::Configuratio
 }
 
 private predicate readsVariable(LoadInstruction load, Variable var) {
-  load.getSourceAddress().(VariableAddressInstruction).getASTVariable() = var
+  load.getSourceAddress().(VariableAddressInstruction).getAstVariable() = var
 }
 
 private predicate writesVariable(StoreInstruction store, Variable var) {
-  store.getDestinationAddress().(VariableAddressInstruction).getASTVariable() = var
+  store.getDestinationAddress().(VariableAddressInstruction).getAstVariable() = var
 }
 
 /**
@@ -489,9 +489,9 @@ module TaintedWithPath {
     /** Gets the element that `pathNode` wraps, if any. */
     Element getElementFromPathNode(PathNode pathNode) {
       exists(DataFlow::Node node | node = pathNode.(WrapPathNode).inner().getNode() |
-        result = node.asInstruction().getAST()
+        result = node.asInstruction().getAst()
         or
-        result = node.asOperand().getDef().getAST()
+        result = node.asOperand().getDef().getAst()
       )
       or
       result = pathNode.(EndpointPathNode).inner()
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/ResolveCall.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/ResolveCall.qll
index f25386d3ba8..bcf2fa8c7db 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/ResolveCall.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/ResolveCall.qll
@@ -17,7 +17,7 @@ private import semmle.code.cpp.ir.IR
  */
 Function resolveCall(Call call) {
   exists(CallInstruction callInstruction |
-    callInstruction.getAST() = call and
+    callInstruction.getAst() = call and
     result = viableCallable(callInstruction)
   )
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowDispatch.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowDispatch.qll
index 509ee01ec07..c0bdb656e0e 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowDispatch.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowDispatch.qll
@@ -116,12 +116,12 @@ private module VirtualDispatch {
   /** Holds if `addressInstr` is an instruction that produces the address of `var`. */
   private predicate addressOfGlobal(Instruction addressInstr, GlobalOrNamespaceVariable var) {
     // Access directly to the global variable
-    addressInstr.(VariableAddressInstruction).getASTVariable() = var
+    addressInstr.(VariableAddressInstruction).getAstVariable() = var
     or
     // Access to a field on a global union
     exists(FieldAddressInstruction fa |
       fa = addressInstr and
-      fa.getObjectAddress().(VariableAddressInstruction).getASTVariable() = var and
+      fa.getObjectAddress().(VariableAddressInstruction).getAstVariable() = var and
       fa.getField().getDeclaringType() instanceof Union
     )
   }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/IRVariable.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/IRVariable.qll
index 146fc270738..ca4708857a7 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/IRVariable.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/IRVariable.qll
@@ -55,7 +55,10 @@ class IRVariable extends TIRVariable {
    * Gets the AST node that declared this variable, or that introduced this
    * variable as part of the AST-to-IR translation.
    */
-  Language::AST getAST() { none() }
+  Language::AST getAst() { none() }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated Language::AST getAST() { result = getAst() }
 
   /**
    * Gets an identifier string for the variable. This identifier is unique
@@ -66,7 +69,7 @@ class IRVariable extends TIRVariable {
   /**
    * Gets the source location of this variable.
    */
-  final Language::Location getLocation() { result = getAST().getLocation() }
+  final Language::Location getLocation() { result = getAst().getLocation() }
 
   /**
    * Gets the IR for the function that references this variable.
@@ -90,7 +93,10 @@ class IRUserVariable extends IRVariable, TIRUserVariable {
 
   final override string toString() { result = getVariable().toString() }
 
-  final override Language::AST getAST() { result = var }
+  final override Language::AST getAst() { result = var }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 
   final override string getUniqueId() {
     result = getVariable().toString() + " " + getVariable().getLocation().toString()
@@ -157,7 +163,10 @@ class IRGeneratedVariable extends IRVariable {
 
   final override Language::LanguageType getLanguageType() { result = type }
 
-  final override Language::AST getAST() { result = ast }
+  final override Language::AST getAst() { result = ast }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 
   override string toString() { result = getBaseString() + getLocationString() }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/Instruction.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/Instruction.qll
index 1c2cc493338..4dac3087f83 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/Instruction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/Instruction.qll
@@ -41,7 +41,7 @@ class Instruction extends Construction::TStageInstruction {
   }
 
   /** Gets a textual representation of this element. */
-  final string toString() { result = this.getOpcode().toString() + ": " + this.getAST().toString() }
+  final string toString() { result = this.getOpcode().toString() + ": " + this.getAst().toString() }
 
   /**
    * Gets a string showing the result, opcode, and operands of the instruction, equivalent to what
@@ -136,7 +136,7 @@ class Instruction extends Construction::TStageInstruction {
   string getResultId() {
     this.shouldGenerateDumpStrings() and
     result =
-      this.getResultPrefix() + this.getAST().getLocation().getStartLine() + "_" + this.getLineRank()
+      this.getResultPrefix() + this.getAst().getLocation().getStartLine() + "_" + this.getLineRank()
   }
 
   /**
@@ -208,12 +208,15 @@ class Instruction extends Construction::TStageInstruction {
   /**
    * Gets the AST that caused this instruction to be generated.
    */
-  final Language::AST getAST() { result = Construction::getInstructionAST(this) }
+  final Language::AST getAst() { result = Construction::getInstructionAst(this) }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated Language::AST getAST() { result = getAst() }
 
   /**
    * Gets the location of the source code for this instruction.
    */
-  final Language::Location getLocation() { result = this.getAST().getLocation() }
+  final Language::Location getLocation() { result = this.getAst().getLocation() }
 
   /**
    * Gets the  `Expr` whose result is computed by this instruction, if any. The `Expr` may be a
@@ -459,7 +462,10 @@ class VariableInstruction extends Instruction {
   /**
    * Gets the AST variable that this instruction's IR variable refers to, if one exists.
    */
-  final Language::Variable getASTVariable() { result = var.(IRUserVariable).getVariable() }
+  final Language::Variable getAstVariable() { result = var.(IRUserVariable).getVariable() }
+
+  /** DEPRECATED: Alias for getAstVariable */
+  deprecated Language::Variable getASTVariable() { result = getAstVariable() }
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/Operand.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/Operand.qll
index 89b82657c3b..c1e997d5844 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/Operand.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/Operand.qll
@@ -18,7 +18,7 @@ private import internal.OperandInternal
  * of `TOperand` that are used in this stage.
  */
 private class TStageOperand =
-  TRegisterOperand or TNonSSAMemoryOperand or TPhiOperand or TChiOperand;
+  TRegisterOperand or TNonSsaMemoryOperand or TPhiOperand or TChiOperand;
 
 /**
  * A known location. Testing `loc instanceof KnownLocation` will account for non existing locations, as
@@ -38,7 +38,7 @@ class Operand extends TStageOperand {
     // Ensure that the operand does not refer to instructions from earlier stages that are unreachable here
     exists(Instruction use, Instruction def | this = registerOperand(use, _, def))
     or
-    exists(Instruction use | this = nonSSAMemoryOperand(use, _))
+    exists(Instruction use | this = nonSsaMemoryOperand(use, _))
     or
     exists(Instruction use, Instruction def, IRBlock predecessorBlock |
       this = phiOperand(use, def, predecessorBlock, _) or
@@ -209,7 +209,7 @@ class Operand extends TStageOperand {
 class MemoryOperand extends Operand {
   cached
   MemoryOperand() {
-    this instanceof TNonSSAMemoryOperand or
+    this instanceof TNonSsaMemoryOperand or
     this instanceof TPhiOperand or
     this instanceof TChiOperand
   }
@@ -249,7 +249,7 @@ class NonPhiOperand extends Operand {
 
   NonPhiOperand() {
     this = registerOperand(useInstr, tag, _) or
-    this = nonSSAMemoryOperand(useInstr, tag) or
+    this = nonSsaMemoryOperand(useInstr, tag) or
     this = chiOperand(useInstr, tag)
   }
 
@@ -299,7 +299,7 @@ class NonPhiMemoryOperand extends NonPhiOperand, MemoryOperand, TNonPhiMemoryOpe
 
   cached
   NonPhiMemoryOperand() {
-    this = nonSSAMemoryOperand(useInstr, tag)
+    this = nonSsaMemoryOperand(useInstr, tag)
     or
     this = chiOperand(useInstr, tag)
   }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/internal/ValueNumberingInternal.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/internal/ValueNumberingInternal.qll
index fdb645e03f0..2dc735f49df 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/internal/ValueNumberingInternal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/internal/ValueNumberingInternal.qll
@@ -99,7 +99,7 @@ private predicate filteredNumberableInstruction(Instruction instr) {
   // count rather than strictcount to handle missing AST elements
   // separate instanceof and inline casts to avoid failed casts with a count of 0
   instr instanceof VariableAddressInstruction and
-  count(instr.(VariableAddressInstruction).getIRVariable().getAST()) != 1
+  count(instr.(VariableAddressInstruction).getIRVariable().getAst()) != 1
   or
   instr instanceof ConstantInstruction and
   count(instr.getResultIRType()) != 1
@@ -121,7 +121,7 @@ private predicate variableAddressValueNumber(
   // The underlying AST element is used as value-numbering key instead of the
   // `IRVariable` to work around a problem where a variable or expression with
   // multiple types gives rise to multiple `IRVariable`s.
-  unique( | | instr.getIRVariable().getAST()) = ast
+  unique( | | instr.getIRVariable().getAst()) = ast
 }
 
 private predicate initializeParameterValueNumber(
@@ -131,7 +131,7 @@ private predicate initializeParameterValueNumber(
   // The underlying AST element is used as value-numbering key instead of the
   // `IRVariable` to work around a problem where a variable or expression with
   // multiple types gives rise to multiple `IRVariable`s.
-  instr.getIRVariable().getAST() = var
+  instr.getIRVariable().getAst() = var
 }
 
 private predicate constantValueNumber(
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasConfiguration.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasConfiguration.qll
index 8ba91d70087..7e12ebc1c90 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasConfiguration.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasConfiguration.qll
@@ -2,12 +2,12 @@ private import AliasConfigurationInternal
 private import semmle.code.cpp.ir.implementation.unaliased_ssa.IR
 private import cpp
 private import AliasAnalysis
-private import semmle.code.cpp.ir.implementation.unaliased_ssa.internal.SimpleSSA as UnaliasedSSA
+private import semmle.code.cpp.ir.implementation.unaliased_ssa.internal.SimpleSSA as UnaliasedSsa
 
 private newtype TAllocation =
   TVariableAllocation(IRVariable var) {
     // Only model variables that were not already handled in unaliased SSA.
-    not UnaliasedSSA::canReuseSSAForVariable(var)
+    not UnaliasedSsa::canReuseSsaForVariable(var)
   } or
   TIndirectParameterAllocation(IRAutomaticVariable var) {
     exists(InitializeIndirectionInstruction instr | instr.getIRVariable() = var)
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasedSSA.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasedSSA.qll
index acdae2b758a..76a99026d59 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasedSSA.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasedSSA.qll
@@ -133,7 +133,10 @@ abstract class MemoryLocation extends TMemoryLocation {
    */
   predicate isAlwaysAllocatedOnStack() { none() }
 
-  final predicate canReuseSSA() { none() }
+  final predicate canReuseSsa() { none() }
+
+  /** DEPRECATED: Alias for canReuseSsa */
+  deprecated predicate canReuseSSA() { canReuseSsa() }
 }
 
 /**
@@ -569,13 +572,16 @@ private Overlap getVariableMemoryLocationOverlap(
  * Holds if the def/use information for the result of `instr` can be reused from the previous
  * iteration of the IR.
  */
-predicate canReuseSSAForOldResult(Instruction instr) { OldSSA::canReuseSSAForMemoryResult(instr) }
+predicate canReuseSsaForOldResult(Instruction instr) { OldSSA::canReuseSsaForMemoryResult(instr) }
+
+/** DEPRECATED: Alias for canReuseSsaForOldResult */
+deprecated predicate canReuseSSAForOldResult = canReuseSsaForOldResult/1;
 
 bindingset[result, b]
 private boolean unbindBool(boolean b) { result != b.booleanNot() }
 
 MemoryLocation getResultMemoryLocation(Instruction instr) {
-  not canReuseSSAForOldResult(instr) and
+  not canReuseSsaForOldResult(instr) and
   exists(MemoryAccessKind kind, boolean isMayAccess |
     kind = instr.getResultMemoryAccess() and
     (if instr.hasResultMayMemoryAccess() then isMayAccess = true else isMayAccess = false) and
@@ -608,7 +614,7 @@ MemoryLocation getResultMemoryLocation(Instruction instr) {
 }
 
 MemoryLocation getOperandMemoryLocation(MemoryOperand operand) {
-  not canReuseSSAForOldResult(operand.getAnyDef()) and
+  not canReuseSsaForOldResult(operand.getAnyDef()) and
   exists(MemoryAccessKind kind, boolean isMayAccess |
     kind = operand.getMemoryAccess() and
     (if operand.hasMayReadMemoryAccess() then isMayAccess = true else isMayAccess = false) and
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/OperandInternal.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/OperandInternal.qll
index b47c20e97ef..c7a5389901b 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/OperandInternal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/OperandInternal.qll
@@ -1,2 +1,2 @@
 private import semmle.code.cpp.ir.implementation.internal.TOperand
-import AliasedSSAOperands
+import AliasedSsaOperands
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/PrintSSA.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/PrintSSA.qll
index 72bb239c153..c7487872512 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/PrintSSA.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/PrintSSA.qll
@@ -2,7 +2,7 @@ private import SSAConstructionInternal
 private import OldIR
 private import Alias
 private import SSAConstruction
-private import DebugSSA
+private import DebugSsa
 
 bindingset[offset]
 private string getKeySuffixForOffset(int offset) {
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConsistency.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConsistency.qll
index 5686bb439eb..1c75529be00 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConsistency.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConsistency.qll
@@ -1,2 +1,2 @@
 private import SSAConstruction as SSA
-import SSA::SSAConsistency
+import SSA::SsaConsistency
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstruction.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstruction.qll
index 5092e921cb3..13ec2ca4ca4 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstruction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstruction.qll
@@ -112,7 +112,7 @@ private module Cached {
     exists(Alias::getResultMemoryLocation(oldInstruction))
     or
     // This result was already modeled by a previous iteration of SSA.
-    Alias::canReuseSSAForOldResult(oldInstruction)
+    Alias::canReuseSsaForOldResult(oldInstruction)
   }
 
   cached
@@ -182,7 +182,7 @@ private module Cached {
    * unreachable, this predicate will recurse through any degenerate `Phi` instructions to find the
    * true definition.
    */
-  private Instruction getNewDefinitionFromOldSSA(OldIR::MemoryOperand oldOperand, Overlap overlap) {
+  private Instruction getNewDefinitionFromOldSsa(OldIR::MemoryOperand oldOperand, Overlap overlap) {
     exists(Overlap originalOverlap |
       originalOverlap = oldOperand.getDefinitionOverlap() and
       (
@@ -191,7 +191,7 @@ private module Cached {
         or
         exists(OldIR::PhiInputOperand phiOperand, Overlap phiOperandOverlap |
           phiOperand = getDegeneratePhiOperand(oldOperand.getAnyDef()) and
-          result = getNewDefinitionFromOldSSA(phiOperand, phiOperandOverlap) and
+          result = getNewDefinitionFromOldSsa(phiOperand, phiOperandOverlap) and
           overlap =
             combineOverlap(pragma[only_bind_out](phiOperandOverlap),
               pragma[only_bind_out](originalOverlap))
@@ -233,7 +233,7 @@ private module Cached {
     )
     or
     exists(OldIR::NonPhiMemoryOperand oldOperand |
-      result = getNewDefinitionFromOldSSA(oldOperand, overlap) and
+      result = getNewDefinitionFromOldSsa(oldOperand, overlap) and
       oldOperand.getUse() = instruction and
       tag = oldOperand.getOperandTag()
     )
@@ -307,13 +307,13 @@ private module Cached {
    * Gets the new definition instruction for the operand of `instr` that flows from the block
    * `newPredecessorBlock`, based on that operand's definition in the old IR.
    */
-  private Instruction getNewPhiOperandDefinitionFromOldSSA(
+  private Instruction getNewPhiOperandDefinitionFromOldSsa(
     Instruction instr, IRBlock newPredecessorBlock, Overlap overlap
   ) {
     exists(OldIR::PhiInstruction oldPhi, OldIR::PhiInputOperand oldOperand |
       oldPhi = getOldInstruction(instr) and
       oldOperand = oldPhi.getInputOperand(getOldBlock(newPredecessorBlock)) and
-      result = getNewDefinitionFromOldSSA(oldOperand, overlap)
+      result = getNewDefinitionFromOldSsa(oldOperand, overlap)
     )
   }
 
@@ -333,7 +333,7 @@ private module Cached {
       overlap = Alias::getOverlap(actualDefLocation, useLocation)
     )
     or
-    result = getNewPhiOperandDefinitionFromOldSSA(instr, newPredecessorBlock, overlap)
+    result = getNewPhiOperandDefinitionFromOldSsa(instr, newPredecessorBlock, overlap)
   }
 
   cached
@@ -412,17 +412,17 @@ private module Cached {
   }
 
   cached
-  Language::AST getInstructionAST(Instruction instr) {
-    result = getOldInstruction(instr).getAST()
+  Language::AST getInstructionAst(Instruction instr) {
+    result = getOldInstruction(instr).getAst()
     or
     exists(RawIR::Instruction blockStartInstr |
       instr = phiInstruction(blockStartInstr, _) and
-      result = blockStartInstr.getAST()
+      result = blockStartInstr.getAst()
     )
     or
     exists(RawIR::Instruction primaryInstr |
       instr = chiInstruction(primaryInstr) and
-      result = primaryInstr.getAST()
+      result = primaryInstr.getAst()
     )
     or
     exists(IRFunctionBase irFunc |
@@ -430,6 +430,12 @@ private module Cached {
     )
   }
 
+  /** DEPRECATED: Alias for getInstructionAst */
+  cached
+  deprecated Language::AST getInstructionAST(Instruction instr) {
+    result = getInstructionAst(instr)
+  }
+
   cached
   Language::LanguageType getInstructionResultType(Instruction instr) {
     result = instr.(RawIR::Instruction).getResultLanguageType()
@@ -975,35 +981,41 @@ module DefUse {
   }
 }
 
-predicate canReuseSSAForMemoryResult(Instruction instruction) {
+predicate canReuseSsaForMemoryResult(Instruction instruction) {
   exists(OldInstruction oldInstruction |
     oldInstruction = getOldInstruction(instruction) and
     (
       // The previous iteration said it was reusable, so we should mark it as reusable as well.
-      Alias::canReuseSSAForOldResult(oldInstruction)
+      Alias::canReuseSsaForOldResult(oldInstruction)
       or
       // The current alias analysis says it is reusable.
-      Alias::getResultMemoryLocation(oldInstruction).canReuseSSA()
+      Alias::getResultMemoryLocation(oldInstruction).canReuseSsa()
     )
   )
   or
   exists(Alias::MemoryLocation defLocation |
     // This is a `Phi` for a reusable location, so the result of the `Phi` is reusable as well.
     instruction = phiInstruction(_, defLocation) and
-    defLocation.canReuseSSA()
+    defLocation.canReuseSsa()
   )
   // We don't support reusing SSA for any location that could create a `Chi` instruction.
 }
 
+/** DEPRECATED: Alias for canReuseSsaForMemoryResult */
+deprecated predicate canReuseSSAForMemoryResult = canReuseSsaForMemoryResult/1;
+
 /**
  * Expose some of the internal predicates to PrintSSA.qll. We do this by publically importing those modules in the
  * `DebugSSA` module, which is then imported by PrintSSA.
  */
-module DebugSSA {
+module DebugSsa {
   import PhiInsertion
   import DefUse
 }
 
+/** DEPRECATED: Alias for DebugSsa */
+deprecated module DebugSSA = DebugSsa;
+
 import CachedForDebugging
 
 cached
@@ -1038,7 +1050,7 @@ private module CachedForDebugging {
 
   private OldIR::IRTempVariable getOldTempVariable(IRTempVariable var) {
     result.getEnclosingFunction() = var.getEnclosingFunction() and
-    result.getAST() = var.getAST() and
+    result.getAst() = var.getAst() and
     result.getTag() = var.getTag()
   }
 
@@ -1061,7 +1073,7 @@ private module CachedForDebugging {
   int maxValue() { result = 2147483647 }
 }
 
-module SSAConsistency {
+module SsaConsistency {
   /**
    * Holds if a `MemoryOperand` has more than one `MemoryLocation` assigned by alias analysis.
    */
@@ -1114,6 +1126,9 @@ module SSAConsistency {
   }
 }
 
+/** DEPRECATED: Alias for SsaConsistency */
+deprecated module SSAConsistency = SsaConsistency;
+
 /**
  * Provides the portion of the parameterized IR interface that is used to construct the SSA stages
  * of the IR. The raw stage of the IR does not expose these predicates.
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstructionInternal.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstructionInternal.qll
index a1ce2629cc2..74919a57870 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstructionInternal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstructionInternal.qll
@@ -2,7 +2,7 @@ import semmle.code.cpp.ir.implementation.unaliased_ssa.IR as OldIR
 import semmle.code.cpp.ir.implementation.unaliased_ssa.internal.reachability.ReachableBlock as Reachability
 import semmle.code.cpp.ir.implementation.unaliased_ssa.internal.reachability.Dominance as Dominance
 import semmle.code.cpp.ir.implementation.aliased_ssa.IR as NewIR
-import semmle.code.cpp.ir.implementation.internal.TInstruction::AliasedSSAInstructions as SSAInstructions
+import semmle.code.cpp.ir.implementation.internal.TInstruction::AliasedSsaInstructions as SSAInstructions
 import semmle.code.cpp.ir.internal.IRCppLanguage as Language
 import AliasedSSA as Alias
-import semmle.code.cpp.ir.implementation.internal.TOperand::AliasedSSAOperands as SSAOperands
+import semmle.code.cpp.ir.implementation.internal.TOperand::AliasedSsaOperands as SSAOperands
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/internal/TInstruction.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/internal/TInstruction.qll
index 4b3f19cbdde..5a7099d9fa2 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/internal/TInstruction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/internal/TInstruction.qll
@@ -19,24 +19,24 @@ newtype TInstruction =
   ) {
     IRConstruction::Raw::hasInstruction(tag1, tag2)
   } or
-  TUnaliasedSSAPhiInstruction(
-    TRawInstruction blockStartInstr, UnaliasedSSA::SSA::MemoryLocation memoryLocation
+  TUnaliasedSsaPhiInstruction(
+    TRawInstruction blockStartInstr, UnaliasedSsa::SSA::MemoryLocation memoryLocation
   ) {
-    UnaliasedSSA::SSA::hasPhiInstruction(blockStartInstr, memoryLocation)
+    UnaliasedSsa::SSA::hasPhiInstruction(blockStartInstr, memoryLocation)
   } or
-  TUnaliasedSSAChiInstruction(TRawInstruction primaryInstruction) { none() } or
-  TUnaliasedSSAUnreachedInstruction(IRFunctionBase irFunc) {
-    UnaliasedSSA::SSA::hasUnreachedInstruction(irFunc)
+  TUnaliasedSsaChiInstruction(TRawInstruction primaryInstruction) { none() } or
+  TUnaliasedSsaUnreachedInstruction(IRFunctionBase irFunc) {
+    UnaliasedSsa::SSA::hasUnreachedInstruction(irFunc)
   } or
-  TAliasedSSAPhiInstruction(
+  TAliasedSsaPhiInstruction(
     TRawInstruction blockStartInstr, AliasedSSA::SSA::MemoryLocation memoryLocation
   ) {
     AliasedSSA::SSA::hasPhiInstruction(blockStartInstr, memoryLocation)
   } or
-  TAliasedSSAChiInstruction(TRawInstruction primaryInstruction) {
+  TAliasedSsaChiInstruction(TRawInstruction primaryInstruction) {
     AliasedSSA::SSA::hasChiInstruction(primaryInstruction)
   } or
-  TAliasedSSAUnreachedInstruction(IRFunctionBase irFunc) {
+  TAliasedSsaUnreachedInstruction(IRFunctionBase irFunc) {
     AliasedSSA::SSA::hasUnreachedInstruction(irFunc)
   }
 
@@ -46,58 +46,64 @@ newtype TInstruction =
  * These wrappers are not parameterized because it is not possible to invoke an IPA constructor via
  * a class alias.
  */
-module UnaliasedSSAInstructions {
-  class TPhiInstruction = TUnaliasedSSAPhiInstruction;
+module UnaliasedSsaInstructions {
+  class TPhiInstruction = TUnaliasedSsaPhiInstruction;
 
   TPhiInstruction phiInstruction(
-    TRawInstruction blockStartInstr, UnaliasedSSA::SSA::MemoryLocation memoryLocation
+    TRawInstruction blockStartInstr, UnaliasedSsa::SSA::MemoryLocation memoryLocation
   ) {
-    result = TUnaliasedSSAPhiInstruction(blockStartInstr, memoryLocation)
+    result = TUnaliasedSsaPhiInstruction(blockStartInstr, memoryLocation)
   }
 
   TRawInstruction reusedPhiInstruction(TRawInstruction blockStartInstr) { none() }
 
-  class TChiInstruction = TUnaliasedSSAChiInstruction;
+  class TChiInstruction = TUnaliasedSsaChiInstruction;
 
   TChiInstruction chiInstruction(TRawInstruction primaryInstruction) {
-    result = TUnaliasedSSAChiInstruction(primaryInstruction)
+    result = TUnaliasedSsaChiInstruction(primaryInstruction)
   }
 
-  class TUnreachedInstruction = TUnaliasedSSAUnreachedInstruction;
+  class TUnreachedInstruction = TUnaliasedSsaUnreachedInstruction;
 
   TUnreachedInstruction unreachedInstruction(IRFunctionBase irFunc) {
-    result = TUnaliasedSSAUnreachedInstruction(irFunc)
+    result = TUnaliasedSsaUnreachedInstruction(irFunc)
   }
 }
 
+/** DEPRECATED: Alias for UnaliasedSsaInstructions */
+deprecated module UnaliasedSSAInstructions = UnaliasedSsaInstructions;
+
 /**
  * Provides wrappers for the constructors of each branch of `TInstruction` that is used by the
  * aliased SSA stage.
  * These wrappers are not parameterized because it is not possible to invoke an IPA constructor via
  * a class alias.
  */
-module AliasedSSAInstructions {
-  class TPhiInstruction = TAliasedSSAPhiInstruction or TUnaliasedSSAPhiInstruction;
+module AliasedSsaInstructions {
+  class TPhiInstruction = TAliasedSsaPhiInstruction or TUnaliasedSsaPhiInstruction;
 
   TPhiInstruction phiInstruction(
     TRawInstruction blockStartInstr, AliasedSSA::SSA::MemoryLocation memoryLocation
   ) {
-    result = TAliasedSSAPhiInstruction(blockStartInstr, memoryLocation)
+    result = TAliasedSsaPhiInstruction(blockStartInstr, memoryLocation)
   }
 
   TPhiInstruction reusedPhiInstruction(TRawInstruction blockStartInstr) {
-    result = TUnaliasedSSAPhiInstruction(blockStartInstr, _)
+    result = TUnaliasedSsaPhiInstruction(blockStartInstr, _)
   }
 
-  class TChiInstruction = TAliasedSSAChiInstruction;
+  class TChiInstruction = TAliasedSsaChiInstruction;
 
   TChiInstruction chiInstruction(TRawInstruction primaryInstruction) {
-    result = TAliasedSSAChiInstruction(primaryInstruction)
+    result = TAliasedSsaChiInstruction(primaryInstruction)
   }
 
-  class TUnreachedInstruction = TAliasedSSAUnreachedInstruction;
+  class TUnreachedInstruction = TAliasedSsaUnreachedInstruction;
 
   TUnreachedInstruction unreachedInstruction(IRFunctionBase irFunc) {
-    result = TAliasedSSAUnreachedInstruction(irFunc)
+    result = TAliasedSsaUnreachedInstruction(irFunc)
   }
 }
+
+/** DEPRECATED: Alias for AliasedSsaInstructions */
+deprecated module AliasedSSAInstructions = AliasedSsaInstructions;
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/internal/TInstructionInternal.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/internal/TInstructionInternal.qll
index adaaaca9cd8..2c9ac1c4b80 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/internal/TInstructionInternal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/internal/TInstructionInternal.qll
@@ -1,4 +1,4 @@
 import semmle.code.cpp.ir.internal.IRCppLanguage as Language
 import semmle.code.cpp.ir.implementation.raw.internal.IRConstruction as IRConstruction
-import semmle.code.cpp.ir.implementation.unaliased_ssa.internal.SSAConstruction as UnaliasedSSA
+import semmle.code.cpp.ir.implementation.unaliased_ssa.internal.SSAConstruction as UnaliasedSsa
 import semmle.code.cpp.ir.implementation.aliased_ssa.internal.SSAConstruction as AliasedSSA
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/internal/TOperand.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/internal/TOperand.qll
index e86494af03a..bc69754fe32 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/internal/TOperand.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/internal/TOperand.qll
@@ -31,7 +31,7 @@ private module Internal {
     TNoOperand() { none() } or
     // Can be "removed" later when there's unreachable code
     // These operands can be reused across all three stages. They just get different defs.
-    TNonSSAMemoryOperand(Raw::Instruction useInstr, MemoryOperandTag tag) {
+    TNonSsaMemoryOperand(Raw::Instruction useInstr, MemoryOperandTag tag) {
       // Has no definition in raw but will get definitions later
       useInstr.getOpcode().hasOperand(tag)
     } or
@@ -49,11 +49,11 @@ private module Internal {
     // important that we use the same definition of "is variable aliased" across
     // the phases.
     TAliasedPhiOperand(
-      TAliasedSSAPhiInstruction useInstr, Aliased::IRBlock predecessorBlock, Overlap overlap
+      TAliasedSsaPhiInstruction useInstr, Aliased::IRBlock predecessorBlock, Overlap overlap
     ) {
       exists(AliasedConstruction::getPhiOperandDefinition(useInstr, predecessorBlock, overlap))
     } or
-    TAliasedChiOperand(TAliasedSSAChiInstruction useInstr, ChiOperandTag tag) { any() }
+    TAliasedChiOperand(TAliasedSsaChiInstruction useInstr, ChiOperandTag tag) { any() }
 }
 
 /**
@@ -72,13 +72,21 @@ private module Shared {
     result = Internal::TRegisterOperand(useInstr, tag, defInstr)
   }
 
-  class TNonSSAMemoryOperand = Internal::TNonSSAMemoryOperand;
+  class TNonSsaMemoryOperand = Internal::TNonSsaMemoryOperand;
+
+  /** DEPRECATED: Alias for TNonSsaMemoryOperand */
+  deprecated class TNonSSAMemoryOperand = TNonSsaMemoryOperand;
 
   /**
    * Returns the non-Phi memory operand with the specified parameters.
    */
-  TNonSSAMemoryOperand nonSSAMemoryOperand(TRawInstruction useInstr, MemoryOperandTag tag) {
-    result = Internal::TNonSSAMemoryOperand(useInstr, tag)
+  TNonSsaMemoryOperand nonSsaMemoryOperand(TRawInstruction useInstr, MemoryOperandTag tag) {
+    result = Internal::TNonSsaMemoryOperand(useInstr, tag)
+  }
+
+  /** DEPRECATED: Alias for nonSsaMemoryOperand */
+  deprecated TNonSSAMemoryOperand nonSSAMemoryOperand(TRawInstruction useInstr, MemoryOperandTag tag) {
+    result = nonSsaMemoryOperand(useInstr, tag)
   }
 }
 
@@ -95,7 +103,7 @@ module RawOperands {
 
   class TChiOperand = Internal::TNoOperand;
 
-  class TNonPhiMemoryOperand = TNonSSAMemoryOperand or TChiOperand;
+  class TNonPhiMemoryOperand = TNonSsaMemoryOperand or TChiOperand;
 
   /**
    * Returns the Phi operand with the specified parameters.
@@ -126,14 +134,14 @@ module RawOperands {
  * These wrappers are not parameterized because it is not possible to invoke an IPA constructor via
  * a class alias.
  */
-module UnaliasedSSAOperands {
+module UnaliasedSsaOperands {
   import Shared
 
   class TPhiOperand = Internal::TUnaliasedPhiOperand;
 
   class TChiOperand = Internal::TNoOperand;
 
-  class TNonPhiMemoryOperand = TNonSSAMemoryOperand or TChiOperand;
+  class TNonPhiMemoryOperand = TNonSsaMemoryOperand or TChiOperand;
 
   /**
    * Returns the Phi operand with the specified parameters.
@@ -159,20 +167,23 @@ module UnaliasedSSAOperands {
   TChiOperand chiOperand(Unaliased::Instruction useInstr, ChiOperandTag tag) { none() }
 }
 
+/** DEPRECATED: Alias for UnaliasedSsaOperands */
+deprecated module UnaliasedSSAOperands = UnaliasedSsaOperands;
+
 /**
  * Provides wrappers for the constructors of each branch of `TOperand` that is used by the
  * asliased SSA stage.
  * These wrappers are not parameterized because it is not possible to invoke an IPA constructor via
  * a class alias.
  */
-module AliasedSSAOperands {
+module AliasedSsaOperands {
   import Shared
 
   class TPhiOperand = Internal::TAliasedPhiOperand or Internal::TUnaliasedPhiOperand;
 
   class TChiOperand = Internal::TAliasedChiOperand;
 
-  class TNonPhiMemoryOperand = TNonSSAMemoryOperand or TChiOperand;
+  class TNonPhiMemoryOperand = TNonSsaMemoryOperand or TChiOperand;
 
   /**
    * Returns the Phi operand with the specified parameters.
@@ -202,7 +213,10 @@ module AliasedSSAOperands {
   /**
    * Returns the Chi operand with the specified parameters.
    */
-  TChiOperand chiOperand(TAliasedSSAChiInstruction useInstr, ChiOperandTag tag) {
+  TChiOperand chiOperand(TAliasedSsaChiInstruction useInstr, ChiOperandTag tag) {
     result = Internal::TAliasedChiOperand(useInstr, tag)
   }
 }
+
+/** DEPRECATED: Alias for AliasedSsaOperands */
+deprecated module AliasedSSAOperands = AliasedSsaOperands;
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/IRVariable.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/IRVariable.qll
index 146fc270738..ca4708857a7 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/IRVariable.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/IRVariable.qll
@@ -55,7 +55,10 @@ class IRVariable extends TIRVariable {
    * Gets the AST node that declared this variable, or that introduced this
    * variable as part of the AST-to-IR translation.
    */
-  Language::AST getAST() { none() }
+  Language::AST getAst() { none() }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated Language::AST getAST() { result = getAst() }
 
   /**
    * Gets an identifier string for the variable. This identifier is unique
@@ -66,7 +69,7 @@ class IRVariable extends TIRVariable {
   /**
    * Gets the source location of this variable.
    */
-  final Language::Location getLocation() { result = getAST().getLocation() }
+  final Language::Location getLocation() { result = getAst().getLocation() }
 
   /**
    * Gets the IR for the function that references this variable.
@@ -90,7 +93,10 @@ class IRUserVariable extends IRVariable, TIRUserVariable {
 
   final override string toString() { result = getVariable().toString() }
 
-  final override Language::AST getAST() { result = var }
+  final override Language::AST getAst() { result = var }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 
   final override string getUniqueId() {
     result = getVariable().toString() + " " + getVariable().getLocation().toString()
@@ -157,7 +163,10 @@ class IRGeneratedVariable extends IRVariable {
 
   final override Language::LanguageType getLanguageType() { result = type }
 
-  final override Language::AST getAST() { result = ast }
+  final override Language::AST getAst() { result = ast }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 
   override string toString() { result = getBaseString() + getLocationString() }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/Instruction.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/Instruction.qll
index 1c2cc493338..4dac3087f83 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/Instruction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/Instruction.qll
@@ -41,7 +41,7 @@ class Instruction extends Construction::TStageInstruction {
   }
 
   /** Gets a textual representation of this element. */
-  final string toString() { result = this.getOpcode().toString() + ": " + this.getAST().toString() }
+  final string toString() { result = this.getOpcode().toString() + ": " + this.getAst().toString() }
 
   /**
    * Gets a string showing the result, opcode, and operands of the instruction, equivalent to what
@@ -136,7 +136,7 @@ class Instruction extends Construction::TStageInstruction {
   string getResultId() {
     this.shouldGenerateDumpStrings() and
     result =
-      this.getResultPrefix() + this.getAST().getLocation().getStartLine() + "_" + this.getLineRank()
+      this.getResultPrefix() + this.getAst().getLocation().getStartLine() + "_" + this.getLineRank()
   }
 
   /**
@@ -208,12 +208,15 @@ class Instruction extends Construction::TStageInstruction {
   /**
    * Gets the AST that caused this instruction to be generated.
    */
-  final Language::AST getAST() { result = Construction::getInstructionAST(this) }
+  final Language::AST getAst() { result = Construction::getInstructionAst(this) }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated Language::AST getAST() { result = getAst() }
 
   /**
    * Gets the location of the source code for this instruction.
    */
-  final Language::Location getLocation() { result = this.getAST().getLocation() }
+  final Language::Location getLocation() { result = this.getAst().getLocation() }
 
   /**
    * Gets the  `Expr` whose result is computed by this instruction, if any. The `Expr` may be a
@@ -459,7 +462,10 @@ class VariableInstruction extends Instruction {
   /**
    * Gets the AST variable that this instruction's IR variable refers to, if one exists.
    */
-  final Language::Variable getASTVariable() { result = var.(IRUserVariable).getVariable() }
+  final Language::Variable getAstVariable() { result = var.(IRUserVariable).getVariable() }
+
+  /** DEPRECATED: Alias for getAstVariable */
+  deprecated Language::Variable getASTVariable() { result = getAstVariable() }
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/Operand.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/Operand.qll
index 89b82657c3b..c1e997d5844 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/Operand.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/Operand.qll
@@ -18,7 +18,7 @@ private import internal.OperandInternal
  * of `TOperand` that are used in this stage.
  */
 private class TStageOperand =
-  TRegisterOperand or TNonSSAMemoryOperand or TPhiOperand or TChiOperand;
+  TRegisterOperand or TNonSsaMemoryOperand or TPhiOperand or TChiOperand;
 
 /**
  * A known location. Testing `loc instanceof KnownLocation` will account for non existing locations, as
@@ -38,7 +38,7 @@ class Operand extends TStageOperand {
     // Ensure that the operand does not refer to instructions from earlier stages that are unreachable here
     exists(Instruction use, Instruction def | this = registerOperand(use, _, def))
     or
-    exists(Instruction use | this = nonSSAMemoryOperand(use, _))
+    exists(Instruction use | this = nonSsaMemoryOperand(use, _))
     or
     exists(Instruction use, Instruction def, IRBlock predecessorBlock |
       this = phiOperand(use, def, predecessorBlock, _) or
@@ -209,7 +209,7 @@ class Operand extends TStageOperand {
 class MemoryOperand extends Operand {
   cached
   MemoryOperand() {
-    this instanceof TNonSSAMemoryOperand or
+    this instanceof TNonSsaMemoryOperand or
     this instanceof TPhiOperand or
     this instanceof TChiOperand
   }
@@ -249,7 +249,7 @@ class NonPhiOperand extends Operand {
 
   NonPhiOperand() {
     this = registerOperand(useInstr, tag, _) or
-    this = nonSSAMemoryOperand(useInstr, tag) or
+    this = nonSsaMemoryOperand(useInstr, tag) or
     this = chiOperand(useInstr, tag)
   }
 
@@ -299,7 +299,7 @@ class NonPhiMemoryOperand extends NonPhiOperand, MemoryOperand, TNonPhiMemoryOpe
 
   cached
   NonPhiMemoryOperand() {
-    this = nonSSAMemoryOperand(useInstr, tag)
+    this = nonSsaMemoryOperand(useInstr, tag)
     or
     this = chiOperand(useInstr, tag)
   }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll
index fdb645e03f0..2dc735f49df 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll
@@ -99,7 +99,7 @@ private predicate filteredNumberableInstruction(Instruction instr) {
   // count rather than strictcount to handle missing AST elements
   // separate instanceof and inline casts to avoid failed casts with a count of 0
   instr instanceof VariableAddressInstruction and
-  count(instr.(VariableAddressInstruction).getIRVariable().getAST()) != 1
+  count(instr.(VariableAddressInstruction).getIRVariable().getAst()) != 1
   or
   instr instanceof ConstantInstruction and
   count(instr.getResultIRType()) != 1
@@ -121,7 +121,7 @@ private predicate variableAddressValueNumber(
   // The underlying AST element is used as value-numbering key instead of the
   // `IRVariable` to work around a problem where a variable or expression with
   // multiple types gives rise to multiple `IRVariable`s.
-  unique( | | instr.getIRVariable().getAST()) = ast
+  unique( | | instr.getIRVariable().getAst()) = ast
 }
 
 private predicate initializeParameterValueNumber(
@@ -131,7 +131,7 @@ private predicate initializeParameterValueNumber(
   // The underlying AST element is used as value-numbering key instead of the
   // `IRVariable` to work around a problem where a variable or expression with
   // multiple types gives rise to multiple `IRVariable`s.
-  instr.getIRVariable().getAST() = var
+  instr.getIRVariable().getAst() = var
 }
 
 private predicate constantValueNumber(
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/IRConstruction.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/IRConstruction.qll
index e8fcf3fcdf3..16158a4c73a 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/IRConstruction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/IRConstruction.qll
@@ -48,7 +48,7 @@ module Raw {
   cached
   predicate hasTempVariable(Function func, Locatable ast, TempVariableTag tag, CppType type) {
     exists(TranslatedElement element |
-      element.getAST() = ast and
+      element.getAst() = ast and
       func = element.getFunction() and
       element.hasTempVariable(tag, type)
     )
@@ -75,7 +75,7 @@ module Raw {
       tag = getInstructionTag(instruction) and
       (
         result = element.getInstructionVariable(tag) or
-        result.(IRStringLiteral).getAST() = element.getInstructionStringLiteral(tag)
+        result.(IRStringLiteral).getAst() = element.getInstructionStringLiteral(tag)
       )
     )
   }
@@ -339,7 +339,7 @@ Instruction getInstructionBackEdgeSuccessor(Instruction instruction, EdgeKind ki
   // such a `goto` creates a back edge.
   exists(TranslatedElement s, GotoStmt goto |
     not isStrictlyForwardGoto(goto) and
-    goto = s.getAST() and
+    goto = s.getAst() and
     exists(InstructionTag tag |
       result = s.getInstructionSuccessor(tag, kind) and
       instruction = s.getInstruction(tag)
@@ -352,8 +352,13 @@ private predicate isStrictlyForwardGoto(GotoStmt goto) {
   goto.getLocation().isBefore(goto.getTarget().getLocation())
 }
 
-Locatable getInstructionAST(TStageInstruction instr) {
-  result = getInstructionTranslatedElement(instr).getAST()
+Locatable getInstructionAst(TStageInstruction instr) {
+  result = getInstructionTranslatedElement(instr).getAst()
+}
+
+/** DEPRECATED: Alias for getInstructionAst */
+deprecated Locatable getInstructionAST(TStageInstruction instr) {
+  result = getInstructionAst(instr)
 }
 
 CppType getInstructionResultType(TStageInstruction instr) {
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCall.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCall.qll
index 8ef5334b598..66c601736af 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCall.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCall.qll
@@ -175,7 +175,10 @@ abstract class TranslatedSideEffects extends TranslatedElement {
   /** Gets the expression whose side effects are being modeled. */
   abstract Expr getExpr();
 
-  final override Locatable getAST() { result = getExpr() }
+  final override Locatable getAst() { result = getExpr() }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   final override Function getFunction() { result = getExpr().getEnclosingFunction() }
 
@@ -522,7 +525,10 @@ class TranslatedArgumentExprSideEffect extends TranslatedArgumentSideEffect,
     this = TTranslatedArgumentExprSideEffect(call, arg, index, sideEffectOpcode)
   }
 
-  final override Locatable getAST() { result = arg }
+  final override Locatable getAst() { result = arg }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   final override Type getIndirectionType() {
     result = arg.getUnspecifiedType().(DerivedType).getBaseType()
@@ -553,7 +559,10 @@ class TranslatedStructorQualifierSideEffect extends TranslatedArgumentSideEffect
     index = -1
   }
 
-  final override Locatable getAST() { result = call }
+  final override Locatable getAst() { result = call }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   final override Type getIndirectionType() { result = call.getTarget().getDeclaringType() }
 
@@ -574,7 +583,10 @@ class TranslatedCallSideEffect extends TranslatedSideEffect, TTranslatedCallSide
 
   TranslatedCallSideEffect() { this = TTranslatedCallSideEffect(expr, sideEffectOpcode) }
 
-  override Locatable getAST() { result = expr }
+  override Locatable getAst() { result = expr }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   override Expr getPrimaryExpr() { result = expr }
 
@@ -612,7 +624,10 @@ class TranslatedAllocationSideEffect extends TranslatedSideEffect, TTranslatedAl
 
   TranslatedAllocationSideEffect() { this = TTranslatedAllocationSideEffect(expr) }
 
-  override Locatable getAST() { result = expr }
+  override Locatable getAst() { result = expr }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   override Expr getPrimaryExpr() { result = expr }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCondition.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCondition.qll
index 0779d6fbda5..528acf4498b 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCondition.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCondition.qll
@@ -19,7 +19,10 @@ abstract class TranslatedCondition extends TranslatedElement {
 
   final override string toString() { result = expr.toString() }
 
-  final override Locatable getAST() { result = expr }
+  final override Locatable getAst() { result = expr }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   final ConditionContext getConditionContext() { result = getParent() }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedDeclarationEntry.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedDeclarationEntry.qll
index de63b81c876..36f1ce9443d 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedDeclarationEntry.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedDeclarationEntry.qll
@@ -14,7 +14,7 @@ private import TranslatedInitialization
  * `entry`.
  */
 TranslatedDeclarationEntry getTranslatedDeclarationEntry(DeclarationEntry entry) {
-  result.getAST() = entry
+  result.getAst() = entry
 }
 
 /**
@@ -37,7 +37,10 @@ abstract class TranslatedDeclarationEntry extends TranslatedElement, TTranslated
 
   final override string toString() { result = entry.toString() }
 
-  final override Locatable getAST() { result = entry }
+  final override Locatable getAst() { result = entry }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 }
 
 /**
@@ -223,7 +226,10 @@ class TranslatedStaticLocalVariableInitialization extends TranslatedElement,
 
   final override string toString() { result = "init: " + entry.toString() }
 
-  final override Locatable getAST() { result = entry }
+  final override Locatable getAst() { result = entry }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   final override LocalVariable getVariable() { result = var }
 
@@ -254,7 +260,10 @@ class TranslatedRangeBasedForVariableDeclaration extends TranslatedLocalVariable
 
   override string toString() { result = var.toString() }
 
-  override Locatable getAST() { result = var }
+  override Locatable getAst() { result = var }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   override Function getFunction() { result = forStmt.getEnclosingFunction() }
 
@@ -262,7 +271,7 @@ class TranslatedRangeBasedForVariableDeclaration extends TranslatedLocalVariable
 }
 
 TranslatedConditionDecl getTranslatedConditionDecl(ConditionDeclExpr expr) {
-  result.getAST() = expr
+  result.getAst() = expr
 }
 
 /**
@@ -280,7 +289,10 @@ class TranslatedConditionDecl extends TranslatedLocalVariableDeclaration, TTrans
 
   override string toString() { result = "decl: " + conditionDeclExpr.toString() }
 
-  override Locatable getAST() { result = conditionDeclExpr }
+  override Locatable getAst() { result = conditionDeclExpr }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   override Function getFunction() { result = conditionDeclExpr.getEnclosingFunction() }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll
index 8034e9e2bd1..c9ac4d0e6d9 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll
@@ -31,7 +31,7 @@ IRUserVariable getIRUserVariable(Function func, Variable var) {
 }
 
 IRTempVariable getIRTempVariable(Locatable ast, TempVariableTag tag) {
-  result.getAST() = ast and
+  result.getAst() = ast and
   result.getTag() = tag
 }
 
@@ -730,7 +730,10 @@ abstract class TranslatedElement extends TTranslatedElement {
   /**
    * Gets the AST node being translated.
    */
-  abstract Locatable getAST();
+  abstract Locatable getAst();
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated Locatable getAST() { result = getAst() }
 
   /**
    * Get the first instruction to be executed in the evaluation of this element.
@@ -929,16 +932,16 @@ abstract class TranslatedElement extends TTranslatedElement {
    */
   final IRTempVariable getTempVariable(TempVariableTag tag) {
     exists(Locatable ast |
-      result.getAST() = ast and
+      result.getAst() = ast and
       result.getTag() = tag and
-      hasTempVariableAndAST(tag, ast)
+      hasTempVariableAndAst(tag, ast)
     )
   }
 
   pragma[noinline]
-  private predicate hasTempVariableAndAST(TempVariableTag tag, Locatable ast) {
+  private predicate hasTempVariableAndAst(TempVariableTag tag, Locatable ast) {
     hasTempVariable(tag, _) and
-    ast = getAST()
+    ast = getAst()
   }
 
   /**
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedExpr.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedExpr.qll
index 1b761a85640..a4a21f039fb 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedExpr.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedExpr.qll
@@ -74,7 +74,10 @@ abstract class TranslatedExpr extends TranslatedElement {
     expr.isGLValueCategory()
   }
 
-  final override Locatable getAST() { result = expr }
+  final override Locatable getAst() { result = expr }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   final override Function getFunction() { result = expr.getEnclosingFunction() }
 
@@ -1709,7 +1712,7 @@ abstract class TranslatedAllocationSize extends TranslatedExpr, TTranslatedAlloc
 }
 
 TranslatedAllocationSize getTranslatedAllocationSize(NewOrNewArrayExpr newExpr) {
-  result.getAST() = newExpr
+  result.getAst() = newExpr
 }
 
 /**
@@ -1875,7 +1878,7 @@ class TranslatedAllocatorCall extends TTranslatedAllocatorCall, TranslatedDirect
 }
 
 TranslatedAllocatorCall getTranslatedAllocatorCall(NewOrNewArrayExpr newExpr) {
-  result.getAST() = newExpr
+  result.getAst() = newExpr
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedFunction.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedFunction.qll
index 2fa4548fc3c..0f781cb2244 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedFunction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedFunction.qll
@@ -15,7 +15,7 @@ private import VarArgs
 /**
  * Gets the `TranslatedFunction` that represents function `func`.
  */
-TranslatedFunction getTranslatedFunction(Function func) { result.getAST() = func }
+TranslatedFunction getTranslatedFunction(Function func) { result.getAst() = func }
 
 /**
  * Gets the size, in bytes, of the variable used to represent the `...` parameter in a varargs
@@ -65,7 +65,10 @@ class TranslatedFunction extends TranslatedElement, TTranslatedFunction {
 
   final override string toString() { result = func.toString() }
 
-  final override Locatable getAST() { result = func }
+  final override Locatable getAst() { result = func }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   /**
    * Gets the function being translated.
@@ -344,7 +347,7 @@ TranslatedThisParameter getTranslatedThisParameter(Function func) { result.getFu
 /**
  * Gets the `TranslatedPositionalParameter` that represents parameter `param`.
  */
-TranslatedPositionalParameter getTranslatedParameter(Parameter param) { result.getAST() = param }
+TranslatedPositionalParameter getTranslatedParameter(Parameter param) { result.getAst() = param }
 
 /**
  * Gets the `TranslatedEllipsisParameter` for function `func`, if one exists.
@@ -457,7 +460,10 @@ class TranslatedThisParameter extends TranslatedParameter, TTranslatedThisParame
 
   final override string toString() { result = "this" }
 
-  final override Locatable getAST() { result = func }
+  final override Locatable getAst() { result = func }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   final override Function getFunction() { result = func }
 
@@ -489,7 +495,10 @@ class TranslatedPositionalParameter extends TranslatedParameter, TTranslatedPara
 
   final override string toString() { result = param.toString() }
 
-  final override Locatable getAST() { result = param }
+  final override Locatable getAst() { result = param }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   final override Function getFunction() {
     result = param.getFunction() or
@@ -526,7 +535,10 @@ class TranslatedEllipsisParameter extends TranslatedParameter, TTranslatedEllips
 
   final override string toString() { result = "..." }
 
-  final override Locatable getAST() { result = func }
+  final override Locatable getAst() { result = func }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   final override Function getFunction() { result = func }
 
@@ -544,7 +556,7 @@ class TranslatedEllipsisParameter extends TranslatedParameter, TTranslatedEllips
 }
 
 private TranslatedConstructorInitList getTranslatedConstructorInitList(Function func) {
-  result.getAST() = func
+  result.getAst() = func
 }
 
 /**
@@ -561,7 +573,10 @@ class TranslatedConstructorInitList extends TranslatedElement, InitializationCon
 
   override string toString() { result = "ctor init: " + func.toString() }
 
-  override Locatable getAST() { result = func }
+  override Locatable getAst() { result = func }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   override TranslatedElement getChild(int id) {
     exists(ConstructorFieldInit fieldInit |
@@ -611,7 +626,7 @@ class TranslatedConstructorInitList extends TranslatedElement, InitializationCon
 }
 
 private TranslatedDestructorDestructionList getTranslatedDestructorDestructionList(Function func) {
-  result.getAST() = func
+  result.getAst() = func
 }
 
 /**
@@ -629,7 +644,10 @@ class TranslatedDestructorDestructionList extends TranslatedElement,
 
   override string toString() { result = "dtor destruction: " + func.toString() }
 
-  override Locatable getAST() { result = func }
+  override Locatable getAst() { result = func }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   override TranslatedElement getChild(int id) {
     exists(DestructorFieldDestruction fieldDestruction |
@@ -667,14 +685,17 @@ class TranslatedDestructorDestructionList extends TranslatedElement,
   }
 }
 
-TranslatedReadEffects getTranslatedReadEffects(Function func) { result.getAST() = func }
+TranslatedReadEffects getTranslatedReadEffects(Function func) { result.getAst() = func }
 
 class TranslatedReadEffects extends TranslatedElement, TTranslatedReadEffects {
   Function func;
 
   TranslatedReadEffects() { this = TTranslatedReadEffects(func) }
 
-  override Locatable getAST() { result = func }
+  override Locatable getAst() { result = func }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   override Function getFunction() { result = func }
 
@@ -718,11 +739,11 @@ class TranslatedReadEffects extends TranslatedElement, TTranslatedReadEffects {
 }
 
 private TranslatedThisReadEffect getTranslatedThisReadEffect(Function func) {
-  result.getAST() = func
+  result.getAst() = func
 }
 
 private TranslatedParameterReadEffect getTranslatedParameterReadEffect(Parameter param) {
-  result.getAST() = param
+  result.getAst() = param
 }
 
 abstract class TranslatedReadEffect extends TranslatedElement {
@@ -758,7 +779,10 @@ class TranslatedThisReadEffect extends TranslatedReadEffect, TTranslatedThisRead
 
   TranslatedThisReadEffect() { this = TTranslatedThisReadEffect(func) }
 
-  override Locatable getAST() { result = func }
+  override Locatable getAst() { result = func }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   override Function getFunction() { result = func }
 
@@ -781,7 +805,10 @@ class TranslatedParameterReadEffect extends TranslatedReadEffect, TTranslatedPar
 
   TranslatedParameterReadEffect() { this = TTranslatedParameterReadEffect(param) }
 
-  override Locatable getAST() { result = param }
+  override Locatable getAst() { result = param }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   override string toString() { result = "read effect: " + param.toString() }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedInitialization.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedInitialization.qll
index 23d6ad133cf..1a9d7ad9d70 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedInitialization.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedInitialization.qll
@@ -139,7 +139,10 @@ abstract class TranslatedInitialization extends TranslatedElement, TTranslatedIn
 
   final override Function getFunction() { result = expr.getEnclosingFunction() }
 
-  final override Locatable getAST() { result = expr }
+  final override Locatable getAst() { result = expr }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   /**
    * Gets the expression that is doing the initialization.
@@ -461,11 +464,11 @@ class TranslatedConstructorInitialization extends TranslatedDirectInitialization
 TranslatedFieldInitialization getTranslatedFieldInitialization(
   ClassAggregateLiteral initList, Field field
 ) {
-  result.getAST() = initList and result.getField() = field
+  result.getAst() = initList and result.getField() = field
 }
 
 TranslatedFieldInitialization getTranslatedConstructorFieldInitialization(ConstructorFieldInit init) {
-  result.getAST() = init
+  result.getAst() = init
 }
 
 /**
@@ -478,7 +481,10 @@ abstract class TranslatedFieldInitialization extends TranslatedElement {
 
   final override string toString() { result = ast.toString() + "." + field.toString() }
 
-  final override Locatable getAST() { result = ast }
+  final override Locatable getAst() { result = ast }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   final override Function getFunction() { result = ast.getEnclosingFunction() }
 
@@ -622,7 +628,10 @@ abstract class TranslatedElementInitialization extends TranslatedElement {
     result = initList.toString() + "[" + getElementIndex().toString() + "]"
   }
 
-  final override Locatable getAST() { result = initList }
+  final override Locatable getAst() { result = initList }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   final override Function getFunction() { result = initList.getEnclosingFunction() }
 
@@ -802,7 +811,10 @@ class TranslatedElementValueInitialization extends TranslatedElementInitializati
 abstract class TranslatedStructorCallFromStructor extends TranslatedElement, StructorCallContext {
   FunctionCall call;
 
-  final override Locatable getAST() { result = call }
+  final override Locatable getAst() { result = call }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   final override TranslatedElement getChild(int id) {
     id = 0 and
@@ -864,7 +876,7 @@ abstract class TranslatedConstructorCallFromConstructor extends TranslatedStruct
 }
 
 TranslatedConstructorCallFromConstructor getTranslatedConstructorBaseInit(ConstructorBaseInit init) {
-  result.getAST() = init
+  result.getAst() = init
 }
 
 /**
@@ -904,7 +916,7 @@ class TranslatedConstructorBaseInit extends TranslatedConstructorCallFromConstru
 TranslatedDestructorBaseDestruction getTranslatedDestructorBaseDestruction(
   DestructorBaseDestruction destruction
 ) {
-  result.getAST() = destruction
+  result.getAst() = destruction
 }
 
 /**
@@ -928,7 +940,10 @@ class TranslatedConstructorBareInit extends TranslatedElement, TTranslatedConstr
 
   TranslatedConstructorBareInit() { this = TTranslatedConstructorBareInit(init) }
 
-  override Locatable getAST() { result = init }
+  override Locatable getAst() { result = init }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   final override string toString() { result = "construct base (no constructor)" }
 
@@ -948,5 +963,5 @@ class TranslatedConstructorBareInit extends TranslatedElement, TTranslatedConstr
 }
 
 TranslatedConstructorBareInit getTranslatedConstructorBareInit(ConstructorInit init) {
-  result.getAST() = init
+  result.getAst() = init
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedStmt.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedStmt.qll
index 2bc3b5bc3ef..eb195286339 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedStmt.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedStmt.qll
@@ -11,7 +11,7 @@ private import TranslatedExpr
 private import TranslatedFunction
 private import TranslatedInitialization
 
-TranslatedStmt getTranslatedStmt(Stmt stmt) { result.getAST() = stmt }
+TranslatedStmt getTranslatedStmt(Stmt stmt) { result.getAst() = stmt }
 
 abstract class TranslatedStmt extends TranslatedElement, TTranslatedStmt {
   Stmt stmt;
@@ -20,7 +20,10 @@ abstract class TranslatedStmt extends TranslatedElement, TTranslatedStmt {
 
   final override string toString() { result = stmt.toString() }
 
-  final override Locatable getAST() { result = stmt }
+  final override Locatable getAst() { result = stmt }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Locatable getAST() { result = getAst() }
 
   final override Function getFunction() { result = stmt.getEnclosingFunction() }
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/IRVariable.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/IRVariable.qll
index 146fc270738..ca4708857a7 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/IRVariable.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/IRVariable.qll
@@ -55,7 +55,10 @@ class IRVariable extends TIRVariable {
    * Gets the AST node that declared this variable, or that introduced this
    * variable as part of the AST-to-IR translation.
    */
-  Language::AST getAST() { none() }
+  Language::AST getAst() { none() }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated Language::AST getAST() { result = getAst() }
 
   /**
    * Gets an identifier string for the variable. This identifier is unique
@@ -66,7 +69,7 @@ class IRVariable extends TIRVariable {
   /**
    * Gets the source location of this variable.
    */
-  final Language::Location getLocation() { result = getAST().getLocation() }
+  final Language::Location getLocation() { result = getAst().getLocation() }
 
   /**
    * Gets the IR for the function that references this variable.
@@ -90,7 +93,10 @@ class IRUserVariable extends IRVariable, TIRUserVariable {
 
   final override string toString() { result = getVariable().toString() }
 
-  final override Language::AST getAST() { result = var }
+  final override Language::AST getAst() { result = var }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 
   final override string getUniqueId() {
     result = getVariable().toString() + " " + getVariable().getLocation().toString()
@@ -157,7 +163,10 @@ class IRGeneratedVariable extends IRVariable {
 
   final override Language::LanguageType getLanguageType() { result = type }
 
-  final override Language::AST getAST() { result = ast }
+  final override Language::AST getAst() { result = ast }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 
   override string toString() { result = getBaseString() + getLocationString() }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/Instruction.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/Instruction.qll
index 1c2cc493338..4dac3087f83 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/Instruction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/Instruction.qll
@@ -41,7 +41,7 @@ class Instruction extends Construction::TStageInstruction {
   }
 
   /** Gets a textual representation of this element. */
-  final string toString() { result = this.getOpcode().toString() + ": " + this.getAST().toString() }
+  final string toString() { result = this.getOpcode().toString() + ": " + this.getAst().toString() }
 
   /**
    * Gets a string showing the result, opcode, and operands of the instruction, equivalent to what
@@ -136,7 +136,7 @@ class Instruction extends Construction::TStageInstruction {
   string getResultId() {
     this.shouldGenerateDumpStrings() and
     result =
-      this.getResultPrefix() + this.getAST().getLocation().getStartLine() + "_" + this.getLineRank()
+      this.getResultPrefix() + this.getAst().getLocation().getStartLine() + "_" + this.getLineRank()
   }
 
   /**
@@ -208,12 +208,15 @@ class Instruction extends Construction::TStageInstruction {
   /**
    * Gets the AST that caused this instruction to be generated.
    */
-  final Language::AST getAST() { result = Construction::getInstructionAST(this) }
+  final Language::AST getAst() { result = Construction::getInstructionAst(this) }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated Language::AST getAST() { result = getAst() }
 
   /**
    * Gets the location of the source code for this instruction.
    */
-  final Language::Location getLocation() { result = this.getAST().getLocation() }
+  final Language::Location getLocation() { result = this.getAst().getLocation() }
 
   /**
    * Gets the  `Expr` whose result is computed by this instruction, if any. The `Expr` may be a
@@ -459,7 +462,10 @@ class VariableInstruction extends Instruction {
   /**
    * Gets the AST variable that this instruction's IR variable refers to, if one exists.
    */
-  final Language::Variable getASTVariable() { result = var.(IRUserVariable).getVariable() }
+  final Language::Variable getAstVariable() { result = var.(IRUserVariable).getVariable() }
+
+  /** DEPRECATED: Alias for getAstVariable */
+  deprecated Language::Variable getASTVariable() { result = getAstVariable() }
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/Operand.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/Operand.qll
index 89b82657c3b..c1e997d5844 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/Operand.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/Operand.qll
@@ -18,7 +18,7 @@ private import internal.OperandInternal
  * of `TOperand` that are used in this stage.
  */
 private class TStageOperand =
-  TRegisterOperand or TNonSSAMemoryOperand or TPhiOperand or TChiOperand;
+  TRegisterOperand or TNonSsaMemoryOperand or TPhiOperand or TChiOperand;
 
 /**
  * A known location. Testing `loc instanceof KnownLocation` will account for non existing locations, as
@@ -38,7 +38,7 @@ class Operand extends TStageOperand {
     // Ensure that the operand does not refer to instructions from earlier stages that are unreachable here
     exists(Instruction use, Instruction def | this = registerOperand(use, _, def))
     or
-    exists(Instruction use | this = nonSSAMemoryOperand(use, _))
+    exists(Instruction use | this = nonSsaMemoryOperand(use, _))
     or
     exists(Instruction use, Instruction def, IRBlock predecessorBlock |
       this = phiOperand(use, def, predecessorBlock, _) or
@@ -209,7 +209,7 @@ class Operand extends TStageOperand {
 class MemoryOperand extends Operand {
   cached
   MemoryOperand() {
-    this instanceof TNonSSAMemoryOperand or
+    this instanceof TNonSsaMemoryOperand or
     this instanceof TPhiOperand or
     this instanceof TChiOperand
   }
@@ -249,7 +249,7 @@ class NonPhiOperand extends Operand {
 
   NonPhiOperand() {
     this = registerOperand(useInstr, tag, _) or
-    this = nonSSAMemoryOperand(useInstr, tag) or
+    this = nonSsaMemoryOperand(useInstr, tag) or
     this = chiOperand(useInstr, tag)
   }
 
@@ -299,7 +299,7 @@ class NonPhiMemoryOperand extends NonPhiOperand, MemoryOperand, TNonPhiMemoryOpe
 
   cached
   NonPhiMemoryOperand() {
-    this = nonSSAMemoryOperand(useInstr, tag)
+    this = nonSsaMemoryOperand(useInstr, tag)
     or
     this = chiOperand(useInstr, tag)
   }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll
index fdb645e03f0..2dc735f49df 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll
@@ -99,7 +99,7 @@ private predicate filteredNumberableInstruction(Instruction instr) {
   // count rather than strictcount to handle missing AST elements
   // separate instanceof and inline casts to avoid failed casts with a count of 0
   instr instanceof VariableAddressInstruction and
-  count(instr.(VariableAddressInstruction).getIRVariable().getAST()) != 1
+  count(instr.(VariableAddressInstruction).getIRVariable().getAst()) != 1
   or
   instr instanceof ConstantInstruction and
   count(instr.getResultIRType()) != 1
@@ -121,7 +121,7 @@ private predicate variableAddressValueNumber(
   // The underlying AST element is used as value-numbering key instead of the
   // `IRVariable` to work around a problem where a variable or expression with
   // multiple types gives rise to multiple `IRVariable`s.
-  unique( | | instr.getIRVariable().getAST()) = ast
+  unique( | | instr.getIRVariable().getAst()) = ast
 }
 
 private predicate initializeParameterValueNumber(
@@ -131,7 +131,7 @@ private predicate initializeParameterValueNumber(
   // The underlying AST element is used as value-numbering key instead of the
   // `IRVariable` to work around a problem where a variable or expression with
   // multiple types gives rise to multiple `IRVariable`s.
-  instr.getIRVariable().getAST() = var
+  instr.getIRVariable().getAst() = var
 }
 
 private predicate constantValueNumber(
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/OperandInternal.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/OperandInternal.qll
index 80e06a381a1..369f7c317f9 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/OperandInternal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/OperandInternal.qll
@@ -1,2 +1,2 @@
 private import semmle.code.cpp.ir.implementation.internal.TOperand
-import UnaliasedSSAOperands
+import UnaliasedSsaOperands
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/PrintSSA.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/PrintSSA.qll
index 72bb239c153..c7487872512 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/PrintSSA.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/PrintSSA.qll
@@ -2,7 +2,7 @@ private import SSAConstructionInternal
 private import OldIR
 private import Alias
 private import SSAConstruction
-private import DebugSSA
+private import DebugSsa
 
 bindingset[offset]
 private string getKeySuffixForOffset(int offset) {
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConsistency.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConsistency.qll
index 5686bb439eb..1c75529be00 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConsistency.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConsistency.qll
@@ -1,2 +1,2 @@
 private import SSAConstruction as SSA
-import SSA::SSAConsistency
+import SSA::SsaConsistency
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll
index 5092e921cb3..13ec2ca4ca4 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll
@@ -112,7 +112,7 @@ private module Cached {
     exists(Alias::getResultMemoryLocation(oldInstruction))
     or
     // This result was already modeled by a previous iteration of SSA.
-    Alias::canReuseSSAForOldResult(oldInstruction)
+    Alias::canReuseSsaForOldResult(oldInstruction)
   }
 
   cached
@@ -182,7 +182,7 @@ private module Cached {
    * unreachable, this predicate will recurse through any degenerate `Phi` instructions to find the
    * true definition.
    */
-  private Instruction getNewDefinitionFromOldSSA(OldIR::MemoryOperand oldOperand, Overlap overlap) {
+  private Instruction getNewDefinitionFromOldSsa(OldIR::MemoryOperand oldOperand, Overlap overlap) {
     exists(Overlap originalOverlap |
       originalOverlap = oldOperand.getDefinitionOverlap() and
       (
@@ -191,7 +191,7 @@ private module Cached {
         or
         exists(OldIR::PhiInputOperand phiOperand, Overlap phiOperandOverlap |
           phiOperand = getDegeneratePhiOperand(oldOperand.getAnyDef()) and
-          result = getNewDefinitionFromOldSSA(phiOperand, phiOperandOverlap) and
+          result = getNewDefinitionFromOldSsa(phiOperand, phiOperandOverlap) and
           overlap =
             combineOverlap(pragma[only_bind_out](phiOperandOverlap),
               pragma[only_bind_out](originalOverlap))
@@ -233,7 +233,7 @@ private module Cached {
     )
     or
     exists(OldIR::NonPhiMemoryOperand oldOperand |
-      result = getNewDefinitionFromOldSSA(oldOperand, overlap) and
+      result = getNewDefinitionFromOldSsa(oldOperand, overlap) and
       oldOperand.getUse() = instruction and
       tag = oldOperand.getOperandTag()
     )
@@ -307,13 +307,13 @@ private module Cached {
    * Gets the new definition instruction for the operand of `instr` that flows from the block
    * `newPredecessorBlock`, based on that operand's definition in the old IR.
    */
-  private Instruction getNewPhiOperandDefinitionFromOldSSA(
+  private Instruction getNewPhiOperandDefinitionFromOldSsa(
     Instruction instr, IRBlock newPredecessorBlock, Overlap overlap
   ) {
     exists(OldIR::PhiInstruction oldPhi, OldIR::PhiInputOperand oldOperand |
       oldPhi = getOldInstruction(instr) and
       oldOperand = oldPhi.getInputOperand(getOldBlock(newPredecessorBlock)) and
-      result = getNewDefinitionFromOldSSA(oldOperand, overlap)
+      result = getNewDefinitionFromOldSsa(oldOperand, overlap)
     )
   }
 
@@ -333,7 +333,7 @@ private module Cached {
       overlap = Alias::getOverlap(actualDefLocation, useLocation)
     )
     or
-    result = getNewPhiOperandDefinitionFromOldSSA(instr, newPredecessorBlock, overlap)
+    result = getNewPhiOperandDefinitionFromOldSsa(instr, newPredecessorBlock, overlap)
   }
 
   cached
@@ -412,17 +412,17 @@ private module Cached {
   }
 
   cached
-  Language::AST getInstructionAST(Instruction instr) {
-    result = getOldInstruction(instr).getAST()
+  Language::AST getInstructionAst(Instruction instr) {
+    result = getOldInstruction(instr).getAst()
     or
     exists(RawIR::Instruction blockStartInstr |
       instr = phiInstruction(blockStartInstr, _) and
-      result = blockStartInstr.getAST()
+      result = blockStartInstr.getAst()
     )
     or
     exists(RawIR::Instruction primaryInstr |
       instr = chiInstruction(primaryInstr) and
-      result = primaryInstr.getAST()
+      result = primaryInstr.getAst()
     )
     or
     exists(IRFunctionBase irFunc |
@@ -430,6 +430,12 @@ private module Cached {
     )
   }
 
+  /** DEPRECATED: Alias for getInstructionAst */
+  cached
+  deprecated Language::AST getInstructionAST(Instruction instr) {
+    result = getInstructionAst(instr)
+  }
+
   cached
   Language::LanguageType getInstructionResultType(Instruction instr) {
     result = instr.(RawIR::Instruction).getResultLanguageType()
@@ -975,35 +981,41 @@ module DefUse {
   }
 }
 
-predicate canReuseSSAForMemoryResult(Instruction instruction) {
+predicate canReuseSsaForMemoryResult(Instruction instruction) {
   exists(OldInstruction oldInstruction |
     oldInstruction = getOldInstruction(instruction) and
     (
       // The previous iteration said it was reusable, so we should mark it as reusable as well.
-      Alias::canReuseSSAForOldResult(oldInstruction)
+      Alias::canReuseSsaForOldResult(oldInstruction)
       or
       // The current alias analysis says it is reusable.
-      Alias::getResultMemoryLocation(oldInstruction).canReuseSSA()
+      Alias::getResultMemoryLocation(oldInstruction).canReuseSsa()
     )
   )
   or
   exists(Alias::MemoryLocation defLocation |
     // This is a `Phi` for a reusable location, so the result of the `Phi` is reusable as well.
     instruction = phiInstruction(_, defLocation) and
-    defLocation.canReuseSSA()
+    defLocation.canReuseSsa()
   )
   // We don't support reusing SSA for any location that could create a `Chi` instruction.
 }
 
+/** DEPRECATED: Alias for canReuseSsaForMemoryResult */
+deprecated predicate canReuseSSAForMemoryResult = canReuseSsaForMemoryResult/1;
+
 /**
  * Expose some of the internal predicates to PrintSSA.qll. We do this by publically importing those modules in the
  * `DebugSSA` module, which is then imported by PrintSSA.
  */
-module DebugSSA {
+module DebugSsa {
   import PhiInsertion
   import DefUse
 }
 
+/** DEPRECATED: Alias for DebugSsa */
+deprecated module DebugSSA = DebugSsa;
+
 import CachedForDebugging
 
 cached
@@ -1038,7 +1050,7 @@ private module CachedForDebugging {
 
   private OldIR::IRTempVariable getOldTempVariable(IRTempVariable var) {
     result.getEnclosingFunction() = var.getEnclosingFunction() and
-    result.getAST() = var.getAST() and
+    result.getAst() = var.getAst() and
     result.getTag() = var.getTag()
   }
 
@@ -1061,7 +1073,7 @@ private module CachedForDebugging {
   int maxValue() { result = 2147483647 }
 }
 
-module SSAConsistency {
+module SsaConsistency {
   /**
    * Holds if a `MemoryOperand` has more than one `MemoryLocation` assigned by alias analysis.
    */
@@ -1114,6 +1126,9 @@ module SSAConsistency {
   }
 }
 
+/** DEPRECATED: Alias for SsaConsistency */
+deprecated module SSAConsistency = SsaConsistency;
+
 /**
  * Provides the portion of the parameterized IR interface that is used to construct the SSA stages
  * of the IR. The raw stage of the IR does not expose these predicates.
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstructionInternal.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstructionInternal.qll
index 70d44e03267..8f64bff29f2 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstructionInternal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstructionInternal.qll
@@ -3,7 +3,7 @@ import semmle.code.cpp.ir.implementation.raw.internal.reachability.ReachableBloc
 import semmle.code.cpp.ir.implementation.raw.internal.reachability.Dominance as Dominance
 import semmle.code.cpp.ir.implementation.unaliased_ssa.IR as NewIR
 import semmle.code.cpp.ir.implementation.raw.internal.IRConstruction as RawStage
-import semmle.code.cpp.ir.implementation.internal.TInstruction::UnaliasedSSAInstructions as SSAInstructions
+import semmle.code.cpp.ir.implementation.internal.TInstruction::UnaliasedSsaInstructions as SSAInstructions
 import semmle.code.cpp.ir.internal.IRCppLanguage as Language
 import SimpleSSA as Alias
-import semmle.code.cpp.ir.implementation.internal.TOperand::UnaliasedSSAOperands as SSAOperands
+import semmle.code.cpp.ir.implementation.internal.TOperand::UnaliasedSsaOperands as SSAOperands
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SimpleSSA.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SimpleSSA.qll
index f3e02c9f6a8..ec2e6f5ef34 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SimpleSSA.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SimpleSSA.qll
@@ -41,11 +41,14 @@ predicate isVariableModeled(Allocation var) {
  * subsequent iterations will recompute SSA for any variable that we assumed did not escape, but
  * actually would have escaped if we had used a sound escape analysis.
  */
-predicate canReuseSSAForVariable(IRAutomaticVariable var) {
+predicate canReuseSsaForVariable(IRAutomaticVariable var) {
   isVariableModeled(var) and
   not allocationEscapes(var)
 }
 
+/** DEPRECATED: Alias for canReuseSsaForVariable */
+deprecated predicate canReuseSSAForVariable = canReuseSsaForVariable/1;
+
 private newtype TMemoryLocation = MkMemoryLocation(Allocation var) { isVariableModeled(var) }
 
 private MemoryLocation getMemoryLocation(Allocation var) { result.getAllocation() = var }
@@ -69,10 +72,16 @@ class MemoryLocation extends TMemoryLocation {
 
   final string getUniqueId() { result = var.getUniqueId() }
 
-  final predicate canReuseSSA() { canReuseSSAForVariable(var) }
+  final predicate canReuseSsa() { canReuseSsaForVariable(var) }
+
+  /** DEPRECATED: Alias for canReuseSsa */
+  deprecated predicate canReuseSSA() { canReuseSsa() }
 }
 
-predicate canReuseSSAForOldResult(Instruction instr) { none() }
+predicate canReuseSsaForOldResult(Instruction instr) { none() }
+
+/** DEPRECATED: Alias for canReuseSsaForOldResult */
+deprecated predicate canReuseSSAForOldResult = canReuseSsaForOldResult/1;
 
 /**
  * Represents a set of `MemoryLocation`s that cannot overlap with
diff --git a/cpp/ql/lib/semmle/code/cpp/rangeanalysis/RangeSSA.qll b/cpp/ql/lib/semmle/code/cpp/rangeanalysis/RangeSSA.qll
index d2d2fbd5b3c..02cd5cb7876 100644
--- a/cpp/ql/lib/semmle/code/cpp/rangeanalysis/RangeSSA.qll
+++ b/cpp/ql/lib/semmle/code/cpp/rangeanalysis/RangeSSA.qll
@@ -29,8 +29,8 @@ private import RangeAnalysisUtils
  * The SSA logic comes in two versions: the standard SSA and range-analysis RangeSSA.
  * This class provides the range-analysis SSA logic.
  */
-library class RangeSSA extends SSAHelper {
-  RangeSSA() { this = 1 }
+library class RangeSsa extends SsaHelper {
+  RangeSsa() { this = 1 }
 
   /**
    * Add a phi node on the out-edge of a guard.
@@ -40,6 +40,9 @@ library class RangeSSA extends SSAHelper {
   }
 }
 
+/** DEPRECATED: Alias for RangeSsa */
+deprecated class RangeSSA = RangeSsa;
+
 private predicate guard_defn(VariableAccess v, Expr guard, BasicBlock b, boolean branch) {
   guardCondition(guard, v, branch) and
   guardSuccessor(guard, branch, b)
@@ -67,22 +70,22 @@ private predicate guardSuccessor(Expr guard, boolean branch, BasicBlock succ) {
  * nodes.
  */
 class RangeSsaDefinition extends ControlFlowNodeBase {
-  RangeSsaDefinition() { exists(RangeSSA x | x.ssa_defn(_, this, _, _)) }
+  RangeSsaDefinition() { exists(RangeSsa x | x.ssa_defn(_, this, _, _)) }
 
   /**
    * Gets a variable corresponding to a SSA StackVariable defined by
    * this definition.
    */
-  StackVariable getAVariable() { exists(RangeSSA x | x.ssa_defn(result, this, _, _)) }
+  StackVariable getAVariable() { exists(RangeSsa x | x.ssa_defn(result, this, _, _)) }
 
   /**
    * A string representation of the SSA variable represented by the pair
    * `(this, v)`.
    */
-  string toString(StackVariable v) { exists(RangeSSA x | result = x.toString(this, v)) }
+  string toString(StackVariable v) { exists(RangeSsa x | result = x.toString(this, v)) }
 
   /** Gets a use of the SSA variable represented by the pair `(this, v)`. */
-  VariableAccess getAUse(StackVariable v) { exists(RangeSSA x | result = x.getAUse(this, v)) }
+  VariableAccess getAUse(StackVariable v) { exists(RangeSsa x | result = x.getAUse(this, v)) }
 
   /** Gets the control flow node for this definition. */
   ControlFlowNode getDefinition() { result = this }
@@ -91,7 +94,7 @@ class RangeSsaDefinition extends ControlFlowNodeBase {
   BasicBlock getBasicBlock() { result.contains(this.getDefinition()) }
 
   /** Whether this definition is a phi node for variable `v`. */
-  predicate isPhiNode(StackVariable v) { exists(RangeSSA x | x.phi_node(v, this)) }
+  predicate isPhiNode(StackVariable v) { exists(RangeSsa x | x.phi_node(v, this)) }
 
   /**
    * DEPRECATED: Use isGuardPhi/4 instead
@@ -172,6 +175,6 @@ class RangeSsaDefinition extends ControlFlowNodeBase {
    * Holds if this definition of the variable `v` reached the end of the basic block `b`.
    */
   predicate reachesEndOfBB(StackVariable v, BasicBlock b) {
-    exists(RangeSSA x | x.ssaDefinitionReachesEndOfBB(v, this, b))
+    exists(RangeSsa x | x.ssaDefinitionReachesEndOfBB(v, this, b))
   }
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/valuenumbering/GlobalValueNumberingImpl.qll b/cpp/ql/lib/semmle/code/cpp/valuenumbering/GlobalValueNumberingImpl.qll
index f9231e24725..d5e69d31254 100644
--- a/cpp/ql/lib/semmle/code/cpp/valuenumbering/GlobalValueNumberingImpl.qll
+++ b/cpp/ql/lib/semmle/code/cpp/valuenumbering/GlobalValueNumberingImpl.qll
@@ -89,7 +89,7 @@ private ControlFlowNode getControlFlowEntry(ControlFlowNode node) {
  * graph so that we can use the dominator tree to find the most recent
  * side-effect.
  */
-private predicate sideEffectCFG(ControlFlowNode src, ControlFlowNode dst) {
+private predicate sideEffectCfg(ControlFlowNode src, ControlFlowNode dst) {
   src.getASuccessor() = dst
   or
   // Add an edge from the entry point to any node that might have a side
@@ -103,7 +103,7 @@ private predicate sideEffectCFG(ControlFlowNode src, ControlFlowNode dst) {
  * the side-effect CFG.
  */
 private predicate iDomEffect(ControlFlowNode dominator, ControlFlowNode node) =
-  idominance(functionEntry/1, sideEffectCFG/2)(_, dominator, node)
+  idominance(functionEntry/1, sideEffectCfg/2)(_, dominator, node)
 
 /**
  * Gets the most recent side effect. To be more precise, `result` is a
diff --git a/cpp/ql/src/Likely Bugs/Memory Management/ReturnStackAllocatedMemory.ql b/cpp/ql/src/Likely Bugs/Memory Management/ReturnStackAllocatedMemory.ql
index 50da750e9a8..c9f9d981f0f 100644
--- a/cpp/ql/src/Likely Bugs/Memory Management/ReturnStackAllocatedMemory.ql	
+++ b/cpp/ql/src/Likely Bugs/Memory Management/ReturnStackAllocatedMemory.ql	
@@ -34,7 +34,7 @@ class ReturnStackAllocatedMemoryConfig extends MustFlowConfiguration {
     exists(VariableAddressInstruction var, Function func |
       var = source.asInstruction() and
       func = var.getEnclosingFunction() and
-      var.getASTVariable() instanceof StackVariable and
+      var.getAstVariable() instanceof StackVariable and
       // Pointer-to-member types aren't properly handled in the dbscheme.
       not var.getResultType() instanceof PointerToMemberType and
       // Rule out FPs caused by extraction errors.
@@ -84,5 +84,5 @@ where
   // Only raise an alert if we're returning from the _same_ callable as the on that
   // declared the stack variable.
   var.getEnclosingFunction() = sink.getNode().getEnclosingCallable()
-select sink.getNode(), source, sink, "May return stack-allocated memory from $@.", var.getAST(),
-  var.getAST().toString()
+select sink.getNode(), source, sink, "May return stack-allocated memory from $@.", var.getAst(),
+  var.getAst().toString()
diff --git a/cpp/ql/src/Likely Bugs/Memory Management/UsingExpiredStackAddress.ql b/cpp/ql/src/Likely Bugs/Memory Management/UsingExpiredStackAddress.ql
index af847701f85..27aeabbaf49 100644
--- a/cpp/ql/src/Likely Bugs/Memory Management/UsingExpiredStackAddress.ql	
+++ b/cpp/ql/src/Likely Bugs/Memory Management/UsingExpiredStackAddress.ql	
@@ -19,7 +19,7 @@ import semmle.code.cpp.valuenumbering.GlobalValueNumbering
 import semmle.code.cpp.ir.IR
 
 predicate instructionHasVariable(VariableAddressInstruction vai, StackVariable var, Function f) {
-  var = vai.getASTVariable() and
+  var = vai.getAstVariable() and
   f = vai.getEnclosingFunction() and
   // Pointer-to-member types aren't properly handled in the dbscheme.
   not vai.getResultType() instanceof PointerToMemberType and
@@ -108,7 +108,7 @@ predicate inheritanceConversionTypes(
 
 /** Gets the HashCons value of an address computed by `instr`, if any. */
 TGlobalAddress globalAddress(Instruction instr) {
-  result = TGlobalVariable(instr.(VariableAddressInstruction).getASTVariable())
+  result = TGlobalVariable(instr.(VariableAddressInstruction).getAstVariable())
   or
   not instr instanceof LoadInstruction and
   result = globalAddress(instr.(CopyInstruction).getSourceValue())
diff --git a/cpp/ql/src/Likely Bugs/RedundantNullCheckSimple.ql b/cpp/ql/src/Likely Bugs/RedundantNullCheckSimple.ql
index 65ba665dff2..8d7a07f4335 100644
--- a/cpp/ql/src/Likely Bugs/RedundantNullCheckSimple.ql	
+++ b/cpp/ql/src/Likely Bugs/RedundantNullCheckSimple.ql	
@@ -52,7 +52,7 @@ predicate explicitNullTestOfInstruction(Instruction checked, Instruction bool) {
 pragma[noinline]
 predicate candidateResult(LoadInstruction checked, ValueNumber value, IRBlock dominator) {
   explicitNullTestOfInstruction(checked, _) and
-  not checked.getAST().isInMacroExpansion() and
+  not checked.getAst().isInMacroExpansion() and
   value.getAnInstruction() = checked and
   dominator.dominates(checked.getBlock())
 }
diff --git a/cpp/ql/src/Security/CWE/CWE-020/CountUntrustedDataToExternalAPI.ql b/cpp/ql/src/Security/CWE/CWE-020/CountUntrustedDataToExternalAPI.ql
index 8c75e8da6e2..bebff32a5c1 100644
--- a/cpp/ql/src/Security/CWE/CWE-020/CountUntrustedDataToExternalAPI.ql
+++ b/cpp/ql/src/Security/CWE/CWE-020/CountUntrustedDataToExternalAPI.ql
@@ -11,7 +11,7 @@
 import cpp
 import ExternalAPIs
 
-from ExternalAPIUsedWithUntrustedData externalAPI
-select externalAPI, count(externalAPI.getUntrustedDataNode()) as numberOfUses,
-  externalAPI.getNumberOfUntrustedSources() as numberOfUntrustedSources order by
+from ExternalApiUsedWithUntrustedData externalApi
+select externalApi, count(externalApi.getUntrustedDataNode()) as numberOfUses,
+  externalApi.getNumberOfUntrustedSources() as numberOfUntrustedSources order by
     numberOfUntrustedSources desc
diff --git a/cpp/ql/src/Security/CWE/CWE-020/ExternalAPIs.qll b/cpp/ql/src/Security/CWE/CWE-020/ExternalAPIs.qll
index 29d5b20cfc4..0636dcbe11b 100644
--- a/cpp/ql/src/Security/CWE/CWE-020/ExternalAPIs.qll
+++ b/cpp/ql/src/Security/CWE/CWE-020/ExternalAPIs.qll
@@ -9,28 +9,31 @@ private import semmle.code.cpp.models.interfaces.Taint
 import ExternalAPIsSpecific
 
 /** A node representing untrusted data being passed to an external API. */
-class UntrustedExternalAPIDataNode extends ExternalAPIDataNode {
-  UntrustedExternalAPIDataNode() { any(UntrustedDataToExternalAPIConfig c).hasFlow(_, this) }
+class UntrustedExternalApiDataNode extends ExternalApiDataNode {
+  UntrustedExternalApiDataNode() { any(UntrustedDataToExternalApiConfig c).hasFlow(_, this) }
 
   /** Gets a source of untrusted data which is passed to this external API data node. */
   DataFlow::Node getAnUntrustedSource() {
-    any(UntrustedDataToExternalAPIConfig c).hasFlow(result, this)
+    any(UntrustedDataToExternalApiConfig c).hasFlow(result, this)
   }
 }
 
-private newtype TExternalAPI =
-  TExternalAPIParameter(Function f, int index) {
-    exists(UntrustedExternalAPIDataNode n |
+/** DEPRECATED: Alias for UntrustedExternalApiDataNode */
+deprecated class UntrustedExternalAPIDataNode = UntrustedExternalApiDataNode;
+
+private newtype TExternalApi =
+  TExternalApiParameter(Function f, int index) {
+    exists(UntrustedExternalApiDataNode n |
       f = n.getExternalFunction() and
       index = n.getIndex()
     )
   }
 
 /** An external API which is used with untrusted data. */
-class ExternalAPIUsedWithUntrustedData extends TExternalAPI {
+class ExternalApiUsedWithUntrustedData extends TExternalApi {
   /** Gets a possibly untrusted use of this external API. */
-  UntrustedExternalAPIDataNode getUntrustedDataNode() {
-    this = TExternalAPIParameter(result.getExternalFunction(), result.getIndex())
+  UntrustedExternalApiDataNode getUntrustedDataNode() {
+    this = TExternalApiParameter(result.getExternalFunction(), result.getIndex())
   }
 
   /** Gets the number of untrusted sources used with this external API. */
@@ -43,8 +46,11 @@ class ExternalAPIUsedWithUntrustedData extends TExternalAPI {
     exists(Function f, int index, string indexString |
       if index = -1 then indexString = "qualifier" else indexString = "param " + index
     |
-      this = TExternalAPIParameter(f, index) and
+      this = TExternalApiParameter(f, index) and
       result = f.toString() + " [" + indexString + "]"
     )
   }
 }
+
+/** DEPRECATED: Alias for ExternalApiUsedWithUntrustedData */
+deprecated class ExternalAPIUsedWithUntrustedData = ExternalApiUsedWithUntrustedData;
diff --git a/cpp/ql/src/Security/CWE/CWE-020/ExternalAPIsSpecific.qll b/cpp/ql/src/Security/CWE/CWE-020/ExternalAPIsSpecific.qll
index 5e710c9548d..db236b510b9 100644
--- a/cpp/ql/src/Security/CWE/CWE-020/ExternalAPIsSpecific.qll
+++ b/cpp/ql/src/Security/CWE/CWE-020/ExternalAPIsSpecific.qll
@@ -8,11 +8,11 @@ import semmle.code.cpp.models.interfaces.DataFlow
 import SafeExternalAPIFunction
 
 /** A node representing untrusted data being passed to an external API. */
-class ExternalAPIDataNode extends DataFlow::Node {
+class ExternalApiDataNode extends DataFlow::Node {
   Call call;
   int i;
 
-  ExternalAPIDataNode() {
+  ExternalApiDataNode() {
     // Argument to call to a function
     (
       this.asExpr() = call.getArgument(i)
@@ -27,7 +27,7 @@ class ExternalAPIDataNode extends DataFlow::Node {
       not f instanceof DataFlowFunction and
       not f instanceof TaintFunction and
       // Not a call to a known safe external API
-      not f instanceof SafeExternalAPIFunction
+      not f instanceof SafeExternalApiFunction
     )
   }
 
@@ -41,9 +41,12 @@ class ExternalAPIDataNode extends DataFlow::Node {
   string getFunctionDescription() { result = this.getExternalFunction().toString() }
 }
 
-/** A configuration for tracking flow from `RemoteFlowSource`s to `ExternalAPIDataNode`s. */
-class UntrustedDataToExternalAPIConfig extends TaintTracking::Configuration {
-  UntrustedDataToExternalAPIConfig() { this = "UntrustedDataToExternalAPIConfig" }
+/** DEPRECATED: Alias for ExternalApiDataNode */
+deprecated class ExternalAPIDataNode = ExternalApiDataNode;
+
+/** A configuration for tracking flow from `RemoteFlowSource`s to `ExternalApiDataNode`s. */
+class UntrustedDataToExternalApiConfig extends TaintTracking::Configuration {
+  UntrustedDataToExternalApiConfig() { this = "UntrustedDataToExternalAPIConfig" }
 
   override predicate isSource(DataFlow::Node source) {
     exists(RemoteFlowSourceFunction remoteFlow |
@@ -52,5 +55,8 @@ class UntrustedDataToExternalAPIConfig extends TaintTracking::Configuration {
     )
   }
 
-  override predicate isSink(DataFlow::Node sink) { sink instanceof ExternalAPIDataNode }
+  override predicate isSink(DataFlow::Node sink) { sink instanceof ExternalApiDataNode }
 }
+
+/** DEPRECATED: Alias for UntrustedDataToExternalApiConfig */
+deprecated class UntrustedDataToExternalAPIConfig = UntrustedDataToExternalApiConfig;
diff --git a/cpp/ql/src/Security/CWE/CWE-020/IRCountUntrustedDataToExternalAPI.ql b/cpp/ql/src/Security/CWE/CWE-020/IRCountUntrustedDataToExternalAPI.ql
index 4d0c2174809..69911c22c6a 100644
--- a/cpp/ql/src/Security/CWE/CWE-020/IRCountUntrustedDataToExternalAPI.ql
+++ b/cpp/ql/src/Security/CWE/CWE-020/IRCountUntrustedDataToExternalAPI.ql
@@ -11,7 +11,7 @@
 import cpp
 import ir.ExternalAPIs
 
-from ExternalAPIUsedWithUntrustedData externalAPI
-select externalAPI, count(externalAPI.getUntrustedDataNode()) as numberOfUses,
-  externalAPI.getNumberOfUntrustedSources() as numberOfUntrustedSources order by
+from ExternalApiUsedWithUntrustedData externalApi
+select externalApi, count(externalApi.getUntrustedDataNode()) as numberOfUses,
+  externalApi.getNumberOfUntrustedSources() as numberOfUntrustedSources order by
     numberOfUntrustedSources desc
diff --git a/cpp/ql/src/Security/CWE/CWE-020/IRUntrustedDataToExternalAPI.ql b/cpp/ql/src/Security/CWE/CWE-020/IRUntrustedDataToExternalAPI.ql
index 47a0bf14b7f..4860fc5356f 100644
--- a/cpp/ql/src/Security/CWE/CWE-020/IRUntrustedDataToExternalAPI.ql
+++ b/cpp/ql/src/Security/CWE/CWE-020/IRUntrustedDataToExternalAPI.ql
@@ -15,8 +15,8 @@ import ir.ExternalAPIs
 import semmle.code.cpp.security.FlowSources
 import DataFlow::PathGraph
 
-from UntrustedDataToExternalAPIConfig config, DataFlow::PathNode source, DataFlow::PathNode sink
+from UntrustedDataToExternalApiConfig config, DataFlow::PathNode source, DataFlow::PathNode sink
 where config.hasFlowPath(source, sink)
 select sink, source, sink,
-  "Call to " + sink.getNode().(ExternalAPIDataNode).getExternalFunction().toString() +
+  "Call to " + sink.getNode().(ExternalApiDataNode).getExternalFunction().toString() +
     " with untrusted data from $@.", source, source.getNode().(RemoteFlowSource).getSourceType()
diff --git a/cpp/ql/src/Security/CWE/CWE-020/SafeExternalAPIFunction.qll b/cpp/ql/src/Security/CWE/CWE-020/SafeExternalAPIFunction.qll
index 5eb0b23d914..de59e82e552 100644
--- a/cpp/ql/src/Security/CWE/CWE-020/SafeExternalAPIFunction.qll
+++ b/cpp/ql/src/Security/CWE/CWE-020/SafeExternalAPIFunction.qll
@@ -8,11 +8,14 @@ private import semmle.code.cpp.models.interfaces.SideEffect
 /**
  * A `Function` that is considered a "safe" external API from a security perspective.
  */
-abstract class SafeExternalAPIFunction extends Function { }
+abstract class SafeExternalApiFunction extends Function { }
+
+/** DEPRECATED: Alias for SafeExternalApiFunction */
+deprecated class SafeExternalAPIFunction = SafeExternalApiFunction;
 
 /** The default set of "safe" external APIs. */
-private class DefaultSafeExternalAPIFunction extends SafeExternalAPIFunction {
-  DefaultSafeExternalAPIFunction() {
+private class DefaultSafeExternalApiFunction extends SafeExternalApiFunction {
+  DefaultSafeExternalApiFunction() {
     // If a function does not write to any of its arguments, we consider it safe to
     // pass untrusted data to it. This means that string functions such as `strcmp`
     // and `strlen`, as well as memory functions such as `memcmp`, are considered safe.
diff --git a/cpp/ql/src/Security/CWE/CWE-020/UntrustedDataToExternalAPI.ql b/cpp/ql/src/Security/CWE/CWE-020/UntrustedDataToExternalAPI.ql
index b85a5b26a7f..01067425190 100644
--- a/cpp/ql/src/Security/CWE/CWE-020/UntrustedDataToExternalAPI.ql
+++ b/cpp/ql/src/Security/CWE/CWE-020/UntrustedDataToExternalAPI.ql
@@ -14,8 +14,8 @@ import semmle.code.cpp.dataflow.TaintTracking
 import ExternalAPIs
 import DataFlow::PathGraph
 
-from UntrustedDataToExternalAPIConfig config, DataFlow::PathNode source, DataFlow::PathNode sink
+from UntrustedDataToExternalApiConfig config, DataFlow::PathNode source, DataFlow::PathNode sink
 where config.hasFlowPath(source, sink)
 select sink, source, sink,
-  "Call to " + sink.getNode().(ExternalAPIDataNode).getExternalFunction().toString() +
+  "Call to " + sink.getNode().(ExternalApiDataNode).getExternalFunction().toString() +
     " with untrusted data from $@.", source, source.toString()
diff --git a/cpp/ql/src/Security/CWE/CWE-020/ir/ExternalAPIs.qll b/cpp/ql/src/Security/CWE/CWE-020/ir/ExternalAPIs.qll
index 29d5b20cfc4..0636dcbe11b 100644
--- a/cpp/ql/src/Security/CWE/CWE-020/ir/ExternalAPIs.qll
+++ b/cpp/ql/src/Security/CWE/CWE-020/ir/ExternalAPIs.qll
@@ -9,28 +9,31 @@ private import semmle.code.cpp.models.interfaces.Taint
 import ExternalAPIsSpecific
 
 /** A node representing untrusted data being passed to an external API. */
-class UntrustedExternalAPIDataNode extends ExternalAPIDataNode {
-  UntrustedExternalAPIDataNode() { any(UntrustedDataToExternalAPIConfig c).hasFlow(_, this) }
+class UntrustedExternalApiDataNode extends ExternalApiDataNode {
+  UntrustedExternalApiDataNode() { any(UntrustedDataToExternalApiConfig c).hasFlow(_, this) }
 
   /** Gets a source of untrusted data which is passed to this external API data node. */
   DataFlow::Node getAnUntrustedSource() {
-    any(UntrustedDataToExternalAPIConfig c).hasFlow(result, this)
+    any(UntrustedDataToExternalApiConfig c).hasFlow(result, this)
   }
 }
 
-private newtype TExternalAPI =
-  TExternalAPIParameter(Function f, int index) {
-    exists(UntrustedExternalAPIDataNode n |
+/** DEPRECATED: Alias for UntrustedExternalApiDataNode */
+deprecated class UntrustedExternalAPIDataNode = UntrustedExternalApiDataNode;
+
+private newtype TExternalApi =
+  TExternalApiParameter(Function f, int index) {
+    exists(UntrustedExternalApiDataNode n |
       f = n.getExternalFunction() and
       index = n.getIndex()
     )
   }
 
 /** An external API which is used with untrusted data. */
-class ExternalAPIUsedWithUntrustedData extends TExternalAPI {
+class ExternalApiUsedWithUntrustedData extends TExternalApi {
   /** Gets a possibly untrusted use of this external API. */
-  UntrustedExternalAPIDataNode getUntrustedDataNode() {
-    this = TExternalAPIParameter(result.getExternalFunction(), result.getIndex())
+  UntrustedExternalApiDataNode getUntrustedDataNode() {
+    this = TExternalApiParameter(result.getExternalFunction(), result.getIndex())
   }
 
   /** Gets the number of untrusted sources used with this external API. */
@@ -43,8 +46,11 @@ class ExternalAPIUsedWithUntrustedData extends TExternalAPI {
     exists(Function f, int index, string indexString |
       if index = -1 then indexString = "qualifier" else indexString = "param " + index
     |
-      this = TExternalAPIParameter(f, index) and
+      this = TExternalApiParameter(f, index) and
       result = f.toString() + " [" + indexString + "]"
     )
   }
 }
+
+/** DEPRECATED: Alias for ExternalApiUsedWithUntrustedData */
+deprecated class ExternalAPIUsedWithUntrustedData = ExternalApiUsedWithUntrustedData;
diff --git a/cpp/ql/src/Security/CWE/CWE-020/ir/ExternalAPIsSpecific.qll b/cpp/ql/src/Security/CWE/CWE-020/ir/ExternalAPIsSpecific.qll
index 994e76d6ced..b0fa685d1a4 100644
--- a/cpp/ql/src/Security/CWE/CWE-020/ir/ExternalAPIsSpecific.qll
+++ b/cpp/ql/src/Security/CWE/CWE-020/ir/ExternalAPIsSpecific.qll
@@ -8,11 +8,11 @@ private import semmle.code.cpp.models.interfaces.DataFlow
 import SafeExternalAPIFunction
 
 /** A node representing untrusted data being passed to an external API. */
-class ExternalAPIDataNode extends DataFlow::Node {
+class ExternalApiDataNode extends DataFlow::Node {
   Call call;
   int i;
 
-  ExternalAPIDataNode() {
+  ExternalApiDataNode() {
     // Argument to call to a function
     (
       this.asExpr() = call.getArgument(i)
@@ -27,7 +27,7 @@ class ExternalAPIDataNode extends DataFlow::Node {
       not f instanceof DataFlowFunction and
       not f instanceof TaintFunction and
       // Not a call to a known safe external API
-      not f instanceof SafeExternalAPIFunction
+      not f instanceof SafeExternalApiFunction
     )
   }
 
@@ -41,11 +41,17 @@ class ExternalAPIDataNode extends DataFlow::Node {
   string getFunctionDescription() { result = this.getExternalFunction().toString() }
 }
 
-/** A configuration for tracking flow from `RemoteFlowSource`s to `ExternalAPIDataNode`s. */
-class UntrustedDataToExternalAPIConfig extends TaintTracking::Configuration {
-  UntrustedDataToExternalAPIConfig() { this = "UntrustedDataToExternalAPIConfigIR" }
+/** DEPRECATED: Alias for ExternalApiDataNode */
+deprecated class ExternalAPIDataNode = ExternalApiDataNode;
+
+/** A configuration for tracking flow from `RemoteFlowSource`s to `ExternalApiDataNode`s. */
+class UntrustedDataToExternalApiConfig extends TaintTracking::Configuration {
+  UntrustedDataToExternalApiConfig() { this = "UntrustedDataToExternalAPIConfigIR" }
 
   override predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
-  override predicate isSink(DataFlow::Node sink) { sink instanceof ExternalAPIDataNode }
+  override predicate isSink(DataFlow::Node sink) { sink instanceof ExternalApiDataNode }
 }
+
+/** DEPRECATED: Alias for UntrustedDataToExternalApiConfig */
+deprecated class UntrustedDataToExternalAPIConfig = UntrustedDataToExternalApiConfig;
diff --git a/cpp/ql/src/Security/CWE/CWE-020/ir/SafeExternalAPIFunction.qll b/cpp/ql/src/Security/CWE/CWE-020/ir/SafeExternalAPIFunction.qll
index 5eb0b23d914..de59e82e552 100644
--- a/cpp/ql/src/Security/CWE/CWE-020/ir/SafeExternalAPIFunction.qll
+++ b/cpp/ql/src/Security/CWE/CWE-020/ir/SafeExternalAPIFunction.qll
@@ -8,11 +8,14 @@ private import semmle.code.cpp.models.interfaces.SideEffect
 /**
  * A `Function` that is considered a "safe" external API from a security perspective.
  */
-abstract class SafeExternalAPIFunction extends Function { }
+abstract class SafeExternalApiFunction extends Function { }
+
+/** DEPRECATED: Alias for SafeExternalApiFunction */
+deprecated class SafeExternalAPIFunction = SafeExternalApiFunction;
 
 /** The default set of "safe" external APIs. */
-private class DefaultSafeExternalAPIFunction extends SafeExternalAPIFunction {
-  DefaultSafeExternalAPIFunction() {
+private class DefaultSafeExternalApiFunction extends SafeExternalApiFunction {
+  DefaultSafeExternalApiFunction() {
     // If a function does not write to any of its arguments, we consider it safe to
     // pass untrusted data to it. This means that string functions such as `strcmp`
     // and `strlen`, as well as memory functions such as `memcmp`, are considered safe.
diff --git a/cpp/ql/src/Security/CWE/CWE-089/SqlTainted.ql b/cpp/ql/src/Security/CWE/CWE-089/SqlTainted.ql
index 92c8b9a2bd5..1f8a5023864 100644
--- a/cpp/ql/src/Security/CWE/CWE-089/SqlTainted.ql
+++ b/cpp/ql/src/Security/CWE/CWE-089/SqlTainted.ql
@@ -18,15 +18,15 @@ import semmle.code.cpp.security.FunctionWithWrappers
 import semmle.code.cpp.security.TaintTracking
 import TaintedWithPath
 
-class SQLLikeFunction extends FunctionWithWrappers {
-  SQLLikeFunction() { sqlArgument(this.getName(), _) }
+class SqlLikeFunction extends FunctionWithWrappers {
+  SqlLikeFunction() { sqlArgument(this.getName(), _) }
 
   override predicate interestingArg(int arg) { sqlArgument(this.getName(), arg) }
 }
 
 class Configuration extends TaintTrackingConfiguration {
   override predicate isSink(Element tainted) {
-    exists(SQLLikeFunction runSql | runSql.outermostWrapperFunctionCall(tainted, _))
+    exists(SqlLikeFunction runSql | runSql.outermostWrapperFunctionCall(tainted, _))
   }
 
   override predicate isBarrier(Expr e) {
@@ -43,7 +43,7 @@ class Configuration extends TaintTrackingConfiguration {
 }
 
 from
-  SQLLikeFunction runSql, Expr taintedArg, Expr taintSource, PathNode sourceNode, PathNode sinkNode,
+  SqlLikeFunction runSql, Expr taintedArg, Expr taintSource, PathNode sourceNode, PathNode sinkNode,
   string taintCause, string callChain
 where
   runSql.outermostWrapperFunctionCall(taintedArg, callChain) and
diff --git a/cpp/ql/src/Security/CWE/CWE-497/ExposedSystemData.ql b/cpp/ql/src/Security/CWE/CWE-497/ExposedSystemData.ql
index 7a50d4f15f3..31a152a167a 100644
--- a/cpp/ql/src/Security/CWE/CWE-497/ExposedSystemData.ql
+++ b/cpp/ql/src/Security/CWE/CWE-497/ExposedSystemData.ql
@@ -46,8 +46,8 @@ class EnvData extends SystemData {
 /**
  * Data originating from a call to `mysql_get_client_info()`.
  */
-class SQLClientInfo extends SystemData {
-  SQLClientInfo() { this.(FunctionCall).getTarget().hasName("mysql_get_client_info") }
+class SqlClientInfo extends SystemData {
+  SqlClientInfo() { this.(FunctionCall).getTarget().hasName("mysql_get_client_info") }
 
   override Expr getAnExpr() { result = this }
 }
@@ -63,8 +63,8 @@ private predicate sqlConnectInfo(FunctionCall source, VariableAccess use) {
 /**
  * Data passed into an SQL connect function.
  */
-class SQLConnectInfo extends SystemData {
-  SQLConnectInfo() { sqlConnectInfo(this, _) }
+class SqlConnectInfo extends SystemData {
+  SqlConnectInfo() { sqlConnectInfo(this, _) }
 
   override Expr getAnExpr() { sqlConnectInfo(this, result) }
 }
diff --git a/cpp/ql/src/jsf/4.10 Classes/AV Rule 97.ql b/cpp/ql/src/jsf/4.10 Classes/AV Rule 97.ql
index 872a7443e6e..58b83e4bd13 100644
--- a/cpp/ql/src/jsf/4.10 Classes/AV Rule 97.ql	
+++ b/cpp/ql/src/jsf/4.10 Classes/AV Rule 97.ql	
@@ -27,13 +27,13 @@ predicate containsArray(Type t) {
   )
 }
 
-predicate functionAPIViolation(MemberFunction f) {
+predicate functionApiViolation(MemberFunction f) {
   f.isPublic() and
   containsArray(f.getAParameter().getType())
 }
 
 from MemberFunction m
 where
-  functionAPIViolation(m) and
+  functionApiViolation(m) and
   not m.getDeclaringType() instanceof Struct
 select m, "Raw arrays should not be used in interfaces. A container class should be used instead."
diff --git a/cpp/ql/src/jsf/4.24 Control Flow Structures/AV Rule 186.ql b/cpp/ql/src/jsf/4.24 Control Flow Structures/AV Rule 186.ql
index ed713c4b109..4c1f8cfdd7f 100644
--- a/cpp/ql/src/jsf/4.24 Control Flow Structures/AV Rule 186.ql	
+++ b/cpp/ql/src/jsf/4.24 Control Flow Structures/AV Rule 186.ql	
@@ -12,13 +12,13 @@
 import cpp
 
 // whether f is to be considered an API entry point, and hence reachable by default
-predicate isAPI(Function f) {
+predicate isApi(Function f) {
   f.hasName("main") or
   f.(MemberFunction).hasSpecifier("public")
 }
 
 predicate unusedFunction(Function f) {
-  not isAPI(f) and
+  not isApi(f) and
   not exists(FunctionCall c | c.getTarget() = f) and
   not exists(Access acc | acc.getTarget() = f) and
   f.hasDefinition()
diff --git a/cpp/ql/src/printAst.ql b/cpp/ql/src/printAst.ql
index f800fa3be3e..ae6b3052ec7 100644
--- a/cpp/ql/src/printAst.ql
+++ b/cpp/ql/src/printAst.ql
@@ -16,7 +16,7 @@ import definitions
  */
 external string selectedSourceFile();
 
-class Cfg extends PrintASTConfiguration {
+class Cfg extends PrintAstConfiguration {
   /**
    * Holds if the AST for `func` should be printed.
    * Print All functions from the selected file.
diff --git a/cpp/ql/test/TestUtilities/dataflow/FlowTestCommon.qll b/cpp/ql/test/TestUtilities/dataflow/FlowTestCommon.qll
index 87602ef0e4c..5841412331d 100644
--- a/cpp/ql/test/TestUtilities/dataflow/FlowTestCommon.qll
+++ b/cpp/ql/test/TestUtilities/dataflow/FlowTestCommon.qll
@@ -42,8 +42,8 @@ class IRFlowTest extends InlineExpectationsTest {
   }
 }
 
-class ASTFlowTest extends InlineExpectationsTest {
-  ASTFlowTest() { this = "ASTFlowTest" }
+class AstFlowTest extends InlineExpectationsTest {
+  AstFlowTest() { this = "ASTFlowTest" }
 
   override string getARelevantTag() { result = "ast" }
 
@@ -69,3 +69,6 @@ class ASTFlowTest extends InlineExpectationsTest {
     )
   }
 }
+
+/** DEPRECATED: Alias for AstFlowTest */
+deprecated class ASTFlowTest = AstFlowTest;
diff --git a/cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/annotate_path_to_sink/tainted.ql b/cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/annotate_path_to_sink/tainted.ql
index c1477d788ca..1737bb0bb33 100644
--- a/cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/annotate_path_to_sink/tainted.ql
+++ b/cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/annotate_path_to_sink/tainted.ql
@@ -67,8 +67,8 @@ class IRDefaultTaintTrackingTest extends InlineExpectationsTest {
   }
 }
 
-class ASTTaintTrackingTest extends InlineExpectationsTest {
-  ASTTaintTrackingTest() { this = "ASTTaintTrackingTest" }
+class AstTaintTrackingTest extends InlineExpectationsTest {
+  AstTaintTrackingTest() { this = "ASTTaintTrackingTest" }
 
   override string getARelevantTag() { result = "ast" }
 
diff --git a/cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/annotate_sinks_only/tainted.ql b/cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/annotate_sinks_only/tainted.ql
index 5784906862b..61014bbd48f 100644
--- a/cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/annotate_sinks_only/tainted.ql
+++ b/cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/annotate_sinks_only/tainted.ql
@@ -55,8 +55,8 @@ class IRDefaultTaintTrackingTest extends InlineExpectationsTest {
   }
 }
 
-class ASTTaintTrackingTest extends InlineExpectationsTest {
-  ASTTaintTrackingTest() { this = "ASTTaintTrackingTest" }
+class AstTaintTrackingTest extends InlineExpectationsTest {
+  AstTaintTrackingTest() { this = "ASTTaintTrackingTest" }
 
   override string getARelevantTag() { result = "ast" }
 
diff --git a/cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/globals/global.ql b/cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/globals/global.ql
index 953b15a9f9c..a9a4a1af231 100644
--- a/cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/globals/global.ql
+++ b/cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/globals/global.ql
@@ -27,8 +27,8 @@ class IRGlobalDefaultTaintTrackingTest extends InlineExpectationsTest {
   }
 }
 
-class ASTGlobalDefaultTaintTrackingTest extends InlineExpectationsTest {
-  ASTGlobalDefaultTaintTrackingTest() { this = "ASTGlobalDefaultTaintTrackingTest" }
+class AstGlobalDefaultTaintTrackingTest extends InlineExpectationsTest {
+  AstGlobalDefaultTaintTrackingTest() { this = "ASTGlobalDefaultTaintTrackingTest" }
 
   override string getARelevantTag() { result = "ast" }
 
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.ql b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.ql
index 331956083ad..63c20affad1 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.ql
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.ql
@@ -1,6 +1,6 @@
 import TestUtilities.dataflow.FlowTestCommon
 
-module ASTTest {
+module AstTest {
   private import semmle.code.cpp.dataflow.DataFlow
 
   /**
@@ -18,8 +18,8 @@ module ASTTest {
   }
 
   /** Common data flow configuration to be used by tests. */
-  class ASTTestAllocationConfig extends DataFlow::Configuration {
-    ASTTestAllocationConfig() { this = "ASTTestAllocationConfig" }
+  class AstTestAllocationConfig extends DataFlow::Configuration {
+    AstTestAllocationConfig() { this = "ASTTestAllocationConfig" }
 
     override predicate isSource(DataFlow::Node source) {
       source.asExpr().(FunctionCall).getTarget().getName() = "source"
@@ -100,10 +100,10 @@ module IRTest {
   }
 
   private predicate readsVariable(LoadInstruction load, Variable var) {
-    load.getSourceAddress().(VariableAddressInstruction).getASTVariable() = var
+    load.getSourceAddress().(VariableAddressInstruction).getAstVariable() = var
   }
 
   private predicate writesVariable(StoreInstruction store, Variable var) {
-    store.getDestinationAddress().(VariableAddressInstruction).getASTVariable() = var
+    store.getDestinationAddress().(VariableAddressInstruction).getAstVariable() = var
   }
 }
diff --git a/cpp/ql/test/library-tests/dataflow/fields/ASTConfiguration.qll b/cpp/ql/test/library-tests/dataflow/fields/ASTConfiguration.qll
index 67017f63abd..39d6cff3492 100644
--- a/cpp/ql/test/library-tests/dataflow/fields/ASTConfiguration.qll
+++ b/cpp/ql/test/library-tests/dataflow/fields/ASTConfiguration.qll
@@ -1,8 +1,8 @@
 private import semmle.code.cpp.dataflow.DataFlow
 private import DataFlow
 
-class ASTConf extends Configuration {
-  ASTConf() { this = "ASTFieldFlowConf" }
+class AstConf extends Configuration {
+  AstConf() { this = "ASTFieldFlowConf" }
 
   override predicate isSource(Node src) {
     src.asExpr() instanceof NewExpr
@@ -30,3 +30,6 @@ class ASTConf extends Configuration {
     b.asExpr().(AddressOfExpr).getOperand() = a.asExpr()
   }
 }
+
+/** DEPRECATED: Alias for AstConf */
+deprecated class ASTConf = AstConf;
diff --git a/cpp/ql/test/library-tests/dataflow/fields/Nodes.qll b/cpp/ql/test/library-tests/dataflow/fields/Nodes.qll
index eb6f3247b82..2c3186b3dfa 100644
--- a/cpp/ql/test/library-tests/dataflow/fields/Nodes.qll
+++ b/cpp/ql/test/library-tests/dataflow/fields/Nodes.qll
@@ -3,7 +3,7 @@ private import semmle.code.cpp.dataflow.DataFlow as AST
 private import cpp
 
 private newtype TNode =
-  TASTNode(AST::DataFlow::Node n) or
+  TAstNode(AST::DataFlow::Node n) or
   TIRNode(IR::DataFlow::Node n)
 
 class Node extends TNode {
@@ -11,23 +11,32 @@ class Node extends TNode {
 
   IR::DataFlow::Node asIR() { none() }
 
-  AST::DataFlow::Node asAST() { none() }
+  AST::DataFlow::Node asAst() { none() }
+
+  /** DEPRECATED: Alias for asAst */
+  deprecated AST::DataFlow::Node asAST() { result = asAst() }
 
   Location getLocation() { none() }
 }
 
-class ASTNode extends Node, TASTNode {
+class AstNode extends Node, TAstNode {
   AST::DataFlow::Node n;
 
-  ASTNode() { this = TASTNode(n) }
+  AstNode() { this = TAstNode(n) }
 
   override string toString() { result = n.toString() }
 
-  override AST::DataFlow::Node asAST() { result = n }
+  override AST::DataFlow::Node asAst() { result = n }
+
+  /** DEPRECATED: Alias for asAst */
+  deprecated override AST::DataFlow::Node asAST() { result = asAst() }
 
   override Location getLocation() { result = n.getLocation() }
 }
 
+/** DEPRECATED: Alias for AstNode */
+deprecated class ASTNode = AstNode;
+
 class IRNode extends Node, TIRNode {
   IR::DataFlow::Node n;
 
diff --git a/cpp/ql/test/library-tests/dataflow/fields/flow.ql b/cpp/ql/test/library-tests/dataflow/fields/flow.ql
index 23a7281c718..f902afd33db 100644
--- a/cpp/ql/test/library-tests/dataflow/fields/flow.ql
+++ b/cpp/ql/test/library-tests/dataflow/fields/flow.ql
@@ -1,6 +1,6 @@
 import TestUtilities.dataflow.FlowTestCommon
 
-module ASTTest {
+module AstTest {
   private import ASTConfiguration
 }
 
diff --git a/cpp/ql/test/library-tests/dataflow/fields/partial-definition-diff.ql b/cpp/ql/test/library-tests/dataflow/fields/partial-definition-diff.ql
index fae4b06da5a..3baba1a02ff 100644
--- a/cpp/ql/test/library-tests/dataflow/fields/partial-definition-diff.ql
+++ b/cpp/ql/test/library-tests/dataflow/fields/partial-definition-diff.ql
@@ -7,8 +7,8 @@ import semmle.code.cpp.ir.dataflow.DataFlow::DataFlow as IR
 import semmle.code.cpp.dataflow.DataFlow::DataFlow as AST
 import Nodes
 
-class ASTPartialDefNode extends ASTNode {
-  ASTPartialDefNode() { exists(n.asPartialDefinition()) }
+class AstPartialDefNode extends AstNode {
+  AstPartialDefNode() { exists(n.asPartialDefinition()) }
 
   override string toString() { result = n.asPartialDefinition().toString() }
 }
@@ -29,7 +29,7 @@ where
   msg = "IR only"
   or
   exists(AST::Node astNode, Expr partial |
-    node.asAST() = astNode and
+    node.asAst() = astNode and
     partial = astNode.asPartialDefinition() and
     not exists(IR::Node otherNode | otherNode.asPartialDefinition() = partial)
   ) and
diff --git a/cpp/ql/test/library-tests/dataflow/fields/path-flow.ql b/cpp/ql/test/library-tests/dataflow/fields/path-flow.ql
index 1772a3d6ad2..b1aeadfbb60 100644
--- a/cpp/ql/test/library-tests/dataflow/fields/path-flow.ql
+++ b/cpp/ql/test/library-tests/dataflow/fields/path-flow.ql
@@ -7,6 +7,6 @@ import ASTConfiguration
 import cpp
 import DataFlow::PathGraph
 
-from DataFlow::PathNode src, DataFlow::PathNode sink, ASTConf conf
+from DataFlow::PathNode src, DataFlow::PathNode sink, AstConf conf
 where conf.hasFlowPath(src, sink)
 select sink, src, sink, sink + " flows from $@", src, src.toString()
diff --git a/cpp/ql/test/library-tests/dataflow/smart-pointers-taint/taint.ql b/cpp/ql/test/library-tests/dataflow/smart-pointers-taint/taint.ql
index 4f18139b2af..d16552d983d 100644
--- a/cpp/ql/test/library-tests/dataflow/smart-pointers-taint/taint.ql
+++ b/cpp/ql/test/library-tests/dataflow/smart-pointers-taint/taint.ql
@@ -1,10 +1,10 @@
 import TestUtilities.dataflow.FlowTestCommon
 
-module ASTTest {
+module AstTest {
   private import semmle.code.cpp.dataflow.TaintTracking
 
-  class ASTSmartPointerTaintConfig extends TaintTracking::Configuration {
-    ASTSmartPointerTaintConfig() { this = "ASTSmartPointerTaintConfig" }
+  class AstSmartPointerTaintConfig extends TaintTracking::Configuration {
+    AstSmartPointerTaintConfig() { this = "ASTSmartPointerTaintConfig" }
 
     override predicate isSource(DataFlow::Node source) {
       source.asExpr().(FunctionCall).getTarget().getName() = "source"
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/taint.ql b/cpp/ql/test/library-tests/dataflow/taint-tests/taint.ql
index 4bf7420a9fd..bd513adcef2 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/taint.ql
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/taint.ql
@@ -38,13 +38,13 @@ module TaintModels {
   }
 }
 
-module ASTTest {
+module AstTest {
   private import semmle.code.cpp.dataflow.TaintTracking
   private import semmle.code.cpp.models.interfaces.Taint
 
   /** Common data flow configuration to be used by tests. */
-  class ASTTestAllocationConfig extends TaintTracking::Configuration {
-    ASTTestAllocationConfig() { this = "ASTTestAllocationConfig" }
+  class AstTestAllocationConfig extends TaintTracking::Configuration {
+    AstTestAllocationConfig() { this = "ASTTestAllocationConfig" }
 
     override predicate isSource(DataFlow::Node source) {
       source.asExpr().(FunctionCall).getTarget().getName() = "source"
diff --git a/cpp/ql/test/library-tests/depends_initializers/InitializerCFG.ql b/cpp/ql/test/library-tests/depends_initializers/InitializerCFG.ql
index fdb42979dc5..a9c52dd8223 100644
--- a/cpp/ql/test/library-tests/depends_initializers/InitializerCFG.ql
+++ b/cpp/ql/test/library-tests/depends_initializers/InitializerCFG.ql
@@ -1,7 +1,7 @@
 import cpp
 
-Function getCFGFunction(Initializer i) { result = i.getASuccessor*() }
+Function getCfgFunction(Initializer i) { result = i.getASuccessor*() }
 
 from Initializer i, string f
-where if exists(getCFGFunction(i)) then f = getCFGFunction(i).toString() else f = ""
+where if exists(getCfgFunction(i)) then f = getCfgFunction(i).toString() else f = ""
 select i, f
diff --git a/cpp/ql/test/library-tests/ir/ir/PrintAST.ql b/cpp/ql/test/library-tests/ir/ir/PrintAST.ql
index e107c80de02..471b12ed3e5 100644
--- a/cpp/ql/test/library-tests/ir/ir/PrintAST.ql
+++ b/cpp/ql/test/library-tests/ir/ir/PrintAST.ql
@@ -6,6 +6,6 @@ private import cpp
 private import semmle.code.cpp.PrintAST
 private import PrintConfig
 
-private class PrintConfig extends PrintASTConfiguration {
+private class PrintConfig extends PrintAstConfiguration {
   override predicate shouldPrintFunction(Function func) { shouldDumpFunction(func) }
 }
diff --git a/cpp/ql/test/library-tests/ir/points_to/points_to.ql b/cpp/ql/test/library-tests/ir/points_to/points_to.ql
index b639a235ee8..6cc7b7efb34 100644
--- a/cpp/ql/test/library-tests/ir/points_to/points_to.ql
+++ b/cpp/ql/test/library-tests/ir/points_to/points_to.ql
@@ -40,7 +40,7 @@ module Raw {
   }
 }
 
-module UnaliasedSSA {
+module UnaliasedSsa {
   private import semmle.code.cpp.ir.implementation.unaliased_ssa.IR
   private import semmle.code.cpp.ir.implementation.aliased_ssa.internal.AliasedSSA
 
@@ -49,8 +49,8 @@ module UnaliasedSSA {
     result = getOperandMemoryLocation(instr.getAnOperand())
   }
 
-  class UnaliasedSSAPointsToTest extends InlineExpectationsTest {
-    UnaliasedSSAPointsToTest() { this = "UnaliasedSSAPointsToTest" }
+  class UnaliasedSsaPointsToTest extends InlineExpectationsTest {
+    UnaliasedSsaPointsToTest() { this = "UnaliasedSSAPointsToTest" }
 
     override string getARelevantTag() { result = "ussa" }
 
diff --git a/csharp/ql/lib/semmle/code/asp/WebConfig.qll b/csharp/ql/lib/semmle/code/asp/WebConfig.qll
index 16d5393afc2..024d60ca450 100644
--- a/csharp/ql/lib/semmle/code/asp/WebConfig.qll
+++ b/csharp/ql/lib/semmle/code/asp/WebConfig.qll
@@ -7,67 +7,88 @@ import csharp
 /**
  * A `Web.config` file.
  */
-class WebConfigXML extends XMLFile {
-  WebConfigXML() { this.getName().matches("%Web.config") }
+class WebConfigXml extends XMLFile {
+  WebConfigXml() { this.getName().matches("%Web.config") }
 }
 
+/** DEPRECATED: Alias for WebConfigXml */
+deprecated class WebConfigXML = WebConfigXml;
+
 /** A `<configuration>` tag in an ASP.NET configuration file. */
-class ConfigurationXMLElement extends XMLElement {
-  ConfigurationXMLElement() { this.getName().toLowerCase() = "configuration" }
+class ConfigurationXmlElement extends XMLElement {
+  ConfigurationXmlElement() { this.getName().toLowerCase() = "configuration" }
 }
 
+/** DEPRECATED: Alias for ConfigurationXmlElement */
+deprecated class ConfigurationXMLElement = ConfigurationXmlElement;
+
 /** A `<location>` tag in an ASP.NET configuration file. */
-class LocationXMLElement extends XMLElement {
-  LocationXMLElement() {
-    this.getParent() instanceof ConfigurationXMLElement and
+class LocationXmlElement extends XMLElement {
+  LocationXmlElement() {
+    this.getParent() instanceof ConfigurationXmlElement and
     this.getName().toLowerCase() = "location"
   }
 }
 
+/** DEPRECATED: Alias for LocationXmlElement */
+deprecated class LocationXMLElement = LocationXmlElement;
+
 /** A `<system.web>` tag in an ASP.NET configuration file. */
-class SystemWebXMLElement extends XMLElement {
-  SystemWebXMLElement() {
+class SystemWebXmlElement extends XMLElement {
+  SystemWebXmlElement() {
     (
-      this.getParent() instanceof ConfigurationXMLElement
+      this.getParent() instanceof ConfigurationXmlElement
       or
-      this.getParent() instanceof LocationXMLElement
+      this.getParent() instanceof LocationXmlElement
     ) and
     this.getName().toLowerCase() = "system.web"
   }
 }
 
+/** DEPRECATED: Alias for SystemWebXmlElement */
+deprecated class SystemWebXMLElement = SystemWebXmlElement;
+
 /** A `<system.webServer>` tag in an ASP.NET configuration file. */
-class SystemWebServerXMLElement extends XMLElement {
-  SystemWebServerXMLElement() {
+class SystemWebServerXmlElement extends XMLElement {
+  SystemWebServerXmlElement() {
     (
-      this.getParent() instanceof ConfigurationXMLElement
+      this.getParent() instanceof ConfigurationXmlElement
       or
-      this.getParent() instanceof LocationXMLElement
+      this.getParent() instanceof LocationXmlElement
     ) and
     this.getName().toLowerCase() = "system.webserver"
   }
 }
 
+/** DEPRECATED: Alias for SystemWebServerXmlElement */
+deprecated class SystemWebServerXMLElement = SystemWebServerXmlElement;
+
 /** A `<customErrors>` tag in an ASP.NET configuration file. */
-class CustomErrorsXMLElement extends XMLElement {
-  CustomErrorsXMLElement() {
-    this.getParent() instanceof SystemWebXMLElement and
+class CustomErrorsXmlElement extends XMLElement {
+  CustomErrorsXmlElement() {
+    this.getParent() instanceof SystemWebXmlElement and
     this.getName().toLowerCase() = "customerrors"
   }
 }
 
+/** DEPRECATED: Alias for CustomErrorsXmlElement */
+deprecated class CustomErrorsXMLElement = CustomErrorsXmlElement;
+
 /** A `<httpRuntime>` tag in an ASP.NET configuration file. */
-class HttpRuntimeXMLElement extends XMLElement {
-  HttpRuntimeXMLElement() {
-    this.getParent() instanceof SystemWebXMLElement and
+class HttpRuntimeXmlElement extends XMLElement {
+  HttpRuntimeXmlElement() {
+    this.getParent() instanceof SystemWebXmlElement and
     this.getName().toLowerCase() = "httpruntime"
   }
 }
 
+/** DEPRECATED: Alias for HttpRuntimeXmlElement */
+deprecated class HttpRuntimeXMLElement = HttpRuntimeXmlElement;
+
 /** A `<forms>` tag under `<system.web><authentication>` in an ASP.NET configuration file. */
 class FormsElement extends XMLElement {
   FormsElement() {
-    this = any(SystemWebXMLElement sw).getAChild("authentication").getAChild("forms")
+    this = any(SystemWebXmlElement sw).getAChild("authentication").getAChild("forms")
   }
 
   /**
@@ -85,7 +106,7 @@ class FormsElement extends XMLElement {
 
 /** A `<httpCookies>` tag in an ASP.NET configuration file. */
 class HttpCookiesElement extends XMLElement {
-  HttpCookiesElement() { this = any(SystemWebXMLElement sw).getAChild("httpCookies") }
+  HttpCookiesElement() { this = any(SystemWebXmlElement sw).getAChild("httpCookies") }
 
   /**
    * Gets attribute's `httpOnlyCookies` value.
diff --git a/csharp/ql/lib/semmle/code/csharp/XML.qll b/csharp/ql/lib/semmle/code/csharp/XML.qll
index d2e6c44951f..fb781a4683f 100755
--- a/csharp/ql/lib/semmle/code/csharp/XML.qll
+++ b/csharp/ql/lib/semmle/code/csharp/XML.qll
@@ -4,11 +4,11 @@
 
 import semmle.files.FileSystem
 
-private class TXMLLocatable =
+private class TXmlLocatable =
   @xmldtd or @xmlelement or @xmlattribute or @xmlnamespace or @xmlcomment or @xmlcharacters;
 
 /** An XML element that has a location. */
-class XMLLocatable extends @xmllocatable, TXMLLocatable {
+class XMLLocatable extends @xmllocatable, TXmlLocatable {
   /** Gets the source location for this element. */
   Location getLocation() { xmllocations(this, result) }
 
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/Guards.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/Guards.qll
index 7e9b8f7818a..062be133c58 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/Guards.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/Guards.qll
@@ -1000,7 +1000,7 @@ module Internal {
   // The predicates in this module should be evaluated in the same stage as the CFG
   // construction stage. This is to avoid recomputation of pre-basic-blocks and
   // pre-SSA predicates
-  private module PreCFG {
+  private module PreCfg {
     private import semmle.code.csharp.controlflow.internal.PreBasicBlocks as PreBasicBlocks
     private import semmle.code.csharp.controlflow.internal.PreSsa
 
@@ -1414,7 +1414,7 @@ module Internal {
     }
 
     cached
-    private module CachedWithCFG {
+    private module CachedWithCfg {
       private import semmle.code.csharp.Caching
 
       cached
@@ -1719,10 +1719,10 @@ module Internal {
       }
     }
 
-    import CachedWithCFG
+    import CachedWithCfg
   }
 
-  import PreCFG
+  import PreCfg
 
   private predicate interestingDescendantCandidate(Expr e) {
     guardControls(e, _, _)
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/ExternalAPIsQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/ExternalAPIsQuery.qll
index 34cff98208d..6b6b49e3a60 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/ExternalAPIsQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/ExternalAPIsQuery.qll
@@ -12,15 +12,18 @@ private import semmle.code.csharp.dataflow.FlowSummary
 /**
  * A callable that is considered a "safe" external API from a security perspective.
  */
-abstract class SafeExternalAPICallable extends Callable { }
+abstract class SafeExternalApiCallable extends Callable { }
 
-private class SummarizedCallableSafe extends SafeExternalAPICallable {
+/** DEPRECATED: Alias for SafeExternalApiCallable */
+deprecated class SafeExternalAPICallable = SafeExternalApiCallable;
+
+private class SummarizedCallableSafe extends SafeExternalApiCallable {
   SummarizedCallableSafe() { this instanceof SummarizedCallable }
 }
 
 /** The default set of "safe" external APIs. */
-private class DefaultSafeExternalAPICallable extends SafeExternalAPICallable {
-  DefaultSafeExternalAPICallable() {
+private class DefaultSafeExternalApiCallable extends SafeExternalApiCallable {
+  DefaultSafeExternalApiCallable() {
     this instanceof EqualsMethod or
     this instanceof IEquatableEqualsMethod or
     this = any(SystemObjectClass s).getEqualsMethod() or
@@ -36,11 +39,11 @@ private class DefaultSafeExternalAPICallable extends SafeExternalAPICallable {
 }
 
 /** A node representing data being passed to an external API. */
-class ExternalAPIDataNode extends DataFlow::Node {
+class ExternalApiDataNode extends DataFlow::Node {
   Call call;
   int i;
 
-  ExternalAPIDataNode() {
+  ExternalApiDataNode() {
     (
       // Argument to call
       this.asExpr() = call.getArgument(i)
@@ -59,7 +62,7 @@ class ExternalAPIDataNode extends DataFlow::Node {
       m.fromSource()
     ) and
     // Not a call to a known safe external API
-    not call.getTarget().getUnboundDeclaration() instanceof SafeExternalAPICallable
+    not call.getTarget().getUnboundDeclaration() instanceof SafeExternalApiCallable
   }
 
   /** Gets the called API callable. */
@@ -72,38 +75,47 @@ class ExternalAPIDataNode extends DataFlow::Node {
   string getCallableDescription() { result = this.getCallable().getQualifiedName() }
 }
 
-/** A configuration for tracking flow from `RemoteFlowSource`s to `ExternalAPIDataNode`s. */
-class UntrustedDataToExternalAPIConfig extends TaintTracking::Configuration {
-  UntrustedDataToExternalAPIConfig() { this = "UntrustedDataToExternalAPIConfig" }
+/** DEPRECATED: Alias for ExternalApiDataNode */
+deprecated class ExternalAPIDataNode = ExternalApiDataNode;
+
+/** A configuration for tracking flow from `RemoteFlowSource`s to `ExternalApiDataNode`s. */
+class UntrustedDataToExternalApiConfig extends TaintTracking::Configuration {
+  UntrustedDataToExternalApiConfig() { this = "UntrustedDataToExternalAPIConfig" }
 
   override predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
-  override predicate isSink(DataFlow::Node sink) { sink instanceof ExternalAPIDataNode }
+  override predicate isSink(DataFlow::Node sink) { sink instanceof ExternalApiDataNode }
 }
 
-/** A node representing untrusted data being passed to an external API. */
-class UntrustedExternalAPIDataNode extends ExternalAPIDataNode {
-  private UntrustedDataToExternalAPIConfig c;
+/** DEPRECATED: Alias for UntrustedDataToExternalApiConfig */
+deprecated class UntrustedDataToExternalAPIConfig = UntrustedDataToExternalApiConfig;
 
-  UntrustedExternalAPIDataNode() { c.hasFlow(_, this) }
+/** A node representing untrusted data being passed to an external API. */
+class UntrustedExternalApiDataNode extends ExternalApiDataNode {
+  private UntrustedDataToExternalApiConfig c;
+
+  UntrustedExternalApiDataNode() { c.hasFlow(_, this) }
 
   /** Gets a source of untrusted data which is passed to this external API data node. */
   DataFlow::Node getAnUntrustedSource() { c.hasFlow(result, this) }
 }
 
-private newtype TExternalAPI =
-  TExternalAPIParameter(Callable m, int index) {
-    exists(UntrustedExternalAPIDataNode n |
+/** DEPRECATED: Alias for UntrustedExternalApiDataNode */
+deprecated class UntrustedExternalAPIDataNode = UntrustedExternalApiDataNode;
+
+private newtype TExternalApi =
+  TExternalApiParameter(Callable m, int index) {
+    exists(UntrustedExternalApiDataNode n |
       m = n.getCallable().getUnboundDeclaration() and
       index = n.getIndex()
     )
   }
 
 /** An external API which is used with untrusted data. */
-class ExternalAPIUsedWithUntrustedData extends TExternalAPI {
+class ExternalApiUsedWithUntrustedData extends TExternalApi {
   /** Gets a possibly untrusted use of this external API. */
-  UntrustedExternalAPIDataNode getUntrustedDataNode() {
-    this = TExternalAPIParameter(result.getCallable().getUnboundDeclaration(), result.getIndex())
+  UntrustedExternalApiDataNode getUntrustedDataNode() {
+    this = TExternalApiParameter(result.getCallable().getUnboundDeclaration(), result.getIndex())
   }
 
   /** Gets the number of untrusted sources used with this external API. */
@@ -116,10 +128,13 @@ class ExternalAPIUsedWithUntrustedData extends TExternalAPI {
     exists(Callable m, int index, string indexString |
       if index = -1 then indexString = "qualifier" else indexString = "param " + index
     |
-      this = TExternalAPIParameter(m, index) and
+      this = TExternalApiParameter(m, index) and
       result =
         m.getDeclaringType().getQualifiedName() + "." + m.toStringWithTypes() + " [" + indexString +
           "]"
     )
   }
 }
+
+/** DEPRECATED: Alias for ExternalApiUsedWithUntrustedData */
+deprecated class ExternalAPIUsedWithUntrustedData = ExternalApiUsedWithUntrustedData;
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/LDAPInjectionQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/LDAPInjectionQuery.qll
index 5aa27202f4f..6f985463763 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/LDAPInjectionQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/LDAPInjectionQuery.qll
@@ -117,12 +117,15 @@ class SearchRequestFilterSink extends Sink {
  *
  * This will match the encoding methods provided by the AntiXSS library.
  */
-class LDAPEncodeSanitizer extends Sanitizer {
-  LDAPEncodeSanitizer() {
+class LdapEncodeSanitizer extends Sanitizer {
+  LdapEncodeSanitizer() {
     this.getExpr().(MethodCall).getTarget().getName().regexpMatch("(?i)LDAP.*Encode.*")
   }
 }
 
+/** DEPRECATED: Alias for LdapEncodeSanitizer */
+deprecated class LDAPEncodeSanitizer = LdapEncodeSanitizer;
+
 private class SimpleTypeSanitizer extends Sanitizer, SimpleTypeSanitizedExpr { }
 
 private class GuidSanitizer extends Sanitizer, GuidSanitizedExpr { }
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/XMLEntityInjectionQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/XMLEntityInjectionQuery.qll
index cf27d2db49b..d49ecd7c900 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/XMLEntityInjectionQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/XMLEntityInjectionQuery.qll
@@ -28,10 +28,10 @@ abstract class Sink extends DataFlow::ExprNode {
   abstract string getReason();
 }
 
-private class InsecureXMLSink extends Sink {
+private class InsecureXmlSink extends Sink {
   private string reason;
 
-  InsecureXMLSink() {
+  InsecureXmlSink() {
     exists(InsecureXML::InsecureXmlProcessing r | r.isUnsafe(reason) |
       this.getExpr() = r.getAnArgument()
     )
diff --git a/csharp/ql/src/Security Features/CWE-011/ASPNetDebug.ql b/csharp/ql/src/Security Features/CWE-011/ASPNetDebug.ql
index 3bccd9b0331..8477401fe17 100644
--- a/csharp/ql/src/Security Features/CWE-011/ASPNetDebug.ql	
+++ b/csharp/ql/src/Security Features/CWE-011/ASPNetDebug.ql	
@@ -17,7 +17,7 @@
 import csharp
 import semmle.code.asp.WebConfig
 
-from SystemWebXMLElement web, XMLAttribute debugAttribute
+from SystemWebXmlElement web, XMLAttribute debugAttribute
 where
   debugAttribute = web.getAChild("compilation").getAttribute("debug") and
   not debugAttribute.getValue().toLowerCase() = "false"
diff --git a/csharp/ql/src/Security Features/CWE-016/ASPNetMaxRequestLength.ql b/csharp/ql/src/Security Features/CWE-016/ASPNetMaxRequestLength.ql
index 5a527c96084..d6b4da2c258 100644
--- a/csharp/ql/src/Security Features/CWE-016/ASPNetMaxRequestLength.ql	
+++ b/csharp/ql/src/Security Features/CWE-016/ASPNetMaxRequestLength.ql	
@@ -14,7 +14,7 @@
 import csharp
 import semmle.code.asp.WebConfig
 
-from SystemWebXMLElement web, XMLAttribute maxReqLength
+from SystemWebXmlElement web, XMLAttribute maxReqLength
 where
   maxReqLength =
     web.getAChild(any(string s | s.toLowerCase() = "httpruntime"))
diff --git a/csharp/ql/src/Security Features/CWE-016/ASPNetPagesValidateRequest.ql b/csharp/ql/src/Security Features/CWE-016/ASPNetPagesValidateRequest.ql
index f093a888446..3a8208c270f 100644
--- a/csharp/ql/src/Security Features/CWE-016/ASPNetPagesValidateRequest.ql	
+++ b/csharp/ql/src/Security Features/CWE-016/ASPNetPagesValidateRequest.ql	
@@ -13,7 +13,7 @@
 import csharp
 import semmle.code.asp.WebConfig
 
-from SystemWebXMLElement web, XMLAttribute requestvalidateAttribute
+from SystemWebXmlElement web, XMLAttribute requestvalidateAttribute
 where
   requestvalidateAttribute = web.getAChild("pages").getAttribute("validateRequest") and
   requestvalidateAttribute.getValue().toLowerCase() = "false"
diff --git a/csharp/ql/src/Security Features/CWE-020/ExternalAPIsUsedWithUntrustedData.ql b/csharp/ql/src/Security Features/CWE-020/ExternalAPIsUsedWithUntrustedData.ql
index 8b6a657ecd4..b07b1093ec8 100644
--- a/csharp/ql/src/Security Features/CWE-020/ExternalAPIsUsedWithUntrustedData.ql	
+++ b/csharp/ql/src/Security Features/CWE-020/ExternalAPIsUsedWithUntrustedData.ql	
@@ -11,7 +11,7 @@
 import csharp
 import semmle.code.csharp.security.dataflow.ExternalAPIsQuery
 
-from ExternalAPIUsedWithUntrustedData externalAPI
-select externalAPI, count(externalAPI.getUntrustedDataNode()) as numberOfUses,
-  externalAPI.getNumberOfUntrustedSources() as numberOfUntrustedSources order by
+from ExternalApiUsedWithUntrustedData externalApi
+select externalApi, count(externalApi.getUntrustedDataNode()) as numberOfUses,
+  externalApi.getNumberOfUntrustedSources() as numberOfUntrustedSources order by
     numberOfUntrustedSources desc
diff --git a/csharp/ql/src/Security Features/CWE-020/UntrustedDataToExternalAPI.ql b/csharp/ql/src/Security Features/CWE-020/UntrustedDataToExternalAPI.ql
index 3db73db09d4..aaf18f7f312 100644
--- a/csharp/ql/src/Security Features/CWE-020/UntrustedDataToExternalAPI.ql	
+++ b/csharp/ql/src/Security Features/CWE-020/UntrustedDataToExternalAPI.ql	
@@ -14,8 +14,8 @@ import semmle.code.csharp.dataflow.TaintTracking
 import semmle.code.csharp.security.dataflow.ExternalAPIsQuery
 import DataFlow::PathGraph
 
-from UntrustedDataToExternalAPIConfig config, DataFlow::PathNode source, DataFlow::PathNode sink
+from UntrustedDataToExternalApiConfig config, DataFlow::PathNode source, DataFlow::PathNode sink
 where config.hasFlowPath(source, sink)
 select sink, source, sink,
-  "Call to " + sink.getNode().(ExternalAPIDataNode).getCallableDescription() +
+  "Call to " + sink.getNode().(ExternalApiDataNode).getCallableDescription() +
     " with untrusted data from $@.", source, source.toString()
diff --git a/csharp/ql/src/Security Features/CWE-248/MissingASPNETGlobalErrorHandler.ql b/csharp/ql/src/Security Features/CWE-248/MissingASPNETGlobalErrorHandler.ql
index 416608b9115..1e7a9a4ddb1 100644
--- a/csharp/ql/src/Security Features/CWE-248/MissingASPNETGlobalErrorHandler.ql	
+++ b/csharp/ql/src/Security Features/CWE-248/MissingASPNETGlobalErrorHandler.ql	
@@ -24,7 +24,7 @@ class Application_Error extends Method {
   }
 }
 
-from CustomErrorsXMLElement customError
+from CustomErrorsXmlElement customError
 where
   // `<customErrors>` must be set to "off" to be dangerous
   customError.getAttributeValue("mode").toLowerCase() = "off" and
diff --git a/csharp/ql/src/Security Features/CWE-451/MissingXFrameOptions.ql b/csharp/ql/src/Security Features/CWE-451/MissingXFrameOptions.ql
index 67f3ae1d7b8..9e51b663038 100644
--- a/csharp/ql/src/Security Features/CWE-451/MissingXFrameOptions.ql	
+++ b/csharp/ql/src/Security Features/CWE-451/MissingXFrameOptions.ql	
@@ -19,7 +19,7 @@ import semmle.code.csharp.frameworks.system.Web
 /**
  * Holds if the `Web.config` file `webConfig` adds an `X-Frame-Options` header.
  */
-predicate hasWebConfigXFrameOptions(WebConfigXML webConfig) {
+predicate hasWebConfigXFrameOptions(WebConfigXml webConfig) {
   // Looking for an entry in `webConfig` that looks like this:
   // ```xml
   // <system.webServer>
@@ -52,7 +52,7 @@ predicate hasCodeXFrameOptions() {
   )
 }
 
-from WebConfigXML webConfig
+from WebConfigXml webConfig
 where
   not hasWebConfigXFrameOptions(webConfig) and
   not hasCodeXFrameOptions()
diff --git a/csharp/ql/src/Security Features/CWE-548/ASPNetDirectoryListing.ql b/csharp/ql/src/Security Features/CWE-548/ASPNetDirectoryListing.ql
index 9416fa32f0a..2337ecfc4cf 100644
--- a/csharp/ql/src/Security Features/CWE-548/ASPNetDirectoryListing.ql	
+++ b/csharp/ql/src/Security Features/CWE-548/ASPNetDirectoryListing.ql	
@@ -13,7 +13,7 @@
 import csharp
 import semmle.code.asp.WebConfig
 
-from SystemWebServerXMLElement ws, XMLAttribute a
+from SystemWebServerXmlElement ws, XMLAttribute a
 where
   ws.getAChild("directoryBrowse").getAttribute("enabled") = a and
   a.getValue() = "true"
diff --git a/csharp/ql/src/Security Features/HeaderCheckingDisabled.ql b/csharp/ql/src/Security Features/HeaderCheckingDisabled.ql
index 631b408a5a3..5d0958d06f9 100644
--- a/csharp/ql/src/Security Features/HeaderCheckingDisabled.ql	
+++ b/csharp/ql/src/Security Features/HeaderCheckingDisabled.ql	
@@ -27,7 +27,7 @@ where
   )
   or
   // header checking is disabled in a configuration file
-  exists(HttpRuntimeXMLElement e, XMLAttribute a |
+  exists(HttpRuntimeXmlElement e, XMLAttribute a |
     a = e.getAttribute("enableHeaderChecking") and
     a.getValue().toLowerCase() = "false" and
     a = l
diff --git a/csharp/ql/src/experimental/ir/implementation/internal/TInstruction.qll b/csharp/ql/src/experimental/ir/implementation/internal/TInstruction.qll
index 4b3f19cbdde..5a7099d9fa2 100644
--- a/csharp/ql/src/experimental/ir/implementation/internal/TInstruction.qll
+++ b/csharp/ql/src/experimental/ir/implementation/internal/TInstruction.qll
@@ -19,24 +19,24 @@ newtype TInstruction =
   ) {
     IRConstruction::Raw::hasInstruction(tag1, tag2)
   } or
-  TUnaliasedSSAPhiInstruction(
-    TRawInstruction blockStartInstr, UnaliasedSSA::SSA::MemoryLocation memoryLocation
+  TUnaliasedSsaPhiInstruction(
+    TRawInstruction blockStartInstr, UnaliasedSsa::SSA::MemoryLocation memoryLocation
   ) {
-    UnaliasedSSA::SSA::hasPhiInstruction(blockStartInstr, memoryLocation)
+    UnaliasedSsa::SSA::hasPhiInstruction(blockStartInstr, memoryLocation)
   } or
-  TUnaliasedSSAChiInstruction(TRawInstruction primaryInstruction) { none() } or
-  TUnaliasedSSAUnreachedInstruction(IRFunctionBase irFunc) {
-    UnaliasedSSA::SSA::hasUnreachedInstruction(irFunc)
+  TUnaliasedSsaChiInstruction(TRawInstruction primaryInstruction) { none() } or
+  TUnaliasedSsaUnreachedInstruction(IRFunctionBase irFunc) {
+    UnaliasedSsa::SSA::hasUnreachedInstruction(irFunc)
   } or
-  TAliasedSSAPhiInstruction(
+  TAliasedSsaPhiInstruction(
     TRawInstruction blockStartInstr, AliasedSSA::SSA::MemoryLocation memoryLocation
   ) {
     AliasedSSA::SSA::hasPhiInstruction(blockStartInstr, memoryLocation)
   } or
-  TAliasedSSAChiInstruction(TRawInstruction primaryInstruction) {
+  TAliasedSsaChiInstruction(TRawInstruction primaryInstruction) {
     AliasedSSA::SSA::hasChiInstruction(primaryInstruction)
   } or
-  TAliasedSSAUnreachedInstruction(IRFunctionBase irFunc) {
+  TAliasedSsaUnreachedInstruction(IRFunctionBase irFunc) {
     AliasedSSA::SSA::hasUnreachedInstruction(irFunc)
   }
 
@@ -46,58 +46,64 @@ newtype TInstruction =
  * These wrappers are not parameterized because it is not possible to invoke an IPA constructor via
  * a class alias.
  */
-module UnaliasedSSAInstructions {
-  class TPhiInstruction = TUnaliasedSSAPhiInstruction;
+module UnaliasedSsaInstructions {
+  class TPhiInstruction = TUnaliasedSsaPhiInstruction;
 
   TPhiInstruction phiInstruction(
-    TRawInstruction blockStartInstr, UnaliasedSSA::SSA::MemoryLocation memoryLocation
+    TRawInstruction blockStartInstr, UnaliasedSsa::SSA::MemoryLocation memoryLocation
   ) {
-    result = TUnaliasedSSAPhiInstruction(blockStartInstr, memoryLocation)
+    result = TUnaliasedSsaPhiInstruction(blockStartInstr, memoryLocation)
   }
 
   TRawInstruction reusedPhiInstruction(TRawInstruction blockStartInstr) { none() }
 
-  class TChiInstruction = TUnaliasedSSAChiInstruction;
+  class TChiInstruction = TUnaliasedSsaChiInstruction;
 
   TChiInstruction chiInstruction(TRawInstruction primaryInstruction) {
-    result = TUnaliasedSSAChiInstruction(primaryInstruction)
+    result = TUnaliasedSsaChiInstruction(primaryInstruction)
   }
 
-  class TUnreachedInstruction = TUnaliasedSSAUnreachedInstruction;
+  class TUnreachedInstruction = TUnaliasedSsaUnreachedInstruction;
 
   TUnreachedInstruction unreachedInstruction(IRFunctionBase irFunc) {
-    result = TUnaliasedSSAUnreachedInstruction(irFunc)
+    result = TUnaliasedSsaUnreachedInstruction(irFunc)
   }
 }
 
+/** DEPRECATED: Alias for UnaliasedSsaInstructions */
+deprecated module UnaliasedSSAInstructions = UnaliasedSsaInstructions;
+
 /**
  * Provides wrappers for the constructors of each branch of `TInstruction` that is used by the
  * aliased SSA stage.
  * These wrappers are not parameterized because it is not possible to invoke an IPA constructor via
  * a class alias.
  */
-module AliasedSSAInstructions {
-  class TPhiInstruction = TAliasedSSAPhiInstruction or TUnaliasedSSAPhiInstruction;
+module AliasedSsaInstructions {
+  class TPhiInstruction = TAliasedSsaPhiInstruction or TUnaliasedSsaPhiInstruction;
 
   TPhiInstruction phiInstruction(
     TRawInstruction blockStartInstr, AliasedSSA::SSA::MemoryLocation memoryLocation
   ) {
-    result = TAliasedSSAPhiInstruction(blockStartInstr, memoryLocation)
+    result = TAliasedSsaPhiInstruction(blockStartInstr, memoryLocation)
   }
 
   TPhiInstruction reusedPhiInstruction(TRawInstruction blockStartInstr) {
-    result = TUnaliasedSSAPhiInstruction(blockStartInstr, _)
+    result = TUnaliasedSsaPhiInstruction(blockStartInstr, _)
   }
 
-  class TChiInstruction = TAliasedSSAChiInstruction;
+  class TChiInstruction = TAliasedSsaChiInstruction;
 
   TChiInstruction chiInstruction(TRawInstruction primaryInstruction) {
-    result = TAliasedSSAChiInstruction(primaryInstruction)
+    result = TAliasedSsaChiInstruction(primaryInstruction)
   }
 
-  class TUnreachedInstruction = TAliasedSSAUnreachedInstruction;
+  class TUnreachedInstruction = TAliasedSsaUnreachedInstruction;
 
   TUnreachedInstruction unreachedInstruction(IRFunctionBase irFunc) {
-    result = TAliasedSSAUnreachedInstruction(irFunc)
+    result = TAliasedSsaUnreachedInstruction(irFunc)
   }
 }
+
+/** DEPRECATED: Alias for AliasedSsaInstructions */
+deprecated module AliasedSSAInstructions = AliasedSsaInstructions;
diff --git a/csharp/ql/src/experimental/ir/implementation/internal/TInstructionInternal.qll b/csharp/ql/src/experimental/ir/implementation/internal/TInstructionInternal.qll
index 978d2c41aa7..252f390bf55 100644
--- a/csharp/ql/src/experimental/ir/implementation/internal/TInstructionInternal.qll
+++ b/csharp/ql/src/experimental/ir/implementation/internal/TInstructionInternal.qll
@@ -1,4 +1,4 @@
 import experimental.ir.internal.IRCSharpLanguage as Language
 import experimental.ir.implementation.raw.internal.IRConstruction as IRConstruction
-import experimental.ir.implementation.unaliased_ssa.internal.SSAConstruction as UnaliasedSSA
+import experimental.ir.implementation.unaliased_ssa.internal.SSAConstruction as UnaliasedSsa
 import AliasedSSAStub as AliasedSSA
diff --git a/csharp/ql/src/experimental/ir/implementation/internal/TOperand.qll b/csharp/ql/src/experimental/ir/implementation/internal/TOperand.qll
index 20fe77f8223..6327c603901 100644
--- a/csharp/ql/src/experimental/ir/implementation/internal/TOperand.qll
+++ b/csharp/ql/src/experimental/ir/implementation/internal/TOperand.qll
@@ -29,7 +29,7 @@ private module Internal {
     TNoOperand() { none() } or
     // Can be "removed" later when there's unreachable code
     // These operands can be reused across all three stages. They just get different defs.
-    TNonSSAMemoryOperand(Raw::Instruction useInstr, MemoryOperandTag tag) {
+    TNonSsaMemoryOperand(Raw::Instruction useInstr, MemoryOperandTag tag) {
       // Has no definition in raw but will get definitions later
       useInstr.getOpcode().hasOperand(tag)
     } or
@@ -57,13 +57,21 @@ private module Shared {
     result = Internal::TRegisterOperand(useInstr, tag, defInstr)
   }
 
-  class TNonSSAMemoryOperand = Internal::TNonSSAMemoryOperand;
+  class TNonSsaMemoryOperand = Internal::TNonSsaMemoryOperand;
+
+  /** DEPRECATED: Alias for TNonSsaMemoryOperand */
+  deprecated class TNonSSAMemoryOperand = TNonSsaMemoryOperand;
 
   /**
    * Returns the non-Phi memory operand with the specified parameters.
    */
-  TNonSSAMemoryOperand nonSSAMemoryOperand(TRawInstruction useInstr, MemoryOperandTag tag) {
-    result = Internal::TNonSSAMemoryOperand(useInstr, tag)
+  TNonSsaMemoryOperand nonSsaMemoryOperand(TRawInstruction useInstr, MemoryOperandTag tag) {
+    result = Internal::TNonSsaMemoryOperand(useInstr, tag)
+  }
+
+  /** DEPRECATED: Alias for nonSsaMemoryOperand */
+  deprecated TNonSSAMemoryOperand nonSSAMemoryOperand(TRawInstruction useInstr, MemoryOperandTag tag) {
+    result = nonSsaMemoryOperand(useInstr, tag)
   }
 }
 
@@ -80,7 +88,7 @@ module RawOperands {
 
   class TChiOperand = Internal::TNoOperand;
 
-  class TNonPhiMemoryOperand = TNonSSAMemoryOperand or TChiOperand;
+  class TNonPhiMemoryOperand = TNonSsaMemoryOperand or TChiOperand;
 
   /**
    * Returns the Phi operand with the specified parameters.
@@ -114,14 +122,14 @@ module RawOperands {
  * These wrappers are not parameterized because it is not possible to invoke an IPA constructor via
  * a class alias.
  */
-module UnaliasedSSAOperands {
+module UnaliasedSsaOperands {
   import Shared
 
   class TPhiOperand = Internal::TUnaliasedPhiOperand;
 
   class TChiOperand = Internal::TNoOperand;
 
-  class TNonPhiMemoryOperand = TNonSSAMemoryOperand or TChiOperand;
+  class TNonPhiMemoryOperand = TNonSsaMemoryOperand or TChiOperand;
 
   /**
    * Returns the Phi operand with the specified parameters.
@@ -148,3 +156,6 @@ module UnaliasedSSAOperands {
    */
   TChiOperand chiOperand(Unaliased::Instruction useInstr, ChiOperandTag tag) { none() }
 }
+
+/** DEPRECATED: Alias for UnaliasedSsaOperands */
+deprecated module UnaliasedSSAOperands = UnaliasedSsaOperands;
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/IRVariable.qll b/csharp/ql/src/experimental/ir/implementation/raw/IRVariable.qll
index 146fc270738..ca4708857a7 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/IRVariable.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/IRVariable.qll
@@ -55,7 +55,10 @@ class IRVariable extends TIRVariable {
    * Gets the AST node that declared this variable, or that introduced this
    * variable as part of the AST-to-IR translation.
    */
-  Language::AST getAST() { none() }
+  Language::AST getAst() { none() }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated Language::AST getAST() { result = getAst() }
 
   /**
    * Gets an identifier string for the variable. This identifier is unique
@@ -66,7 +69,7 @@ class IRVariable extends TIRVariable {
   /**
    * Gets the source location of this variable.
    */
-  final Language::Location getLocation() { result = getAST().getLocation() }
+  final Language::Location getLocation() { result = getAst().getLocation() }
 
   /**
    * Gets the IR for the function that references this variable.
@@ -90,7 +93,10 @@ class IRUserVariable extends IRVariable, TIRUserVariable {
 
   final override string toString() { result = getVariable().toString() }
 
-  final override Language::AST getAST() { result = var }
+  final override Language::AST getAst() { result = var }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 
   final override string getUniqueId() {
     result = getVariable().toString() + " " + getVariable().getLocation().toString()
@@ -157,7 +163,10 @@ class IRGeneratedVariable extends IRVariable {
 
   final override Language::LanguageType getLanguageType() { result = type }
 
-  final override Language::AST getAST() { result = ast }
+  final override Language::AST getAst() { result = ast }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 
   override string toString() { result = getBaseString() + getLocationString() }
 
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/Instruction.qll b/csharp/ql/src/experimental/ir/implementation/raw/Instruction.qll
index 1c2cc493338..4dac3087f83 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/Instruction.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/Instruction.qll
@@ -41,7 +41,7 @@ class Instruction extends Construction::TStageInstruction {
   }
 
   /** Gets a textual representation of this element. */
-  final string toString() { result = this.getOpcode().toString() + ": " + this.getAST().toString() }
+  final string toString() { result = this.getOpcode().toString() + ": " + this.getAst().toString() }
 
   /**
    * Gets a string showing the result, opcode, and operands of the instruction, equivalent to what
@@ -136,7 +136,7 @@ class Instruction extends Construction::TStageInstruction {
   string getResultId() {
     this.shouldGenerateDumpStrings() and
     result =
-      this.getResultPrefix() + this.getAST().getLocation().getStartLine() + "_" + this.getLineRank()
+      this.getResultPrefix() + this.getAst().getLocation().getStartLine() + "_" + this.getLineRank()
   }
 
   /**
@@ -208,12 +208,15 @@ class Instruction extends Construction::TStageInstruction {
   /**
    * Gets the AST that caused this instruction to be generated.
    */
-  final Language::AST getAST() { result = Construction::getInstructionAST(this) }
+  final Language::AST getAst() { result = Construction::getInstructionAst(this) }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated Language::AST getAST() { result = getAst() }
 
   /**
    * Gets the location of the source code for this instruction.
    */
-  final Language::Location getLocation() { result = this.getAST().getLocation() }
+  final Language::Location getLocation() { result = this.getAst().getLocation() }
 
   /**
    * Gets the  `Expr` whose result is computed by this instruction, if any. The `Expr` may be a
@@ -459,7 +462,10 @@ class VariableInstruction extends Instruction {
   /**
    * Gets the AST variable that this instruction's IR variable refers to, if one exists.
    */
-  final Language::Variable getASTVariable() { result = var.(IRUserVariable).getVariable() }
+  final Language::Variable getAstVariable() { result = var.(IRUserVariable).getVariable() }
+
+  /** DEPRECATED: Alias for getAstVariable */
+  deprecated Language::Variable getASTVariable() { result = getAstVariable() }
 }
 
 /**
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/Operand.qll b/csharp/ql/src/experimental/ir/implementation/raw/Operand.qll
index 89b82657c3b..c1e997d5844 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/Operand.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/Operand.qll
@@ -18,7 +18,7 @@ private import internal.OperandInternal
  * of `TOperand` that are used in this stage.
  */
 private class TStageOperand =
-  TRegisterOperand or TNonSSAMemoryOperand or TPhiOperand or TChiOperand;
+  TRegisterOperand or TNonSsaMemoryOperand or TPhiOperand or TChiOperand;
 
 /**
  * A known location. Testing `loc instanceof KnownLocation` will account for non existing locations, as
@@ -38,7 +38,7 @@ class Operand extends TStageOperand {
     // Ensure that the operand does not refer to instructions from earlier stages that are unreachable here
     exists(Instruction use, Instruction def | this = registerOperand(use, _, def))
     or
-    exists(Instruction use | this = nonSSAMemoryOperand(use, _))
+    exists(Instruction use | this = nonSsaMemoryOperand(use, _))
     or
     exists(Instruction use, Instruction def, IRBlock predecessorBlock |
       this = phiOperand(use, def, predecessorBlock, _) or
@@ -209,7 +209,7 @@ class Operand extends TStageOperand {
 class MemoryOperand extends Operand {
   cached
   MemoryOperand() {
-    this instanceof TNonSSAMemoryOperand or
+    this instanceof TNonSsaMemoryOperand or
     this instanceof TPhiOperand or
     this instanceof TChiOperand
   }
@@ -249,7 +249,7 @@ class NonPhiOperand extends Operand {
 
   NonPhiOperand() {
     this = registerOperand(useInstr, tag, _) or
-    this = nonSSAMemoryOperand(useInstr, tag) or
+    this = nonSsaMemoryOperand(useInstr, tag) or
     this = chiOperand(useInstr, tag)
   }
 
@@ -299,7 +299,7 @@ class NonPhiMemoryOperand extends NonPhiOperand, MemoryOperand, TNonPhiMemoryOpe
 
   cached
   NonPhiMemoryOperand() {
-    this = nonSSAMemoryOperand(useInstr, tag)
+    this = nonSsaMemoryOperand(useInstr, tag)
     or
     this = chiOperand(useInstr, tag)
   }
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll b/csharp/ql/src/experimental/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll
index fdb645e03f0..2dc735f49df 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/gvn/internal/ValueNumberingInternal.qll
@@ -99,7 +99,7 @@ private predicate filteredNumberableInstruction(Instruction instr) {
   // count rather than strictcount to handle missing AST elements
   // separate instanceof and inline casts to avoid failed casts with a count of 0
   instr instanceof VariableAddressInstruction and
-  count(instr.(VariableAddressInstruction).getIRVariable().getAST()) != 1
+  count(instr.(VariableAddressInstruction).getIRVariable().getAst()) != 1
   or
   instr instanceof ConstantInstruction and
   count(instr.getResultIRType()) != 1
@@ -121,7 +121,7 @@ private predicate variableAddressValueNumber(
   // The underlying AST element is used as value-numbering key instead of the
   // `IRVariable` to work around a problem where a variable or expression with
   // multiple types gives rise to multiple `IRVariable`s.
-  unique( | | instr.getIRVariable().getAST()) = ast
+  unique( | | instr.getIRVariable().getAst()) = ast
 }
 
 private predicate initializeParameterValueNumber(
@@ -131,7 +131,7 @@ private predicate initializeParameterValueNumber(
   // The underlying AST element is used as value-numbering key instead of the
   // `IRVariable` to work around a problem where a variable or expression with
   // multiple types gives rise to multiple `IRVariable`s.
-  instr.getIRVariable().getAST() = var
+  instr.getIRVariable().getAst() = var
 }
 
 private predicate constantValueNumber(
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/IRConstruction.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/IRConstruction.qll
index 956a95e0667..032026e7969 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/IRConstruction.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/IRConstruction.qll
@@ -62,7 +62,7 @@ module Raw {
     Callable callable, Language::AST ast, TempVariableTag tag, CSharpType type
   ) {
     exists(TranslatedElement element |
-      element.getAST() = ast and
+      element.getAst() = ast and
       callable = element.getFunction() and
       element.hasTempVariable(tag, type)
     )
@@ -105,7 +105,7 @@ module Raw {
       tag = getInstructionTag(instruction) and
       (
         result = element.getInstructionVariable(tag) or
-        result.(IRStringLiteral).getAST() = element.getInstructionStringLiteral(tag)
+        result.(IRStringLiteral).getAst() = element.getInstructionStringLiteral(tag)
       )
     )
   }
@@ -357,7 +357,7 @@ private module Cached {
     exists(TranslatedElement s, GotoStmt goto |
       goto instanceof GotoStmt and
       not isStrictlyForwardGoto(goto) and
-      goto = s.getAST() and
+      goto = s.getAst() and
       exists(InstructionTag tag |
         result = s.getInstructionSuccessor(tag, kind) and
         instruction = s.getInstruction(tag)
@@ -372,8 +372,14 @@ private module Cached {
   }
 
   cached
-  Language::AST getInstructionAST(Instruction instruction) {
-    result = getInstructionTranslatedElement(instruction).getAST()
+  Language::AST getInstructionAst(Instruction instruction) {
+    result = getInstructionTranslatedElement(instruction).getAst()
+  }
+
+  /** DEPRECATED: Alias for getInstructionAst */
+  cached
+  deprecated Language::AST getInstructionAST(Instruction instruction) {
+    result = getInstructionAst(instruction)
   }
 
   cached
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedCondition.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedCondition.qll
index 99833c70d0b..97ecc25fb43 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedCondition.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedCondition.qll
@@ -15,7 +15,10 @@ abstract class TranslatedCondition extends ConditionBase {
 
   final override string toString() { result = expr.toString() }
 
-  final override Language::AST getAST() { result = expr }
+  final override Language::AST getAst() { result = expr }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 
   final Expr getExpr() { result = expr }
 
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedDeclaration.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedDeclaration.qll
index 9b4fbbba723..bc4a2da5b91 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedDeclaration.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedDeclaration.qll
@@ -14,7 +14,7 @@ private import common.TranslatedDeclarationBase
  * `entry`.
  */
 TranslatedLocalDeclaration getTranslatedLocalDeclaration(LocalVariableDeclExpr declExpr) {
-  result.getAST() = declExpr
+  result.getAst() = declExpr
 }
 
 /**
@@ -29,7 +29,10 @@ abstract class TranslatedLocalDeclaration extends TranslatedElement, TTranslated
 
   final override string toString() { result = expr.toString() }
 
-  final override Language::AST getAST() { result = expr }
+  final override Language::AST getAst() { result = expr }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 }
 
 /**
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedElement.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedElement.qll
index ea1ad7931cb..0f269010702 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedElement.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedElement.qll
@@ -27,7 +27,7 @@ IRUserVariable getIRUserVariable(Language::Function func, Language::Variable var
 }
 
 IRTempVariable getIRTempVariable(Language::AST ast, TempVariableTag tag) {
-  result.getAST() = ast and
+  result.getAst() = ast and
   result.getTag() = tag
 }
 
@@ -365,7 +365,10 @@ abstract class TranslatedElement extends TTranslatedElement {
   /**
    * Gets the AST node being translated.
    */
-  abstract Language::AST getAST();
+  abstract Language::AST getAst();
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated Language::AST getAST() { result = getAst() }
 
   /**
    * Get the first instruction to be executed in the evaluation of this element.
@@ -558,7 +561,7 @@ abstract class TranslatedElement extends TTranslatedElement {
    * Gets the temporary variable generated by this element with tag `tag`.
    */
   final IRTempVariable getTempVariable(TempVariableTag tag) {
-    result.getAST() = this.getAST() and
+    result.getAst() = this.getAst() and
     result.getTag() = tag and
     this.hasTempVariable(tag, _)
   }
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedExpr.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedExpr.qll
index 4f4c1a5f073..e8696aa88f2 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedExpr.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedExpr.qll
@@ -62,7 +62,10 @@ abstract class TranslatedExpr extends TranslatedExprBase {
    */
   final Type getResultType() { result = expr.getType() }
 
-  final override Language::AST getAST() { result = expr }
+  final override Language::AST getAst() { result = expr }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 
   final override Callable getFunction() { result = expr.getEnclosingCallable() }
 
@@ -577,9 +580,9 @@ class TranslatedArrayAccess extends TranslatedNonConstantExpr {
     result = this.getInstruction(ElementsAddressTag(0))
     or
     // The successor of an offset expression is a `PointerAdd` expression.
-    child = this.getOffsetOperand(child.getAST().getIndex()) and
-    child.getAST().getIndex() >= 0 and
-    result = this.getInstruction(PointerAddTag(child.getAST().getIndex()))
+    child = this.getOffsetOperand(child.getAst().getIndex()) and
+    child.getAst().getIndex() >= 0 and
+    result = this.getInstruction(PointerAddTag(child.getAst().getIndex()))
   }
 
   override Instruction getResult() {
@@ -2039,7 +2042,7 @@ class TranslatedObjectCreation extends TranslatedCreation {
     // Since calls are also expressions, we can't
     // use the predicate getTranslatedExpr (since that would
     // also return `this`).
-    result.getAST() = this.getAST()
+    result.getAst() = this.getAst()
   }
 
   override predicate needsLoad() { expr.getObjectType().isValueType() }
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedFunction.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedFunction.qll
index 94b48b0985d..0ec4146ad1b 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedFunction.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedFunction.qll
@@ -15,7 +15,7 @@ private import experimental.ir.internal.IRCSharpLanguage as Language
 /**
  * Gets the `TranslatedFunction` that represents function `callable`.
  */
-TranslatedFunction getTranslatedFunction(Callable callable) { result.getAST() = callable }
+TranslatedFunction getTranslatedFunction(Callable callable) { result.getAst() = callable }
 
 /**
  * Represents the IR translation of a function. This is the root element for
@@ -28,7 +28,10 @@ class TranslatedFunction extends TranslatedElement, TTranslatedFunction {
 
   final override string toString() { result = callable.toString() }
 
-  final override Language::AST getAST() { result = callable }
+  final override Language::AST getAst() { result = callable }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 
   /**
    * Gets the function being translated.
@@ -269,7 +272,7 @@ class TranslatedFunction extends TranslatedElement, TTranslatedFunction {
 /**
  * Gets the `TranslatedParameter` that represents parameter `param`.
  */
-TranslatedParameter getTranslatedParameter(Parameter param) { result.getAST() = param }
+TranslatedParameter getTranslatedParameter(Parameter param) { result.getAst() = param }
 
 /**
  * Represents the IR translation of a function parameter, including the
@@ -282,7 +285,10 @@ class TranslatedParameter extends TranslatedElement, TTranslatedParameter {
 
   final override string toString() { result = param.toString() }
 
-  final override Language::AST getAST() { result = param }
+  final override Language::AST getAst() { result = param }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 
   final override Callable getFunction() { result = param.getCallable() }
 
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedInitialization.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedInitialization.qll
index 77e41c15e72..13a583d23d9 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedInitialization.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedInitialization.qll
@@ -51,7 +51,10 @@ abstract class TranslatedInitialization extends TranslatedElement, TTranslatedIn
 
   final override Callable getFunction() { result = expr.getEnclosingCallable() }
 
-  final override Language::AST getAST() { result = expr }
+  final override Language::AST getAst() { result = expr }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 
   /**
    * Gets the expression that is doing the initialization.
@@ -206,7 +209,10 @@ abstract class TranslatedElementInitialization extends TranslatedElement {
     result = initList.toString() + "[" + this.getElementIndex().toString() + "]"
   }
 
-  final override Language::AST getAST() { result = initList }
+  final override Language::AST getAst() { result = initList }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 
   final override Callable getFunction() { result = initList.getEnclosingCallable() }
 
@@ -310,7 +316,10 @@ abstract class TranslatedConstructorCallFromConstructor extends TranslatedElemen
   ConstructorCallContext {
   Call call;
 
-  final override Language::AST getAST() { result = call }
+  final override Language::AST getAst() { result = call }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 
   final override TranslatedElement getChild(int id) {
     id = 0 and result = this.getConstructorCall()
@@ -327,7 +336,7 @@ abstract class TranslatedConstructorCallFromConstructor extends TranslatedElemen
 }
 
 TranslatedConstructorInitializer getTranslatedConstructorInitializer(ConstructorInitializer ci) {
-  result.getAST() = ci
+  result.getAst() = ci
 }
 
 /**
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedStmt.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedStmt.qll
index ac69a9c0f28..edd65b5a1a2 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedStmt.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedStmt.qll
@@ -15,7 +15,7 @@ private import experimental.ir.internal.IRUtilities
 private import desugar.Foreach
 private import desugar.Lock
 
-TranslatedStmt getTranslatedStmt(Stmt stmt) { result.getAST() = stmt }
+TranslatedStmt getTranslatedStmt(Stmt stmt) { result.getAst() = stmt }
 
 abstract class TranslatedStmt extends TranslatedElement, TTranslatedStmt {
   Stmt stmt;
@@ -24,7 +24,10 @@ abstract class TranslatedStmt extends TranslatedElement, TTranslatedStmt {
 
   final override string toString() { result = stmt.toString() }
 
-  final override Language::AST getAST() { result = stmt }
+  final override Language::AST getAst() { result = stmt }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 
   final override Callable getFunction() { result = stmt.getEnclosingCallable() }
 }
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/Delegate.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/Delegate.qll
index f7c80e497fa..5e51073900e 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/Delegate.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/Delegate.qll
@@ -27,10 +27,10 @@ private import experimental.ir.implementation.raw.internal.common.TranslatedExpr
  */
 module DelegateElements {
   TranslatedDelegateConstructorCall getConstructor(DelegateCreation generatedBy) {
-    result.getAST() = generatedBy
+    result.getAst() = generatedBy
   }
 
-  TranslatedDelegateInvokeCall getInvoke(DelegateCall generatedBy) { result.getAST() = generatedBy }
+  TranslatedDelegateInvokeCall getInvoke(DelegateCall generatedBy) { result.getAst() = generatedBy }
 
   int noGeneratedElements(Element generatedBy) {
     (
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/Foreach.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/Foreach.qll
index 195072ed124..bc8ec748648 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/Foreach.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/Foreach.qll
@@ -56,9 +56,9 @@ private import internal.TranslatedCompilerGeneratedElement
  * Module that exposes the functions needed for the translation of the `foreach` stmt.
  */
 module ForeachElements {
-  TranslatedForeachTry getTry(ForeachStmt generatedBy) { result.getAST() = generatedBy }
+  TranslatedForeachTry getTry(ForeachStmt generatedBy) { result.getAst() = generatedBy }
 
-  TranslatedForeachEnumerator getEnumDecl(ForeachStmt generatedBy) { result.getAST() = generatedBy }
+  TranslatedForeachEnumerator getEnumDecl(ForeachStmt generatedBy) { result.getAst() = generatedBy }
 
   int noGeneratedElements() { result = 13 }
 }
@@ -71,14 +71,14 @@ private class TranslatedForeachTry extends TranslatedCompilerGeneratedTry,
 
   override TranslatedElement getFinally() {
     exists(TranslatedForeachFinally ff |
-      ff.getAST() = generatedBy and
+      ff.getAst() = generatedBy and
       result = ff
     )
   }
 
   override TranslatedElement getBody() {
     exists(TranslatedForeachWhile fw |
-      fw.getAST() = generatedBy and
+      fw.getAst() = generatedBy and
       result = fw
     )
   }
@@ -96,7 +96,7 @@ private class TranslatedForeachFinally extends TranslatedCompilerGeneratedBlock,
   override TranslatedElement getStmt(int index) {
     index = 0 and
     exists(TranslatedForeachDispose fd |
-      fd.getAST() = generatedBy and
+      fd.getAst() = generatedBy and
       result = fd
     )
   }
@@ -147,14 +147,14 @@ class TranslatedForeachWhile extends TranslatedCompilerGeneratedStmt, ConditionC
 
   TranslatedElement getInit() {
     exists(TranslatedForeachIterVar iv |
-      iv.getAST() = generatedBy and
+      iv.getAst() = generatedBy and
       result = iv
     )
   }
 
   ValueConditionBase getCondition() {
     exists(TranslatedForeachWhileCondition cond |
-      cond.getAST() = generatedBy and
+      cond.getAst() = generatedBy and
       result = cond
     )
   }
@@ -180,7 +180,7 @@ private class TranslatedForeachMoveNext extends TranslatedCompilerGeneratedCall,
 
   override TranslatedExprBase getQualifier() {
     exists(TranslatedMoveNextEnumAcc acc |
-      acc.getAST() = generatedBy and
+      acc.getAst() = generatedBy and
       result = acc
     )
   }
@@ -230,7 +230,7 @@ private class TranslatedForeachCurrent extends TranslatedCompilerGeneratedCall,
 
   override TranslatedExprBase getQualifier() {
     exists(TranslatedForeachCurrentEnumAcc acc |
-      acc.getAST() = generatedBy and
+      acc.getAst() = generatedBy and
       result = acc
     )
   }
@@ -263,7 +263,7 @@ private class TranslatedForeachDispose extends TranslatedCompilerGeneratedCall,
 
   override TranslatedExprBase getQualifier() {
     exists(TranslatedForeachDisposeEnumAcc acc |
-      acc.getAST() = generatedBy and
+      acc.getAst() = generatedBy and
       result = acc
     )
   }
@@ -282,7 +282,7 @@ private class TranslatedForeachWhileCondition extends TranslatedCompilerGenerate
 
   override TranslatedCompilerGeneratedCall getValueExpr() {
     exists(TranslatedForeachMoveNext mn |
-      mn.getAST() = generatedBy and
+      mn.getAst() = generatedBy and
       result = mn
     )
   }
@@ -311,7 +311,7 @@ private class TranslatedForeachEnumerator extends TranslatedCompilerGeneratedDec
 
   override TranslatedCompilerGeneratedCall getInitialization() {
     exists(TranslatedForeachGetEnumerator ge |
-      ge.getAST() = generatedBy and
+      ge.getAst() = generatedBy and
       result = ge
     )
   }
@@ -339,7 +339,7 @@ private class TranslatedForeachIterVar extends TranslatedCompilerGeneratedDeclar
 
   override TranslatedCompilerGeneratedCall getInitialization() {
     exists(TranslatedForeachCurrent crtProp |
-      crtProp.getAST() = generatedBy and
+      crtProp.getAst() = generatedBy and
       result = crtProp
     )
   }
@@ -361,7 +361,7 @@ private class TranslatedMoveNextEnumAcc extends TTranslatedCompilerGeneratedElem
 
   override Type getVariableType() {
     exists(TranslatedForeachGetEnumerator ge |
-      ge.getAST() = generatedBy and
+      ge.getAst() = generatedBy and
       result = ge.getCallResultType()
     )
   }
@@ -393,7 +393,7 @@ private class TranslatedForeachCurrentEnumAcc extends TTranslatedCompilerGenerat
 
   override Type getVariableType() {
     exists(TranslatedForeachGetEnumerator ge |
-      ge.getAST() = generatedBy and
+      ge.getAst() = generatedBy and
       result = ge.getCallResultType()
     )
   }
@@ -425,7 +425,7 @@ private class TranslatedForeachDisposeEnumAcc extends TTranslatedCompilerGenerat
 
   override Type getVariableType() {
     exists(TranslatedForeachGetEnumerator ge |
-      ge.getAST() = generatedBy and
+      ge.getAst() = generatedBy and
       result = ge.getCallResultType()
     )
   }
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/Lock.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/Lock.qll
index c83957d9b94..e061a1371b2 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/Lock.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/Lock.qll
@@ -42,12 +42,12 @@ private import internal.TranslatedCompilerGeneratedExpr
  * Module that exposes the functions needed for the translation of the `lock` stmt.
  */
 module LockElements {
-  TranslatedLockedVarDecl getLockedVarDecl(LockStmt generatedBy) { result.getAST() = generatedBy }
+  TranslatedLockedVarDecl getLockedVarDecl(LockStmt generatedBy) { result.getAst() = generatedBy }
 
-  TranslatedLockTry getTry(LockStmt generatedBy) { result.getAST() = generatedBy }
+  TranslatedLockTry getTry(LockStmt generatedBy) { result.getAst() = generatedBy }
 
   TranslatedLockWasTakenDecl getLockWasTakenDecl(LockStmt generatedBy) {
-    result.getAST() = generatedBy
+    result.getAst() = generatedBy
   }
 
   int noGeneratedElements() { result = 14 }
@@ -64,14 +64,14 @@ private class TranslatedLockTry extends TranslatedCompilerGeneratedTry,
 
   override TranslatedElement getFinally() {
     exists(TranslatedLockFinally fin |
-      fin.getAST() = generatedBy and
+      fin.getAst() = generatedBy and
       result = fin
     )
   }
 
   override TranslatedElement getBody() {
     exists(TranslatedLockTryBody ltb |
-      ltb.getAST() = generatedBy and
+      ltb.getAst() = generatedBy and
       result = ltb
     )
   }
@@ -89,7 +89,7 @@ private class TranslatedLockTryBody extends TranslatedCompilerGeneratedBlock,
   override TranslatedElement getStmt(int index) {
     index = 0 and
     exists(TranslatedMonitorEnter me |
-      me.getAST() = generatedBy and
+      me.getAst() = generatedBy and
       result = me
     )
     or
@@ -110,7 +110,7 @@ private class TranslatedLockFinally extends TranslatedCompilerGeneratedBlock,
   override TranslatedElement getStmt(int index) {
     index = 0 and
     exists(TranslatedFinallyIf fif |
-      fif.getAST() = generatedBy and
+      fif.getAst() = generatedBy and
       result = fif
     )
   }
@@ -138,7 +138,7 @@ private class TranslatedMonitorExit extends TranslatedCompilerGeneratedCall,
   override TranslatedExprBase getArgument(int id) {
     id = 0 and
     exists(TranslatedMonitorExitVarAcc var |
-      var.getAST() = generatedBy and
+      var.getAst() = generatedBy and
       result = var
     )
   }
@@ -170,13 +170,13 @@ private class TranslatedMonitorEnter extends TranslatedCompilerGeneratedCall,
   override TranslatedExprBase getArgument(int id) {
     id = 0 and
     exists(TranslatedMonitorEnterVarAcc var |
-      var.getAST() = generatedBy and
+      var.getAst() = generatedBy and
       result = var
     )
     or
     id = 1 and
     exists(TranslatedLockWasTakenRefArg refArg |
-      refArg.getAST() = generatedBy and
+      refArg.getAst() = generatedBy and
       result = refArg
     )
   }
@@ -197,7 +197,7 @@ private class TranslatedIfCondition extends TranslatedCompilerGeneratedValueCond
 
   override TranslatedCompilerGeneratedExpr getValueExpr() {
     exists(TranslatedLockWasTakenCondVarAcc condVar |
-      condVar.getAST() = generatedBy and
+      condVar.getAst() = generatedBy and
       result = condVar
     )
   }
@@ -216,14 +216,14 @@ private class TranslatedFinallyIf extends TranslatedCompilerGeneratedIfStmt,
 
   override TranslatedCompilerGeneratedValueCondition getCondition() {
     exists(TranslatedIfCondition cond |
-      cond.getAST() = generatedBy and
+      cond.getAst() = generatedBy and
       result = cond
     )
   }
 
   override TranslatedCompilerGeneratedCall getThen() {
     exists(TranslatedMonitorExit me |
-      me.getAST() = generatedBy and
+      me.getAst() = generatedBy and
       result = me
     )
   }
@@ -271,7 +271,7 @@ private class TranslatedLockWasTakenDecl extends TranslatedCompilerGeneratedDecl
 
   override TranslatedCompilerGeneratedExpr getInitialization() {
     exists(TranslatedWasTakenConst const |
-      const.getAST() = generatedBy and
+      const.getAst() = generatedBy and
       result = const
     )
   }
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/internal/TranslatedCompilerGeneratedElement.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/internal/TranslatedCompilerGeneratedElement.qll
index 1eb7520eda4..ffcc400a9bc 100644
--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/internal/TranslatedCompilerGeneratedElement.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/desugar/internal/TranslatedCompilerGeneratedElement.qll
@@ -18,5 +18,8 @@ abstract class TranslatedCompilerGeneratedElement extends TranslatedElement,
 
   final override Callable getFunction() { result = generatedBy.getEnclosingCallable() }
 
-  final override Language::AST getAST() { result = generatedBy }
+  final override Language::AST getAst() { result = generatedBy }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 }
diff --git a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/IRVariable.qll b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/IRVariable.qll
index 146fc270738..ca4708857a7 100644
--- a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/IRVariable.qll
+++ b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/IRVariable.qll
@@ -55,7 +55,10 @@ class IRVariable extends TIRVariable {
    * Gets the AST node that declared this variable, or that introduced this
    * variable as part of the AST-to-IR translation.
    */
-  Language::AST getAST() { none() }
+  Language::AST getAst() { none() }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated Language::AST getAST() { result = getAst() }
 
   /**
    * Gets an identifier string for the variable. This identifier is unique
@@ -66,7 +69,7 @@ class IRVariable extends TIRVariable {
   /**
    * Gets the source location of this variable.
    */
-  final Language::Location getLocation() { result = getAST().getLocation() }
+  final Language::Location getLocation() { result = getAst().getLocation() }
 
   /**
    * Gets the IR for the function that references this variable.
@@ -90,7 +93,10 @@ class IRUserVariable extends IRVariable, TIRUserVariable {
 
   final override string toString() { result = getVariable().toString() }
 
-  final override Language::AST getAST() { result = var }
+  final override Language::AST getAst() { result = var }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 
   final override string getUniqueId() {
     result = getVariable().toString() + " " + getVariable().getLocation().toString()
@@ -157,7 +163,10 @@ class IRGeneratedVariable extends IRVariable {
 
   final override Language::LanguageType getLanguageType() { result = type }
 
-  final override Language::AST getAST() { result = ast }
+  final override Language::AST getAst() { result = ast }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated override Language::AST getAST() { result = getAst() }
 
   override string toString() { result = getBaseString() + getLocationString() }
 
diff --git a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/Instruction.qll b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/Instruction.qll
index 1c2cc493338..4dac3087f83 100644
--- a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/Instruction.qll
+++ b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/Instruction.qll
@@ -41,7 +41,7 @@ class Instruction extends Construction::TStageInstruction {
   }
 
   /** Gets a textual representation of this element. */
-  final string toString() { result = this.getOpcode().toString() + ": " + this.getAST().toString() }
+  final string toString() { result = this.getOpcode().toString() + ": " + this.getAst().toString() }
 
   /**
    * Gets a string showing the result, opcode, and operands of the instruction, equivalent to what
@@ -136,7 +136,7 @@ class Instruction extends Construction::TStageInstruction {
   string getResultId() {
     this.shouldGenerateDumpStrings() and
     result =
-      this.getResultPrefix() + this.getAST().getLocation().getStartLine() + "_" + this.getLineRank()
+      this.getResultPrefix() + this.getAst().getLocation().getStartLine() + "_" + this.getLineRank()
   }
 
   /**
@@ -208,12 +208,15 @@ class Instruction extends Construction::TStageInstruction {
   /**
    * Gets the AST that caused this instruction to be generated.
    */
-  final Language::AST getAST() { result = Construction::getInstructionAST(this) }
+  final Language::AST getAst() { result = Construction::getInstructionAst(this) }
+
+  /** DEPRECATED: Alias for getAst */
+  deprecated Language::AST getAST() { result = getAst() }
 
   /**
    * Gets the location of the source code for this instruction.
    */
-  final Language::Location getLocation() { result = this.getAST().getLocation() }
+  final Language::Location getLocation() { result = this.getAst().getLocation() }
 
   /**
    * Gets the  `Expr` whose result is computed by this instruction, if any. The `Expr` may be a
@@ -459,7 +462,10 @@ class VariableInstruction extends Instruction {
   /**
    * Gets the AST variable that this instruction's IR variable refers to, if one exists.
    */
-  final Language::Variable getASTVariable() { result = var.(IRUserVariable).getVariable() }
+  final Language::Variable getAstVariable() { result = var.(IRUserVariable).getVariable() }
+
+  /** DEPRECATED: Alias for getAstVariable */
+  deprecated Language::Variable getASTVariable() { result = getAstVariable() }
 }
 
 /**
diff --git a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/Operand.qll b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/Operand.qll
index 89b82657c3b..c1e997d5844 100644
--- a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/Operand.qll
+++ b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/Operand.qll
@@ -18,7 +18,7 @@ private import internal.OperandInternal
  * of `TOperand` that are used in this stage.
  */
 private class TStageOperand =
-  TRegisterOperand or TNonSSAMemoryOperand or TPhiOperand or TChiOperand;
+  TRegisterOperand or TNonSsaMemoryOperand or TPhiOperand or TChiOperand;
 
 /**
  * A known location. Testing `loc instanceof KnownLocation` will account for non existing locations, as
@@ -38,7 +38,7 @@ class Operand extends TStageOperand {
     // Ensure that the operand does not refer to instructions from earlier stages that are unreachable here
     exists(Instruction use, Instruction def | this = registerOperand(use, _, def))
     or
-    exists(Instruction use | this = nonSSAMemoryOperand(use, _))
+    exists(Instruction use | this = nonSsaMemoryOperand(use, _))
     or
     exists(Instruction use, Instruction def, IRBlock predecessorBlock |
       this = phiOperand(use, def, predecessorBlock, _) or
@@ -209,7 +209,7 @@ class Operand extends TStageOperand {
 class MemoryOperand extends Operand {
   cached
   MemoryOperand() {
-    this instanceof TNonSSAMemoryOperand or
+    this instanceof TNonSsaMemoryOperand or
     this instanceof TPhiOperand or
     this instanceof TChiOperand
   }
@@ -249,7 +249,7 @@ class NonPhiOperand extends Operand {
 
   NonPhiOperand() {
     this = registerOperand(useInstr, tag, _) or
-    this = nonSSAMemoryOperand(useInstr, tag) or
+    this = nonSsaMemoryOperand(useInstr, tag) or
     this = chiOperand(useInstr, tag)
   }
 
@@ -299,7 +299,7 @@ class NonPhiMemoryOperand extends NonPhiOperand, MemoryOperand, TNonPhiMemoryOpe
 
   cached
   NonPhiMemoryOperand() {
-    this = nonSSAMemoryOperand(useInstr, tag)
+    this = nonSsaMemoryOperand(useInstr, tag)
     or
     this = chiOperand(useInstr, tag)
   }
diff --git a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll
index fdb645e03f0..2dc735f49df 100644
--- a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll
+++ b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingInternal.qll
@@ -99,7 +99,7 @@ private predicate filteredNumberableInstruction(Instruction instr) {
   // count rather than strictcount to handle missing AST elements
   // separate instanceof and inline casts to avoid failed casts with a count of 0
   instr instanceof VariableAddressInstruction and
-  count(instr.(VariableAddressInstruction).getIRVariable().getAST()) != 1
+  count(instr.(VariableAddressInstruction).getIRVariable().getAst()) != 1
   or
   instr instanceof ConstantInstruction and
   count(instr.getResultIRType()) != 1
@@ -121,7 +121,7 @@ private predicate variableAddressValueNumber(
   // The underlying AST element is used as value-numbering key instead of the
   // `IRVariable` to work around a problem where a variable or expression with
   // multiple types gives rise to multiple `IRVariable`s.
-  unique( | | instr.getIRVariable().getAST()) = ast
+  unique( | | instr.getIRVariable().getAst()) = ast
 }
 
 private predicate initializeParameterValueNumber(
@@ -131,7 +131,7 @@ private predicate initializeParameterValueNumber(
   // The underlying AST element is used as value-numbering key instead of the
   // `IRVariable` to work around a problem where a variable or expression with
   // multiple types gives rise to multiple `IRVariable`s.
-  instr.getIRVariable().getAST() = var
+  instr.getIRVariable().getAst() = var
 }
 
 private predicate constantValueNumber(
diff --git a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/OperandInternal.qll b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/OperandInternal.qll
index 88a4e6f8551..e522599abe9 100644
--- a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/OperandInternal.qll
+++ b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/OperandInternal.qll
@@ -1,2 +1,2 @@
 private import experimental.ir.implementation.internal.TOperand
-import UnaliasedSSAOperands
+import UnaliasedSsaOperands
diff --git a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/PrintSSA.qll b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/PrintSSA.qll
index 72bb239c153..c7487872512 100644
--- a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/PrintSSA.qll
+++ b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/PrintSSA.qll
@@ -2,7 +2,7 @@ private import SSAConstructionInternal
 private import OldIR
 private import Alias
 private import SSAConstruction
-private import DebugSSA
+private import DebugSsa
 
 bindingset[offset]
 private string getKeySuffixForOffset(int offset) {
diff --git a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConsistency.qll b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConsistency.qll
index 5686bb439eb..1c75529be00 100644
--- a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConsistency.qll
+++ b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConsistency.qll
@@ -1,2 +1,2 @@
 private import SSAConstruction as SSA
-import SSA::SSAConsistency
+import SSA::SsaConsistency
diff --git a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll
index 5092e921cb3..13ec2ca4ca4 100644
--- a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll
+++ b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll
@@ -112,7 +112,7 @@ private module Cached {
     exists(Alias::getResultMemoryLocation(oldInstruction))
     or
     // This result was already modeled by a previous iteration of SSA.
-    Alias::canReuseSSAForOldResult(oldInstruction)
+    Alias::canReuseSsaForOldResult(oldInstruction)
   }
 
   cached
@@ -182,7 +182,7 @@ private module Cached {
    * unreachable, this predicate will recurse through any degenerate `Phi` instructions to find the
    * true definition.
    */
-  private Instruction getNewDefinitionFromOldSSA(OldIR::MemoryOperand oldOperand, Overlap overlap) {
+  private Instruction getNewDefinitionFromOldSsa(OldIR::MemoryOperand oldOperand, Overlap overlap) {
     exists(Overlap originalOverlap |
       originalOverlap = oldOperand.getDefinitionOverlap() and
       (
@@ -191,7 +191,7 @@ private module Cached {
         or
         exists(OldIR::PhiInputOperand phiOperand, Overlap phiOperandOverlap |
           phiOperand = getDegeneratePhiOperand(oldOperand.getAnyDef()) and
-          result = getNewDefinitionFromOldSSA(phiOperand, phiOperandOverlap) and
+          result = getNewDefinitionFromOldSsa(phiOperand, phiOperandOverlap) and
           overlap =
             combineOverlap(pragma[only_bind_out](phiOperandOverlap),
               pragma[only_bind_out](originalOverlap))
@@ -233,7 +233,7 @@ private module Cached {
     )
     or
     exists(OldIR::NonPhiMemoryOperand oldOperand |
-      result = getNewDefinitionFromOldSSA(oldOperand, overlap) and
+      result = getNewDefinitionFromOldSsa(oldOperand, overlap) and
       oldOperand.getUse() = instruction and
       tag = oldOperand.getOperandTag()
     )
@@ -307,13 +307,13 @@ private module Cached {
    * Gets the new definition instruction for the operand of `instr` that flows from the block
    * `newPredecessorBlock`, based on that operand's definition in the old IR.
    */
-  private Instruction getNewPhiOperandDefinitionFromOldSSA(
+  private Instruction getNewPhiOperandDefinitionFromOldSsa(
     Instruction instr, IRBlock newPredecessorBlock, Overlap overlap
   ) {
     exists(OldIR::PhiInstruction oldPhi, OldIR::PhiInputOperand oldOperand |
       oldPhi = getOldInstruction(instr) and
       oldOperand = oldPhi.getInputOperand(getOldBlock(newPredecessorBlock)) and
-      result = getNewDefinitionFromOldSSA(oldOperand, overlap)
+      result = getNewDefinitionFromOldSsa(oldOperand, overlap)
     )
   }
 
@@ -333,7 +333,7 @@ private module Cached {
       overlap = Alias::getOverlap(actualDefLocation, useLocation)
     )
     or
-    result = getNewPhiOperandDefinitionFromOldSSA(instr, newPredecessorBlock, overlap)
+    result = getNewPhiOperandDefinitionFromOldSsa(instr, newPredecessorBlock, overlap)
   }
 
   cached
@@ -412,17 +412,17 @@ private module Cached {
   }
 
   cached
-  Language::AST getInstructionAST(Instruction instr) {
-    result = getOldInstruction(instr).getAST()
+  Language::AST getInstructionAst(Instruction instr) {
+    result = getOldInstruction(instr).getAst()
     or
     exists(RawIR::Instruction blockStartInstr |
       instr = phiInstruction(blockStartInstr, _) and
-      result = blockStartInstr.getAST()
+      result = blockStartInstr.getAst()
     )
     or
     exists(RawIR::Instruction primaryInstr |
       instr = chiInstruction(primaryInstr) and
-      result = primaryInstr.getAST()
+      result = primaryInstr.getAst()
     )
     or
     exists(IRFunctionBase irFunc |
@@ -430,6 +430,12 @@ private module Cached {
     )
   }
 
+  /** DEPRECATED: Alias for getInstructionAst */
+  cached
+  deprecated Language::AST getInstructionAST(Instruction instr) {
+    result = getInstructionAst(instr)
+  }
+
   cached
   Language::LanguageType getInstructionResultType(Instruction instr) {
     result = instr.(RawIR::Instruction).getResultLanguageType()
@@ -975,35 +981,41 @@ module DefUse {
   }
 }
 
-predicate canReuseSSAForMemoryResult(Instruction instruction) {
+predicate canReuseSsaForMemoryResult(Instruction instruction) {
   exists(OldInstruction oldInstruction |
     oldInstruction = getOldInstruction(instruction) and
     (
       // The previous iteration said it was reusable, so we should mark it as reusable as well.
-      Alias::canReuseSSAForOldResult(oldInstruction)
+      Alias::canReuseSsaForOldResult(oldInstruction)
       or
       // The current alias analysis says it is reusable.
-      Alias::getResultMemoryLocation(oldInstruction).canReuseSSA()
+      Alias::getResultMemoryLocation(oldInstruction).canReuseSsa()
     )
   )
   or
   exists(Alias::MemoryLocation defLocation |
     // This is a `Phi` for a reusable location, so the result of the `Phi` is reusable as well.
     instruction = phiInstruction(_, defLocation) and
-    defLocation.canReuseSSA()
+    defLocation.canReuseSsa()
   )
   // We don't support reusing SSA for any location that could create a `Chi` instruction.
 }
 
+/** DEPRECATED: Alias for canReuseSsaForMemoryResult */
+deprecated predicate canReuseSSAForMemoryResult = canReuseSsaForMemoryResult/1;
+
 /**
  * Expose some of the internal predicates to PrintSSA.qll. We do this by publically importing those modules in the
  * `DebugSSA` module, which is then imported by PrintSSA.
  */
-module DebugSSA {
+module DebugSsa {
   import PhiInsertion
   import DefUse
 }
 
+/** DEPRECATED: Alias for DebugSsa */
+deprecated module DebugSSA = DebugSsa;
+
 import CachedForDebugging
 
 cached
@@ -1038,7 +1050,7 @@ private module CachedForDebugging {
 
   private OldIR::IRTempVariable getOldTempVariable(IRTempVariable var) {
     result.getEnclosingFunction() = var.getEnclosingFunction() and
-    result.getAST() = var.getAST() and
+    result.getAst() = var.getAst() and
     result.getTag() = var.getTag()
   }
 
@@ -1061,7 +1073,7 @@ private module CachedForDebugging {
   int maxValue() { result = 2147483647 }
 }
 
-module SSAConsistency {
+module SsaConsistency {
   /**
    * Holds if a `MemoryOperand` has more than one `MemoryLocation` assigned by alias analysis.
    */
@@ -1114,6 +1126,9 @@ module SSAConsistency {
   }
 }
 
+/** DEPRECATED: Alias for SsaConsistency */
+deprecated module SSAConsistency = SsaConsistency;
+
 /**
  * Provides the portion of the parameterized IR interface that is used to construct the SSA stages
  * of the IR. The raw stage of the IR does not expose these predicates.
diff --git a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConstructionInternal.qll b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConstructionInternal.qll
index 8f726b81345..005ea53b018 100644
--- a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConstructionInternal.qll
+++ b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConstructionInternal.qll
@@ -3,7 +3,7 @@ import experimental.ir.implementation.raw.internal.reachability.ReachableBlock a
 import experimental.ir.implementation.raw.internal.reachability.Dominance as Dominance
 import experimental.ir.implementation.unaliased_ssa.IR as NewIR
 import experimental.ir.implementation.raw.internal.IRConstruction as RawStage
-import experimental.ir.implementation.internal.TInstruction::UnaliasedSSAInstructions as SSAInstructions
+import experimental.ir.implementation.internal.TInstruction::UnaliasedSsaInstructions as SSAInstructions
 import experimental.ir.internal.IRCSharpLanguage as Language
 import SimpleSSA as Alias
-import experimental.ir.implementation.internal.TOperand::UnaliasedSSAOperands as SSAOperands
+import experimental.ir.implementation.internal.TOperand::UnaliasedSsaOperands as SSAOperands
diff --git a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SimpleSSA.qll b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SimpleSSA.qll
index f3e02c9f6a8..ec2e6f5ef34 100644
--- a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SimpleSSA.qll
+++ b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SimpleSSA.qll
@@ -41,11 +41,14 @@ predicate isVariableModeled(Allocation var) {
  * subsequent iterations will recompute SSA for any variable that we assumed did not escape, but
  * actually would have escaped if we had used a sound escape analysis.
  */
-predicate canReuseSSAForVariable(IRAutomaticVariable var) {
+predicate canReuseSsaForVariable(IRAutomaticVariable var) {
   isVariableModeled(var) and
   not allocationEscapes(var)
 }
 
+/** DEPRECATED: Alias for canReuseSsaForVariable */
+deprecated predicate canReuseSSAForVariable = canReuseSsaForVariable/1;
+
 private newtype TMemoryLocation = MkMemoryLocation(Allocation var) { isVariableModeled(var) }
 
 private MemoryLocation getMemoryLocation(Allocation var) { result.getAllocation() = var }
@@ -69,10 +72,16 @@ class MemoryLocation extends TMemoryLocation {
 
   final string getUniqueId() { result = var.getUniqueId() }
 
-  final predicate canReuseSSA() { canReuseSSAForVariable(var) }
+  final predicate canReuseSsa() { canReuseSsaForVariable(var) }
+
+  /** DEPRECATED: Alias for canReuseSsa */
+  deprecated predicate canReuseSSA() { canReuseSsa() }
 }
 
-predicate canReuseSSAForOldResult(Instruction instr) { none() }
+predicate canReuseSsaForOldResult(Instruction instr) { none() }
+
+/** DEPRECATED: Alias for canReuseSsaForOldResult */
+deprecated predicate canReuseSSAForOldResult = canReuseSsaForOldResult/1;
 
 /**
  * Represents a set of `MemoryLocation`s that cannot overlap with
diff --git a/csharp/ql/src/experimental/ir/internal/IRGuards.qll b/csharp/ql/src/experimental/ir/internal/IRGuards.qll
index a87788eb9a0..91e2208c6f7 100644
--- a/csharp/ql/src/experimental/ir/internal/IRGuards.qll
+++ b/csharp/ql/src/experimental/ir/internal/IRGuards.qll
@@ -28,8 +28,8 @@ class GuardCondition extends Expr {
     or
     // the IR short-circuits if(!x)
     // don't produce a guard condition for `y = !x` and other non-short-circuited cases
-    not exists(Instruction inst | this = inst.getAST()) and
-    exists(IRGuardCondition ir | this.(LogicalNotExpr).getOperand() = ir.getAST())
+    not exists(Instruction inst | this = inst.getAst()) and
+    exists(IRGuardCondition ir | this.(LogicalNotExpr).getOperand() = ir.getAst())
   }
 
   /**
@@ -172,8 +172,8 @@ private class GuardConditionFromBinaryLogicalOperator extends GuardCondition {
  */
 private class GuardConditionFromShortCircuitNot extends GuardCondition, LogicalNotExpr {
   GuardConditionFromShortCircuitNot() {
-    not exists(Instruction inst | this = inst.getAST()) and
-    exists(IRGuardCondition ir | this.getOperand() = ir.getAST())
+    not exists(Instruction inst | this = inst.getAst()) and
+    exists(IRGuardCondition ir | this.getOperand() = ir.getAst())
   }
 
   override predicate controls(BasicBlock controlled, boolean testIsTrue) {
@@ -267,7 +267,7 @@ private class GuardConditionFromIR extends GuardCondition {
   private predicate controlsBlock1(BasicBlock controlled, boolean testIsTrue) {
     exists(IRBlock irb |
       forex(IRGuardCondition inst | inst = ir | inst.controls(irb, testIsTrue)) and
-      irb.getAnInstruction().getAST().(ControlFlowElement).getAControlFlowNode().getBasicBlock() =
+      irb.getAnInstruction().getAst().(ControlFlowElement).getAControlFlowNode().getBasicBlock() =
         controlled and
       not isUnreachedBlock(irb)
     )
diff --git a/csharp/ql/src/experimental/ir/rangeanalysis/RangeAnalysis.qll b/csharp/ql/src/experimental/ir/rangeanalysis/RangeAnalysis.qll
index ccc6b9ea30e..ebdca09414f 100644
--- a/csharp/ql/src/experimental/ir/rangeanalysis/RangeAnalysis.qll
+++ b/csharp/ql/src/experimental/ir/rangeanalysis/RangeAnalysis.qll
@@ -623,7 +623,7 @@ private predicate boundedInstruction(
   )
   or
   exists(PropertyAccess pa |
-    i.(CallInstruction).getAST() = pa and
+    i.(CallInstruction).getAst() = pa and
     pa.getProperty().getName() = "Length" and
     b instanceof ZeroBound and
     delta = origdelta and
diff --git a/csharp/ql/test/experimental/ir/offbyone/OffByOneRA.ql b/csharp/ql/test/experimental/ir/offbyone/OffByOneRA.ql
index 7518386e6d2..38386d47568 100644
--- a/csharp/ql/test/experimental/ir/offbyone/OffByOneRA.ql
+++ b/csharp/ql/test/experimental/ir/offbyone/OffByOneRA.ql
@@ -10,17 +10,17 @@ predicate boundedArrayAccess(ElementAccess aa, int k) {
   exists(Instruction index, Instruction usage, Bound b, int delta |
     (
       // indexer access
-      usage.(CallInstruction).getAST() = aa
+      usage.(CallInstruction).getAst() = aa
       or
       // array access
-      usage.(PointerAddInstruction).getAST() = aa
+      usage.(PointerAddInstruction).getAst() = aa
     ) and
     usage.getAnOperand().getDef() = index and
     boundedInstruction(index, b, delta, true, _)
   |
     exists(PropertyAccess pa |
       k = delta and
-      b.getInstruction().getAST() = pa and
+      b.getInstruction().getAst() = pa and
       pa.getProperty().getName() = "Length" and
       pa.(QualifiableExpr).getQualifier().(VariableAccess).getTarget() =
         aa.getQualifier().(VariableAccess).getTarget()
diff --git a/java/ql/lib/semmle/code/java/Expr.qll b/java/ql/lib/semmle/code/java/Expr.qll
index d98cdbb6b0e..ad14984cffa 100755
--- a/java/ql/lib/semmle/code/java/Expr.qll
+++ b/java/ql/lib/semmle/code/java/Expr.qll
@@ -1668,7 +1668,10 @@ class LValue extends VarAccess {
    * (such as (`+=`), both the RHS and the LHS of the compound assignment
    * are source expressions of the assignment.
    */
-  Expr getRHS() { exists(Assignment e | e.getDest() = this and e.getSource() = result) }
+  Expr getRhs() { exists(Assignment e | e.getDest() = this and e.getSource() = result) }
+
+  /** DEPRECATED: Alias for getRhs */
+  deprecated Expr getRHS() { result = getRhs() }
 }
 
 /**
diff --git a/java/ql/lib/semmle/code/java/dataflow/SSA.qll b/java/ql/lib/semmle/code/java/dataflow/SSA.qll
index f67a211198b..abcaf737d80 100644
--- a/java/ql/lib/semmle/code/java/dataflow/SSA.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/SSA.qll
@@ -920,7 +920,7 @@ class SsaVariable extends TSsaVariable {
   }
 
   /** Gets the `ControlFlowNode` at which this SSA variable is defined. */
-  ControlFlowNode getCFGNode() {
+  ControlFlowNode getCfgNode() {
     this = TSsaPhiNode(_, result) or
     this = TSsaCertainUpdate(_, result, _, _) or
     this = TSsaUncertainUpdate(_, result, _, _) or
@@ -928,14 +928,17 @@ class SsaVariable extends TSsaVariable {
     this = TSsaUntracked(_, result)
   }
 
+  /** DEPRECATED: Alias for getCfgNode */
+  deprecated ControlFlowNode getCFGNode() { result = getCfgNode() }
+
   /** Gets a textual representation of this SSA variable. */
   string toString() { none() }
 
   /** Gets the source location for this element. */
-  Location getLocation() { result = this.getCFGNode().getLocation() }
+  Location getLocation() { result = this.getCfgNode().getLocation() }
 
   /** Gets the `BasicBlock` in which this SSA variable is defined. */
-  BasicBlock getBasicBlock() { result = this.getCFGNode().getBasicBlock() }
+  BasicBlock getBasicBlock() { result = this.getCfgNode().getBasicBlock() }
 
   /** Gets an access of this SSA variable. */
   RValue getAUse() {
@@ -990,7 +993,7 @@ class SsaUpdate extends SsaVariable {
 class SsaExplicitUpdate extends SsaUpdate, TSsaCertainUpdate {
   SsaExplicitUpdate() {
     exists(VariableUpdate upd |
-      upd = this.getCFGNode() and getDestVar(upd) = this.getSourceVariable()
+      upd = this.getCfgNode() and getDestVar(upd) = this.getSourceVariable()
     )
   }
 
@@ -998,7 +1001,7 @@ class SsaExplicitUpdate extends SsaUpdate, TSsaCertainUpdate {
 
   /** Gets the `VariableUpdate` defining the SSA variable. */
   VariableUpdate getDefiningExpr() {
-    result = this.getCFGNode() and getDestVar(result) = this.getSourceVariable()
+    result = this.getCfgNode() and getDestVar(result) = this.getSourceVariable()
   }
 }
 
@@ -1018,10 +1021,10 @@ class SsaImplicitUpdate extends SsaUpdate {
   private string getKind() {
     this = TSsaUntracked(_, _) and result = "untracked"
     or
-    certainVariableUpdate(this.getSourceVariable().getQualifier(), this.getCFGNode(), _, _) and
+    certainVariableUpdate(this.getSourceVariable().getQualifier(), this.getCfgNode(), _, _) and
     result = "explicit qualifier"
     or
-    if uncertainVariableUpdate(this.getSourceVariable().getQualifier(), this.getCFGNode(), _, _)
+    if uncertainVariableUpdate(this.getSourceVariable().getQualifier(), this.getCfgNode(), _, _)
     then
       if exists(this.getANonLocalUpdate())
       then result = "nonlocal + nonlocal qualifier"
@@ -1038,7 +1041,7 @@ class SsaImplicitUpdate extends SsaUpdate {
     exists(SsaSourceField f, Callable setter |
       f = this.getSourceVariable() and
       relevantFieldUpdate(setter, f.getField(), result) and
-      updatesNamedField(this.getCFGNode(), f, setter)
+      updatesNamedField(this.getCfgNode(), f, setter)
     )
   }
 
@@ -1051,8 +1054,8 @@ class SsaImplicitUpdate extends SsaUpdate {
    */
   predicate assignsUnknownValue() {
     this = TSsaUntracked(_, _) or
-    certainVariableUpdate(this.getSourceVariable().getQualifier(), this.getCFGNode(), _, _) or
-    uncertainVariableUpdate(this.getSourceVariable().getQualifier(), this.getCFGNode(), _, _)
+    certainVariableUpdate(this.getSourceVariable().getQualifier(), this.getCfgNode(), _, _) or
+    uncertainVariableUpdate(this.getSourceVariable().getQualifier(), this.getCfgNode(), _, _)
   }
 }
 
@@ -1086,7 +1089,7 @@ class SsaImplicitInit extends SsaVariable, TSsaEntryDef {
    */
   predicate isParameterDefinition(Parameter p) {
     this.getSourceVariable() = TLocalVar(p.getCallable(), p) and
-    p.getCallable().getBody() = this.getCFGNode()
+    p.getCallable().getBody() = this.getCfgNode()
   }
 }
 
@@ -1098,7 +1101,7 @@ class SsaPhiNode extends SsaVariable, TSsaPhiNode {
   SsaVariable getAPhiInput() {
     exists(BasicBlock phiPred, TrackedVar v |
       v = this.getSourceVariable() and
-      this.getCFGNode().(BasicBlock).getABBPredecessor() = phiPred and
+      this.getCfgNode().(BasicBlock).getABBPredecessor() = phiPred and
       ssaDefReachesEndOfBlock(v, result, phiPred)
     )
   }
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/BaseSSA.qll b/java/ql/lib/semmle/code/java/dataflow/internal/BaseSSA.qll
index 218fe6ef287..e41928fd9e5 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/BaseSSA.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/BaseSSA.qll
@@ -476,18 +476,21 @@ class BaseSsaVariable extends TBaseSsaVariable {
   }
 
   /** Gets the `ControlFlowNode` at which this SSA variable is defined. */
-  ControlFlowNode getCFGNode() {
+  ControlFlowNode getCfgNode() {
     this = TSsaPhiNode(_, result) or
     this = TSsaUpdate(_, result, _, _) or
     this = TSsaEntryDef(_, result)
   }
 
+  /** DEPRECATED: Alias for getCfgNode */
+  deprecated ControlFlowNode getCFGNode() { result = getCfgNode() }
+
   string toString() { none() }
 
-  Location getLocation() { result = this.getCFGNode().getLocation() }
+  Location getLocation() { result = this.getCfgNode().getLocation() }
 
   /** Gets the `BasicBlock` in which this SSA variable is defined. */
-  BasicBlock getBasicBlock() { result = this.getCFGNode().getBasicBlock() }
+  BasicBlock getBasicBlock() { result = this.getCfgNode().getBasicBlock() }
 
   /** Gets an access of this SSA variable. */
   RValue getAUse() { ssaDefReachesUse(_, this, result) }
@@ -533,7 +536,7 @@ class BaseSsaVariable extends TBaseSsaVariable {
 class BaseSsaUpdate extends BaseSsaVariable, TSsaUpdate {
   BaseSsaUpdate() {
     exists(VariableUpdate upd |
-      upd = this.getCFGNode() and getDestVar(upd) = this.getSourceVariable()
+      upd = this.getCfgNode() and getDestVar(upd) = this.getSourceVariable()
     )
   }
 
@@ -541,7 +544,7 @@ class BaseSsaUpdate extends BaseSsaVariable, TSsaUpdate {
 
   /** Gets the `VariableUpdate` defining the SSA variable. */
   VariableUpdate getDefiningExpr() {
-    result = this.getCFGNode() and getDestVar(result) = this.getSourceVariable()
+    result = this.getCfgNode() and getDestVar(result) = this.getSourceVariable()
   }
 }
 
@@ -562,7 +565,7 @@ class BaseSsaImplicitInit extends BaseSsaVariable, TSsaEntryDef {
    */
   predicate isParameterDefinition(Parameter p) {
     this.getSourceVariable() = TLocalVar(p.getCallable(), p) and
-    p.getCallable().getBody() = this.getCFGNode()
+    p.getCallable().getBody() = this.getCfgNode()
   }
 }
 
@@ -574,7 +577,7 @@ class BaseSsaPhiNode extends BaseSsaVariable, TSsaPhiNode {
   BaseSsaVariable getAPhiInput() {
     exists(BasicBlock phiPred, BaseSsaSourceVariable v |
       v = this.getSourceVariable() and
-      this.getCFGNode().(BasicBlock).getABBPredecessor() = phiPred and
+      this.getCfgNode().(BasicBlock).getABBPredecessor() = phiPred and
       ssaDefReachesEndOfBlock(v, result, phiPred)
     )
   }
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImplSpecific.qll b/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImplSpecific.qll
index eb59ee5f06a..f4fbcf0045f 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImplSpecific.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImplSpecific.qll
@@ -196,7 +196,7 @@ predicate interpretInputSpecific(string c, InterpretNode mid, InterpretNode n) {
   exists(FieldWrite fw |
     c = "" and
     fw.getField() = mid.asElement() and
-    n.asNode().asExpr() = fw.getRHS()
+    n.asNode().asExpr() = fw.getRhs()
   )
 }
 
diff --git a/java/ql/lib/semmle/code/java/deadcode/EntryPoints.qll b/java/ql/lib/semmle/code/java/deadcode/EntryPoints.qll
index cbb29066102..027e2392252 100644
--- a/java/ql/lib/semmle/code/java/deadcode/EntryPoints.qll
+++ b/java/ql/lib/semmle/code/java/deadcode/EntryPoints.qll
@@ -427,8 +427,8 @@ class PersistenceCallbackMethod extends CallableEntryPoint {
  * A source class which is referred to by fully qualified name in the value of an arbitrary XML
  * attribute which has a name containing "className" or "ClassName".
  */
-class ArbitraryXMLEntryPoint extends ReflectivelyConstructedClass {
-  ArbitraryXMLEntryPoint() {
+class ArbitraryXmlEntryPoint extends ReflectivelyConstructedClass {
+  ArbitraryXmlEntryPoint() {
     this.fromSource() and
     exists(XMLAttribute attribute |
       attribute.getName() = "className" or
@@ -446,6 +446,9 @@ class ArbitraryXMLEntryPoint extends ReflectivelyConstructedClass {
   }
 }
 
+/** DEPRECATED: Alias for ArbitraryXmlEntryPoint */
+deprecated class ArbitraryXMLEntryPoint = ArbitraryXmlEntryPoint;
+
 /** A Selenium PageObject, created by a call to PageFactory.initElements(..). */
 class SeleniumPageObjectEntryPoint extends ReflectivelyConstructedClass {
   SeleniumPageObjectEntryPoint() { this instanceof SeleniumPageObject }
diff --git a/java/ql/lib/semmle/code/java/deadcode/SpringEntryPoints.qll b/java/ql/lib/semmle/code/java/deadcode/SpringEntryPoints.qll
index 4929ba2b7f2..562c7ef7c1c 100644
--- a/java/ql/lib/semmle/code/java/deadcode/SpringEntryPoints.qll
+++ b/java/ql/lib/semmle/code/java/deadcode/SpringEntryPoints.qll
@@ -13,7 +13,7 @@ class SpringInjectionCallableEntryPoint extends CallableEntryPoint {
     this instanceof SpringBeanReflectivelyConstructed or
     // A setter method specified in the context.
     this instanceof SpringBeanPropertySetterMethod or
-    exists(this.(SpringBeanXMLAutowiredSetterMethod).getInjectedBean()) or
+    exists(this.(SpringBeanXmlAutowiredSetterMethod).getInjectedBean()) or
     this instanceof SpringBeanAutowiredCallable
   }
 }
diff --git a/java/ql/lib/semmle/code/java/deadcode/WebEntryPoints.qll b/java/ql/lib/semmle/code/java/deadcode/WebEntryPoints.qll
index b061502fffe..836ad5a1f55 100644
--- a/java/ql/lib/semmle/code/java/deadcode/WebEntryPoints.qll
+++ b/java/ql/lib/semmle/code/java/deadcode/WebEntryPoints.qll
@@ -14,7 +14,7 @@ class ServletConstructedClass extends ReflectivelyConstructedClass {
     // referred to as a servlet-class in at least one. If no `web.xml` files are found, we assume
     // that XML extraction was not enabled, and therefore consider all `Servlet` classes as live.
     (
-      isWebXMLIncluded()
+      isWebXmlIncluded()
       implies
       exists(WebServletClass servletClass | this = servletClass.getClass())
     )
@@ -29,12 +29,12 @@ class ServletConstructedClass extends ReflectivelyConstructedClass {
  */
 class ServletListenerClass extends ReflectivelyConstructedClass {
   ServletListenerClass() {
-    this.getAnAncestor() instanceof ServletWebXMLListenerType and
+    this.getAnAncestor() instanceof ServletWebXmlListenerType and
     // If we have seen any `web.xml` files, this listener will be considered to be live only if it is
     // referred to as a listener-class in at least one. If no `web.xml` files are found, we assume
     // that XML extraction was not enabled, and therefore consider all listener classes as live.
     (
-      isWebXMLIncluded()
+      isWebXmlIncluded()
       implies
       exists(WebListenerClass listenerClass | this = listenerClass.getClass())
     )
@@ -51,7 +51,7 @@ class ServletFilterClass extends ReflectivelyConstructedClass {
     // If we have seen any `web.xml` files, this filter will be considered to be live only if it is
     // referred to as a filter-class in at least one. If no `web.xml` files are found, we assume
     // that XML extraction was not enabled, and therefore consider all filter classes as live.
-    (isWebXMLIncluded() implies exists(WebFilterClass filterClass | this = filterClass.getClass()))
+    (isWebXmlIncluded() implies exists(WebFilterClass filterClass | this = filterClass.getClass()))
   }
 }
 
diff --git a/java/ql/lib/semmle/code/java/frameworks/Camel.qll b/java/ql/lib/semmle/code/java/frameworks/Camel.qll
index 09bfa73d460..0d7161e5f8f 100644
--- a/java/ql/lib/semmle/code/java/frameworks/Camel.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/Camel.qll
@@ -12,7 +12,7 @@ import semmle.code.java.frameworks.camel.CamelJavaAnnotations
  */
 class CamelToURI extends string {
   CamelToURI() {
-    exists(SpringCamelXMLToElement toXMLElement | this = toXMLElement.getURI()) or
+    exists(SpringCamelXmlToElement toXmlElement | this = toXmlElement.getURI()) or
     exists(CamelJavaDSLToDecl toJavaDSL | this = toJavaDSL.getURI())
   }
 }
@@ -56,17 +56,17 @@ class CamelToBeanURI extends CamelToURI {
  */
 class CamelTargetClass extends Class {
   CamelTargetClass() {
-    exists(SpringCamelXMLBeanRef camelXMLBeanRef |
+    exists(SpringCamelXmlBeanRef camelXmlBeanRef |
       // A target may be defined by referencing an existing Spring Bean.
-      this = camelXMLBeanRef.getRefBean().getClass()
+      this = camelXmlBeanRef.getRefBean().getClass()
       or
       // A target may be defined by referencing a class, which Apache Camel will create into a bean.
-      this = camelXMLBeanRef.getBeanType()
+      this = camelXmlBeanRef.getBeanType()
     )
     or
     exists(CamelToBeanURI toBeanURI | this = toBeanURI.getRefBean().getClass())
     or
-    exists(SpringCamelXMLMethodElement xmlMethod |
+    exists(SpringCamelXmlMethodElement xmlMethod |
       this = xmlMethod.getRefBean().getClass() or
       this = xmlMethod.getBeanType()
     )
diff --git a/java/ql/lib/semmle/code/java/frameworks/Networking.qll b/java/ql/lib/semmle/code/java/frameworks/Networking.qll
index 1ab9c74e0ca..66a798f40d3 100644
--- a/java/ql/lib/semmle/code/java/frameworks/Networking.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/Networking.qll
@@ -4,7 +4,7 @@
 
 import semmle.code.java.Type
 
-/** The type `java.net.URLConnection`. */
+/** The type `java.net.UrlConnection`. */
 class TypeUrlConnection extends RefType {
   TypeUrlConnection() { this.hasQualifiedName("java.net", "URLConnection") }
 }
@@ -29,15 +29,18 @@ class TypeUri extends RefType {
   TypeUri() { this.hasQualifiedName("java.net", "URI") }
 }
 
-/** The method `java.net.URLConnection::getInputStream`. */
-class URLConnectionGetInputStreamMethod extends Method {
-  URLConnectionGetInputStreamMethod() {
+/** The method `java.net.UrlConnection::getInputStream`. */
+class UrlConnectionGetInputStreamMethod extends Method {
+  UrlConnectionGetInputStreamMethod() {
     this.getDeclaringType() instanceof TypeUrlConnection and
     this.hasName("getInputStream") and
     this.hasNoParameters()
   }
 }
 
+/** DEPRECATED: Alias for UrlConnectionGetInputStreamMethod */
+deprecated class URLConnectionGetInputStreamMethod = UrlConnectionGetInputStreamMethod;
+
 /** The method `java.net.Socket::getInputStream`. */
 class SocketGetInputStreamMethod extends Method {
   SocketGetInputStreamMethod() {
diff --git a/java/ql/lib/semmle/code/java/frameworks/Servlets.qll b/java/ql/lib/semmle/code/java/frameworks/Servlets.qll
index 81f334015bd..de82d49a7aa 100644
--- a/java/ql/lib/semmle/code/java/frameworks/Servlets.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/Servlets.qll
@@ -120,14 +120,17 @@ library class HttpServletRequestGetHeaderNamesMethod extends Method {
 /**
  * The method `getRequestURL()` declared in `javax.servlet.http.HttpServletRequest`.
  */
-class HttpServletRequestGetRequestURLMethod extends Method {
-  HttpServletRequestGetRequestURLMethod() {
+class HttpServletRequestGetRequestUrlMethod extends Method {
+  HttpServletRequestGetRequestUrlMethod() {
     this.getDeclaringType() instanceof HttpServletRequest and
     this.hasName("getRequestURL") and
     this.getNumberOfParameters() = 0
   }
 }
 
+/** DEPRECATED: Alias for HttpServletRequestGetRequestUrlMethod */
+deprecated class HttpServletRequestGetRequestURLMethod = HttpServletRequestGetRequestUrlMethod;
+
 /**
  * The method `getRequestURI()` declared in `javax.servlet.http.HttpServletRequest`.
  */
@@ -318,8 +321,8 @@ class ServletClass extends Class {
  * Note: There are a number of other listener interfaces in the `javax.servlet` package that cannot
  * be configured in `web.xml` and therefore are not covered by this class.
  */
-class ServletWebXMLListenerType extends RefType {
-  ServletWebXMLListenerType() {
+class ServletWebXmlListenerType extends RefType {
+  ServletWebXmlListenerType() {
     this.hasQualifiedName("javax.servlet", "ServletContextAttributeListener") or
     this.hasQualifiedName("javax.servlet", "ServletContextListener") or
     this.hasQualifiedName("javax.servlet", "ServletRequestAttributeListener") or
@@ -333,6 +336,9 @@ class ServletWebXMLListenerType extends RefType {
   }
 }
 
+/** DEPRECATED: Alias for ServletWebXmlListenerType */
+deprecated class ServletWebXMLListenerType = ServletWebXmlListenerType;
+
 /** Holds if `m` is a request handler method (for example `doGet` or `doPost`). */
 predicate isServletRequestMethod(Method m) {
   m.getDeclaringType() instanceof ServletClass and
diff --git a/java/ql/lib/semmle/code/java/frameworks/UnboundId.qll b/java/ql/lib/semmle/code/java/frameworks/UnboundId.qll
index 88156da0264..2bac6eb5ce2 100644
--- a/java/ql/lib/semmle/code/java/frameworks/UnboundId.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/UnboundId.qll
@@ -25,12 +25,15 @@ class TypeUnboundIdLdapFilter extends Class {
 }
 
 /** The class `com.unboundid.ldap.sdk.LDAPConnection`. */
-class TypeUnboundIdLDAPConnection extends Class {
-  TypeUnboundIdLDAPConnection() {
+class TypeUnboundIdLdapConnection extends Class {
+  TypeUnboundIdLdapConnection() {
     this.hasQualifiedName("com.unboundid.ldap.sdk", "LDAPConnection")
   }
 }
 
+/** DEPRECATED: Alias for TypeUnboundIdLdapConnection */
+deprecated class TypeUnboundIdLDAPConnection = TypeUnboundIdLdapConnection;
+
 /*--- Methods ---*/
 /** A method with the name `setBaseDN` declared in `com.unboundid.ldap.sdk.SearchRequest`. */
 class MethodUnboundIdSearchRequestSetBaseDN extends Method {
@@ -89,25 +92,36 @@ class MethodUnboundIdFilterSimplifyFilter extends Method {
 }
 
 /** A method with the name `search` declared in `com.unboundid.ldap.sdk.LDAPConnection`. */
-class MethodUnboundIdLDAPConnectionSearch extends Method {
-  MethodUnboundIdLDAPConnectionSearch() {
-    this.getDeclaringType() instanceof TypeUnboundIdLDAPConnection and
+class MethodUnboundIdLdapConnectionSearch extends Method {
+  MethodUnboundIdLdapConnectionSearch() {
+    this.getDeclaringType() instanceof TypeUnboundIdLdapConnection and
     this.hasName("search")
   }
 }
 
+/** DEPRECATED: Alias for MethodUnboundIdLdapConnectionSearch */
+deprecated class MethodUnboundIdLDAPConnectionSearch = MethodUnboundIdLdapConnectionSearch;
+
 /** A method with the name `asyncSearch` declared in `com.unboundid.ldap.sdk.LDAPConnection`. */
-class MethodUnboundIdLDAPConnectionAsyncSearch extends Method {
-  MethodUnboundIdLDAPConnectionAsyncSearch() {
-    this.getDeclaringType() instanceof TypeUnboundIdLDAPConnection and
+class MethodUnboundIdLdapConnectionAsyncSearch extends Method {
+  MethodUnboundIdLdapConnectionAsyncSearch() {
+    this.getDeclaringType() instanceof TypeUnboundIdLdapConnection and
     this.hasName("asyncSearch")
   }
 }
 
+/** DEPRECATED: Alias for MethodUnboundIdLdapConnectionAsyncSearch */
+deprecated class MethodUnboundIdLDAPConnectionAsyncSearch =
+  MethodUnboundIdLdapConnectionAsyncSearch;
+
 /** A method with the name `searchForEntry` declared in `com.unboundid.ldap.sdk.LDAPConnection`. */
-class MethodUnboundIdLDAPConnectionSearchForEntry extends Method {
-  MethodUnboundIdLDAPConnectionSearchForEntry() {
-    this.getDeclaringType() instanceof TypeUnboundIdLDAPConnection and
+class MethodUnboundIdLdapConnectionSearchForEntry extends Method {
+  MethodUnboundIdLdapConnectionSearchForEntry() {
+    this.getDeclaringType() instanceof TypeUnboundIdLdapConnection and
     this.hasName("searchForEntry")
   }
 }
+
+/** DEPRECATED: Alias for MethodUnboundIdLdapConnectionSearchForEntry */
+deprecated class MethodUnboundIdLDAPConnectionSearchForEntry =
+  MethodUnboundIdLdapConnectionSearchForEntry;
diff --git a/java/ql/lib/semmle/code/java/frameworks/gwt/GwtXml.qll b/java/ql/lib/semmle/code/java/frameworks/gwt/GwtXml.qll
index 3ac223be2d5..f3d5c58c0ce 100644
--- a/java/ql/lib/semmle/code/java/frameworks/gwt/GwtXml.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/gwt/GwtXml.qll
@@ -5,7 +5,7 @@ import semmle.code.xml.XML
 /**
  * Holds if any `*.gwt.xml` files are included in this snapshot.
  */
-predicate isGwtXmlIncluded() { exists(GwtXmlFile webXML) }
+predicate isGwtXmlIncluded() { exists(GwtXmlFile webXml) }
 
 /** A GWT module XML file with a `.gwt.xml` suffix. */
 class GwtXmlFile extends XMLFile {
diff --git a/java/ql/lib/semmle/code/java/frameworks/jOOQ.qll b/java/ql/lib/semmle/code/java/frameworks/jOOQ.qll
index 8a6ee13ec57..0e74408bca1 100644
--- a/java/ql/lib/semmle/code/java/frameworks/jOOQ.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/jOOQ.qll
@@ -10,8 +10,8 @@ import semmle.code.java.dataflow.ExternalFlow
  * and is prone to SQL injection.
  * https://www.jooq.org/doc/current/manual/sql-building/plain-sql/
  */
-private class PlainSQLType extends Annotation {
-  PlainSQLType() { this.getType().hasQualifiedName("org.jooq", "PlainSQL") }
+private class PlainSqlType extends Annotation {
+  PlainSqlType() { this.getType().hasQualifiedName("org.jooq", "PlainSQL") }
 }
 
 /**
@@ -19,7 +19,7 @@ private class PlainSQLType extends Annotation {
  * first argument.
  */
 predicate jOOQSqlMethod(Method m) {
-  m.getAnAnnotation() instanceof PlainSQLType and
+  m.getAnAnnotation() instanceof PlainSqlType and
   m.getParameterType(0) instanceof TypeString
 }
 
diff --git a/java/ql/lib/semmle/code/java/frameworks/jackson/JacksonSerializability.qll b/java/ql/lib/semmle/code/java/frameworks/jackson/JacksonSerializability.qll
index bf87e7fbc57..1fb2e377841 100644
--- a/java/ql/lib/semmle/code/java/frameworks/jackson/JacksonSerializability.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/jackson/JacksonSerializability.qll
@@ -14,14 +14,17 @@ private import semmle.code.java.dataflow.ExternalFlow
 /**
  * A `@com.fasterxml.jackson.annotation.JsonIgnore` annoation.
  */
-class JacksonJSONIgnoreAnnotation extends NonReflectiveAnnotation {
-  JacksonJSONIgnoreAnnotation() {
+class JacksonJsonIgnoreAnnotation extends NonReflectiveAnnotation {
+  JacksonJsonIgnoreAnnotation() {
     exists(AnnotationType anntp | anntp = this.getType() |
       anntp.hasQualifiedName("com.fasterxml.jackson.annotation", "JsonIgnore")
     )
   }
 }
 
+/** DEPRECATED: Alias for JacksonJsonIgnoreAnnotation */
+deprecated class JacksonJSONIgnoreAnnotation = JacksonJsonIgnoreAnnotation;
+
 /** A type whose values may be serialized using the Jackson JSON framework. */
 abstract class JacksonSerializableType extends Type { }
 
@@ -143,7 +146,7 @@ class JacksonSerializableField extends SerializableField {
       not superType instanceof TypeObject and
       superType.fromSource()
     ) and
-    not this.getAnAnnotation() instanceof JacksonJSONIgnoreAnnotation
+    not this.getAnAnnotation() instanceof JacksonJsonIgnoreAnnotation
   }
 }
 
@@ -155,7 +158,7 @@ class JacksonDeserializableField extends DeserializableField {
       not superType instanceof TypeObject and
       superType.fromSource()
     ) and
-    not this.getAnAnnotation() instanceof JacksonJSONIgnoreAnnotation
+    not this.getAnAnnotation() instanceof JacksonJsonIgnoreAnnotation
   }
 }
 
diff --git a/java/ql/lib/semmle/code/java/frameworks/javaee/JavaServerFaces.qll b/java/ql/lib/semmle/code/java/frameworks/javaee/JavaServerFaces.qll
index 1d6c08c4862..326bfe34381 100644
--- a/java/ql/lib/semmle/code/java/frameworks/javaee/JavaServerFaces.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/javaee/JavaServerFaces.qll
@@ -67,8 +67,8 @@ class FacesComponent extends Class {
       )
       or
       // Or in an XML file
-      exists(FacesConfigComponentClass componentClassXML |
-        this = componentClassXML.getFacesComponentClass()
+      exists(FacesConfigComponentClass componentClassXml |
+        this = componentClassXml.getFacesComponentClass()
       )
     )
   }
diff --git a/java/ql/lib/semmle/code/java/frameworks/javaee/PersistenceXML.qll b/java/ql/lib/semmle/code/java/frameworks/javaee/PersistenceXML.qll
index 82fc32baca2..077c2baf862 100644
--- a/java/ql/lib/semmle/code/java/frameworks/javaee/PersistenceXML.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/javaee/PersistenceXML.qll
@@ -8,8 +8,8 @@ import java
 /**
  * A JavaEE persistence configuration XML file (persistence.xml).
  */
-class PersistenceXMLFile extends XMLFile {
-  PersistenceXMLFile() { this.getStem() = "persistence" }
+class PersistenceXmlFile extends XMLFile {
+  PersistenceXmlFile() { this.getStem() = "persistence" }
 
   /** Gets the root XML element in this `persistence.xml` file. */
   PersistenceXmlRoot getRoot() { result = this.getAChild() }
@@ -26,10 +26,13 @@ class PersistenceXMLFile extends XMLFile {
   }
 }
 
+/** DEPRECATED: Alias for PersistenceXmlFile */
+deprecated class PersistenceXMLFile = PersistenceXmlFile;
+
 /** The root `persistence` XML element in a `persistence.xml` file. */
 class PersistenceXmlRoot extends XMLElement {
   PersistenceXmlRoot() {
-    this.getParent() instanceof PersistenceXMLFile and
+    this.getParent() instanceof PersistenceXmlFile and
     this.getName() = "persistence"
   }
 
diff --git a/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJB.qll b/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJB.qll
index 58968c753ac..5a65891020a 100644
--- a/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJB.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJB.qll
@@ -22,7 +22,7 @@ class SessionEJB extends EJB {
     this.getAnAnnotation().getType().hasName("Stateless") or
     this.getAnAnnotation().getType().hasName("Stateful") or
     // XML deployment descriptor.
-    exists(EjbJarXMLFile f |
+    exists(EjbJarXmlFile f |
       this.getQualifiedName() =
         f.getASessionElement().getAnEjbClassElement().getACharactersSet().getCharacters()
     )
@@ -121,7 +121,7 @@ class StatefulSessionEJB extends SessionEJB {
     this.getAnAnnotation().getType().hasName("Stateful")
     or
     // XML deployment descriptor.
-    exists(EjbJarXMLFile f, EjbJarSessionElement se |
+    exists(EjbJarXmlFile f, EjbJarSessionElement se |
       se = f.getASessionElement() and
       this.getQualifiedName() = se.getAnEjbClassElement().getACharactersSet().getCharacters() and
       se.getASessionTypeElement().isStateful()
@@ -138,7 +138,7 @@ class StatelessSessionEJB extends SessionEJB {
     this.getAnAnnotation().getType().hasName("Stateless")
     or
     // XML deployment descriptor.
-    exists(EjbJarXMLFile f, EjbJarSessionElement se |
+    exists(EjbJarXmlFile f, EjbJarSessionElement se |
       se = f.getASessionElement() and
       this.getQualifiedName() = se.getAnEjbClassElement().getACharactersSet().getCharacters() and
       se.getASessionTypeElement().isStateless()
@@ -158,7 +158,7 @@ class MessageDrivenBean extends EJB {
     this.getAnAnnotation().getType().hasName("MessageDriven")
     or
     // XML deployment descriptor.
-    exists(EjbJarXMLFile f |
+    exists(EjbJarXmlFile f |
       this.getQualifiedName() =
         f.getAMessageDrivenElement().getAnEjbClassElement().getACharactersSet().getCharacters()
     )
@@ -174,7 +174,7 @@ class EntityEJB extends EJB {
     this instanceof EntityBean
     or
     // XML deployment descriptor.
-    exists(EjbJarXMLFile f |
+    exists(EjbJarXmlFile f |
       this.getQualifiedName() =
         f.getAnEntityElement().getAnEjbClassElement().getACharactersSet().getCharacters()
     )
@@ -245,14 +245,14 @@ abstract class BusinessInterface extends Interface {
  */
 class XmlSpecifiedBusinessInterface extends BusinessInterface {
   XmlSpecifiedBusinessInterface() {
-    exists(EjbJarXMLFile f |
+    exists(EjbJarXmlFile f |
       this.getQualifiedName() =
         f.getASessionElement().getABusinessElement().getACharactersSet().getCharacters()
     )
   }
 
   override SessionEJB getAnEJB() {
-    exists(EjbJarXMLFile f, EjbJarSessionElement se |
+    exists(EjbJarXmlFile f, EjbJarSessionElement se |
       se = f.getASessionElement() and
       this.getQualifiedName() = se.getABusinessElement().getACharactersSet().getCharacters() and
       result.getQualifiedName() = se.getAnEjbClassElement().getACharactersSet().getCharacters()
@@ -260,14 +260,14 @@ class XmlSpecifiedBusinessInterface extends BusinessInterface {
   }
 
   override predicate isDeclaredLocal() {
-    exists(EjbJarXMLFile f |
+    exists(EjbJarXmlFile f |
       this.getQualifiedName() =
         f.getASessionElement().getABusinessLocalElement().getACharactersSet().getCharacters()
     )
   }
 
   override predicate isDeclaredRemote() {
-    exists(EjbJarXMLFile f |
+    exists(EjbJarXmlFile f |
       this.getQualifiedName() =
         f.getASessionElement().getABusinessRemoteElement().getACharactersSet().getCharacters()
     )
@@ -411,7 +411,7 @@ class ExtendedRemoteInterface extends LegacyEjbRemoteInterface, RemoteEJBInterfa
 /** A legacy remote interface specified within an XML deployment descriptor. */
 class XmlSpecifiedRemoteInterface extends LegacyEjbRemoteInterface {
   XmlSpecifiedRemoteInterface() {
-    exists(EjbJarXMLFile f |
+    exists(EjbJarXmlFile f |
       this.getQualifiedName() =
         f.getASessionElement().getARemoteElement().getACharactersSet().getCharacters()
     )
@@ -422,7 +422,7 @@ class XmlSpecifiedRemoteInterface extends LegacyEjbRemoteInterface {
    * for this legacy EJB remote interface.
    */
   SessionEJB getAnEJB() {
-    exists(EjbJarXMLFile f, EjbJarSessionElement se |
+    exists(EjbJarXmlFile f, EjbJarSessionElement se |
       se = f.getASessionElement() and
       this.getQualifiedName() = se.getARemoteElement().getACharactersSet().getCharacters() and
       result.getQualifiedName() = se.getAnEjbClassElement().getACharactersSet().getCharacters()
@@ -453,7 +453,7 @@ class AnnotatedRemoteHomeInterface extends LegacyEjbRemoteHomeInterface {
 /** A legacy remote home interface specified within an XML deployment descriptor. */
 class XmlSpecifiedRemoteHomeInterface extends LegacyEjbRemoteHomeInterface {
   XmlSpecifiedRemoteHomeInterface() {
-    exists(EjbJarXMLFile f |
+    exists(EjbJarXmlFile f |
       this.getQualifiedName() =
         f.getASessionElement().getARemoteHomeElement().getACharactersSet().getCharacters()
     )
@@ -461,7 +461,7 @@ class XmlSpecifiedRemoteHomeInterface extends LegacyEjbRemoteHomeInterface {
 
   /** Gets an EJB to which this interface belongs. */
   SessionEJB getAnEJB() {
-    exists(EjbJarXMLFile f, EjbJarSessionElement se |
+    exists(EjbJarXmlFile f, EjbJarSessionElement se |
       se = f.getASessionElement() and
       this.getQualifiedName() = se.getARemoteHomeElement().getACharactersSet().getCharacters() and
       result.getQualifiedName() = se.getAnEjbClassElement().getACharactersSet().getCharacters()
@@ -478,7 +478,7 @@ class ExtendedLocalInterface extends LegacyEjbLocalInterface, LocalEJBInterface
 /** A legacy local interface specified within an XML deployment descriptor. */
 class XmlSpecifiedLocalInterface extends LegacyEjbLocalInterface {
   XmlSpecifiedLocalInterface() {
-    exists(EjbJarXMLFile f |
+    exists(EjbJarXmlFile f |
       this.getQualifiedName() =
         f.getASessionElement().getALocalElement().getACharactersSet().getCharacters()
     )
@@ -486,7 +486,7 @@ class XmlSpecifiedLocalInterface extends LegacyEjbLocalInterface {
 
   /** Gets an EJB to which this interface belongs. */
   SessionEJB getAnEJB() {
-    exists(EjbJarXMLFile f, EjbJarSessionElement se |
+    exists(EjbJarXmlFile f, EjbJarSessionElement se |
       se = f.getASessionElement() and
       this.getQualifiedName() = se.getALocalElement().getACharactersSet().getCharacters() and
       result.getQualifiedName() = se.getAnEjbClassElement().getACharactersSet().getCharacters()
@@ -517,7 +517,7 @@ class AnnotatedLocalHomeInterface extends LegacyEjbLocalHomeInterface {
 /** A legacy local home interface specified within an XML deployment descriptor. */
 class XmlSpecifiedLocalHomeInterface extends LegacyEjbLocalHomeInterface {
   XmlSpecifiedLocalHomeInterface() {
-    exists(EjbJarXMLFile f |
+    exists(EjbJarXmlFile f |
       this.getQualifiedName() =
         f.getASessionElement().getALocalHomeElement().getACharactersSet().getCharacters()
     )
@@ -525,7 +525,7 @@ class XmlSpecifiedLocalHomeInterface extends LegacyEjbLocalHomeInterface {
 
   /** Gets an EJB to which this interface belongs. */
   SessionEJB getAnEJB() {
-    exists(EjbJarXMLFile f, EjbJarSessionElement se |
+    exists(EjbJarXmlFile f, EjbJarSessionElement se |
       se = f.getASessionElement() and
       this.getQualifiedName() = se.getALocalHomeElement().getACharactersSet().getCharacters() and
       result.getQualifiedName() = se.getAnEjbClassElement().getACharactersSet().getCharacters()
diff --git a/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJBJarXML.qll b/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJBJarXML.qll
index db89836ff9d..4122869ecdb 100644
--- a/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJBJarXML.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJBJarXML.qll
@@ -8,8 +8,8 @@ import java
 /**
  * An EJB deployment descriptor XML file named `ejb-jar.xml`.
  */
-class EjbJarXMLFile extends XMLFile {
-  EjbJarXMLFile() { this.getStem() = "ejb-jar" }
+class EjbJarXmlFile extends XMLFile {
+  EjbJarXmlFile() { this.getStem() = "ejb-jar" }
 
   /** Gets the root `ejb-jar` XML element of this `ejb-jar.xml` file. */
   EjbJarRootElement getRoot() { result = this.getAChild() }
@@ -35,10 +35,13 @@ class EjbJarXMLFile extends XMLFile {
   }
 }
 
+/** DEPRECATED: Alias for EjbJarXmlFile */
+deprecated class EjbJarXMLFile = EjbJarXmlFile;
+
 /** The root `ejb-jar` XML element in an `ejb-jar.xml` file. */
 class EjbJarRootElement extends XMLElement {
   EjbJarRootElement() {
-    this.getParent() instanceof EjbJarXMLFile and
+    this.getParent() instanceof EjbJarXmlFile and
     this.getName() = "ejb-jar"
   }
 
diff --git a/java/ql/lib/semmle/code/java/frameworks/javaee/jsf/JSFFacesContextXML.qll b/java/ql/lib/semmle/code/java/frameworks/javaee/jsf/JSFFacesContextXML.qll
index 2d6721298a9..657df736c4c 100644
--- a/java/ql/lib/semmle/code/java/frameworks/javaee/jsf/JSFFacesContextXML.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/javaee/jsf/JSFFacesContextXML.qll
@@ -8,19 +8,22 @@ import default
  * A JSF "application configuration resources file", typically called `faces-config.xml`, which
  * contains the configuration for a JSF application
  */
-class FacesConfigXMLFile extends XMLFile {
-  FacesConfigXMLFile() {
+class FacesConfigXmlFile extends XMLFile {
+  FacesConfigXmlFile() {
     // Contains a single top-level XML node named "faces-Config".
     count(XMLElement e | e = this.getAChild()) = 1 and
     this.getAChild().getName() = "faces-config"
   }
 }
 
+/** DEPRECATED: Alias for FacesConfigXmlFile */
+deprecated class FacesConfigXMLFile = FacesConfigXmlFile;
+
 /**
  * An XML element in a `FacesConfigXMLFile`.
  */
-class FacesConfigXMLElement extends XMLElement {
-  FacesConfigXMLElement() { this.getFile() instanceof FacesConfigXMLFile }
+class FacesConfigXmlElement extends XMLElement {
+  FacesConfigXmlElement() { this.getFile() instanceof FacesConfigXmlFile }
 
   /**
    * Gets the value for this element, with leading and trailing whitespace trimmed.
@@ -28,17 +31,20 @@ class FacesConfigXMLElement extends XMLElement {
   string getValue() { result = this.allCharactersString().trim() }
 }
 
+/** DEPRECATED: Alias for FacesConfigXmlElement */
+deprecated class FacesConfigXMLElement = FacesConfigXmlElement;
+
 /**
  * An element in a JSF config file that declares a managed bean.
  */
-class FacesConfigManagedBean extends FacesConfigXMLElement {
+class FacesConfigManagedBean extends FacesConfigXmlElement {
   FacesConfigManagedBean() { this.getName() = "managed-bean" }
 }
 
 /**
  * An element in a JSF config file that declares the Class of a managed bean.
  */
-class FacesConfigManagedBeanClass extends FacesConfigXMLElement {
+class FacesConfigManagedBeanClass extends FacesConfigXmlElement {
   FacesConfigManagedBeanClass() {
     this.getName() = "managed-bean-class" and
     this.getParent() instanceof FacesConfigManagedBean
@@ -53,14 +59,14 @@ class FacesConfigManagedBeanClass extends FacesConfigXMLElement {
 /**
  * An element in a JSF config file that declares a custom component.
  */
-class FacesConfigComponent extends FacesConfigXMLElement {
+class FacesConfigComponent extends FacesConfigXmlElement {
   FacesConfigComponent() { this.getName() = "component" }
 }
 
 /**
  * An element in a JSF config file that declares the Class of a faces component.
  */
-class FacesConfigComponentClass extends FacesConfigXMLElement {
+class FacesConfigComponentClass extends FacesConfigXmlElement {
   FacesConfigComponentClass() {
     this.getName() = "component-class" and
     this.getParent() instanceof FacesConfigComponent
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringAbstractRef.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringAbstractRef.qll
index 685c22779f3..4dd4b0ab947 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringAbstractRef.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringAbstractRef.qll
@@ -3,7 +3,7 @@ import semmle.code.java.frameworks.spring.SpringXMLElement
 import semmle.code.java.frameworks.spring.SpringBean
 
 /** A common supertype of `SpringRef` and `SpringIdRef`. */
-class SpringAbstractRef extends SpringXMLElement {
+class SpringAbstractRef extends SpringXmlElement {
   SpringAbstractRef() {
     this.getName() = "idref" or
     this.getName() = "ref"
@@ -29,7 +29,7 @@ class SpringAbstractRef extends SpringXMLElement {
   }
 
   /** Holds if `other` is also a reference and points to the same bean as this reference. */
-  override predicate isSimilar(SpringXMLElement other) {
+  override predicate isSimilar(SpringXmlElement other) {
     exists(SpringAbstractRef otherRef |
       otherRef = other and
       this.getBean() = otherRef.getBean()
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringAlias.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringAlias.qll
index a3aa0fd38ac..cbc4f025dac 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringAlias.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringAlias.qll
@@ -3,7 +3,7 @@ import semmle.code.java.frameworks.spring.SpringXMLElement
 import semmle.code.java.frameworks.spring.SpringBean
 
 /** An `<alias>` element in Spring XML files. */
-class SpringAlias extends SpringXMLElement {
+class SpringAlias extends SpringXmlElement {
   SpringAlias() { this.getName() = "alias" }
 
   /** Gets the value of the `alias` attribute. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringArgType.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringArgType.qll
index 285c34d48e4..bddf5f01f9e 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringArgType.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringArgType.qll
@@ -2,7 +2,7 @@ import java
 import semmle.code.java.frameworks.spring.SpringXMLElement
 
 /** An `<arg-type>` element in Spring XML files. */
-class SpringArgType extends SpringXMLElement {
+class SpringArgType extends SpringXmlElement {
   SpringArgType() { this.getName() = "arg-type" }
 
   /** Gets the value of the `match` attribute. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringAttribute.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringAttribute.qll
index 1f2f2a13e68..a20eef4d0d7 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringAttribute.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringAttribute.qll
@@ -2,7 +2,7 @@ import java
 import semmle.code.java.frameworks.spring.SpringXMLElement
 
 /** An `<attribute>` element in Spring XML files. */
-class SpringAttribute extends SpringXMLElement {
+class SpringAttribute extends SpringXmlElement {
   SpringAttribute() { this.getName() = "attribute" }
 
   /** Gets the value of the `key` attribute. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringAutowire.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringAutowire.qll
index f387b40a547..b99dafecc65 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringAutowire.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringAutowire.qll
@@ -58,8 +58,8 @@ class SpringBeanPropertySetterMethod extends Method {
  *
  * Confusingly, this is a different form of autowiring to the `@Autowired` annotation.
  */
-class SpringBeanXMLAutowiredSetterMethod extends Method {
-  SpringBeanXMLAutowiredSetterMethod() {
+class SpringBeanXmlAutowiredSetterMethod extends Method {
+  SpringBeanXmlAutowiredSetterMethod() {
     // The bean as marked with some form of autowiring in the XML file.
     exists(string xmlAutowire |
       xmlAutowire = this.getDeclaringType().(SpringBeanRefType).getSpringBean().getAutowire()
@@ -100,6 +100,9 @@ class SpringBeanXMLAutowiredSetterMethod extends Method {
   }
 }
 
+/** DEPRECATED: Alias for SpringBeanXmlAutowiredSetterMethod */
+deprecated class SpringBeanXMLAutowiredSetterMethod = SpringBeanXmlAutowiredSetterMethod;
+
 /**
  * A callable that is annotated with `@Autowired`.
  *
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringBean.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringBean.qll
index 17a19c9a228..6b7636203e1 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringBean.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringBean.qll
@@ -12,7 +12,7 @@ import semmle.code.java.frameworks.spring.SpringReplacedMethod
  */
 
 /** A `<bean>` element in a Spring XML file. */
-class SpringBean extends SpringXMLElement {
+class SpringBean extends SpringXmlElement {
   SpringBean() {
     this.getName() = "bean" and
     // Do not capture Camel beans, which are different
@@ -268,7 +268,7 @@ class SpringBean extends SpringXMLElement {
   /**
    * Holds if this bean element has the same bean identifier as `other`.
    */
-  override predicate isSimilar(SpringXMLElement other) {
+  override predicate isSimilar(SpringXmlElement other) {
     this.getBeanIdentifier() = other.(SpringBean).getBeanIdentifier()
   }
 
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringCamel.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringCamel.qll
index 3cbbf6acf11..656837e6d5e 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringCamel.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringCamel.qll
@@ -9,56 +9,71 @@ import semmle.code.java.frameworks.spring.SpringBean
 /**
  * An Apache Camel element in a Spring Beans file.
  */
-class SpringCamelXMLElement extends SpringXMLElement {
-  SpringCamelXMLElement() { getNamespace().getURI() = "http://camel.apache.org/schema/spring" }
+class SpringCamelXmlElement extends SpringXmlElement {
+  SpringCamelXmlElement() { getNamespace().getURI() = "http://camel.apache.org/schema/spring" }
 }
 
+/** DEPRECATED: Alias for SpringCamelXmlElement */
+deprecated class SpringCamelXMLElement = SpringCamelXmlElement;
+
 /**
  * An element in a Spring beans file that defines an Apache Camel context.
  *
  * All Apache Camel Spring elements are nested within a `<camelContext>` or a `<routeContext>`.
  */
-class SpringCamelXMLContext extends SpringCamelXMLElement {
-  SpringCamelXMLContext() { getName() = "camelContext" }
+class SpringCamelXmlContext extends SpringCamelXmlElement {
+  SpringCamelXmlContext() { getName() = "camelContext" }
 }
 
+/** DEPRECATED: Alias for SpringCamelXmlContext */
+deprecated class SpringCamelXMLContext = SpringCamelXmlContext;
+
 /**
  * An element in a Spring beans file that defines an Apache Camel route context.
  *
  * A `<routeContext>` is a fragment, containing route definitions, that can be included within a
  * `<camelContext>`.
  */
-class SpringCamelXMLRouteContext extends SpringCamelXMLElement {
-  SpringCamelXMLRouteContext() { getName() = "routeContext" }
+class SpringCamelXmlRouteContext extends SpringCamelXmlElement {
+  SpringCamelXmlRouteContext() { getName() = "routeContext" }
 }
 
+/** DEPRECATED: Alias for SpringCamelXmlRouteContext */
+deprecated class SpringCamelXMLRouteContext = SpringCamelXmlRouteContext;
+
 /**
  * An element in a Spring beans files that defines an Apache Camel route.
  *
  * A Camel `<route>` element defines how messages that match certain criteria are handled by Apache
  * Camel.
  */
-class SpringCamelXMLRoute extends SpringCamelXMLElement {
-  SpringCamelXMLRoute() {
+class SpringCamelXmlRoute extends SpringCamelXmlElement {
+  SpringCamelXmlRoute() {
     // A route must either be in a `<routeContext>` or a `<camelContext>`.
     (
-      getParent() instanceof SpringCamelXMLRouteContext or
-      getParent() instanceof SpringCamelXMLContext
+      getParent() instanceof SpringCamelXmlRouteContext or
+      getParent() instanceof SpringCamelXmlContext
     ) and
     getName() = "route"
   }
 }
 
+/** DEPRECATED: Alias for SpringCamelXmlRoute */
+deprecated class SpringCamelXMLRoute = SpringCamelXmlRoute;
+
 /**
  * An element in a Spring bean file that is logically contained in an Apache Camel route.
  */
-class SpringCamelXMLRouteElement extends SpringCamelXMLElement {
-  SpringCamelXMLRouteElement() {
-    getParent() instanceof SpringCamelXMLRoute or
-    getParent() instanceof SpringCamelXMLRouteElement
+class SpringCamelXmlRouteElement extends SpringCamelXmlElement {
+  SpringCamelXmlRouteElement() {
+    getParent() instanceof SpringCamelXmlRoute or
+    getParent() instanceof SpringCamelXmlRouteElement
   }
 }
 
+/** DEPRECATED: Alias for SpringCamelXmlRouteElement */
+deprecated class SpringCamelXMLRouteElement = SpringCamelXmlRouteElement;
+
 /**
  * A reference to a Spring bean in an Apache Camel route defined in a Spring beans file.
  *
@@ -66,8 +81,8 @@ class SpringCamelXMLRouteElement extends SpringCamelXMLElement {
  * specifies a Spring bean that should be called in response to messages that match the enclosing
  * route.
  */
-class SpringCamelXMLBeanRef extends SpringCamelXMLRouteElement {
-  SpringCamelXMLBeanRef() { getName() = "bean" }
+class SpringCamelXmlBeanRef extends SpringCamelXmlRouteElement {
+  SpringCamelXmlBeanRef() { getName() = "bean" }
 
   /**
    * Gets the Spring bean that is referenced by this route bean definition, if any.
@@ -83,6 +98,9 @@ class SpringCamelXMLBeanRef extends SpringCamelXMLRouteElement {
   RefType getBeanType() { result.getQualifiedName() = getAttribute("beanType").getValue() }
 }
 
+/** DEPRECATED: Alias for SpringCamelXmlBeanRef */
+deprecated class SpringCamelXMLBeanRef = SpringCamelXmlBeanRef;
+
 /**
  * A declaration of a target in an Apache Camel route defined in a Spring beans file.
  *
@@ -90,8 +108,8 @@ class SpringCamelXMLBeanRef extends SpringCamelXMLRouteElement {
  * determines the type of the target. For example, if the scheme is "bean:" then the rest of the uri
  * consists of a bean name and optional method name.
  */
-class SpringCamelXMLToElement extends SpringCamelXMLRouteElement {
-  SpringCamelXMLToElement() { getName() = "to" }
+class SpringCamelXmlToElement extends SpringCamelXmlRouteElement {
+  SpringCamelXmlToElement() { getName() = "to" }
 
   /**
    * Gets the URI attribute for this `<to>` element.
@@ -99,6 +117,9 @@ class SpringCamelXMLToElement extends SpringCamelXMLRouteElement {
   string getURI() { result = getAttribute("uri").getValue() }
 }
 
+/** DEPRECATED: Alias for SpringCamelXmlToElement */
+deprecated class SpringCamelXMLToElement = SpringCamelXmlToElement;
+
 /**
  * A declaration of a Apache Camel "method" expression defined in a Spring beans file.
  *
@@ -107,8 +128,8 @@ class SpringCamelXMLToElement extends SpringCamelXMLRouteElement {
  * (when the "ref" or "bean" attributes are used), or a type that should be instantiated as a bean
  * (if "beanType" is used.
  */
-class SpringCamelXMLMethodElement extends SpringCamelXMLElement {
-  SpringCamelXMLMethodElement() { getName() = "method" }
+class SpringCamelXmlMethodElement extends SpringCamelXmlElement {
+  SpringCamelXmlMethodElement() { getName() = "method" }
 
   /**
    * Gets the `SpringBean` that this method expression refers to.
@@ -123,3 +144,6 @@ class SpringCamelXMLMethodElement extends SpringCamelXMLElement {
    */
   RefType getBeanType() { result.getQualifiedName() = getAttribute("beanType").getValue() }
 }
+
+/** DEPRECATED: Alias for SpringCamelXmlMethodElement */
+deprecated class SpringCamelXMLMethodElement = SpringCamelXmlMethodElement;
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringComponentScan.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringComponentScan.qll
index b2b507414d1..1c037adefd6 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringComponentScan.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringComponentScan.qll
@@ -8,8 +8,8 @@ import semmle.code.xml.WebXML
  * An element in a Spring configuration file that configures which packages are considered to be
  * "base" packages when performing the Spring component scan.
  */
-class SpringXMLComponentScan extends SpringXMLElement {
-  SpringXMLComponentScan() {
+class SpringXmlComponentScan extends SpringXmlElement {
+  SpringXmlComponentScan() {
     this.getName() = "component-scan" and
     this.getNamespace().getPrefix() = "context"
   }
@@ -23,6 +23,9 @@ class SpringXMLComponentScan extends SpringXMLElement {
   string getAProfileExpr() { result = this.getSpringBeanFile().getAProfileExpr() }
 }
 
+/** DEPRECATED: Alias for SpringXmlComponentScan */
+deprecated class SpringXMLComponentScan = SpringXmlComponentScan;
+
 /**
  * An annotation of a class that configures which packages are considered to be "base" packages
  * when performing the Spring component scan.
@@ -59,11 +62,11 @@ class SpringBasePackage extends string {
     exists(string basePackages |
       // Interpret the contexts of the `web.xml` "contextConfigLocation" parameter as a base package,
       // but only if the appropriate context class is chosen.
-      exists(WebXMLFile webXML |
-        webXML.getContextParamValue("contextClass") =
+      exists(WebXmlFile webXml |
+        webXml.getContextParamValue("contextClass") =
           "org.springframework.web.context.support.AnnotationConfigWebApplicationContext"
       |
-        basePackages = webXML.getContextParamValue("contextConfigLocation")
+        basePackages = webXml.getContextParamValue("contextConfigLocation")
       )
       or
       exists(SpringComponent c, Annotation componentScan |
@@ -75,7 +78,7 @@ class SpringBasePackage extends string {
         c.isLive()
       )
       or
-      exists(SpringXMLComponentScan xmlComponentScan |
+      exists(SpringXmlComponentScan xmlComponentScan |
         basePackages = xmlComponentScan.getBasePackages() and
         // The component scan profile must be active, if one is specified.
         (
@@ -110,7 +113,7 @@ class SpringComponentAnnotation extends AnnotationType {
  * In order for Spring XML to be "enabled", XML must have been indexed into the snapshot, and that
  * XML must contain the appropriate Spring configuration files.
  */
-private predicate isSpringXMLEnabled() { exists(SpringXMLElement springXMLElement) }
+private predicate isSpringXmlEnabled() { exists(SpringXmlElement springXmlElement) }
 
 /**
  * A Spring component class, identified by the presence of a particular annotation.
@@ -178,7 +181,7 @@ class SpringComponent extends RefType {
     // only validate whether this class is ever picked up if XML indexing is enabled. If it's
     // enabled, then the package of this class must belong in one of the packages defined as a base
     // package.
-    not isSpringXMLEnabled()
+    not isSpringXmlEnabled()
     or
     exists(SpringBasePackage sbp |
       this.getPackage().getName().prefix(sbp.length() + 1) = sbp + "." or
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringConstructorArg.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringConstructorArg.qll
index d9762d792f9..e434e53ca3d 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringConstructorArg.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringConstructorArg.qll
@@ -5,7 +5,7 @@ import semmle.code.java.frameworks.spring.SpringAbstractRef
 import semmle.code.java.frameworks.spring.SpringValue
 
 /** A `<constructor-arg>` element in a Spring XML file. */
-class SpringConstructorArg extends SpringXMLElement {
+class SpringConstructorArg extends SpringXmlElement {
   SpringConstructorArg() { this.getName() = "constructor-arg" }
 
   /** Holds if this `constructor-arg` element has an `index` attribute. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringDescription.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringDescription.qll
index a6a803a6275..34cf13a9571 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringDescription.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringDescription.qll
@@ -6,6 +6,6 @@ import semmle.code.java.frameworks.spring.SpringXMLElement
  *
  * Its contents can be accessed using `SpringXMLElement.getContentString()`.
  */
-class SpringDescription extends SpringXMLElement {
+class SpringDescription extends SpringXmlElement {
   SpringDescription() { this.getName() = "description" }
 }
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringEntry.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringEntry.qll
index 128d1abd548..8ec02002af5 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringEntry.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringEntry.qll
@@ -6,7 +6,7 @@ import semmle.code.java.frameworks.spring.SpringKey
 import semmle.code.java.frameworks.spring.SpringValue
 
 /** An `<entry>` element in Spring XML files. */
-class SpringEntry extends SpringXMLElement {
+class SpringEntry extends SpringXmlElement {
   SpringEntry() { this.getName() = "entry" }
 
   /** Holds if this `entry` has a `key` attribute. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringFlex.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringFlex.qll
index 7ed0f78fd37..e1c32fe7687 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringFlex.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringFlex.qll
@@ -9,7 +9,7 @@ import semmle.code.java.frameworks.spring.SpringComponentScan
 import semmle.code.java.frameworks.spring.SpringXMLElement
 
 /** Represents a `<remoting-destination>` element in Spring XML files. */
-class SpringRemotingDestination extends SpringXMLElement {
+class SpringRemotingDestination extends SpringXmlElement {
   SpringRemotingDestination() { this.getName() = "remoting-destination" }
 
   /**
@@ -55,7 +55,12 @@ class SpringRemotingDestinationClass extends Class {
   /**
    * Gets the XML configuration of the remoting destination, if it was configured in XML.
    */
-  SpringRemotingDestination getRemotingDestinationXML() { this = result.getSpringBean().getClass() }
+  SpringRemotingDestination getRemotingDestinationXml() { this = result.getSpringBean().getClass() }
+
+  /** DEPRECATED: Alias for getRemotingDestinationXml */
+  deprecated SpringRemotingDestination getRemotingDestinationXML() {
+    result = getRemotingDestinationXml()
+  }
 
   /**
    * Holds if the class is operating on an "include" or "exclude" basis.
@@ -70,7 +75,7 @@ class SpringRemotingDestinationClass extends Class {
       m.hasAnnotation("org.springframework.flex.remoting", "RemotingInclude")
     )
     or
-    exists(this.getRemotingDestinationXML().getAnIncludeMethod())
+    exists(this.getRemotingDestinationXml().getAnIncludeMethod())
   }
 
   /**
@@ -81,10 +86,10 @@ class SpringRemotingDestinationClass extends Class {
     if this.isIncluding()
     then
       result.hasAnnotation("org.springframework.flex.remoting", "RemotingInclude") or
-      result.getName() = this.getRemotingDestinationXML().getAnIncludeMethod()
+      result.getName() = this.getRemotingDestinationXml().getAnIncludeMethod()
     else (
       not result.hasAnnotation("org.springframework.flex.remoting", "RemotingExclude") and
-      not result.getName() = this.getRemotingDestinationXML().getAnExcludeMethod()
+      not result.getName() = this.getRemotingDestinationXml().getAnExcludeMethod()
     )
   }
 }
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringImport.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringImport.qll
index 72290764540..688a14da32e 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringImport.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringImport.qll
@@ -2,7 +2,7 @@ import java
 import semmle.code.java.frameworks.spring.SpringXMLElement
 
 /** An `<import>` element in a Spring XML file. */
-class SpringImport extends SpringXMLElement {
+class SpringImport extends SpringXmlElement {
   SpringImport() { this.getName() = "import" }
 
   /** Gets the value of the `resource` attribute. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringKey.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringKey.qll
index 1b993b6bf9d..5f07b227706 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringKey.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringKey.qll
@@ -2,6 +2,6 @@ import java
 import semmle.code.java.frameworks.spring.SpringXMLElement
 
 /** A `<key>` element in Spring XML files. */
-class SpringKey extends SpringXMLElement {
+class SpringKey extends SpringXmlElement {
   SpringKey() { this.getName() = "key" }
 }
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringLookupMethod.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringLookupMethod.qll
index 81ef06c14c5..9dba22a3cb7 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringLookupMethod.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringLookupMethod.qll
@@ -3,7 +3,7 @@ import semmle.code.java.frameworks.spring.SpringXMLElement
 import semmle.code.java.frameworks.spring.SpringBean
 
 /** A `<lookup-method>` element in a Spring XML file. */
-class SpringLookupMethod extends SpringXMLElement {
+class SpringLookupMethod extends SpringXmlElement {
   SpringLookupMethod() { this.getName() = "lookup-method" }
 
   /** Gets the value of the `bean` attribute. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringMergable.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringMergable.qll
index 2898a1d1e70..baef7d3b91a 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringMergable.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringMergable.qll
@@ -4,7 +4,7 @@ import semmle.code.java.frameworks.spring.SpringXMLElement
 /**
  * A common superclass for mergeable Spring XML elements (`list`, `map`).
  */
-/*abstract*/ class SpringMergable extends SpringXMLElement {
+/*abstract*/ class SpringMergable extends SpringXmlElement {
   string getMergeRaw() { result = this.getAttributeValueWithDefault("merge") }
 
   /** Holds if this element is merged, taking `default-merged` values in `<beans>` into account. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringMeta.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringMeta.qll
index 6e42dad820e..640305b313a 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringMeta.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringMeta.qll
@@ -2,7 +2,7 @@ import java
 import semmle.code.java.frameworks.spring.SpringXMLElement
 
 /** A `<meta>` element in Spring XML files. */
-class SpringMeta extends SpringXMLElement {
+class SpringMeta extends SpringXmlElement {
   SpringMeta() { this.getName() = "meta" }
 
   /** Gets the value of the `key` attribute. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringNull.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringNull.qll
index b46a888b4e0..c3f2c00a2b7 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringNull.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringNull.qll
@@ -2,6 +2,6 @@ import java
 import semmle.code.java.frameworks.spring.SpringXMLElement
 
 /** A `<null>` element in Spring XML files. */
-class SpringNull extends SpringXMLElement {
+class SpringNull extends SpringXmlElement {
   SpringNull() { this.getName() = "null" }
 }
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringProp.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringProp.qll
index fb4964e4b61..771370a3e7a 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringProp.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringProp.qll
@@ -2,7 +2,7 @@ import java
 import semmle.code.java.frameworks.spring.SpringXMLElement
 
 /** A `<prop>` element in Spring XML files. */
-class SpringProp extends SpringXMLElement {
+class SpringProp extends SpringXmlElement {
   SpringProp() { this.getName() = "prop" }
 
   /** Gets the value of the `key` attribute. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringProperty.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringProperty.qll
index cdf6a1f9bd0..06d5daefaa1 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringProperty.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringProperty.qll
@@ -6,7 +6,7 @@ import semmle.code.java.frameworks.spring.SpringList
 import semmle.code.java.frameworks.spring.SpringValue
 
 /** A `<property>` element in Spring XML files. */
-class SpringProperty extends SpringXMLElement {
+class SpringProperty extends SpringXmlElement {
   SpringProperty() { this.getName() = "property" }
 
   override string toString() { result = this.getPropertyName() }
@@ -55,7 +55,7 @@ class SpringProperty extends SpringXMLElement {
    * Holds if this property is similar to another property.
    * Currently only checks the property name and references to beans.
    */
-  override predicate isSimilar(SpringXMLElement element) {
+  override predicate isSimilar(SpringXmlElement element) {
     exists(SpringProperty other |
       other = element and this.getPropertyName() = other.getPropertyName()
     |
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringQualifier.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringQualifier.qll
index 3ac11e9e5f3..eb57b37efe0 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringQualifier.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringQualifier.qll
@@ -2,7 +2,7 @@ import java
 import semmle.code.java.frameworks.spring.SpringXMLElement
 
 /** A `<qualifier>` element in a Spring XML file. */
-class SpringQualifier extends SpringXMLElement {
+class SpringQualifier extends SpringXmlElement {
   SpringQualifier() { this.getName() = "qualifier" }
 
   /** Gets the name of the Java class of this qualifier. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringReplacedMethod.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringReplacedMethod.qll
index ae2e827e703..47e8d182898 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringReplacedMethod.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringReplacedMethod.qll
@@ -3,7 +3,7 @@ import semmle.code.java.frameworks.spring.SpringXMLElement
 import semmle.code.java.frameworks.spring.SpringBean
 
 /** A `<replaced-method>` element in a Spring XML file. */
-class SpringReplacedMethod extends SpringXMLElement {
+class SpringReplacedMethod extends SpringXmlElement {
   SpringReplacedMethod() { this.getName() = "replaced-method" }
 
   /** Gets the value of the `name` attribute. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringValue.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringValue.qll
index 73c4098a8c2..55854d60f9c 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringValue.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringValue.qll
@@ -2,7 +2,7 @@ import java
 import semmle.code.java.frameworks.spring.SpringXMLElement
 
 /** A `<value>` element in a Spring XML file. */
-class SpringValue extends SpringXMLElement {
+class SpringValue extends SpringXmlElement {
   SpringValue() { this.getName() = "value" }
 
   /** Gets the value of the `type` attribute. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringXMLElement.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringXMLElement.qll
index 943285d99a8..adaf69c5890 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/SpringXMLElement.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/SpringXMLElement.qll
@@ -3,11 +3,11 @@ import semmle.code.java.frameworks.spring.SpringBeanFile
 import semmle.code.java.frameworks.spring.SpringBean
 
 /** A common superclass for all Spring XML elements. */
-class SpringXMLElement extends XMLElement {
-  SpringXMLElement() { this.getFile() instanceof SpringBeanFile }
+class SpringXmlElement extends XMLElement {
+  SpringXmlElement() { this.getFile() instanceof SpringBeanFile }
 
   /** Gets a child of this Spring XML element. */
-  SpringXMLElement getASpringChild() { result = this.getAChild() }
+  SpringXmlElement getASpringChild() { result = this.getAChild() }
 
   /** Gets the bean file of this XML element. */
   SpringBeanFile getSpringBeanFile() { result = this.getFile() }
@@ -27,13 +27,16 @@ class SpringXMLElement extends XMLElement {
   SpringBean getEnclosingBean() {
     if this instanceof SpringBean
     then result = this
-    else result = this.getParent().(SpringXMLElement).getEnclosingBean()
+    else result = this.getParent().(SpringXmlElement).getEnclosingBean()
   }
 
   /**
    * Overridden by subclasses. Used to match `value`, `property` and `ref` elements for similarity.
    */
-  predicate isSimilar(SpringXMLElement other) { none() }
+  predicate isSimilar(SpringXmlElement other) { none() }
 
   string getContentString() { result = this.allCharactersString() }
 }
+
+/** DEPRECATED: Alias for SpringXmlElement */
+deprecated class SpringXMLElement = SpringXmlElement;
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/metrics/MetricSpringBean.qll b/java/ql/lib/semmle/code/java/frameworks/spring/metrics/MetricSpringBean.qll
index 9cac47fa281..ffbc5c9e5ec 100644
--- a/java/ql/lib/semmle/code/java/frameworks/spring/metrics/MetricSpringBean.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/spring/metrics/MetricSpringBean.qll
@@ -2,7 +2,7 @@ import semmle.code.java.frameworks.spring.SpringBean
 import semmle.code.java.frameworks.spring.SpringBeanFile
 import semmle.code.java.frameworks.spring.SpringEntry
 
-predicate springDepends(SpringBean b1, SpringBean b2, SpringXMLElement cause) {
+predicate springDepends(SpringBean b1, SpringBean b2, SpringXmlElement cause) {
   b1 != b2 and
   b1.getBeanParent() = b2 and
   cause = b1
@@ -63,7 +63,7 @@ class MetricSpringBean extends SpringBean {
     this.getSpringBeanFile() = result.getSpringBeanFile()
   }
 
-  SpringXMLElement getBeanDependencyCause(SpringBean dependency) {
+  SpringXmlElement getBeanDependencyCause(SpringBean dependency) {
     springDepends(this, dependency, result)
   }
 }
diff --git a/java/ql/lib/semmle/code/java/frameworks/struts/StrutsActions.qll b/java/ql/lib/semmle/code/java/frameworks/struts/StrutsActions.qll
index ebe6716e4f5..4d50dbf92ab 100644
--- a/java/ql/lib/semmle/code/java/frameworks/struts/StrutsActions.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/struts/StrutsActions.qll
@@ -6,7 +6,7 @@ import semmle.code.java.frameworks.struts.StrutsXML
  * Gets the custom struts mapper class used for this `refType`, if any.
  */
 private string getStrutsMapperClass(RefType refType) {
-  result = getRootXMLFile(refType).getConstantValue("struts.mapper.class")
+  result = getRootXmlFile(refType).getConstantValue("struts.mapper.class")
 }
 
 /**
@@ -21,7 +21,7 @@ class Struts2ActionClass extends Class {
     or
     // If there is a struts.xml file, then any class that is specified as an action is considered
     // to be reflectively constructed.
-    exists(StrutsXMLAction strutsAction | this = strutsAction.getActionClass())
+    exists(StrutsXmlAction strutsAction | this = strutsAction.getActionClass())
     or
     // We have determined that this is an action class due to the conventions plugin.
     this instanceof Struts2ConventionActionClass
@@ -64,7 +64,7 @@ class Struts2ActionClass extends Class {
           any()
         else (
           // Use the default mapping
-          exists(StrutsXMLAction strutsAction |
+          exists(StrutsXmlAction strutsAction |
             this = strutsAction.getActionClass() and
             result = strutsAction.getActionMethod()
           )
diff --git a/java/ql/lib/semmle/code/java/frameworks/struts/StrutsConventions.qll b/java/ql/lib/semmle/code/java/frameworks/struts/StrutsConventions.qll
index 0f38147ad13..fd9f14d4c6f 100644
--- a/java/ql/lib/semmle/code/java/frameworks/struts/StrutsConventions.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/struts/StrutsConventions.qll
@@ -53,7 +53,7 @@ private predicate isStrutsConventionPluginUsed(RefType refType) {
   strutsConventionAnnotationUsedInFolder(getSourceFolder(refType.getCompilationUnit()))
   or
   // The struts configuration file for this file sets a convention property
-  getRootXMLFile(refType).getAConstant().getName().matches("struts.convention%")
+  getRootXmlFile(refType).getAConstant().getName().matches("struts.convention%")
   or
   // We've found the POM for this RefType, and it includes a dependency on the convention plugin
   exists(Pom pom |
@@ -68,7 +68,7 @@ private predicate isStrutsConventionPluginUsed(RefType refType) {
  * We guess by identifying the "nearest" `struts.xml` configuration file, i.e. the Struts
  * configuration file with the lowest common ancestor to this file.
  */
-StrutsXMLFile getRootXMLFile(RefType refType) {
+StrutsXmlFile getRootXmlFile(RefType refType) {
   exists(StrutsFolder strutsFolder |
     strutsFolder = refType.getFile().getParentContainer*() and
     strutsFolder.isUnique()
@@ -77,14 +77,17 @@ StrutsXMLFile getRootXMLFile(RefType refType) {
   )
 }
 
+/** DEPRECATED: Alias for getRootXmlFile */
+deprecated StrutsXMLFile getRootXMLFile(RefType refType) { result = getRootXmlFile(refType) }
+
 /**
  * Gets the suffix used for automatically identifying actions when using the convention plugin.
  *
  * If no configuration is supplied, or identified, the default is "Action".
  */
 private string getConventionSuffix(RefType refType) {
-  if exists(getRootXMLFile(refType).getConstantValue("struts.convention.action.suffix"))
-  then result = getRootXMLFile(refType).getConstantValue("struts.convention.action.suffix")
+  if exists(getRootXmlFile(refType).getConstantValue("struts.convention.action.suffix"))
+  then result = getRootXmlFile(refType).getConstantValue("struts.convention.action.suffix")
   else result = "Action"
 }
 
diff --git a/java/ql/lib/semmle/code/java/frameworks/struts/StrutsXML.qll b/java/ql/lib/semmle/code/java/frameworks/struts/StrutsXML.qll
index 8e69c5d9a83..77285d98175 100644
--- a/java/ql/lib/semmle/code/java/frameworks/struts/StrutsXML.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/struts/StrutsXML.qll
@@ -4,13 +4,16 @@ import semmle.code.xml.XML
 /**
  * Holds if any struts XML files are included in this snapshot.
  */
-predicate isStrutsXMLIncluded() { exists(StrutsXMLFile strutsXML) }
+predicate isStrutsXmlIncluded() { exists(StrutsXmlFile strutsXml) }
+
+/** DEPRECATED: Alias for isStrutsXmlIncluded */
+deprecated predicate isStrutsXMLIncluded = isStrutsXmlIncluded/0;
 
 /**
  * A struts 2 configuration file.
  */
-abstract class StrutsXMLFile extends XMLFile {
-  StrutsXMLFile() {
+abstract class StrutsXmlFile extends XMLFile {
+  StrutsXmlFile() {
     // Contains a single top-level XML node named "struts".
     count(XMLElement e | e = this.getAChild()) = 1 and
     this.getAChild().getName() = "struts"
@@ -19,55 +22,64 @@ abstract class StrutsXMLFile extends XMLFile {
   /**
    * Gets a "root" struts configuration file that includes this file.
    */
-  StrutsRootXMLFile getARoot() { result.getAnIncludedFile() = this }
+  StrutsRootXmlFile getARoot() { result.getAnIncludedFile() = this }
 
   /**
    * Gets a directly included file.
    */
-  StrutsXMLFile getADirectlyIncludedFile() {
-    exists(StrutsXMLInclude include | include.getFile() = this | result = include.getIncludedFile())
+  StrutsXmlFile getADirectlyIncludedFile() {
+    exists(StrutsXmlInclude include | include.getFile() = this | result = include.getIncludedFile())
   }
 
   /**
    * Gets a transitively included file.
    */
-  StrutsXMLFile getAnIncludedFile() { result = this.getADirectlyIncludedFile*() }
+  StrutsXmlFile getAnIncludedFile() { result = this.getADirectlyIncludedFile*() }
 
   /**
    * Gets a `<constant>` defined in this file, or an included file.
    */
-  StrutsXMLConstant getAConstant() { result.getFile() = this.getAnIncludedFile() }
+  StrutsXmlConstant getAConstant() { result.getFile() = this.getAnIncludedFile() }
 
   /**
    * Gets the value of the constant with the given `name`.
    */
   string getConstantValue(string name) {
-    exists(StrutsXMLConstant constant | constant = this.getAConstant() |
+    exists(StrutsXmlConstant constant | constant = this.getAConstant() |
       constant.getConstantName() = name and
       result = constant.getConstantValue()
     )
   }
 }
 
+/** DEPRECATED: Alias for StrutsXmlFile */
+deprecated class StrutsXMLFile = StrutsXmlFile;
+
 /**
  * A Struts 2 "root" configuration XML file directly read by struts.
  *
  * Root configurations either have the name `struts.xml` or `struts-plugin.xml`.
  */
-class StrutsRootXMLFile extends StrutsXMLFile {
-  StrutsRootXMLFile() {
+class StrutsRootXmlFile extends StrutsXmlFile {
+  StrutsRootXmlFile() {
     this.getBaseName() = "struts.xml" or
     this.getBaseName() = "struts-plugin.xml"
   }
 }
 
+/** DEPRECATED: Alias for StrutsRootXmlFile */
+deprecated class StrutsRootXMLFile = StrutsRootXmlFile;
+
 /**
  * A Struts 2 configuration XML file included, directly or indirectly, by a root Struts configuration.
  */
-class StrutsIncludedXMLFile extends StrutsXMLFile {
-  StrutsIncludedXMLFile() { exists(StrutsXMLInclude include | this = include.getIncludedFile()) }
+class StrutsIncludedXmlFile extends StrutsXmlFile {
+  StrutsIncludedXmlFile() { exists(StrutsXmlInclude include | this = include.getIncludedFile()) }
 }
 
+/** DEPRECATED: Alias for StrutsIncludedXmlFile */
+deprecated class StrutsIncludedXMLFile = StrutsIncludedXmlFile;
+
 /**
  * A Folder which has one or more Struts 2 root configurations.
  */
@@ -75,7 +87,7 @@ class StrutsFolder extends Folder {
   StrutsFolder() {
     exists(Container c | c = this.getAChildContainer() |
       c instanceof StrutsFolder or
-      c instanceof StrutsXMLFile
+      c instanceof StrutsXmlFile
     )
   }
 
@@ -87,7 +99,7 @@ class StrutsFolder extends Folder {
   /**
    * Gets a struts root configuration that applies to this folder.
    */
-  StrutsRootXMLFile getAStrutsRootFile() {
+  StrutsRootXmlFile getAStrutsRootFile() {
     result = this.getAChildContainer() or
     result = this.getAChildContainer().(StrutsFolder).getAStrutsRootFile()
   }
@@ -96,8 +108,8 @@ class StrutsFolder extends Folder {
 /**
  * An XML element in a `StrutsXMLFile`.
  */
-class StrutsXMLElement extends XMLElement {
-  StrutsXMLElement() { this.getFile() instanceof StrutsXMLFile }
+class StrutsXmlElement extends XMLElement {
+  StrutsXmlElement() { this.getFile() instanceof StrutsXmlFile }
 
   /**
    * Gets the value for this element, with leading and trailing whitespace trimmed.
@@ -105,14 +117,17 @@ class StrutsXMLElement extends XMLElement {
   string getValue() { result = this.allCharactersString().trim() }
 }
 
+/** DEPRECATED: Alias for StrutsXmlElement */
+deprecated class StrutsXMLElement = StrutsXmlElement;
+
 /**
  * A `<include>` element within a `struts.xml` file.
  *
  * This indicates that the file specified in the `file` attribute should be included in the struts
  * configuration. The file is looked up using the classpath.
  */
-class StrutsXMLInclude extends StrutsXMLElement {
-  StrutsXMLInclude() { this.getName() = "include" }
+class StrutsXmlInclude extends StrutsXmlElement {
+  StrutsXmlInclude() { this.getName() = "include" }
 
   /**
    * Gets the XMLFile that we believe is included by this include statement.
@@ -127,6 +142,9 @@ class StrutsXMLInclude extends StrutsXMLElement {
   }
 }
 
+/** DEPRECATED: Alias for StrutsXmlInclude */
+deprecated class StrutsXMLInclude = StrutsXmlInclude;
+
 /**
  * Escape a string for use as the matcher in a string.match(..) call.
  */
@@ -150,8 +168,8 @@ private predicate strutsWildcardMatching(string matches, string wildcardstring)
 /**
  * A `<action>` element within a `struts.xml` file.
  */
-class StrutsXMLAction extends StrutsXMLElement {
-  StrutsXMLAction() { this.getName() = "action" }
+class StrutsXmlAction extends StrutsXmlElement {
+  StrutsXmlAction() { this.getName() = "action" }
 
   /**
    * Gets the `Class` that is referenced by this Struts action.
@@ -175,13 +193,19 @@ class StrutsXMLAction extends StrutsXMLElement {
   }
 }
 
+/** DEPRECATED: Alias for StrutsXmlAction */
+deprecated class StrutsXMLAction = StrutsXmlAction;
+
 /**
  * A `<constant>` property, representing a configuration parameter to struts.
  */
-class StrutsXMLConstant extends StrutsXMLElement {
-  StrutsXMLConstant() { this.getName() = "constant" }
+class StrutsXmlConstant extends StrutsXmlElement {
+  StrutsXmlConstant() { this.getName() = "constant" }
 
   string getConstantName() { result = this.getAttribute("name").getValue() }
 
   string getConstantValue() { result = this.getAttribute("value").getValue() }
 }
+
+/** DEPRECATED: Alias for StrutsXmlConstant */
+deprecated class StrutsXMLConstant = StrutsXmlConstant;
diff --git a/java/ql/lib/semmle/code/java/security/Encryption.qll b/java/ql/lib/semmle/code/java/security/Encryption.qll
index 281a97bc60d..d3c2cc7420e 100644
--- a/java/ql/lib/semmle/code/java/security/Encryption.qll
+++ b/java/ql/lib/semmle/code/java/security/Encryption.qll
@@ -17,10 +17,13 @@ class X509TrustManager extends RefType {
   X509TrustManager() { this.hasQualifiedName("javax.net.ssl", "X509TrustManager") }
 }
 
-class HttpsURLConnection extends RefType {
-  HttpsURLConnection() { this.hasQualifiedName("javax.net.ssl", "HttpsURLConnection") }
+class HttpsUrlConnection extends RefType {
+  HttpsUrlConnection() { this.hasQualifiedName("javax.net.ssl", "HttpsURLConnection") }
 }
 
+/** DEPRECATED: Alias for HttpsUrlConnection */
+deprecated class HttpsURLConnection = HttpsUrlConnection;
+
 class SSLSocketFactory extends RefType {
   SSLSocketFactory() { this.hasQualifiedName("javax.net.ssl", "SSLSocketFactory") }
 }
@@ -105,22 +108,22 @@ class CreateSslEngineMethod extends Method {
 class SetConnectionFactoryMethod extends Method {
   SetConnectionFactoryMethod() {
     this.hasName("setSSLSocketFactory") and
-    this.getDeclaringType().getAnAncestor() instanceof HttpsURLConnection
+    this.getDeclaringType().getAnAncestor() instanceof HttpsUrlConnection
   }
 }
 
 class SetHostnameVerifierMethod extends Method {
   SetHostnameVerifierMethod() {
     this.hasName("setHostnameVerifier") and
-    this.getDeclaringType().getAnAncestor() instanceof HttpsURLConnection
+    this.getDeclaringType().getAnAncestor() instanceof HttpsUrlConnection
   }
 }
 
-/** The `setDefaultHostnameVerifier` method of the class `javax.net.ssl.HttpsURLConnection`. */
+/** The `setDefaultHostnameVerifier` method of the class `javax.net.ssl.HttpsUrlConnection`. */
 class SetDefaultHostnameVerifierMethod extends Method {
   SetDefaultHostnameVerifierMethod() {
     this.hasName("setDefaultHostnameVerifier") and
-    this.getDeclaringType().getAnAncestor() instanceof HttpsURLConnection
+    this.getDeclaringType().getAnAncestor() instanceof HttpsUrlConnection
   }
 }
 
diff --git a/java/ql/lib/semmle/code/java/security/ExternalAPIs.qll b/java/ql/lib/semmle/code/java/security/ExternalAPIs.qll
index 0aee4aaf802..b4b8ea7fdd9 100644
--- a/java/ql/lib/semmle/code/java/security/ExternalAPIs.qll
+++ b/java/ql/lib/semmle/code/java/security/ExternalAPIs.qll
@@ -10,11 +10,14 @@ import semmle.code.java.dataflow.TaintTracking
 /**
  * A `Method` that is considered a "safe" external API from a security perspective.
  */
-abstract class SafeExternalAPIMethod extends Method { }
+abstract class SafeExternalApiMethod extends Method { }
+
+/** DEPRECATED: Alias for SafeExternalApiMethod */
+deprecated class SafeExternalAPIMethod = SafeExternalApiMethod;
 
 /** The default set of "safe" external APIs. */
-private class DefaultSafeExternalAPIMethod extends SafeExternalAPIMethod {
-  DefaultSafeExternalAPIMethod() {
+private class DefaultSafeExternalApiMethod extends SafeExternalApiMethod {
+  DefaultSafeExternalApiMethod() {
     this instanceof EqualsMethod
     or
     this.getName().regexpMatch("size|length|compareTo|getClass|lastIndexOf")
@@ -53,11 +56,11 @@ private class DefaultSafeExternalAPIMethod extends SafeExternalAPIMethod {
 }
 
 /** A node representing data being passed to an external API. */
-class ExternalAPIDataNode extends DataFlow::Node {
+class ExternalApiDataNode extends DataFlow::Node {
   Call call;
   int i;
 
-  ExternalAPIDataNode() {
+  ExternalApiDataNode() {
     (
       // Argument to call to a method
       this.asExpr() = call.getArgument(i)
@@ -79,7 +82,7 @@ class ExternalAPIDataNode extends DataFlow::Node {
     not exists(DataFlow::Node next | TaintTracking::localTaintStep(this, next)) and
     not exists(DataFlow::Node next | TaintTracking::defaultAdditionalTaintStep(this, next)) and
     // Not a call to a known safe external API
-    not call.getCallee() instanceof SafeExternalAPIMethod
+    not call.getCallee() instanceof SafeExternalApiMethod
   }
 
   /** Gets the called API `Method`. */
@@ -95,38 +98,47 @@ class ExternalAPIDataNode extends DataFlow::Node {
   }
 }
 
-/** A configuration for tracking flow from `RemoteFlowSource`s to `ExternalAPIDataNode`s. */
-class UntrustedDataToExternalAPIConfig extends TaintTracking::Configuration {
-  UntrustedDataToExternalAPIConfig() { this = "UntrustedDataToExternalAPIConfig" }
+/** DEPRECATED: Alias for ExternalApiDataNode */
+deprecated class ExternalAPIDataNode = ExternalApiDataNode;
+
+/** A configuration for tracking flow from `RemoteFlowSource`s to `ExternalApiDataNode`s. */
+class UntrustedDataToExternalApiConfig extends TaintTracking::Configuration {
+  UntrustedDataToExternalApiConfig() { this = "UntrustedDataToExternalAPIConfig" }
 
   override predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
-  override predicate isSink(DataFlow::Node sink) { sink instanceof ExternalAPIDataNode }
+  override predicate isSink(DataFlow::Node sink) { sink instanceof ExternalApiDataNode }
 }
 
+/** DEPRECATED: Alias for UntrustedDataToExternalApiConfig */
+deprecated class UntrustedDataToExternalAPIConfig = UntrustedDataToExternalApiConfig;
+
 /** A node representing untrusted data being passed to an external API. */
-class UntrustedExternalAPIDataNode extends ExternalAPIDataNode {
-  UntrustedExternalAPIDataNode() { any(UntrustedDataToExternalAPIConfig c).hasFlow(_, this) }
+class UntrustedExternalApiDataNode extends ExternalApiDataNode {
+  UntrustedExternalApiDataNode() { any(UntrustedDataToExternalApiConfig c).hasFlow(_, this) }
 
   /** Gets a source of untrusted data which is passed to this external API data node. */
   DataFlow::Node getAnUntrustedSource() {
-    any(UntrustedDataToExternalAPIConfig c).hasFlow(result, this)
+    any(UntrustedDataToExternalApiConfig c).hasFlow(result, this)
   }
 }
 
-private newtype TExternalAPI =
-  TExternalAPIParameter(Method m, int index) {
-    exists(UntrustedExternalAPIDataNode n |
+/** DEPRECATED: Alias for UntrustedExternalApiDataNode */
+deprecated class UntrustedExternalAPIDataNode = UntrustedExternalApiDataNode;
+
+private newtype TExternalApi =
+  TExternalApiParameter(Method m, int index) {
+    exists(UntrustedExternalApiDataNode n |
       m = n.getMethod() and
       index = n.getIndex()
     )
   }
 
 /** An external API which is used with untrusted data. */
-class ExternalAPIUsedWithUntrustedData extends TExternalAPI {
+class ExternalApiUsedWithUntrustedData extends TExternalApi {
   /** Gets a possibly untrusted use of this external API. */
-  UntrustedExternalAPIDataNode getUntrustedDataNode() {
-    this = TExternalAPIParameter(result.getMethod(), result.getIndex())
+  UntrustedExternalApiDataNode getUntrustedDataNode() {
+    this = TExternalApiParameter(result.getMethod(), result.getIndex())
   }
 
   /** Gets the number of untrusted sources used with this external API. */
@@ -139,9 +151,12 @@ class ExternalAPIUsedWithUntrustedData extends TExternalAPI {
     exists(Method m, int index, string indexString |
       if index = -1 then indexString = "qualifier" else indexString = "param " + index
     |
-      this = TExternalAPIParameter(m, index) and
+      this = TExternalApiParameter(m, index) and
       result =
         m.getDeclaringType().getQualifiedName() + "." + m.getSignature() + " [" + indexString + "]"
     )
   }
 }
+
+/** DEPRECATED: Alias for ExternalApiUsedWithUntrustedData */
+deprecated class ExternalAPIUsedWithUntrustedData = ExternalApiUsedWithUntrustedData;
diff --git a/java/ql/lib/semmle/code/java/security/RequestForgeryConfig.qll b/java/ql/lib/semmle/code/java/security/RequestForgeryConfig.qll
index c93d3089dc9..c8a59f65b0e 100644
--- a/java/ql/lib/semmle/code/java/security/RequestForgeryConfig.qll
+++ b/java/ql/lib/semmle/code/java/security/RequestForgeryConfig.qll
@@ -18,7 +18,7 @@ class RequestForgeryConfiguration extends TaintTracking::Configuration {
     // Exclude results of remote HTTP requests: fetching something else based on that result
     // is no worse than following a redirect returned by the remote server, and typically
     // we're requesting a resource via https which we trust to only send us to safe URLs.
-    not source.asExpr().(MethodAccess).getCallee() instanceof URLConnectionGetInputStreamMethod
+    not source.asExpr().(MethodAccess).getCallee() instanceof UrlConnectionGetInputStreamMethod
   }
 
   override predicate isSink(DataFlow::Node sink) { sink instanceof RequestForgerySink }
diff --git a/java/ql/lib/semmle/code/java/security/UnsafeDeserializationQuery.qll b/java/ql/lib/semmle/code/java/security/UnsafeDeserializationQuery.qll
index 71a2492c70c..6d0ff888d82 100644
--- a/java/ql/lib/semmle/code/java/security/UnsafeDeserializationQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/UnsafeDeserializationQuery.qll
@@ -28,8 +28,8 @@ private class ObjectInputStreamReadObjectMethod extends Method {
   }
 }
 
-private class XMLDecoderReadObjectMethod extends Method {
-  XMLDecoderReadObjectMethod() {
+private class XmlDecoderReadObjectMethod extends Method {
+  XmlDecoderReadObjectMethod() {
     this.getDeclaringType().hasQualifiedName("java.beans", "XMLDecoder") and
     this.hasName("readObject")
   }
@@ -140,7 +140,7 @@ predicate unsafeDeserialization(MethodAccess ma, Expr sink) {
           .hasQualifiedName("org.apache.commons.io.serialization", "ValidatingObjectInputStream")
     )
     or
-    m instanceof XMLDecoderReadObjectMethod and
+    m instanceof XmlDecoderReadObjectMethod and
     sink = ma.getQualifier()
     or
     m instanceof XStreamReadObjectMethod and
diff --git a/java/ql/lib/semmle/code/java/security/XSS.qll b/java/ql/lib/semmle/code/java/security/XSS.qll
index 6053e3f4511..23bda5b9964 100644
--- a/java/ql/lib/semmle/code/java/security/XSS.qll
+++ b/java/ql/lib/semmle/code/java/security/XSS.qll
@@ -50,8 +50,8 @@ private class DefaultXssSink extends XssSink {
 }
 
 /** A default sanitizer that considers numeric and boolean typed data safe for writing to output. */
-private class DefaultXSSSanitizer extends XssSanitizer {
-  DefaultXSSSanitizer() {
+private class DefaultXssSanitizer extends XssSanitizer {
+  DefaultXssSanitizer() {
     this.getType() instanceof NumericType or
     this.getType() instanceof BooleanType or
     // Match `org.springframework.web.util.HtmlUtils.htmlEscape` and possibly other methods like it.
diff --git a/java/ql/lib/semmle/code/java/security/XmlParsers.qll b/java/ql/lib/semmle/code/java/security/XmlParsers.qll
index 376e7481590..795d92538fc 100644
--- a/java/ql/lib/semmle/code/java/security/XmlParsers.qll
+++ b/java/ql/lib/semmle/code/java/security/XmlParsers.qll
@@ -358,21 +358,24 @@ class SafeXmlInputFactory extends VarAccess {
 /**
  * The class `org.jdom.input.SAXBuilder.`
  */
-class SAXBuilder extends RefType {
-  SAXBuilder() {
+class SaxBuilder extends RefType {
+  SaxBuilder() {
     this.hasQualifiedName("org.jdom.input", "SAXBuilder") or
     this.hasQualifiedName("org.jdom2.input", "SAXBuilder")
   }
 }
 
+/** DEPRECATED: Alias for SaxBuilder */
+deprecated class SAXBuilder = SaxBuilder;
+
 /**
  * A call to `SAXBuilder.build.`
  */
-class SAXBuilderParse extends XmlParserCall {
-  SAXBuilderParse() {
+class SaxBuilderParse extends XmlParserCall {
+  SaxBuilderParse() {
     exists(Method m |
       m = this.getMethod() and
-      m.getDeclaringType() instanceof SAXBuilder and
+      m.getDeclaringType() instanceof SaxBuilder and
       m.hasName("build")
     )
   }
@@ -380,19 +383,22 @@ class SAXBuilderParse extends XmlParserCall {
   override Expr getSink() { result = this.getArgument(0) }
 
   override predicate isSafe() {
-    exists(SafeSAXBuilderToSAXBuilderParseFlowConfig conf | conf.hasFlowToExpr(this.getQualifier()))
+    exists(SafeSaxBuilderToSaxBuilderParseFlowConfig conf | conf.hasFlowToExpr(this.getQualifier()))
   }
 }
 
-private class SafeSAXBuilderToSAXBuilderParseFlowConfig extends DataFlow2::Configuration {
-  SafeSAXBuilderToSAXBuilderParseFlowConfig() {
+/** DEPRECATED: Alias for SaxBuilderParse */
+deprecated class SAXBuilderParse = SaxBuilderParse;
+
+private class SafeSaxBuilderToSaxBuilderParseFlowConfig extends DataFlow2::Configuration {
+  SafeSaxBuilderToSaxBuilderParseFlowConfig() {
     this = "XmlParsers::SafeSAXBuilderToSAXBuilderParseFlowConfig"
   }
 
-  override predicate isSource(DataFlow::Node src) { src.asExpr() instanceof SafeSAXBuilder }
+  override predicate isSource(DataFlow::Node src) { src.asExpr() instanceof SafeSaxBuilder }
 
   override predicate isSink(DataFlow::Node sink) {
-    sink.asExpr() = any(SAXBuilderParse sax).getQualifier()
+    sink.asExpr() = any(SaxBuilderParse sax).getQualifier()
   }
 
   override int fieldFlowBranchLimit() { result = 0 }
@@ -401,22 +407,25 @@ private class SafeSAXBuilderToSAXBuilderParseFlowConfig extends DataFlow2::Confi
 /**
  * A `ParserConfig` specific to `SAXBuilder`.
  */
-class SAXBuilderConfig extends ParserConfig {
-  SAXBuilderConfig() {
+class SaxBuilderConfig extends ParserConfig {
+  SaxBuilderConfig() {
     exists(Method m |
       m = this.getMethod() and
-      m.getDeclaringType() instanceof SAXBuilder and
+      m.getDeclaringType() instanceof SaxBuilder and
       m.hasName("setFeature")
     )
   }
 }
 
-/** A safely configured `SAXBuilder`. */
-class SafeSAXBuilder extends VarAccess {
-  SafeSAXBuilder() {
+/** DEPRECATED: Alias for SaxBuilderConfig */
+deprecated class SAXBuilderConfig = SaxBuilderConfig;
+
+/** A safely configured `SaxBuilder`. */
+class SafeSaxBuilder extends VarAccess {
+  SafeSaxBuilder() {
     exists(Variable v |
       v = this.getVariable() and
-      exists(SAXBuilderConfig config | config.getQualifier() = v.getAnAccess() |
+      exists(SaxBuilderConfig config | config.getQualifier() = v.getAnAccess() |
         config
             .enables(any(ConstantStringExpr s |
                 s.getStringValue() = "http://apache.org/xml/features/disallow-doctype-decl"
@@ -426,6 +435,9 @@ class SafeSAXBuilder extends VarAccess {
   }
 }
 
+/** DEPRECATED: Alias for SafeSaxBuilder */
+deprecated class SafeSAXBuilder = SafeSaxBuilder;
+
 /*
  * The case in
  * https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html#jaxb-unmarshaller
@@ -435,21 +447,27 @@ class SafeSAXBuilder extends VarAccess {
 /**
  * The class `javax.xml.parsers.SAXParser`.
  */
-class SAXParser extends RefType {
-  SAXParser() { this.hasQualifiedName("javax.xml.parsers", "SAXParser") }
+class SaxParser extends RefType {
+  SaxParser() { this.hasQualifiedName("javax.xml.parsers", "SAXParser") }
 }
 
-/** The class `javax.xml.parsers.SAXParserFactory`. */
-class SAXParserFactory extends RefType {
-  SAXParserFactory() { this.hasQualifiedName("javax.xml.parsers", "SAXParserFactory") }
+/** DEPRECATED: Alias for SaxParser */
+deprecated class SAXParser = SaxParser;
+
+/** The class `javax.xml.parsers.SaxParserFactory`. */
+class SaxParserFactory extends RefType {
+  SaxParserFactory() { this.hasQualifiedName("javax.xml.parsers", "SAXParserFactory") }
 }
 
-/** A call to `SAXParser.parse`. */
-class SAXParserParse extends XmlParserCall {
-  SAXParserParse() {
+/** DEPRECATED: Alias for SaxParserFactory */
+deprecated class SAXParserFactory = SaxParserFactory;
+
+/** A call to `SaxParser.parse`. */
+class SaxParserParse extends XmlParserCall {
+  SaxParserParse() {
     exists(Method m |
       m = this.getMethod() and
-      m.getDeclaringType() instanceof SAXParser and
+      m.getDeclaringType() instanceof SaxParser and
       m.hasName("parse")
     )
   }
@@ -457,44 +475,50 @@ class SAXParserParse extends XmlParserCall {
   override Expr getSink() { result = this.getArgument(0) }
 
   override predicate isSafe() {
-    exists(SafeSAXParserFlowConfig sp | sp.hasFlowToExpr(this.getQualifier()))
+    exists(SafeSaxParserFlowConfig sp | sp.hasFlowToExpr(this.getQualifier()))
   }
 }
 
-/** A `ParserConfig` that is specific to `SAXParserFactory`. */
-class SAXParserFactoryConfig extends ParserConfig {
-  SAXParserFactoryConfig() {
+/** DEPRECATED: Alias for SaxParserParse */
+deprecated class SAXParserParse = SaxParserParse;
+
+/** A `ParserConfig` that is specific to `SaxParserFactory`. */
+class SaxParserFactoryConfig extends ParserConfig {
+  SaxParserFactoryConfig() {
     exists(Method m |
       m = this.getMethod() and
-      m.getDeclaringType() instanceof SAXParserFactory and
+      m.getDeclaringType() instanceof SaxParserFactory and
       m.hasName("setFeature")
     )
   }
 }
 
+/** DEPRECATED: Alias for SaxParserFactoryConfig */
+deprecated class SAXParserFactoryConfig = SaxParserFactoryConfig;
+
 /**
  * A safely configured `SAXParserFactory`.
  */
-class SafeSAXParserFactory extends VarAccess {
-  SafeSAXParserFactory() {
+class SafeSaxParserFactory extends VarAccess {
+  SafeSaxParserFactory() {
     exists(Variable v | v = this.getVariable() |
-      exists(SAXParserFactoryConfig config | config.getQualifier() = v.getAnAccess() |
+      exists(SaxParserFactoryConfig config | config.getQualifier() = v.getAnAccess() |
         config.enables(singleSafeConfig())
       )
       or
-      exists(SAXParserFactoryConfig config | config.getQualifier() = v.getAnAccess() |
+      exists(SaxParserFactoryConfig config | config.getQualifier() = v.getAnAccess() |
         config
             .disables(any(ConstantStringExpr s |
                 s.getStringValue() = "http://xml.org/sax/features/external-general-entities"
               ))
       ) and
-      exists(SAXParserFactoryConfig config | config.getQualifier() = v.getAnAccess() |
+      exists(SaxParserFactoryConfig config | config.getQualifier() = v.getAnAccess() |
         config
             .disables(any(ConstantStringExpr s |
                 s.getStringValue() = "http://xml.org/sax/features/external-parameter-entities"
               ))
       ) and
-      exists(SAXParserFactoryConfig config | config.getQualifier() = v.getAnAccess() |
+      exists(SaxParserFactoryConfig config | config.getQualifier() = v.getAnAccess() |
         config
             .disables(any(ConstantStringExpr s |
                 s.getStringValue() =
@@ -505,18 +529,21 @@ class SafeSAXParserFactory extends VarAccess {
   }
 }
 
-private class SafeSAXParserFactoryToNewSAXParserFlowConfig extends DataFlow5::Configuration {
-  SafeSAXParserFactoryToNewSAXParserFlowConfig() {
+/** DEPRECATED: Alias for SafeSaxParserFactory */
+deprecated class SafeSAXParserFactory = SafeSaxParserFactory;
+
+private class SafeSaxParserFactoryToNewSaxParserFlowConfig extends DataFlow5::Configuration {
+  SafeSaxParserFactoryToNewSaxParserFlowConfig() {
     this = "XmlParsers::SafeSAXParserFactoryToNewSAXParserFlowConfig"
   }
 
-  override predicate isSource(DataFlow::Node src) { src.asExpr() instanceof SafeSAXParserFactory }
+  override predicate isSource(DataFlow::Node src) { src.asExpr() instanceof SafeSaxParserFactory }
 
   override predicate isSink(DataFlow::Node sink) {
     exists(MethodAccess ma, Method m |
       sink.asExpr() = ma.getQualifier() and
       ma.getMethod() = m and
-      m.getDeclaringType() instanceof SAXParserFactory and
+      m.getDeclaringType() instanceof SaxParserFactory and
       m.hasName("newSAXParser")
     )
   }
@@ -524,45 +551,51 @@ private class SafeSAXParserFactoryToNewSAXParserFlowConfig extends DataFlow5::Co
   override int fieldFlowBranchLimit() { result = 0 }
 }
 
-private class SafeSAXParserFlowConfig extends DataFlow4::Configuration {
-  SafeSAXParserFlowConfig() { this = "XmlParsers::SafeSAXParserFlowConfig" }
+private class SafeSaxParserFlowConfig extends DataFlow4::Configuration {
+  SafeSaxParserFlowConfig() { this = "XmlParsers::SafeSAXParserFlowConfig" }
 
-  override predicate isSource(DataFlow::Node src) { src.asExpr() instanceof SafeSAXParser }
+  override predicate isSource(DataFlow::Node src) { src.asExpr() instanceof SafeSaxParser }
 
   override predicate isSink(DataFlow::Node sink) {
     exists(MethodAccess ma |
-      sink.asExpr() = ma.getQualifier() and ma.getMethod().getDeclaringType() instanceof SAXParser
+      sink.asExpr() = ma.getQualifier() and ma.getMethod().getDeclaringType() instanceof SaxParser
     )
   }
 
   override int fieldFlowBranchLimit() { result = 0 }
 }
 
-/** A `SAXParser` created from a safely configured `SAXParserFactory`. */
-class SafeSAXParser extends MethodAccess {
-  SafeSAXParser() {
-    exists(SafeSAXParserFactoryToNewSAXParserFlowConfig sdf |
-      this.getMethod().getDeclaringType() instanceof SAXParserFactory and
+/** A `SaxParser` created from a safely configured `SaxParserFactory`. */
+class SafeSaxParser extends MethodAccess {
+  SafeSaxParser() {
+    exists(SafeSaxParserFactoryToNewSaxParserFlowConfig sdf |
+      this.getMethod().getDeclaringType() instanceof SaxParserFactory and
       this.getMethod().hasName("newSAXParser") and
       sdf.hasFlowToExpr(this.getQualifier())
     )
   }
 }
 
+/** DEPRECATED: Alias for SafeSaxParser */
+deprecated class SafeSAXParser = SafeSaxParser;
+
 /* SAXReader: https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html#saxreader */
 /**
  * The class `org.dom4j.io.SAXReader`.
  */
-class SAXReader extends RefType {
-  SAXReader() { this.hasQualifiedName("org.dom4j.io", "SAXReader") }
+class SaxReader extends RefType {
+  SaxReader() { this.hasQualifiedName("org.dom4j.io", "SAXReader") }
 }
 
-/** A call to `SAXReader.read`. */
-class SAXReaderRead extends XmlParserCall {
-  SAXReaderRead() {
+/** DEPRECATED: Alias for SaxReader */
+deprecated class SAXReader = SaxReader;
+
+/** A call to `SaxReader.read`. */
+class SaxReaderRead extends XmlParserCall {
+  SaxReaderRead() {
     exists(Method m |
       m = this.getMethod() and
-      m.getDeclaringType() instanceof SAXReader and
+      m.getDeclaringType() instanceof SaxReader and
       m.hasName("read")
     )
   }
@@ -570,52 +603,58 @@ class SAXReaderRead extends XmlParserCall {
   override Expr getSink() { result = this.getArgument(0) }
 
   override predicate isSafe() {
-    exists(SafeSAXReaderFlowConfig sr | sr.hasFlowToExpr(this.getQualifier()))
+    exists(SafeSaxReaderFlowConfig sr | sr.hasFlowToExpr(this.getQualifier()))
   }
 }
 
-/** A `ParserConfig` specific to `SAXReader`. */
-class SAXReaderConfig extends ParserConfig {
-  SAXReaderConfig() {
+/** DEPRECATED: Alias for SaxReaderRead */
+deprecated class SAXReaderRead = SaxReaderRead;
+
+/** A `ParserConfig` specific to `SaxReader`. */
+class SaxReaderConfig extends ParserConfig {
+  SaxReaderConfig() {
     exists(Method m |
       m = this.getMethod() and
-      m.getDeclaringType() instanceof SAXReader and
+      m.getDeclaringType() instanceof SaxReader and
       m.hasName("setFeature")
     )
   }
 }
 
-private class SafeSAXReaderFlowConfig extends DataFlow4::Configuration {
-  SafeSAXReaderFlowConfig() { this = "XmlParsers::SafeSAXReaderFlowConfig" }
+/** DEPRECATED: Alias for SaxReaderConfig */
+deprecated class SAXReaderConfig = SaxReaderConfig;
 
-  override predicate isSource(DataFlow::Node src) { src.asExpr() instanceof SafeSAXReader }
+private class SafeSaxReaderFlowConfig extends DataFlow4::Configuration {
+  SafeSaxReaderFlowConfig() { this = "XmlParsers::SafeSAXReaderFlowConfig" }
+
+  override predicate isSource(DataFlow::Node src) { src.asExpr() instanceof SafeSaxReader }
 
   override predicate isSink(DataFlow::Node sink) {
     exists(MethodAccess ma |
-      sink.asExpr() = ma.getQualifier() and ma.getMethod().getDeclaringType() instanceof SAXReader
+      sink.asExpr() = ma.getQualifier() and ma.getMethod().getDeclaringType() instanceof SaxReader
     )
   }
 
   override int fieldFlowBranchLimit() { result = 0 }
 }
 
-/** A safely configured `SAXReader`. */
-class SafeSAXReader extends VarAccess {
-  SafeSAXReader() {
+/** A safely configured `SaxReader`. */
+class SafeSaxReader extends VarAccess {
+  SafeSaxReader() {
     exists(Variable v | v = this.getVariable() |
-      exists(SAXReaderConfig config | config.getQualifier() = v.getAnAccess() |
+      exists(SaxReaderConfig config | config.getQualifier() = v.getAnAccess() |
         config
             .disables(any(ConstantStringExpr s |
                 s.getStringValue() = "http://xml.org/sax/features/external-general-entities"
               ))
       ) and
-      exists(SAXReaderConfig config | config.getQualifier() = v.getAnAccess() |
+      exists(SaxReaderConfig config | config.getQualifier() = v.getAnAccess() |
         config
             .disables(any(ConstantStringExpr s |
                 s.getStringValue() = "http://xml.org/sax/features/external-parameter-entities"
               ))
       ) and
-      exists(SAXReaderConfig config | config.getQualifier() = v.getAnAccess() |
+      exists(SaxReaderConfig config | config.getQualifier() = v.getAnAccess() |
         config
             .enables(any(ConstantStringExpr s |
                 s.getStringValue() = "http://apache.org/xml/features/disallow-doctype-decl"
@@ -625,18 +664,24 @@ class SafeSAXReader extends VarAccess {
   }
 }
 
+/** DEPRECATED: Alias for SafeSaxReader */
+deprecated class SafeSAXReader = SafeSaxReader;
+
 /* https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html#xmlreader */
-/** The class `org.xml.sax.XMLReader`. */
-class XMLReader extends RefType {
-  XMLReader() { this.hasQualifiedName("org.xml.sax", "XMLReader") }
+/** The class `org.xml.sax.XmlReader`. */
+class XmlReader extends RefType {
+  XmlReader() { this.hasQualifiedName("org.xml.sax", "XMLReader") }
 }
 
-/** A call to `XMLReader.read`. */
-class XMLReaderParse extends XmlParserCall {
-  XMLReaderParse() {
+/** DEPRECATED: Alias for XmlReader */
+deprecated class XMLReader = XmlReader;
+
+/** A call to `XmlReader.read`. */
+class XmlReaderParse extends XmlParserCall {
+  XmlReaderParse() {
     exists(Method m |
       m = this.getMethod() and
-      m.getDeclaringType() instanceof XMLReader and
+      m.getDeclaringType() instanceof XmlReader and
       m.hasName("parse")
     )
   }
@@ -644,59 +689,68 @@ class XMLReaderParse extends XmlParserCall {
   override Expr getSink() { result = this.getArgument(0) }
 
   override predicate isSafe() {
-    exists(ExplicitlySafeXMLReader sr | sr.flowsTo(this.getQualifier())) or
-    exists(CreatedSafeXMLReader cr | cr.flowsTo(this.getQualifier()))
+    exists(ExplicitlySafeXmlReader sr | sr.flowsTo(this.getQualifier())) or
+    exists(CreatedSafeXmlReader cr | cr.flowsTo(this.getQualifier()))
   }
 }
 
-/** A `ParserConfig` specific to the `XMLReader`. */
-class XMLReaderConfig extends ParserConfig {
-  XMLReaderConfig() {
+/** DEPRECATED: Alias for XmlReaderParse */
+deprecated class XMLReaderParse = XmlReaderParse;
+
+/** A `ParserConfig` specific to the `XmlReader`. */
+class XmlReaderConfig extends ParserConfig {
+  XmlReaderConfig() {
     exists(Method m |
       m = this.getMethod() and
-      m.getDeclaringType() instanceof XMLReader and
+      m.getDeclaringType() instanceof XmlReader and
       m.hasName("setFeature")
     )
   }
 }
 
-private class ExplicitlySafeXMLReaderFlowConfig extends DataFlow3::Configuration {
-  ExplicitlySafeXMLReaderFlowConfig() { this = "XmlParsers::ExplicitlySafeXMLReaderFlowConfig" }
+/** DEPRECATED: Alias for XmlReaderConfig */
+deprecated class XMLReaderConfig = XmlReaderConfig;
+
+private class ExplicitlySafeXmlReaderFlowConfig extends DataFlow3::Configuration {
+  ExplicitlySafeXmlReaderFlowConfig() { this = "XmlParsers::ExplicitlySafeXMLReaderFlowConfig" }
 
   override predicate isSource(DataFlow::Node src) {
-    src.asExpr() instanceof ExplicitlySafeXMLReader
+    src.asExpr() instanceof ExplicitlySafeXmlReader
   }
 
-  override predicate isSink(DataFlow::Node sink) { sink.asExpr() instanceof SafeXMLReaderFlowSink }
+  override predicate isSink(DataFlow::Node sink) { sink.asExpr() instanceof SafeXmlReaderFlowSink }
 
   override int fieldFlowBranchLimit() { result = 0 }
 }
 
-class SafeXMLReaderFlowSink extends Expr {
-  SafeXMLReaderFlowSink() {
-    this = any(XMLReaderParse p).getQualifier() or
-    this = any(ConstructedSAXSource s).getArgument(0) or
-    this = any(SAXSourceSetReader s).getArgument(0)
+class SafeXmlReaderFlowSink extends Expr {
+  SafeXmlReaderFlowSink() {
+    this = any(XmlReaderParse p).getQualifier() or
+    this = any(ConstructedSaxSource s).getArgument(0) or
+    this = any(SaxSourceSetReader s).getArgument(0)
   }
 }
 
-/** An `XMLReader` that is explicitly configured to be safe. */
-class ExplicitlySafeXMLReader extends VarAccess {
-  ExplicitlySafeXMLReader() {
+/** DEPRECATED: Alias for SafeXmlReaderFlowSink */
+deprecated class SafeXMLReaderFlowSink = SafeXmlReaderFlowSink;
+
+/** An `XmlReader` that is explicitly configured to be safe. */
+class ExplicitlySafeXmlReader extends VarAccess {
+  ExplicitlySafeXmlReader() {
     exists(Variable v | v = this.getVariable() |
-      exists(XMLReaderConfig config | config.getQualifier() = v.getAnAccess() |
+      exists(XmlReaderConfig config | config.getQualifier() = v.getAnAccess() |
         config
             .disables(any(ConstantStringExpr s |
                 s.getStringValue() = "http://xml.org/sax/features/external-general-entities"
               ))
       ) and
-      exists(XMLReaderConfig config | config.getQualifier() = v.getAnAccess() |
+      exists(XmlReaderConfig config | config.getQualifier() = v.getAnAccess() |
         config
             .disables(any(ConstantStringExpr s |
                 s.getStringValue() = "http://xml.org/sax/features/external-parameter-entities"
               ))
       ) and
-      exists(XMLReaderConfig config | config.getQualifier() = v.getAnAccess() |
+      exists(XmlReaderConfig config | config.getQualifier() = v.getAnAccess() |
         config
             .disables(any(ConstantStringExpr s |
                 s.getStringValue() =
@@ -704,7 +758,7 @@ class ExplicitlySafeXMLReader extends VarAccess {
               ))
       )
       or
-      exists(XMLReaderConfig config | config.getQualifier() = v.getAnAccess() |
+      exists(XmlReaderConfig config | config.getQualifier() = v.getAnAccess() |
         config
             .enables(any(ConstantStringExpr s |
                 s.getStringValue() = "http://apache.org/xml/features/disallow-doctype-decl"
@@ -713,35 +767,38 @@ class ExplicitlySafeXMLReader extends VarAccess {
     )
   }
 
-  predicate flowsTo(SafeXMLReaderFlowSink sink) {
-    any(ExplicitlySafeXMLReaderFlowConfig conf)
+  predicate flowsTo(SafeXmlReaderFlowSink sink) {
+    any(ExplicitlySafeXmlReaderFlowConfig conf)
         .hasFlow(DataFlow::exprNode(this), DataFlow::exprNode(sink))
   }
 }
 
-private class CreatedSafeXMLReaderFlowConfig extends DataFlow3::Configuration {
-  CreatedSafeXMLReaderFlowConfig() { this = "XmlParsers::CreatedSafeXMLReaderFlowConfig" }
+/** DEPRECATED: Alias for ExplicitlySafeXmlReader */
+deprecated class ExplicitlySafeXMLReader = ExplicitlySafeXmlReader;
 
-  override predicate isSource(DataFlow::Node src) { src.asExpr() instanceof CreatedSafeXMLReader }
+private class CreatedSafeXmlReaderFlowConfig extends DataFlow3::Configuration {
+  CreatedSafeXmlReaderFlowConfig() { this = "XmlParsers::CreatedSafeXMLReaderFlowConfig" }
 
-  override predicate isSink(DataFlow::Node sink) { sink.asExpr() instanceof SafeXMLReaderFlowSink }
+  override predicate isSource(DataFlow::Node src) { src.asExpr() instanceof CreatedSafeXmlReader }
+
+  override predicate isSink(DataFlow::Node sink) { sink.asExpr() instanceof SafeXmlReaderFlowSink }
 
   override int fieldFlowBranchLimit() { result = 0 }
 }
 
-/** An `XMLReader` that is obtained from a safe source. */
-class CreatedSafeXMLReader extends Call {
-  CreatedSafeXMLReader() {
+/** An `XmlReader` that is obtained from a safe source. */
+class CreatedSafeXmlReader extends Call {
+  CreatedSafeXmlReader() {
     //Obtained from SAXParser
-    exists(SafeSAXParserFlowConfig safeParser |
-      this.(MethodAccess).getMethod().getDeclaringType() instanceof SAXParser and
+    exists(SafeSaxParserFlowConfig safeParser |
+      this.(MethodAccess).getMethod().getDeclaringType() instanceof SaxParser and
       this.(MethodAccess).getMethod().hasName("getXMLReader") and
       safeParser.hasFlowToExpr(this.getQualifier())
     )
     or
     //Obtained from SAXReader
-    exists(SafeSAXReaderFlowConfig safeReader |
-      this.(MethodAccess).getMethod().getDeclaringType() instanceof SAXReader and
+    exists(SafeSaxReaderFlowConfig safeReader |
+      this.(MethodAccess).getMethod().getDeclaringType() instanceof SaxReader and
       this.(MethodAccess).getMethod().hasName("getXMLReader") and
       safeReader.hasFlowToExpr(this.getQualifier())
     )
@@ -753,28 +810,34 @@ class CreatedSafeXMLReader extends Call {
     )
   }
 
-  predicate flowsTo(SafeXMLReaderFlowSink sink) {
-    any(CreatedSafeXMLReaderFlowConfig conf)
+  predicate flowsTo(SafeXmlReaderFlowSink sink) {
+    any(CreatedSafeXmlReaderFlowConfig conf)
         .hasFlow(DataFlow::exprNode(this), DataFlow::exprNode(sink))
   }
 }
 
+/** DEPRECATED: Alias for CreatedSafeXmlReader */
+deprecated class CreatedSafeXMLReader = CreatedSafeXmlReader;
+
 /*
  * SAXSource in
  * https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html#jaxb-unmarshaller
  */
 
-/** The class `javax.xml.transform.sax.SAXSource` */
-class SAXSource extends RefType {
-  SAXSource() { this.hasQualifiedName("javax.xml.transform.sax", "SAXSource") }
+/** The class `javax.xml.transform.sax.SaxSource` */
+class SaxSource extends RefType {
+  SaxSource() { this.hasQualifiedName("javax.xml.transform.sax", "SAXSource") }
 }
 
-/** A call to the constructor of `SAXSource` with `XMLReader` and `InputSource`. */
-class ConstructedSAXSource extends ClassInstanceExpr {
-  ConstructedSAXSource() {
-    this.getConstructedType() instanceof SAXSource and
+/** DEPRECATED: Alias for SaxSource */
+deprecated class SAXSource = SaxSource;
+
+/** A call to the constructor of `SaxSource` with `XmlReader` and `InputSource`. */
+class ConstructedSaxSource extends ClassInstanceExpr {
+  ConstructedSaxSource() {
+    this.getConstructedType() instanceof SaxSource and
     this.getNumArgument() = 2 and
-    this.getArgument(0).getType() instanceof XMLReader
+    this.getArgument(0).getType() instanceof XmlReader
   }
 
   /**
@@ -782,40 +845,49 @@ class ConstructedSAXSource extends ClassInstanceExpr {
    */
   Expr getSink() { result = this.getArgument(1) }
 
-  /** Holds if the resulting `SAXSource` is safe. */
+  /** Holds if the resulting `SaxSource` is safe. */
   predicate isSafe() {
-    exists(CreatedSafeXMLReader safeReader | safeReader.flowsTo(this.getArgument(0))) or
-    exists(ExplicitlySafeXMLReader safeReader | safeReader.flowsTo(this.getArgument(0)))
+    exists(CreatedSafeXmlReader safeReader | safeReader.flowsTo(this.getArgument(0))) or
+    exists(ExplicitlySafeXmlReader safeReader | safeReader.flowsTo(this.getArgument(0)))
   }
 }
 
-/** A call to the `SAXSource.setXMLReader` method. */
-class SAXSourceSetReader extends MethodAccess {
-  SAXSourceSetReader() {
+/** DEPRECATED: Alias for ConstructedSaxSource */
+deprecated class ConstructedSAXSource = ConstructedSaxSource;
+
+/** A call to the `SaxSource.setXMLReader` method. */
+class SaxSourceSetReader extends MethodAccess {
+  SaxSourceSetReader() {
     exists(Method m |
       m = this.getMethod() and
-      m.getDeclaringType() instanceof SAXSource and
+      m.getDeclaringType() instanceof SaxSource and
       m.hasName("setXMLReader")
     )
   }
 }
 
-/** A `SAXSource` that is safe to use. */
-class SafeSAXSource extends Expr {
-  SafeSAXSource() {
+/** DEPRECATED: Alias for SaxSourceSetReader */
+deprecated class SAXSourceSetReader = SaxSourceSetReader;
+
+/** A `SaxSource` that is safe to use. */
+class SafeSaxSource extends Expr {
+  SafeSaxSource() {
     exists(Variable v | v = this.(VarAccess).getVariable() |
-      exists(SAXSourceSetReader s | s.getQualifier() = v.getAnAccess() |
+      exists(SaxSourceSetReader s | s.getQualifier() = v.getAnAccess() |
         (
-          exists(CreatedSafeXMLReader safeReader | safeReader.flowsTo(s.getArgument(0))) or
-          exists(ExplicitlySafeXMLReader safeReader | safeReader.flowsTo(s.getArgument(0)))
+          exists(CreatedSafeXmlReader safeReader | safeReader.flowsTo(s.getArgument(0))) or
+          exists(ExplicitlySafeXmlReader safeReader | safeReader.flowsTo(s.getArgument(0)))
         )
       )
     )
     or
-    this.(ConstructedSAXSource).isSafe()
+    this.(ConstructedSaxSource).isSafe()
   }
 }
 
+/** DEPRECATED: Alias for SafeSaxSource */
+deprecated class SafeSAXSource = SafeSaxSource;
+
 /* Transformer: https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html#transformerfactory */
 /** An access to a method use for configuring a transformer or schema. */
 abstract class TransformerConfig extends MethodAccess {
@@ -992,8 +1064,8 @@ class SafeTransformer extends MethodAccess {
  */
 
 /** A call to `SAXTransformerFactory.newFilter`. */
-class SAXTransformerFactoryNewXMLFilter extends XmlParserCall {
-  SAXTransformerFactoryNewXMLFilter() {
+class SaxTransformerFactoryNewXmlFilter extends XmlParserCall {
+  SaxTransformerFactoryNewXmlFilter() {
     exists(Method m |
       this.getMethod() = m and
       m.getDeclaringType().hasQualifiedName("javax.xml.transform.sax", "SAXTransformerFactory") and
@@ -1008,6 +1080,9 @@ class SAXTransformerFactoryNewXMLFilter extends XmlParserCall {
   }
 }
 
+/** DEPRECATED: Alias for SaxTransformerFactoryNewXmlFilter */
+deprecated class SAXTransformerFactoryNewXMLFilter = SaxTransformerFactoryNewXmlFilter;
+
 /* Schema: https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html#schemafactory */
 /** The class `javax.xml.validation.SchemaFactory`. */
 class SchemaFactory extends RefType {
@@ -1116,8 +1191,8 @@ class XPathEvaluate extends XmlParserCall {
 
 // Sink methods in simplexml http://simple.sourceforge.net/home.php
 /** A call to `read` or `validate` in `Persister`. */
-class SimpleXMLPersisterCall extends XmlParserCall {
-  SimpleXMLPersisterCall() {
+class SimpleXmlPersisterCall extends XmlParserCall {
+  SimpleXmlPersisterCall() {
     exists(Method m |
       this.getMethod() = m and
       (m.hasName("validate") or m.hasName("read")) and
@@ -1130,9 +1205,12 @@ class SimpleXMLPersisterCall extends XmlParserCall {
   override predicate isSafe() { none() }
 }
 
+/** DEPRECATED: Alias for SimpleXmlPersisterCall */
+deprecated class SimpleXMLPersisterCall = SimpleXmlPersisterCall;
+
 /** A call to `provide` in `Provider`. */
-class SimpleXMLProviderCall extends XmlParserCall {
-  SimpleXMLProviderCall() {
+class SimpleXmlProviderCall extends XmlParserCall {
+  SimpleXmlProviderCall() {
     exists(Method m |
       this.getMethod() = m and
       m.hasName("provide") and
@@ -1148,9 +1226,12 @@ class SimpleXMLProviderCall extends XmlParserCall {
   override predicate isSafe() { none() }
 }
 
+/** DEPRECATED: Alias for SimpleXmlProviderCall */
+deprecated class SimpleXMLProviderCall = SimpleXmlProviderCall;
+
 /** A call to `read` in `NodeBuilder`. */
-class SimpleXMLNodeBuilderCall extends XmlParserCall {
-  SimpleXMLNodeBuilderCall() {
+class SimpleXmlNodeBuilderCall extends XmlParserCall {
+  SimpleXmlNodeBuilderCall() {
     exists(Method m |
       this.getMethod() = m and
       m.hasName("read") and
@@ -1163,9 +1244,12 @@ class SimpleXMLNodeBuilderCall extends XmlParserCall {
   override predicate isSafe() { none() }
 }
 
+/** DEPRECATED: Alias for SimpleXmlNodeBuilderCall */
+deprecated class SimpleXMLNodeBuilderCall = SimpleXmlNodeBuilderCall;
+
 /** A call to the `format` method of the `Formatter`. */
-class SimpleXMLFormatterCall extends XmlParserCall {
-  SimpleXMLFormatterCall() {
+class SimpleXmlFormatterCall extends XmlParserCall {
+  SimpleXmlFormatterCall() {
     exists(Method m |
       this.getMethod() = m and
       m.hasName("format") and
@@ -1178,6 +1262,9 @@ class SimpleXMLFormatterCall extends XmlParserCall {
   override predicate isSafe() { none() }
 }
 
+/** DEPRECATED: Alias for SimpleXmlFormatterCall */
+deprecated class SimpleXMLFormatterCall = SimpleXmlFormatterCall;
+
 /** A configuration for secure processing. */
 Expr configSecureProcessing() {
   result.(ConstantStringExpr).getStringValue() =
diff --git a/java/ql/lib/semmle/code/java/security/XsltInjection.qll b/java/ql/lib/semmle/code/java/security/XsltInjection.qll
index 75288492004..db96879181c 100644
--- a/java/ql/lib/semmle/code/java/security/XsltInjection.qll
+++ b/java/ql/lib/semmle/code/java/security/XsltInjection.qll
@@ -112,7 +112,7 @@ private predicate documentBuilderStep(DataFlow::Node n1, DataFlow::Node n2) {
  * `new DOMSource(tainted)`.
  */
 private predicate domSourceStep(DataFlow::Node n1, DataFlow::Node n2) {
-  exists(ConstructorCall cc | cc.getConstructedType() instanceof TypeDOMSource |
+  exists(ConstructorCall cc | cc.getConstructedType() instanceof TypeDomSource |
     n1.asExpr() = cc.getAnArgument() and
     n2.asExpr() = cc
   )
@@ -179,8 +179,8 @@ private class TypeStAXSource extends Class {
 }
 
 /** The class `javax.xml.transform.dom.DOMSource`. */
-private class TypeDOMSource extends Class {
-  TypeDOMSource() { this.hasQualifiedName("javax.xml.transform.dom", "DOMSource") }
+private class TypeDomSource extends Class {
+  TypeDomSource() { this.hasQualifiedName("javax.xml.transform.dom", "DOMSource") }
 }
 
 /** The interface `javax.xml.transform.Templates`. */
diff --git a/java/ql/lib/semmle/code/xml/WebXML.qll b/java/ql/lib/semmle/code/xml/WebXML.qll
index c7dec5fd600..67e46b10026 100644
--- a/java/ql/lib/semmle/code/xml/WebXML.qll
+++ b/java/ql/lib/semmle/code/xml/WebXML.qll
@@ -3,13 +3,16 @@ import java
 /**
  * Holds if any `web.xml` files are included in this snapshot.
  */
-predicate isWebXMLIncluded() { exists(WebXMLFile webXML) }
+predicate isWebXmlIncluded() { exists(WebXmlFile webXml) }
+
+/** DEPRECATED: Alias for isWebXmlIncluded */
+deprecated predicate isWebXMLIncluded = isWebXmlIncluded/0;
 
 /**
  * A deployment descriptor file, typically called `web.xml`.
  */
-class WebXMLFile extends XMLFile {
-  WebXMLFile() {
+class WebXmlFile extends XMLFile {
+  WebXmlFile() {
     count(XMLElement e | e = this.getAChild()) = 1 and
     this.getAChild().getName() = "web-app"
   }
@@ -28,11 +31,14 @@ class WebXMLFile extends XMLFile {
   }
 }
 
+/** DEPRECATED: Alias for WebXmlFile */
+deprecated class WebXMLFile = WebXmlFile;
+
 /**
  * An XML element in a `WebXMLFile`.
  */
-class WebXMLElement extends XMLElement {
-  WebXMLElement() { this.getFile() instanceof WebXMLFile }
+class WebXmlElement extends XMLElement {
+  WebXmlElement() { this.getFile() instanceof WebXmlFile }
 
   /**
    * Gets the value for this element, with leading and trailing whitespace trimmed.
@@ -40,10 +46,13 @@ class WebXMLElement extends XMLElement {
   string getValue() { result = this.allCharactersString().trim() }
 }
 
+/** DEPRECATED: Alias for WebXmlElement */
+deprecated class WebXMLElement = WebXmlElement;
+
 /**
  * A `<context-param>` element in a `web.xml` file.
  */
-class WebContextParameter extends WebXMLElement {
+class WebContextParameter extends WebXmlElement {
   WebContextParameter() { this.getName() = "context-param" }
 
   /**
@@ -60,28 +69,28 @@ class WebContextParameter extends WebXMLElement {
 /**
  * A `<param-name>` element in a `web.xml` file.
  */
-class WebContextParamName extends WebXMLElement {
+class WebContextParamName extends WebXmlElement {
   WebContextParamName() { this.getName() = "param-name" }
 }
 
 /**
  * A `<param-value>` element in a `web.xml` file.
  */
-class WebContextParamValue extends WebXMLElement {
+class WebContextParamValue extends WebXmlElement {
   WebContextParamValue() { this.getName() = "param-value" }
 }
 
 /**
  * A `<filter>` element in a `web.xml` file.
  */
-class WebFilter extends WebXMLElement {
+class WebFilter extends WebXmlElement {
   WebFilter() { this.getName() = "filter" }
 }
 
 /**
  * A `<filter-class>` element in a `web.xml` file, nested under a `<filter>` element.
  */
-class WebFilterClass extends WebXMLElement {
+class WebFilterClass extends WebXmlElement {
   WebFilterClass() {
     this.getName() = "filter-class" and
     this.getParent() instanceof WebFilter
@@ -93,14 +102,14 @@ class WebFilterClass extends WebXMLElement {
 /**
  * A `<servlet>` element in a `web.xml` file.
  */
-class WebServlet extends WebXMLElement {
+class WebServlet extends WebXmlElement {
   WebServlet() { this.getName() = "servlet" }
 }
 
 /**
  * A `<servlet-class>` element in a `web.xml` file, nested under a `<servlet>` element.
  */
-class WebServletClass extends WebXMLElement {
+class WebServletClass extends WebXmlElement {
   WebServletClass() {
     this.getName() = "servlet-class" and
     this.getParent() instanceof WebServlet
@@ -112,14 +121,14 @@ class WebServletClass extends WebXMLElement {
 /**
  * A `<listener>` element in a `web.xml` file.
  */
-class WebListener extends WebXMLElement {
+class WebListener extends WebXmlElement {
   WebListener() { this.getName() = "listener" }
 }
 
 /**
  * A `<listener-class>` element in a `web.xml` file, nested under a `<listener>` element.
  */
-class WebListenerClass extends WebXMLElement {
+class WebListenerClass extends WebXmlElement {
   WebListenerClass() {
     this.getName() = "listener-class" and
     this.getParent() instanceof WebListener
@@ -134,7 +143,7 @@ class WebListenerClass extends WebXMLElement {
 /**
  * An `<error-page>` element in a `web.xml` file.
  */
-class WebErrorPage extends WebXMLElement {
+class WebErrorPage extends WebXmlElement {
   WebErrorPage() { this.getName() = "error-page" }
 
   /**
@@ -151,7 +160,7 @@ class WebErrorPage extends WebXMLElement {
 /**
  * An `<exception-type>` element in a `web.xml` file, nested under an `<error-page>` element.
  */
-class WebErrorPageType extends WebXMLElement {
+class WebErrorPageType extends WebXmlElement {
   WebErrorPageType() {
     this.getName() = "exception-type" and
     this.getParent() instanceof WebErrorPage
@@ -161,7 +170,7 @@ class WebErrorPageType extends WebXMLElement {
 /**
  * A `<location>` element in a `web.xml` file, nested under an `<error-page>` element.
  */
-class WebErrorPageLocation extends WebXMLElement {
+class WebErrorPageLocation extends WebXmlElement {
   WebErrorPageLocation() {
     this.getName() = "location" and
     this.getParent() instanceof WebErrorPage
diff --git a/java/ql/lib/semmle/code/xml/XML.qll b/java/ql/lib/semmle/code/xml/XML.qll
index d2e6c44951f..fb781a4683f 100755
--- a/java/ql/lib/semmle/code/xml/XML.qll
+++ b/java/ql/lib/semmle/code/xml/XML.qll
@@ -4,11 +4,11 @@
 
 import semmle.files.FileSystem
 
-private class TXMLLocatable =
+private class TXmlLocatable =
   @xmldtd or @xmlelement or @xmlattribute or @xmlnamespace or @xmlcomment or @xmlcharacters;
 
 /** An XML element that has a location. */
-class XMLLocatable extends @xmllocatable, TXMLLocatable {
+class XMLLocatable extends @xmllocatable, TXmlLocatable {
   /** Gets the source location for this element. */
   Location getLocation() { xmllocations(this, result) }
 
diff --git a/java/ql/src/Frameworks/Spring/Architecture/Refactoring Opportunities/UnusedBean.ql b/java/ql/src/Frameworks/Spring/Architecture/Refactoring Opportunities/UnusedBean.ql
index 32a83c26acf..504825807fd 100644
--- a/java/ql/src/Frameworks/Spring/Architecture/Refactoring Opportunities/UnusedBean.ql	
+++ b/java/ql/src/Frameworks/Spring/Architecture/Refactoring Opportunities/UnusedBean.ql	
@@ -100,7 +100,7 @@ class SpringPureClass extends Class {
       // Setter method by autowiring, either in the XML or by annotation
       c = this.getAMethod().(SpringBeanAutowiredCallable)
       or
-      c = this.getAMethod().(SpringBeanXMLAutowiredSetterMethod)
+      c = this.getAMethod().(SpringBeanXmlAutowiredSetterMethod)
     )
   }
 }
@@ -189,7 +189,7 @@ class LiveSpringBean extends SpringBean {
       )
       or
       // Injected by autowired specified in XML
-      exists(SpringBeanXMLAutowiredSetterMethod setterMethod |
+      exists(SpringBeanXmlAutowiredSetterMethod setterMethod |
         // The config method must be on a live bean
         setterMethod.getDeclaringType().(SpringBeanRefType).getSpringBean() instanceof
           LiveSpringBean
diff --git a/java/ql/src/Frameworks/Spring/Violations of Best Practice/UseShortcutForms.ql b/java/ql/src/Frameworks/Spring/Violations of Best Practice/UseShortcutForms.ql
index 1d924dc9d6d..b7aad1b85fb 100644
--- a/java/ql/src/Frameworks/Spring/Violations of Best Practice/UseShortcutForms.ql	
+++ b/java/ql/src/Frameworks/Spring/Violations of Best Practice/UseShortcutForms.ql	
@@ -51,7 +51,7 @@ class SpringPropertyUseShortcut extends SpringProperty {
   }
 }
 
-from SpringXMLElement springElement, string msg
+from SpringXmlElement springElement, string msg
 where
   exists(SpringConstructorArgUseShortcut cons | cons = springElement and msg = cons.getMessage())
   or
diff --git a/java/ql/src/Likely Bugs/Termination/ConstantLoopCondition.ql b/java/ql/src/Likely Bugs/Termination/ConstantLoopCondition.ql
index 41be2be2c52..3d0b45dabed 100644
--- a/java/ql/src/Likely Bugs/Termination/ConstantLoopCondition.ql	
+++ b/java/ql/src/Likely Bugs/Termination/ConstantLoopCondition.ql	
@@ -74,8 +74,8 @@ where
   ) and
   // None of the ssa variables in `cond` are updated inside the loop.
   forex(SsaVariable ssa, RValue use | ssa.getAUse() = use and use.getParent*() = cond |
-    not ssa.getCFGNode().getEnclosingStmt().getEnclosingStmt*() = loop or
-    ssa.getCFGNode().(Expr).getParent*() = loop.(ForStmt).getAnInit()
+    not ssa.getCfgNode().getEnclosingStmt().getEnclosingStmt*() = loop or
+    ssa.getCfgNode().(Expr).getParent*() = loop.(ForStmt).getAnInit()
   ) and
   // And `cond` does not use method calls, field reads, or array reads.
   not exists(MethodAccess ma | ma.getParent*() = cond) and
diff --git a/java/ql/src/Security/CWE/CWE-020/ExternalAPIsUsedWithUntrustedData.ql b/java/ql/src/Security/CWE/CWE-020/ExternalAPIsUsedWithUntrustedData.ql
index f9643429d72..23c82397de0 100644
--- a/java/ql/src/Security/CWE/CWE-020/ExternalAPIsUsedWithUntrustedData.ql
+++ b/java/ql/src/Security/CWE/CWE-020/ExternalAPIsUsedWithUntrustedData.ql
@@ -12,7 +12,7 @@ import java
 import semmle.code.java.security.ExternalAPIs
 import semmle.code.java.dataflow.DataFlow
 
-from ExternalAPIUsedWithUntrustedData externalAPI
-select externalAPI, count(externalAPI.getUntrustedDataNode()) as numberOfUses,
-  externalAPI.getNumberOfUntrustedSources() as numberOfUntrustedSources order by
+from ExternalApiUsedWithUntrustedData externalApi
+select externalApi, count(externalApi.getUntrustedDataNode()) as numberOfUses,
+  externalApi.getNumberOfUntrustedSources() as numberOfUntrustedSources order by
     numberOfUntrustedSources desc
diff --git a/java/ql/src/Security/CWE/CWE-020/UntrustedDataToExternalAPI.ql b/java/ql/src/Security/CWE/CWE-020/UntrustedDataToExternalAPI.ql
index 63c66ffa9d0..b4a2e209513 100644
--- a/java/ql/src/Security/CWE/CWE-020/UntrustedDataToExternalAPI.ql
+++ b/java/ql/src/Security/CWE/CWE-020/UntrustedDataToExternalAPI.ql
@@ -15,8 +15,8 @@ import semmle.code.java.dataflow.TaintTracking
 import semmle.code.java.security.ExternalAPIs
 import DataFlow::PathGraph
 
-from UntrustedDataToExternalAPIConfig config, DataFlow::PathNode source, DataFlow::PathNode sink
+from UntrustedDataToExternalApiConfig config, DataFlow::PathNode source, DataFlow::PathNode sink
 where config.hasFlowPath(source, sink)
 select sink, source, sink,
-  "Call to " + sink.getNode().(ExternalAPIDataNode).getMethodDescription() +
+  "Call to " + sink.getNode().(ExternalApiDataNode).getMethodDescription() +
     " with untrusted data from $@.", source, source.toString()
diff --git a/java/ql/src/Security/CWE/CWE-079/XSS.ql b/java/ql/src/Security/CWE/CWE-079/XSS.ql
index 885a6f7a47b..c488a5d08d4 100644
--- a/java/ql/src/Security/CWE/CWE-079/XSS.ql
+++ b/java/ql/src/Security/CWE/CWE-079/XSS.ql
@@ -16,8 +16,8 @@ import semmle.code.java.dataflow.FlowSources
 import semmle.code.java.security.XSS
 import DataFlow::PathGraph
 
-class XSSConfig extends TaintTracking::Configuration {
-  XSSConfig() { this = "XSSConfig" }
+class XssConfig extends TaintTracking::Configuration {
+  XssConfig() { this = "XSSConfig" }
 
   override predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
@@ -32,7 +32,7 @@ class XSSConfig extends TaintTracking::Configuration {
   }
 }
 
-from DataFlow::PathNode source, DataFlow::PathNode sink, XSSConfig conf
+from DataFlow::PathNode source, DataFlow::PathNode sink, XssConfig conf
 where conf.hasFlowPath(source, sink)
 select sink.getNode(), source, sink, "Cross-site scripting vulnerability due to $@.",
   source.getNode(), "user-provided value"
diff --git a/java/ql/src/Security/CWE/CWE-079/XSSLocal.ql b/java/ql/src/Security/CWE/CWE-079/XSSLocal.ql
index e16a9bbc2e9..da318a5b7cb 100644
--- a/java/ql/src/Security/CWE/CWE-079/XSSLocal.ql
+++ b/java/ql/src/Security/CWE/CWE-079/XSSLocal.ql
@@ -16,15 +16,15 @@ import semmle.code.java.dataflow.FlowSources
 import semmle.code.java.security.XSS
 import DataFlow::PathGraph
 
-class XSSLocalConfig extends TaintTracking::Configuration {
-  XSSLocalConfig() { this = "XSSLocalConfig" }
+class XssLocalConfig extends TaintTracking::Configuration {
+  XssLocalConfig() { this = "XSSLocalConfig" }
 
   override predicate isSource(DataFlow::Node source) { source instanceof LocalUserInput }
 
   override predicate isSink(DataFlow::Node sink) { sink instanceof XssSink }
 }
 
-from DataFlow::PathNode source, DataFlow::PathNode sink, XSSLocalConfig conf
+from DataFlow::PathNode source, DataFlow::PathNode sink, XssLocalConfig conf
 where conf.hasFlowPath(source, sink)
 select sink.getNode(), source, sink, "Cross-site scripting vulnerability due to $@.",
   source.getNode(), "user-provided value"
diff --git a/java/ql/src/Security/CWE/CWE-319/UseSSL.ql b/java/ql/src/Security/CWE/CWE-319/UseSSL.ql
index 1b267af52cf..ba3dee696dd 100644
--- a/java/ql/src/Security/CWE/CWE-319/UseSSL.ql
+++ b/java/ql/src/Security/CWE/CWE-319/UseSSL.ql
@@ -14,8 +14,8 @@ import java
 import semmle.code.java.dataflow.TypeFlow
 import semmle.code.java.security.Encryption
 
-class URLConnection extends RefType {
-  URLConnection() {
+class UrlConnection extends RefType {
+  UrlConnection() {
     this.getAnAncestor().hasQualifiedName("java.net", "URLConnection") and
     not this.hasName("JarURLConnection")
   }
@@ -29,7 +29,7 @@ from MethodAccess m, Class c, string type
 where
   m.getQualifier().getType() = c and
   (
-    c instanceof URLConnection and type = "connection"
+    c instanceof UrlConnection and type = "connection"
     or
     c instanceof Socket and type = "socket"
   ) and
diff --git a/java/ql/src/Security/CWE/CWE-611/XXE.ql b/java/ql/src/Security/CWE/CWE-611/XXE.ql
index bfcedb19d17..b50c9c7fef8 100644
--- a/java/ql/src/Security/CWE/CWE-611/XXE.ql
+++ b/java/ql/src/Security/CWE/CWE-611/XXE.ql
@@ -19,10 +19,10 @@ import semmle.code.java.dataflow.FlowSources
 import semmle.code.java.dataflow.TaintTracking2
 import DataFlow::PathGraph
 
-class SafeSAXSourceFlowConfig extends TaintTracking2::Configuration {
-  SafeSAXSourceFlowConfig() { this = "XmlParsers::SafeSAXSourceFlowConfig" }
+class SafeSaxSourceFlowConfig extends TaintTracking2::Configuration {
+  SafeSaxSourceFlowConfig() { this = "XmlParsers::SafeSAXSourceFlowConfig" }
 
-  override predicate isSource(DataFlow::Node src) { src.asExpr() instanceof SafeSAXSource }
+  override predicate isSource(DataFlow::Node src) { src.asExpr() instanceof SafeSaxSource }
 
   override predicate isSink(DataFlow::Node sink) {
     sink.asExpr() = any(XmlParserCall parse).getSink()
@@ -33,7 +33,7 @@ class SafeSAXSourceFlowConfig extends TaintTracking2::Configuration {
 
 class UnsafeXxeSink extends DataFlow::ExprNode {
   UnsafeXxeSink() {
-    not exists(SafeSAXSourceFlowConfig safeSource | safeSource.hasFlowTo(this)) and
+    not exists(SafeSaxSourceFlowConfig safeSource | safeSource.hasFlowTo(this)) and
     exists(XmlParserCall parse |
       parse.getSink() = this.getExpr() and
       not parse.isSafe()
diff --git a/java/ql/src/Telemetry/ExternalAPI.qll b/java/ql/src/Telemetry/ExternalAPI.qll
index c3bd101662d..e8a1e007c12 100644
--- a/java/ql/src/Telemetry/ExternalAPI.qll
+++ b/java/ql/src/Telemetry/ExternalAPI.qll
@@ -12,8 +12,8 @@ private import semmle.code.java.dataflow.TaintTracking
 /**
  * An external API from either the Java Standard Library or a 3rd party library.
  */
-class ExternalAPI extends Callable {
-  ExternalAPI() { not this.fromSource() }
+class ExternalApi extends Callable {
+  ExternalApi() { not this.fromSource() }
 
   /** Holds if this API is not worth supporting */
   predicate isUninteresting() { this.isTestLibrary() or this.isParameterlessConstructor() }
@@ -80,6 +80,9 @@ class ExternalAPI extends Callable {
   predicate isSupported() { this.hasSummary() or this.isSource() or this.isSink() }
 }
 
+/** DEPRECATED: Alias for ExternalApi */
+deprecated class ExternalAPI = ExternalApi;
+
 private class TestLibrary extends RefType {
   TestLibrary() {
     this.getPackage()
diff --git a/java/ql/src/Telemetry/ExternalLibraryUsage.ql b/java/ql/src/Telemetry/ExternalLibraryUsage.ql
index 93052f19d3b..fd29d2fbea0 100644
--- a/java/ql/src/Telemetry/ExternalLibraryUsage.ql
+++ b/java/ql/src/Telemetry/ExternalLibraryUsage.ql
@@ -12,7 +12,7 @@ import ExternalAPI
 from int usages, string jarname
 where
   usages =
-    strictcount(Call c, ExternalAPI a |
+    strictcount(Call c, ExternalApi a |
       c.getCallee().getSourceDeclaration() = a and
       not c.getFile() instanceof GeneratedFile and
       a.jarContainer() = jarname and
diff --git a/java/ql/src/Telemetry/SupportedExternalSinks.ql b/java/ql/src/Telemetry/SupportedExternalSinks.ql
index f39794a23be..fc831f9fa59 100644
--- a/java/ql/src/Telemetry/SupportedExternalSinks.ql
+++ b/java/ql/src/Telemetry/SupportedExternalSinks.ql
@@ -10,7 +10,7 @@ import java
 import ExternalAPI
 import semmle.code.java.GeneratedFiles
 
-from ExternalAPI api, int usages
+from ExternalApi api, int usages
 where
   not api.isUninteresting() and
   api.isSink() and
diff --git a/java/ql/src/Telemetry/SupportedExternalSources.ql b/java/ql/src/Telemetry/SupportedExternalSources.ql
index 91d51cd72fa..9e526007b00 100644
--- a/java/ql/src/Telemetry/SupportedExternalSources.ql
+++ b/java/ql/src/Telemetry/SupportedExternalSources.ql
@@ -10,7 +10,7 @@ import java
 import ExternalAPI
 import semmle.code.java.GeneratedFiles
 
-from ExternalAPI api, int usages
+from ExternalApi api, int usages
 where
   not api.isUninteresting() and
   api.isSource() and
diff --git a/java/ql/src/Telemetry/SupportedExternalTaint.ql b/java/ql/src/Telemetry/SupportedExternalTaint.ql
index 71721923dea..7e7032a4730 100644
--- a/java/ql/src/Telemetry/SupportedExternalTaint.ql
+++ b/java/ql/src/Telemetry/SupportedExternalTaint.ql
@@ -10,7 +10,7 @@ import java
 import ExternalAPI
 import semmle.code.java.GeneratedFiles
 
-from ExternalAPI api, int usages
+from ExternalApi api, int usages
 where
   not api.isUninteresting() and
   api.hasSummary() and
diff --git a/java/ql/src/Telemetry/UnsupportedExternalAPIs.ql b/java/ql/src/Telemetry/UnsupportedExternalAPIs.ql
index e79e4938438..ab9df45091d 100644
--- a/java/ql/src/Telemetry/UnsupportedExternalAPIs.ql
+++ b/java/ql/src/Telemetry/UnsupportedExternalAPIs.ql
@@ -10,7 +10,7 @@ import java
 import ExternalAPI
 import semmle.code.java.GeneratedFiles
 
-from ExternalAPI api, int usages
+from ExternalApi api, int usages
 where
   not api.isUninteresting() and
   not api.isSupported() and
diff --git a/java/ql/src/Violations of Best Practice/Dead Code/DeadLocals.qll b/java/ql/src/Violations of Best Practice/Dead Code/DeadLocals.qll
index a138351e656..82933aa9bac 100644
--- a/java/ql/src/Violations of Best Practice/Dead Code/DeadLocals.qll	
+++ b/java/ql/src/Violations of Best Practice/Dead Code/DeadLocals.qll	
@@ -44,8 +44,8 @@ predicate overwritten(SsaExplicitUpdate ssa) {
     not deadLocal(overwrite) and
     not overwrite.getDefiningExpr() instanceof LocalVariableDeclExpr and
     exists(BasicBlock bb1, BasicBlock bb2, int i, int j |
-      bb1.getNode(i) = ssa.getCFGNode() and
-      bb2.getNode(j) = overwrite.getCFGNode()
+      bb1.getNode(i) = ssa.getCfgNode() and
+      bb2.getNode(j) = overwrite.getCfgNode()
     |
       bb1.getABBSuccessor+() = bb2
       or
diff --git a/java/ql/src/experimental/Security/CWE/CWE-036/OpenStream.ql b/java/ql/src/experimental/Security/CWE/CWE-036/OpenStream.ql
index 871d6bb4737..efd2608f59c 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-036/OpenStream.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-036/OpenStream.ql
@@ -16,8 +16,8 @@ import semmle.code.java.dataflow.FlowSources
 import semmle.code.java.dataflow.ExternalFlow
 import DataFlow::PathGraph
 
-class URLConstructor extends ClassInstanceExpr {
-  URLConstructor() { this.getConstructor().getDeclaringType() instanceof TypeUrl }
+class UrlConstructor extends ClassInstanceExpr {
+  UrlConstructor() { this.getConstructor().getDeclaringType() instanceof TypeUrl }
 
   Expr stringArg() {
     // Query only in URL's that were constructed by calling the single parameter string constructor.
@@ -27,28 +27,28 @@ class URLConstructor extends ClassInstanceExpr {
   }
 }
 
-class URLOpenStreamMethod extends Method {
-  URLOpenStreamMethod() {
+class UrlOpenStreamMethod extends Method {
+  UrlOpenStreamMethod() {
     this.getDeclaringType() instanceof TypeUrl and
     this.getName() = "openStream"
   }
 }
 
-class RemoteURLToOpenStreamFlowConfig extends TaintTracking::Configuration {
-  RemoteURLToOpenStreamFlowConfig() { this = "OpenStream::RemoteURLToOpenStreamFlowConfig" }
+class RemoteUrlToOpenStreamFlowConfig extends TaintTracking::Configuration {
+  RemoteUrlToOpenStreamFlowConfig() { this = "OpenStream::RemoteURLToOpenStreamFlowConfig" }
 
   override predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
   override predicate isSink(DataFlow::Node sink) {
     exists(MethodAccess m |
-      sink.asExpr() = m.getQualifier() and m.getMethod() instanceof URLOpenStreamMethod
+      sink.asExpr() = m.getQualifier() and m.getMethod() instanceof UrlOpenStreamMethod
     )
     or
     sinkNode(sink, "url-open-stream")
   }
 
   override predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
-    exists(URLConstructor u |
+    exists(UrlConstructor u |
       node1.asExpr() = u.stringArg() and
       node2.asExpr() = u
     )
@@ -58,6 +58,6 @@ class RemoteURLToOpenStreamFlowConfig extends TaintTracking::Configuration {
 from DataFlow::PathNode source, DataFlow::PathNode sink, MethodAccess call
 where
   sink.getNode().asExpr() = call.getQualifier() and
-  any(RemoteURLToOpenStreamFlowConfig c).hasFlowPath(source, sink)
+  any(RemoteUrlToOpenStreamFlowConfig c).hasFlowPath(source, sink)
 select call, source, sink,
   "URL on which openStream is called may have been constructed from remote source"
diff --git a/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisCommonLib.qll b/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisCommonLib.qll
index f43f9a34128..b7f01ce06cd 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisCommonLib.qll
+++ b/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisCommonLib.qll
@@ -45,7 +45,7 @@ class ListType extends RefType {
 }
 
 /** Holds if the specified `method` uses MyBatis Mapper XMLElement `mmxx`. */
-predicate myBatisMapperXMLElementFromMethod(Method method, MyBatisMapperXMLElement mmxx) {
+predicate myBatisMapperXmlElementFromMethod(Method method, MyBatisMapperXmlElement mmxx) {
   exists(MyBatisMapperSqlOperation mbmxe | mbmxe.getMapperMethod() = method |
     mbmxe.getAChild*() = mmxx
     or
@@ -56,6 +56,9 @@ predicate myBatisMapperXMLElementFromMethod(Method method, MyBatisMapperXMLEleme
   )
 }
 
+/** DEPRECATED: Alias for myBatisMapperXmlElementFromMethod */
+deprecated predicate myBatisMapperXMLElementFromMethod = myBatisMapperXmlElementFromMethod/2;
+
 /** Holds if the specified `method` has Ibatis Sql operation annotation `isoa`. */
 predicate myBatisSqlOperationAnnotationFromMethod(Method method, IbatisSqlOperationAnnotation isoa) {
   exists(MyBatisSqlOperationAnnotationMethod msoam |
diff --git a/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisMapperXmlSqlInjection.ql b/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisMapperXmlSqlInjection.ql
index 908234fa3f3..9aeb95ea94a 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisMapperXmlSqlInjection.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisMapperXmlSqlInjection.ql
@@ -45,11 +45,11 @@ private class MyBatisMapperXmlSqlInjectionConfiguration extends TaintTracking::C
 
 from
   MyBatisMapperXmlSqlInjectionConfiguration cfg, DataFlow::PathNode source, DataFlow::PathNode sink,
-  MyBatisMapperXMLElement mmxe, MethodAccess ma, string unsafeExpression
+  MyBatisMapperXmlElement mmxe, MethodAccess ma, string unsafeExpression
 where
   cfg.hasFlowPath(source, sink) and
   ma.getAnArgument() = sink.getNode().asExpr() and
-  myBatisMapperXMLElementFromMethod(ma.getMethod(), mmxe) and
+  myBatisMapperXmlElementFromMethod(ma.getMethod(), mmxe) and
   unsafeExpression = getAMybatisXmlSetValue(mmxe) and
   (
     isMybatisXmlOrAnnotationSqlInjection(sink.getNode(), ma, unsafeExpression)
diff --git a/java/ql/src/experimental/Security/CWE/CWE-1004/InsecureTomcatConfig.ql b/java/ql/src/experimental/Security/CWE/CWE-1004/InsecureTomcatConfig.ql
index c8bff52333d..fbc3e0536b1 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-1004/InsecureTomcatConfig.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-1004/InsecureTomcatConfig.ql
@@ -17,10 +17,10 @@ private class HttpOnlyConfig extends WebContextParameter {
 
   string getParamValueElementValue() { result = this.getParamValue().getValue() }
 
-  predicate isHTTPOnlySet() { this.getParamValueElementValue().toLowerCase() = "false" }
+  predicate isHttpOnlySet() { this.getParamValueElementValue().toLowerCase() = "false" }
 }
 
 from HttpOnlyConfig config
-where config.isHTTPOnlySet()
+where config.isHttpOnlySet()
 select config,
   "httpOnly should be enabled in tomcat config file to help mitigate cross-site scripting (XSS) attacks"
diff --git a/java/ql/src/experimental/Security/CWE/CWE-548/InsecureDirectoryConfig.ql b/java/ql/src/experimental/Security/CWE/CWE-548/InsecureDirectoryConfig.ql
index c1667abdd3d..1ef4fb4d1f6 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-548/InsecureDirectoryConfig.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-548/InsecureDirectoryConfig.ql
@@ -27,7 +27,7 @@ private class DefaultTomcatServlet extends WebServletClass {
 /**
  * The `<init-param>` element in a `web.xml` file, nested under a `<servlet>` element controlling directory listing.
  */
-class DirectoryListingInitParam extends WebXMLElement {
+class DirectoryListingInitParam extends WebXmlElement {
   DirectoryListingInitParam() {
     this.getName() = "init-param" and
     this.getAChild("param-name").getTextValue() = "listings" and
diff --git a/java/ql/src/experimental/Security/CWE/CWE-552/UnsafeUrlForward.ql b/java/ql/src/experimental/Security/CWE/CWE-552/UnsafeUrlForward.ql
index 12f6b29d692..94cdaafa553 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-552/UnsafeUrlForward.ql
+++ b/java/ql/src/experimental/Security/CWE/CWE-552/UnsafeUrlForward.ql
@@ -23,7 +23,7 @@ class UnsafeUrlForwardFlowConfig extends TaintTracking::Configuration {
     not exists(MethodAccess ma, Method m | ma.getMethod() = m |
       (
         m instanceof HttpServletRequestGetRequestURIMethod or
-        m instanceof HttpServletRequestGetRequestURLMethod or
+        m instanceof HttpServletRequestGetRequestUrlMethod or
         m instanceof HttpServletRequestGetPathMethod
       ) and
       ma = source.asExpr()
diff --git a/java/ql/src/experimental/Security/CWE/CWE-611/XXELib.qll b/java/ql/src/experimental/Security/CWE/CWE-611/XXELib.qll
index 267b4bdef1d..996eca35850 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-611/XXELib.qll
+++ b/java/ql/src/experimental/Security/CWE/CWE-611/XXELib.qll
@@ -204,17 +204,20 @@ private class SafeDigesterFlowConfig extends DataFlow4::Configuration {
   override int fieldFlowBranchLimit() { result = 0 }
 }
 
-/** The class `java.beans.XMLDecoder`. */
-class XMLDecoder extends RefType {
-  XMLDecoder() { this.hasQualifiedName("java.beans", "XMLDecoder") }
+/** The class `java.beans.XmlDecoder`. */
+class XmlDecoder extends RefType {
+  XmlDecoder() { this.hasQualifiedName("java.beans", "XMLDecoder") }
 }
 
-/** A call to `XMLDecoder.readObject`. */
-class XMLDecoderReadObject extends XmlParserCall {
-  XMLDecoderReadObject() {
+/** DEPRECATED: Alias for XmlDecoder */
+deprecated class XMLDecoder = XmlDecoder;
+
+/** A call to `XmlDecoder.readObject`. */
+class XmlDecoderReadObject extends XmlParserCall {
+  XmlDecoderReadObject() {
     exists(Method m |
       this.getMethod() = m and
-      m.getDeclaringType() instanceof XMLDecoder and
+      m.getDeclaringType() instanceof XmlDecoder and
       m.hasName("readObject")
     )
   }
@@ -224,6 +227,9 @@ class XMLDecoderReadObject extends XmlParserCall {
   override predicate isSafe() { none() }
 }
 
+/** DEPRECATED: Alias for XmlDecoderReadObject */
+deprecated class XMLDecoderReadObject = XmlDecoderReadObject;
+
 private predicate constantStringExpr(Expr e, string val) {
   e.(CompileTimeConstantExpr).getStringValue() = val
   or
@@ -235,8 +241,8 @@ private predicate constantStringExpr(Expr e, string val) {
 }
 
 /** A call to `SAXTransformerFactory.newTransformerHandler`. */
-class SAXTransformerFactoryNewTransformerHandler extends XmlParserCall {
-  SAXTransformerFactoryNewTransformerHandler() {
+class SaxTransformerFactoryNewTransformerHandler extends XmlParserCall {
+  SaxTransformerFactoryNewTransformerHandler() {
     exists(Method m |
       this.getMethod() = m and
       m.getDeclaringType().hasQualifiedName("javax.xml.transform.sax", "SAXTransformerFactory") and
@@ -251,6 +257,10 @@ class SAXTransformerFactoryNewTransformerHandler extends XmlParserCall {
   }
 }
 
+/** DEPRECATED: Alias for SaxTransformerFactoryNewTransformerHandler */
+deprecated class SAXTransformerFactoryNewTransformerHandler =
+  SaxTransformerFactoryNewTransformerHandler;
+
 /** An expression that always has the same string value. */
 private class ConstantStringExpr extends Expr {
   string value;
diff --git a/java/ql/src/experimental/semmle/code/java/PathSanitizer.qll b/java/ql/src/experimental/semmle/code/java/PathSanitizer.qll
index 9e76410a6ff..aba7bba5238 100644
--- a/java/ql/src/experimental/semmle/code/java/PathSanitizer.qll
+++ b/java/ql/src/experimental/semmle/code/java/PathSanitizer.qll
@@ -102,7 +102,7 @@ private class BlockListBarrierGuard extends PathTraversalBarrierGuard instanceof
  * A guard that considers a string safe because it is checked for URL encoding sequences,
  * having previously been checked against a block-list of forbidden values.
  */
-private class URLEncodingBarrierGuard extends PathTraversalBarrierGuard instanceof UrlEncodingGuard {
+private class UrlEncodingBarrierGuard extends PathTraversalBarrierGuard instanceof UrlEncodingGuard {
   override predicate checks(Expr e, boolean branch) {
     e = super.getCheckedExpr() and
     branch = false and
diff --git a/java/ql/src/experimental/semmle/code/xml/StrutsXML.qll b/java/ql/src/experimental/semmle/code/xml/StrutsXML.qll
index 00580fe1e79..709a05dae0d 100644
--- a/java/ql/src/experimental/semmle/code/xml/StrutsXML.qll
+++ b/java/ql/src/experimental/semmle/code/xml/StrutsXML.qll
@@ -3,18 +3,21 @@ import java
 /**
  * A deployment descriptor file, typically called `struts.xml`.
  */
-class StrutsXMLFile extends XMLFile {
-  StrutsXMLFile() {
+class StrutsXmlFile extends XMLFile {
+  StrutsXmlFile() {
     count(XMLElement e | e = this.getAChild()) = 1 and
     this.getAChild().getName() = "struts"
   }
 }
 
+/** DEPRECATED: Alias for StrutsXmlFile */
+deprecated class StrutsXMLFile = StrutsXmlFile;
+
 /**
  * An XML element in a `StrutsXMLFile`.
  */
-class StrutsXMLElement extends XMLElement {
-  StrutsXMLElement() { this.getFile() instanceof StrutsXMLFile }
+class StrutsXmlElement extends XMLElement {
+  StrutsXmlElement() { this.getFile() instanceof StrutsXmlFile }
 
   /**
    * Gets the value for this element, with leading and trailing whitespace trimmed.
@@ -22,10 +25,13 @@ class StrutsXMLElement extends XMLElement {
   string getValue() { result = this.allCharactersString().trim() }
 }
 
+/** DEPRECATED: Alias for StrutsXmlElement */
+deprecated class StrutsXMLElement = StrutsXmlElement;
+
 /**
  * A `<constant>` element in a `StrutsXMLFile`.
  */
-class ConstantParameter extends StrutsXMLElement {
+class ConstantParameter extends StrutsXmlElement {
   ConstantParameter() { this.getName() = "constant" }
 
   /**
diff --git a/java/ql/src/meta/ssa/AmbiguousToString.ql b/java/ql/src/meta/ssa/AmbiguousToString.ql
index ef9439705de..817685cf609 100644
--- a/java/ql/src/meta/ssa/AmbiguousToString.ql
+++ b/java/ql/src/meta/ssa/AmbiguousToString.ql
@@ -22,6 +22,6 @@ where
     or
     multipleToString(ssa) and problem = "SSA variable with multiple 'toString()' results for "
   ) and
-  n = ssa.getCFGNode() and
+  n = ssa.getCfgNode() and
   v = ssa.getSourceVariable().getVariable()
 select n, problem + v
diff --git a/java/ql/src/semmle/code/xml/MyBatisMapperXML.qll b/java/ql/src/semmle/code/xml/MyBatisMapperXML.qll
index 5eff757a93d..856729dcce5 100644
--- a/java/ql/src/semmle/code/xml/MyBatisMapperXML.qll
+++ b/java/ql/src/semmle/code/xml/MyBatisMapperXML.qll
@@ -7,18 +7,21 @@ import java
 /**
  * MyBatis Mapper XML file.
  */
-class MyBatisMapperXMLFile extends XMLFile {
-  MyBatisMapperXMLFile() {
+class MyBatisMapperXmlFile extends XMLFile {
+  MyBatisMapperXmlFile() {
     count(XMLElement e | e = this.getAChild()) = 1 and
     this.getAChild().getName() = "mapper"
   }
 }
 
+/** DEPRECATED: Alias for MyBatisMapperXmlFile */
+deprecated class MyBatisMapperXMLFile = MyBatisMapperXmlFile;
+
 /**
  * An XML element in a `MyBatisMapperXMLFile`.
  */
-class MyBatisMapperXMLElement extends XMLElement {
-  MyBatisMapperXMLElement() { this.getFile() instanceof MyBatisMapperXMLFile }
+class MyBatisMapperXmlElement extends XMLElement {
+  MyBatisMapperXmlElement() { this.getFile() instanceof MyBatisMapperXmlFile }
 
   /**
    * Gets the value for this element, with leading and trailing whitespace trimmed.
@@ -33,10 +36,13 @@ class MyBatisMapperXMLElement extends XMLElement {
   }
 }
 
+/** DEPRECATED: Alias for MyBatisMapperXmlElement */
+deprecated class MyBatisMapperXMLElement = MyBatisMapperXmlElement;
+
 /**
  * An MyBatis Mapper sql operation element.
  */
-abstract class MyBatisMapperSqlOperation extends MyBatisMapperXMLElement {
+abstract class MyBatisMapperSqlOperation extends MyBatisMapperXmlElement {
   /**
    * Gets the value of the `id` attribute of MyBatis Mapper sql operation element.
    */
@@ -52,7 +58,7 @@ abstract class MyBatisMapperSqlOperation extends MyBatisMapperXMLElement {
    */
   Method getMapperMethod() {
     result.getName() = this.getId() and
-    result.getDeclaringType() = this.getParent().(MyBatisMapperXMLElement).getNamespaceRefType()
+    result.getDeclaringType() = this.getParent().(MyBatisMapperXmlElement).getNamespaceRefType()
   }
 }
 
@@ -87,7 +93,7 @@ class MyBatisMapperSelect extends MyBatisMapperSqlOperation {
 /**
  * A `<sql>` element in a `MyBatisMapperXMLElement`.
  */
-class MyBatisMapperSql extends MyBatisMapperXMLElement {
+class MyBatisMapperSql extends MyBatisMapperXmlElement {
   MyBatisMapperSql() { this.getName() = "sql" }
 
   /**
@@ -99,7 +105,7 @@ class MyBatisMapperSql extends MyBatisMapperXMLElement {
 /**
  * A `<include>` element in a `MyBatisMapperXMLElement`.
  */
-class MyBatisMapperInclude extends MyBatisMapperXMLElement {
+class MyBatisMapperInclude extends MyBatisMapperXmlElement {
   MyBatisMapperInclude() { this.getName() = "include" }
 
   /**
@@ -111,6 +117,6 @@ class MyBatisMapperInclude extends MyBatisMapperXMLElement {
 /**
  * A `<foreach>` element in a `MyBatisMapperXMLElement`.
  */
-class MyBatisMapperForeach extends MyBatisMapperXMLElement {
+class MyBatisMapperForeach extends MyBatisMapperXmlElement {
   MyBatisMapperForeach() { this.getName() = "foreach" }
 }
diff --git a/java/ql/src/utils/model-generator/CaptureSinkModels.ql b/java/ql/src/utils/model-generator/CaptureSinkModels.ql
index aab52da3058..9f574cf84c9 100644
--- a/java/ql/src/utils/model-generator/CaptureSinkModels.ql
+++ b/java/ql/src/utils/model-generator/CaptureSinkModels.ql
@@ -43,7 +43,7 @@ string asInputArgument(DataFlow::Node source) {
   result = "Argument[-1]"
 }
 
-string captureSink(TargetAPI api) {
+string captureSink(TargetApi api) {
   exists(DataFlow::Node src, DataFlow::Node sink, PropagateToSinkConfiguration config, string kind |
     config.hasFlow(src, sink) and
     sinkNode(sink, kind) and
@@ -53,6 +53,6 @@ string captureSink(TargetAPI api) {
   )
 }
 
-from TargetAPI api, string sink
+from TargetApi api, string sink
 where sink = captureSink(api)
 select sink order by sink
diff --git a/java/ql/src/utils/model-generator/CaptureSourceModels.ql b/java/ql/src/utils/model-generator/CaptureSourceModels.ql
index 7cb9d2f19b3..e36ba324068 100644
--- a/java/ql/src/utils/model-generator/CaptureSourceModels.ql
+++ b/java/ql/src/utils/model-generator/CaptureSourceModels.ql
@@ -22,7 +22,7 @@ class FromSourceConfiguration extends TaintTracking::Configuration {
   override predicate isSource(DataFlow::Node source) { sourceNode(source, _) }
 
   override predicate isSink(DataFlow::Node sink) {
-    exists(TargetAPI c |
+    exists(TargetApi c |
       sink instanceof ReturnNodeExt and
       sink.getEnclosingCallable() = c and
       c.isPublic() and
@@ -39,7 +39,7 @@ class FromSourceConfiguration extends TaintTracking::Configuration {
   }
 }
 
-string captureSource(TargetAPI api) {
+string captureSource(TargetApi api) {
   exists(DataFlow::Node source, DataFlow::Node sink, FromSourceConfiguration config, string kind |
     config.hasFlow(source, sink) and
     sourceNode(source, kind) and
@@ -48,6 +48,6 @@ string captureSource(TargetAPI api) {
   )
 }
 
-from TargetAPI api, string sink
+from TargetApi api, string sink
 where sink = captureSource(api)
 select sink order by sink
diff --git a/java/ql/src/utils/model-generator/CaptureSummaryModels.ql b/java/ql/src/utils/model-generator/CaptureSummaryModels.ql
index 280e0a19d7d..f190af7ba4b 100644
--- a/java/ql/src/utils/model-generator/CaptureSummaryModels.ql
+++ b/java/ql/src/utils/model-generator/CaptureSummaryModels.ql
@@ -12,7 +12,7 @@ import semmle.code.java.dataflow.internal.DataFlowPrivate
 import semmle.code.java.dataflow.InstanceAccess
 import ModelGeneratorUtils
 
-string captureFlow(TargetAPI api) {
+string captureFlow(TargetApi api) {
   result = captureQualifierFlow(api) or
   result = captureThroughFlow(api)
 }
@@ -29,7 +29,7 @@ string captureFlow(TargetAPI api) {
  * }
  * ```
  */
-string captureQualifierFlow(TargetAPI api) {
+string captureQualifierFlow(TargetApi api) {
   exists(ReturnStmt rtn |
     rtn.getEnclosingCallable() = api and
     rtn.getResult().(ThisAccess).isOwnInstanceAccess()
@@ -50,7 +50,7 @@ class ThroughFlowConfig extends TaintTracking::Configuration {
 
   override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) {
     source instanceof DataFlow::ParameterNode and
-    source.getEnclosingCallable() instanceof TargetAPI and
+    source.getEnclosingCallable() instanceof TargetApi and
     state instanceof TaintRead
   }
 
@@ -145,7 +145,7 @@ class ThroughFlowConfig extends TaintTracking::Configuration {
  * Captured Model:
  * `p;Foo;true;addToList;;Argument[0];Argument[1];taint`
  */
-string captureThroughFlow(TargetAPI api) {
+string captureThroughFlow(TargetApi api) {
   exists(
     ThroughFlowConfig config, DataFlow::ParameterNode p, ReturnNodeExt returnNodeExt, string input,
     string output
@@ -159,6 +159,6 @@ string captureThroughFlow(TargetAPI api) {
   )
 }
 
-from TargetAPI api, string flow
+from TargetApi api, string flow
 where flow = captureFlow(api)
 select flow order by flow
diff --git a/java/ql/src/utils/model-generator/ModelGeneratorUtils.qll b/java/ql/src/utils/model-generator/ModelGeneratorUtils.qll
index f990a2e2fad..abfe750342f 100644
--- a/java/ql/src/utils/model-generator/ModelGeneratorUtils.qll
+++ b/java/ql/src/utils/model-generator/ModelGeneratorUtils.qll
@@ -11,8 +11,8 @@ Method superImpl(Method m) {
   not m instanceof ToStringMethod
 }
 
-class TargetAPI extends Callable {
-  TargetAPI() {
+class TargetApi extends Callable {
+  TargetApi() {
     this.isPublic() and
     this.fromSource() and
     (
@@ -23,6 +23,9 @@ class TargetAPI extends Callable {
   }
 }
 
+/** DEPRECATED: Alias for TargetApi */
+deprecated class TargetAPI = TargetApi;
+
 private string isExtensible(RefType ref) {
   if ref.isFinal() then result = "false" else result = "true"
 }
@@ -59,17 +62,17 @@ private predicate isJdkInternal(CompilationUnit cu) {
 }
 
 bindingset[input, output]
-string asTaintModel(TargetAPI api, string input, string output) {
+string asTaintModel(TargetApi api, string input, string output) {
   result = asSummaryModel(api, input, output, "taint")
 }
 
 bindingset[input, output]
-string asValueModel(TargetAPI api, string input, string output) {
+string asValueModel(TargetApi api, string input, string output) {
   result = asSummaryModel(api, input, output, "value")
 }
 
 bindingset[input, output, kind]
-string asSummaryModel(TargetAPI api, string input, string output, string kind) {
+string asSummaryModel(TargetApi api, string input, string output, string kind) {
   result =
     asPartialModel(api) + input + ";" //
       + output + ";" //
@@ -77,19 +80,19 @@ string asSummaryModel(TargetAPI api, string input, string output, string kind) {
 }
 
 bindingset[input, kind]
-string asSinkModel(TargetAPI api, string input, string kind) {
+string asSinkModel(TargetApi api, string input, string kind) {
   result = asPartialModel(api) + input + ";" + kind
 }
 
 bindingset[output, kind]
-string asSourceModel(TargetAPI api, string output, string kind) {
+string asSourceModel(TargetApi api, string output, string kind) {
   result = asPartialModel(api) + output + ";" + kind
 }
 
 /**
  * Computes the first 6 columns for CSV rows.
  */
-private string asPartialModel(TargetAPI api) {
+private string asPartialModel(TargetApi api) {
   result =
     typeAsSummaryModel(api) + ";" //
       + isExtensible(bestTypeForModel(api)) + ";" //
@@ -102,9 +105,9 @@ private string asPartialModel(TargetAPI api) {
  * Returns the appropriate type name for the model. Either the type
  * declaring the method or the supertype introducing the method.
  */
-private string typeAsSummaryModel(TargetAPI api) { result = typeAsModel(bestTypeForModel(api)) }
+private string typeAsSummaryModel(TargetApi api) { result = typeAsModel(bestTypeForModel(api)) }
 
-private RefType bestTypeForModel(TargetAPI api) {
+private RefType bestTypeForModel(TargetApi api) {
   if exists(superImpl(api))
   then superImpl(api).fromSource() and result = superImpl(api).getDeclaringType()
   else result = api.getDeclaringType()
diff --git a/java/ql/test/library-tests/ssa/ssaDef.ql b/java/ql/test/library-tests/ssa/ssaDef.ql
index 9f08ddc0c40..c487c539e78 100644
--- a/java/ql/test/library-tests/ssa/ssaDef.ql
+++ b/java/ql/test/library-tests/ssa/ssaDef.ql
@@ -9,4 +9,4 @@ where
     or
     not exists(ssa.toString()) and s = "error"
   )
-select v, ssa.getCFGNode(), s
+select v, ssa.getCfgNode(), s
diff --git a/java/ql/test/library-tests/ssa/ssaPhi.ql b/java/ql/test/library-tests/ssa/ssaPhi.ql
index 11fc2d8d595..8aa0942e90a 100644
--- a/java/ql/test/library-tests/ssa/ssaPhi.ql
+++ b/java/ql/test/library-tests/ssa/ssaPhi.ql
@@ -3,4 +3,4 @@ import semmle.code.java.dataflow.SSA
 
 from SsaPhiNode ssa, SsaSourceVariable v, SsaVariable phiInput
 where ssa.getAPhiInput() = phiInput and ssa.getSourceVariable() = v
-select v, ssa.getCFGNode(), phiInput.getCFGNode()
+select v, ssa.getCfgNode(), phiInput.getCfgNode()
diff --git a/java/ql/test/library-tests/ssa/ssaUse.ql b/java/ql/test/library-tests/ssa/ssaUse.ql
index 53414a88064..cab6f47c955 100644
--- a/java/ql/test/library-tests/ssa/ssaUse.ql
+++ b/java/ql/test/library-tests/ssa/ssaUse.ql
@@ -3,4 +3,4 @@ import semmle.code.java.dataflow.SSA
 
 from SsaVariable ssa, SsaSourceVariable v, Expr use
 where use = ssa.getAUse() and ssa.getSourceVariable() = v
-select v, ssa.getCFGNode(), ssa.toString(), use
+select v, ssa.getCfgNode(), ssa.toString(), use
diff --git a/java/ql/test/query-tests/security/CWE-079/semmle/tests/XSS.ql b/java/ql/test/query-tests/security/CWE-079/semmle/tests/XSS.ql
index 6bfde865e85..afb0f7ae3e1 100644
--- a/java/ql/test/query-tests/security/CWE-079/semmle/tests/XSS.ql
+++ b/java/ql/test/query-tests/security/CWE-079/semmle/tests/XSS.ql
@@ -3,8 +3,8 @@ import semmle.code.java.dataflow.FlowSources
 import semmle.code.java.security.XSS
 import TestUtilities.InlineExpectationsTest
 
-class XSSConfig extends TaintTracking::Configuration {
-  XSSConfig() { this = "XSSConfig" }
+class XssConfig extends TaintTracking::Configuration {
+  XssConfig() { this = "XSSConfig" }
 
   override predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
@@ -24,7 +24,7 @@ class XssTest extends InlineExpectationsTest {
 
   override predicate hasActualResult(Location location, string element, string tag, string value) {
     tag = "xss" and
-    exists(DataFlow::Node src, DataFlow::Node sink, XSSConfig conf | conf.hasFlow(src, sink) |
+    exists(DataFlow::Node src, DataFlow::Node sink, XssConfig conf | conf.hasFlow(src, sink) |
       sink.getLocation() = location and
       element = sink.toString() and
       value = ""
diff --git a/javascript/ql/examples/snippets/jsxattribute.ql b/javascript/ql/examples/snippets/jsxattribute.ql
index ad7a6458667..b55abc09dd0 100644
--- a/javascript/ql/examples/snippets/jsxattribute.ql
+++ b/javascript/ql/examples/snippets/jsxattribute.ql
@@ -8,6 +8,6 @@
 
 import javascript
 
-from JSXAttribute a
+from JsxAttribute a
 where a.getName() = "dangerouslySetInnerHTML"
 select a
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/ATMConfig.qll b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/ATMConfig.qll
index bec90be46cc..4e07bec6536 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/ATMConfig.qll
+++ b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/ATMConfig.qll
@@ -28,9 +28,9 @@ import EndpointTypes
  * `isAdditionalFlowStep` with a more generalised definition of additional edges. See
  * `NosqlInjectionATM.qll` for an example of doing this.
  */
-abstract class ATMConfig extends string {
+abstract class AtmConfig extends string {
   bindingset[this]
-  ATMConfig() { any() }
+  AtmConfig() { any() }
 
   /**
    * EXPERIMENTAL. This API may change in the future.
@@ -110,3 +110,6 @@ abstract class ATMConfig extends string {
    */
   float getScoreCutoff() { result = 0.0 }
 }
+
+/** DEPRECATED: Alias for AtmConfig */
+deprecated class ATMConfig = AtmConfig;
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/BaseScoring.qll b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/BaseScoring.qll
index 1af5966997a..a6787196bbb 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/BaseScoring.qll
+++ b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/BaseScoring.qll
@@ -12,7 +12,7 @@ external predicate availableMlModels(
 );
 
 /** Get the ATM configuration. */
-ATMConfig getCfg() { any() }
+AtmConfig getCfg() { any() }
 
 /**
  * A string containing scoring information produced by a scoring model.
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/CoreKnowledge.qll b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/CoreKnowledge.qll
index 4f0ad84b238..23ba238ff99 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/CoreKnowledge.qll
+++ b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/CoreKnowledge.qll
@@ -61,7 +61,7 @@ predicate isArgumentToKnownLibrarySinkFunction(DataFlow::Node n) {
  * This corresponds to known sinks from security queries whose sources include remote flow and
  * DOM-based sources.
  */
-predicate isKnownExternalAPIQuerySink(DataFlow::Node n) {
+predicate isKnownExternalApiQuerySink(DataFlow::Node n) {
   n instanceof Xxe::Sink or
   n instanceof TaintedPath::Sink or
   n instanceof XpathInjection::Sink or
@@ -86,11 +86,14 @@ predicate isKnownExternalAPIQuerySink(DataFlow::Node n) {
   n instanceof HttpToFileAccess::Sink
 }
 
+/** DEPRECATED: Alias for isKnownExternalApiQuerySink */
+deprecated predicate isKnownExternalAPIQuerySink = isKnownExternalApiQuerySink/1;
+
 /**
  * Holds if the node `n` is a known sink in a modeled library.
  */
 predicate isKnownLibrarySink(DataFlow::Node n) {
-  isKnownExternalAPIQuerySink(n) or
+  isKnownExternalApiQuerySink(n) or
   n instanceof CleartextLogging::Sink or
   n instanceof StackTraceExposure::Sink or
   n instanceof ShellCommandInjectionFromEnvironment::Sink or
@@ -207,7 +210,7 @@ predicate isOtherModeledArgument(DataFlow::Node n, FilteringReason reason) {
       DatabaseAccess and
     reason instanceof DatabaseAccessReason
     or
-    call = DOM::domValueRef() and reason instanceof DOMReason
+    call = DOM::domValueRef() and reason instanceof DomReason
     or
     call.getCalleeName() = "next" and
     exists(DataFlow::FunctionNode f | call = f.getLastParameter().getACall()) and
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/FilteringReasons.qll b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/FilteringReasons.qll
index 063cf567fc9..4b0cdb986e8 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/FilteringReasons.qll
+++ b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/FilteringReasons.qll
@@ -24,7 +24,7 @@ newtype TFilteringReason =
   TMembershipCandidateTestReason() or
   TFileSystemAccessReason() or
   TDatabaseAccessReason() or
-  TDOMReason() or
+  TDomReason() or
   TNextFunctionCallReason() or
   TArgumentToArrayReason() or
   TArgumentToBuiltinGlobalVarRefReason() or
@@ -161,12 +161,15 @@ class DatabaseAccessReason extends NotASinkReason, TDatabaseAccessReason {
   override int getEncoding() { result = 21 }
 }
 
-class DOMReason extends NotASinkReason, TDOMReason {
+class DomReason extends NotASinkReason, TDomReason {
   override string getDescription() { result = "DOM" }
 
   override int getEncoding() { result = 22 }
 }
 
+/** DEPRECATED: Alias for DomReason */
+deprecated class DOMReason = DomReason;
+
 class NextFunctionCallReason extends NotASinkReason, TNextFunctionCallReason {
   override string getDescription() { result = "NextFunctionCall" }
 
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/FunctionBodyFeatures.qll b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/FunctionBodyFeatures.qll
index 6459a30250f..4b1a5778cc0 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/FunctionBodyFeatures.qll
+++ b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/FunctionBodyFeatures.qll
@@ -10,7 +10,7 @@ private import FeaturizationConfig
 /**
  * Gets a tokenized representation of the AST node for use in the `enclosingFunctionBody` feature.
  */
-string getTokenizedAstNode(ASTNode node) {
+string getTokenizedAstNode(AstNode node) {
   // e.g. `x` -> "x"
   result = node.(Identifier).getName()
   or
@@ -35,12 +35,15 @@ string getTokenizedAstNode(ASTNode node) {
 
 /** Gets an AST node within the function `f` that we should featurize. */
 pragma[inline]
-ASTNode getAnASTNodeToFeaturize(Function f) {
+AstNode getAnAstNodeToFeaturize(Function f) {
   result.getParent*() = f and
   // Don't featurize the function name as part of the function body tokens
   not result = f.getIdentifier()
 }
 
+/** DEPRECATED: Alias for getAnAstNodeToFeaturize */
+deprecated ASTNode getAnASTNodeToFeaturize(Function f) { result = getAnAstNodeToFeaturize(f) }
+
 /**
  * Gets a function that contains the endpoint.
  *
@@ -72,7 +75,7 @@ private int getMaxNumAstNodes() { result = 1024 }
 private int getNumAstNodesInFunction(Function function) {
   // Restrict the values `function` can take on
   function = getAFunctionForEndpoint(_) and
-  result = count(getAnASTNodeToFeaturize(function))
+  result = count(getAnAstNodeToFeaturize(function))
 }
 
 /**
@@ -121,16 +124,19 @@ Function getRepresentativeFunctionForEndpoint(DataFlow::Node endpoint) {
 }
 
 /** Returns an AST node within the function `f` that an associated token feature. */
-ASTNode getAnASTNodeWithAFeature(Function f) {
+AstNode getAnAstNodeWithAFeature(Function f) {
   // Performance optimization: Restrict the set of functions to those containing an endpoint to featurize.
   f = getRepresentativeFunctionForEndpoint(any(FeaturizationConfig cfg).getAnEndpointToFeaturize()) and
-  result = getAnASTNodeToFeaturize(f)
+  result = getAnAstNodeToFeaturize(f)
 }
 
+/** DEPRECATED: Alias for getAnAstNodeWithAFeature */
+deprecated ASTNode getAnASTNodeWithAFeature(Function f) { result = getAnAstNodeWithAFeature(f) }
+
 /** Returns the number of source-code characters in a function. */
 int getNumCharsInFunction(Function f) {
   result =
-    strictsum(ASTNode node | node = getAnASTNodeWithAFeature(f) | getTokenizedAstNode(node).length())
+    strictsum(AstNode node | node = getAnAstNodeWithAFeature(f) | getTokenizedAstNode(node).length())
 }
 
 /**
@@ -149,8 +155,8 @@ string getBodyTokensFeature(Function function) {
   // large body features are replaced by the absent token.
   //
   // We count nodes instead of tokens because tokens are often not unique.
-  strictcount(ASTNode node |
-    node = getAnASTNodeToFeaturize(function) and
+  strictcount(AstNode node |
+    node = getAnAstNodeToFeaturize(function) and
     exists(getTokenizedAstNode(node))
   ) <= 256 and
   // Performance optimization: If a function has more than getMaxChars() characters in its body subtokens,
@@ -161,8 +167,8 @@ string getBodyTokensFeature(Function function) {
       // The use of a nested exists here allows us to avoid duplicates due to two AST nodes in the
       // same location featurizing to the same token. By using a nested exists, we take only unique
       // (location, token) pairs.
-      exists(ASTNode node |
-        node = getAnASTNodeToFeaturize(function) and
+      exists(AstNode node |
+        node = getAnAstNodeToFeaturize(function) and
         token = getTokenizedAstNode(node) and
         l = node.getLocation()
       )
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/NosqlInjectionATM.qll b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/NosqlInjectionATM.qll
index 45128d9c4a7..2d5b2a58510 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/NosqlInjectionATM.qll
+++ b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/NosqlInjectionATM.qll
@@ -87,8 +87,8 @@ module SinkEndpointFilter {
   }
 }
 
-class NosqlInjectionATMConfig extends ATMConfig {
-  NosqlInjectionATMConfig() { this = "NosqlInjectionATMConfig" }
+class NosqlInjectionAtmConfig extends AtmConfig {
+  NosqlInjectionAtmConfig() { this = "NosqlInjectionATMConfig" }
 
   override predicate isKnownSource(DataFlow::Node source) {
     source instanceof NosqlInjection::Source or TaintedObject::isSource(source, _)
@@ -103,7 +103,10 @@ class NosqlInjectionATMConfig extends ATMConfig {
   override EndpointType getASinkEndpointType() { result instanceof NosqlInjectionSinkType }
 }
 
-/** Holds if src -> trg is an additional flow step in the non-boosted NoSQL injection security query. */
+/** DEPRECATED: Alias for NosqlInjectionAtmConfig */
+deprecated class NosqlInjectionATMConfig = NosqlInjectionAtmConfig;
+
+/** Holds if src -> trg is an additional flow step in the non-boosted NoSql injection security query. */
 predicate isBaseAdditionalFlowStep(
   DataFlow::Node src, DataFlow::Node trg, DataFlow::FlowLabel inlbl, DataFlow::FlowLabel outlbl
 ) {
@@ -112,7 +115,7 @@ predicate isBaseAdditionalFlowStep(
   // additional flow step to track taint through NoSQL query objects
   inlbl = TaintedObject::label() and
   outlbl = TaintedObject::label() and
-  exists(NoSQL::Query query, DataFlow::SourceNode queryObj |
+  exists(NoSql::Query query, DataFlow::SourceNode queryObj |
     queryObj.flowsToExpr(query) and
     queryObj.flowsTo(trg) and
     src = queryObj.getAPropertyWrite().getRhs()
@@ -127,7 +130,7 @@ predicate isBaseAdditionalFlowStep(
  * involving more complex queries.
  */
 DataFlow::Node getASubexpressionWithinQuery(DataFlow::Node query) {
-  any(NosqlInjectionATMConfig cfg).isEffectiveSink(query) and
+  any(NosqlInjectionAtmConfig cfg).isEffectiveSink(query) and
   exists(DataFlow::SourceNode receiver |
     receiver = [getASubexpressionWithinQuery(query), query].getALocalSource()
   |
@@ -156,7 +159,7 @@ class Configuration extends TaintTracking::Configuration {
     sink.(NosqlInjection::Sink).getAFlowLabel() = label
     or
     // Allow effective sinks to have any taint label
-    any(NosqlInjectionATMConfig cfg).isEffectiveSink(sink)
+    any(NosqlInjectionAtmConfig cfg).isEffectiveSink(sink)
   }
 
   override predicate isSanitizer(DataFlow::Node node) {
@@ -175,7 +178,7 @@ class Configuration extends TaintTracking::Configuration {
     isBaseAdditionalFlowStep(src, trg, inlbl, outlbl)
     or
     // relaxed version of previous step to track taint through unmodeled NoSQL query objects
-    any(NosqlInjectionATMConfig cfg).isEffectiveSink(trg) and
+    any(NosqlInjectionAtmConfig cfg).isEffectiveSink(trg) and
     src = getASubexpressionWithinQuery(trg)
   }
 }
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/SqlInjectionATM.qll b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/SqlInjectionATM.qll
index 86ceadf4f84..b3b722fb0fc 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/SqlInjectionATM.qll
+++ b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/SqlInjectionATM.qll
@@ -60,8 +60,8 @@ module SinkEndpointFilter {
   }
 }
 
-class SqlInjectionATMConfig extends ATMConfig {
-  SqlInjectionATMConfig() { this = "SqlInjectionATMConfig" }
+class SqlInjectionAtmConfig extends AtmConfig {
+  SqlInjectionAtmConfig() { this = "SqlInjectionATMConfig" }
 
   override predicate isKnownSource(DataFlow::Node source) { source instanceof SqlInjection::Source }
 
@@ -74,6 +74,9 @@ class SqlInjectionATMConfig extends ATMConfig {
   override EndpointType getASinkEndpointType() { result instanceof SqlInjectionSinkType }
 }
 
+/** DEPRECATED: Alias for SqlInjectionAtmConfig */
+deprecated class SqlInjectionATMConfig = SqlInjectionAtmConfig;
+
 /**
  * A taint-tracking configuration for reasoning about SQL injection vulnerabilities.
  *
@@ -86,7 +89,7 @@ class Configuration extends TaintTracking::Configuration {
   override predicate isSource(DataFlow::Node source) { source instanceof SqlInjection::Source }
 
   override predicate isSink(DataFlow::Node sink) {
-    sink instanceof SqlInjection::Sink or any(SqlInjectionATMConfig cfg).isEffectiveSink(sink)
+    sink instanceof SqlInjection::Sink or any(SqlInjectionAtmConfig cfg).isEffectiveSink(sink)
   }
 
   override predicate isSanitizer(DataFlow::Node node) {
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/TaintedPathATM.qll b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/TaintedPathATM.qll
index 908bab9fd51..109fd357007 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/TaintedPathATM.qll
+++ b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/TaintedPathATM.qll
@@ -59,8 +59,8 @@ module SinkEndpointFilter {
   }
 }
 
-class TaintedPathATMConfig extends ATMConfig {
-  TaintedPathATMConfig() { this = "TaintedPathATMConfig" }
+class TaintedPathAtmConfig extends AtmConfig {
+  TaintedPathAtmConfig() { this = "TaintedPathATMConfig" }
 
   override predicate isKnownSource(DataFlow::Node source) { source instanceof TaintedPath::Source }
 
@@ -73,6 +73,9 @@ class TaintedPathATMConfig extends ATMConfig {
   override EndpointType getASinkEndpointType() { result instanceof TaintedPathSinkType }
 }
 
+/** DEPRECATED: Alias for TaintedPathAtmConfig */
+deprecated class TaintedPathATMConfig = TaintedPathAtmConfig;
+
 /**
  * A taint-tracking configuration for reasoning about path injection vulnerabilities.
  *
@@ -88,7 +91,7 @@ class Configuration extends TaintTracking::Configuration {
     label = sink.(TaintedPath::Sink).getAFlowLabel()
     or
     // Allow effective sinks to have any taint label
-    any(TaintedPathATMConfig cfg).isEffectiveSink(sink)
+    any(TaintedPathAtmConfig cfg).isEffectiveSink(sink)
   }
 
   override predicate isSanitizer(DataFlow::Node node) { node instanceof TaintedPath::Sanitizer }
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/XssATM.qll b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/XssATM.qll
index 009db55b86a..796fc94c64e 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/XssATM.qll
+++ b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/XssATM.qll
@@ -60,8 +60,8 @@ module SinkEndpointFilter {
   }
 }
 
-class DomBasedXssATMConfig extends ATMConfig {
-  DomBasedXssATMConfig() { this = "DomBasedXssATMConfig" }
+class DomBasedXssAtmConfig extends AtmConfig {
+  DomBasedXssAtmConfig() { this = "DomBasedXssATMConfig" }
 
   override predicate isKnownSource(DataFlow::Node source) { source instanceof DomBasedXss::Source }
 
@@ -74,6 +74,9 @@ class DomBasedXssATMConfig extends ATMConfig {
   override EndpointType getASinkEndpointType() { result instanceof XssSinkType }
 }
 
+/** DEPRECATED: Alias for DomBasedXssAtmConfig */
+deprecated class DomBasedXssATMConfig = DomBasedXssAtmConfig;
+
 /**
  * A taint-tracking configuration for reasoning about XSS vulnerabilities.
  *
@@ -87,7 +90,7 @@ class Configuration extends TaintTracking::Configuration {
 
   override predicate isSink(DataFlow::Node sink) {
     sink instanceof DomBasedXss::Sink or
-    any(DomBasedXssATMConfig cfg).isEffectiveSink(sink)
+    any(DomBasedXssAtmConfig cfg).isEffectiveSink(sink)
   }
 
   override predicate isSanitizer(DataFlow::Node node) {
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/DebugResultInclusion.ql b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/DebugResultInclusion.ql
index 9be2929fd41..215103358ea 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/DebugResultInclusion.ql
+++ b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/DebugResultInclusion.ql
@@ -33,7 +33,7 @@ string getDescriptionForAlertCandidate(
 ) {
   result = "excluded[reason=" + getAReasonSinkExcluded(sinkCandidate, query) + "]"
   or
-  getATMCfg(query).isKnownSink(sinkCandidate) and
+  getAtmCfg(query).isKnownSink(sinkCandidate) and
   result = "excluded[reason=known-sink]"
   or
   not exists(getAReasonSinkExcluded(sinkCandidate, query)) and
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/CountSourcesAndSinks.ql b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/CountSourcesAndSinks.ql
index 997c61bc096..dca511762b0 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/CountSourcesAndSinks.ql
+++ b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/CountSourcesAndSinks.ql
@@ -20,7 +20,7 @@ import semmle.javascript.security.dataflow.DeepObjectResourceExhaustionQuery as
 import semmle.javascript.security.dataflow.DifferentKindsComparisonBypassQuery as DifferentKindsComparisonBypass
 import semmle.javascript.security.dataflow.DomBasedXssQuery as DomBasedXss
 import semmle.javascript.security.dataflow.ExceptionXssQuery as ExceptionXss
-import semmle.javascript.security.dataflow.ExternalAPIUsedWithUntrustedDataQuery as ExternalAPIUsedWithUntrustedData
+import semmle.javascript.security.dataflow.ExternalAPIUsedWithUntrustedDataQuery as ExternalApiUsedWithUntrustedData
 import semmle.javascript.security.dataflow.FileAccessToHttpQuery as FileAccessToHttp
 import semmle.javascript.security.dataflow.HardcodedCredentialsQuery as HardcodedCredentials
 import semmle.javascript.security.dataflow.HardcodedDataInterpretedAsCodeQuery as HardcodedDataInterpretedAsCode
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/ExtractEndpointData.qll b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/ExtractEndpointData.qll
index bea47423797..a0edb69f371 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/ExtractEndpointData.qll
+++ b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/ExtractEndpointData.qll
@@ -23,17 +23,20 @@ import NoFeaturizationRestrictionsConfig
 import Queries
 
 /** Gets the ATM configuration object for the specified query. */
-ATMConfig getATMCfg(Query query) {
+AtmConfig getAtmCfg(Query query) {
   query instanceof NosqlInjectionQuery and
-  result instanceof NosqlInjectionATM::NosqlInjectionATMConfig
+  result instanceof NosqlInjectionATM::NosqlInjectionAtmConfig
   or
-  query instanceof SqlInjectionQuery and result instanceof SqlInjectionATM::SqlInjectionATMConfig
+  query instanceof SqlInjectionQuery and result instanceof SqlInjectionATM::SqlInjectionAtmConfig
   or
-  query instanceof TaintedPathQuery and result instanceof TaintedPathATM::TaintedPathATMConfig
+  query instanceof TaintedPathQuery and result instanceof TaintedPathATM::TaintedPathAtmConfig
   or
-  query instanceof XssQuery and result instanceof XssATM::DomBasedXssATMConfig
+  query instanceof XssQuery and result instanceof XssATM::DomBasedXssAtmConfig
 }
 
+/** DEPRECATED: Alias for getAtmCfg */
+deprecated ATMConfig getATMCfg(Query query) { result = getAtmCfg(query) }
+
 /** Gets the ATM data flow configuration for the specified query. */
 DataFlow::Configuration getDataFlowCfg(Query query) {
   query instanceof NosqlInjectionQuery and result instanceof NosqlInjectionATM::Configuration
@@ -47,7 +50,7 @@ DataFlow::Configuration getDataFlowCfg(Query query) {
 
 /** Gets a known sink for the specified query. */
 private DataFlow::Node getASink(Query query) {
-  getATMCfg(query).isKnownSink(result) and
+  getAtmCfg(query).isKnownSink(result) and
   // Only consider the source code for the project being analyzed.
   exists(result.getFile().getRelativePath())
 }
@@ -72,8 +75,8 @@ private DataFlow::Node getANotASink(NotASinkReason reason) {
  */
 private DataFlow::Node getAnUnknown(Query query) {
   (
-    getATMCfg(query).isEffectiveSink(result) or
-    getATMCfg(query).isEffectiveSinkWithOverridingScore(result, _, _)
+    getAtmCfg(query).isEffectiveSink(result) or
+    getAtmCfg(query).isEffectiveSinkWithOverridingScore(result, _, _)
   ) and
   not result = getASink(query) and
   // Only consider the source code for the project being analyzed.
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/ExtractEndpointMapping.ql b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/ExtractEndpointMapping.ql
index 879fdeaca1c..ce9a12acf88 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/ExtractEndpointMapping.ql
+++ b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/ExtractEndpointMapping.ql
@@ -4,19 +4,19 @@ import experimental.adaptivethreatmodeling.TaintedPathATM as TaintedPathATM
 import experimental.adaptivethreatmodeling.XssATM as XssATM
 import experimental.adaptivethreatmodeling.AdaptiveThreatModeling
 
-from string queryName, ATMConfig c, EndpointType e
+from string queryName, AtmConfig c, EndpointType e
 where
   (
     queryName = "SqlInjectionATM.ql" and
-    c instanceof SqlInjectionATM::SqlInjectionATMConfig
+    c instanceof SqlInjectionATM::SqlInjectionAtmConfig
     or
     queryName = "NosqlInjectionATM.ql" and
-    c instanceof NosqlInjectionATM::NosqlInjectionATMConfig
+    c instanceof NosqlInjectionATM::NosqlInjectionAtmConfig
     or
     queryName = "TaintedPathInjectionATM.ql" and
-    c instanceof TaintedPathATM::TaintedPathATMConfig
+    c instanceof TaintedPathATM::TaintedPathAtmConfig
     or
-    queryName = "XssATM.ql" and c instanceof XssATM::DomBasedXssATMConfig
+    queryName = "XssATM.ql" and c instanceof XssATM::DomBasedXssAtmConfig
   ) and
   e = c.getASinkEndpointType()
 select queryName, e.getEncoding() as endpointTypeEncoded
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/ExtractMisclassifiedEndpointFeatures.ql b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/ExtractMisclassifiedEndpointFeatures.ql
index f05048f8cdc..b09eed5964d 100644
--- a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/ExtractMisclassifiedEndpointFeatures.ql
+++ b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/ExtractMisclassifiedEndpointFeatures.ql
@@ -19,8 +19,8 @@ EndpointType getEndpointType() { result instanceof NosqlInjectionSinkType }
 DataFlow::Node getAPositiveEndpoint() { result instanceof NosqlInjection::Sink }
 
 /** An ATM configuration to find misclassified endpoints of type `getEndpointType()`. */
-class ExtractMisclassifiedEndpointsATMConfig extends ATMConfig {
-  ExtractMisclassifiedEndpointsATMConfig() { this = "ExtractMisclassifiedEndpointsATMConfig" }
+class ExtractMisclassifiedEndpointsAtmConfig extends AtmConfig {
+  ExtractMisclassifiedEndpointsAtmConfig() { this = "ExtractMisclassifiedEndpointsATMConfig" }
 
   override predicate isEffectiveSink(DataFlow::Node sinkCandidate) {
     sinkCandidate = getAPositiveEndpoint()
@@ -31,7 +31,7 @@ class ExtractMisclassifiedEndpointsATMConfig extends ATMConfig {
 
 /** Get an endpoint from `getAPositiveEndpoint()` that is incorrectly excluded from the results. */
 DataFlow::Node getAMisclassifedEndpoint() {
-  any(ExtractMisclassifiedEndpointsATMConfig config).isEffectiveSink(result) and
+  any(ExtractMisclassifiedEndpointsAtmConfig config).isEffectiveSink(result) and
   not any(ScoringResults results).shouldResultBeIncluded(_, result)
 }
 
diff --git a/javascript/ql/lib/Expressions/DOMProperties.qll b/javascript/ql/lib/Expressions/DOMProperties.qll
index 7ff1884fb1b..d0671c932b5 100644
--- a/javascript/ql/lib/Expressions/DOMProperties.qll
+++ b/javascript/ql/lib/Expressions/DOMProperties.qll
@@ -5,14 +5,20 @@
 import semmle.javascript.Externs
 
 /** Holds if `et` is a root interface of the DOM type hierarchy. */
-predicate isDOMRootType(ExternalType et) {
+predicate isDomRootType(ExternalType et) {
   exists(string n | n = et.getName() | n = "EventTarget" or n = "StyleSheet")
 }
 
+/** DEPRECATED: Alias for isDomRootType */
+deprecated predicate isDOMRootType = isDomRootType/1;
+
 /** Holds if `p` is declared as a property of a DOM class or interface. */
 pragma[nomagic]
-predicate isDOMProperty(string p) {
+predicate isDomProperty(string p) {
   exists(ExternalMemberDecl emd | emd.getName() = p |
-    isDOMRootType(emd.getDeclaringType().getASupertype*())
+    isDomRootType(emd.getDeclaringType().getASupertype*())
   )
 }
+
+/** DEPRECATED: Alias for isDomProperty */
+deprecated predicate isDOMProperty = isDomProperty/1;
diff --git a/javascript/ql/lib/Expressions/ExprHasNoEffect.qll b/javascript/ql/lib/Expressions/ExprHasNoEffect.qll
index 220eef15a4a..691424f3b71 100644
--- a/javascript/ql/lib/Expressions/ExprHasNoEffect.qll
+++ b/javascript/ql/lib/Expressions/ExprHasNoEffect.qll
@@ -143,7 +143,7 @@ predicate hasNoEffect(Expr e) {
   // don't complain about declarations
   not isDeclaration(e) and
   // exclude DOM properties, which sometimes have magical auto-update properties
-  not isDOMProperty(e.(PropAccess).getPropertyName()) and
+  not isDomProperty(e.(PropAccess).getPropertyName()) and
   // exclude xUnit.js annotations
   not e instanceof XUnitAnnotation and
   // exclude common patterns that are most likely intentional
diff --git a/javascript/ql/lib/semmle/javascript/AST.qll b/javascript/ql/lib/semmle/javascript/AST.qll
index d4f2de4b170..895922f952f 100644
--- a/javascript/ql/lib/semmle/javascript/AST.qll
+++ b/javascript/ql/lib/semmle/javascript/AST.qll
@@ -22,7 +22,7 @@ private import semmle.javascript.internal.CachedStages
  * abs(-42);
  * ```
  */
-class ASTNode extends @ast_node, NodeInStmtContainer {
+class AstNode extends @ast_node, NodeInStmtContainer {
   override Location getLocation() { hasLocation(this, result) }
 
   override File getFile() {
@@ -84,7 +84,7 @@ class ASTNode extends @ast_node, NodeInStmtContainer {
    * _Note_: The indices of child nodes are considered an implementation detail and may
    * change between versions of the extractor.
    */
-  ASTNode getChild(int i) {
+  AstNode getChild(int i) {
     result = this.getChildExpr(i) or
     result = this.getChildStmt(i) or
     properties(result, this, i, _, _) or
@@ -101,7 +101,7 @@ class ASTNode extends @ast_node, NodeInStmtContainer {
   TypeExpr getChildTypeExpr(int i) { typeexprs(result, _, this, i, _) }
 
   /** Gets a child node of this node. */
-  ASTNode getAChild() { result = this.getChild(_) }
+  AstNode getAChild() { result = this.getChild(_) }
 
   /** Gets a child expression of this node. */
   Expr getAChildExpr() { result = this.getChildExpr(_) }
@@ -120,7 +120,7 @@ class ASTNode extends @ast_node, NodeInStmtContainer {
 
   /** Gets the parent node of this node, if any. */
   cached
-  ASTNode getParent() { Stages::Ast::ref() and this = result.getAChild() }
+  AstNode getParent() { Stages::Ast::ref() and this = result.getAChild() }
 
   /** Gets the first control flow node belonging to this syntactic entity. */
   ControlFlowNode getFirstControlFlowNode() { result = this }
@@ -184,6 +184,9 @@ class ASTNode extends @ast_node, NodeInStmtContainer {
   }
 }
 
+/** DEPRECATED: Alias for AstNode */
+deprecated class ASTNode = AstNode;
+
 /**
  * Holds if the given file is a `.d.ts` file.
  */
@@ -334,7 +337,10 @@ class EventHandlerCode extends @event_handler, CodeInAttribute { }
  * <a href="javascript:alert('hi')">Click me</a>
  * ```
  */
-class JavaScriptURL extends @javascript_url, CodeInAttribute { }
+class JavaScriptUrl extends @javascript_url, CodeInAttribute { }
+
+/** DEPRECATED: Alias for JavaScriptUrl */
+deprecated class JavaScriptURL = JavaScriptUrl;
 
 /**
  * A toplevel syntactic entity containing Closure-style externs definitions.
@@ -361,7 +367,7 @@ class Externs extends TopLevel {
  * i = 9
  * ```
  */
-class ExprOrStmt extends @expr_or_stmt, ControlFlowNode, ASTNode { }
+class ExprOrStmt extends @expr_or_stmt, ControlFlowNode, AstNode { }
 
 /**
  * A program element that contains statements, but isn't itself
@@ -375,7 +381,7 @@ class ExprOrStmt extends @expr_or_stmt, ControlFlowNode, ASTNode { }
  * }
  * ```
  */
-class StmtContainer extends @stmt_container, ASTNode {
+class StmtContainer extends @stmt_container, AstNode {
   /** Gets the innermost enclosing container in which this container is nested. */
   cached
   StmtContainer getEnclosingContainer() { none() }
@@ -405,7 +411,7 @@ class StmtContainer extends @stmt_container, ASTNode {
    * For scripts or modules, this is the container itself; for functions,
    * it is the function body.
    */
-  ASTNode getBody() { result = this }
+  AstNode getBody() { result = this }
 
   /**
    * Gets the (unique) entry node of the control flow graph for this toplevel or function.
@@ -470,7 +476,7 @@ module AST {
    * function id(x) { return x; }    // function declaration
    * ```
    */
-  class ValueNode extends ASTNode, @dataflownode {
+  class ValueNode extends AstNode, @dataflownode {
     /** Gets type inference results for this element. */
     DataFlow::AnalyzedNode analyze() { result = DataFlow::valueNode(this).analyze() }
 
diff --git a/javascript/ql/lib/semmle/javascript/ApiGraphs.qll b/javascript/ql/lib/semmle/javascript/ApiGraphs.qll
index 57dcf6f2eec..c9c283746db 100644
--- a/javascript/ql/lib/semmle/javascript/ApiGraphs.qll
+++ b/javascript/ql/lib/semmle/javascript/ApiGraphs.qll
@@ -109,7 +109,7 @@ module API {
      */
     cached
     Node getMember(string m) {
-      Stages::APIStage::ref() and
+      Stages::ApiStage::ref() and
       result = this.getASuccessor(Label::member(m))
     }
 
@@ -119,7 +119,7 @@ module API {
      */
     cached
     Node getUnknownMember() {
-      Stages::APIStage::ref() and
+      Stages::ApiStage::ref() and
       result = this.getASuccessor(Label::unknownMember())
     }
 
@@ -129,7 +129,7 @@ module API {
      */
     cached
     Node getAMember() {
-      Stages::APIStage::ref() and
+      Stages::ApiStage::ref() and
       result = this.getMember(_)
       or
       result = this.getUnknownMember()
@@ -148,7 +148,7 @@ module API {
      */
     cached
     Node getInstance() {
-      Stages::APIStage::ref() and
+      Stages::ApiStage::ref() and
       result = this.getASuccessor(Label::instance())
     }
 
@@ -160,7 +160,7 @@ module API {
      */
     cached
     Node getParameter(int i) {
-      Stages::APIStage::ref() and
+      Stages::ApiStage::ref() and
       result = this.getASuccessor(Label::parameter(i))
     }
 
@@ -182,7 +182,7 @@ module API {
      */
     cached
     Node getReceiver() {
-      Stages::APIStage::ref() and
+      Stages::ApiStage::ref() and
       result = this.getASuccessor(Label::receiver())
     }
 
@@ -196,7 +196,7 @@ module API {
      */
     cached
     Node getAParameter() {
-      Stages::APIStage::ref() and
+      Stages::ApiStage::ref() and
       result = this.getParameter(_)
       or
       result = this.getReceiver()
@@ -210,7 +210,7 @@ module API {
      */
     cached
     Node getReturn() {
-      Stages::APIStage::ref() and
+      Stages::ApiStage::ref() and
       result = this.getASuccessor(Label::return())
     }
 
@@ -220,7 +220,7 @@ module API {
      */
     cached
     Node getPromised() {
-      Stages::APIStage::ref() and
+      Stages::ApiStage::ref() and
       result = this.getASuccessor(Label::promised())
     }
 
@@ -229,7 +229,7 @@ module API {
      */
     cached
     Node getPromisedError() {
-      Stages::APIStage::ref() and
+      Stages::ApiStage::ref() and
       result = this.getASuccessor(Label::promisedError())
     }
 
@@ -892,7 +892,7 @@ module API {
      */
     cached
     predicate edge(TApiNode pred, Label::ApiLabel lbl, TApiNode succ) {
-      Stages::APIStage::ref() and
+      Stages::ApiStage::ref() and
       exists(string m |
         pred = MkRoot() and
         lbl = Label::moduleLabel(m)
@@ -1251,7 +1251,7 @@ private predicate exports(string m, string prop, DataFlow::Node rhs) {
 
 /** Gets the definition of module `m`. */
 private Module importableModule(string m) {
-  exists(NPMPackage pkg, PackageJSON json | json = pkg.getPackageJSON() and not json.isPrivate() |
+  exists(NpmPackage pkg, PackageJson json | json = pkg.getPackageJson() and not json.isPrivate() |
     result = pkg.getMainModule() and
     not result.isExterns() and
     m = pkg.getPackageName()
diff --git a/javascript/ql/lib/semmle/javascript/CFG.qll b/javascript/ql/lib/semmle/javascript/CFG.qll
index a37fedc1ec0..4daf849bc3d 100644
--- a/javascript/ql/lib/semmle/javascript/CFG.qll
+++ b/javascript/ql/lib/semmle/javascript/CFG.qll
@@ -347,7 +347,7 @@ class ControlFlowNode extends @cfg_node, Locatable, NodeInStmtContainer {
     then result = "function in " + any(MethodDeclaration mem | mem.getBody() = this)
     else
       if this instanceof @decorator_list
-      then result = "parameter decorators of " + this.(ASTNode).getParent().(Function).describe()
+      then result = "parameter decorators of " + this.(AstNode).getParent().(Function).describe()
       else result = toString()
   }
 }
diff --git a/javascript/ql/lib/semmle/javascript/CanonicalNames.qll b/javascript/ql/lib/semmle/javascript/CanonicalNames.qll
index 7435be7131a..fc25314af95 100644
--- a/javascript/ql/lib/semmle/javascript/CanonicalNames.qll
+++ b/javascript/ql/lib/semmle/javascript/CanonicalNames.qll
@@ -48,7 +48,7 @@ class CanonicalName extends @symbol {
   string getExternalModuleName() {
     symbol_module(this, result)
     or
-    exists(PackageJSON pkg |
+    exists(PackageJson pkg |
       getModule() = pkg.getMainModule() and
       result = pkg.getPackageName()
     )
@@ -160,7 +160,7 @@ class CanonicalName extends @symbol {
   /**
    * Gets a definition of the entity with this canonical name.
    */
-  ASTNode getADefinition() { none() }
+  AstNode getADefinition() { none() }
 
   /**
    * Gets a use that refers to the entity with this canonical name.
diff --git a/javascript/ql/lib/semmle/javascript/CharacterEscapes.qll b/javascript/ql/lib/semmle/javascript/CharacterEscapes.qll
index 6f95ed1c30a..1a19112cee3 100644
--- a/javascript/ql/lib/semmle/javascript/CharacterEscapes.qll
+++ b/javascript/ql/lib/semmle/javascript/CharacterEscapes.qll
@@ -32,7 +32,7 @@ module CharacterEscapes {
    * Holds if `n` is delimited by `delim` and contains `rawStringNode` with the raw string value `raw`.
    */
   private predicate hasRawStringAndQuote(
-    DataFlow::ValueNode n, string delim, ASTNode rawStringNode, string raw
+    DataFlow::ValueNode n, string delim, AstNode rawStringNode, string raw
   ) {
     rawStringNode = n.asExpr() and
     raw = rawStringNode.(StringLiteral).getRawValue() and
@@ -52,7 +52,7 @@ module CharacterEscapes {
    *
    * The character is the `i`th character of `rawStringNode`'s raw string value.
    */
-  string getAnIdentityEscapedCharacter(DataFlow::Node n, ASTNode rawStringNode, int i) {
+  string getAnIdentityEscapedCharacter(DataFlow::Node n, AstNode rawStringNode, int i) {
     exists(string delim, string raw, string additionalEscapeChars |
       hasRawStringAndQuote(n, delim, rawStringNode, raw) and
       if rawStringNode instanceof RegExpLiteral
@@ -80,7 +80,7 @@ module CharacterEscapes {
    * The character is the `i`th character of the raw string value of `rawStringNode`.
    */
   string getALikelyRegExpPatternMistake(
-    RegExpPatternSource src, string mistake, ASTNode rawStringNode, int i
+    RegExpPatternSource src, string mistake, AstNode rawStringNode, int i
   ) {
     result = getAnIdentityEscapedCharacter(src, rawStringNode, i) and
     (
diff --git a/javascript/ql/lib/semmle/javascript/DOM.qll b/javascript/ql/lib/semmle/javascript/DOM.qll
index 67f75ce7fa9..bca70363c67 100644
--- a/javascript/ql/lib/semmle/javascript/DOM.qll
+++ b/javascript/ql/lib/semmle/javascript/DOM.qll
@@ -76,10 +76,10 @@ module DOM {
   /**
    * A JSX element, viewed as an `ElementDefinition`.
    */
-  private class JsxElementDefinition extends ElementDefinition, @jsx_element instanceof JSXElement {
-    override string getName() { result = JSXElement.super.getName() }
+  private class JsxElementDefinition extends ElementDefinition, @jsx_element instanceof JsxElement {
+    override string getName() { result = JsxElement.super.getName() }
 
-    override AttributeDefinition getAttribute(int i) { result = JSXElement.super.getAttribute(i) }
+    override AttributeDefinition getAttribute(int i) { result = JsxElement.super.getAttribute(i) }
 
     override ElementDefinition getParent() { result = super.getJsxParent() }
   }
@@ -139,7 +139,7 @@ module DOM {
    * A JSX attribute, viewed as an `AttributeDefinition`.
    */
   private class JsxAttributeDefinition extends AttributeDefinition, @jsx_attribute {
-    JSXAttribute attr;
+    JsxAttribute attr;
 
     JsxAttributeDefinition() { this = attr }
 
@@ -323,7 +323,7 @@ module DOM {
 
     private class DefaultRange extends Range {
       DefaultRange() {
-        this.asExpr().(VarAccess).getVariable() instanceof DOMGlobalVariable
+        this.asExpr().(VarAccess).getVariable() instanceof DomGlobalVariable
         or
         exists(DataFlow::PropRead read |
           this = read and
@@ -392,7 +392,7 @@ module DOM {
    */
   private DataFlow::SourceNode domEventSource() {
     // e.g. <form onSubmit={e => e.target}/>
-    exists(JSXAttribute attr | attr.getName().matches("on%") |
+    exists(JsxAttribute attr | attr.getName().matches("on%") |
       result = attr.getValue().flow().getABoundFunctionValue(0).getParameter(0)
     )
     or
diff --git a/javascript/ql/lib/semmle/javascript/E4X.qll b/javascript/ql/lib/semmle/javascript/E4X.qll
index e8e224e1e51..f69990138c8 100644
--- a/javascript/ql/lib/semmle/javascript/E4X.qll
+++ b/javascript/ql/lib/semmle/javascript/E4X.qll
@@ -14,7 +14,10 @@ module E4X {
    * *
    * ```
    */
-  class XMLAnyName extends Expr, @e4x_xml_anyname { }
+  class XmlAnyName extends Expr, @e4x_xml_anyname { }
+
+  /** DEPRECATED: Alias for XmlAnyName */
+  deprecated class XMLAnyName = XmlAnyName;
 
   /**
    * An E4X qualified identifier.
@@ -29,7 +32,7 @@ module E4X {
    * Note that qualified identifiers are not currently supported by the parser, so snapshots
    * will not usually contain any.
    */
-  class XMLQualifiedIdentifier extends Expr, @e4x_xml_qualident {
+  class XmlQualifiedIdentifier extends Expr, @e4x_xml_qualident {
     /**
      * Gets the left operand of this qualified identifier, which is either
      * an identifier or a wildcard.
@@ -54,6 +57,9 @@ module E4X {
     }
   }
 
+  /** DEPRECATED: Alias for XmlQualifiedIdentifier */
+  deprecated class XMLQualifiedIdentifier = XmlQualifiedIdentifier;
+
   /**
    * An E4X attribute selector.
    *
@@ -64,7 +70,7 @@ module E4X {
    * @[p]
    * ```
    */
-  class XMLAttributeSelector extends Expr, @e4x_xml_attribute_selector {
+  class XmlAttributeSelector extends Expr, @e4x_xml_attribute_selector {
     /**
      * Gets the selected attribute, which is either a static name (that is, a
      * wildcard identifier or a possibly qualified name), or an arbitrary
@@ -83,6 +89,9 @@ module E4X {
     }
   }
 
+  /** DEPRECATED: Alias for XmlAttributeSelector */
+  deprecated class XMLAttributeSelector = XmlAttributeSelector;
+
   /**
    * An E4X filter expression.
    *
@@ -92,7 +101,7 @@ module E4X {
    * employees.(@id == 0 || @id == 1)
    * ```
    */
-  class XMLFilterExpression extends Expr, @e4x_xml_filter_expression {
+  class XmlFilterExpression extends Expr, @e4x_xml_filter_expression {
     /**
      * Gets the left operand of this filter expression.
      */
@@ -108,6 +117,9 @@ module E4X {
     }
   }
 
+  /** DEPRECATED: Alias for XmlFilterExpression */
+  deprecated class XMLFilterExpression = XmlFilterExpression;
+
   /**
    * An E4X "dot-dot" expression.
    *
@@ -117,7 +129,7 @@ module E4X {
    * e..name
    * ```
    */
-  class XMLDotDotExpression extends Expr, @e4x_xml_dotdotexpr {
+  class XmlDotDotExpression extends Expr, @e4x_xml_dotdotexpr {
     /**
      * Gets the base expression of this dot-dot expression.
      */
@@ -132,4 +144,7 @@ module E4X {
       result = getBase().getFirstControlFlowNode()
     }
   }
+
+  /** DEPRECATED: Alias for XmlDotDotExpression */
+  deprecated class XMLDotDotExpression = XmlDotDotExpression;
 }
diff --git a/javascript/ql/lib/semmle/javascript/Expr.qll b/javascript/ql/lib/semmle/javascript/Expr.qll
index b99b4c71be8..69dbdd11451 100644
--- a/javascript/ql/lib/semmle/javascript/Expr.qll
+++ b/javascript/ql/lib/semmle/javascript/Expr.qll
@@ -2744,7 +2744,7 @@ class Decorator extends @decorator, Expr {
  * }
  * ```
  */
-class Decoratable extends ASTNode {
+class Decoratable extends AstNode {
   Decoratable() {
     this instanceof ClassDefinition or
     this instanceof Property or
diff --git a/javascript/ql/lib/semmle/javascript/Externs.qll b/javascript/ql/lib/semmle/javascript/Externs.qll
index 5fe855a46a8..157b4b3f4cf 100644
--- a/javascript/ql/lib/semmle/javascript/Externs.qll
+++ b/javascript/ql/lib/semmle/javascript/Externs.qll
@@ -64,7 +64,7 @@ import javascript
  * Object.prototype.hasOwnProperty = function(p) {};
  * </pre>
  */
-abstract class ExternalDecl extends ASTNode {
+abstract class ExternalDecl extends AstNode {
   /** Gets the name of this declaration. */
   abstract string getName();
 
@@ -125,7 +125,7 @@ abstract class ExternalVarDecl extends ExternalDecl {
    *
    * The result can be either a function or an expression.
    */
-  abstract ASTNode getInit();
+  abstract AstNode getInit();
 
   /**
    * Gets a JSDoc tag associated with this declaration.
@@ -179,7 +179,7 @@ class ExternalGlobalFunctionDecl extends ExternalGlobalDecl, FunctionDeclStmt {
   /** Gets the name of this declaration. */
   override string getName() { result = FunctionDeclStmt.super.getName() }
 
-  override ASTNode getInit() { result = this }
+  override AstNode getInit() { result = this }
 }
 
 /**
@@ -336,7 +336,7 @@ class ExternalInstanceMemberDecl extends ExternalMemberDecl {
  *   function(p) {};  // external function entity
  * </pre>
  */
-class ExternalEntity extends ASTNode {
+class ExternalEntity extends AstNode {
   ExternalEntity() { exists(ExternalVarDecl d | d.getInit() = this) }
 
   /** Gets the variable declaration to which this entity belongs. */
diff --git a/javascript/ql/lib/semmle/javascript/JSDoc.qll b/javascript/ql/lib/semmle/javascript/JSDoc.qll
index 2621c92e3c6..b2b7548886f 100644
--- a/javascript/ql/lib/semmle/javascript/JSDoc.qll
+++ b/javascript/ql/lib/semmle/javascript/JSDoc.qll
@@ -55,7 +55,7 @@ class JSDoc extends @jsdoc, Locatable {
  * }
  * </pre>
  */
-abstract class Documentable extends ASTNode {
+abstract class Documentable extends AstNode {
   /** Gets the JSDoc comment for this element, if any. */
   cached
   JSDoc getDocumentation() {
diff --git a/javascript/ql/lib/semmle/javascript/JSON.qll b/javascript/ql/lib/semmle/javascript/JSON.qll
index ed3f6f69637..1e6e259f3eb 100644
--- a/javascript/ql/lib/semmle/javascript/JSON.qll
+++ b/javascript/ql/lib/semmle/javascript/JSON.qll
@@ -19,14 +19,14 @@ import javascript
  * { "value": 0 }
  * ```
  */
-class JSONValue extends @json_value, Locatable {
+class JsonValue extends @json_value, Locatable {
   override Location getLocation() { json_locations(this, result) }
 
   /** Gets the parent value to which this value belongs, if any. */
-  JSONValue getParent() { json(this, _, result, _, _) }
+  JsonValue getParent() { json(this, _, result, _, _) }
 
   /** Gets the `i`th child value of this value. */
-  JSONValue getChild(int i) { json(result, _, this, i, _) }
+  JsonValue getChild(int i) { json(result, _, this, i, _) }
 
   /** Holds if this JSON value is the top level element in its enclosing file. */
   predicate isTopLevel() { not exists(getParent()) }
@@ -42,23 +42,26 @@ class JSONValue extends @json_value, Locatable {
   }
 
   /** If this is an object, gets the value of property `name`. */
-  JSONValue getPropValue(string name) { json_properties(this, name, result) }
+  JsonValue getPropValue(string name) { json_properties(this, name, result) }
 
   /** If this is an array, gets the value of the `i`th element. */
-  JSONValue getElementValue(int i) { result = this.(JSONArray).getChild(i) }
+  JsonValue getElementValue(int i) { result = this.(JsonArray).getChild(i) }
 
   /** If this is a string constant, gets the value of the string. */
-  string getStringValue() { result = this.(JSONString).getValue() }
+  string getStringValue() { result = this.(JsonString).getValue() }
 
   /** If this is an integer constant, gets its numeric value. */
-  int getIntValue() { result = this.(JSONNumber).getValue().toInt() }
+  int getIntValue() { result = this.(JsonNumber).getValue().toInt() }
 
   /** If this is a boolean constant, gets its boolean value. */
-  boolean getBooleanValue() { result.toString() = this.(JSONBoolean).getValue() }
+  boolean getBooleanValue() { result.toString() = this.(JsonBoolean).getValue() }
 
   override string getAPrimaryQlClass() { result = "JSONValue" }
 }
 
+/** DEPRECATED: Alias for JsonValue */
+deprecated class JSONValue = JsonValue;
+
 /**
  * A JSON-encoded primitive value.
  *
@@ -72,7 +75,7 @@ class JSONValue extends @json_value, Locatable {
  * "a string"
  * ```
  */
-abstract class JSONPrimitiveValue extends JSONValue {
+abstract class JsonPrimitiveValue extends JsonValue {
   /** Gets a string representation of the encoded value. */
   string getValue() { json_literals(result, _, this) }
 
@@ -80,6 +83,9 @@ abstract class JSONPrimitiveValue extends JSONValue {
   string getRawValue() { json_literals(_, result, this) }
 }
 
+/** DEPRECATED: Alias for JsonPrimitiveValue */
+deprecated class JSONPrimitiveValue = JsonPrimitiveValue;
+
 /**
  * A JSON-encoded null value.
  *
@@ -89,10 +95,13 @@ abstract class JSONPrimitiveValue extends JSONValue {
  * null
  * ```
  */
-class JSONNull extends @json_null, JSONPrimitiveValue {
+class JsonNull extends @json_null, JsonPrimitiveValue {
   override string getAPrimaryQlClass() { result = "JSONNull" }
 }
 
+/** DEPRECATED: Alias for JsonNull */
+deprecated class JSONNull = JsonNull;
+
 /**
  * A JSON-encoded Boolean value.
  *
@@ -103,10 +112,13 @@ class JSONNull extends @json_null, JSONPrimitiveValue {
  * false
  * ```
  */
-class JSONBoolean extends @json_boolean, JSONPrimitiveValue {
+class JsonBoolean extends @json_boolean, JsonPrimitiveValue {
   override string getAPrimaryQlClass() { result = "JSONBoolean" }
 }
 
+/** DEPRECATED: Alias for JsonBoolean */
+deprecated class JSONBoolean = JsonBoolean;
+
 /**
  * A JSON-encoded number.
  *
@@ -117,10 +129,13 @@ class JSONBoolean extends @json_boolean, JSONPrimitiveValue {
  * 1.0
  * ```
  */
-class JSONNumber extends @json_number, JSONPrimitiveValue {
+class JsonNumber extends @json_number, JsonPrimitiveValue {
   override string getAPrimaryQlClass() { result = "JSONNumber" }
 }
 
+/** DEPRECATED: Alias for JsonNumber */
+deprecated class JSONNumber = JsonNumber;
+
 /**
  * A JSON-encoded string value.
  *
@@ -130,10 +145,13 @@ class JSONNumber extends @json_number, JSONPrimitiveValue {
  * "a string"
  * ```
  */
-class JSONString extends @json_string, JSONPrimitiveValue {
+class JsonString extends @json_string, JsonPrimitiveValue {
   override string getAPrimaryQlClass() { result = "JSONString" }
 }
 
+/** DEPRECATED: Alias for JsonString */
+deprecated class JSONString = JsonString;
+
 /**
  * A JSON-encoded array.
  *
@@ -143,13 +161,16 @@ class JSONString extends @json_string, JSONPrimitiveValue {
  * [ 1, 2, 3 ]
  * ```
  */
-class JSONArray extends @json_array, JSONValue {
+class JsonArray extends @json_array, JsonValue {
   override string getAPrimaryQlClass() { result = "JSONArray" }
 
   /** Gets the string value of the `i`th element of this array. */
   string getElementStringValue(int i) { result = getElementValue(i).getStringValue() }
 }
 
+/** DEPRECATED: Alias for JsonArray */
+deprecated class JSONArray = JsonArray;
+
 /**
  * A JSON-encoded object.
  *
@@ -159,18 +180,24 @@ class JSONArray extends @json_array, JSONValue {
  * { "value": 0 }
  * ```
  */
-class JSONObject extends @json_object, JSONValue {
+class JsonObject extends @json_object, JsonValue {
   override string getAPrimaryQlClass() { result = "JSONObject" }
 
   /** Gets the string value of property `name` of this object. */
   string getPropStringValue(string name) { result = getPropValue(name).getStringValue() }
 }
 
+/** DEPRECATED: Alias for JsonObject */
+deprecated class JSONObject = JsonObject;
+
 /**
  * An error reported by the JSON parser.
  */
-class JSONParseError extends @json_parse_error, Error {
+class JsonParseError extends @json_parse_error, Error {
   override Location getLocation() { json_locations(this, result) }
 
   override string getMessage() { json_errors(this, result) }
 }
+
+/** DEPRECATED: Alias for JsonParseError */
+deprecated class JSONParseError = JsonParseError;
diff --git a/javascript/ql/lib/semmle/javascript/JSX.qll b/javascript/ql/lib/semmle/javascript/JSX.qll
index 4080964886e..e8a33bde257 100644
--- a/javascript/ql/lib/semmle/javascript/JSX.qll
+++ b/javascript/ql/lib/semmle/javascript/JSX.qll
@@ -15,7 +15,7 @@ import javascript
  * <><h1>Title</h1>Some <b>text</b></>
  * ```
  */
-class JSXNode extends Expr, @jsx_element {
+class JsxNode extends Expr, @jsx_element {
   /** Gets the `i`th element in the body of this element or fragment. */
   Expr getBodyElement(int i) { i >= 0 and result = getChildExpr(-i - 2) }
 
@@ -25,11 +25,14 @@ class JSXNode extends Expr, @jsx_element {
   /**
    * Gets the parent JSX element or fragment of this element.
    */
-  JSXNode getJsxParent() { this = result.getABodyElement() }
+  JsxNode getJsxParent() { this = result.getABodyElement() }
 
   override string getAPrimaryQlClass() { result = "JSXNode" }
 }
 
+/** DEPRECATED: Alias for JsxNode */
+deprecated class JSXNode = JsxNode;
+
 /**
  * A JSX element.
  *
@@ -40,25 +43,25 @@ class JSXNode extends Expr, @jsx_element {
  * <Welcome name={user.name}/>
  * ```
  */
-class JSXElement extends JSXNode {
-  JSXName name;
+class JsxElement extends JsxNode {
+  JsxName name;
 
-  JSXElement() { name = getChildExpr(-1) }
+  JsxElement() { name = getChildExpr(-1) }
 
   /** Gets the expression denoting the name of this element. */
-  JSXName getNameExpr() { result = name }
+  JsxName getNameExpr() { result = name }
 
   /** Gets the name of this element. */
   string getName() { result = name.getValue() }
 
   /** Gets the `i`th attribute of this element. */
-  JSXAttribute getAttribute(int i) { properties(result, this, i, _, _) }
+  JsxAttribute getAttribute(int i) { properties(result, this, i, _, _) }
 
   /** Gets an attribute of this element. */
-  JSXAttribute getAnAttribute() { result = getAttribute(_) }
+  JsxAttribute getAnAttribute() { result = getAttribute(_) }
 
   /** Gets the attribute of this element with the given name, if any. */
-  JSXAttribute getAttributeByName(string n) { result = getAnAttribute() and result.getName() = n }
+  JsxAttribute getAttributeByName(string n) { result = getAnAttribute() and result.getName() = n }
 
   override ControlFlowNode getFirstControlFlowNode() {
     result = getNameExpr().getFirstControlFlowNode()
@@ -70,9 +73,15 @@ class JSXElement extends JSXNode {
    * Holds if this JSX element is a HTML element.
    * That is, the name starts with a lowercase letter.
    */
-  predicate isHTMLElement() { getName().regexpMatch("[a-z].*") }
+  predicate isHtmlElement() { getName().regexpMatch("[a-z].*") }
+
+  /** DEPRECATED: Alias for isHtmlElement */
+  deprecated predicate isHTMLElement() { isHtmlElement() }
 }
 
+/** DEPRECATED: Alias for JsxElement */
+deprecated class JSXElement = JsxElement;
+
 /**
  * A JSX fragment.
  *
@@ -82,8 +91,8 @@ class JSXElement extends JSXNode {
  * <><h1>Title</h1>Some <b>text</b></>
  * ```
  */
-class JSXFragment extends JSXNode {
-  JSXFragment() { not exists(getChildExpr(-1)) }
+class JsxFragment extends JsxNode {
+  JsxFragment() { not exists(getChildExpr(-1)) }
 
   override ControlFlowNode getFirstControlFlowNode() {
     result = getBodyElement(0).getFirstControlFlowNode()
@@ -94,6 +103,9 @@ class JSXFragment extends JSXNode {
   override string getAPrimaryQlClass() { result = "JSXFragment" }
 }
 
+/** DEPRECATED: Alias for JsxFragment */
+deprecated class JSXFragment = JsxFragment;
+
 /**
  * An attribute of a JSX element, including spread attributes.
  *
@@ -105,13 +117,13 @@ class JSXFragment extends JSXNode {
  * <div {...attrs}></div>            // `{...attrs}` is a (spread) attribute
  * ```
  */
-class JSXAttribute extends ASTNode, @jsx_attribute {
+class JsxAttribute extends AstNode, @jsx_attribute {
   /**
    * Gets the expression denoting the name of this attribute.
    *
    * This is not defined for spread attributes.
    */
-  JSXName getNameExpr() { result = getChildExpr(0) }
+  JsxName getNameExpr() { result = getChildExpr(0) }
 
   /**
    * Gets the name of this attribute.
@@ -127,7 +139,7 @@ class JSXAttribute extends ASTNode, @jsx_attribute {
   string getStringValue() { result = getValue().getStringValue() }
 
   /** Gets the JSX element to which this attribute belongs. */
-  JSXElement getElement() { this = result.getAnAttribute() }
+  JsxElement getElement() { this = result.getAnAttribute() }
 
   override ControlFlowNode getFirstControlFlowNode() {
     result = getNameExpr().getFirstControlFlowNode()
@@ -140,6 +152,9 @@ class JSXAttribute extends ASTNode, @jsx_attribute {
   override string getAPrimaryQlClass() { result = "JSXAttribute" }
 }
 
+/** DEPRECATED: Alias for JsxAttribute */
+deprecated class JSXAttribute = JsxAttribute;
+
 /**
  * A spread attribute of a JSX element.
  *
@@ -149,8 +164,8 @@ class JSXAttribute extends ASTNode, @jsx_attribute {
  * <div {...attrs}></div>            // `{...attrs}` is a spread attribute
  * ```
  */
-class JSXSpreadAttribute extends JSXAttribute {
-  JSXSpreadAttribute() { not exists(getNameExpr()) }
+class JsxSpreadAttribute extends JsxAttribute {
+  JsxSpreadAttribute() { not exists(getNameExpr()) }
 
   override SpreadElement getValue() {
     // override for more precise result type
@@ -158,6 +173,9 @@ class JSXSpreadAttribute extends JSXAttribute {
   }
 }
 
+/** DEPRECATED: Alias for JsxSpreadAttribute */
+deprecated class JSXSpreadAttribute = JsxSpreadAttribute;
+
 /**
  * A namespace-qualified name such as `n:a`.
  *
@@ -167,7 +185,7 @@ class JSXSpreadAttribute extends JSXAttribute {
  * html:href
  * ```
  */
-class JSXQualifiedName extends Expr, @jsx_qualified_name {
+class JsxQualifiedName extends Expr, @jsx_qualified_name {
   /** Gets the namespace component of this qualified name. */
   Identifier getNamespace() { result = getChildExpr(0) }
 
@@ -181,6 +199,9 @@ class JSXQualifiedName extends Expr, @jsx_qualified_name {
   override string getAPrimaryQlClass() { result = "JSXQualifiedName" }
 }
 
+/** DEPRECATED: Alias for JsxQualifiedName */
+deprecated class JSXQualifiedName = JsxQualifiedName;
+
 /**
  * A name of an JSX element or attribute (which is
  * always an identifier, a dot expression, or a qualified
@@ -194,12 +215,12 @@ class JSXQualifiedName extends Expr, @jsx_qualified_name {
  * data.path
  * ```
  */
-class JSXName extends Expr {
-  JSXName() {
+class JsxName extends Expr {
+  JsxName() {
     this instanceof Identifier or
     this instanceof ThisExpr or
-    this.(DotExpr).getBase() instanceof JSXName or
-    this instanceof JSXQualifiedName
+    this.(DotExpr).getBase() instanceof JsxName or
+    this instanceof JsxQualifiedName
   }
 
   /**
@@ -209,10 +230,10 @@ class JSXName extends Expr {
     result = this.(Identifier).getName()
     or
     exists(DotExpr dot | dot = this |
-      result = dot.getBase().(JSXName).getValue() + "." + dot.getPropertyName()
+      result = dot.getBase().(JsxName).getValue() + "." + dot.getPropertyName()
     )
     or
-    exists(JSXQualifiedName qual | qual = this |
+    exists(JsxQualifiedName qual | qual = this |
       result = qual.getNamespace().getName() + ":" + qual.getName().getName()
     )
     or
@@ -221,6 +242,9 @@ class JSXName extends Expr {
   }
 }
 
+/** DEPRECATED: Alias for JsxName */
+deprecated class JSXName = JsxName;
+
 /**
  * An interpolating expression that interpolates nothing.
  *
@@ -230,10 +254,13 @@ class JSXName extends Expr {
  * { /* TBD *&#47; }
  * </pre>
  */
-class JSXEmptyExpr extends Expr, @jsx_empty_expr {
+class JsxEmptyExpr extends Expr, @jsx_empty_expr {
   override string getAPrimaryQlClass() { result = "JSXEmptyExpr" }
 }
 
+/** DEPRECATED: Alias for JsxEmptyExpr */
+deprecated class JSXEmptyExpr = JsxEmptyExpr;
+
 /**
  * A legacy `@jsx` pragma.
  *
@@ -243,12 +270,18 @@ class JSXEmptyExpr extends Expr, @jsx_empty_expr {
  * @jsx React.DOM
  * ```
  */
-class JSXPragma extends JSDocTag {
-  JSXPragma() { getTitle() = "jsx" }
+class JsxPragma extends JSDocTag {
+  JsxPragma() { getTitle() = "jsx" }
 
   /**
    * Gets the DOM name specified by the pragma; for `@jsx React.DOM`,
    * the result is `React.DOM`.
    */
-  string getDOMName() { result = getDescription().trim() }
+  string getDomName() { result = getDescription().trim() }
+
+  /** DEPRECATED: Alias for getDomName */
+  deprecated string getDOMName() { result = getDomName() }
 }
+
+/** DEPRECATED: Alias for JsxPragma */
+deprecated class JSXPragma = JsxPragma;
diff --git a/javascript/ql/lib/semmle/javascript/JsonStringifiers.qll b/javascript/ql/lib/semmle/javascript/JsonStringifiers.qll
index 8f6edd312cd..03ca152471f 100644
--- a/javascript/ql/lib/semmle/javascript/JsonStringifiers.qll
+++ b/javascript/ql/lib/semmle/javascript/JsonStringifiers.qll
@@ -64,7 +64,7 @@ class JSON2CSVTaintStep extends TaintTracking::SharedTaintStep {
  * This is not quite a `JSON.stringify` call, as it e.g. does not wrap keys in double quotes.
  * It's therefore modeled as a taint-step rather than as a `JSON.stringify` call.
  */
-class PrettyJSONTaintStep extends TaintTracking::SharedTaintStep {
+class PrettyJsonTaintStep extends TaintTracking::SharedTaintStep {
   override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
     exists(API::CallNode call |
       call = API::moduleImport("prettyjson").getMember("render").getACall()
@@ -74,3 +74,6 @@ class PrettyJSONTaintStep extends TaintTracking::SharedTaintStep {
     )
   }
 }
+
+/** DEPRECATED: Alias for PrettyJsonTaintStep */
+deprecated class PrettyJSONTaintStep = PrettyJsonTaintStep;
diff --git a/javascript/ql/lib/semmle/javascript/Modules.qll b/javascript/ql/lib/semmle/javascript/Modules.qll
index a811f6689e9..8c36044bb24 100644
--- a/javascript/ql/lib/semmle/javascript/Modules.qll
+++ b/javascript/ql/lib/semmle/javascript/Modules.qll
@@ -118,7 +118,7 @@ abstract class Module extends TopLevel {
  * An import in a module, which may be an ECMAScript 2015-style
  * `import` statement, a CommonJS-style `require` import, or an AMD dependency.
  */
-abstract class Import extends ASTNode {
+abstract class Import extends AstNode {
   /** Gets the module in which this import appears. */
   abstract Module getEnclosingModule();
 
@@ -211,7 +211,7 @@ abstract class Import extends ASTNode {
  * No support for importing from folders inside the other package.
  */
 private Module resolveNeighbourPackage(PathString importPath) {
-  exists(PackageJSON json | importPath = json.getPackageName() and result = json.getMainModule())
+  exists(PackageJson json | importPath = json.getPackageName() and result = json.getMainModule())
   or
   exists(string package |
     result.getFile().getParentContainer() = getPackageFolder(package) and
@@ -224,7 +224,7 @@ private Module resolveNeighbourPackage(PathString importPath) {
  */
 pragma[noinline]
 private Folder getPackageFolder(string package) {
-  exists(PackageJSON json |
+  exists(PackageJson json |
     json.getPackageName() = package and
     result = json.getFile().getParentContainer()
   )
diff --git a/javascript/ql/lib/semmle/javascript/NPM.qll b/javascript/ql/lib/semmle/javascript/NPM.qll
index 03d62b3aac6..8644ad5c15c 100644
--- a/javascript/ql/lib/semmle/javascript/NPM.qll
+++ b/javascript/ql/lib/semmle/javascript/NPM.qll
@@ -6,8 +6,8 @@ import javascript
 private import NodeModuleResolutionImpl
 
 /** A `package.json` configuration object. */
-class PackageJSON extends JSONObject {
-  PackageJSON() {
+class PackageJson extends JsonObject {
+  PackageJson() {
     this.getJsonFile().getBaseName() = "package.json" and
     this.isTopLevel()
   }
@@ -22,7 +22,7 @@ class PackageJSON extends JSONObject {
   string getDescription() { result = this.getPropStringValue("description") }
 
   /** Gets the array of keywords for this package. */
-  JSONArray getKeywords() { result = this.getPropValue("keywords") }
+  JsonArray getKeywords() { result = this.getPropValue("keywords") }
 
   /** Gets a keyword for this package. */
   string getAKeyword() { result = this.getKeywords().getElementStringValue(_) }
@@ -45,7 +45,7 @@ class PackageJSON extends JSONObject {
   }
 
   /** Gets the array of files for this package. */
-  JSONArray getFiles() { result = this.getPropValue("files") }
+  JsonArray getFiles() { result = this.getPropValue("files") }
 
   /** Gets a file for this package. */
   string getAFile() { result = this.getFiles().getElementStringValue(_) }
@@ -67,16 +67,16 @@ class PackageJSON extends JSONObject {
   }
 
   /** Gets information about the directories of this package. */
-  JSONObject getDirectories() { result = this.getPropValue("directories") }
+  JsonObject getDirectories() { result = this.getPropValue("directories") }
 
   /** Gets repository information for this package. */
   RepositoryInfo getRepository() { result = this.getPropValue("repository") }
 
   /** Gets information about the scripts of this package. */
-  JSONObject getScripts() { result = this.getPropValue("scripts") }
+  JsonObject getScripts() { result = this.getPropValue("scripts") }
 
   /** Gets configuration information for this package. */
-  JSONObject getConfig() { result = this.getPropValue("config") }
+  JsonObject getConfig() { result = this.getPropValue("config") }
 
   /** Gets the dependencies of this package. */
   PackageDependencies getDependencies() { result = this.getPropValue("dependencies") }
@@ -131,10 +131,10 @@ class PackageJSON extends JSONObject {
   PackageDependencies getEngines() { result = this.getPropValue("engines") }
 
   /** Holds if this package has strict engine requirements. */
-  predicate isEngineStrict() { this.getPropValue("engineStrict").(JSONBoolean).getValue() = "true" }
+  predicate isEngineStrict() { this.getPropValue("engineStrict").(JsonBoolean).getValue() = "true" }
 
   /** Gets information about operating systems supported by this package. */
-  JSONArray getOSs() { result = this.getPropValue("os") }
+  JsonArray getOSs() { result = this.getPropValue("os") }
 
   /** Gets an operating system supported by this package. */
   string getWhitelistedOS() {
@@ -150,7 +150,7 @@ class PackageJSON extends JSONObject {
   }
 
   /** Gets information about platforms supported by this package. */
-  JSONArray getCPUs() { result = this.getPropValue("cpu") }
+  JsonArray getCPUs() { result = this.getPropValue("cpu") }
 
   /** Gets a platform supported by this package. */
   string getWhitelistedCPU() {
@@ -166,13 +166,13 @@ class PackageJSON extends JSONObject {
   }
 
   /** Holds if this package prefers to be installed globally. */
-  predicate isPreferGlobal() { this.getPropValue("preferGlobal").(JSONBoolean).getValue() = "true" }
+  predicate isPreferGlobal() { this.getPropValue("preferGlobal").(JsonBoolean).getValue() = "true" }
 
   /** Holds if this is a private package. */
-  predicate isPrivate() { this.getPropValue("private").(JSONBoolean).getValue() = "true" }
+  predicate isPrivate() { this.getPropValue("private").(JsonBoolean).getValue() = "true" }
 
   /** Gets publishing configuration information about this package. */
-  JSONValue getPublishConfig() { result = this.getPropValue("publishConfig") }
+  JsonValue getPublishConfig() { result = this.getPropValue("publishConfig") }
 
   /**
    * Gets the main module of this package.
@@ -182,13 +182,16 @@ class PackageJSON extends JSONObject {
   }
 }
 
+/** DEPRECATED: Alias for PackageJson */
+deprecated class PackageJSON = PackageJson;
+
 /**
  * A representation of bug tracker information for an NPM package.
  */
-class BugTrackerInfo extends JSONValue {
+class BugTrackerInfo extends JsonValue {
   BugTrackerInfo() {
-    exists(PackageJSON pkg | pkg.getPropValue("bugs") = this) and
-    (this instanceof JSONObject or this instanceof JSONString)
+    exists(PackageJson pkg | pkg.getPropValue("bugs") = this) and
+    (this instanceof JsonObject or this instanceof JsonString)
   }
 
   /** Gets the bug tracker URL. */
@@ -204,13 +207,13 @@ class BugTrackerInfo extends JSONValue {
 /**
  * A representation of contributor information for an NPM package.
  */
-class ContributorInfo extends JSONValue {
+class ContributorInfo extends JsonValue {
   ContributorInfo() {
-    exists(PackageJSON pkg |
+    exists(PackageJson pkg |
       this = pkg.getPropValue("author") or
       this = pkg.getPropValue("contributors").getElementValue(_)
     ) and
-    (this instanceof JSONObject or this instanceof JSONString)
+    (this instanceof JsonObject or this instanceof JsonString)
   }
 
   /**
@@ -244,8 +247,8 @@ class ContributorInfo extends JSONValue {
 /**
  * A representation of repository information for an NPM package.
  */
-class RepositoryInfo extends JSONObject {
-  RepositoryInfo() { exists(PackageJSON pkg | this = pkg.getPropValue("repository")) }
+class RepositoryInfo extends JsonObject {
+  RepositoryInfo() { exists(PackageJson pkg | this = pkg.getPropValue("repository")) }
 
   /** Gets the repository type. */
   string getType() { result = this.getPropStringValue("type") }
@@ -257,9 +260,9 @@ class RepositoryInfo extends JSONObject {
 /**
  * A representation of package dependencies for an NPM package.
  */
-class PackageDependencies extends JSONObject {
+class PackageDependencies extends JsonObject {
   PackageDependencies() {
-    exists(PackageJSON pkg, string name |
+    exists(PackageJson pkg, string name |
       name.regexpMatch("(.+D|d)ependencies|engines") and
       this = pkg.getPropValue(name)
     )
@@ -272,11 +275,11 @@ class PackageDependencies extends JSONObject {
 /**
  * An NPM package.
  */
-class NPMPackage extends @folder {
+class NpmPackage extends @folder {
   /** The `package.json` file of this package. */
-  PackageJSON pkg;
+  PackageJson pkg;
 
-  NPMPackage() { pkg.getJsonFile().getParentContainer() = this }
+  NpmPackage() { pkg.getJsonFile().getParentContainer() = this }
 
   /** Gets a textual representation of this package. */
   string toString() { result = this.(Folder).toString() }
@@ -285,10 +288,13 @@ class NPMPackage extends @folder {
   string getPath() { result = this.(Folder).getAbsolutePath() }
 
   /** Gets the `package.json` object of this package. */
-  PackageJSON getPackageJSON() { result = pkg }
+  PackageJson getPackageJson() { result = pkg }
+
+  /** DEPRECATED: Alias for getPackageJson */
+  deprecated PackageJSON getPackageJSON() { result = getPackageJson() }
 
   /** Gets the name of this package. */
-  string getPackageName() { result = this.getPackageJSON().getPackageName() }
+  string getPackageName() { result = this.getPackageJson().getPackageName() }
 
   /** Gets the `node_modules` folder of this package. */
   Folder getNodeModulesFolder() {
@@ -325,6 +331,9 @@ class NPMPackage extends @folder {
   predicate declaresDependency(string p, string v) { pkg.declaresDependency(p, v) }
 }
 
+/** DEPRECATED: Alias for NpmPackage */
+deprecated class NPMPackage = NpmPackage;
+
 /**
  * Gets the parent folder of `c`, provided that they belong to the same NPM
  * package; that is, `c` must not be a `node_modules` folder.
diff --git a/javascript/ql/lib/semmle/javascript/NodeModuleResolutionImpl.qll b/javascript/ql/lib/semmle/javascript/NodeModuleResolutionImpl.qll
index cb2481861ee..6df85792a56 100644
--- a/javascript/ql/lib/semmle/javascript/NodeModuleResolutionImpl.qll
+++ b/javascript/ql/lib/semmle/javascript/NodeModuleResolutionImpl.qll
@@ -60,7 +60,7 @@ File loadAsFile(Require req, int rootPriority, int priority) {
  */
 File loadAsDirectory(Require req, int rootPriority, int priority) {
   exists(Folder dir | dir = req.getImportedPath().resolve(rootPriority) |
-    result = resolveMainModule(dir.(NPMPackage).getPackageJSON(), priority) or
+    result = resolveMainModule(dir.(NpmPackage).getPackageJson(), priority) or
     result = tryExtensions(dir, "index", priority - (numberOfExtensions() + 1))
   )
 }
@@ -90,7 +90,7 @@ private string getStem(string name) { result = name.regexpCapture("(.+?)(?:\\.([
 /**
  * Gets the main module described by `pkg` with the given `priority`.
  */
-File resolveMainModule(PackageJSON pkg, int priority) {
+File resolveMainModule(PackageJson pkg, int priority) {
   exists(PathExpr main | main = MainModulePath::of(pkg) |
     result = main.resolve() and priority = 0
     or
@@ -144,14 +144,17 @@ private string getASrcFolderName() { result = ["ts", "js", "src", "lib"] }
  * module of the package.
  */
 class MainModulePath extends PathExpr, @json_string {
-  PackageJSON pkg;
+  PackageJson pkg;
 
   MainModulePath() { this = pkg.getPropValue(["main", "module"]) }
 
   /** Gets the `package.json` file in which this path occurs. */
-  PackageJSON getPackageJSON() { result = pkg }
+  PackageJson getPackageJson() { result = pkg }
 
-  override string getValue() { result = this.(JSONString).getValue() }
+  /** DEPRECATED: Alias for getPackageJson */
+  deprecated PackageJSON getPackageJSON() { result = getPackageJson() }
+
+  override string getValue() { result = this.(JsonString).getValue() }
 
   override Folder getAdditionalSearchRoot(int priority) {
     priority = 0 and
@@ -160,7 +163,7 @@ class MainModulePath extends PathExpr, @json_string {
 }
 
 module MainModulePath {
-  MainModulePath of(PackageJSON pkg) { result.getPackageJSON() = pkg }
+  MainModulePath of(PackageJson pkg) { result.getPackageJson() = pkg }
 }
 
 /**
@@ -169,17 +172,20 @@ module MainModulePath {
  * For performance reasons this only exists if there is no "main" field in the `package.json` file.
  */
 private class FilesPath extends PathExpr, @json_string {
-  PackageJSON pkg;
+  PackageJson pkg;
 
   FilesPath() {
-    this = pkg.getPropValue("files").(JSONArray).getElementValue(_) and
+    this = pkg.getPropValue("files").(JsonArray).getElementValue(_) and
     not exists(MainModulePath::of(pkg))
   }
 
   /** Gets the `package.json` file in which this path occurs. */
-  PackageJSON getPackageJSON() { result = pkg }
+  PackageJson getPackageJson() { result = pkg }
 
-  override string getValue() { result = this.(JSONString).getValue() }
+  /** DEPRECATED: Alias for getPackageJson */
+  deprecated PackageJSON getPackageJSON() { result = getPackageJson() }
+
+  override string getValue() { result = this.(JsonString).getValue() }
 
   override Folder getAdditionalSearchRoot(int priority) {
     priority = 0 and
@@ -188,5 +194,5 @@ private class FilesPath extends PathExpr, @json_string {
 }
 
 private module FilesPath {
-  FilesPath of(PackageJSON pkg) { result.getPackageJSON() = pkg }
+  FilesPath of(PackageJson pkg) { result.getPackageJson() = pkg }
 }
diff --git a/javascript/ql/lib/semmle/javascript/PackageExports.qll b/javascript/ql/lib/semmle/javascript/PackageExports.qll
index 2895ad7232c..82bcb842859 100644
--- a/javascript/ql/lib/semmle/javascript/PackageExports.qll
+++ b/javascript/ql/lib/semmle/javascript/PackageExports.qll
@@ -52,7 +52,7 @@ private import NodeModuleResolutionImpl as NodeModule
 private DataFlow::Node getAValueExportedByPackage() {
   // The base case, an export from a named `package.json` file.
   result =
-    getAnExportFromModule(any(PackageJSON pack | exists(pack.getPackageName())).getMainModule())
+    getAnExportFromModule(any(PackageJson pack | exists(pack.getPackageName())).getMainModule())
   or
   // module.exports.bar.baz = result;
   exists(DataFlow::PropWrite write |
@@ -133,7 +133,7 @@ private DataFlow::Node getAValueExportedByPackage() {
     DataFlow::globalVarRef("define").getACall().getArgument(1) = prev.getALocalUse() and
     func.getFile() =
       min(int j, File f |
-        f = NodeModule::resolveMainModule(any(PackageJSON pack | exists(pack.getPackageName())), j)
+        f = NodeModule::resolveMainModule(any(PackageJson pack | exists(pack.getPackageName())), j)
       |
         f order by j
       )
diff --git a/javascript/ql/lib/semmle/javascript/Paths.qll b/javascript/ql/lib/semmle/javascript/Paths.qll
index 11904b3069e..e22d5ad6132 100644
--- a/javascript/ql/lib/semmle/javascript/Paths.qll
+++ b/javascript/ql/lib/semmle/javascript/Paths.qll
@@ -212,7 +212,7 @@ private module TypeScriptOutDir {
    * Gets a folder of TypeScript files that is compiled to JavaScript files in `outdir` relative to a `parent`.
    */
   string getOriginalTypeScriptFolder(string outdir, Folder parent) {
-    exists(JSONObject tsconfig |
+    exists(JsonObject tsconfig |
       outdir = removeLeadingSlash(getOutDir(tsconfig, parent)) and
       result = removeLeadingSlash(getEffectiveRootDirFromTSConfig(tsconfig))
     )
@@ -229,7 +229,7 @@ private module TypeScriptOutDir {
   /**
    * Gets the `outDir` option from a tsconfig file from the folder `parent`.
    */
-  private string getOutDir(JSONObject tsconfig, Folder parent) {
+  private string getOutDir(JsonObject tsconfig, Folder parent) {
     tsconfig.getFile().getBaseName().regexpMatch("tsconfig.*\\.json") and
     tsconfig.isTopLevel() and
     tsconfig.getFile().getParentContainer() = parent and
@@ -241,7 +241,7 @@ private module TypeScriptOutDir {
    * Based on the tsconfig.json file `tsconfig`.
    */
   pragma[inline]
-  private string getEffectiveRootDirFromTSConfig(JSONObject tsconfig) {
+  private string getEffectiveRootDirFromTSConfig(JsonObject tsconfig) {
     // if an explicit "rootDir" option exists, then use that.
     result = getRootDir(tsconfig)
     or
@@ -273,7 +273,7 @@ private module TypeScriptOutDir {
    * Can have multiple results if the includes are from multiple folders.
    */
   pragma[inline]
-  private string getARootDirFromInclude(JSONObject tsconfig) {
+  private string getARootDirFromInclude(JsonObject tsconfig) {
     result =
       getRootFolderFromPath(tsconfig.getPropValue("include").getElementValue(_).getStringValue())
   }
@@ -282,7 +282,7 @@ private module TypeScriptOutDir {
    * Gets the value of the "rootDir" option from a tsconfig.json.
    */
   pragma[inline]
-  private string getRootDir(JSONObject tsconfig) {
+  private string getRootDir(JsonObject tsconfig) {
     result = tsconfig.getPropValue("compilerOptions").getPropValue("rootDir").getStringValue()
   }
 }
diff --git a/javascript/ql/lib/semmle/javascript/PrintAst.qll b/javascript/ql/lib/semmle/javascript/PrintAst.qll
index 98abe183af1..8c2e0ff1d92 100644
--- a/javascript/ql/lib/semmle/javascript/PrintAst.qll
+++ b/javascript/ql/lib/semmle/javascript/PrintAst.qll
@@ -54,26 +54,26 @@ private string getQlClass(Locatable el) {
  */
 private newtype TPrintAstNode =
   // JavaScript / TypeScript
-  TElementNode(ASTNode el) { shouldPrint(el, _) and not isNotNeeded(el) } or
+  TElementNode(AstNode el) { shouldPrint(el, _) and not isNotNeeded(el) } or
   TParametersNode(Function f) { shouldPrint(f, _) and not isNotNeeded(f) } or
   TTypeParametersNode(TypeParameterized f) { shouldPrint(f, _) and not isNotNeeded(f) } or
-  TJSXAttributesNode(JSXElement n) { shouldPrint(n, _) and not isNotNeeded(n) } or
-  TJSXBodyElementsNode(JSXNode n) { shouldPrint(n, _) and not isNotNeeded(n) } or
+  TJsxAttributesNode(JsxElement n) { shouldPrint(n, _) and not isNotNeeded(n) } or
+  TJsxBodyElementsNode(JsxNode n) { shouldPrint(n, _) and not isNotNeeded(n) } or
   TInvokeArgumentsNode(InvokeExpr n) { shouldPrint(n, _) and not isNotNeeded(n) } or
   TInvokeTypeArgumentsNode(InvokeExpr invk) { shouldPrint(invk, _) and not isNotNeeded(invk) } or
   // JSON
-  TJSONNode(JSONValue value) { shouldPrint(value, _) and not isNotNeeded(value) } or
+  TJsonNode(JsonValue value) { shouldPrint(value, _) and not isNotNeeded(value) } or
   // YAML
-  TYAMLNode(YAMLNode n) { shouldPrint(n, _) and not isNotNeeded(n) } or
-  TYAMLMappingNode(YAMLMapping mapping, int i) {
+  TYamlNode(YAMLNode n) { shouldPrint(n, _) and not isNotNeeded(n) } or
+  TYamlMappingNode(YAMLMapping mapping, int i) {
     shouldPrint(mapping, _) and not isNotNeeded(mapping) and exists(mapping.getKeyNode(i))
   } or
   // HTML
-  THTMLElementNode(HTML::Element e) { shouldPrint(e, _) and not isNotNeeded(e) } or
-  THTMLAttributesNodes(HTML::Element e) { shouldPrint(e, _) and not isNotNeeded(e) } or
-  THTMLAttributeNode(HTML::Attribute attr) { shouldPrint(attr, _) and not isNotNeeded(attr) } or
-  THTMLScript(Script script) { shouldPrint(script, _) and not isNotNeeded(script) } or
-  THTMLCodeInAttr(CodeInAttribute attr) { shouldPrint(attr, _) and not isNotNeeded(attr) } or
+  THtmlElementNode(HTML::Element e) { shouldPrint(e, _) and not isNotNeeded(e) } or
+  THtmlAttributesNodes(HTML::Element e) { shouldPrint(e, _) and not isNotNeeded(e) } or
+  THtmlAttributeNode(HTML::Attribute attr) { shouldPrint(attr, _) and not isNotNeeded(attr) } or
+  THtmlScript(Script script) { shouldPrint(script, _) and not isNotNeeded(script) } or
+  THtmlCodeInAttr(CodeInAttribute attr) { shouldPrint(attr, _) and not isNotNeeded(attr) } or
   TRegExpTermNode(RegExpTerm term) {
     shouldPrint(term, _) and
     term.isUsedAsRegExp() and
@@ -168,7 +168,7 @@ private module PrintJavaScript {
    * For example by aggregating all the parameters of a function under a single child node.
    */
   class ElementNode extends PrintAstNode, TElementNode {
-    ASTNode element;
+    AstNode element;
 
     ElementNode() {
       this = TElementNode(element) and
@@ -183,10 +183,10 @@ private module PrintJavaScript {
     /**
      * Gets the `ASTNode` represented by this node.
      */
-    final ASTNode getElement() { result = element }
+    final AstNode getElement() { result = element }
 
     override PrintAstNode getChild(int childIndex) {
-      exists(ASTNode el | result.(ElementNode).getElement() = el |
+      exists(AstNode el | result.(ElementNode).getElement() = el |
         el = this.getChildNode(childIndex)
       )
     }
@@ -195,16 +195,16 @@ private module PrintJavaScript {
      * Gets the `i`th child of `element`.
      * Can be overriden in subclasses to get more specific behavior for `getChild()`.
      */
-    ASTNode getChildNode(int childIndex) { result = getLocationSortedChild(element, childIndex) }
+    AstNode getChildNode(int childIndex) { result = getLocationSortedChild(element, childIndex) }
   }
 
-  /** Provides predicates for pretty printing `ASTNode`s. */
+  /** Provides predicates for pretty printing `AstNode`s. */
   private module PrettyPrinting {
     /**
      * Gets a pretty string representation of `element`.
      * Either the result is `ASTNode::toString`, or a custom made string representation of `element`.
      */
-    string print(ASTNode element) {
+    string print(AstNode element) {
       shouldPrint(element, _) and
       (
         result = element.toString().regexpReplaceAll("(\\\\n|\\\\r|\\\\t| )+", " ") and
@@ -217,7 +217,7 @@ private module PrintJavaScript {
     /**
      * Gets a string representing `a`.
      */
-    private string repr(ASTNode a) {
+    private string repr(AstNode a) {
       shouldPrint(a, _) and
       (
         exists(DeclStmt decl | decl = a |
@@ -252,9 +252,9 @@ private module PrintJavaScript {
     }
   }
 
-  private ASTNode getLocationSortedChild(ASTNode parent, int i) {
+  private AstNode getLocationSortedChild(AstNode parent, int i) {
     result =
-      rank[i](ASTNode child, int childIndex |
+      rank[i](AstNode child, int childIndex |
         child = parent.getChild(childIndex)
       |
         child
@@ -370,62 +370,77 @@ private module PrintJavaScript {
    * 2: An aggregate node for all the attributes  (for example `href={foo}` in `<Name href={foo} />`).
    * 3: An aggregate node for all the body element (for example `foo` in `<span>foo</span>`).
    */
-  class JSXNodeNode extends ElementNode {
-    override JSXNode element;
+  class JsxNodeNode extends ElementNode {
+    override JsxNode element;
 
     override PrintAstNode getChild(int childIndex) {
-      childIndex = 0 and result.(ElementNode).getElement() = element.(JSXElement).getNameExpr()
+      childIndex = 0 and result.(ElementNode).getElement() = element.(JsxElement).getNameExpr()
       or
       childIndex = 1 and
       exists(element.getABodyElement()) and
-      result.(JSXBodyElementsNode).getJSXNode() = element
+      result.(JsxBodyElementsNode).getJsxNode() = element
       or
       childIndex = 2 and
-      exists(element.(JSXElement).getAttribute(_)) and
-      result.(JSXAttributesNode).getJSXElement() = element
+      exists(element.(JsxElement).getAttribute(_)) and
+      result.(JsxAttributesNode).getJsxElement() = element
     }
   }
 
+  /** DEPRECATED: Alias for JsxNodeNode */
+  deprecated class JSXNodeNode = JsxNodeNode;
+
   /**
    * An aggregate node representing all the attributes in a `JSXNode`.
    */
-  class JSXAttributesNode extends PrintAstNode, TJSXAttributesNode {
-    JSXElement n;
+  class JsxAttributesNode extends PrintAstNode, TJsxAttributesNode {
+    JsxElement n;
 
-    JSXAttributesNode() { this = TJSXAttributesNode(n) and exists(n.getAttribute(_)) }
+    JsxAttributesNode() { this = TJsxAttributesNode(n) and exists(n.getAttribute(_)) }
 
     override string toString() { result = "(Attributes)" }
 
     /**
      * Gets the `JSXElement` for which this node represents the attributes.
      */
-    JSXElement getJSXElement() { result = n }
+    JsxElement getJsxElement() { result = n }
+
+    /** DEPRECATED: Alias for getJsxElement */
+    deprecated JSXElement getJSXElement() { result = getJsxElement() }
 
     override PrintAstNode getChild(int childIndex) {
       result.(ElementNode).getElement() = n.getAttribute(childIndex)
     }
   }
 
+  /** DEPRECATED: Alias for JsxAttributesNode */
+  deprecated class JSXAttributesNode = JsxAttributesNode;
+
   /**
    * An aggregate node representing all the body elements in a `JSXNode`.
    */
-  class JSXBodyElementsNode extends PrintAstNode, TJSXBodyElementsNode {
-    JSXNode n;
+  class JsxBodyElementsNode extends PrintAstNode, TJsxBodyElementsNode {
+    JsxNode n;
 
-    JSXBodyElementsNode() { this = TJSXBodyElementsNode(n) and exists(n.getBodyElement(_)) }
+    JsxBodyElementsNode() { this = TJsxBodyElementsNode(n) and exists(n.getBodyElement(_)) }
 
     override string toString() { result = "(Body)" }
 
     /**
      * Gets the `JSXNode` for which this node represents the body elements.
      */
-    JSXNode getJSXNode() { result = n }
+    JsxNode getJsxNode() { result = n }
+
+    /** DEPRECATED: Alias for getJsxNode */
+    deprecated JSXNode getJSXNode() { result = getJsxNode() }
 
     override PrintAstNode getChild(int childIndex) {
       result.(ElementNode).getElement() = n.getBodyElement(childIndex)
     }
   }
 
+  /** DEPRECATED: Alias for JsxBodyElementsNode */
+  deprecated class JSXBodyElementsNode = JsxBodyElementsNode;
+
   /**
    * A node representing any `ASTNode` that has type-parameters.
    *
@@ -484,7 +499,7 @@ private module PrintJavaScript {
   class ParameterNode extends ElementNode {
     override Parameter element;
 
-    override ASTNode getChildNode(int childIndex) {
+    override AstNode getChildNode(int childIndex) {
       childIndex = 0 and result = element.getTypeAnnotation()
       or
       childIndex = 1 and result = element.getDefault()
@@ -535,14 +550,14 @@ private module PrintJavaScript {
 /**
  * Classes for printing JSON AST.
  */
-private module PrintJSON {
+private module PrintJson {
   /**
    * A print node representing a JSON value in a .json file.
    */
-  class JSONNode extends PrintAstNode, TJSONNode {
-    JSONValue value;
+  class JsonNode extends PrintAstNode, TJsonNode {
+    JsonValue value;
 
-    JSONNode() { this = TJSONNode(value) }
+    JsonNode() { this = TJsonNode(value) }
 
     override string toString() { result = getQlClass(value) + PrettyPrinting::print(value) }
 
@@ -551,22 +566,25 @@ private module PrintJSON {
     /**
      * Gets the `JSONValue` represented by this node.
      */
-    final JSONValue getValue() { result = value }
+    final JsonValue getValue() { result = value }
 
     override PrintAstNode getChild(int childIndex) {
-      exists(JSONValue child | result.(JSONNode).getValue() = child |
+      exists(JsonValue child | result.(JsonNode).getValue() = child |
         child = value.getChild(childIndex)
       )
     }
   }
 
+  /** DEPRECATED: Alias for JsonNode */
+  deprecated class JSONNode = JsonNode;
+
   /** Provied predicates for pretty printing JSON. */
   private module PrettyPrinting {
     /**
      * Gets a string representation of `n`.
      * Either using the default `JSONValue::toString`, or a custom printing of the JSON value.
      */
-    string print(JSONValue n) {
+    string print(JsonValue n) {
       shouldPrint(n, _) and
       (
         result = n.toString().regexpReplaceAll("(\\\\n|\\\\r|\\\\t| )+", " ") and
@@ -577,20 +595,20 @@ private module PrintJSON {
     }
 
     /** Gets a string representing `n`. */
-    private string repr(JSONValue n) {
+    private string repr(JsonValue n) {
       shouldPrint(n, _) and
       (
-        exists(JSONObject obj, string name, JSONValue prop | obj = n |
+        exists(JsonObject obj, string name, JsonValue prop | obj = n |
           prop = obj.getPropValue(name) and
           prop = obj.getChild(0) and
           result = "{" + name + ": ...}"
         )
         or
-        n instanceof JSONObject and not exists(n.getChild(_)) and result = "{}"
+        n instanceof JsonObject and not exists(n.getChild(_)) and result = "{}"
         or
-        result = n.(JSONPrimitiveValue).getRawValue()
+        result = n.(JsonPrimitiveValue).getRawValue()
         or
-        exists(JSONArray arr | arr = n |
+        exists(JsonArray arr | arr = n |
           result = "[]" and not exists(arr.getChild(_))
           or
           result = "[" + repr(arr.getChild(0)) + "]" and not exists(arr.getChild(1))
@@ -605,14 +623,14 @@ private module PrintJSON {
 /**
  * Classes for printing YAML AST.
  */
-module PrintYAML {
+module PrintYaml {
   /**
    * A print node representing a YAML value in a .yml file.
    */
-  class YAMLNodeNode extends PrintAstNode, TYAMLNode {
+  class YamlNodeNode extends PrintAstNode, TYamlNode {
     YAMLNode node;
 
-    YAMLNodeNode() { this = TYAMLNode(node) }
+    YamlNodeNode() { this = TYamlNode(node) }
 
     override string toString() { result = getQlClass(node) + node.toString() }
 
@@ -624,33 +642,39 @@ module PrintYAML {
     final YAMLNode getValue() { result = node }
 
     override PrintAstNode getChild(int childIndex) {
-      exists(YAMLNode child | result.(YAMLNodeNode).getValue() = child |
+      exists(YAMLNode child | result.(YamlNodeNode).getValue() = child |
         child = node.getChildNode(childIndex)
       )
     }
   }
 
+  /** DEPRECATED: Alias for YamlNodeNode */
+  deprecated class YAMLNodeNode = YamlNodeNode;
+
   /**
    * A print node representing a `YAMLMapping`.
    *
    * Each child of this node aggregates the key and value of a mapping.
    */
-  class YAMLMappingNode extends YAMLNodeNode {
+  class YamlMappingNode extends YamlNodeNode {
     override YAMLMapping node;
 
     override PrintAstNode getChild(int childIndex) {
-      exists(YAMLMappingMapNode map | map = result | map.maps(node, childIndex))
+      exists(YamlMappingMapNode map | map = result | map.maps(node, childIndex))
     }
   }
 
+  /** DEPRECATED: Alias for YamlMappingNode */
+  deprecated class YAMLMappingNode = YamlMappingNode;
+
   /**
    * A print node representing the `i`th mapping in `mapping`.
    */
-  class YAMLMappingMapNode extends PrintAstNode, TYAMLMappingNode {
+  class YamlMappingMapNode extends PrintAstNode, TYamlMappingNode {
     YAMLMapping mapping;
     int i;
 
-    YAMLMappingMapNode() { this = TYAMLMappingNode(mapping, i) }
+    YamlMappingMapNode() { this = TYamlMappingNode(mapping, i) }
 
     override string toString() {
       result = "(Mapping " + i + ")" and not exists(mapping.getKeyNode(i).(YAMLScalar).getValue())
@@ -667,24 +691,30 @@ module PrintYAML {
     }
 
     override PrintAstNode getChild(int childIndex) {
-      childIndex = 0 and result.(YAMLNodeNode).getValue() = mapping.getKeyNode(i)
+      childIndex = 0 and result.(YamlNodeNode).getValue() = mapping.getKeyNode(i)
       or
-      childIndex = 1 and result.(YAMLNodeNode).getValue() = mapping.getValueNode(i)
+      childIndex = 1 and result.(YamlNodeNode).getValue() = mapping.getValueNode(i)
     }
   }
+
+  /** DEPRECATED: Alias for YamlMappingMapNode */
+  deprecated class YAMLMappingMapNode = YamlMappingMapNode;
 }
 
+/** DEPRECATED: Alias for PrintYaml */
+deprecated module PrintYAML = PrintYaml;
+
 /**
  * Classes for printing HTML AST.
  */
-module PrintHTML {
+module PrintHtml {
   /**
    * A print node representing an HTML node in a .html file.
    */
-  class HTMLElementNode extends PrintAstNode, THTMLElementNode {
+  class HtmlElementNode extends PrintAstNode, THtmlElementNode {
     HTML::Element element;
 
-    HTMLElementNode() { this = THTMLElementNode(element) }
+    HtmlElementNode() { this = THtmlElementNode(element) }
 
     override string toString() { result = getQlClass(element) + "<" + element.getName() + " ..." }
 
@@ -696,36 +726,42 @@ module PrintHTML {
     final HTML::Element getElement() { result = element }
 
     override PrintAstNode getChild(int childIndex) {
-      childIndex = -1 and result.(HTMLAttributesNodes).getElement() = element
+      childIndex = -1 and result.(HtmlAttributesNodes).getElement() = element
       or
-      exists(HTML::Element child | result.(HTMLElementNode).getElement() = child |
+      exists(HTML::Element child | result.(HtmlElementNode).getElement() = child |
         child = element.getChild(childIndex)
       )
     }
   }
 
+  /** DEPRECATED: Alias for HtmlElementNode */
+  deprecated class HTMLElementNode = HtmlElementNode;
+
   /**
    * A print node representing an HTML node in a .html file.
    */
-  class HTMLScriptElementNode extends HTMLElementNode {
+  class HtmlScriptElementNode extends HtmlElementNode {
     override HTML::ScriptElement element;
 
     override PrintAstNode getChild(int childIndex) {
-      childIndex = -200 and result.(HTMLScript).getScript() = element.getScript()
+      childIndex = -200 and result.(HtmlScript).getScript() = element.getScript()
       or
       result = super.getChild(childIndex)
     }
   }
 
+  /** DEPRECATED: Alias for HtmlScriptElementNode */
+  deprecated class HTMLScriptElementNode = HtmlScriptElementNode;
+
   /**
    * A print node representing the code inside a `<script>` element.
    */
-  class HTMLScript extends PrintAstNode, THTMLScript {
+  class HtmlScript extends PrintAstNode, THtmlScript {
     Script script;
 
-    HTMLScript() {
-      this = THTMLScript(script) and
-      any(HTMLScriptElementNode se).getElement().(HTML::ScriptElement).getScript() = script
+    HtmlScript() {
+      this = THtmlScript(script) and
+      any(HtmlScriptElementNode se).getElement().(HTML::ScriptElement).getScript() = script
     }
 
     override string toString() { result = "(Script)" }
@@ -742,15 +778,18 @@ module PrintHTML {
     }
   }
 
+  /** DEPRECATED: Alias for HtmlScript */
+  deprecated class HTMLScript = HtmlScript;
+
   /**
    * A print node representing the code inside an attribute.
    */
-  class HTMLCodeInAttr extends PrintAstNode, THTMLCodeInAttr {
+  class HtmlCodeInAttr extends PrintAstNode, THtmlCodeInAttr {
     CodeInAttribute attr;
 
-    HTMLCodeInAttr() {
-      this = THTMLCodeInAttr(attr) and
-      any(HTMLAttributeNode an).getAttribute().getCodeInAttribute() = attr
+    HtmlCodeInAttr() {
+      this = THtmlCodeInAttr(attr) and
+      any(HtmlAttributeNode an).getAttribute().getCodeInAttribute() = attr
     }
 
     override string toString() { result = "(Script)" }
@@ -767,14 +806,17 @@ module PrintHTML {
     }
   }
 
+  /** DEPRECATED: Alias for HtmlCodeInAttr */
+  deprecated class HTMLCodeInAttr = HtmlCodeInAttr;
+
   /**
    * An aggregate node representing all the attributes of an HTMLElement.
    */
-  class HTMLAttributesNodes extends PrintAstNode, THTMLAttributesNodes {
+  class HtmlAttributesNodes extends PrintAstNode, THtmlAttributesNodes {
     HTML::Element element;
 
-    HTMLAttributesNodes() {
-      this = THTMLAttributesNodes(element) and exists(element.getAttribute(_))
+    HtmlAttributesNodes() {
+      this = THtmlAttributesNodes(element) and exists(element.getAttribute(_))
     }
 
     override string toString() { result = "(Attributes)" }
@@ -785,17 +827,20 @@ module PrintHTML {
     HTML::Element getElement() { result = element }
 
     override PrintAstNode getChild(int childIndex) {
-      result.(HTMLAttributeNode).getAttribute() = element.getAttribute(childIndex)
+      result.(HtmlAttributeNode).getAttribute() = element.getAttribute(childIndex)
     }
   }
 
+  /** DEPRECATED: Alias for HtmlAttributesNodes */
+  deprecated class HTMLAttributesNodes = HtmlAttributesNodes;
+
   /**
    * A print node representing an HTML attribute in a .html file.
    */
-  class HTMLAttributeNode extends PrintAstNode, THTMLAttributeNode {
+  class HtmlAttributeNode extends PrintAstNode, THtmlAttributeNode {
     HTML::Attribute attr;
 
-    HTMLAttributeNode() { this = THTMLAttributeNode(attr) }
+    HtmlAttributeNode() { this = THtmlAttributeNode(attr) }
 
     override string toString() { result = getQlClass(attr) + attr.toString() }
 
@@ -807,11 +852,17 @@ module PrintHTML {
     final HTML::Attribute getAttribute() { result = attr }
 
     override PrintAstNode getChild(int childIndex) {
-      childIndex = 0 and result.(HTMLCodeInAttr).getCode() = attr.getCodeInAttribute()
+      childIndex = 0 and result.(HtmlCodeInAttr).getCode() = attr.getCodeInAttribute()
     }
   }
+
+  /** DEPRECATED: Alias for HtmlAttributeNode */
+  deprecated class HTMLAttributeNode = HtmlAttributeNode;
 }
 
+/** DEPRECATED: Alias for PrintHtml */
+deprecated module PrintHTML = PrintHtml;
+
 /** Holds if `node` belongs to the output tree, and its property `key` has the given `value`. */
 query predicate nodes(PrintAstNode node, string key, string value) { value = node.getProperty(key) }
 
diff --git a/javascript/ql/lib/semmle/javascript/Regexp.qll b/javascript/ql/lib/semmle/javascript/Regexp.qll
index 829f78f95c5..6b434d65f39 100644
--- a/javascript/ql/lib/semmle/javascript/Regexp.qll
+++ b/javascript/ql/lib/semmle/javascript/Regexp.qll
@@ -1291,8 +1291,8 @@ module RegExp {
   /**
    * A meta character used by HTML.
    */
-  private class HTMLMetaCharacter extends MetaCharacter {
-    HTMLMetaCharacter() { this = ["<", "'", "\""] }
+  private class HtmlMetaCharacter extends MetaCharacter {
+    HtmlMetaCharacter() { this = ["<", "'", "\""] }
   }
 
   /**
diff --git a/javascript/ql/lib/semmle/javascript/SourceMaps.qll b/javascript/ql/lib/semmle/javascript/SourceMaps.qll
index 7937799ca8f..4da9f2966ae 100644
--- a/javascript/ql/lib/semmle/javascript/SourceMaps.qll
+++ b/javascript/ql/lib/semmle/javascript/SourceMaps.qll
@@ -10,17 +10,20 @@ class SourceMappingComment extends Comment {
   string url;
 
   SourceMappingComment() {
-    exists(string sourceMappingURLRegex |
-      sourceMappingURLRegex = "[@#]\\s*sourceMappingURL\\s*=\\s*(.*)\\s*"
+    exists(string sourceMappingUrlRegex |
+      sourceMappingUrlRegex = "[@#]\\s*sourceMappingURL\\s*=\\s*(.*)\\s*"
     |
       // either a line comment whose entire text matches the regex...
-      url = this.(SlashSlashComment).getText().regexpCapture(sourceMappingURLRegex, 1)
+      url = this.(SlashSlashComment).getText().regexpCapture(sourceMappingUrlRegex, 1)
       or
       // ...or a block comment one of whose lines matches the regex
-      url = this.(SlashStarComment).getLine(_).regexpCapture("//" + sourceMappingURLRegex, 1)
+      url = this.(SlashStarComment).getLine(_).regexpCapture("//" + sourceMappingUrlRegex, 1)
     )
   }
 
   /** Gets the URL of the source map referenced by this comment. */
-  string getSourceMappingURL() { result = url }
+  string getSourceMappingUrl() { result = url }
+
+  /** DEPRECATED: Alias for getSourceMappingUrl */
+  deprecated string getSourceMappingURL() { result = getSourceMappingUrl() }
 }
diff --git a/javascript/ql/lib/semmle/javascript/Stmt.qll b/javascript/ql/lib/semmle/javascript/Stmt.qll
index 4bef2d9363f..edf8296585a 100644
--- a/javascript/ql/lib/semmle/javascript/Stmt.qll
+++ b/javascript/ql/lib/semmle/javascript/Stmt.qll
@@ -248,7 +248,7 @@ private class MaybeDirective extends ExprStmt {
  */
 class Directive extends MaybeDirective {
   Directive() {
-    exists(StmtContainer sc, ASTNode body, int i |
+    exists(StmtContainer sc, AstNode body, int i |
       // directives must be toplevel statements in their container
       body = sc.getBody() and
       this = body.getChildStmt(i) and
@@ -502,7 +502,7 @@ class JumpStmt extends TJumpStmt, Stmt {
    * Note that this predicate does not take `finally` clauses
    * into account, which may interrupt the jump.
    */
-  abstract ASTNode getTarget();
+  abstract AstNode getTarget();
 }
 
 /**
@@ -583,7 +583,7 @@ class WithStmt extends @with_stmt, ControlStmt {
     exists(Variable v | v = acc.getVariable() |
       v instanceof GlobalVariable
       or
-      exists(ASTNode scopeElt | scopeElt = v.getScope().getScopeElement() |
+      exists(AstNode scopeElt | scopeElt = v.getScope().getScopeElement() |
         scopeElt = this.getParent+()
       )
     )
@@ -676,7 +676,7 @@ class ThrowStmt extends @throw_stmt, JumpStmt {
    * `try` statement in whose body the throw statement occurs. If there is no such
    * `try` statement, the target defaults to the enclosing statement container.
    */
-  override ASTNode getTarget() {
+  override AstNode getTarget() {
     if exists(TryStmt ts | this.getParentStmt+() = ts.getBody())
     then
       this.getParentStmt+() = result.(TryStmt).getBody() and
@@ -802,7 +802,7 @@ class DoWhileStmt extends @do_while_stmt, LoopStmt {
  * var i = 1;
  * ```
  */
-class ExprOrVarDecl extends ASTNode {
+class ExprOrVarDecl extends AstNode {
   ExprOrVarDecl() {
     this instanceof Expr or
     this instanceof DeclStmt
diff --git a/javascript/ql/lib/semmle/javascript/TypeScript.qll b/javascript/ql/lib/semmle/javascript/TypeScript.qll
index 62d7f61c0c3..70a1ed98830 100644
--- a/javascript/ql/lib/semmle/javascript/TypeScript.qll
+++ b/javascript/ql/lib/semmle/javascript/TypeScript.qll
@@ -98,7 +98,7 @@ class NamespaceDeclaration extends NamespaceDefinition, StmtContainer, @namespac
  * Note that imports and type parameters are not type definitions.  Consider using `TypeDecl` to capture
  * a wider class of type declarations.
  */
-class TypeDefinition extends ASTNode, @type_definition {
+class TypeDefinition extends AstNode, @type_definition {
   /**
    * Gets the identifier naming the type.
    */
@@ -376,7 +376,7 @@ class ConstructorTypeExpr extends FunctionTypeExpr, @constructor_typeexpr { }
 class PlainFunctionTypeExpr extends FunctionTypeExpr, @plain_function_typeexpr { }
 
 /** A possibly qualified identifier that declares or refers to a type. */
-abstract class TypeRef extends ASTNode { }
+abstract class TypeRef extends AstNode { }
 
 /** An identifier declaring a type name, that is, the name of a class, interface, type parameter, or import. */
 class TypeDecl extends Identifier, TypeRef, LexicalDecl {
@@ -1291,7 +1291,7 @@ class ExpressionWithTypeArguments extends @expression_with_type_arguments, Expr
 /**
  * A program element that supports type parameters, that is, a function, class, interface, type alias, mapped type, or `infer` type.
  */
-class TypeParameterized extends @type_parameterized, ASTNode {
+class TypeParameterized extends @type_parameterized, AstNode {
   /** Gets the `n`th type parameter declared on this function or type. */
   TypeParameter getTypeParameter(int n) { none() } // Overridden in subtypes.
 
@@ -1394,7 +1394,7 @@ class NonNullAssertion extends Expr, @non_null_assertion {
 /**
  * A possibly qualified identifier that refers to or declares a local name for a namespace.
  */
-abstract class NamespaceRef extends ASTNode { }
+abstract class NamespaceRef extends AstNode { }
 
 /**
  * An identifier that declares a local name for a namespace, that is,
@@ -1602,7 +1602,7 @@ class EnumDeclaration extends NamespaceDefinition, @enum_declaration, AST::Value
  * enum Color { red = 1, green, blue }
  * ```
  */
-class EnumMember extends ASTNode, @enum_member {
+class EnumMember extends AstNode, @enum_member {
   /**
    * Gets the name of the enum member, such as `off` in `enum State { on, off }`.
    *
diff --git a/javascript/ql/lib/semmle/javascript/Variables.qll b/javascript/ql/lib/semmle/javascript/Variables.qll
index fa97bd151e6..73292cfed40 100644
--- a/javascript/ql/lib/semmle/javascript/Variables.qll
+++ b/javascript/ql/lib/semmle/javascript/Variables.qll
@@ -14,7 +14,7 @@ class Scope extends @scope {
   Scope getAnInnerScope() { result.getOuterScope() = this }
 
   /** Gets the program element this scope is associated with, if any. */
-  ASTNode getScopeElement() { scopenodes(result, this) }
+  AstNode getScopeElement() { scopenodes(result, this) }
 
   /** Gets the location of the program element this scope is associated with, if any. */
   Location getLocation() { result = this.getScopeElement().getLocation() }
@@ -32,7 +32,7 @@ class Scope extends @scope {
 /**
  * A program element that induces a scope.
  */
-class ScopeElement extends ASTNode {
+class ScopeElement extends AstNode {
   Scope s;
 
   ScopeElement() { this = s.getScopeElement() }
@@ -581,7 +581,7 @@ class ObjectPattern extends DestructuringPattern, @object_pattern {
  * }
  * ```
  */
-class PropertyPattern extends @property, ASTNode {
+class PropertyPattern extends @property, AstNode {
   PropertyPattern() {
     // filter out ordinary properties
     exists(ObjectPattern obj | properties(this, obj, _, _, _))
diff --git a/javascript/ql/lib/semmle/javascript/XML.qll b/javascript/ql/lib/semmle/javascript/XML.qll
index d2e6c44951f..fb781a4683f 100755
--- a/javascript/ql/lib/semmle/javascript/XML.qll
+++ b/javascript/ql/lib/semmle/javascript/XML.qll
@@ -4,11 +4,11 @@
 
 import semmle.files.FileSystem
 
-private class TXMLLocatable =
+private class TXmlLocatable =
   @xmldtd or @xmlelement or @xmlattribute or @xmlnamespace or @xmlcomment or @xmlcharacters;
 
 /** An XML element that has a location. */
-class XMLLocatable extends @xmllocatable, TXMLLocatable {
+class XMLLocatable extends @xmllocatable, TXmlLocatable {
   /** Gets the source location for this element. */
   Location getLocation() { xmllocations(this, result) }
 
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/DataFlow.qll b/javascript/ql/lib/semmle/javascript/dataflow/DataFlow.qll
index 5a4b1ac3f46..113abe41208 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/DataFlow.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/DataFlow.qll
@@ -78,7 +78,7 @@ module DataFlow {
     }
 
     /** Gets the AST node corresponding to this data flow node, if any. */
-    ASTNode getAstNode() { none() }
+    AstNode getAstNode() { none() }
 
     /** Gets the basic block to which this node belongs. */
     BasicBlock getBasicBlock() { none() }
@@ -332,7 +332,7 @@ module DataFlow {
 
     override File getFile() { result = ssa.getBasicBlock().getFile() }
 
-    override ASTNode getAstNode() { none() }
+    override AstNode getAstNode() { none() }
   }
 
   /**
@@ -353,11 +353,11 @@ module DataFlow {
           .hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
     }
 
-    override string toString() { result = prop.(ASTNode).toString() }
+    override string toString() { result = prop.(AstNode).toString() }
 
-    override File getFile() { result = prop.(ASTNode).getFile() }
+    override File getFile() { result = prop.(AstNode).getFile() }
 
-    override ASTNode getAstNode() { result = prop }
+    override AstNode getAstNode() { result = prop }
   }
 
   /**
@@ -382,7 +382,7 @@ module DataFlow {
 
     override File getFile() { result = pattern.getFile() }
 
-    override ASTNode getAstNode() { result = rest }
+    override AstNode getAstNode() { result = rest }
   }
 
   /**
@@ -407,7 +407,7 @@ module DataFlow {
 
     override File getFile() { result = pattern.getFile() }
 
-    override ASTNode getAstNode() { result = elt }
+    override AstNode getAstNode() { result = elt }
   }
 
   /**
@@ -436,7 +436,7 @@ module DataFlow {
 
     override File getFile() { result = arr.getFile() }
 
-    override ASTNode getAstNode() { result = elt }
+    override AstNode getAstNode() { result = elt }
   }
 
   /**
@@ -719,7 +719,7 @@ module DataFlow {
    * the JSX element it is in.
    */
   private class JsxAttributeAsPropWrite extends PropWrite, PropNode {
-    override JSXAttribute prop;
+    override JsxAttribute prop;
 
     override Node getBase() { result = valueNode(prop.getElement()) }
 
@@ -1307,7 +1307,7 @@ module DataFlow {
    * This predicate is only defined for expressions, properties, and for statements that declare
    * a function, a class, or a TypeScript namespace or enum.
    */
-  ValueNode valueNode(ASTNode nd) { result.getAstNode() = nd }
+  ValueNode valueNode(AstNode nd) { result.getAstNode() = nd }
 
   /**
    * Gets the data flow node corresponding to `e`.
@@ -1669,11 +1669,11 @@ module DataFlow {
     or
     exists(Expr e | e = nd.asExpr() and cause = "heap" |
       e instanceof PropAccess or
-      e instanceof E4X::XMLAnyName or
-      e instanceof E4X::XMLAttributeSelector or
-      e instanceof E4X::XMLDotDotExpression or
-      e instanceof E4X::XMLFilterExpression or
-      e instanceof E4X::XMLQualifiedIdentifier or
+      e instanceof E4X::XmlAnyName or
+      e instanceof E4X::XmlAttributeSelector or
+      e instanceof E4X::XmlDotDotExpression or
+      e instanceof E4X::XmlFilterExpression or
+      e instanceof E4X::XmlQualifiedIdentifier or
       e instanceof Angular2::PipeRefExpr
     )
     or
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/Portals.qll b/javascript/ql/lib/semmle/javascript/dataflow/Portals.qll
index 697e2dd3903..299819de4cd 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/Portals.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/Portals.qll
@@ -180,7 +180,7 @@ private class NpmPackagePortal extends Portal, MkNpmPackagePortal {
 private module NpmPackagePortal {
   /** Gets an import of `imported` inside package `importer`. */
   pragma[noinline]
-  private DataFlow::SourceNode getAModuleImport(NPMPackage importer, string imported) {
+  private DataFlow::SourceNode getAModuleImport(NpmPackage importer, string imported) {
     result = DataFlow::moduleImport(imported) and
     result.getTopLevel() = importer.getAModule()
   }
@@ -188,7 +188,7 @@ private module NpmPackagePortal {
   /** Gets an import of `member` from `imported` inside package `importer`. */
   pragma[noinline]
   private DataFlow::SourceNode getAModuleMemberImport(
-    NPMPackage importer, string imported, string member
+    NpmPackage importer, string imported, string member
   ) {
     result = DataFlow::moduleMember(imported, member) and
     result.getTopLevel() = importer.getAModule()
@@ -196,7 +196,7 @@ private module NpmPackagePortal {
 
   /** Holds if `imp` is an import of package `pkgName`. */
   predicate imports(DataFlow::SourceNode imp, string pkgName) {
-    exists(NPMPackage pkg |
+    exists(NpmPackage pkg |
       imp = getAModuleImport(pkg, pkgName) and
       pkgName.regexpMatch("[^./].*")
     )
@@ -204,7 +204,7 @@ private module NpmPackagePortal {
 
   /** Holds if `imp` imports `member` from package `pkgName`. */
   predicate imports(DataFlow::SourceNode imp, string pkgName, string member) {
-    exists(NPMPackage pkg |
+    exists(NpmPackage pkg |
       imp = getAModuleMemberImport(pkg, pkgName, member) and
       pkgName.regexpMatch("[^./].*")
     )
@@ -212,7 +212,7 @@ private module NpmPackagePortal {
 
   /** Gets the main module of package `pkgName`. */
   Module packageMain(string pkgName) {
-    exists(PackageJSON pkg |
+    exists(PackageJson pkg |
       // don't construct portals for private packages
       not pkg.isPrivate() and
       // don't construct portals for vendored-in packages
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/Sources.qll b/javascript/ql/lib/semmle/javascript/dataflow/Sources.qll
index be29fd7f864..73d3f9c96ac 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/Sources.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/Sources.qll
@@ -302,13 +302,13 @@ module SourceNode {
    */
   class DefaultRange extends Range {
     DefaultRange() {
-      exists(ASTNode astNode | this = DataFlow::valueNode(astNode) |
+      exists(AstNode astNode | this = DataFlow::valueNode(astNode) |
         astNode instanceof PropAccess or
         astNode instanceof Function or
         astNode instanceof ClassDefinition or
         astNode instanceof ObjectExpr or
         astNode instanceof ArrayExpr or
-        astNode instanceof JSXNode or
+        astNode instanceof JsxNode or
         astNode instanceof GlobalVarAccess or
         astNode instanceof ExternalModuleReference or
         astNode instanceof RegExpLiteral or
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/internal/BasicExprTypeInference.qll b/javascript/ql/lib/semmle/javascript/dataflow/internal/BasicExprTypeInference.qll
index 786dcd08496..d0b8242f143 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/internal/BasicExprTypeInference.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/internal/BasicExprTypeInference.qll
@@ -129,8 +129,8 @@ private class AnalyzedEnumDeclaration extends DataFlow::AnalyzedValueNode {
 /**
  * Flow analysis for JSX elements and fragments.
  */
-private class AnalyzedJSXNode extends DataFlow::AnalyzedValueNode {
-  override JSXNode astNode;
+private class AnalyzedJsxNode extends DataFlow::AnalyzedValueNode {
+  override JsxNode astNode;
 
   override AbstractValue getALocalValue() { result = TAbstractOtherObject() }
 }
@@ -138,8 +138,8 @@ private class AnalyzedJSXNode extends DataFlow::AnalyzedValueNode {
 /**
  * Flow analysis for qualified JSX names.
  */
-private class AnalyzedJSXQualifiedName extends DataFlow::AnalyzedValueNode {
-  override JSXQualifiedName astNode;
+private class AnalyzedJsxQualifiedName extends DataFlow::AnalyzedValueNode {
+  override JsxQualifiedName astNode;
 
   override AbstractValue getALocalValue() { result = TAbstractOtherObject() }
 }
@@ -147,8 +147,8 @@ private class AnalyzedJSXQualifiedName extends DataFlow::AnalyzedValueNode {
 /**
  * Flow analysis for empty JSX expressions.
  */
-private class AnalyzedJSXEmptyExpression extends DataFlow::AnalyzedValueNode {
-  override JSXEmptyExpr astNode;
+private class AnalyzedJsxEmptyExpression extends DataFlow::AnalyzedValueNode {
+  override JsxEmptyExpr astNode;
 
   override AbstractValue getALocalValue() { result = TAbstractUndefined() }
 }
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/internal/VariableTypeInference.qll b/javascript/ql/lib/semmle/javascript/dataflow/internal/VariableTypeInference.qll
index 37804e4c26f..f2b905086c5 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/internal/VariableTypeInference.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/internal/VariableTypeInference.qll
@@ -138,7 +138,7 @@ class AnalyzedVarDef extends VarDef {
   /**
    * Gets the toplevel syntactic unit to which this definition belongs.
    */
-  TopLevel getTopLevel() { result = this.(ASTNode).getTopLevel() }
+  TopLevel getTopLevel() { result = this.(AstNode).getTopLevel() }
 }
 
 /**
diff --git a/javascript/ql/lib/semmle/javascript/dependencies/Dependencies.qll b/javascript/ql/lib/semmle/javascript/dependencies/Dependencies.qll
index bea4fe9a6a0..9974b9975c3 100644
--- a/javascript/ql/lib/semmle/javascript/dependencies/Dependencies.qll
+++ b/javascript/ql/lib/semmle/javascript/dependencies/Dependencies.qll
@@ -35,9 +35,12 @@ abstract class Dependency extends Locatable {
  * the source tree, or a package that is referenced as a dependency
  * in a `package.json` file.
  */
-abstract class NPMDependency extends Dependency {
+abstract class NpmDependency extends Dependency {
   /** Gets the name of the NPM package this module belongs to. */
-  abstract string getNPMPackageName();
+  abstract string getNpmPackageName();
+
+  /** DEPRECATED: Alias for getNpmPackageName */
+  deprecated string getNPMPackageName() { result = getNpmPackageName() }
 
   /** Gets the version of the NPM package this module belongs to. */
   abstract string getVersion();
@@ -46,7 +49,7 @@ abstract class NPMDependency extends Dependency {
   abstract Import getAnImport();
 
   override predicate info(string id, string v) {
-    id = this.getNPMPackageName() and
+    id = this.getNpmPackageName() and
     v = this.getVersion()
   }
 
@@ -59,6 +62,9 @@ abstract class NPMDependency extends Dependency {
   }
 }
 
+/** DEPRECATED: Alias for NpmDependency */
+deprecated class NPMDependency = NpmDependency;
+
 /**
  * Gets a variable into which something is imported by `i`.
  */
@@ -83,23 +89,26 @@ private Expr propAccessOn(Expr e) { result.(PropAccess).getBase() = e }
  * included in the database (as opposed to an `ExternalNPMDependency`
  * which is only referenced in a `package.json` file).
  */
-class BundledNPMDependency extends NPMDependency {
-  BundledNPMDependency() {
-    exists(NPMPackage pkg | this = pkg.getAModule() |
+class BundledNpmDependency extends NpmDependency {
+  BundledNpmDependency() {
+    exists(NpmPackage pkg | this = pkg.getAModule() |
       // exclude packages marked "private": they have no globally unique ID
-      not pkg.getPackageJSON().isPrivate()
+      not pkg.getPackageJson().isPrivate()
     )
   }
 
   /** Gets the package to which this module belongs. */
-  private NPMPackage getPackage() { this = result.getAModule() }
+  private NpmPackage getPackage() { this = result.getAModule() }
 
   /** Gets the `package.json` of the package to which this module belongs. */
-  private PackageJSON getPackageJSON() { result = this.getPackage().getPackageJSON() }
+  private PackageJson getPackageJson() { result = this.getPackage().getPackageJson() }
 
-  override string getNPMPackageName() { result = this.getPackageJSON().getPackageName() }
+  override string getNpmPackageName() { result = this.getPackageJson().getPackageName() }
 
-  override string getVersion() { result = this.getPackageJSON().getVersion() }
+  /** DEPRECATED: Alias for getNpmPackageName */
+  deprecated override string getNPMPackageName() { result = getNpmPackageName() }
+
+  override string getVersion() { result = this.getPackageJson().getVersion() }
 
   override Import getAnImport() {
     this = result.getImportedModule() and
@@ -108,27 +117,33 @@ class BundledNPMDependency extends NPMDependency {
   }
 }
 
+/** DEPRECATED: Alias for BundledNpmDependency */
+deprecated class BundledNPMDependency = BundledNpmDependency;
+
 /**
  * An NPM package referenced in a `package.json` file.
  */
-class ExternalNPMDependency extends NPMDependency {
-  ExternalNPMDependency() {
-    exists(PackageJSON pkgjson |
-      this.(JSONString) = pkgjson.getADependenciesObject(_).getPropValue(_)
+class ExternalNpmDependency extends NpmDependency {
+  ExternalNpmDependency() {
+    exists(PackageJson pkgjson |
+      this.(JsonString) = pkgjson.getADependenciesObject(_).getPropValue(_)
     )
   }
 
   /** Gets the NPM package declaring this dependency. */
-  private NPMPackage getDeclaringPackage() {
-    this = result.getPackageJSON().getADependenciesObject(_).getPropValue(_)
+  private NpmPackage getDeclaringPackage() {
+    this = result.getPackageJson().getADependenciesObject(_).getPropValue(_)
   }
 
-  override string getNPMPackageName() {
+  override string getNpmPackageName() {
     exists(PackageDependencies pkgdeps | this = pkgdeps.getPropValue(result))
   }
 
+  /** DEPRECATED: Alias for getNpmPackageName */
+  deprecated override string getNPMPackageName() { result = getNpmPackageName() }
+
   private string getVersionNumber() {
-    exists(string versionRange | versionRange = this.(JSONString).getValue() |
+    exists(string versionRange | versionRange = this.(JsonString).getValue() |
       // extract a concrete version from the version range; currently,
       // we handle exact versions as well as `<=`, `>=`, `~` and `^` ranges
       result = versionRange.regexpCapture("(?:[><]=|[=~^])?v?(\\d+(\\.\\d+){1,2})", 1)
@@ -151,13 +166,16 @@ class ExternalNPMDependency extends NPMDependency {
   }
 }
 
+/** DEPRECATED: Alias for ExternalNpmDependency */
+deprecated class ExternalNPMDependency = ExternalNpmDependency;
+
 /**
  * Holds if import `i` may refer to the declared dependency `dep` of package `pkg`,
  * where the result value is the nesting depth of the file containing `i` within `pkg`.
  */
-private int importsDependency(Import i, NPMPackage pkg, NPMDependency dep) {
+private int importsDependency(Import i, NpmPackage pkg, NpmDependency dep) {
   exists(string name |
-    dep = pkg.getPackageJSON().getADependenciesObject(_).getPropValue(name) and
+    dep = pkg.getPackageJson().getADependenciesObject(_).getPropValue(name) and
     not exists(i.getImportedModule()) and
     i.getImportedPath().getComponent(0) = name and
     i.getEnclosingModule() = pkg.getAModule() and
diff --git a/javascript/ql/lib/semmle/javascript/dependencies/FrameworkLibraries.qll b/javascript/ql/lib/semmle/javascript/dependencies/FrameworkLibraries.qll
index 0eed07a6962..b3e0b884373 100644
--- a/javascript/ql/lib/semmle/javascript/dependencies/FrameworkLibraries.qll
+++ b/javascript/ql/lib/semmle/javascript/dependencies/FrameworkLibraries.qll
@@ -125,9 +125,9 @@ abstract class FrameworkLibraryWithMarkerComment extends FrameworkLibrary {
  * A framework library that is referenced by URLs that have a certain
  * pattern.
  */
-abstract class FrameworkLibraryWithURLRegex extends FrameworkLibrary {
+abstract class FrameworkLibraryWithUrlRegex extends FrameworkLibrary {
   bindingset[this]
-  FrameworkLibraryWithURLRegex() { this = this }
+  FrameworkLibraryWithUrlRegex() { this = this }
 
   /**
    * Gets a regular expression that can be used to identify a URL referring
@@ -136,9 +136,15 @@ abstract class FrameworkLibraryWithURLRegex extends FrameworkLibrary {
    * The first capture group of this regular expression should match
    * the version number.
    */
-  abstract string getAURLRegex();
+  abstract string getAUrlRegex();
+
+  /** DEPRECATED: Alias for getAUrlRegex */
+  deprecated string getAURLRegex() { result = getAUrlRegex() }
 }
 
+/** DEPRECATED: Alias for FrameworkLibraryWithUrlRegex */
+deprecated class FrameworkLibraryWithURLRegex = FrameworkLibraryWithUrlRegex;
+
 /**
  * A framework library that is referenced by URLs containing the name
  * of the framework (or an alias) and a version string.
@@ -154,14 +160,14 @@ abstract class FrameworkLibraryWithURLRegex extends FrameworkLibrary {
  *
  * See `variantRegex()` below for a discussion of variant suffixes.
  */
-abstract class FrameworkLibraryWithGenericURL extends FrameworkLibraryWithURLRegex {
+abstract class FrameworkLibraryWithGenericUrl extends FrameworkLibraryWithUrlRegex {
   bindingset[this]
-  FrameworkLibraryWithGenericURL() { this = this }
+  FrameworkLibraryWithGenericUrl() { this = this }
 
   /** Gets an alternative name of this library. */
   string getAnAlias() { none() }
 
-  override string getAURLRegex() {
+  override string getAUrlRegex() {
     exists(string id | id = this.getId() or id = this.getAnAlias() |
       result = ".*(?:^|/)" + id + "-(" + semverRegex() + ")" + variantRegex() + "\\.js" or
       result =
@@ -169,8 +175,14 @@ abstract class FrameworkLibraryWithGenericURL extends FrameworkLibraryWithURLReg
           "\\.js"
     )
   }
+
+  /** DEPRECATED: Alias for getAUrlRegex */
+  deprecated override string getAURLRegex() { result = getAUrlRegex() }
 }
 
+/** DEPRECATED: Alias for FrameworkLibraryWithGenericUrl */
+deprecated class FrameworkLibraryWithGenericURL = FrameworkLibraryWithGenericUrl;
+
 /**
  * Gets a regular expression identifying suffixes that are commonly appended
  * to the name of a library to distinguish minor variants.
@@ -264,20 +276,23 @@ private predicate matchMarkerComment(
 /**
  * A reference to a `FrameworkLibraryWithURL`.
  */
-class FrameworkLibraryReferenceWithURL extends FrameworkLibraryReference {
-  FrameworkLibraryReferenceWithURL() { matchURL(this, _, _) }
+class FrameworkLibraryReferenceWithUrl extends FrameworkLibraryReference {
+  FrameworkLibraryReferenceWithUrl() { matchUrl(this, _, _) }
 
-  override predicate info(FrameworkLibrary fl, string v) { matchURL(this, fl, v) }
+  override predicate info(FrameworkLibrary fl, string v) { matchUrl(this, fl, v) }
 }
 
+/** DEPRECATED: Alias for FrameworkLibraryReferenceWithUrl */
+deprecated class FrameworkLibraryReferenceWithURL = FrameworkLibraryReferenceWithUrl;
+
 /**
  * Holds if the value of `src` attribute `attr` matches the URL pattern of library
  * `fl` at `version`.
  */
-private predicate matchURL(HTML::Attribute attr, FrameworkLibraryWithURLRegex fl, string version) {
+private predicate matchUrl(HTML::Attribute attr, FrameworkLibraryWithUrlRegex fl, string version) {
   attr.getName() = "src" and
   attr.getElement() instanceof HTML::ScriptElement and
-  version = attr.getValue().regexpCapture(fl.getAURLRegex(), 1)
+  version = attr.getValue().regexpCapture(fl.getAUrlRegex(), 1)
 }
 
 /**
@@ -288,7 +303,7 @@ private string versionRegex() { result = "\\d+\\.\\d+[A-Za-z0-9.+_-]*" }
 /**
  * The jQuery framework.
  */
-private class JQuery extends FrameworkLibraryWithGenericURL {
+private class JQuery extends FrameworkLibraryWithGenericUrl {
   JQuery() { this = "jquery" }
 
   override string getAnEntryPoint() { result = "$" or result = "jQuery" }
@@ -331,7 +346,7 @@ private class JQueryInstance extends FrameworkLibraryInstance {
 /**
  * The jQuery Mobile framework.
  */
-private class JQueryMobile extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class JQueryMobile extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   JQueryMobile() { this = "jquery-mobile" }
 
   override string getAnAlias() { result = "jquery.mobile" }
@@ -344,7 +359,7 @@ private class JQueryMobile extends FrameworkLibraryWithGenericURL, FrameworkLibr
 /**
  * The jQuery UI framework.
  */
-private class JQueryUI extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class JQueryUI extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   JQueryUI() { this = "jquery-ui" }
 
   override string getAMarkerCommentRegex() { result = "(?s).*jQuery UI - v?(<VERSION>).*" }
@@ -355,7 +370,7 @@ private class JQueryUI extends FrameworkLibraryWithGenericURL, FrameworkLibraryW
 /**
  * The jQuery TextExt framework.
  */
-private class JQueryTextExt extends FrameworkLibraryWithGenericURL,
+private class JQueryTextExt extends FrameworkLibraryWithGenericUrl,
   FrameworkLibraryWithMarkerComment {
   JQueryTextExt() { this = "jquery-textext" }
 
@@ -371,7 +386,7 @@ private class JQueryTextExt extends FrameworkLibraryWithGenericURL,
 /**
  * The jQuery DataTables framework.
  */
-private class JQueryDataTables extends FrameworkLibraryWithGenericURL,
+private class JQueryDataTables extends FrameworkLibraryWithGenericUrl,
   FrameworkLibraryWithMarkerComment {
   JQueryDataTables() { this = "jquery-dataTables" }
 
@@ -385,7 +400,7 @@ private class JQueryDataTables extends FrameworkLibraryWithGenericURL,
 /**
  * The jQuery jsTree framework.
  */
-private class JQueryJsTree extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class JQueryJsTree extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   JQueryJsTree() { this = "jquery-jstree" }
 
   override string getAnAlias() { result = "jquery.jstree" }
@@ -396,7 +411,7 @@ private class JQueryJsTree extends FrameworkLibraryWithGenericURL, FrameworkLibr
 /**
  * The jQuery Snippet framework.
  */
-private class JQuerySnippet extends FrameworkLibraryWithGenericURL,
+private class JQuerySnippet extends FrameworkLibraryWithGenericUrl,
   FrameworkLibraryWithMarkerComment {
   JQuerySnippet() { this = "jquery-snippet" }
 
@@ -410,7 +425,7 @@ private class JQuerySnippet extends FrameworkLibraryWithGenericURL,
 /**
  * The Bootstrap framework.
  */
-private class Bootstrap extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class Bootstrap extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   Bootstrap() { this = "bootstrap" }
 
   override string getAMarkerCommentRegex() {
@@ -423,7 +438,7 @@ private class Bootstrap extends FrameworkLibraryWithGenericURL, FrameworkLibrary
 /**
  * The Modernizr framework.
  */
-private class Modernizr extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class Modernizr extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   Modernizr() { this = "modernizr" }
 
   override string getAMarkerCommentRegex() {
@@ -436,7 +451,7 @@ private class Modernizr extends FrameworkLibraryWithGenericURL, FrameworkLibrary
 /**
  * The MooTools framework.
  */
-private class MooTools extends FrameworkLibraryWithGenericURL {
+private class MooTools extends FrameworkLibraryWithGenericUrl {
   MooTools() { this = "mootools" }
 
   override string getAnEntryPoint() { /* not easily detectable */ none() }
@@ -479,7 +494,7 @@ private class MooToolsInstance extends FrameworkLibraryInstance {
 /**
  * The Prototype framework.
  */
-private class Prototype extends FrameworkLibraryWithGenericURL {
+private class Prototype extends FrameworkLibraryWithGenericUrl {
   Prototype() { this = "prototype" }
 
   override string getAnEntryPoint() { /* not easily detectable */ none() }
@@ -518,7 +533,7 @@ private class PrototypeInstance extends FrameworkLibraryInstance {
 /**
  * The Scriptaculous framework.
  */
-private class Scriptaculous extends FrameworkLibraryWithGenericURL {
+private class Scriptaculous extends FrameworkLibraryWithGenericUrl {
   Scriptaculous() { this = "scriptaculous" }
 
   override string getAnEntryPoint() { /* not easily detectable */ none() }
@@ -557,7 +572,7 @@ private class ScriptaculousInstance extends FrameworkLibraryInstance {
 /**
  * The Underscore framework.
  */
-private class Underscore extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class Underscore extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   Underscore() { this = "underscore" }
 
   override string getAMarkerCommentRegex() { result = "^\\s*Underscore.js (<VERSION>).*" }
@@ -568,7 +583,7 @@ private class Underscore extends FrameworkLibraryWithGenericURL, FrameworkLibrar
 /**
  * The Lodash framework.
  */
-private class Lodash extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class Lodash extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   Lodash() { this = "lodash" }
 
   override string getAMarkerCommentRegex() {
@@ -581,7 +596,7 @@ private class Lodash extends FrameworkLibraryWithGenericURL, FrameworkLibraryWit
 }
 
 /** The Dojo framework. */
-private class Dojo extends FrameworkLibraryWithGenericURL {
+private class Dojo extends FrameworkLibraryWithGenericUrl {
   Dojo() { this = "dojo" }
 
   override string getAnEntryPoint() { result = "dojo" }
@@ -613,7 +628,7 @@ private class DojoInstance extends FrameworkLibraryInstance {
 /**
  * The ExtJS framework.
  */
-private class ExtJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class ExtJS extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   ExtJS() { this = "extjs" }
 
   override string getAMarkerCommentRegex() {
@@ -629,7 +644,7 @@ private class ExtJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWith
 /**
  * The YUI framework.
  */
-private class YUI extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class YUI extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   YUI() { this = "yui" }
 
   override string getAMarkerCommentRegex() { result = "(?s).*YUI (<VERSION>) \\(build \\d+\\).*" }
@@ -640,7 +655,7 @@ private class YUI extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMa
 /**
  * The Knockout framework.
  */
-private class Knockout extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class Knockout extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   Knockout() { this = "knockout" }
 
   override string getAMarkerCommentRegex() {
@@ -653,7 +668,7 @@ private class Knockout extends FrameworkLibraryWithGenericURL, FrameworkLibraryW
 /**
  * The AngularJS framework.
  */
-private class AngularJS extends FrameworkLibraryWithGenericURL {
+private class AngularJS extends FrameworkLibraryWithGenericUrl {
   AngularJS() { this = "angularjs" }
 
   override string getAnAlias() { result = "angular" or result = "angular2" }
@@ -691,7 +706,7 @@ private class AngularJSInstance extends FrameworkLibraryInstance {
 /**
  * The Angular UI bootstrap framework.
  */
-private class AngularUIBootstrap extends FrameworkLibraryWithGenericURL {
+private class AngularUIBootstrap extends FrameworkLibraryWithGenericUrl {
   AngularUIBootstrap() { this = "angular-ui-bootstrap" }
 
   override string getAnAlias() { result = "ui-bootstrap" }
@@ -722,7 +737,7 @@ private class AngularUIBootstrapInstance extends FrameworkLibraryInstance {
 /**
  * The React framework.
  */
-private class React extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class React extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   React() { this = "react" }
 
   override string getAMarkerCommentRegex() {
@@ -733,15 +748,15 @@ private class React extends FrameworkLibraryWithGenericURL, FrameworkLibraryWith
 /**
  * The Microsoft AJAX Framework.
  */
-private class MicrosoftAJAXFramework extends FrameworkLibrary {
-  MicrosoftAJAXFramework() { this = "microsoft-ajax-framework" }
+private class MicrosoftAjaxFramework extends FrameworkLibrary {
+  MicrosoftAjaxFramework() { this = "microsoft-ajax-framework" }
 }
 
 /**
  * Holds if comments `c1` and `c2` in toplevel `tl` are marker comments for the given
  * `version` of the Microsoft AJAX Framework.
  */
-private predicate microsoftAJAXFrameworkMarkerComments(
+private predicate microsoftAjaxFrameworkMarkerComments(
   Comment c1, Comment c2, TopLevel tl, string version
 ) {
   tl = c1.getTopLevel() and
@@ -753,19 +768,19 @@ private predicate microsoftAJAXFrameworkMarkerComments(
 /**
  * A copy of the Microsoft AJAX Framework.
  */
-private class MicrosoftAJAXFrameworkInstance extends FrameworkLibraryInstance {
-  MicrosoftAJAXFrameworkInstance() { microsoftAJAXFrameworkMarkerComments(_, _, this, _) }
+private class MicrosoftAjaxFrameworkInstance extends FrameworkLibraryInstance {
+  MicrosoftAjaxFrameworkInstance() { microsoftAjaxFrameworkMarkerComments(_, _, this, _) }
 
   override predicate info(FrameworkLibrary fl, string v) {
-    fl instanceof MicrosoftAJAXFramework and
-    microsoftAJAXFrameworkMarkerComments(_, _, this, v)
+    fl instanceof MicrosoftAjaxFramework and
+    microsoftAjaxFrameworkMarkerComments(_, _, this, v)
   }
 }
 
 /**
  * The Polymer framework.
  */
-private class Polymer extends FrameworkLibraryWithGenericURL {
+private class Polymer extends FrameworkLibraryWithGenericUrl {
   Polymer() { this = "polymer" }
 
   override string getAnEntryPoint() { result = "Polymer" }
@@ -800,7 +815,7 @@ private class PolymerInstance extends FrameworkLibraryInstance {
 /**
  * The Vue.js framework.
  */
-private class VueJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class VueJS extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   VueJS() { this = "vue" }
 
   override string getAMarkerCommentRegex() { result = "(?s).*Vue\\.js v(<VERSION>).*" }
@@ -811,7 +826,7 @@ private class VueJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWith
 /**
  * The Swagger UI framework.
  */
-private class SwaggerUI extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class SwaggerUI extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   SwaggerUI() { this = "swagger-ui" }
 
   override string getAMarkerCommentRegex() {
@@ -822,7 +837,7 @@ private class SwaggerUI extends FrameworkLibraryWithGenericURL, FrameworkLibrary
 /**
  * The Backbone.js framework.
  */
-private class BackboneJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class BackboneJS extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   BackboneJS() { this = "backbone" }
 
   override string getAMarkerCommentRegex() { result = "(?s).*Backbone\\.js (<VERSION>).*" }
@@ -833,7 +848,7 @@ private class BackboneJS extends FrameworkLibraryWithGenericURL, FrameworkLibrar
 /**
  * The Ember.js framework.
  */
-private class EmberJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class EmberJS extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   EmberJS() { this = "ember" }
 
   override string getAMarkerCommentRegex() {
@@ -846,7 +861,7 @@ private class EmberJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWi
 /**
  * The QUnit.js framework.
  */
-private class QUnitJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class QUnitJS extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   QUnitJS() { this = "qunit" }
 
   override string getAMarkerCommentRegex() { result = "(?s).*QUnit\\s*(<VERSION>).*" }
@@ -857,28 +872,28 @@ private class QUnitJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWi
 /**
  * The Mocha framework.
  */
-private class Mocha extends FrameworkLibraryWithGenericURL {
+private class Mocha extends FrameworkLibraryWithGenericUrl {
   Mocha() { this = "mocha" }
 }
 
 /**
  * The Jasmine framework.
  */
-private class Jasmine extends FrameworkLibraryWithGenericURL {
+private class Jasmine extends FrameworkLibraryWithGenericUrl {
   Jasmine() { this = "jasmine" }
 }
 
 /**
  * The Chai framework.
  */
-private class Chai extends FrameworkLibraryWithGenericURL {
+private class Chai extends FrameworkLibraryWithGenericUrl {
   Chai() { this = "chai" }
 }
 
 /**
  * The Sinon.JS framework.
  */
-private class SinonJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class SinonJS extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   SinonJS() { this = "sinon" }
 
   override string getAnAlias() { result = "sinon-ie" or result = "sinon-timers" }
@@ -889,7 +904,7 @@ private class SinonJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWi
 /**
  * The TinyMCE framework.
  */
-private class TinyMCE extends FrameworkLibraryWithGenericURL {
+private class TinyMCE extends FrameworkLibraryWithGenericUrl {
   TinyMCE() { this = "tinymce" }
 
   override string getAnAlias() { result = "jquery.tinymce" or result = "tinymce.jquery" }
@@ -898,7 +913,7 @@ private class TinyMCE extends FrameworkLibraryWithGenericURL {
 /**
  * The Require.js framework.
  */
-private class RequireJS extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class RequireJS extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   RequireJS() { this = "requirejs" }
 
   override string getAnAlias() { result = "require.js" }
@@ -917,7 +932,7 @@ private class ApplicationInsightsInstance extends FrameworkLibraryInstance {
       this.(TopLevel)
           .getFile()
           .getAbsolutePath()
-          .regexpCapture(any(ApplicationInsights t).getAURLRegex(), 1)
+          .regexpCapture(any(ApplicationInsights t).getAUrlRegex(), 1)
   }
 
   override predicate info(FrameworkLibrary fl, string v) {
@@ -929,16 +944,19 @@ private class ApplicationInsightsInstance extends FrameworkLibraryInstance {
 /**
  * The Microsoft ApplicationInsights framework.
  */
-private class ApplicationInsights extends FrameworkLibraryWithURLRegex {
+private class ApplicationInsights extends FrameworkLibraryWithUrlRegex {
   ApplicationInsights() { this = "ApplicationInsights" }
 
-  override string getAURLRegex() { result = ".*(?:^|/)ai\\.(" + semverRegex() + ")-build\\d+\\.js" }
+  override string getAUrlRegex() { result = ".*(?:^|/)ai\\.(" + semverRegex() + ")-build\\d+\\.js" }
+
+  /** DEPRECATED: Alias for getAUrlRegex */
+  deprecated override string getAURLRegex() { result = getAUrlRegex() }
 }
 
 /**
  * The twitter-text framework.
  */
-private class TwitterText extends FrameworkLibraryWithGenericURL, FrameworkLibraryWithMarkerComment {
+private class TwitterText extends FrameworkLibraryWithGenericUrl, FrameworkLibraryWithMarkerComment {
   TwitterText() { this = "twitter-text" }
 
   override string getAMarkerCommentRegex() { result = "(?s).*twitter-text\\s*(<VERSION>).*" }
@@ -947,10 +965,13 @@ private class TwitterText extends FrameworkLibraryWithGenericURL, FrameworkLibra
 /**
  * The classic version of twitter-text, as seen in the wild.
  */
-private class TwitterTextClassic extends FrameworkLibraryWithURLRegex {
+private class TwitterTextClassic extends FrameworkLibraryWithUrlRegex {
   TwitterTextClassic() { this = "twitter-text" }
 
-  override string getAURLRegex() { result = ".*(?:^|/)twitter_text" + variantRegex() + "\\.js" }
+  override string getAUrlRegex() { result = ".*(?:^|/)twitter_text" + variantRegex() + "\\.js" }
+
+  /** DEPRECATED: Alias for getAUrlRegex */
+  deprecated override string getAURLRegex() { result = getAUrlRegex() }
 }
 
 /**
@@ -961,7 +982,7 @@ private class TwitterTextClassicInstance extends FrameworkLibraryInstance {
     this.(TopLevel)
         .getFile()
         .getAbsolutePath()
-        .regexpMatch(any(TwitterTextClassic t).getAURLRegex())
+        .regexpMatch(any(TwitterTextClassic t).getAUrlRegex())
   }
 
   override predicate info(FrameworkLibrary fl, string v) {
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/AngularJS/DependencyInjections.qll b/javascript/ql/lib/semmle/javascript/frameworks/AngularJS/DependencyInjections.qll
index 01be5035325..6f5aaf7d38f 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/AngularJS/DependencyInjections.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/AngularJS/DependencyInjections.qll
@@ -46,23 +46,23 @@ abstract class InjectableFunction extends DataFlow::ValueNode {
   /**
    * Gets the `i`th dependency declaration, which is also named `name`.
    */
-  abstract ASTNode getDependencyDeclaration(int i, string name);
+  abstract AstNode getDependencyDeclaration(int i, string name);
 
   /**
    * Gets an ASTNode for the `name` dependency declaration.
    */
-  ASTNode getADependencyDeclaration(string name) { result = getDependencyDeclaration(_, name) }
+  AstNode getADependencyDeclaration(string name) { result = getDependencyDeclaration(_, name) }
 
   /**
    * Gets the ASTNode for the `i`th dependency declaration.
    */
-  ASTNode getDependencyDeclaration(int i) { result = getDependencyDeclaration(i, _) }
+  AstNode getDependencyDeclaration(int i) { result = getDependencyDeclaration(i, _) }
 
   /** Gets the function underlying this injectable function. */
   abstract Function asFunction();
 
   /** Gets a location where this function is explicitly dependency injected. */
-  abstract ASTNode getAnExplicitDependencyInjection();
+  abstract AstNode getAnExplicitDependencyInjection();
 
   /**
    * Gets a service corresponding to the dependency-injected `parameter`.
@@ -110,7 +110,7 @@ private class FunctionWithImplicitDependencyAnnotation extends InjectableFunctio
 
   override Function asFunction() { result = astNode }
 
-  override ASTNode getAnExplicitDependencyInjection() { none() }
+  override AstNode getAnExplicitDependencyInjection() { none() }
 }
 
 private DataFlow::PropWrite getAPropertyDependencyInjection(Function function) {
@@ -143,7 +143,7 @@ private class FunctionWithInjectProperty extends InjectableFunction {
     exists(int i | exists(getDependencyDeclaration(i, name)) | result = astNode.getParameter(i))
   }
 
-  override ASTNode getDependencyDeclaration(int i, string name) {
+  override AstNode getDependencyDeclaration(int i, string name) {
     exists(DataFlow::ValueNode decl |
       decl = dependencies.getElement(i) and
       decl.mayHaveStringValue(name) and
@@ -153,7 +153,7 @@ private class FunctionWithInjectProperty extends InjectableFunction {
 
   override Function asFunction() { result = astNode }
 
-  override ASTNode getAnExplicitDependencyInjection() {
+  override AstNode getAnExplicitDependencyInjection() {
     result = getAPropertyDependencyInjection(astNode).getAstNode()
   }
 }
@@ -176,14 +176,14 @@ private class FunctionWithExplicitDependencyAnnotation extends InjectableFunctio
     )
   }
 
-  override ASTNode getDependencyDeclaration(int i, string name) {
+  override AstNode getDependencyDeclaration(int i, string name) {
     result = astNode.getElement(i) and
     result.(Expr).mayHaveStringValue(name)
   }
 
   override Function asFunction() { result = function.getAstNode() }
 
-  override ASTNode getAnExplicitDependencyInjection() {
+  override AstNode getAnExplicitDependencyInjection() {
     result = astNode or
     result = function.(InjectableFunction).getAnExplicitDependencyInjection()
   }
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Babel.qll b/javascript/ql/lib/semmle/javascript/frameworks/Babel.qll
index 570052a58a9..3d061eb2aef 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Babel.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Babel.qll
@@ -9,18 +9,18 @@ module Babel {
    * A Babel configuration object, either from `package.json` or from a
    * `.babelrc` file.
    */
-  class Config extends JSONObject {
+  class Config extends JsonObject {
     Config() {
       isTopLevel() and getJsonFile().getBaseName().matches(".babelrc%")
       or
-      this = any(PackageJSON pkg).getPropValue("babel")
+      this = any(PackageJson pkg).getPropValue("babel")
     }
 
     /**
      * Gets the configuration for the plugin with the given name.
      */
-    JSONValue getPluginConfig(string pluginName) {
-      exists(JSONArray plugins |
+    JsonValue getPluginConfig(string pluginName) {
+      exists(JsonArray plugins |
         plugins = getPropValue("plugins") and
         result = plugins.getElementValue(_)
       |
@@ -38,7 +38,7 @@ module Babel {
       or
       result = getAContainerInScope().getAChildContainer() and
       // File-relative .babelrc search stops at any package.json or .babelrc file.
-      not result.getAChildContainer() = any(PackageJSON pkg).getJsonFile() and
+      not result.getAChildContainer() = any(PackageJson pkg).getJsonFile() and
       not result.getAChildContainer() = any(Config pkg).getJsonFile()
     }
 
@@ -51,7 +51,7 @@ module Babel {
   /**
    * A configuration object for a Babel plugin.
    */
-  class Plugin extends JSONValue {
+  class Plugin extends JsonValue {
     Config cfg;
     string pluginName;
 
@@ -64,10 +64,10 @@ module Babel {
     Config getConfig() { result = cfg }
 
     /** Gets the options value passed to the plugin, if any. */
-    JSONValue getOptions() { result = this.(JSONArray).getElementValue(1) }
+    JsonValue getOptions() { result = this.(JsonArray).getElementValue(1) }
 
     /** Gets a named option from the option object, if present. */
-    JSONValue getOption(string name) { result = getOptions().getPropValue(name) }
+    JsonValue getOption(string name) { result = getOptions().getPropValue(name) }
 
     /** Holds if this plugin applies to `tl`. */
     predicate appliesTo(TopLevel tl) { cfg.appliesTo(tl) }
@@ -99,12 +99,12 @@ module Babel {
     /**
      * Gets an object specifying a root prefix.
      */
-    private JSONObject getARootPathSpec() {
+    private JsonObject getARootPathSpec() {
       // ["babel-plugin-root-import", <spec>]
       result = getOptions() and
       exists(result.getPropValue("rootPathSuffix"))
       or
-      exists(JSONArray pathSpecs |
+      exists(JsonArray pathSpecs |
         // ["babel-plugin-root-import", [ <spec>... ] ]
         pathSpecs = getOptions()
         or
@@ -119,7 +119,7 @@ module Babel {
      * Gets the (explicitly specified) root for the given prefix.
      */
     private string getExplicitRoot(string prefix) {
-      exists(JSONObject rootPathSpec |
+      exists(JsonObject rootPathSpec |
         rootPathSpec = getARootPathSpec() and
         result = rootPathSpec.getPropStringValue("rootPathSuffix")
       |
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/ClientRequests.qll b/javascript/ql/lib/semmle/javascript/frameworks/ClientRequests.qll
index 162ad304ddc..d6006545827 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/ClientRequests.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/ClientRequests.qll
@@ -546,8 +546,8 @@ module ClientRequest {
    *
    * Note: Prefer to use the `ClientRequest` class as it is more general.
    */
-  class XMLHttpRequest extends ClientRequest::Range {
-    XMLHttpRequest() {
+  class XmlHttpRequest extends ClientRequest::Range {
+    XmlHttpRequest() {
       this = DataFlow::globalVarRef("XMLHttpRequest").getAnInstantiation()
       or
       // closure shim for XMLHttpRequest
@@ -618,6 +618,9 @@ module ClientRequest {
     }
   }
 
+  /** DEPRECATED: Alias for XmlHttpRequest */
+  deprecated class XMLHttpRequest = XmlHttpRequest;
+
   /**
    * A model of a URL request made using the `XhrIo` class from the closure library.
    */
@@ -788,8 +791,8 @@ module ClientRequest {
   /**
    * A model of a URL request made using `jsdom.fromUrl()`.
    */
-  class JSDOMFromUrl extends ClientRequest::Range {
-    JSDOMFromUrl() {
+  class JSDomFromUrl extends ClientRequest::Range {
+    JSDomFromUrl() {
       this = API::moduleImport("jsdom").getMember("JSDOM").getMember("fromURL").getACall()
     }
 
@@ -800,6 +803,9 @@ module ClientRequest {
     override DataFlow::Node getADataNode() { none() }
   }
 
+  /** DEPRECATED: Alias for JSDomFromUrl */
+  deprecated class JSDOMFromUrl = JSDomFromUrl;
+
   /**
    * Classes and predicates modeling the `apollo-client` library.
    */
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/CookieLibraries.qll b/javascript/ql/lib/semmle/javascript/frameworks/CookieLibraries.qll
index 5cffe53d198..77bfff9f388 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/CookieLibraries.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/CookieLibraries.qll
@@ -367,10 +367,10 @@ private module ExpressCookies {
  * In case an array is passed `setHeader("Set-Cookie", [...]` it sets multiple cookies.
  * We model a `CookieWrite` for each array element.
  */
-private class HTTPCookieWrite extends CookieWrites::CookieWrite {
+private class HttpCookieWrite extends CookieWrites::CookieWrite {
   string header;
 
-  HTTPCookieWrite() {
+  HttpCookieWrite() {
     exists(HTTP::CookieDefinition setCookie |
       this.asExpr() = setCookie.getHeaderArgument() and
       not this instanceof DataFlow::ArrayCreationNode
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Files.qll b/javascript/ql/lib/semmle/javascript/frameworks/Files.qll
index 9e9507d4111..0bad9367b7f 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Files.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Files.qll
@@ -212,12 +212,12 @@ private class RecursiveReadDir extends FileSystemAccess, FileNameProducer, API::
 /**
  * Classes and predicates for modeling the `jsonfile` library (https://www.npmjs.com/package/jsonfile).
  */
-private module JSONFile {
+private module JsonFile {
   /**
    * A reader for JSON files.
    */
-  class JSONFileReader extends FileSystemReadAccess, API::CallNode {
-    JSONFileReader() {
+  class JsonFileReader extends FileSystemReadAccess, API::CallNode {
+    JsonFileReader() {
       this = API::moduleImport("jsonfile").getMember(["readFile", "readFileSync"]).getACall()
     }
 
@@ -238,11 +238,14 @@ private module JSONFile {
     }
   }
 
+  /** DEPRECATED: Alias for JsonFileReader */
+  deprecated class JSONFileReader = JsonFileReader;
+
   /**
    * A writer for JSON files.
    */
-  class JSONFileWriter extends FileSystemWriteAccess, DataFlow::CallNode {
-    JSONFileWriter() {
+  class JsonFileWriter extends FileSystemWriteAccess, DataFlow::CallNode {
+    JsonFileWriter() {
       this =
         DataFlow::moduleMember("jsonfile", any(string s | s = "writeFile" or s = "writeFileSync"))
             .getACall()
@@ -252,6 +255,9 @@ private module JSONFile {
 
     override DataFlow::Node getADataNode() { result = this.getArgument(1) }
   }
+
+  /** DEPRECATED: Alias for JsonFileWriter */
+  deprecated class JSONFileWriter = JsonFileWriter;
 }
 
 /**
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/JWT.qll b/javascript/ql/lib/semmle/javascript/frameworks/JWT.qll
index f4bd7a67886..21ac8aad249 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/JWT.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/JWT.qll
@@ -42,8 +42,8 @@ private module JsonWebToken {
   /**
    * The private key for a JWT as a `CredentialsExpr`.
    */
-  private class JWTKey extends CredentialsExpr {
-    JWTKey() {
+  private class JwtKey extends CredentialsExpr {
+    JwtKey() {
       this = DataFlow::moduleMember("jsonwebtoken", "sign").getACall().getArgument(1).asExpr()
     }
 
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Markdown.qll b/javascript/ql/lib/semmle/javascript/frameworks/Markdown.qll
index e630eb9b2a7..ea362aba757 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Markdown.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Markdown.qll
@@ -21,7 +21,10 @@ module Markdown {
     /**
      * Holds if the taint-step preserves HTML.
      */
-    predicate preservesHTML() { any() }
+    predicate preservesHtml() { any() }
+
+    /** DEPRECATED: Alias for preservesHtml */
+    deprecated predicate preservesHTML() { preservesHtml() }
   }
 
   private class MarkdownStepAsTaintStep extends TaintTracking::SharedTaintStep {
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Next.qll b/javascript/ql/lib/semmle/javascript/frameworks/Next.qll
index cc2121857e2..254901c1d7b 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Next.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Next.qll
@@ -11,7 +11,7 @@ module NextJS {
   /**
    * Gets a `package.json` that depends on the `Next.js` library.
    */
-  PackageJSON getANextPackage() { result.getDependencies().getADependency("next", _) }
+  PackageJson getANextPackage() { result.getDependencies().getADependency("next", _) }
 
   /**
    * Gets a "pages" folder in a `Next.js` application.
@@ -195,9 +195,9 @@ module NextJS {
    * The response (res) includes a set of Express.js-like methods,
    * and we therefore model the routehandler as an Express.js routehandler.
    */
-  class NextAPIRouteHandler extends DataFlow::FunctionNode, Express::RouteHandler,
+  class NextApiRouteHandler extends DataFlow::FunctionNode, Express::RouteHandler,
     HTTP::Servers::StandardRouteHandler {
-    NextAPIRouteHandler() {
+    NextApiRouteHandler() {
       exists(Module mod | mod.getFile().getParentContainer() = apiFolder() |
         this = mod.getAnExportedValue("default").getAFunctionValue()
       )
@@ -210,6 +210,9 @@ module NextJS {
     }
   }
 
+  /** DEPRECATED: Alias for NextApiRouteHandler */
+  deprecated class NextAPIRouteHandler = NextApiRouteHandler;
+
   /**
    * Gets a reference to a [Next.js router](https://nextjs.org/docs/api-reference/next/router).
    */
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/NoSQL.qll b/javascript/ql/lib/semmle/javascript/frameworks/NoSQL.qll
index 11c0b6691b1..62e12bd170c 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/NoSQL.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/NoSQL.qll
@@ -5,14 +5,17 @@
 import javascript
 import semmle.javascript.Promises
 
-module NoSQL {
-  /** An expression that is interpreted as a NoSQL query. */
+module NoSql {
+  /** An expression that is interpreted as a NoSql query. */
   abstract class Query extends Expr {
     /** Gets an expression that is interpreted as a code operator in this query. */
     DataFlow::Node getACodeOperator() { none() }
   }
 }
 
+/** DEPRECATED: Alias for NoSql */
+deprecated module NoSQL = NoSql;
+
 /**
  * Gets a value that has been assigned to the "$where" property of an object that flows to `queryArg`.
  */
@@ -78,7 +81,7 @@ private module MongoDB {
   /**
    * An expression that is interpreted as a MongoDB query.
    */
-  class Query extends NoSQL::Query {
+  class Query extends NoSql::Query {
     QueryCall qc;
 
     Query() { this = qc.getAQueryArgument().asExpr() }
@@ -512,7 +515,7 @@ private module Mongoose {
   /**
    * An expression that is interpreted as a (part of a) MongoDB query.
    */
-  class MongoDBQueryPart extends NoSQL::Query {
+  class MongoDBQueryPart extends NoSql::Query {
     MongooseFunction f;
 
     MongoDBQueryPart() { this = f.getQueryArgument().getARhs().asExpr() }
@@ -619,7 +622,7 @@ private module Minimongo {
   /**
    * An expression that is interpreted as a Minimongo query.
    */
-  class Query extends NoSQL::Query {
+  class Query extends NoSql::Query {
     QueryCall qc;
 
     Query() { this = qc.getAQueryArgument().asExpr() }
@@ -679,7 +682,7 @@ private module MarsDB {
   /**
    * An expression that is interpreted as a MarsDB query.
    */
-  class Query extends NoSQL::Query {
+  class Query extends NoSql::Query {
     QueryCall qc;
 
     Query() { this = qc.getAQueryArgument().asExpr() }
@@ -763,7 +766,7 @@ private module Redis {
   /**
    * An expression that is interpreted as a key in a Node Redis call.
    */
-  class RedisKeyArgument extends NoSQL::Query {
+  class RedisKeyArgument extends NoSql::Query {
     RedisKeyArgument() {
       exists(string method, int argIndex |
         QuerySignatures::argumentIsAmbiguousKey(method, argIndex) and
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/React.qll b/javascript/ql/lib/semmle/javascript/frameworks/React.qll
index bfd84dd2822..6eb1846b58a 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/React.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/React.qll
@@ -23,7 +23,7 @@ DataFlow::SourceNode react() {
  * - instances from `React.createClass`
  * - stateless functional components
  */
-abstract class ReactComponent extends ASTNode {
+abstract class ReactComponent extends AstNode {
   /**
    * Gets an instance method of this component with the given name.
    */
@@ -208,7 +208,7 @@ abstract class ReactComponent extends ASTNode {
   DataFlow::Node getACandidatePropsValue(string name) {
     getACandidatePropsSource().hasPropertyWrite(name, result)
     or
-    exists(ReactJSXElement e, JSXAttribute attr |
+    exists(ReactJsxElement e, JsxAttribute attr |
       this = e.getComponent() and
       attr = e.getAttributeByName(name) and
       result.asExpr() = attr.getValue()
@@ -247,13 +247,13 @@ abstract class ReactComponent extends ASTNode {
 /**
  * Holds if `f` always returns a JSX element or fragment, or a React element.
  */
-private predicate alwaysReturnsJSXOrReactElements(Function f) {
+private predicate alwaysReturnsJsxOrReactElements(Function f) {
   forex(Expr e |
     e.flow().(DataFlow::SourceNode).flowsToExpr(f.getAReturnedExpr()) and
     // Allow returning string constants in addition to JSX/React elemnts.
     not exists(e.getStringValue())
   |
-    e instanceof JSXNode or
+    e instanceof JsxNode or
     e instanceof ReactElementDefinition
   )
 }
@@ -271,7 +271,7 @@ class FunctionalComponent extends ReactComponent, Function {
       p.getName().regexpMatch("(?i).*props.*") or
       p instanceof ObjectPattern
     ) and
-    alwaysReturnsJSXOrReactElements(this)
+    alwaysReturnsJsxOrReactElements(this)
   }
 
   override Function getInstanceMethod(string name) { name = "render" and result = this }
@@ -420,7 +420,7 @@ private class HeuristicReactPreactComponent extends ClassDefinition, PreactCompo
   ES2015Component {
   HeuristicReactPreactComponent() {
     any(DataFlow::GlobalVarRefNode c | c.getName() = "Component").flowsToExpr(getSuperClass()) and
-    alwaysReturnsJSXOrReactElements(ClassDefinition.super.getInstanceMethod("render"))
+    alwaysReturnsJsxOrReactElements(ClassDefinition.super.getInstanceMethod("render"))
   }
 }
 
@@ -549,10 +549,10 @@ private class ReactCallbackPartialInvoke extends DataFlow::PartialInvokeNode::Ra
 /**
  * A `JSXElement` that instantiates a `ReactComponent`.
  */
-private class ReactJSXElement extends JSXElement {
+private class ReactJsxElement extends JsxElement {
   ReactComponent component;
 
-  ReactJSXElement() { component.getAComponentCreatorReference().flowsToExpr(getNameExpr()) }
+  ReactJsxElement() { component.getAComponentCreatorReference().flowsToExpr(getNameExpr()) }
 
   /**
    * Gets the component this element instantiates.
@@ -646,7 +646,7 @@ private DataFlow::Node getAContextInput(DataFlow::CallNode createContext) {
   createContext = react().getAMemberCall("createContext") and
   result = createContext.getArgument(0) // initial value
   or
-  exists(JSXElement provider |
+  exists(JsxElement provider |
     getAContextRef(createContext)
         .getAPropertyRead("Provider")
         .flowsTo(provider.getNameExpr().flow()) and
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/ReactNative.qll b/javascript/ql/lib/semmle/javascript/frameworks/ReactNative.qll
index f639a163f60..a64edda01e9 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/ReactNative.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/ReactNative.qll
@@ -7,7 +7,7 @@ import javascript
 module ReactNative {
   /** A `WebView` JSX element. */
   class WebViewElement extends DataFlow::ValueNode, DataFlow::SourceNode {
-    override JSXElement astNode;
+    override JsxElement astNode;
 
     WebViewElement() {
       DataFlow::moduleMember("react-native", "WebView").flowsToExpr(astNode.getNameExpr())
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Redux.qll b/javascript/ql/lib/semmle/javascript/frameworks/Redux.qll
index 529edb64976..95e222f57ab 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Redux.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Redux.qll
@@ -16,19 +16,19 @@ module Redux {
    */
   private module ProgramSlicing {
     /** Gets the innermost `package.json` file in a directory containing the given file. */
-    private PackageJSON getPackageJson(Container f) {
+    private PackageJson getPackageJson(Container f) {
       f = result.getFile().getParentContainer()
       or
       not exists(f.getFile("package.json")) and
       result = getPackageJson(f.getParentContainer())
     }
 
-    private predicate packageDependsOn(PackageJSON importer, PackageJSON dependency) {
+    private predicate packageDependsOn(PackageJson importer, PackageJson dependency) {
       importer.getADependenciesObject("").getADependency(dependency.getPackageName(), _)
     }
 
     /** Gets a package that can be considered an entry point for a Redux app. */
-    private PackageJSON entryPointPackage() {
+    private PackageJson entryPointPackage() {
       result = getPackageJson(any(StoreCreation c).getFile())
       or
       // Any package that imports a store-creating package is considered a potential entry point.
@@ -36,8 +36,8 @@ module Redux {
     }
 
     pragma[nomagic]
-    private predicate arePackagesInSameReduxApp(PackageJSON a, PackageJSON b) {
-      exists(PackageJSON entry |
+    private predicate arePackagesInSameReduxApp(PackageJson a, PackageJson b) {
+      exists(PackageJson entry |
         entry = entryPointPackage() and
         packageDependsOn*(entry, a) and
         packageDependsOn*(entry, b)
@@ -47,7 +47,7 @@ module Redux {
     /** Holds if the two files are considered to be part of the same Redux app. */
     pragma[inline]
     predicate areFilesInSameReduxApp(File a, File b) {
-      not exists(PackageJSON pkg)
+      not exists(PackageJson pkg)
       or
       arePackagesInSameReduxApp(getPackageJson(a), getPackageJson(b))
     }
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/SocketIO.qll b/javascript/ql/lib/semmle/javascript/frameworks/SocketIO.qll
index baea53f105f..df761420e29 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/SocketIO.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/SocketIO.qll
@@ -518,7 +518,7 @@ module SocketIOClient {
   }
 
   /** Gets the NPM package that contains `nd`. */
-  private NPMPackage getPackage(DataFlow::SourceNode nd) { result.getAFile() = nd.getFile() }
+  private NpmPackage getPackage(DataFlow::SourceNode nd) { result.getAFile() = nd.getFile() }
 
   /**
    * A data flow node representing an API call that receives data from the server.
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Templating.qll b/javascript/ql/lib/semmle/javascript/frameworks/Templating.qll
index acc7ce8cebe..c1e6cb342f1 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Templating.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Templating.qll
@@ -84,7 +84,7 @@ module Templating {
     predicate isInCodeAttribute() {
       exists(TopLevel code | code = this.getParent().(HTML::Attribute).getCodeInAttribute() |
         code instanceof EventHandlerCode or
-        code instanceof JavaScriptURL
+        code instanceof JavaScriptUrl
       )
     }
 
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Vuex.qll b/javascript/ql/lib/semmle/javascript/frameworks/Vuex.qll
index 73b099e5637..1f2d2b90dbf 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Vuex.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Vuex.qll
@@ -365,19 +365,19 @@ module Vuex {
    */
   private module ProgramSlicing {
     /** Gets the innermost `package.json` file in a directory containing the given file. */
-    private PackageJSON getPackageJson(Container f) {
+    private PackageJson getPackageJson(Container f) {
       f = result.getFile().getParentContainer()
       or
       not exists(f.getFile("package.json")) and
       result = getPackageJson(f.getParentContainer())
     }
 
-    private predicate packageDependsOn(PackageJSON importer, PackageJSON dependency) {
+    private predicate packageDependsOn(PackageJson importer, PackageJson dependency) {
       importer.getADependenciesObject("").getADependency(dependency.getPackageName(), _)
     }
 
     /** Gets a package that can be considered an entry point for a Vuex app. */
-    private PackageJSON entryPointPackage() {
+    private PackageJson entryPointPackage() {
       result = getPackageJson(storeRef().getAnImmediateUse().getFile())
       or
       // Any package that imports a store-creating package is considered a potential entry point.
@@ -385,8 +385,8 @@ module Vuex {
     }
 
     pragma[nomagic]
-    private predicate arePackagesInSameVuexApp(PackageJSON a, PackageJSON b) {
-      exists(PackageJSON entry |
+    private predicate arePackagesInSameVuexApp(PackageJson a, PackageJson b) {
+      exists(PackageJson entry |
         entry = entryPointPackage() and
         packageDependsOn*(entry, a) and
         packageDependsOn*(entry, b)
@@ -396,7 +396,7 @@ module Vuex {
     /** Holds if the two files are considered to be part of the same Vuex app. */
     pragma[inline]
     predicate areFilesInSameVuexApp(File a, File b) {
-      not exists(PackageJSON pkg)
+      not exists(PackageJson pkg)
       or
       arePackagesInSameVuexApp(getPackageJson(a), getPackageJson(b))
     }
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/WebSocket.qll b/javascript/ql/lib/semmle/javascript/frameworks/WebSocket.qll
index 36f7df03d92..16e5187081e 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/WebSocket.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/WebSocket.qll
@@ -235,19 +235,22 @@ module ServerWebSocket {
   /**
    * The `req` parameter of a `socket.on("connection", (msg, req) => {})` call.
    */
-  class ServerHTTPRequest extends HTTP::Servers::RequestSource {
+  class ServerHttpRequest extends HTTP::Servers::RequestSource {
     ConnectionCallAsRouteHandler handler;
 
-    ServerHTTPRequest() { this = handler.getCallback(1).getParameter(1) }
+    ServerHttpRequest() { this = handler.getCallback(1).getParameter(1) }
 
     override HTTP::RouteHandler getRouteHandler() { result = handler }
   }
 
+  /** DEPRECATED: Alias for ServerHttpRequest */
+  deprecated class ServerHTTPRequest = ServerHttpRequest;
+
   /**
    * An access user-controlled HTTP request input in a request to a WebSocket server.
    */
   class WebSocketRequestInput extends HTTP::RequestInputAccess {
-    ServerHTTPRequest request;
+    ServerHttpRequest request;
     string kind;
 
     WebSocketRequestInput() {
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/XmlParsers.qll b/javascript/ql/lib/semmle/javascript/frameworks/XmlParsers.qll
index c2e5a1808c6..fbc4c59eb06 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/XmlParsers.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/XmlParsers.qll
@@ -182,8 +182,8 @@ module XML {
   /**
    * An invocation of `DOMParser.parseFromString`.
    */
-  private class DOMParserXmlParserInvocation extends XML::ParserInvocation {
-    DOMParserXmlParserInvocation() {
+  private class DomParserXmlParserInvocation extends XML::ParserInvocation {
+    DomParserXmlParserInvocation() {
       this =
         DataFlow::globalVarRef("DOMParser")
             .getAnInstantiation()
@@ -341,7 +341,7 @@ module XML {
     }
   }
 
-  private class XMLParserTaintStep extends js::TaintTracking::SharedTaintStep {
+  private class XmlParserTaintStep extends js::TaintTracking::SharedTaintStep {
     override predicate deserializeStep(DataFlow::Node pred, DataFlow::Node succ) {
       exists(XML::ParserInvocation parser |
         pred.asExpr() = parser.getSourceArgument() and
diff --git a/javascript/ql/lib/semmle/javascript/heuristics/AdditionalSources.qll b/javascript/ql/lib/semmle/javascript/heuristics/AdditionalSources.qll
index 6585fb7133b..35b1ac83e2d 100644
--- a/javascript/ql/lib/semmle/javascript/heuristics/AdditionalSources.qll
+++ b/javascript/ql/lib/semmle/javascript/heuristics/AdditionalSources.qll
@@ -26,9 +26,9 @@ private class RemoteFlowPassword extends HeuristicSource, RemoteFlowSource {
  * A use of `JSON.stringify`, viewed as a source for command-line injections
  * since it does not properly escape single quotes and dollar symbols.
  */
-private class JSONStringifyAsCommandInjectionSource extends HeuristicSource,
+private class JsonStringifyAsCommandInjectionSource extends HeuristicSource,
   CommandInjection::Source {
-  JSONStringifyAsCommandInjectionSource() { this instanceof JsonStringifyCall }
+  JsonStringifyAsCommandInjectionSource() { this instanceof JsonStringifyCall }
 
   override string getSourceType() { result = "a string from JSON.stringify" }
 }
diff --git a/javascript/ql/lib/semmle/javascript/internal/CachedStages.qll b/javascript/ql/lib/semmle/javascript/internal/CachedStages.qll
index cda0727f136..17a3e4f915a 100644
--- a/javascript/ql/lib/semmle/javascript/internal/CachedStages.qll
+++ b/javascript/ql/lib/semmle/javascript/internal/CachedStages.qll
@@ -56,9 +56,9 @@ module Stages {
     predicate backref() {
       1 = 1
       or
-      exists(any(ASTNode a).getTopLevel())
+      exists(any(AstNode a).getTopLevel())
       or
-      exists(any(ASTNode a).getParent())
+      exists(any(AstNode a).getParent())
       or
       exists(any(StmtContainer c).getEnclosingContainer())
       or
@@ -68,7 +68,7 @@ module Stages {
       or
       exists(any(Expr e).getStringValue())
       or
-      any(ASTNode node).isAmbient()
+      any(AstNode node).isAmbient()
       or
       exists(any(Identifier e).getName())
       or
@@ -245,7 +245,7 @@ module Stages {
    * The `APIStage` stage.
    */
   cached
-  module APIStage {
+  module ApiStage {
     /**
      * Always holds.
      * Ensures that a predicate is evaluated as part of the APIStage stage.
@@ -278,6 +278,9 @@ module Stages {
     }
   }
 
+  /** DEPRECATED: Alias for ApiStage */
+  deprecated module APIStage = ApiStage;
+
   /**
    * The `taint` stage.
    */
diff --git a/javascript/ql/lib/semmle/javascript/internal/StmtContainers.qll b/javascript/ql/lib/semmle/javascript/internal/StmtContainers.qll
index 70b36e35d83..a1df0504ce8 100644
--- a/javascript/ql/lib/semmle/javascript/internal/StmtContainers.qll
+++ b/javascript/ql/lib/semmle/javascript/internal/StmtContainers.qll
@@ -16,7 +16,7 @@ private StmtContainer getStmtContainer(NodeInStmtContainer node) {
   stmt_containers(node, result)
   or
   // Properties
-  exists(ASTNode parent | properties(node, parent, _, _, _) |
+  exists(AstNode parent | properties(node, parent, _, _, _) |
     expr_containers(parent, result)
     or
     stmt_containers(parent, result)
diff --git a/javascript/ql/lib/semmle/javascript/linters/ESLint.qll b/javascript/ql/lib/semmle/javascript/linters/ESLint.qll
index df9a991cf1a..32b9f217a27 100644
--- a/javascript/ql/lib/semmle/javascript/linters/ESLint.qll
+++ b/javascript/ql/lib/semmle/javascript/linters/ESLint.qll
@@ -34,7 +34,7 @@ module ESLint {
   }
 
   /** An ESLint configuration file in JSON format. */
-  abstract private class JsonConfiguration extends Configuration, JSONObject { }
+  abstract private class JsonConfiguration extends Configuration, JsonObject { }
 
   /** An `.eslintrc.json` file. */
   private class EslintrcJson extends JsonConfiguration {
@@ -47,11 +47,11 @@ module ESLint {
   }
 
   /** An ESLint configuration object in JSON format. */
-  private class JsonConfigurationObject extends ConfigurationObject, JSONObject {
+  private class JsonConfigurationObject extends ConfigurationObject, JsonObject {
     override Configuration getConfiguration() { this = result.(JsonConfiguration).getPropValue(_) }
 
     override boolean getBooleanProperty(string p) {
-      exists(string v | v = getPropValue(p).(JSONBoolean).getValue() |
+      exists(string v | v = getPropValue(p).(JsonBoolean).getValue() |
         v = "true" and result = true
         or
         v = "false" and result = false
@@ -86,7 +86,7 @@ module ESLint {
   /** An ESLint configuration embedded in a `package.json` file. */
   private class EslintConfigInPackageJson extends JsonConfiguration {
     EslintConfigInPackageJson() {
-      exists(PackageJSON pkg | this = pkg.getPropValue("eslintConfig"))
+      exists(PackageJson pkg | this = pkg.getPropValue("eslintConfig"))
     }
 
     override ConfigurationObject getGlobals() { result = getPropValue("globals") }
diff --git a/javascript/ql/lib/semmle/javascript/security/BadTagFilterQuery.qll b/javascript/ql/lib/semmle/javascript/security/BadTagFilterQuery.qll
index 51e294c4f61..e22c00ddc47 100644
--- a/javascript/ql/lib/semmle/javascript/security/BadTagFilterQuery.qll
+++ b/javascript/ql/lib/semmle/javascript/security/BadTagFilterQuery.qll
@@ -176,8 +176,8 @@ private module RegexpMatching {
 }
 
 /** A class to test whether a regular expression matches certain HTML tags. */
-class HTMLMatchingRegExp extends RegexpMatching::MatchedRegExp {
-  HTMLMatchingRegExp() {
+class HtmlMatchingRegExp extends RegexpMatching::MatchedRegExp {
+  HtmlMatchingRegExp() {
     // the regexp must mention "<" and ">" explicitly.
     forall(string angleBracket | angleBracket = ["<", ">"] |
       any(RegExpConstant term | term.getValue().matches("%" + angleBracket + "%")).getRootTerm() =
@@ -204,12 +204,15 @@ class HTMLMatchingRegExp extends RegexpMatching::MatchedRegExp {
   }
 }
 
+/** DEPRECATED: Alias for HtmlMatchingRegExp */
+deprecated class HTMLMatchingRegExp = HtmlMatchingRegExp;
+
 /**
  * Holds if `regexp` matches some HTML tags, but misses some HTML tags that it should match.
  *
  * When adding a new case to this predicate, make sure the test string used in `matches(..)` calls are present in `HTMLMatchingRegExp::test` / `HTMLMatchingRegExp::testWithGroups`.
  */
-predicate isBadRegexpFilter(HTMLMatchingRegExp regexp, string msg) {
+predicate isBadRegexpFilter(HtmlMatchingRegExp regexp, string msg) {
   // CVE-2021-33829 - matching both "<!-- foo -->" and "<!-- foo --!>", but in different capture groups
   regexp.matches("<!-- foo -->") and
   regexp.matches("<!-- foo --!>") and
diff --git a/javascript/ql/lib/semmle/javascript/security/PasswordInConfigurationFileQuery.qll b/javascript/ql/lib/semmle/javascript/security/PasswordInConfigurationFileQuery.qll
index 848f924a846..e31b482c25f 100644
--- a/javascript/ql/lib/semmle/javascript/security/PasswordInConfigurationFileQuery.qll
+++ b/javascript/ql/lib/semmle/javascript/security/PasswordInConfigurationFileQuery.qll
@@ -16,9 +16,9 @@ import semmle.javascript.security.SensitiveActions
  */
 predicate config(string key, string val, Locatable valElement) {
   (
-    exists(JSONObject obj | not exists(PackageJSON p | obj = p.getADependenciesObject(_)) |
+    exists(JsonObject obj | not exists(PackageJson p | obj = p.getADependenciesObject(_)) |
       obj.getPropValue(key) = valElement and
-      val = valElement.(JSONString).getValue()
+      val = valElement.(JsonString).getValue()
     )
     or
     exists(YAMLMapping m, YAMLString keyElement |
diff --git a/javascript/ql/lib/semmle/javascript/security/SensitiveActions.qll b/javascript/ql/lib/semmle/javascript/security/SensitiveActions.qll
index fcea4ffbbfd..a9e0fd35bfb 100644
--- a/javascript/ql/lib/semmle/javascript/security/SensitiveActions.qll
+++ b/javascript/ql/lib/semmle/javascript/security/SensitiveActions.qll
@@ -226,19 +226,19 @@ module PasswordHeuristics {
   predicate isDummyAuthHeader(string header) {
     isDummyPassword(header)
     or
-    exists(string prefix, string suffix | prefix = getAnHTTPAuthenticationScheme() |
+    exists(string prefix, string suffix | prefix = getAnHttpAuthenticationScheme() |
       header.toLowerCase() = prefix + " " + suffix and
       isDummyPassword(suffix)
     )
     or
-    header.trim().toLowerCase() = getAnHTTPAuthenticationScheme()
+    header.trim().toLowerCase() = getAnHttpAuthenticationScheme()
   }
 
   /**
    * Gets a HTTP authentication scheme normalized to lowercase.
    * From this list: https://www.iana.org/assignments/http-authschemes/http-authschemes.xhtml
    */
-  private string getAnHTTPAuthenticationScheme() {
+  private string getAnHttpAuthenticationScheme() {
     result =
       [
         "Basic", "Bearer", "Digest", "HOBA", "Mutual", "Negotiate", "OAuth", "SCRAM-SHA-1",
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirectCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirectCustomizations.qll
index 76b64b3e944..f7fc0f86267 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirectCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirectCustomizations.qll
@@ -186,9 +186,9 @@ module ClientSideUrlRedirect {
    */
   class ReactAttributeWriteUrlSink extends ScriptUrlSink {
     ReactAttributeWriteUrlSink() {
-      exists(JSXAttribute attr |
+      exists(JsxAttribute attr |
         attr.getName() = DOM::getAPropertyNameInterpretedAsJavaScriptUrl() and
-        attr.getElement().isHTMLElement()
+        attr.getElement().isHtmlElement()
         or
         DataFlow::moduleImport("next/link").flowsToExpr(attr.getElement().getNameExpr())
       |
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/CodeInjectionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/CodeInjectionCustomizations.qll
index 66321456266..19ecc84bcde 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/CodeInjectionCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/CodeInjectionCustomizations.qll
@@ -208,7 +208,7 @@ module CodeInjection {
    */
   class ReactScriptTag extends Sink {
     ReactScriptTag() {
-      exists(JSXElement element | element.getName() = "script" |
+      exists(JsxElement element | element.getName() = "script" |
         this = element.getBodyElement(_).flow()
       )
     }
@@ -223,7 +223,7 @@ module CodeInjection {
         def.getName().regexpMatch("(?i)on.+") and
         this = def.getValueNode() and
         // JSX event handlers are functions, not strings
-        not def instanceof JSXAttribute
+        not def instanceof JsxAttribute
       )
     }
   }
@@ -231,10 +231,13 @@ module CodeInjection {
   /**
    * A code operator of a NoSQL query as a code injection sink.
    */
-  class NoSQLCodeInjectionSink extends Sink {
-    NoSQLCodeInjectionSink() { any(NoSQL::Query q).getACodeOperator() = this }
+  class NoSqlCodeInjectionSink extends Sink {
+    NoSqlCodeInjectionSink() { any(NoSql::Query q).getACodeOperator() = this }
   }
 
+  /** DEPRECATED: Alias for NoSqlCodeInjectionSink */
+  deprecated class NoSQLCodeInjectionSink = NoSqlCodeInjectionSink;
+
   /**
    * The first argument to `Module.prototype._compile`, considered as a code-injection sink.
    */
@@ -379,5 +382,8 @@ module CodeInjection {
   /**
    * A call to JSON.stringify() seen as a sanitizer.
    */
-  class JSONStringifySanitizer extends Sanitizer, JsonStringifyCall { }
+  class JsonStringifySanitizer extends Sanitizer, JsonStringifyCall { }
+
+  /** DEPRECATED: Alias for JsonStringifySanitizer */
+  deprecated class JSONStringifySanitizer = JsonStringifySanitizer;
 }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/DOM.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/DOM.qll
index dd88867f4f0..76c3a569346 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/DOM.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/DOM.qll
@@ -10,14 +10,17 @@ predicate isDomRootType(ExternalType tp) {
 }
 
 /** A global variable whose declared type extends a DOM root type. */
-class DOMGlobalVariable extends GlobalVariable {
-  DOMGlobalVariable() {
+class DomGlobalVariable extends GlobalVariable {
+  DomGlobalVariable() {
     exists(ExternalVarDecl d | d.getQualifiedName() = this.getName() |
       isDomRootType(d.getTypeTag().getTypeDeclaration().getASupertype*())
     )
   }
 }
 
+/** DEPRECATED: Alias for DomGlobalVariable */
+deprecated class DOMGlobalVariable = DomGlobalVariable;
+
 /** Holds if `e` could hold a value that comes from the DOM. */
 predicate isDomValue(Expr e) { DOM::domValueRef().flowsToExpr(e) }
 
@@ -37,7 +40,10 @@ DataFlow::SourceNode document() { result = DOM::documentRef() }
 predicate isDocument(Expr e) { DOM::documentRef().flowsToExpr(e) }
 
 /** Holds if `e` could refer to the document URL. */
-predicate isDocumentURL(Expr e) { e.flow() = DOM::locationSource() }
+predicate isDocumentUrl(Expr e) { e.flow() = DOM::locationSource() }
+
+/** DEPRECATED: Alias for isDocumentUrl */
+deprecated predicate isDocumentURL = isDocumentUrl/1;
 
 /**
  * DEPRECATED. In most cases, a sanitizer based on this predicate can be removed, as
@@ -62,7 +68,7 @@ class DomMethodCallExpr extends MethodCallExpr {
   /**
    * Holds if `arg` is an argument that is interpreted as HTML.
    */
-  predicate interpretsArgumentsAsHTML(Expr arg) {
+  predicate interpretsArgumentsAsHtml(Expr arg) {
     exists(int argPos, string name |
       arg = this.getArgument(argPos) and
       name = this.getMethodName()
@@ -93,6 +99,9 @@ class DomMethodCallExpr extends MethodCallExpr {
       )
     )
   }
+
+  /** DEPRECATED: Alias for interpretsArgumentsAsHtml */
+  deprecated predicate interpretsArgumentsAsHTML(Expr arg) { interpretsArgumentsAsHtml(arg) }
 }
 
 /**
@@ -109,11 +118,14 @@ class DomPropWriteNode extends Assignment {
   /**
    * Holds if the assigned value is interpreted as HTML.
    */
-  predicate interpretsValueAsHTML() {
+  predicate interpretsValueAsHtml() {
     lhs.getPropertyName() = "innerHTML" or
     lhs.getPropertyName() = "outerHTML"
   }
 
+  /** DEPRECATED: Alias for interpretsValueAsHtml */
+  deprecated predicate interpretsValueAsHTML() { interpretsValueAsHtml() }
+
   /**
    * Holds if the assigned value is interpreted as JavaScript via javascript: protocol.
    */
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/ExternalAPIUsedWithUntrustedData.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/ExternalAPIUsedWithUntrustedData.qll
index 801accf4f11..e1239bff5f5 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/ExternalAPIUsedWithUntrustedData.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/ExternalAPIUsedWithUntrustedData.qll
@@ -4,4 +4,7 @@ import javascript
 private import ExternalAPIUsedWithUntrustedDataQuery as ExternalAPIUsedWithUntrustedDataQuery // ignore-query-import
 
 /** DEPRECATED. Import `ExternalAPIUsedWithUntrustedDataQuery` instead. */
-deprecated module ExternalAPIUsedWithUntrustedData = ExternalAPIUsedWithUntrustedDataQuery;
+deprecated module ExternalApiUsedWithUntrustedData = ExternalAPIUsedWithUntrustedDataQuery;
+
+/** DEPRECATED: Alias for ExternalApiUsedWithUntrustedData */
+deprecated module ExternalAPIUsedWithUntrustedData = ExternalApiUsedWithUntrustedData;
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/ExternalAPIUsedWithUntrustedDataCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/ExternalAPIUsedWithUntrustedDataCustomizations.qll
index c2a3736e778..81fd7b89118 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/ExternalAPIUsedWithUntrustedDataCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/ExternalAPIUsedWithUntrustedDataCustomizations.qll
@@ -9,7 +9,7 @@ import javascript
  * Provides sources, sinks and sanitizers for reasoning about flow of
  * untrusted data into an external API.
  */
-module ExternalAPIUsedWithUntrustedData {
+module ExternalApiUsedWithUntrustedData {
   /**
    * A source of untrusted data.
    */
@@ -62,12 +62,15 @@ module ExternalAPIUsedWithUntrustedData {
   /**
    * A package name whose entire API is considered "safe" for the purpose of this query.
    */
-  abstract class SafeExternalAPIPackage extends string {
-    SafeExternalAPIPackage() { exists(API::moduleImport(this)) }
+  abstract class SafeExternalApiPackage extends string {
+    SafeExternalApiPackage() { exists(API::moduleImport(this)) }
   }
 
-  private class DefaultSafeExternalAPIPackage extends SafeExternalAPIPackage {
-    DefaultSafeExternalAPIPackage() {
+  /** DEPRECATED: Alias for SafeExternalApiPackage */
+  deprecated class SafeExternalAPIPackage = SafeExternalApiPackage;
+
+  private class DefaultSafeExternalApiPackage extends SafeExternalApiPackage {
+    DefaultSafeExternalApiPackage() {
       // Promise libraries are safe and generate too much noise if included
       this =
         [
@@ -80,14 +83,17 @@ module ExternalAPIUsedWithUntrustedData {
   /**
    * A function that is considered a "safe" external API from a security perspective.
    */
-  abstract class SafeExternalAPIFunction extends API::Node { }
+  abstract class SafeExternalApiFunction extends API::Node { }
+
+  /** DEPRECATED: Alias for SafeExternalApiFunction */
+  deprecated class SafeExternalAPIFunction = SafeExternalApiFunction;
 
   /** Holds if data read from a use of `f` may originate from an imported package. */
   private predicate mayComeFromLibrary(API::Node f) {
     // base case: import
     exists(string path |
       f = API::moduleImport(path) and
-      not path instanceof SafeExternalAPIPackage and
+      not path instanceof SafeExternalApiPackage and
       // Exclude paths that can be resolved to a file in the project
       not exists(Import imprt |
         imprt.getImportedPath().getValue() = path and exists(imprt.getImportedModule())
@@ -132,10 +138,10 @@ module ExternalAPIUsedWithUntrustedData {
    */
   private predicate nodeIsRelevant(API::Node node) {
     mayComeFromLibrary(node) and
-    not node instanceof SafeExternalAPIFunction
+    not node instanceof SafeExternalApiFunction
     or
     nodeIsRelevant(node.getASuccessor()) and
-    not node = API::moduleImport(any(SafeExternalAPIPackage p))
+    not node = API::moduleImport(any(SafeExternalApiPackage p))
   }
 
   /** Holds if the edge `pred -> succ` may lead to an external API call. */
@@ -368,3 +374,6 @@ module ExternalAPIUsedWithUntrustedData {
     }
   }
 }
+
+/** DEPRECATED: Alias for ExternalApiUsedWithUntrustedData */
+deprecated module ExternalAPIUsedWithUntrustedData = ExternalApiUsedWithUntrustedData;
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/ExternalAPIUsedWithUntrustedDataQuery.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/ExternalAPIUsedWithUntrustedDataQuery.qll
index d9675c05997..99136f17bda 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/ExternalAPIUsedWithUntrustedDataQuery.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/ExternalAPIUsedWithUntrustedDataQuery.qll
@@ -8,7 +8,7 @@
  */
 
 import javascript
-import ExternalAPIUsedWithUntrustedDataCustomizations::ExternalAPIUsedWithUntrustedData
+import ExternalAPIUsedWithUntrustedDataCustomizations::ExternalApiUsedWithUntrustedData
 
 /** Flow label for objects from which a tainted value is reachable. */
 private class ObjectWrapperFlowLabel extends DataFlow::FlowLabel {
@@ -59,18 +59,24 @@ class Configuration extends TaintTracking::Configuration {
 }
 
 /** A node representing data being passed to an external API. */
-class ExternalAPIDataNode extends DataFlow::Node {
-  ExternalAPIDataNode() { this instanceof Sink }
+class ExternalApiDataNode extends DataFlow::Node {
+  ExternalApiDataNode() { this instanceof Sink }
 }
 
+/** DEPRECATED: Alias for ExternalApiDataNode */
+deprecated class ExternalAPIDataNode = ExternalApiDataNode;
+
 /** A node representing untrusted data being passed to an external API. */
-class UntrustedExternalAPIDataNode extends ExternalAPIDataNode {
-  UntrustedExternalAPIDataNode() { any(Configuration c).hasFlow(_, this) }
+class UntrustedExternalApiDataNode extends ExternalApiDataNode {
+  UntrustedExternalApiDataNode() { any(Configuration c).hasFlow(_, this) }
 
   /** Gets a source of untrusted data which is passed to this external API data node. */
   DataFlow::Node getAnUntrustedSource() { any(Configuration c).hasFlow(result, this) }
 }
 
+/** DEPRECATED: Alias for UntrustedExternalApiDataNode */
+deprecated class UntrustedExternalAPIDataNode = UntrustedExternalApiDataNode;
+
 /**
  * Name of an external API sink, boxed in a newtype for consistency with other languages.
  */
@@ -83,9 +89,9 @@ private newtype TExternalApi =
   }
 
 /** An external API which is used with untrusted data. */
-class ExternalAPIUsedWithUntrustedData extends TExternalApi {
+class ExternalApiUsedWithUntrustedData extends TExternalApi {
   /** Gets a possibly untrusted use of this external API. */
-  UntrustedExternalAPIDataNode getUntrustedDataNode() {
+  UntrustedExternalApiDataNode getUntrustedDataNode() {
     this = MkExternalApiNode(result.(Sink).getApiName())
   }
 
@@ -97,3 +103,6 @@ class ExternalAPIUsedWithUntrustedData extends TExternalApi {
   /** Gets a textual representation of this element. */
   string toString() { this = MkExternalApiNode(result) }
 }
+
+/** DEPRECATED: Alias for ExternalApiUsedWithUntrustedData */
+deprecated class ExternalAPIUsedWithUntrustedData = ExternalApiUsedWithUntrustedData;
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/ImproperCodeSanitizationCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/ImproperCodeSanitizationCustomizations.qll
index 7fc2cfc2a83..fc08feeb162 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/ImproperCodeSanitizationCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/ImproperCodeSanitizationCustomizations.qll
@@ -35,10 +35,13 @@ module ImproperCodeSanitization {
   /**
    * A call to `JSON.stringify()` seen as a source for improper code sanitization
    */
-  class JSONStringifyAsSource extends Source {
-    JSONStringifyAsSource() { this instanceof JsonStringifyCall }
+  class JsonStringifyAsSource extends Source {
+    JsonStringifyAsSource() { this instanceof JsonStringifyCall }
   }
 
+  /** DEPRECATED: Alias for JsonStringifyAsSource */
+  deprecated class JSONStringifyAsSource = JsonStringifyAsSource;
+
   /**
    * A leaf in a string-concatenation, where the string-concatenation constructs code that looks like a function.
    */
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/InsecureDownloadCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/InsecureDownloadCustomizations.qll
index 8cc97b908cd..0a34642ffd8 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/InsecureDownloadCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/InsecureDownloadCustomizations.qll
@@ -47,16 +47,22 @@ module InsecureDownload {
     /**
      * A flow-label for file URLs that are both sensitive and downloaded over an insecure connection.
      */
-    class SensitiveInsecureURL extends DataFlow::FlowLabel {
-      SensitiveInsecureURL() { this = "sensitiveInsecure" }
+    class SensitiveInsecureUrl extends DataFlow::FlowLabel {
+      SensitiveInsecureUrl() { this = "sensitiveInsecure" }
     }
 
+    /** DEPRECATED: Alias for SensitiveInsecureUrl */
+    deprecated class SensitiveInsecureURL = SensitiveInsecureUrl;
+
     /**
      * A flow-label for a URL that is downloaded over an insecure connection.
      */
-    class InsecureURL extends DataFlow::FlowLabel {
-      InsecureURL() { this = "insecure" }
+    class InsecureUrl extends DataFlow::FlowLabel {
+      InsecureUrl() { this = "insecure" }
     }
+
+    /** DEPRECATED: Alias for InsecureUrl */
+    deprecated class InsecureURL = InsecureUrl;
   }
 
   /**
@@ -72,10 +78,10 @@ module InsecureDownload {
     }
 
     override DataFlow::FlowLabel getALabel() {
-      result instanceof Label::InsecureURL
+      result instanceof Label::InsecureUrl
       or
       hasUnsafeExtension(str) and
-      result instanceof Label::SensitiveInsecureURL
+      result instanceof Label::SensitiveInsecureUrl
     }
   }
 
@@ -106,21 +112,24 @@ module InsecureDownload {
    * A url downloaded by a client-request, seen as a sink for download of
    * sensitive file through insecure connection.
    */
-  class ClientRequestURL extends Sink {
+  class ClientRequestUrl extends Sink {
     ClientRequest request;
 
-    ClientRequestURL() { this = request.getUrl() }
+    ClientRequestUrl() { this = request.getUrl() }
 
     override DataFlow::Node getDownloadCall() { result = request }
 
     override DataFlow::FlowLabel getALabel() {
-      result instanceof Label::SensitiveInsecureURL
+      result instanceof Label::SensitiveInsecureUrl
       or
       hasUnsafeExtension(request.getASavePath().getStringValue()) and
-      result instanceof Label::InsecureURL
+      result instanceof Label::InsecureUrl
     }
   }
 
+  /** DEPRECATED: Alias for ClientRequestUrl */
+  deprecated class ClientRequestURL = ClientRequestUrl;
+
   /**
    * Gets a node for the response from `request`, type-tracked using `t`.
    */
@@ -145,7 +154,7 @@ module InsecureDownload {
       )
     }
 
-    override DataFlow::FlowLabel getALabel() { result instanceof Label::InsecureURL }
+    override DataFlow::FlowLabel getALabel() { result instanceof Label::InsecureUrl }
 
     override DataFlow::Node getDownloadCall() { result = request }
   }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/InsecureDownloadQuery.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/InsecureDownloadQuery.qll
index d61c2f6a626..813a1642d8a 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/InsecureDownloadQuery.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/InsecureDownloadQuery.qll
@@ -10,12 +10,12 @@ import javascript
 import InsecureDownloadCustomizations::InsecureDownload
 
 // Materialize flow labels
-private class ConcreteSensitiveInsecureURL extends Label::SensitiveInsecureURL {
-  ConcreteSensitiveInsecureURL() { this = this }
+private class ConcreteSensitiveInsecureUrl extends Label::SensitiveInsecureUrl {
+  ConcreteSensitiveInsecureUrl() { this = this }
 }
 
-private class ConcreteInsecureURL extends Label::InsecureURL {
-  ConcreteInsecureURL() { this = this }
+private class ConcreteInsecureUrl extends Label::InsecureUrl {
+  ConcreteInsecureUrl() { this = this }
 }
 
 /**
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/NosqlInjectionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/NosqlInjectionCustomizations.qll
index 6de40123339..7d4c5939440 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/NosqlInjectionCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/NosqlInjectionCustomizations.qll
@@ -30,13 +30,13 @@ module NosqlInjection {
    */
   abstract class Sanitizer extends DataFlow::Node { }
 
-  /** A source of remote user input, considered as a flow source for NoSQL injection. */
+  /** A source of remote user input, considered as a flow source for NoSql injection. */
   class RemoteFlowSourceAsSource extends Source {
     RemoteFlowSourceAsSource() { this instanceof RemoteFlowSource }
   }
 
-  /** An expression interpreted as a NoSQL query, viewed as a sink. */
+  /** An expression interpreted as a NoSql query, viewed as a sink. */
   class NosqlQuerySink extends Sink, DataFlow::ValueNode {
-    override NoSQL::Query astNode;
+    override NoSql::Query astNode;
   }
 }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/NosqlInjectionQuery.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/NosqlInjectionQuery.qll
index 0da389208f2..ada9c57ad64 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/NosqlInjectionQuery.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/NosqlInjectionQuery.qll
@@ -44,7 +44,7 @@ class Configuration extends TaintTracking::Configuration {
     // additional flow step to track taint through NoSQL query objects
     inlbl = TaintedObject::label() and
     outlbl = TaintedObject::label() and
-    exists(NoSQL::Query query, DataFlow::SourceNode queryObj |
+    exists(NoSql::Query query, DataFlow::SourceNode queryObj |
       queryObj.flowsToExpr(query) and
       queryObj.flowsTo(trg) and
       src = queryObj.getAPropertyWrite().getRhs()
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/RemoteFlowSources.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/RemoteFlowSources.qll
index 6aaa4f4ae2b..ff026f3a3a4 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/RemoteFlowSources.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/RemoteFlowSources.qll
@@ -101,11 +101,11 @@ class ClientSideRemoteFlowKind extends string {
  * `name` and `address` of global variable `user` should be considered as remote flow sources with
  * source type "user input".
  */
-private class RemoteFlowSourceAccessPath extends JSONString {
+private class RemoteFlowSourceAccessPath extends JsonString {
   string sourceType;
 
   RemoteFlowSourceAccessPath() {
-    exists(JSONObject specs |
+    exists(JsonObject specs |
       specs.isTopLevel() and
       this.getFile().getBaseName() = "codeql-javascript-remote-flow-sources.json" and
       this = specs.getPropValue(sourceType).getElementValue(_) and
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeHtmlConstructionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeHtmlConstructionCustomizations.qll
index 31c7507ed40..66cec4dbec8 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeHtmlConstructionCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeHtmlConstructionCustomizations.qll
@@ -139,17 +139,20 @@ module UnsafeHtmlConstruction {
   /**
    * A string-concatenation of HTML, where the result is used as an XSS sink.
    */
-  class HTMLConcatenationSink extends XssSink, StringOps::HtmlConcatenationLeaf {
-    HTMLConcatenationSink() { isUsedInXssSink(xssSink) = this.getRoot() }
+  class HtmlConcatenationSink extends XssSink, StringOps::HtmlConcatenationLeaf {
+    HtmlConcatenationSink() { isUsedInXssSink(xssSink) = this.getRoot() }
 
     override string describe() { result = "HTML construction" }
   }
 
+  /** DEPRECATED: Alias for HtmlConcatenationSink */
+  deprecated class HTMLConcatenationSink = HtmlConcatenationSink;
+
   /**
    * A string parsed as XML, which is later used in an XSS sink.
    */
-  class XMLParsedSink extends XssSink {
-    XMLParsedSink() {
+  class XmlParsedSink extends XssSink {
+    XmlParsedSink() {
       exists(XML::ParserInvocation parser |
         this.asExpr() = parser.getSourceArgument() and
         isUsedInXssSink(xssSink) = parser.getAResult()
@@ -159,6 +162,9 @@ module UnsafeHtmlConstruction {
     override string describe() { result = "XML parsing" }
   }
 
+  /** DEPRECATED: Alias for XmlParsedSink */
+  deprecated class XMLParsedSink = XmlParsedSink;
+
   /**
    * A string rendered as markdown, where the rendering preserves HTML.
    */
@@ -166,7 +172,7 @@ module UnsafeHtmlConstruction {
     MarkdownSink() {
       exists(DataFlow::Node pred, DataFlow::Node succ, Markdown::MarkdownStep step |
         step.step(pred, succ) and
-        step.preservesHTML() and
+        step.preservesHtml() and
         this = pred and
         succ = isUsedInXssSink(xssSink)
       )
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeJQueryPluginCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeJQueryPluginCustomizations.qll
index e359a86e163..9ee49be3857 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeJQueryPluginCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeJQueryPluginCustomizations.qll
@@ -199,7 +199,7 @@ module UnsafeJQueryPlugin {
       DataFlow::PropRead finalRead
     |
       hasDefaultOption(plugin, defaultDef) and
-      defaultDef = getALikelyHTMLWrite(finalRead.getPropertyName()) and
+      defaultDef = getALikelyHtmlWrite(finalRead.getPropertyName()) and
       finalRead.flowsTo(sink) and
       sink.getTopLevel() = plugin.getTopLevel()
     )
@@ -209,7 +209,7 @@ module UnsafeJQueryPlugin {
    * Gets a property-write that writes a HTML-like constant string to `prop`.
    */
   pragma[noinline]
-  private DataFlow::PropWrite getALikelyHTMLWrite(string prop) {
+  private DataFlow::PropWrite getALikelyHtmlWrite(string prop) {
     exists(string default |
       result.getRhs().mayHaveStringValue(default) and
       default.regexpMatch("\\s*<.*") and
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/Xss.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/Xss.qll
index 501eed347c5..0fd9dfff96a 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/Xss.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/Xss.qll
@@ -88,8 +88,8 @@ module Shared {
    * A sanitizer guard that checks for the existence of HTML chars in a string.
    * E.g. `/["'&<>]/.exec(str)`.
    */
-  class ContainsHTMLGuard extends SanitizerGuard, StringOps::RegExpTest {
-    ContainsHTMLGuard() {
+  class ContainsHtmlGuard extends SanitizerGuard, StringOps::RegExpTest {
+    ContainsHtmlGuard() {
       exists(RegExpCharacterClass regExp |
         regExp = this.getRegExp() and
         forall(string s | s = ["\"", "&", "<", ">"] | regExp.getAMatchedString() = s)
@@ -101,10 +101,13 @@ module Shared {
     }
   }
 
+  /** DEPRECATED: Alias for ContainsHtmlGuard */
+  deprecated class ContainsHTMLGuard = ContainsHtmlGuard;
+
   /**
    * Holds if `str` is used in a switch-case that has cases matching HTML escaping.
    */
-  private predicate isUsedInHTMLEscapingSwitch(Expr str) {
+  private predicate isUsedInHtmlEscapingSwitch(Expr str) {
     exists(SwitchStmt switch |
       // "\"".charCodeAt(0) == 34, "&".charCodeAt(0) == 38, "<".charCodeAt(0) == 60
       forall(int c | c = [34, 38, 60] | c = switch.getACase().getExpr().getIntValue()) and
@@ -133,7 +136,7 @@ module Shared {
    * The `pragma[noinline]` is to avoid materializing a cartesian product.
    */
   pragma[noinline]
-  private SsaVariable getAPathEscapedInSwitch() { isUsedInHTMLEscapingSwitch(result.getAUse()) }
+  private SsaVariable getAPathEscapedInSwitch() { isUsedInHtmlEscapingSwitch(result.getAUse()) }
 
   /**
    * An expression that is sanitized by a switch-case.
@@ -257,11 +260,11 @@ module DomBasedXss {
   class DomSink extends Sink {
     DomSink() {
       // Call to a DOM function that inserts its argument into the DOM
-      any(DomMethodCallExpr call).interpretsArgumentsAsHTML(this.asExpr())
+      any(DomMethodCallExpr call).interpretsArgumentsAsHtml(this.asExpr())
       or
       // Assignment to a dangerous DOM property
       exists(DomPropWriteNode pw |
-        pw.interpretsValueAsHTML() and
+        pw.interpretsValueAsHtml() and
         this = DataFlow::valueNode(pw.getRhs())
       )
       or
@@ -302,7 +305,7 @@ module DomBasedXss {
   class DangerouslySetInnerHtmlSink extends Sink, DataFlow::ValueNode {
     DangerouslySetInnerHtmlSink() {
       exists(DataFlow::Node danger, DataFlow::SourceNode valueSrc |
-        exists(JSXAttribute attr |
+        exists(JsxAttribute attr |
           attr.getName() = "dangerouslySetInnerHTML" and
           attr.getValue() = danger.asExpr()
         )
@@ -323,7 +326,7 @@ module DomBasedXss {
    */
   class TooltipSink extends Sink {
     TooltipSink() {
-      exists(JSXElement el |
+      exists(JsxElement el |
         el.getAttributeByName("data-html").getStringValue() = "true" or
         el.getAttributeByName("data-html").getValue().mayHaveBooleanValue(true)
       |
@@ -446,7 +449,7 @@ module DomBasedXss {
     )
   }
 
-  private class ContainsHTMLGuard extends SanitizerGuard, Shared::ContainsHTMLGuard { }
+  private class ContainsHtmlGuard extends SanitizerGuard, Shared::ContainsHtmlGuard { }
 }
 
 /** Provides classes and predicates for the reflected XSS query. */
@@ -555,7 +558,7 @@ module ReflectedXss {
 
   private class QuoteGuard extends SanitizerGuard, Shared::QuoteGuard { }
 
-  private class ContainsHTMLGuard extends SanitizerGuard, Shared::ContainsHTMLGuard { }
+  private class ContainsHtmlGuard extends SanitizerGuard, Shared::ContainsHtmlGuard { }
 }
 
 /** Provides classes and predicates for the stored XSS query. */
@@ -595,7 +598,7 @@ module StoredXss {
 
   private class QuoteGuard extends SanitizerGuard, Shared::QuoteGuard { }
 
-  private class ContainsHTMLGuard extends SanitizerGuard, Shared::ContainsHTMLGuard { }
+  private class ContainsHtmlGuard extends SanitizerGuard, Shared::ContainsHtmlGuard { }
 }
 
 /** Provides classes and predicates for the XSS through DOM query. */
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/XssThroughDomCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/XssThroughDomCustomizations.qll
index aa7679b88e0..534cc22708a 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/XssThroughDomCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/XssThroughDomCustomizations.qll
@@ -88,8 +88,8 @@ module XssThroughDom {
   /**
    * A source for text from the DOM from a DOM property read or call to `getAttribute()`.
    */
-  class DOMTextSource extends Source {
-    DOMTextSource() {
+  class DomTextSource extends Source {
+    DomTextSource() {
       exists(DataFlow::PropRead read | read = this |
         read.getBase().getALocalSource() = DOM::domValueRef() and
         read.mayHavePropertyName(unsafeDomPropertyName())
@@ -103,6 +103,9 @@ module XssThroughDom {
     }
   }
 
+  /** DEPRECATED: Alias for DomTextSource */
+  deprecated class DOMTextSource = DomTextSource;
+
   /**
    * A test of form `typeof x === "something"`, preventing `x` from being a string in some cases.
    *
@@ -149,7 +152,7 @@ module XssThroughDom {
      */
     class FormikSource extends Source {
       FormikSource() {
-        exists(JSXElement elem |
+        exists(JsxElement elem |
           formik().getAPropertyRead("Formik").flowsToExpr(elem.getNameExpr())
         |
           this =
@@ -176,7 +179,7 @@ module XssThroughDom {
      */
     class ReactFinalFormSource extends Source {
       ReactFinalFormSource() {
-        exists(JSXElement elem |
+        exists(JsxElement elem |
           DataFlow::moduleMember("react-final-form", "Form").flowsToExpr(elem.getNameExpr())
         |
           this =
diff --git a/javascript/ql/src/AngularJS/DuplicateDependency.ql b/javascript/ql/src/AngularJS/DuplicateDependency.ql
index c7d7e0c55d2..e0f0c4954cb 100644
--- a/javascript/ql/src/AngularJS/DuplicateDependency.ql
+++ b/javascript/ql/src/AngularJS/DuplicateDependency.ql
@@ -12,7 +12,7 @@
 import javascript
 import semmle.javascript.RestrictedLocations
 
-predicate isRepeatedDependency(AngularJS::InjectableFunction f, string name, ASTNode location) {
+predicate isRepeatedDependency(AngularJS::InjectableFunction f, string name, AstNode location) {
   exists(int i, int j |
     i < j and
     exists(f.getDependencyDeclaration(i, name)) and
@@ -20,7 +20,7 @@ predicate isRepeatedDependency(AngularJS::InjectableFunction f, string name, AST
   )
 }
 
-from AngularJS::InjectableFunction f, ASTNode node, string name
+from AngularJS::InjectableFunction f, AstNode node, string name
 where
   isRepeatedDependency(f, name, node) and
   not count(f.asFunction().getParameterByName(name)) > 1 // avoid duplicating reports from js/duplicate-parameter-name
diff --git a/javascript/ql/src/AngularJS/RepeatedInjection.ql b/javascript/ql/src/AngularJS/RepeatedInjection.ql
index 246fbbdbd1c..3f2e535fdd0 100644
--- a/javascript/ql/src/AngularJS/RepeatedInjection.ql
+++ b/javascript/ql/src/AngularJS/RepeatedInjection.ql
@@ -12,7 +12,7 @@
 import javascript
 import semmle.javascript.RestrictedLocations
 
-from AngularJS::InjectableFunction f, ASTNode explicitInjection
+from AngularJS::InjectableFunction f, AstNode explicitInjection
 where
   count(f.getAnExplicitDependencyInjection()) > 1 and
   explicitInjection = f.getAnExplicitDependencyInjection()
diff --git a/javascript/ql/src/AngularJS/UnusedAngularDependency.ql b/javascript/ql/src/AngularJS/UnusedAngularDependency.ql
index b3e0773a157..4eb22c33695 100644
--- a/javascript/ql/src/AngularJS/UnusedAngularDependency.ql
+++ b/javascript/ql/src/AngularJS/UnusedAngularDependency.ql
@@ -21,7 +21,7 @@ predicate isUnusedParameter(Function f, string msg, Parameter parameter) {
   )
 }
 
-predicate isMissingParameter(AngularJS::InjectableFunction f, string msg, ASTNode location) {
+predicate isMissingParameter(AngularJS::InjectableFunction f, string msg, AstNode location) {
   exists(int paramCount, int injectionCount |
     DataFlow::valueNode(location) = f and
     paramCount = f.asFunction().getNumParameter() and
@@ -41,7 +41,7 @@ predicate isMissingParameter(AngularJS::InjectableFunction f, string msg, ASTNod
   )
 }
 
-from AngularJS::InjectableFunction f, string message, ASTNode location
+from AngularJS::InjectableFunction f, string message, AstNode location
 where
   isUnusedParameter(f.asFunction(), message, location) or isMissingParameter(f, message, location)
 select location.(FirstLineOf), message
diff --git a/javascript/ql/src/Declarations/DeadStoreOfLocal.ql b/javascript/ql/src/Declarations/DeadStoreOfLocal.ql
index 4877062a84e..70b3ba0e2e2 100644
--- a/javascript/ql/src/Declarations/DeadStoreOfLocal.ql
+++ b/javascript/ql/src/Declarations/DeadStoreOfLocal.ql
@@ -35,7 +35,7 @@ where
   // the variable should be accessed somewhere; otherwise it will be flagged by UnusedVariable
   exists(v.getAnAccess()) and
   // don't flag ambient variable definitions
-  not dead.(ASTNode).isAmbient() and
+  not dead.(AstNode).isAmbient() and
   // don't flag variables with ambient uses
   not exists(LexicalAccess access |
     access.getALexicalName() = v.getADeclaration().getALexicalName() and
@@ -55,7 +55,7 @@ where
   // don't flag default inits that are later overwritten
   not (isDefaultInit(dead.getSource().(Expr).getUnderlyingValue()) and dead.isOverwritten(v)) and
   // don't flag assignments in externs
-  not dead.(ASTNode).inExternsFile() and
+  not dead.(AstNode).inExternsFile() and
   // don't flag exported variables
   not any(ES2015Module m).exportsAs(v, _) and
   // don't flag 'exports' assignments in closure modules
@@ -70,5 +70,5 @@ where
     else msg = "The value assigned to " + v.getName() + " here is unused."
   ) and
   // ignore Angular templates
-  not dead.(ASTNode).getTopLevel() instanceof Angular2::TemplateTopLevel
+  not dead.(AstNode).getTopLevel() instanceof Angular2::TemplateTopLevel
 select dead, msg
diff --git a/javascript/ql/src/Declarations/DeadStoreOfProperty.ql b/javascript/ql/src/Declarations/DeadStoreOfProperty.ql
index d0866768bc5..48b574f8cd1 100644
--- a/javascript/ql/src/Declarations/DeadStoreOfProperty.ql
+++ b/javascript/ql/src/Declarations/DeadStoreOfProperty.ql
@@ -101,7 +101,7 @@ predicate isDeadAssignment(string name, DataFlow::PropWrite assign1, DataFlow::P
     noPropAccessBetweenInsideBasicBlock(name, assign1, assign2) or
     noPropAccessBetweenAcrossBasicBlocks(name, assign1, assign2)
   ) and
-  not isDOMProperty(name)
+  not isDomProperty(name)
 }
 
 /**
diff --git a/javascript/ql/src/Declarations/UnusedVariable.ql b/javascript/ql/src/Declarations/UnusedVariable.ql
index 8fb405a7cf9..64a78908eec 100644
--- a/javascript/ql/src/Declarations/UnusedVariable.ql
+++ b/javascript/ql/src/Declarations/UnusedVariable.ql
@@ -37,20 +37,20 @@ predicate isPropertyFilter(UnusedLocal v) {
 }
 
 predicate hasJsxInScope(UnusedLocal v) {
-  any(JSXNode n).getParent+() = v.getScope().getScopeElement()
+  any(JsxNode n).getParent+() = v.getScope().getScopeElement()
 }
 
 /**
  * Holds if `v` is a "React" variable that is implicitly used by a JSX element.
  */
-predicate isReactForJSX(UnusedLocal v) {
+predicate isReactForJsx(UnusedLocal v) {
   hasJsxInScope(v) and
   (
     v.getName() = "React"
     or
     exists(TopLevel tl | tl = v.getADeclaration().getTopLevel() |
       // legacy `@jsx` pragmas
-      exists(JSXPragma p | p.getTopLevel() = tl | p.getDOMName() = v.getName())
+      exists(JsxPragma p | p.getTopLevel() = tl | p.getDomName() = v.getName())
       or
       // JSX pragma from a .babelrc file
       exists(Babel::TransformReactJsxConfig plugin |
@@ -59,7 +59,7 @@ predicate isReactForJSX(UnusedLocal v) {
       )
     )
     or
-    exists(JSONObject tsconfig |
+    exists(JsonObject tsconfig |
       tsconfig.isTopLevel() and tsconfig.getFile().getBaseName() = "tsconfig.json"
     |
       v.getName() =
@@ -148,7 +148,7 @@ predicate whitelisted(UnusedLocal v) {
   isPropertyFilter(v)
   or
   // exclude imports of React that are implicitly referenced by JSX
-  isReactForJSX(v)
+  isReactForJsx(v)
   or
   // exclude names that are used as types
   exists(VarDecl vd | v = vd.getVariable() |
@@ -198,7 +198,7 @@ predicate unusedImports(ImportVarDeclProvider provider, string msg) {
   )
 }
 
-from ASTNode sel, string msg
+from AstNode sel, string msg
 where
   (
     unusedNonImports(sel, msg) or
diff --git a/javascript/ql/src/Expressions/Clones.qll b/javascript/ql/src/Expressions/Clones.qll
index 612cccd406f..a5d90509403 100644
--- a/javascript/ql/src/Expressions/Clones.qll
+++ b/javascript/ql/src/Expressions/Clones.qll
@@ -7,7 +7,7 @@ import javascript
 /**
  * Gets an opaque integer value encoding the type of AST node `nd`.
  */
-private int kindOf(ASTNode nd) {
+private int kindOf(AstNode nd) {
   // map expression kinds to even non-negative numbers
   result = nd.(Expr).getKind() * 2
   or
@@ -25,7 +25,7 @@ private int kindOf(ASTNode nd) {
 /**
  * Holds if `nd` has the given `kind`, and its number of children is `arity`.
  */
-private predicate kindAndArity(ASTNode nd, int kind, int arity) {
+private predicate kindAndArity(AstNode nd, int kind, int arity) {
   kindOf(nd) = kind and arity = nd.getNumChild()
 }
 
@@ -35,7 +35,7 @@ private predicate kindAndArity(ASTNode nd, int kind, int arity) {
  *
  * Every AST node has at most one value.
  */
-private string valueOf(ASTNode nd) {
+private string valueOf(AstNode nd) {
   result = nd.(Literal).getRawValue() or
   result = nd.(TemplateElement).getRawValue() or
   result = nd.(Identifier).getName()
@@ -47,18 +47,18 @@ private string valueOf(ASTNode nd) {
  * Clients must override the `candidate()` method to identify the
  * nodes for which structural comparison will be interesting.
  */
-abstract class StructurallyCompared extends ASTNode {
+abstract class StructurallyCompared extends AstNode {
   /**
    * Gets a candidate node that we may want to structurally compare this node to.
    */
-  abstract ASTNode candidate();
+  abstract AstNode candidate();
 
   /**
    * Gets a node that structurally corresponds to this node, either because it is
    * a candidate node, or because it is at the same position relative to a
    * candidate node as this node.
    */
-  ASTNode candidateInternal() {
+  AstNode candidateInternal() {
     // in order to correspond, nodes need to have the same kind and shape
     exists(int kind, int numChildren | kindAndArity(this, kind, numChildren) |
       result = this.candidateKind(kind, numChildren)
@@ -71,18 +71,18 @@ abstract class StructurallyCompared extends ASTNode {
    * Gets a node that structurally corresponds to the parent node of this node,
    * where this node is the `i`th child of its parent.
    */
-  private ASTNode getAStructuralUncle(int i) {
+  private AstNode getAStructuralUncle(int i) {
     exists(StructurallyCompared parent | this = parent.getChild(i) |
       result = parent.candidateInternal()
     )
   }
 
-  private ASTNode candidateKind(int kind, int numChildren) {
+  private AstNode candidateKind(int kind, int numChildren) {
     result = this.candidate() and kindAndArity(result, kind, numChildren)
   }
 
   pragma[noinline]
-  private ASTNode uncleKind(int kind, int numChildren) {
+  private AstNode uncleKind(int kind, int numChildren) {
     exists(int i | result = this.getAStructuralUncle(i).getChild(i)) and
     kindAndArity(result, kind, numChildren)
   }
@@ -92,7 +92,7 @@ abstract class StructurallyCompared extends ASTNode {
    * rooted at node `that`, where `that` structurally corresponds to `this` as
    * determined by `candidateInternal`.
    */
-  private predicate sameInternal(ASTNode that) {
+  private predicate sameInternal(AstNode that) {
     that = this.candidateInternal() and
     /*
      * Check that `this` and `that` bind to the same variable, if any.
@@ -120,7 +120,7 @@ abstract class StructurallyCompared extends ASTNode {
    * rooted at node `that`, which must be a candidate node as determined by
    * `candidate`.
    */
-  predicate same(ASTNode that) {
+  predicate same(AstNode that) {
     that = this.candidate() and
     this.sameInternal(that)
   }
@@ -132,7 +132,7 @@ abstract class StructurallyCompared extends ASTNode {
 private class InternalCandidate extends StructurallyCompared {
   InternalCandidate() { exists(this.getParent().(StructurallyCompared).candidateInternal()) }
 
-  override ASTNode candidate() { none() }
+  override AstNode candidate() { none() }
 }
 
 /**
diff --git a/javascript/ql/src/Expressions/HeterogeneousComparison.ql b/javascript/ql/src/Expressions/HeterogeneousComparison.ql
index a736fa5cdc9..3b4c59f08b6 100644
--- a/javascript/ql/src/Expressions/HeterogeneousComparison.ql
+++ b/javascript/ql/src/Expressions/HeterogeneousComparison.ql
@@ -24,7 +24,7 @@ private import semmle.javascript.DefensiveProgramming
  * Besides the usual comparison operators, `switch` statements are also considered to be comparisons,
  * with the switched-on expression being the right operand and all case labels the left operands.
  */
-predicate comparisonOperands(ASTNode nd, Expr left, Expr right) {
+predicate comparisonOperands(AstNode nd, Expr left, Expr right) {
   exists(Comparison cmp | cmp = nd | left = cmp.getLeftOperand() and right = cmp.getRightOperand())
   or
   exists(SwitchStmt switch | switch = nd |
@@ -45,7 +45,7 @@ predicate hasImplicitConversionMethod(DefiniteAbstractValue av) {
 /**
  * Gets a type of `operand`, which is an operand of the strict equality test `eq`.
  */
-InferredType strictEqualityOperandType(ASTNode eq, DataFlow::AnalyzedNode operand) {
+InferredType strictEqualityOperandType(AstNode eq, DataFlow::AnalyzedNode operand) {
   // strict equality tests do no conversion at all
   operand.asExpr() = eq.(StrictEqualityTest).getAChildExpr() and result = operand.getAType()
   or
@@ -60,7 +60,7 @@ InferredType strictEqualityOperandType(ASTNode eq, DataFlow::AnalyzedNode operan
  * Holds if `operand` is an operand of the non-strict equality test or relational
  * operator `parent`, and may have a `toString` or `valueOf` method.
  */
-predicate implicitlyConvertedOperand(ASTNode parent, DataFlow::AnalyzedNode operand) {
+predicate implicitlyConvertedOperand(AstNode parent, DataFlow::AnalyzedNode operand) {
   (parent instanceof NonStrictEqualityTest or parent instanceof RelationalComparison) and
   operand.asExpr() = parent.getAChildExpr() and
   hasImplicitConversionMethod(operand.getAValue())
@@ -70,7 +70,7 @@ predicate implicitlyConvertedOperand(ASTNode parent, DataFlow::AnalyzedNode oper
  * Gets a type of `operand`, which is an operand of the non-strict equality test or
  * relational operator `parent`.
  */
-InferredType nonStrictOperandType(ASTNode parent, DataFlow::AnalyzedNode operand) {
+InferredType nonStrictOperandType(AstNode parent, DataFlow::AnalyzedNode operand) {
   // non-strict equality tests perform conversions
   operand.asExpr() = parent.(NonStrictEqualityTest).getAChildExpr() and
   exists(InferredType tp | tp = operand.getAValue().getType() |
@@ -109,7 +109,7 @@ InferredType nonStrictOperandType(ASTNode parent, DataFlow::AnalyzedNode operand
  * Gets a type that `operand`, which is an operand of comparison `parent`,
  * could be converted to at runtime.
  */
-InferredType convertedOperandType(ASTNode parent, DataFlow::AnalyzedNode operand) {
+InferredType convertedOperandType(AstNode parent, DataFlow::AnalyzedNode operand) {
   result = strictEqualityOperandType(parent, operand)
   or
   // if `operand` might have `toString`/`valueOf`, just assume it could
@@ -125,7 +125,7 @@ InferredType convertedOperandType(ASTNode parent, DataFlow::AnalyzedNode operand
  * common type they coerce to.
  */
 predicate isHeterogeneousComparison(
-  ASTNode cmp, DataFlow::AnalyzedNode left, DataFlow::AnalyzedNode right, string leftTypes,
+  AstNode cmp, DataFlow::AnalyzedNode left, DataFlow::AnalyzedNode right, string leftTypes,
   string rightTypes
 ) {
   comparisonOperands(cmp, left.asExpr(), right.asExpr()) and
@@ -188,7 +188,7 @@ predicate isInitialParameterUse(Expr e) {
 predicate whitelist(Expr e) { isInitialParameterUse(e) }
 
 from
-  ASTNode cmp, DataFlow::AnalyzedNode left, DataFlow::AnalyzedNode right, string leftTypes,
+  AstNode cmp, DataFlow::AnalyzedNode left, DataFlow::AnalyzedNode right, string leftTypes,
   string rightTypes, string leftExprDescription, string rightExprDescription, int leftTypeCount,
   int rightTypeCount, string leftTypeDescription, string rightTypeDescription
 where
diff --git a/javascript/ql/src/Expressions/SelfAssignment.ql b/javascript/ql/src/Expressions/SelfAssignment.ql
index 6aab4c46bb2..784f01fa742 100644
--- a/javascript/ql/src/Expressions/SelfAssignment.ql
+++ b/javascript/ql/src/Expressions/SelfAssignment.ql
@@ -41,7 +41,7 @@ where
     propName = any(AccessorMethodDeclaration amd).getName()
   ) and
   // exclude DOM properties
-  not isDOMProperty(e.(PropAccess).getPropertyName()) and
+  not isDomProperty(e.(PropAccess).getPropertyName()) and
   // exclude self-assignments that have been inserted to satisfy the TypeScript JS-checker
   not e.getAssignment().getParent().(ExprStmt).getDocumentation().getATag().getTitle() = "type" and
   // exclude self-assignments in speculatively parsed template files
diff --git a/javascript/ql/src/Expressions/UnboundEventHandlerReceiver.ql b/javascript/ql/src/Expressions/UnboundEventHandlerReceiver.ql
index 4ae3504d843..04509a9004b 100644
--- a/javascript/ql/src/Expressions/UnboundEventHandlerReceiver.ql
+++ b/javascript/ql/src/Expressions/UnboundEventHandlerReceiver.ql
@@ -83,9 +83,9 @@ private predicate isBoundInMethod(MethodDeclaration method) {
  * Gets an event handler attribute (onClick, onTouch, ...).
  */
 private DOM::AttributeDefinition getAnEventHandlerAttribute() {
-  exists(ReactComponent c, JSXNode rendered, string attributeName |
+  exists(ReactComponent c, JsxNode rendered, string attributeName |
     c.getRenderMethod().getAReturnedExpr().flow().getALocalSource().asExpr() = rendered and
-    result = rendered.getABodyElement*().(JSXElement).getAttributeByName(attributeName) and
+    result = rendered.getABodyElement*().(JsxElement).getAttributeByName(attributeName) and
     attributeName.regexpMatch("on[A-Z][a-zA-Z]+") // camelCased with 'on'-prefix
   )
 }
diff --git a/javascript/ql/src/LanguageFeatures/BadTypeof.ql b/javascript/ql/src/LanguageFeatures/BadTypeof.ql
index 1773f79bb53..1da17f3a8e8 100644
--- a/javascript/ql/src/LanguageFeatures/BadTypeof.ql
+++ b/javascript/ql/src/LanguageFeatures/BadTypeof.ql
@@ -20,7 +20,7 @@ import javascript
  * A comparison construct, that is, either an equality test or a switch case
  * (which is implicitly compared to the switch statement's discriminant).
  */
-class EqOrSwitch extends ASTNode {
+class EqOrSwitch extends AstNode {
   EqOrSwitch() {
     this instanceof EqualityTest or
     this instanceof Case
diff --git a/javascript/ql/src/LanguageFeatures/ExpressionClosures.ql b/javascript/ql/src/LanguageFeatures/ExpressionClosures.ql
index 6c81cf90fc5..db33566a758 100644
--- a/javascript/ql/src/LanguageFeatures/ExpressionClosures.ql
+++ b/javascript/ql/src/LanguageFeatures/ExpressionClosures.ql
@@ -18,7 +18,7 @@ import javascript
  * Holds if `nd` is a use of deprecated language feature `type`, and `replacement`
  * is the recommended replacement.
  */
-predicate deprecated_feature(ASTNode nd, string type, string replacement) {
+predicate deprecated_feature(AstNode nd, string type, string replacement) {
   exists(FunctionExpr fe | fe = nd and fe.getBody() instanceof Expr |
     type = "expression closures" and replacement = "arrow expressions"
   )
@@ -38,6 +38,6 @@ predicate deprecated_feature(ASTNode nd, string type, string replacement) {
   replacement = "standard method definitions"
 }
 
-from ASTNode depr, string type, string replacement
+from AstNode depr, string type, string replacement
 where deprecated_feature(depr, type, replacement)
 select depr, "Use " + replacement + " instead of " + type + "."
diff --git a/javascript/ql/src/LanguageFeatures/TemplateSyntaxInStringLiteral.ql b/javascript/ql/src/LanguageFeatures/TemplateSyntaxInStringLiteral.ql
index 5a6f47c9118..daa34825939 100644
--- a/javascript/ql/src/LanguageFeatures/TemplateSyntaxInStringLiteral.ql
+++ b/javascript/ql/src/LanguageFeatures/TemplateSyntaxInStringLiteral.ql
@@ -42,10 +42,10 @@ class CandidateStringLiteral extends StringLiteral {
    * Gets an ancestor node of this string literal in the AST that can be reached without
    * stepping over scope elements.
    */
-  ASTNode getIntermediate() {
+  AstNode getIntermediate() {
     result = this
     or
-    exists(ASTNode mid | mid = this.getIntermediate() |
+    exists(AstNode mid | mid = this.getIntermediate() |
       not mid instanceof ScopeElement and
       result = mid.getParent()
     )
diff --git a/javascript/ql/src/LanguageFeatures/WrongExtensionJSON.ql b/javascript/ql/src/LanguageFeatures/WrongExtensionJSON.ql
index 91e5f58eee6..46319ab3a6f 100644
--- a/javascript/ql/src/LanguageFeatures/WrongExtensionJSON.ql
+++ b/javascript/ql/src/LanguageFeatures/WrongExtensionJSON.ql
@@ -11,7 +11,7 @@
 
 import javascript
 
-from JSONValue v, File f
+from JsonValue v, File f
 where
   f = v.getFile() and
   f.getExtension().regexpMatch("(?i)jsx?") and
diff --git a/javascript/ql/src/Metrics/ES20xxFeatures.qll b/javascript/ql/src/Metrics/ES20xxFeatures.qll
index ddc40d7f8df..8069ba5e50f 100644
--- a/javascript/ql/src/Metrics/ES20xxFeatures.qll
+++ b/javascript/ql/src/Metrics/ES20xxFeatures.qll
@@ -13,7 +13,7 @@ import javascript
  * (https://kangax.github.io/compat-table/es6/) and [ECMAScript next compatibility table]
  * (https://kangax.github.io/compat-table/esnext/).
  */
-predicate isES20xxFeature(ASTNode nd, int version, string category) {
+predicate isES20xxFeature(AstNode nd, int version, string category) {
   version = 2015 and
   (
     exists(nd.(Parameter).getDefault()) and category = "default function parameters"
diff --git a/javascript/ql/src/Metrics/FUseOfES6.ql b/javascript/ql/src/Metrics/FUseOfES6.ql
index e683cc23629..41f042ce183 100644
--- a/javascript/ql/src/Metrics/FUseOfES6.ql
+++ b/javascript/ql/src/Metrics/FUseOfES6.ql
@@ -12,4 +12,4 @@
 import ES20xxFeatures
 
 from File f
-select f, count(ASTNode nd | nd.getFile() = f and isES20xxFeature(nd, _, _)) as n order by n desc
+select f, count(AstNode nd | nd.getFile() = f and isES20xxFeature(nd, _, _)) as n order by n desc
diff --git a/javascript/ql/src/NodeJS/CyclicImport.ql b/javascript/ql/src/NodeJS/CyclicImport.ql
index 0613b75ccc0..d34dcb587dc 100644
--- a/javascript/ql/src/NodeJS/CyclicImport.ql
+++ b/javascript/ql/src/NodeJS/CyclicImport.ql
@@ -64,7 +64,7 @@ predicate relatedModules(NodeModule m, NodeModule n) {
   n = m.getAnImportedModule() or m = n.getAnImportedModule()
 }
 
-from NodeModule m, Require r, NodeModule imported, string msg, ASTNode linktarget, string linktext
+from NodeModule m, Require r, NodeModule imported, string msg, AstNode linktarget, string linktext
 where
   r = m.getAnImport() and
   imported = r.getImportedModule() and
diff --git a/javascript/ql/src/NodeJS/UnresolvableImport.ql b/javascript/ql/src/NodeJS/UnresolvableImport.ql
index c478a5ebe9d..16feba14348 100644
--- a/javascript/ql/src/NodeJS/UnresolvableImport.ql
+++ b/javascript/ql/src/NodeJS/UnresolvableImport.ql
@@ -16,10 +16,10 @@ import javascript
  * Gets the `package.json` of the nearest enclosing NPM package to which
  * file `f` belongs.
  */
-PackageJSON getClosestPackageJSON(Folder f) {
-  result = f.(NPMPackage).getPackageJSON()
+PackageJson getClosestPackageJson(Folder f) {
+  result = f.(NpmPackage).getPackageJson()
   or
-  not f instanceof NPMPackage and result = getClosestPackageJSON(f.getParentContainer())
+  not f instanceof NpmPackage and result = getClosestPackageJson(f.getParentContainer())
 }
 
 from Require r, string path, string mod
@@ -35,14 +35,14 @@ where
   // import cannot be resolved statically
   not exists(r.getImportedModule()) and
   // no enclosing NPM package declares a dependency on `mod`
-  forex(NPMPackage pkg, PackageJSON pkgJSON |
-    pkg.getAModule() = r.getTopLevel() and pkgJSON = pkg.getPackageJSON()
+  forex(NpmPackage pkg, PackageJson pkgJson |
+    pkg.getAModule() = r.getTopLevel() and pkgJson = pkg.getPackageJson()
   |
-    not pkgJSON.declaresDependency(mod, _) and
-    not pkgJSON.getPeerDependencies().getADependency(mod, _) and
+    not pkgJson.declaresDependency(mod, _) and
+    not pkgJson.getPeerDependencies().getADependency(mod, _) and
     // exclude packages depending on `fbjs`, which automatically pulls in many otherwise
     // undeclared dependencies
-    not pkgJSON.declaresDependency("fbjs", _)
+    not pkgJson.declaresDependency("fbjs", _)
   )
 select r, "Module " + mod + " cannot be resolved, and is not declared as a dependency in $@.",
-  getClosestPackageJSON(r.getFile().getParentContainer()), "package.json"
+  getClosestPackageJson(r.getFile().getParentContainer()), "package.json"
diff --git a/javascript/ql/src/NodeJS/UnusedDependency.ql b/javascript/ql/src/NodeJS/UnusedDependency.ql
index 7566c133296..45bbde37294 100644
--- a/javascript/ql/src/NodeJS/UnusedDependency.ql
+++ b/javascript/ql/src/NodeJS/UnusedDependency.ql
@@ -16,19 +16,19 @@ import javascript
  * Holds if the NPM package `pkg` declares a dependency on package `name`,
  * and `dep` is the corresponding declaration in the `package.json` file.
  */
-predicate declaresDependency(NPMPackage pkg, string name, JSONValue dep) {
-  dep = pkg.getPackageJSON().getDependencies().getPropValue(name)
+predicate declaresDependency(NpmPackage pkg, string name, JsonValue dep) {
+  dep = pkg.getPackageJson().getDependencies().getPropValue(name)
 }
 
 /**
  * Gets a path expression in a module belonging to `pkg`.
  */
-PathExpr getAPathExpr(NPMPackage pkg) { result.getEnclosingModule() = pkg.getAModule() }
+PathExpr getAPathExpr(NpmPackage pkg) { result.getEnclosingModule() = pkg.getAModule() }
 
 /**
  * Gets a URL-valued attribute in a module or HTML file belonging to `pkg`.
  */
-DOM::AttributeDefinition getAURLAttribute(NPMPackage pkg) {
+DOM::AttributeDefinition getAUrlAttribute(NpmPackage pkg) {
   result.getFile() = pkg.getAFile() and
   DOM::isUrlValuedAttribute(result)
 }
@@ -37,10 +37,10 @@ DOM::AttributeDefinition getAURLAttribute(NPMPackage pkg) {
  * Gets the name of a script in the 'scripts' object of `pkg`.
  * The script makes use of a declared `dependency` of `pkg`.
  */
-string getPackageScriptNameWithDependency(NPMPackage pkg, string dependency) {
-  exists(JSONObject scriptsObject, string scriptName, string script |
+string getPackageScriptNameWithDependency(NpmPackage pkg, string dependency) {
+  exists(JsonObject scriptsObject, string scriptName, string script |
     declaresDependency(pkg, dependency, _) and
-    scriptsObject = pkg.getPackageJSON().getPropValue("scripts") and
+    scriptsObject = pkg.getPackageJson().getPropValue("scripts") and
     script = scriptsObject.getPropStringValue(scriptName) and
     script.regexpMatch(".*\\b\\Q" + dependency + "\\E\\b.*") and
     result = scriptName
@@ -51,7 +51,7 @@ string getPackageScriptNameWithDependency(NPMPackage pkg, string dependency) {
  * Holds if the NPM package `pkg` declares a dependency on package `name`,
  * and uses it at least once.
  */
-predicate usesDependency(NPMPackage pkg, string name) {
+predicate usesDependency(NpmPackage pkg, string name) {
   declaresDependency(pkg, name, _) and
   (
     // there is a path expression (e.g., in a `require` or `import`) that
@@ -62,7 +62,7 @@ predicate usesDependency(NPMPackage pkg, string name) {
     )
     or
     // there is an HTML URL attribute that may reference `pkg`
-    exists(DOM::AttributeDefinition attr | attr = getAURLAttribute(pkg) |
+    exists(DOM::AttributeDefinition attr | attr = getAUrlAttribute(pkg) |
       // check whether the URL contains `node_modules/name`
       attr.getStringValue().regexpMatch(".*\\bnode_modules/\\Q" + name + "\\E(/.*)?")
     )
@@ -85,7 +85,7 @@ predicate usesDependency(NPMPackage pkg, string name) {
  * view engine definitions, which (may) implicitly require the specified
  * engine as a module.
  */
-predicate implicitRequire(NPMPackage pkg, string name) {
+predicate implicitRequire(NpmPackage pkg, string name) {
   // look for Express `set('view engine', ...)` calls
   exists(MethodCallExpr setViewEngine, string engine |
     Express::appCreation().flowsToExpr(setViewEngine.getReceiver()) and
@@ -99,7 +99,7 @@ predicate implicitRequire(NPMPackage pkg, string name) {
   )
 }
 
-from NPMPackage pkg, string name, JSONValue dep
+from NpmPackage pkg, string name, JsonValue dep
 where
   exists(pkg.getAModule()) and
   declaresDependency(pkg, name, dep) and
diff --git a/javascript/ql/src/Security/CWE-020/ExternalAPIsUsedWithUntrustedData.ql b/javascript/ql/src/Security/CWE-020/ExternalAPIsUsedWithUntrustedData.ql
index 1d00abb104b..045edc172f3 100644
--- a/javascript/ql/src/Security/CWE-020/ExternalAPIsUsedWithUntrustedData.ql
+++ b/javascript/ql/src/Security/CWE-020/ExternalAPIsUsedWithUntrustedData.ql
@@ -11,7 +11,7 @@
 import javascript
 import semmle.javascript.security.dataflow.ExternalAPIUsedWithUntrustedDataQuery
 
-from ExternalAPIUsedWithUntrustedData externalAPI
-select externalAPI, count(externalAPI.getUntrustedDataNode()) as numberOfUses,
-  externalAPI.getNumberOfUntrustedSources() as numberOfUntrustedSources order by
+from ExternalApiUsedWithUntrustedData externalApi
+select externalApi, count(externalApi.getUntrustedDataNode()) as numberOfUses,
+  externalApi.getNumberOfUntrustedSources() as numberOfUntrustedSources order by
     numberOfUntrustedSources desc
diff --git a/javascript/ql/src/Security/CWE-020/UselessRegExpCharacterEscape.ql b/javascript/ql/src/Security/CWE-020/UselessRegExpCharacterEscape.ql
index 7bd17135e33..3a34708d91b 100644
--- a/javascript/ql/src/Security/CWE-020/UselessRegExpCharacterEscape.ql
+++ b/javascript/ql/src/Security/CWE-020/UselessRegExpCharacterEscape.ql
@@ -23,7 +23,7 @@ newtype TRegExpPatternMistake =
    * by `mistake`.
    */
   TIdentityEscapeInStringMistake(
-    RegExpPatternSource src, string char, string mistake, ASTNode rawStringNode, int index
+    RegExpPatternSource src, string char, string mistake, AstNode rawStringNode, int index
   ) {
     char = getALikelyRegExpPatternMistake(src, mistake, rawStringNode, index)
   } or
@@ -32,7 +32,7 @@ newtype TRegExpPatternMistake =
    * regular expression string `src`, indicating intent to use the
    * word-boundary assertion '\b'.
    */
-  TBackspaceInStringMistake(RegExpPatternSource src, ASTNode rawStringNode, int index) {
+  TBackspaceInStringMistake(RegExpPatternSource src, AstNode rawStringNode, int index) {
     exists(string raw, string cooked |
       exists(StringLiteral lit | lit = rawStringNode |
         rawStringNode = src.asExpr() and
@@ -91,7 +91,7 @@ class RegExpPatternMistake extends TRegExpPatternMistake {
   /** Gets a textual representation of this element. */
   string toString() { result = getMessage() }
 
-  abstract ASTNode getRawStringNode();
+  abstract AstNode getRawStringNode();
 
   abstract RegExpPatternSource getSrc();
 
@@ -109,7 +109,7 @@ class IdentityEscapeInStringMistake extends RegExpPatternMistake, TIdentityEscap
   string char;
   string mistake;
   int index;
-  ASTNode rawStringNode;
+  AstNode rawStringNode;
 
   IdentityEscapeInStringMistake() {
     this = TIdentityEscapeInStringMistake(src, char, mistake, rawStringNode, index)
@@ -123,7 +123,7 @@ class IdentityEscapeInStringMistake extends RegExpPatternMistake, TIdentityEscap
 
   override RegExpPatternSource getSrc() { result = src }
 
-  override ASTNode getRawStringNode() { result = rawStringNode }
+  override AstNode getRawStringNode() { result = rawStringNode }
 }
 
 /**
@@ -133,7 +133,7 @@ class IdentityEscapeInStringMistake extends RegExpPatternMistake, TIdentityEscap
 class BackspaceInStringMistake extends RegExpPatternMistake, TBackspaceInStringMistake {
   RegExpPatternSource src;
   int index;
-  ASTNode rawStringNode;
+  AstNode rawStringNode;
 
   BackspaceInStringMistake() { this = TBackspaceInStringMistake(src, rawStringNode, index) }
 
@@ -145,7 +145,7 @@ class BackspaceInStringMistake extends RegExpPatternMistake, TBackspaceInStringM
 
   override RegExpPatternSource getSrc() { result = src }
 
-  override ASTNode getRawStringNode() { result = rawStringNode }
+  override AstNode getRawStringNode() { result = rawStringNode }
 }
 
 from RegExpPatternMistake mistake
diff --git a/javascript/ql/src/Security/CWE-116/BadTagFilter.ql b/javascript/ql/src/Security/CWE-116/BadTagFilter.ql
index 5d0676b3406..1de903d6394 100644
--- a/javascript/ql/src/Security/CWE-116/BadTagFilter.ql
+++ b/javascript/ql/src/Security/CWE-116/BadTagFilter.ql
@@ -18,6 +18,6 @@
 
 import semmle.javascript.security.BadTagFilterQuery
 
-from HTMLMatchingRegExp regexp, string msg
+from HtmlMatchingRegExp regexp, string msg
 where msg = min(string m | isBadRegexpFilter(regexp, m) | m order by m.length(), m) // there might be multiple, we arbitrarily pick the shortest one
 select regexp, msg
diff --git a/javascript/ql/src/Security/CWE-200/PrivateFileExposure.ql b/javascript/ql/src/Security/CWE-200/PrivateFileExposure.ql
index 805b1966f55..99ca8cba8a7 100644
--- a/javascript/ql/src/Security/CWE-200/PrivateFileExposure.ql
+++ b/javascript/ql/src/Security/CWE-200/PrivateFileExposure.ql
@@ -69,7 +69,7 @@ DataFlow::Node getANodeModulePath(string path) {
  * Gets a folder that contains a `package.json` file.
  */
 pragma[noinline]
-Folder getAPackageJSONFolder() { result = any(PackageJSON json).getFile().getParentContainer() }
+Folder getAPackageJsonFolder() { result = any(PackageJson json).getFile().getParentContainer() }
 
 /**
  * Gets a reference to `dirname`, the home folder, the current working folder, or the root folder.
@@ -82,7 +82,7 @@ Folder getAPackageJSONFolder() { result = any(PackageJSON json).getFile().getPar
  */
 DataFlow::Node getALeakingFolder(string description) {
   exists(ModuleScope ms | result.asExpr() = ms.getVariable("__dirname").getAnAccess()) and
-  result.getFile().getParentContainer() = getAPackageJSONFolder() and
+  result.getFile().getParentContainer() = getAPackageJsonFolder() and
   (
     if result.getFile().getParentContainer().getRelativePath().trim() != ""
     then description = "the folder " + result.getFile().getParentContainer().getRelativePath()
diff --git a/javascript/ql/src/Security/CWE-300/InsecureDependencyResolution.ql b/javascript/ql/src/Security/CWE-300/InsecureDependencyResolution.ql
index 4da7cbe2a54..66ec0689111 100644
--- a/javascript/ql/src/Security/CWE-300/InsecureDependencyResolution.ql
+++ b/javascript/ql/src/Security/CWE-300/InsecureDependencyResolution.ql
@@ -16,7 +16,7 @@
 
 import javascript
 
-from PackageJSON pack, JSONString val
+from PackageJson pack, JsonString val
 where
   [pack.getDependencies(), pack.getDevDependencies()].getPropValue(_) = val and
   val.getValue().regexpMatch("(http|ftp)://.*")
diff --git a/javascript/ql/src/Security/CWE-730/ServerCrash.ql b/javascript/ql/src/Security/CWE-730/ServerCrash.ql
index eb8a6ac3cb5..f5de58d4516 100644
--- a/javascript/ql/src/Security/CWE-730/ServerCrash.ql
+++ b/javascript/ql/src/Security/CWE-730/ServerCrash.ql
@@ -130,7 +130,7 @@ class AsyncCallback extends Function {
  *
  * This is the primary extension point for this query.
  */
-abstract class LikelyExceptionThrower extends ASTNode { }
+abstract class LikelyExceptionThrower extends AstNode { }
 
 /**
  * A `throw` statement.
@@ -152,7 +152,7 @@ class CompilerConfusingExceptionThrower extends LikelyExceptionThrower {
  * - step 3. exception follows the call graph backwards until an async callee is encountered
  * - step 4. (at this point, the program crashes)
  */
-query predicate edges(ASTNode pred, ASTNode succ) {
+query predicate edges(AstNode pred, AstNode succ) {
   exists(LikelyExceptionThrower thrower | main(_, _, _, thrower) |
     pred = thrower and
     succ = thrower.getContainer()
@@ -174,7 +174,7 @@ query predicate edges(ASTNode pred, ASTNode succ) {
 /**
  * Holds if `node` is in the `edge/2` relation above.
  */
-query predicate nodes(ASTNode node) {
+query predicate nodes(AstNode node) {
   edges(node, _) or
   edges(_, node)
 }
diff --git a/javascript/ql/src/Statements/UseOfReturnlessFunction.ql b/javascript/ql/src/Statements/UseOfReturnlessFunction.ql
index 08928946eb5..ea5f2fb9755 100644
--- a/javascript/ql/src/Statements/UseOfReturnlessFunction.ql
+++ b/javascript/ql/src/Statements/UseOfReturnlessFunction.ql
@@ -49,7 +49,7 @@ predicate benignContext(Expr e) {
   e.getParent().(ExprStmt).getParent() instanceof CodeInAttribute
   or
   // and JSX-attributes.
-  e = any(JSXAttribute attr).getValue()
+  e = any(JsxAttribute attr).getValue()
   or
   exists(AwaitExpr await | await.getOperand() = e and benignContext(await))
   or
diff --git a/javascript/ql/src/Statements/UselessConditional.ql b/javascript/ql/src/Statements/UselessConditional.ql
index 57adc2ed06e..600fff5fb1c 100644
--- a/javascript/ql/src/Statements/UselessConditional.ql
+++ b/javascript/ql/src/Statements/UselessConditional.ql
@@ -139,12 +139,12 @@ predicate whitelist(Expr e) {
  * The return value of `e` may have other uses besides the truthiness check,
  * but if the truthiness check always goes one way, it still indicates an error.
  */
-predicate isConditional(ASTNode cond, Expr e) {
+predicate isConditional(AstNode cond, Expr e) {
   isExplicitConditional(cond, e) or
   e = cond.(LogicalBinaryExpr).getLeftOperand()
 }
 
-from ASTNode cond, DataFlow::AnalyzedNode op, boolean cv, ASTNode sel, string msg
+from AstNode cond, DataFlow::AnalyzedNode op, boolean cv, AstNode sel, string msg
 where
   isConditional(cond, op.asExpr()) and
   cv = op.getTheBooleanValue() and
diff --git a/javascript/ql/src/Statements/UselessConditional.qll b/javascript/ql/src/Statements/UselessConditional.qll
index 9197a2b8a0f..17fff876184 100644
--- a/javascript/ql/src/Statements/UselessConditional.qll
+++ b/javascript/ql/src/Statements/UselessConditional.qll
@@ -9,7 +9,7 @@ import javascript
  * `e` and checks its value for truthiness, and the return value of `e`
  * is not used for anything other than this truthiness check.
  */
-predicate isExplicitConditional(ASTNode cond, Expr e) {
+predicate isExplicitConditional(AstNode cond, Expr e) {
   e = cond.(IfStmt).getCondition()
   or
   e = cond.(LoopStmt).getTest()
diff --git a/javascript/ql/src/definitions.ql b/javascript/ql/src/definitions.ql
index a87857415e6..e4a730062e2 100644
--- a/javascript/ql/src/definitions.ql
+++ b/javascript/ql/src/definitions.ql
@@ -8,6 +8,6 @@
 
 import definitions
 
-from Locatable e, ASTNode def, string kind
+from Locatable e, AstNode def, string kind
 where def = definitionOf(e, kind)
 select e, def, kind
diff --git a/javascript/ql/src/definitions.qll b/javascript/ql/src/definitions.qll
index ecba34d6d16..4d0c0d50176 100644
--- a/javascript/ql/src/definitions.qll
+++ b/javascript/ql/src/definitions.qll
@@ -25,7 +25,7 @@ private string refKind(RefExpr r) {
 /**
  * Gets a class, function or object literal `va` may refer to.
  */
-private ASTNode lookupDef(VarAccess va) {
+private AstNode lookupDef(VarAccess va) {
   exists(AbstractValue av | av = va.analyze().getAValue() |
     result = av.(AbstractClass).getClass() or
     result = av.(AbstractFunction).getFunction() or
@@ -37,7 +37,7 @@ private ASTNode lookupDef(VarAccess va) {
  * Holds if `va` is of kind `kind` and `def` is the unique class,
  * function or object literal it refers to.
  */
-private predicate variableDefLookup(VarAccess va, ASTNode def, string kind) {
+private predicate variableDefLookup(VarAccess va, AstNode def, string kind) {
   count(lookupDef(va)) = 1 and
   def = lookupDef(va) and
   kind = refKind(va)
@@ -66,7 +66,7 @@ private predicate variableDeclLookup(VarAccess va, VarDecl decl, string kind) {
  * For example, in the statement `var a = require("./a")`, the path expression
  * `"./a"` imports a module `a` in the same folder.
  */
-private predicate importLookup(ASTNode path, Module target, string kind) {
+private predicate importLookup(AstNode path, Module target, string kind) {
   kind = "I" and
   (
     exists(Import i |
@@ -84,7 +84,7 @@ private predicate importLookup(ASTNode path, Module target, string kind) {
 /**
  * Gets a node that may write the property read by `prn`.
  */
-private ASTNode getAWrite(DataFlow::PropRead prn) {
+private AstNode getAWrite(DataFlow::PropRead prn) {
   exists(DataFlow::AnalyzedNode base, DefiniteAbstractValue baseVal, string propName |
     base = prn.getBase() and
     propName = prn.getPropertyName() and
@@ -112,7 +112,7 @@ private ASTNode getAWrite(DataFlow::PropRead prn) {
  * only such property write. Parameter `kind` is always bound to `"M"`
  * at the moment.
  */
-private predicate propertyLookup(Expr prop, ASTNode write, string kind) {
+private predicate propertyLookup(Expr prop, AstNode write, string kind) {
   exists(DataFlow::PropRead prn | prop = prn.getPropertyNameExpr() |
     count(getAWrite(prn)) = 1 and
     write = getAWrite(prn) and
@@ -123,7 +123,7 @@ private predicate propertyLookup(Expr prop, ASTNode write, string kind) {
 /**
  * Holds if `ref` is an identifier that refers to a type declared at `decl`.
  */
-private predicate typeLookup(ASTNode ref, ASTNode decl, string kind) {
+private predicate typeLookup(AstNode ref, AstNode decl, string kind) {
   exists(TypeAccess typeAccess |
     ref = typeAccess.getIdentifier() and
     decl = typeAccess.getTypeName().getADefinition() and
@@ -134,7 +134,7 @@ private predicate typeLookup(ASTNode ref, ASTNode decl, string kind) {
 /**
  * Holds if `ref` is the callee name of an invocation of `decl`.
  */
-private predicate typedInvokeLookup(ASTNode ref, ASTNode decl, string kind) {
+private predicate typedInvokeLookup(AstNode ref, AstNode decl, string kind) {
   not variableDefLookup(ref, decl, _) and
   not propertyLookup(ref, decl, _) and
   exists(InvokeExpr invoke, Expr callee |
@@ -148,7 +148,7 @@ private predicate typedInvokeLookup(ASTNode ref, ASTNode decl, string kind) {
 /**
  * Holds if `ref` is a JSDoc type annotation referring to a class defined at `decl`.
  */
-private predicate jsdocTypeLookup(JSDocNamedTypeExpr ref, ASTNode decl, string kind) {
+private predicate jsdocTypeLookup(JSDocNamedTypeExpr ref, AstNode decl, string kind) {
   decl = ref.getClass().getAstNode() and
   kind = "T"
 }
@@ -163,7 +163,7 @@ private predicate jsdocTypeLookup(JSDocNamedTypeExpr ref, ASTNode decl, string k
  *  - `"I"` for imports
  */
 cached
-ASTNode definitionOf(Locatable e, string kind) {
+AstNode definitionOf(Locatable e, string kind) {
   variableDefLookup(e, result, kind)
   or
   // prefer definitions over declarations
diff --git a/javascript/ql/src/localDefinitions.ql b/javascript/ql/src/localDefinitions.ql
index a3794b3cce6..289679d42ff 100644
--- a/javascript/ql/src/localDefinitions.ql
+++ b/javascript/ql/src/localDefinitions.ql
@@ -11,6 +11,6 @@ import definitions
 
 external string selectedSourceFile();
 
-from Locatable e, ASTNode def, string kind
+from Locatable e, AstNode def, string kind
 where def = definitionOf(e, kind) and e.getFile() = getFileBySourceArchiveName(selectedSourceFile())
 select e, def, kind
diff --git a/javascript/ql/src/localReferences.ql b/javascript/ql/src/localReferences.ql
index 796fc473356..e9dc4e4a954 100644
--- a/javascript/ql/src/localReferences.ql
+++ b/javascript/ql/src/localReferences.ql
@@ -11,7 +11,7 @@ import definitions
 
 external string selectedSourceFile();
 
-from Locatable e, ASTNode def, string kind
+from Locatable e, AstNode def, string kind
 where
   def = definitionOf(e, kind) and def.getFile() = getFileBySourceArchiveName(selectedSourceFile())
 select e, def, kind
diff --git a/javascript/ql/src/meta/Consistency.ql b/javascript/ql/src/meta/Consistency.ql
index 3e2ec0c412a..ae157f3897b 100644
--- a/javascript/ql/src/meta/Consistency.ql
+++ b/javascript/ql/src/meta/Consistency.ql
@@ -24,7 +24,7 @@ predicate exprWithoutEnclosingStmt(Expr e) {
   // Some expressions have non-expression parents that we want to skip over.
   exprWithoutEnclosingStmt(e.getParent().(Property).getObjectExpr()) or
   exprWithoutEnclosingStmt(e.getParent().(PropertyPattern).getObjectPattern()) or
-  exprWithoutEnclosingStmt(e.getParent().(JSXAttribute).getElement())
+  exprWithoutEnclosingStmt(e.getParent().(JsxAttribute).getElement())
 }
 
 /**
@@ -65,7 +65,7 @@ predicate ast_consistency(string clsname, string problem, string what) {
     not exists(l.getLocation()) and problem = "no location" and what = l.toString()
   )
   or
-  exists(ASTNode nd | clsname = nd.getAQlClass() |
+  exists(AstNode nd | clsname = nd.getAQlClass() |
     uniqueness_error(count(nd.getTopLevel()), "getTopLevel", problem) and
     what = "at " + nd.getLocation()
   )
@@ -120,7 +120,7 @@ predicate location_consistency(string clsname, string problem, string what) {
 /**
  * Holds if function or toplevel `sc` is expected to have an associated control flow graph.
  */
-predicate hasCFG(StmtContainer sc) { not exists(Error err | err.getFile() = sc.getFile()) }
+predicate hasCfg(StmtContainer sc) { not exists(Error err | err.getFile() = sc.getFile()) }
 
 /**
  * Holds if a contract involving the CFG structure is violated, where `clsname`
@@ -128,7 +128,7 @@ predicate hasCFG(StmtContainer sc) { not exists(Error err | err.getFile() = sc.g
  * the violation, and `what` gives location information.
  */
 predicate cfg_consistency(string clsname, string problem, string what) {
-  exists(StmtContainer cont | clsname = cont.getAQlClass() and hasCFG(cont) |
+  exists(StmtContainer cont | clsname = cont.getAQlClass() and hasCfg(cont) |
     uniqueness_error(count(cont.getEntry()), "getEntry", problem) and
     what = "at " + cont.getLocation()
     or
@@ -136,7 +136,7 @@ predicate cfg_consistency(string clsname, string problem, string what) {
     what = "at " + cont.getLocation()
   )
   or
-  exists(ASTNode nd | clsname = nd.getAQlClass() and hasCFG(nd.getTopLevel()) |
+  exists(AstNode nd | clsname = nd.getAQlClass() and hasCfg(nd.getTopLevel()) |
     uniqueness_error(count(nd.getFirstControlFlowNode()), "getFirstControlFlowNode", problem) and
     what = "at " + nd.getLocation()
   )
diff --git a/javascript/ql/test/library-tests/ES20xxFeatures/ES20xxFeatures.ql b/javascript/ql/test/library-tests/ES20xxFeatures/ES20xxFeatures.ql
index b004501c617..4401e852644 100644
--- a/javascript/ql/test/library-tests/ES20xxFeatures/ES20xxFeatures.ql
+++ b/javascript/ql/test/library-tests/ES20xxFeatures/ES20xxFeatures.ql
@@ -1,5 +1,5 @@
 import Metrics.ES20xxFeatures
 
-from ASTNode nd, int version, string category
+from AstNode nd, int version, string category
 where isES20xxFeature(nd, version, category)
 select nd, version, category
diff --git a/javascript/ql/test/library-tests/Expr/getParent.qll b/javascript/ql/test/library-tests/Expr/getParent.qll
index c37c9db3917..c0866fae586 100644
--- a/javascript/ql/test/library-tests/Expr/getParent.qll
+++ b/javascript/ql/test/library-tests/Expr/getParent.qll
@@ -1,3 +1,3 @@
 import javascript
 
-query predicate test_getParent(Expr e, ASTNode res) { res = e.getParent() }
+query predicate test_getParent(Expr e, AstNode res) { res = e.getParent() }
diff --git a/javascript/ql/test/library-tests/Externs/tests.ql b/javascript/ql/test/library-tests/Externs/tests.ql
index 6b722a8232c..7f95dcf42b8 100644
--- a/javascript/ql/test/library-tests/Externs/tests.ql
+++ b/javascript/ql/test/library-tests/Externs/tests.ql
@@ -10,7 +10,7 @@ query predicate externalDecl(ExternalDecl decl) { any() }
 
 query predicate externalTypedef(ExternalTypedef typ) { any() }
 
-query predicate externalVarDecl_getInit(ExternalVarDecl decl, ASTNode init) {
+query predicate externalVarDecl_getInit(ExternalVarDecl decl, AstNode init) {
   decl.getInit() = init
 }
 
diff --git a/javascript/ql/test/library-tests/JSON/JSONError.ql b/javascript/ql/test/library-tests/JSON/JSONError.ql
index d67bfa15856..21be6e1d536 100644
--- a/javascript/ql/test/library-tests/JSON/JSONError.ql
+++ b/javascript/ql/test/library-tests/JSON/JSONError.ql
@@ -1,4 +1,4 @@
 import semmle.javascript.JSON
 
-from JSONParseError jpe
+from JsonParseError jpe
 select jpe
diff --git a/javascript/ql/test/library-tests/JSON/JSONObject.ql b/javascript/ql/test/library-tests/JSON/JSONObject.ql
index 941e96b9d47..383ad19e414 100644
--- a/javascript/ql/test/library-tests/JSON/JSONObject.ql
+++ b/javascript/ql/test/library-tests/JSON/JSONObject.ql
@@ -1,6 +1,6 @@
 import semmle.javascript.JSON
 
-from JSONObject obj, string prop, JSONValue val, string strval
+from JsonObject obj, string prop, JsonValue val, string strval
 where
   val = obj.getPropValue(prop) and
   (
diff --git a/javascript/ql/test/library-tests/JSON/JSONValue.ql b/javascript/ql/test/library-tests/JSON/JSONValue.ql
index 9ea6bcd26e1..91ba2a14f27 100644
--- a/javascript/ql/test/library-tests/JSON/JSONValue.ql
+++ b/javascript/ql/test/library-tests/JSON/JSONValue.ql
@@ -1,4 +1,4 @@
 import semmle.javascript.JSON
 
-from JSONValue v
+from JsonValue v
 select v
diff --git a/javascript/ql/test/library-tests/JSX/tests.ql b/javascript/ql/test/library-tests/JSX/tests.ql
index 2e36c72e2fc..279b9c7c88e 100644
--- a/javascript/ql/test/library-tests/JSX/tests.ql
+++ b/javascript/ql/test/library-tests/JSX/tests.ql
@@ -1,22 +1,22 @@
 import javascript
 
-query predicate htmlElements(JSXElement e) { e.getNameExpr() instanceof Label }
+query predicate htmlElements(JsxElement e) { e.getNameExpr() instanceof Label }
 
-query predicate jsxElementAttribute(JSXElement elt, int i, JSXAttribute attr) {
+query predicate jsxElementAttribute(JsxElement elt, int i, JsxAttribute attr) {
   attr = elt.getAttribute(i)
 }
 
-query predicate jsxElementAttributeName(JSXElement elt, int i, string name) {
+query predicate jsxElementAttributeName(JsxElement elt, int i, string name) {
   name = elt.getAttribute(i).getName()
 }
 
-query predicate jsxElementBody(JSXElement elt, int i, Expr body) { elt.getBodyElement(i) = body }
+query predicate jsxElementBody(JsxElement elt, int i, Expr body) { elt.getBodyElement(i) = body }
 
-query predicate jsxElementName(JSXElement elt, JSXName nameExpr, string name) {
+query predicate jsxElementName(JsxElement elt, JsxName nameExpr, string name) {
   elt.getNameExpr() = nameExpr and
   name = elt.getName()
 }
 
-query predicate jsxFragments(JSXFragment fragment, int i, Expr body) {
+query predicate jsxFragments(JsxFragment fragment, int i, Expr body) {
   fragment.getBodyElement(i) = body
 }
diff --git a/javascript/ql/test/library-tests/MalformedPackageJson/Test.ql b/javascript/ql/test/library-tests/MalformedPackageJson/Test.ql
index 3f0d3eb4607..8baff66c6b8 100644
--- a/javascript/ql/test/library-tests/MalformedPackageJson/Test.ql
+++ b/javascript/ql/test/library-tests/MalformedPackageJson/Test.ql
@@ -2,4 +2,4 @@ import javascript
 
 query File files() { any() }
 
-query PackageJSON packageJsons() { any() }
+query PackageJson packageJsons() { any() }
diff --git a/javascript/ql/test/library-tests/NPM/tests.ql b/javascript/ql/test/library-tests/NPM/tests.ql
index 52714084a81..2f92f9b41b0 100644
--- a/javascript/ql/test/library-tests/NPM/tests.ql
+++ b/javascript/ql/test/library-tests/NPM/tests.ql
@@ -1,7 +1,7 @@
 import javascript
 import semmle.javascript.dependencies.Dependencies
 
-query predicate dependencies(PackageJSON pkgjson, string pkg, string version) {
+query predicate dependencies(PackageJson pkgjson, string pkg, string version) {
   pkgjson.declaresDependency(pkg, version)
 }
 
@@ -9,22 +9,22 @@ query predicate importedFile(Require r, File f) { f = r.getImportedFile() }
 
 query predicate importedModule(Require r, Module m) { m = r.getImportedModule() }
 
-query predicate modules(NPMPackage pkg, string name, Module mod) {
+query predicate modules(NpmPackage pkg, string name, Module mod) {
   name = pkg.getPackageName() and
   mod = pkg.getAModule()
 }
 
-query predicate npm(PackageJSON pkg, string name, string version) {
+query predicate npm(PackageJson pkg, string name, string version) {
   name = pkg.getPackageName() and
   version = pkg.getVersion()
 }
 
-query predicate getMainModule(PackageJSON pkg, string name, Module mod) {
+query predicate getMainModule(PackageJson pkg, string name, Module mod) {
   name = pkg.getPackageName() and
   mod = pkg.getMainModule()
 }
 
-query predicate packageJSON(PackageJSON json) { any() }
+query predicate packageJson(PackageJson json) { any() }
 
 query predicate dependencyInfo(Dependency dep, string name, string version) {
   dep.info(name, version)
diff --git a/javascript/ql/test/library-tests/SourceMaps/SourceMaps.ql b/javascript/ql/test/library-tests/SourceMaps/SourceMaps.ql
index 4b98650d123..177bb4cd6f4 100644
--- a/javascript/ql/test/library-tests/SourceMaps/SourceMaps.ql
+++ b/javascript/ql/test/library-tests/SourceMaps/SourceMaps.ql
@@ -1,4 +1,4 @@
 import semmle.javascript.SourceMaps
 
 from SourceMappingComment smc
-select smc, smc.getSourceMappingURL()
+select smc, smc.getSourceMappingUrl()
diff --git a/javascript/ql/test/library-tests/TypeScript/CallSignatures/test.ql b/javascript/ql/test/library-tests/TypeScript/CallSignatures/test.ql
index e1254629fe1..c1ba57d2746 100644
--- a/javascript/ql/test/library-tests/TypeScript/CallSignatures/test.ql
+++ b/javascript/ql/test/library-tests/TypeScript/CallSignatures/test.ql
@@ -1,7 +1,7 @@
 import javascript
 
 query predicate test_CallSignature(
-  CallSignature call, string declType, ASTNode body, string abstractness
+  CallSignature call, string declType, AstNode body, string abstractness
 ) {
   (if call.isAbstract() then abstractness = "abstract" else abstractness = "not abstract") and
   declType = call.getDeclaringType().describe() and
@@ -9,7 +9,7 @@ query predicate test_CallSignature(
 }
 
 query predicate test_IndexSignature(
-  IndexSignature sig, string declType, ASTNode body, string abstractness
+  IndexSignature sig, string declType, AstNode body, string abstractness
 ) {
   (if sig.isAbstract() then abstractness = "abstract" else abstractness = "not abstract") and
   declType = sig.getDeclaringType().describe() and
diff --git a/javascript/ql/test/library-tests/TypeScript/ImportOutDir/tests.ql b/javascript/ql/test/library-tests/TypeScript/ImportOutDir/tests.ql
index 450989f717b..69fcca56921 100644
--- a/javascript/ql/test/library-tests/TypeScript/ImportOutDir/tests.ql
+++ b/javascript/ql/test/library-tests/TypeScript/ImportOutDir/tests.ql
@@ -6,4 +6,4 @@ query predicate resolveableImport(Import imp, Module mod) {
   not mod.getTopLevel().isExterns()
 }
 
-query Module getMain(PackageJSON json) { result = json.getMainModule() }
+query Module getMain(PackageJson json) { result = json.getMainModule() }
diff --git a/javascript/ql/test/library-tests/TypeScript/LocalTypeResolution/tests.ql b/javascript/ql/test/library-tests/TypeScript/LocalTypeResolution/tests.ql
index 10654d285fd..43ad92c405f 100644
--- a/javascript/ql/test/library-tests/TypeScript/LocalTypeResolution/tests.ql
+++ b/javascript/ql/test/library-tests/TypeScript/LocalTypeResolution/tests.ql
@@ -1,6 +1,6 @@
 import javascript
 
-abstract class Violation extends ASTNode {
+abstract class Violation extends AstNode {
   abstract string reason();
 }
 
diff --git a/javascript/ql/test/library-tests/TypeScript/PathMapping/Imports.ql b/javascript/ql/test/library-tests/TypeScript/PathMapping/Imports.ql
index a271f821ac4..8f93f6f3734 100644
--- a/javascript/ql/test/library-tests/TypeScript/PathMapping/Imports.ql
+++ b/javascript/ql/test/library-tests/TypeScript/PathMapping/Imports.ql
@@ -1,6 +1,6 @@
 import javascript
 
-query predicate symbols(ASTNode astNode, CanonicalName symbol) { ast_node_symbol(astNode, symbol) }
+query predicate symbols(AstNode astNode, CanonicalName symbol) { ast_node_symbol(astNode, symbol) }
 
 from Import imprt
 select imprt, imprt.getImportedModule()
diff --git a/javascript/ql/test/library-tests/TypeScript/TypeAnnotations/ChildIndex.qll b/javascript/ql/test/library-tests/TypeScript/TypeAnnotations/ChildIndex.qll
index 76f83803ea3..947c0e935f4 100644
--- a/javascript/ql/test/library-tests/TypeScript/TypeAnnotations/ChildIndex.qll
+++ b/javascript/ql/test/library-tests/TypeScript/TypeAnnotations/ChildIndex.qll
@@ -1,7 +1,7 @@
 import javascript
 
-query predicate test_ChildIndex(ASTNode node, string res) {
-  exists(ASTNode child1, ASTNode child2, int index |
+query predicate test_ChildIndex(AstNode node, string res) {
+  exists(AstNode child1, AstNode child2, int index |
     node.getChild(index) = child1 and node.getChild(index) = child2 and child1 != child2
   |
     res = "There are two different children at index " + index.toString()
diff --git a/javascript/ql/test/library-tests/TypeScript/TypeAnnotations/Containers.qll b/javascript/ql/test/library-tests/TypeScript/TypeAnnotations/Containers.qll
index dcdc8b2ae6a..04abab0fcf3 100644
--- a/javascript/ql/test/library-tests/TypeScript/TypeAnnotations/Containers.qll
+++ b/javascript/ql/test/library-tests/TypeScript/TypeAnnotations/Containers.qll
@@ -1,6 +1,6 @@
 import javascript
 
-abstract class Violation extends ASTNode {
+abstract class Violation extends AstNode {
   abstract string reason();
 }
 
diff --git a/javascript/ql/test/library-tests/frameworks/ReactJS/ReactName.qll b/javascript/ql/test/library-tests/frameworks/ReactJS/ReactName.qll
index a5e8d0dc7a9..940332693a7 100644
--- a/javascript/ql/test/library-tests/frameworks/ReactJS/ReactName.qll
+++ b/javascript/ql/test/library-tests/frameworks/ReactJS/ReactName.qll
@@ -1,17 +1,20 @@
 import semmle.javascript.frameworks.React
 
-query predicate test_JSXname(JSXElement element, JSXName jsxname, string name, string type) {
+query predicate test_JSXname(JsxElement element, JsxName jsxname, string name, string type) {
   name = jsxname.getValue() and
   (
     jsxname instanceof Identifier and type = "Identifier"
     or
     jsxname instanceof ThisExpr and type = "thisExpr"
     or
-    jsxname.(DotExpr).getBase() instanceof JSXName and type = "dot"
+    jsxname.(DotExpr).getBase() instanceof JsxName and type = "dot"
     or
-    jsxname instanceof JSXQualifiedName and type = "qualifiedName"
+    jsxname instanceof JsxQualifiedName and type = "qualifiedName"
   ) and
   element.getNameExpr() = jsxname
 }
 
-query ThisExpr test_JSXName_this(JSXElement element) { result.getParentExpr+() = element }
+query ThisExpr test_JsxName_this(JsxElement element) { result.getParentExpr+() = element }
+
+/** DEPRECATED: Alias for test_JsxName_this */
+deprecated ThisExpr test_JSXName_this(JSXElement element) { result = test_JsxName_this(element) }
diff --git a/javascript/ql/test/tutorials/Introducing the JavaScript libraries/query19.qll b/javascript/ql/test/tutorials/Introducing the JavaScript libraries/query19.qll
index 6412643f11a..46ec0fe8f31 100644
--- a/javascript/ql/test/tutorials/Introducing the JavaScript libraries/query19.qll	
+++ b/javascript/ql/test/tutorials/Introducing the JavaScript libraries/query19.qll	
@@ -1,8 +1,8 @@
 import javascript
 
 query predicate test_query19(PackageDependencies deps, string res) {
-  exists(NPMPackage pkg, string name |
-    deps = pkg.getPackageJSON().getDependencies() and
+  exists(NpmPackage pkg, string name |
+    deps = pkg.getPackageJson().getDependencies() and
     deps.getADependency(name, _) and
     not exists(Require req | req.getTopLevel() = pkg.getAModule() |
       name = req.getImportedPath().getValue()
diff --git a/javascript/ql/test/tutorials/Validating RAML-based APIs/MissingResponseSpecification.ql b/javascript/ql/test/tutorials/Validating RAML-based APIs/MissingResponseSpecification.ql
index 044814978f4..a03ff0e4257 100644
--- a/javascript/ql/test/tutorials/Validating RAML-based APIs/MissingResponseSpecification.ql	
+++ b/javascript/ql/test/tutorials/Validating RAML-based APIs/MissingResponseSpecification.ql	
@@ -9,17 +9,17 @@ import javascript
 import Osprey
 import RAML
 
-RAMLMethod getSpecification(OspreyMethod om) {
-  exists(RAMLResource rr, File f, string rPath |
+RamlMethod getSpecification(OspreyMethod om) {
+  exists(RamlResource rr, File f, string rPath |
     rr.getLocation().getFile() = f and
-    f = om.getDefinition().getAPI().getSpecFile() and
+    f = om.getDefinition().getApi().getSpecFile() and
     rPath = om.getResourcePath() and
     rr.getPath() = rPath.regexpReplaceAll("/:([^/]+)/", "/{$1}/") and
     result = rr.getMethod(om.getVerb())
   )
 }
 
-from MethodResponseSetStatus mrss, RAMLMethod rm
+from MethodResponseSetStatus mrss, RamlMethod rm
 where
   rm = getSpecification(mrss.getMethod()) and
   not exists(rm.getResponse(mrss.getStatusCode()))
diff --git a/javascript/ql/test/tutorials/Validating RAML-based APIs/Osprey.qll b/javascript/ql/test/tutorials/Validating RAML-based APIs/Osprey.qll
index 4140260a1d8..d7c7df8e1fd 100644
--- a/javascript/ql/test/tutorials/Validating RAML-based APIs/Osprey.qll	
+++ b/javascript/ql/test/tutorials/Validating RAML-based APIs/Osprey.qll	
@@ -13,8 +13,8 @@ class Osprey extends Variable {
 }
 
 /** A call to `osprey.create`. */
-class OspreyCreateAPICall extends MethodCallExpr {
-  OspreyCreateAPICall() {
+class OspreyCreateApiCall extends MethodCallExpr {
+  OspreyCreateApiCall() {
     getReceiver().(VarAccess).getVariable() instanceof Osprey and
     getMethodName() = "create"
   }
@@ -29,22 +29,31 @@ class OspreyCreateAPICall extends MethodCallExpr {
   }
 }
 
-/** A variable in which an Osprey API object is stored. */
-class OspreyAPI extends Variable {
-  OspreyAPI() { getAnAssignedExpr() instanceof OspreyCreateAPICall }
+/** DEPRECATED: Alias for OspreyCreateApiCall */
+deprecated class OspreyCreateAPICall = OspreyCreateApiCall;
 
-  File getSpecFile() { result = getAnAssignedExpr().(OspreyCreateAPICall).getSpecFile() }
+/** A variable in which an Osprey API object is stored. */
+class OspreyApi extends Variable {
+  OspreyApi() { getAnAssignedExpr() instanceof OspreyCreateApiCall }
+
+  File getSpecFile() { result = getAnAssignedExpr().(OspreyCreateApiCall).getSpecFile() }
 }
 
+/** DEPRECATED: Alias for OspreyApi */
+deprecated class OspreyAPI = OspreyApi;
+
 /** An Osprey REST method definition. */
 class OspreyMethodDefinition extends MethodCallExpr {
   OspreyMethodDefinition() {
-    exists(OspreyAPI api | getReceiver() = api.getAnAccess()) and
+    exists(OspreyApi api | getReceiver() = api.getAnAccess()) and
     getMethodName() = httpVerb()
   }
 
   /** Get the API to which this method belongs. */
-  OspreyAPI getAPI() { getReceiver() = result.getAnAccess() }
+  OspreyApi getApi() { getReceiver() = result.getAnAccess() }
+
+  /** DEPRECATED: Alias for getApi */
+  deprecated OspreyAPI getAPI() { result = getApi() }
 
   /** Get the verb which this method implements. */
   string getVerb() { result = getMethodName() }
diff --git a/javascript/ql/test/tutorials/Validating RAML-based APIs/RAML.qll b/javascript/ql/test/tutorials/Validating RAML-based APIs/RAML.qll
index 01c33f19e1d..1156ea4c398 100644
--- a/javascript/ql/test/tutorials/Validating RAML-based APIs/RAML.qll	
+++ b/javascript/ql/test/tutorials/Validating RAML-based APIs/RAML.qll	
@@ -3,14 +3,17 @@ import javascript
 import HTTP
 
 /** A RAML specification. */
-class RAMLSpec extends YAMLDocument, YAMLMapping {
-  RAMLSpec() { getLocation().getFile().getExtension() = "raml" }
+class RamlSpec extends YAMLDocument, YAMLMapping {
+  RamlSpec() { getLocation().getFile().getExtension() = "raml" }
 }
 
+/** DEPRECATED: Alias for RamlSpec */
+deprecated class RAMLSpec = RamlSpec;
+
 /** A RAML resource specification. */
-class RAMLResource extends YAMLMapping {
-  RAMLResource() {
-    getDocument() instanceof RAMLSpec and
+class RamlResource extends YAMLMapping {
+  RamlResource() {
+    getDocument() instanceof RamlSpec and
     exists(YAMLMapping m, string name |
       this = m.lookup(name) and
       name.matches("/%")
@@ -19,25 +22,28 @@ class RAMLResource extends YAMLMapping {
 
   /** Get the path of this resource relative to the API root. */
   string getPath() {
-    exists(RAMLSpec spec | this = spec.lookup(result))
+    exists(RamlSpec spec | this = spec.lookup(result))
     or
-    exists(RAMLResource that, string p |
+    exists(RamlResource that, string p |
       this = that.lookup(p) and
       result = that.getPath() + p
     )
   }
 
   /** Get the method for this resource with the given verb. */
-  RAMLMethod getMethod(string verb) {
+  RamlMethod getMethod(string verb) {
     verb = httpVerb() and
     result = lookup(verb)
   }
 }
 
+/** DEPRECATED: Alias for RamlResource */
+deprecated class RAMLResource = RamlResource;
+
 /** A RAML method specification. */
-class RAMLMethod extends YAMLValue {
-  RAMLMethod() {
-    getDocument() instanceof RAMLSpec and
+class RamlMethod extends YAMLValue {
+  RamlMethod() {
+    getDocument() instanceof RamlSpec and
     exists(YAMLMapping obj | this = obj.lookup(httpVerb()))
   }
 
@@ -50,3 +56,6 @@ class RAMLMethod extends YAMLValue {
     )
   }
 }
+
+/** DEPRECATED: Alias for RamlMethod */
+deprecated class RAMLMethod = RamlMethod;
diff --git a/javascript/ql/test/tutorials/Validating RAML-based APIs/query1.ql b/javascript/ql/test/tutorials/Validating RAML-based APIs/query1.ql
index 00294fe3ea6..a20fd7f18f1 100644
--- a/javascript/ql/test/tutorials/Validating RAML-based APIs/query1.ql	
+++ b/javascript/ql/test/tutorials/Validating RAML-based APIs/query1.ql	
@@ -1,9 +1,9 @@
 import javascript
 
 /** A RAML specification. */
-class RAMLSpec extends YAMLDocument, YAMLMapping {
-  RAMLSpec() { getLocation().getFile().getExtension() = "raml" }
+class RamlSpec extends YAMLDocument, YAMLMapping {
+  RamlSpec() { getLocation().getFile().getExtension() = "raml" }
 }
 
-from RAMLSpec s
+from RamlSpec s
 select s
diff --git a/javascript/ql/test/tutorials/Validating RAML-based APIs/query2.ql b/javascript/ql/test/tutorials/Validating RAML-based APIs/query2.ql
index 5e5acba3d3e..e0230cbfdb0 100644
--- a/javascript/ql/test/tutorials/Validating RAML-based APIs/query2.ql	
+++ b/javascript/ql/test/tutorials/Validating RAML-based APIs/query2.ql	
@@ -3,14 +3,14 @@ import javascript
 string httpVerb() { result = ["get", "put", "post", "delete"] }
 
 /** A RAML specification. */
-class RAMLSpec extends YAMLDocument, YAMLMapping {
-  RAMLSpec() { getLocation().getFile().getExtension() = "raml" }
+class RamlSpec extends YAMLDocument, YAMLMapping {
+  RamlSpec() { getLocation().getFile().getExtension() = "raml" }
 }
 
 /** A RAML resource specification. */
-class RAMLResource extends YAMLMapping {
-  RAMLResource() {
-    getDocument() instanceof RAMLSpec and
+class RamlResource extends YAMLMapping {
+  RamlResource() {
+    getDocument() instanceof RamlSpec and
     exists(YAMLMapping m, string name |
       this = m.lookup(name) and
       name.matches("/%")
@@ -19,25 +19,25 @@ class RAMLResource extends YAMLMapping {
 
   /** Get the path of this resource relative to the API root. */
   string getPath() {
-    exists(RAMLSpec spec | this = spec.lookup(result))
+    exists(RamlSpec spec | this = spec.lookup(result))
     or
-    exists(RAMLResource that, string p |
+    exists(RamlResource that, string p |
       this = that.lookup(p) and
       result = that.getPath() + p
     )
   }
 
   /** Get the method for this resource with the given verb. */
-  RAMLMethod getMethod(string verb) {
+  RamlMethod getMethod(string verb) {
     verb = httpVerb() and
     result = lookup(verb)
   }
 }
 
 /** A RAML method specification. */
-class RAMLMethod extends YAMLValue {
-  RAMLMethod() {
-    getDocument() instanceof RAMLSpec and
+class RamlMethod extends YAMLValue {
+  RamlMethod() {
+    getDocument() instanceof RamlSpec and
     exists(YAMLMapping obj | this = obj.lookup(httpVerb()))
   }
 
@@ -51,5 +51,5 @@ class RAMLMethod extends YAMLValue {
   }
 }
 
-from RAMLResource rr
+from RamlResource rr
 select rr, rr.getPath()
diff --git a/javascript/ql/test/tutorials/Validating RAML-based APIs/query3.ql b/javascript/ql/test/tutorials/Validating RAML-based APIs/query3.ql
index a503976c388..60ee68a8369 100644
--- a/javascript/ql/test/tutorials/Validating RAML-based APIs/query3.ql	
+++ b/javascript/ql/test/tutorials/Validating RAML-based APIs/query3.ql	
@@ -3,14 +3,14 @@ import javascript
 string httpVerb() { result = ["get", "put", "post", "delete"] }
 
 /** A RAML specification. */
-class RAMLSpec extends YAMLDocument, YAMLMapping {
-  RAMLSpec() { getLocation().getFile().getExtension() = "raml" }
+class RamlSpec extends YAMLDocument, YAMLMapping {
+  RamlSpec() { getLocation().getFile().getExtension() = "raml" }
 }
 
 /** A RAML resource specification. */
-class RAMLResource extends YAMLMapping {
-  RAMLResource() {
-    getDocument() instanceof RAMLSpec and
+class RamlResource extends YAMLMapping {
+  RamlResource() {
+    getDocument() instanceof RamlSpec and
     exists(YAMLMapping m, string name |
       this = m.lookup(name) and
       name.matches("/%")
@@ -19,24 +19,24 @@ class RAMLResource extends YAMLMapping {
 
   /** Get the path of this resource relative to the API root. */
   string getPath() {
-    exists(RAMLSpec spec | this = spec.lookup(result))
+    exists(RamlSpec spec | this = spec.lookup(result))
     or
-    exists(RAMLResource that, string p |
+    exists(RamlResource that, string p |
       this = that.lookup(p) and
       result = that.getPath() + p
     )
   }
 
   /** Get the method for this resource with the given verb. */
-  RAMLMethod getMethod(string verb) {
+  RamlMethod getMethod(string verb) {
     verb = httpVerb() and
     result = lookup(verb)
   }
 }
 
-class RAMLMethod extends YAMLValue {
-  RAMLMethod() {
-    getDocument() instanceof RAMLSpec and
+class RamlMethod extends YAMLValue {
+  RamlMethod() {
+    getDocument() instanceof RamlSpec and
     exists(YAMLMapping obj | this = obj.lookup(httpVerb()))
   }
 }
diff --git a/javascript/ql/test/tutorials/Validating RAML-based APIs/query4.ql b/javascript/ql/test/tutorials/Validating RAML-based APIs/query4.ql
index 1bbd4b07622..0cabb0adb25 100644
--- a/javascript/ql/test/tutorials/Validating RAML-based APIs/query4.ql	
+++ b/javascript/ql/test/tutorials/Validating RAML-based APIs/query4.ql	
@@ -3,14 +3,14 @@ import javascript
 string httpVerb() { result = ["get", "put", "post", "delete"] }
 
 /** A RAML specification. */
-class RAMLSpec extends YAMLDocument, YAMLMapping {
-  RAMLSpec() { getLocation().getFile().getExtension() = "raml" }
+class RamlSpec extends YAMLDocument, YAMLMapping {
+  RamlSpec() { getLocation().getFile().getExtension() = "raml" }
 }
 
 /** A RAML resource specification. */
-class RAMLResource extends YAMLMapping {
-  RAMLResource() {
-    getDocument() instanceof RAMLSpec and
+class RamlResource extends YAMLMapping {
+  RamlResource() {
+    getDocument() instanceof RamlSpec and
     exists(YAMLMapping m, string name |
       this = m.lookup(name) and
       name.matches("/%")
@@ -19,25 +19,25 @@ class RAMLResource extends YAMLMapping {
 
   /** Get the path of this resource relative to the API root. */
   string getPath() {
-    exists(RAMLSpec spec | this = spec.lookup(result))
+    exists(RamlSpec spec | this = spec.lookup(result))
     or
-    exists(RAMLResource that, string p |
+    exists(RamlResource that, string p |
       this = that.lookup(p) and
       result = that.getPath() + p
     )
   }
 
   /** Get the method for this resource with the given verb. */
-  RAMLMethod getMethod(string verb) {
+  RamlMethod getMethod(string verb) {
     verb = httpVerb() and
     result = lookup(verb)
   }
 }
 
 /** A RAML method specification. */
-class RAMLMethod extends YAMLValue {
-  RAMLMethod() {
-    getDocument() instanceof RAMLSpec and
+class RamlMethod extends YAMLValue {
+  RamlMethod() {
+    getDocument() instanceof RamlSpec and
     exists(YAMLMapping obj | this = obj.lookup(httpVerb()))
   }
 
@@ -51,5 +51,5 @@ class RAMLMethod extends YAMLValue {
   }
 }
 
-from RAMLMethod m
+from RamlMethod m
 select m
diff --git a/python/ql/lib/semmle/python/frameworks/Django.qll b/python/ql/lib/semmle/python/frameworks/Django.qll
index bc16e4ed431..1a76ea0a2b5 100644
--- a/python/ql/lib/semmle/python/frameworks/Django.qll
+++ b/python/ql/lib/semmle/python/frameworks/Django.qll
@@ -610,8 +610,8 @@ module PrivateDjango {
 
         /** Provides models for the `django.db.models.expressions` module. */
         module expressions {
-          /** Provides models for the `django.db.models.expressions.RawSQL` class. */
-          module RawSQL {
+          /** Provides models for the `django.db.models.expressions.RawSql` class. */
+          module RawSql {
             /**
              * Gets an reference to the `django.db.models.expressions.RawSQL` class.
              */
@@ -644,6 +644,9 @@ module PrivateDjango {
               instance(DataFlow::TypeTracker::end(), sql).flowsTo(result)
             }
           }
+
+          /** DEPRECATED: Alias for RawSql */
+          deprecated module RawSQL = RawSql;
         }
       }
     }
@@ -660,7 +663,7 @@ module PrivateDjango {
 
       ObjectsAnnotate() {
         this = django::db::models::querySetReturningMethod("annotate").getACall() and
-        django::db::models::expressions::RawSQL::instance(sql) in [
+        django::db::models::expressions::RawSql::instance(sql) in [
             this.getArg(_), this.getArgByName(_)
           ]
       }
@@ -678,7 +681,7 @@ module PrivateDjango {
 
       ObjectsAlias() {
         this = django::db::models::querySetReturningMethod("alias").getACall() and
-        django::db::models::expressions::RawSQL::instance(sql) in [
+        django::db::models::expressions::RawSql::instance(sql) in [
             this.getArg(_), this.getArgByName(_)
           ]
       }
diff --git a/python/ql/lib/semmle/python/frameworks/FastApi.qll b/python/ql/lib/semmle/python/frameworks/FastApi.qll
index d8e0f1f0883..1c48562eb70 100644
--- a/python/ql/lib/semmle/python/frameworks/FastApi.qll
+++ b/python/ql/lib/semmle/python/frameworks/FastApi.qll
@@ -30,13 +30,16 @@ private module FastApi {
    *
    * See https://fastapi.tiangolo.com/tutorial/bigger-applications/.
    */
-  module APIRouter {
-    /** Gets a reference to an instance of `fastapi.APIRouter`. */
+  module ApiRouter {
+    /** Gets a reference to an instance of `fastapi.ApiRouter`. */
     API::Node instance() {
       result = API::moduleImport("fastapi").getMember("APIRouter").getASubclass*().getReturn()
     }
   }
 
+  /** DEPRECATED: Alias for ApiRouter */
+  deprecated module APIRouter = ApiRouter;
+
   // ---------------------------------------------------------------------------
   // routing modeling
   // ---------------------------------------------------------------------------
@@ -54,7 +57,7 @@ private module FastApi {
       |
         this = App::instance().getMember(routeAddingMethod).getACall()
         or
-        this = APIRouter::instance().getMember(routeAddingMethod).getACall()
+        this = ApiRouter::instance().getMember(routeAddingMethod).getACall()
       )
     }
 
diff --git a/python/ql/lib/semmle/python/frameworks/PyMySQL.qll b/python/ql/lib/semmle/python/frameworks/PyMySQL.qll
index 01c2e4db3fc..0dfc5a92f38 100644
--- a/python/ql/lib/semmle/python/frameworks/PyMySQL.qll
+++ b/python/ql/lib/semmle/python/frameworks/PyMySQL.qll
@@ -14,7 +14,7 @@ private import semmle.python.frameworks.PEP249
  * Provides models for the `PyMySQL` PyPI package.
  * See https://pypi.org/project/PyMySQL/
  */
-private module PyMySQL {
+private module PyMySql {
   /**
    * A model of PyMySQL as a module that implements PEP 249, providing ways to execute SQL statements
    * against a database.
diff --git a/python/ql/lib/semmle/python/frameworks/RestFramework.qll b/python/ql/lib/semmle/python/frameworks/RestFramework.qll
index a6373df7120..aa4e47cc6d6 100644
--- a/python/ql/lib/semmle/python/frameworks/RestFramework.qll
+++ b/python/ql/lib/semmle/python/frameworks/RestFramework.qll
@@ -329,8 +329,8 @@ private module RestFramework {
    *
    * See https://www.django-rest-framework.org/api-guide/exceptions/#api-reference
    */
-  module APIException {
-    /** A direct instantiation of `rest_framework.exceptions.APIException` or subclass. */
+  module ApiException {
+    /** A direct instantiation of `rest_framework.exceptions.ApiException` or subclass. */
     private class ClassInstantiation extends HTTP::Server::HttpResponse::Range,
       DataFlow::CallCfgNode {
       string className;
@@ -366,4 +366,7 @@ private module RestFramework {
       override string getMimetypeDefault() { none() }
     }
   }
+
+  /** DEPRECATED: Alias for ApiException */
+  deprecated module APIException = ApiException;
 }
diff --git a/python/ql/lib/semmle/python/frameworks/SqlAlchemy.qll b/python/ql/lib/semmle/python/frameworks/SqlAlchemy.qll
index f7fc3157837..c1712e7e7eb 100644
--- a/python/ql/lib/semmle/python/frameworks/SqlAlchemy.qll
+++ b/python/ql/lib/semmle/python/frameworks/SqlAlchemy.qll
@@ -137,7 +137,7 @@ module SqlAlchemy {
    *
    * See https://docs.sqlalchemy.org/en/14/core/connections.html#dbapi-connections.
    */
-  module DBAPIConnection {
+  module DBApiConnection {
     /**
      * A source of instances of DB-API Connections, extend this class to model new instances.
      *
@@ -149,8 +149,8 @@ module SqlAlchemy {
      */
     abstract class InstanceSource extends DataFlow::LocalSourceNode { }
 
-    private class DBAPIConnectionSources extends InstanceSource, PEP249::Connection::InstanceSource {
-      DBAPIConnectionSources() {
+    private class DBApiConnectionSources extends InstanceSource, PEP249::Connection::InstanceSource {
+      DBApiConnectionSources() {
         this.(DataFlow::MethodCallNode).calls(Engine::instance(), "raw_connection")
         or
         this.(DataFlow::AttrRead).accesses(Connection::instance(), "connection")
@@ -169,6 +169,9 @@ module SqlAlchemy {
     DataFlow::Node instance() { instance(DataFlow::TypeTracker::end()).flowsTo(result) }
   }
 
+  /** DEPRECATED: Alias for DBApiConnection */
+  deprecated module DBAPIConnection = DBApiConnection;
+
   /**
    * Provides models for the `sqlalchemy.orm.Session` class
    *
diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib.qll b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
index 1332e0349c4..23f60b76c1e 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib.qll
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
@@ -90,7 +90,7 @@ module Stdlib {
    * https://github.com/python/cpython/blob/64f54b7ccd49764b0304e076bfd79b5482988f53/Lib/http/client.py#L175
    * and https://docs.python.org/3.9/library/email.compat32-message.html#email.message.Message
    */
-  module HTTPMessage {
+  module HttpMessage {
     /**
      * A source of instances of `http.client.HTTPMessage`, extend this class to model new instances.
      *
@@ -102,7 +102,7 @@ module Stdlib {
      */
     abstract class InstanceSource extends DataFlow::LocalSourceNode { }
 
-    /** Gets a reference to an instance of `http.client.HTTPMessage`. */
+    /** Gets a reference to an instance of `http.client.HttpMessage`. */
     private DataFlow::TypeTrackingNode instance(DataFlow::TypeTracker t) {
       t.start() and
       result instanceof InstanceSource
@@ -110,7 +110,7 @@ module Stdlib {
       exists(DataFlow::TypeTracker t2 | result = instance(t2).track(t2, t))
     }
 
-    /** Gets a reference to an instance of `http.client.HTTPMessage`. */
+    /** Gets a reference to an instance of `http.client.HttpMessage`. */
     DataFlow::Node instance() { instance(DataFlow::TypeTracker::end()).flowsTo(result) }
 
     /**
@@ -129,6 +129,9 @@ module Stdlib {
     }
   }
 
+  /** DEPRECATED: Alias for HttpMessage */
+  deprecated module HTTPMessage = HttpMessage;
+
   /**
    * Provides models for the `http.cookies.Morsel` class
    *
@@ -1783,42 +1786,63 @@ private module StdlibPrivate {
   // ---------------------------------------------------------------------------
   // BaseHTTPServer (Python 2 only)
   // ---------------------------------------------------------------------------
-  /** Gets a reference to the `BaseHTTPServer` module. */
-  API::Node baseHTTPServer() { result = API::moduleImport("BaseHTTPServer") }
+  /** Gets a reference to the `BaseHttpServer` module. */
+  API::Node baseHttpServer() { result = API::moduleImport("BaseHTTPServer") }
 
-  /** Provides models for the `BaseHTTPServer` module. */
-  module BaseHTTPServer {
+  /** DEPRECATED: Alias for baseHttpServer */
+  deprecated API::Node baseHTTPServer() { result = baseHttpServer() }
+
+  /** Provides models for the `BaseHttpServer` module. */
+  module BaseHttpServer {
     /**
      * Provides models for the `BaseHTTPServer.BaseHTTPRequestHandler` class (Python 2 only).
      */
-    module BaseHTTPRequestHandler {
-      /** Gets a reference to the `BaseHTTPServer.BaseHTTPRequestHandler` class. */
-      API::Node classRef() { result = baseHTTPServer().getMember("BaseHTTPRequestHandler") }
+    module BaseHttpRequestHandler {
+      /** Gets a reference to the `BaseHttpServer.BaseHttpRequestHandler` class. */
+      API::Node classRef() { result = baseHttpServer().getMember("BaseHTTPRequestHandler") }
     }
+
+    /** DEPRECATED: Alias for BaseHttpRequestHandler */
+    deprecated module BaseHTTPRequestHandler = BaseHttpRequestHandler;
   }
 
+  /** DEPRECATED: Alias for BaseHttpServer */
+  deprecated module BaseHTTPServer = BaseHttpServer;
+
   // ---------------------------------------------------------------------------
   // SimpleHTTPServer (Python 2 only)
   // ---------------------------------------------------------------------------
-  /** Gets a reference to the `SimpleHTTPServer` module. */
-  API::Node simpleHTTPServer() { result = API::moduleImport("SimpleHTTPServer") }
+  /** Gets a reference to the `SimpleHttpServer` module. */
+  API::Node simpleHttpServer() { result = API::moduleImport("SimpleHTTPServer") }
 
-  /** Provides models for the `SimpleHTTPServer` module. */
-  module SimpleHTTPServer {
+  /** DEPRECATED: Alias for simpleHttpServer */
+  deprecated API::Node simpleHTTPServer() { result = simpleHttpServer() }
+
+  /** Provides models for the `SimpleHttpServer` module. */
+  module SimpleHttpServer {
     /**
      * Provides models for the `SimpleHTTPServer.SimpleHTTPRequestHandler` class (Python 2 only).
      */
-    module SimpleHTTPRequestHandler {
-      /** Gets a reference to the `SimpleHTTPServer.SimpleHTTPRequestHandler` class. */
-      API::Node classRef() { result = simpleHTTPServer().getMember("SimpleHTTPRequestHandler") }
+    module SimpleHttpRequestHandler {
+      /** Gets a reference to the `SimpleHttpServer.SimpleHttpRequestHandler` class. */
+      API::Node classRef() { result = simpleHttpServer().getMember("SimpleHTTPRequestHandler") }
     }
+
+    /** DEPRECATED: Alias for SimpleHttpRequestHandler */
+    deprecated module SimpleHTTPRequestHandler = SimpleHttpRequestHandler;
   }
 
+  /** DEPRECATED: Alias for SimpleHttpServer */
+  deprecated module SimpleHTTPServer = SimpleHttpServer;
+
   // ---------------------------------------------------------------------------
   // CGIHTTPServer (Python 2 only)
   // ---------------------------------------------------------------------------
   /** Gets a reference to the `CGIHTTPServer` module. */
-  API::Node cgiHTTPServer() { result = API::moduleImport("CGIHTTPServer") }
+  API::Node cgiHttpServer() { result = API::moduleImport("CGIHTTPServer") }
+
+  /** DEPRECATED: Alias for cgiHttpServer */
+  deprecated API::Node cgiHTTPServer() { result = cgiHttpServer() }
 
   /** Provides models for the `CGIHTTPServer` module. */
   module CGIHTTPServer {
@@ -1827,7 +1851,7 @@ private module StdlibPrivate {
      */
     module CGIHTTPRequestHandler {
       /** Gets a reference to the `CGIHTTPServer.CGIHTTPRequestHandler` class. */
-      API::Node classRef() { result = cgiHTTPServer().getMember("CGIHTTPRequestHandler") }
+      API::Node classRef() { result = cgiHttpServer().getMember("CGIHTTPRequestHandler") }
     }
   }
 
@@ -1852,21 +1876,27 @@ private module StdlibPrivate {
        *
        * See https://docs.python.org/3.9/library/http.server.html#http.server.BaseHTTPRequestHandler.
        */
-      module BaseHTTPRequestHandler {
-        /** Gets a reference to the `http.server.BaseHTTPRequestHandler` class. */
+      module BaseHttpRequestHandler {
+        /** Gets a reference to the `http.server.BaseHttpRequestHandler` class. */
         API::Node classRef() { result = server().getMember("BaseHTTPRequestHandler") }
       }
 
+      /** DEPRECATED: Alias for BaseHttpRequestHandler */
+      deprecated module BaseHTTPRequestHandler = BaseHttpRequestHandler;
+
       /**
        * Provides models for the `http.server.SimpleHTTPRequestHandler` class (Python 3 only).
        *
        * See https://docs.python.org/3.9/library/http.server.html#http.server.SimpleHTTPRequestHandler.
        */
-      module SimpleHTTPRequestHandler {
-        /** Gets a reference to the `http.server.SimpleHTTPRequestHandler` class. */
+      module SimpleHttpRequestHandler {
+        /** Gets a reference to the `http.server.SimpleHttpRequestHandler` class. */
         API::Node classRef() { result = server().getMember("SimpleHTTPRequestHandler") }
       }
 
+      /** DEPRECATED: Alias for SimpleHttpRequestHandler */
+      deprecated module SimpleHTTPRequestHandler = SimpleHttpRequestHandler;
+
       /**
        * Provides models for the `http.server.CGIHTTPRequestHandler` class (Python 3 only).
        *
@@ -1886,27 +1916,30 @@ private module StdlibPrivate {
    *  - https://docs.python.org/3.9/library/http.server.html#http.server.BaseHTTPRequestHandler
    *  - https://docs.python.org/2.7/library/basehttpserver.html#BaseHTTPServer.BaseHTTPRequestHandler
    */
-  private module HTTPRequestHandler {
-    /** Gets a reference to the `BaseHTTPRequestHandler` class or any subclass. */
+  private module HttpRequestHandler {
+    /** Gets a reference to the `BaseHttpRequestHandler` class or any subclass. */
     API::Node subclassRef() {
       result =
         [
           // Python 2
-          BaseHTTPServer::BaseHTTPRequestHandler::classRef(),
-          SimpleHTTPServer::SimpleHTTPRequestHandler::classRef(),
+          BaseHttpServer::BaseHttpRequestHandler::classRef(),
+          SimpleHttpServer::SimpleHttpRequestHandler::classRef(),
           CGIHTTPServer::CGIHTTPRequestHandler::classRef(),
           // Python 3
-          http::server::BaseHTTPRequestHandler::classRef(),
-          http::server::SimpleHTTPRequestHandler::classRef(),
+          http::server::BaseHttpRequestHandler::classRef(),
+          http::server::SimpleHttpRequestHandler::classRef(),
           http::server::CGIHTTPRequestHandler::classRef()
         ].getASubclass*()
     }
 
-    /** A HTTPRequestHandler class definition (most likely in project code). */
-    class HTTPRequestHandlerClassDef extends Class {
-      HTTPRequestHandlerClassDef() { this.getParent() = subclassRef().getAUse().asExpr() }
+    /** A HttpRequestHandler class definition (most likely in project code). */
+    class HttpRequestHandlerClassDef extends Class {
+      HttpRequestHandlerClassDef() { this.getParent() = subclassRef().getAUse().asExpr() }
     }
 
+    /** DEPRECATED: Alias for HttpRequestHandlerClassDef */
+    deprecated class HTTPRequestHandlerClassDef = HttpRequestHandlerClassDef;
+
     /**
      * A source of instances of the `BaseHTTPRequestHandler` class or any subclass, extend this class to model new instances.
      *
@@ -1918,16 +1951,16 @@ private module StdlibPrivate {
      */
     abstract class InstanceSource extends DataFlow::Node { }
 
-    /** The `self` parameter in a method on the `BaseHTTPRequestHandler` class or any subclass. */
+    /** The `self` parameter in a method on the `BaseHttpRequestHandler` class or any subclass. */
     private class SelfParam extends InstanceSource, RemoteFlowSource::Range, DataFlow::ParameterNode {
       SelfParam() {
-        exists(HTTPRequestHandlerClassDef cls | cls.getAMethod().getArg(0) = this.getParameter())
+        exists(HttpRequestHandlerClassDef cls | cls.getAMethod().getArg(0) = this.getParameter())
       }
 
       override string getSourceType() { result = "stdlib HTTPRequestHandler" }
     }
 
-    /** Gets a reference to an instance of the `BaseHTTPRequestHandler` class or any subclass. */
+    /** Gets a reference to an instance of the `BaseHttpRequestHandler` class or any subclass. */
     private DataFlow::TypeTrackingNode instance(DataFlow::TypeTracker t) {
       t.start() and
       result instanceof InstanceSource
@@ -1935,7 +1968,7 @@ private module StdlibPrivate {
       exists(DataFlow::TypeTracker t2 | result = instance(t2).track(t2, t))
     }
 
-    /** Gets a reference to an instance of the `BaseHTTPRequestHandler` class or any subclass. */
+    /** Gets a reference to an instance of the `BaseHttpRequestHandler` class or any subclass. */
     DataFlow::Node instance() { instance(DataFlow::TypeTracker::end()).flowsTo(result) }
 
     private class AdditionalTaintStep extends TaintTracking::AdditionalTaintStep {
@@ -1956,16 +1989,16 @@ private module StdlibPrivate {
       }
     }
 
-    /** An `HTTPMessage` instance that originates from a `BaseHTTPRequestHandler` instance. */
-    private class BaseHTTPRequestHandlerHeadersInstances extends Stdlib::HTTPMessage::InstanceSource {
-      BaseHTTPRequestHandlerHeadersInstances() {
+    /** An `HttpMessage` instance that originates from a `BaseHttpRequestHandler` instance. */
+    private class BaseHttpRequestHandlerHeadersInstances extends Stdlib::HttpMessage::InstanceSource {
+      BaseHttpRequestHandlerHeadersInstances() {
         this.(DataFlow::AttrRead).accesses(instance(), "headers")
       }
     }
 
-    /** A file-like object that originates from a `BaseHTTPRequestHandler` instance. */
-    private class BaseHTTPRequestHandlerFileLikeObjectInstances extends Stdlib::FileLikeObject::InstanceSource {
-      BaseHTTPRequestHandlerFileLikeObjectInstances() {
+    /** A file-like object that originates from a `BaseHttpRequestHandler` instance. */
+    private class BaseHttpRequestHandlerFileLikeObjectInstances extends Stdlib::FileLikeObject::InstanceSource {
+      BaseHttpRequestHandlerFileLikeObjectInstances() {
         this.(DataFlow::AttrRead).accesses(instance(), "rfile")
       }
     }
@@ -1977,7 +2010,7 @@ private module StdlibPrivate {
      */
     private class RequestHandlerFunc extends HTTP::Server::RequestHandler::Range {
       RequestHandlerFunc() {
-        this = any(HTTPRequestHandlerClassDef cls).getAMethod() and
+        this = any(HttpRequestHandlerClassDef cls).getAMethod() and
         this.getName() = "do_" + HTTP::httpVerb()
       }
 
@@ -2155,8 +2188,8 @@ private module StdlibPrivate {
    * - https://docs.python.org/2.7/library/httplib.html#httplib.HTTPConnection
    * - https://docs.python.org/2.7/library/httplib.html#httplib.HTTPSConnection
    */
-  module HTTPConnection {
-    /** Gets a reference to the `http.client.HTTPConnection` class. */
+  module HttpConnection {
+    /** Gets a reference to the `http.client.HttpConnection` class. */
     private API::Node classRef() {
       exists(string className | className in ["HTTPConnection", "HTTPSConnection"] |
         // Python 3
@@ -2184,7 +2217,7 @@ private module StdlibPrivate {
       abstract DataFlow::Node getHostArgument();
     }
 
-    /** A direct instantiation of `http.client.HTTPConnection`. */
+    /** A direct instantiation of `http.client.HttpConnection`. */
     private class ClassInstantiation extends InstanceSource, DataFlow::CallCfgNode {
       ClassInstantiation() { this = classRef().getACall() }
 
@@ -2212,7 +2245,7 @@ private module StdlibPrivate {
       instance(DataFlow::TypeTracker::end(), hostArg).flowsTo(result)
     }
 
-    /** A method call on a HTTPConnection that sends off a request */
+    /** A method call on a HttpConnection that sends off a request */
     private class RequestCall extends HTTP::Client::Request::Range, DataFlow::MethodCallNode {
       RequestCall() { this.calls(instance(_), ["request", "_send_request", "putrequest"]) }
 
@@ -2238,7 +2271,7 @@ private module StdlibPrivate {
 
     /** A call to the `getresponse` method. */
     private class HttpConnectionGetResponseCall extends DataFlow::MethodCallNode,
-      HTTPResponse::InstanceSource {
+      HttpResponse::InstanceSource {
       HttpConnectionGetResponseCall() { this.calls(instance(_), "getresponse") }
     }
 
@@ -2269,6 +2302,9 @@ private module StdlibPrivate {
     }
   }
 
+  /** DEPRECATED: Alias for HttpConnection */
+  deprecated module HTTPConnection = HttpConnection;
+
   /**
    * Provides models for the `http.client.HTTPResponse` class
    *
@@ -2276,8 +2312,8 @@ private module StdlibPrivate {
    * - https://docs.python.org/3.10/library/http.client.html#httpresponse-objects
    * - https://docs.python.org/3/library/http.client.html#http.client.HTTPResponse.
    */
-  module HTTPResponse {
-    /** Gets a reference to the `http.client.HTTPResponse` class. */
+  module HttpResponse {
+    /** Gets a reference to the `http.client.HttpResponse` class. */
     private API::Node classRef() {
       result = API::moduleImport("http").getMember("client").getMember("HTTPResponse")
     }
@@ -2296,12 +2332,12 @@ private module StdlibPrivate {
     abstract class InstanceSource extends Stdlib::FileLikeObject::InstanceSource,
       DataFlow::LocalSourceNode { }
 
-    /** A direct instantiation of `http.client.HTTPResponse`. */
+    /** A direct instantiation of `http.client.HttpResponse`. */
     private class ClassInstantiation extends InstanceSource, DataFlow::CallCfgNode {
       ClassInstantiation() { this = classRef().getACall() }
     }
 
-    /** Gets a reference to an instance of `http.client.HTTPResponse`. */
+    /** Gets a reference to an instance of `http.client.HttpResponse`. */
     private DataFlow::TypeTrackingNode instance(DataFlow::TypeTracker t) {
       t.start() and
       result instanceof InstanceSource
@@ -2309,7 +2345,7 @@ private module StdlibPrivate {
       exists(DataFlow::TypeTracker t2 | result = instance(t2).track(t2, t))
     }
 
-    /** Gets a reference to an instance of `http.client.HTTPResponse`. */
+    /** Gets a reference to an instance of `http.client.HttpResponse`. */
     DataFlow::Node instance() { instance(DataFlow::TypeTracker::end()).flowsTo(result) }
 
     /**
@@ -2327,9 +2363,9 @@ private module StdlibPrivate {
       override string getAsyncMethodName() { none() }
     }
 
-    /** An attribute read that is a HTTPMessage instance. */
-    private class HTTPMessageInstances extends Stdlib::HTTPMessage::InstanceSource {
-      HTTPMessageInstances() {
+    /** An attribute read that is a HttpMessage instance. */
+    private class HttpMessageInstances extends Stdlib::HttpMessage::InstanceSource {
+      HttpMessageInstances() {
         this.(DataFlow::AttrRead).accesses(instance(), ["headers", "msg"])
         or
         this.(DataFlow::MethodCallNode).calls(instance(), "info")
@@ -2337,6 +2373,9 @@ private module StdlibPrivate {
     }
   }
 
+  /** DEPRECATED: Alias for HttpResponse */
+  deprecated module HTTPResponse = HttpResponse;
+
   // ---------------------------------------------------------------------------
   // sqlite3
   // ---------------------------------------------------------------------------
diff --git a/python/ql/lib/semmle/python/frameworks/Tornado.qll b/python/ql/lib/semmle/python/frameworks/Tornado.qll
index 85193c7637d..03e7ddc7ed3 100644
--- a/python/ql/lib/semmle/python/frameworks/Tornado.qll
+++ b/python/ql/lib/semmle/python/frameworks/Tornado.qll
@@ -23,7 +23,7 @@ private module Tornado {
    *
    * See https://www.tornadoweb.org/en/stable/httputil.html#tornado.httputil.HTTPHeaders.
    */
-  module HTTPHeaders {
+  module HttpHeaders {
     /**
      * A source of instances of `tornado.httputil.HTTPHeaders`, extend this class to model new instances.
      *
@@ -35,7 +35,7 @@ private module Tornado {
      */
     abstract class InstanceSource extends DataFlow::LocalSourceNode { }
 
-    /** Gets a reference to an instance of `tornado.httputil.HTTPHeaders`. */
+    /** Gets a reference to an instance of `tornado.httputil.HttpHeaders`. */
     private DataFlow::TypeTrackingNode instance(DataFlow::TypeTracker t) {
       t.start() and
       result instanceof InstanceSource
@@ -43,7 +43,7 @@ private module Tornado {
       exists(DataFlow::TypeTracker t2 | result = instance(t2).track(t2, t))
     }
 
-    /** Gets a reference to an instance of `tornado.httputil.HTTPHeaders`. */
+    /** Gets a reference to an instance of `tornado.httputil.HttpHeaders`. */
     DataFlow::Node instance() { instance(DataFlow::TypeTracker::end()).flowsTo(result) }
 
     /**
@@ -62,6 +62,9 @@ private module Tornado {
     }
   }
 
+  /** DEPRECATED: Alias for HttpHeaders */
+  deprecated module HTTPHeaders = HttpHeaders;
+
   // ---------------------------------------------------------------------------
   // tornado
   // ---------------------------------------------------------------------------
@@ -323,9 +326,9 @@ private module Tornado {
           override string getAsyncMethodName() { none() }
         }
 
-        /** An `HTTPHeaders` instance that originates from a Tornado request. */
-        private class TornadoRequestHTTPHeadersInstances extends HTTPHeaders::InstanceSource {
-          TornadoRequestHTTPHeadersInstances() {
+        /** An `HttpHeaders` instance that originates from a Tornado request. */
+        private class TornadoRequestHttpHeadersInstances extends HttpHeaders::InstanceSource {
+          TornadoRequestHttpHeadersInstances() {
             this.(DataFlow::AttrRead).accesses(instance(), "headers")
           }
         }
diff --git a/python/ql/lib/semmle/python/frameworks/internal/SubclassFinder.qll b/python/ql/lib/semmle/python/frameworks/internal/SubclassFinder.qll
index 36f03cd1401..c2a24358ad2 100644
--- a/python/ql/lib/semmle/python/frameworks/internal/SubclassFinder.qll
+++ b/python/ql/lib/semmle/python/frameworks/internal/SubclassFinder.qll
@@ -34,7 +34,7 @@ private module NotExposed {
         concat(string newModelFullyQualified |
           newModel(any(MySpec spec), newModelFullyQualified, _, _, _)
         |
-          fullyQualifiedToAPIGraphPath(newModelFullyQualified), " or this = API::"
+          fullyQualifiedToApiGraphPath(newModelFullyQualified), " or this = API::"
         )
   }
 
@@ -69,10 +69,15 @@ private module NotExposed {
   //
   //
   bindingset[fullyQaulified]
-  string fullyQualifiedToAPIGraphPath(string fullyQaulified) {
+  string fullyQualifiedToApiGraphPath(string fullyQaulified) {
     result = "moduleImport(\"" + fullyQaulified.replaceAll(".", "\").getMember(\"") + "\")"
   }
 
+  /** DEPRECATED: Alias for fullyQualifiedToApiGraphPath */
+  deprecated string fullyQualifiedToAPIGraphPath(string fullyQaulified) {
+    result = fullyQualifiedToApiGraphPath(fullyQaulified)
+  }
+
   bindingset[this]
   abstract class FindSubclassesSpec extends string {
     abstract API::Node getAlreadyModeledClass();
@@ -99,13 +104,13 @@ private module NotExposed {
     or
     exists(string newSubclassName |
       newModel(spec, newSubclassName, _, _, _) and
-      result.getPath() = fullyQualifiedToAPIGraphPath(newSubclassName)
+      result.getPath() = fullyQualifiedToApiGraphPath(newSubclassName)
     )
   }
 
   bindingset[fullyQualifiedName]
   predicate alreadyModeled(FindSubclassesSpec spec, string fullyQualifiedName) {
-    fullyQualifiedToAPIGraphPath(fullyQualifiedName) = spec.getAlreadyModeledClass().getPath()
+    fullyQualifiedToApiGraphPath(fullyQualifiedName) = spec.getAlreadyModeledClass().getPath()
   }
 
   predicate isNonTestProjectCode(AstNode ast) {
diff --git a/python/ql/lib/semmle/python/security/BadTagFilterQuery.qll b/python/ql/lib/semmle/python/security/BadTagFilterQuery.qll
index 51e294c4f61..e22c00ddc47 100644
--- a/python/ql/lib/semmle/python/security/BadTagFilterQuery.qll
+++ b/python/ql/lib/semmle/python/security/BadTagFilterQuery.qll
@@ -176,8 +176,8 @@ private module RegexpMatching {
 }
 
 /** A class to test whether a regular expression matches certain HTML tags. */
-class HTMLMatchingRegExp extends RegexpMatching::MatchedRegExp {
-  HTMLMatchingRegExp() {
+class HtmlMatchingRegExp extends RegexpMatching::MatchedRegExp {
+  HtmlMatchingRegExp() {
     // the regexp must mention "<" and ">" explicitly.
     forall(string angleBracket | angleBracket = ["<", ">"] |
       any(RegExpConstant term | term.getValue().matches("%" + angleBracket + "%")).getRootTerm() =
@@ -204,12 +204,15 @@ class HTMLMatchingRegExp extends RegexpMatching::MatchedRegExp {
   }
 }
 
+/** DEPRECATED: Alias for HtmlMatchingRegExp */
+deprecated class HTMLMatchingRegExp = HtmlMatchingRegExp;
+
 /**
  * Holds if `regexp` matches some HTML tags, but misses some HTML tags that it should match.
  *
  * When adding a new case to this predicate, make sure the test string used in `matches(..)` calls are present in `HTMLMatchingRegExp::test` / `HTMLMatchingRegExp::testWithGroups`.
  */
-predicate isBadRegexpFilter(HTMLMatchingRegExp regexp, string msg) {
+predicate isBadRegexpFilter(HtmlMatchingRegExp regexp, string msg) {
   // CVE-2021-33829 - matching both "<!-- foo -->" and "<!-- foo --!>", but in different capture groups
   regexp.matches("<!-- foo -->") and
   regexp.matches("<!-- foo --!>") and
diff --git a/python/ql/lib/semmle/python/security/dataflow/ReflectedXSS.qll b/python/ql/lib/semmle/python/security/dataflow/ReflectedXSS.qll
index d5a937b8ef4..2d6624493e8 100644
--- a/python/ql/lib/semmle/python/security/dataflow/ReflectedXSS.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/ReflectedXSS.qll
@@ -13,8 +13,8 @@ import semmle.python.dataflow.new.TaintTracking
 /**
  * Provides a taint-tracking configuration for detecting "reflected server-side cross-site scripting" vulnerabilities.
  */
-module ReflectedXSS {
-  import ReflectedXSSCustomizations::ReflectedXSS
+module ReflectedXss {
+  import ReflectedXSSCustomizations::ReflectedXss
 
   /**
    * A taint-tracking configuration for detecting "reflected server-side cross-site scripting" vulnerabilities.
@@ -34,9 +34,12 @@ module ReflectedXSS {
   }
 }
 
+/** DEPRECATED: Alias for ReflectedXss */
+deprecated module ReflectedXSS = ReflectedXss;
+
 /**
  * DEPRECATED: Don't extend this class for customization, since this will lead to bad
  * performance, instead use the new `ReflectedXSSCustomizations.qll` file, and extend
  * its' classes.
  */
-deprecated class ReflectedXssConfiguration = ReflectedXSS::Configuration;
+deprecated class ReflectedXssConfiguration = ReflectedXss::Configuration;
diff --git a/python/ql/lib/semmle/python/security/dataflow/ReflectedXSSCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/ReflectedXSSCustomizations.qll
index 93363d3409a..7208e26f422 100644
--- a/python/ql/lib/semmle/python/security/dataflow/ReflectedXSSCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/ReflectedXSSCustomizations.qll
@@ -15,7 +15,7 @@ private import semmle.python.dataflow.new.BarrierGuards
  * "reflected server-side cross-site scripting"
  * vulnerabilities, as well as extension points for adding your own.
  */
-module ReflectedXSS {
+module ReflectedXss {
   /**
    * A data flow source for "reflected server-side cross-site scripting" vulnerabilities.
    */
@@ -74,3 +74,6 @@ module ReflectedXSS {
    */
   class StringConstCompareAsSanitizerGuard extends SanitizerGuard, StringConstCompare { }
 }
+
+/** DEPRECATED: Alias for ReflectedXss */
+deprecated module ReflectedXSS = ReflectedXss;
diff --git a/python/ql/lib/semmle/python/security/dataflow/SqlInjection.qll b/python/ql/lib/semmle/python/security/dataflow/SqlInjection.qll
index 2bced608df3..9f7cd02413b 100644
--- a/python/ql/lib/semmle/python/security/dataflow/SqlInjection.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/SqlInjection.qll
@@ -39,4 +39,7 @@ module SqlInjection {
  * performance, instead use the new `SqlInjectionCustomizations.qll` file, and extend
  * its' classes.
  */
-deprecated class SQLInjectionConfiguration = SqlInjection::Configuration;
+deprecated class SqlInjectionConfiguration = SqlInjection::Configuration;
+
+/** DEPRECATED: Alias for SqlInjectionConfiguration */
+deprecated class SQLInjectionConfiguration = SqlInjectionConfiguration;
diff --git a/python/ql/lib/semmle/python/web/stdlib/Request.qll b/python/ql/lib/semmle/python/web/stdlib/Request.qll
index fd95950168f..ff850233616 100644
--- a/python/ql/lib/semmle/python/web/stdlib/Request.qll
+++ b/python/ql/lib/semmle/python/web/stdlib/Request.qll
@@ -8,7 +8,7 @@ import python
 import semmle.python.dataflow.TaintTracking
 import semmle.python.web.Http
 
-/** Source of BaseHTTPRequestHandler instances. */
+/** Source of BaseHttpRequestHandler instances. */
 deprecated class StdLibRequestSource extends HttpRequestTaintSource {
   StdLibRequestSource() {
     exists(ClassValue cls |
@@ -23,7 +23,7 @@ deprecated class StdLibRequestSource extends HttpRequestTaintSource {
   override predicate isSourceOf(TaintKind kind) { kind instanceof BaseHTTPRequestHandlerKind }
 }
 
-/** TaintKind for an instance of BaseHTTPRequestHandler. */
+/** TaintKind for an instance of BaseHttpRequestHandler. */
 deprecated class BaseHTTPRequestHandlerKind extends TaintKind {
   BaseHTTPRequestHandlerKind() { this = "BaseHTTPRequestHandlerKind" }
 
@@ -39,7 +39,7 @@ deprecated class BaseHTTPRequestHandlerKind extends TaintKind {
   }
 }
 
-/** TaintKind for headers (instance of HTTPMessage). */
+/** TaintKind for headers (instance of HttpMessage). */
 deprecated class HTTPMessageKind extends ExternalStringDictKind {
   override TaintKind getTaintOfMethodResult(string name) {
     result = super.getTaintOfMethodResult(name)
diff --git a/python/ql/lib/semmle/python/web/stdlib/Response.qll b/python/ql/lib/semmle/python/web/stdlib/Response.qll
index 2b9407a47b7..651201e204d 100644
--- a/python/ql/lib/semmle/python/web/stdlib/Response.qll
+++ b/python/ql/lib/semmle/python/web/stdlib/Response.qll
@@ -18,7 +18,7 @@ deprecated private predicate is_wfile(AttrNode wfile) {
   )
 }
 
-/** Sink for `h.wfile.write` where `h` is an instance of BaseHTTPRequestHandler. */
+/** Sink for `h.wfile.write` where `h` is an instance of BaseHttpRequestHandler. */
 deprecated class StdLibWFileWriteSink extends HttpResponseTaintSink {
   StdLibWFileWriteSink() {
     exists(CallNode call |
@@ -30,7 +30,7 @@ deprecated class StdLibWFileWriteSink extends HttpResponseTaintSink {
   override predicate sinks(TaintKind kind) { kind instanceof ExternalStringKind }
 }
 
-/** Sink for `h.wfile.writelines` where `h` is an instance of BaseHTTPRequestHandler. */
+/** Sink for `h.wfile.writelines` where `h` is an instance of BaseHttpRequestHandler. */
 deprecated class StdLibWFileWritelinesSink extends HttpResponseTaintSink {
   StdLibWFileWritelinesSink() {
     exists(CallNode call |
diff --git a/python/ql/lib/semmle/python/xml/XML.qll b/python/ql/lib/semmle/python/xml/XML.qll
index d2e6c44951f..fb781a4683f 100755
--- a/python/ql/lib/semmle/python/xml/XML.qll
+++ b/python/ql/lib/semmle/python/xml/XML.qll
@@ -4,11 +4,11 @@
 
 import semmle.files.FileSystem
 
-private class TXMLLocatable =
+private class TXmlLocatable =
   @xmldtd or @xmlelement or @xmlattribute or @xmlnamespace or @xmlcomment or @xmlcharacters;
 
 /** An XML element that has a location. */
-class XMLLocatable extends @xmllocatable, TXMLLocatable {
+class XMLLocatable extends @xmllocatable, TXmlLocatable {
   /** Gets the source location for this element. */
   Location getLocation() { xmllocations(this, result) }
 
diff --git a/python/ql/src/Security/CWE-020-ExternalAPIs/ExternalAPIs.qll b/python/ql/src/Security/CWE-020-ExternalAPIs/ExternalAPIs.qll
index b3482012e9a..120a7967b3a 100644
--- a/python/ql/src/Security/CWE-020-ExternalAPIs/ExternalAPIs.qll
+++ b/python/ql/src/Security/CWE-020-ExternalAPIs/ExternalAPIs.qll
@@ -40,13 +40,16 @@ private import semmle.python.objects.ObjectInternal
 /**
  * A callable that is considered a "safe" external API from a security perspective.
  */
-class SafeExternalAPI extends Unit {
+class SafeExternalApi extends Unit {
   /** Gets a callable that is considered a "safe" external API from a security perspective. */
   abstract DataFlowPrivate::DataFlowCallable getSafeCallable();
 }
 
+/** DEPRECATED: Alias for SafeExternalApi */
+deprecated class SafeExternalAPI = SafeExternalApi;
+
 /** The default set of "safe" external APIs. */
-private class DefaultSafeExternalAPI extends SafeExternalAPI {
+private class DefaultSafeExternalApi extends SafeExternalApi {
   override DataFlowPrivate::DataFlowCallable getSafeCallable() {
     exists(CallableValue cv | cv = result.getCallableValue() |
       cv = Value::named(["len", "isinstance", "getattr", "hasattr"])
@@ -61,15 +64,15 @@ private class DefaultSafeExternalAPI extends SafeExternalAPI {
 }
 
 /** A node representing data being passed to an external API through a call. */
-class ExternalAPIDataNode extends DataFlow::Node {
+class ExternalApiDataNode extends DataFlow::Node {
   DataFlowPrivate::DataFlowCall call;
   DataFlowPrivate::DataFlowCallable callable;
   int i;
 
-  ExternalAPIDataNode() {
+  ExternalApiDataNode() {
     exists(call.getLocation().getFile().getRelativePath()) and
     callable = call.getCallable() and
-    not any(SafeExternalAPI safe).getSafeCallable() = callable and
+    not any(SafeExternalApi safe).getSafeCallable() = callable and
     exists(Value cv | cv = callable.getCallableValue() |
       cv.isAbsent()
       or
@@ -98,38 +101,47 @@ class ExternalAPIDataNode extends DataFlow::Node {
   DataFlowPrivate::DataFlowCallable getCallable() { result = callable }
 }
 
-/** A configuration for tracking flow from `RemoteFlowSource`s to `ExternalAPIDataNode`s. */
-class UntrustedDataToExternalAPIConfig extends TaintTracking::Configuration {
-  UntrustedDataToExternalAPIConfig() { this = "UntrustedDataToExternalAPIConfig" }
+/** DEPRECATED: Alias for ExternalApiDataNode */
+deprecated class ExternalAPIDataNode = ExternalApiDataNode;
+
+/** A configuration for tracking flow from `RemoteFlowSource`s to `ExternalApiDataNode`s. */
+class UntrustedDataToExternalApiConfig extends TaintTracking::Configuration {
+  UntrustedDataToExternalApiConfig() { this = "UntrustedDataToExternalAPIConfig" }
 
   override predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
-  override predicate isSink(DataFlow::Node sink) { sink instanceof ExternalAPIDataNode }
+  override predicate isSink(DataFlow::Node sink) { sink instanceof ExternalApiDataNode }
 }
 
+/** DEPRECATED: Alias for UntrustedDataToExternalApiConfig */
+deprecated class UntrustedDataToExternalAPIConfig = UntrustedDataToExternalApiConfig;
+
 /** A node representing untrusted data being passed to an external API. */
-class UntrustedExternalAPIDataNode extends ExternalAPIDataNode {
-  UntrustedExternalAPIDataNode() { any(UntrustedDataToExternalAPIConfig c).hasFlow(_, this) }
+class UntrustedExternalApiDataNode extends ExternalApiDataNode {
+  UntrustedExternalApiDataNode() { any(UntrustedDataToExternalApiConfig c).hasFlow(_, this) }
 
   /** Gets a source of untrusted data which is passed to this external API data node. */
   DataFlow::Node getAnUntrustedSource() {
-    any(UntrustedDataToExternalAPIConfig c).hasFlow(result, this)
+    any(UntrustedDataToExternalApiConfig c).hasFlow(result, this)
   }
 }
 
-private newtype TExternalAPI =
-  TExternalAPIParameter(DataFlowPrivate::DataFlowCallable callable, int index) {
-    exists(UntrustedExternalAPIDataNode n |
+/** DEPRECATED: Alias for UntrustedExternalApiDataNode */
+deprecated class UntrustedExternalAPIDataNode = UntrustedExternalApiDataNode;
+
+private newtype TExternalApi =
+  TExternalApiParameter(DataFlowPrivate::DataFlowCallable callable, int index) {
+    exists(UntrustedExternalApiDataNode n |
       callable = n.getCallable() and
       index = n.getIndex()
     )
   }
 
 /** An external API which is used with untrusted data. */
-class ExternalAPIUsedWithUntrustedData extends TExternalAPI {
+class ExternalApiUsedWithUntrustedData extends TExternalApi {
   /** Gets a possibly untrusted use of this external API. */
-  UntrustedExternalAPIDataNode getUntrustedDataNode() {
-    this = TExternalAPIParameter(result.getCallable(), result.getIndex())
+  UntrustedExternalApiDataNode getUntrustedDataNode() {
+    this = TExternalApiParameter(result.getCallable(), result.getIndex())
   }
 
   /** Gets the number of untrusted sources used with this external API. */
@@ -143,7 +155,7 @@ class ExternalAPIUsedWithUntrustedData extends TExternalAPI {
       DataFlowPrivate::DataFlowCallable callable, int index, string callableString,
       string indexString
     |
-      this = TExternalAPIParameter(callable, index) and
+      this = TExternalApiParameter(callable, index) and
       indexString = "param " + index and
       exists(CallableValue cv | cv = callable.getCallableValue() |
         callableString =
@@ -167,6 +179,9 @@ class ExternalAPIUsedWithUntrustedData extends TExternalAPI {
   }
 }
 
+/** DEPRECATED: Alias for ExternalApiUsedWithUntrustedData */
+deprecated class ExternalAPIUsedWithUntrustedData = ExternalApiUsedWithUntrustedData;
+
 /** Gets the fully qualified name for the `BuiltinFunctionValue` bfv. */
 private string pretty_builtin_function_value(BuiltinFunctionValue bfv) {
   exists(Builtin b | b = bfv.(BuiltinFunctionObjectInternal).getBuiltin() |
diff --git a/python/ql/src/Security/CWE-020-ExternalAPIs/ExternalAPIsUsedWithUntrustedData.ql b/python/ql/src/Security/CWE-020-ExternalAPIs/ExternalAPIsUsedWithUntrustedData.ql
index 8ab05fc611f..ac374311ee8 100644
--- a/python/ql/src/Security/CWE-020-ExternalAPIs/ExternalAPIsUsedWithUntrustedData.ql
+++ b/python/ql/src/Security/CWE-020-ExternalAPIs/ExternalAPIsUsedWithUntrustedData.ql
@@ -11,7 +11,7 @@
 import python
 import ExternalAPIs
 
-from ExternalAPIUsedWithUntrustedData externalAPI
-select externalAPI, count(externalAPI.getUntrustedDataNode()) as numberOfUses,
-  externalAPI.getNumberOfUntrustedSources() as numberOfUntrustedSources order by
+from ExternalApiUsedWithUntrustedData externalApi
+select externalApi, count(externalApi.getUntrustedDataNode()) as numberOfUses,
+  externalApi.getNumberOfUntrustedSources() as numberOfUntrustedSources order by
     numberOfUntrustedSources desc
diff --git a/python/ql/src/Security/CWE-020-ExternalAPIs/UntrustedDataToExternalAPI.ql b/python/ql/src/Security/CWE-020-ExternalAPIs/UntrustedDataToExternalAPI.ql
index a7991c4ef60..6426854222c 100644
--- a/python/ql/src/Security/CWE-020-ExternalAPIs/UntrustedDataToExternalAPI.ql
+++ b/python/ql/src/Security/CWE-020-ExternalAPIs/UntrustedDataToExternalAPI.ql
@@ -14,11 +14,11 @@ import ExternalAPIs
 import DataFlow::PathGraph
 
 from
-  UntrustedDataToExternalAPIConfig config, DataFlow::PathNode source, DataFlow::PathNode sink,
-  ExternalAPIUsedWithUntrustedData externalAPI
+  UntrustedDataToExternalApiConfig config, DataFlow::PathNode source, DataFlow::PathNode sink,
+  ExternalApiUsedWithUntrustedData externalApi
 where
-  sink.getNode() = externalAPI.getUntrustedDataNode() and
+  sink.getNode() = externalApi.getUntrustedDataNode() and
   config.hasFlowPath(source, sink)
 select sink.getNode(), source, sink,
-  "Call to " + externalAPI.toString() + " with untrusted data from $@.", source.getNode(),
+  "Call to " + externalApi.toString() + " with untrusted data from $@.", source.getNode(),
   source.toString()
diff --git a/python/ql/src/Security/CWE-079/ReflectedXss.ql b/python/ql/src/Security/CWE-079/ReflectedXss.ql
index 4d91ce2ad49..99ed1cccc8d 100644
--- a/python/ql/src/Security/CWE-079/ReflectedXss.ql
+++ b/python/ql/src/Security/CWE-079/ReflectedXss.ql
@@ -17,7 +17,7 @@ import python
 import semmle.python.security.dataflow.ReflectedXSS
 import DataFlow::PathGraph
 
-from ReflectedXSS::Configuration config, DataFlow::PathNode source, DataFlow::PathNode sink
+from ReflectedXss::Configuration config, DataFlow::PathNode source, DataFlow::PathNode sink
 where config.hasFlowPath(source, sink)
 select sink.getNode(), source, sink, "Cross-site scripting vulnerability due to $@.",
   source.getNode(), "a user-provided value"
diff --git a/python/ql/src/Security/CWE-116/BadTagFilter.ql b/python/ql/src/Security/CWE-116/BadTagFilter.ql
index 44305bff876..654df65275b 100644
--- a/python/ql/src/Security/CWE-116/BadTagFilter.ql
+++ b/python/ql/src/Security/CWE-116/BadTagFilter.ql
@@ -16,6 +16,6 @@
 
 import semmle.python.security.BadTagFilterQuery
 
-from HTMLMatchingRegExp regexp, string msg
+from HtmlMatchingRegExp regexp, string msg
 where msg = min(string m | isBadRegexpFilter(regexp, m) | m order by m.length(), m) // there might be multiple, we arbitrarily pick the shortest one
 select regexp, msg
diff --git a/python/ql/src/experimental/Security/CWE-287/ImproperLdapAuth.ql b/python/ql/src/experimental/Security/CWE-287/ImproperLdapAuth.ql
index 24dbb61e738..177c58e2782 100644
--- a/python/ql/src/experimental/Security/CWE-287/ImproperLdapAuth.ql
+++ b/python/ql/src/experimental/Security/CWE-287/ImproperLdapAuth.ql
@@ -13,7 +13,7 @@ import python
 import experimental.semmle.python.Concepts
 import semmle.python.dataflow.new.DataFlow
 
-predicate authenticatesImproperly(LDAPBind ldapBind) {
+predicate authenticatesImproperly(LdapBind ldapBind) {
   (
     DataFlow::localFlow(DataFlow::exprNode(any(None noneName)), ldapBind.getPassword()) or
     not exists(ldapBind.getPassword())
@@ -25,6 +25,6 @@ predicate authenticatesImproperly(LDAPBind ldapBind) {
   )
 }
 
-from LDAPBind ldapBind
+from LdapBind ldapBind
 where authenticatesImproperly(ldapBind)
 select ldapBind, "The following LDAP bind operation is executed without authentication"
diff --git a/python/ql/src/experimental/Security/CWE-347/JWTEmptyKeyOrAlgorithm.ql b/python/ql/src/experimental/Security/CWE-347/JWTEmptyKeyOrAlgorithm.ql
index 2f071a60536..adff8dc173f 100644
--- a/python/ql/src/experimental/Security/CWE-347/JWTEmptyKeyOrAlgorithm.ql
+++ b/python/ql/src/experimental/Security/CWE-347/JWTEmptyKeyOrAlgorithm.ql
@@ -12,7 +12,7 @@ import python
 import experimental.semmle.python.Concepts
 import experimental.semmle.python.frameworks.JWT
 
-from JWTEncoding jwtEncoding, string affectedComponent
+from JwtEncoding jwtEncoding, string affectedComponent
 where
   affectedComponent = "algorithm" and
   isEmptyOrNone(jwtEncoding.getAlgorithm())
diff --git a/python/ql/src/experimental/Security/CWE-347/JWTMissingSecretOrPublicKeyVerification.ql b/python/ql/src/experimental/Security/CWE-347/JWTMissingSecretOrPublicKeyVerification.ql
index e1f1cbb95ba..0cb801cb849 100644
--- a/python/ql/src/experimental/Security/CWE-347/JWTMissingSecretOrPublicKeyVerification.ql
+++ b/python/ql/src/experimental/Security/CWE-347/JWTMissingSecretOrPublicKeyVerification.ql
@@ -12,6 +12,6 @@
 import python
 import experimental.semmle.python.Concepts
 
-from JWTDecoding jwtDecoding
+from JwtDecoding jwtDecoding
 where not jwtDecoding.verifiesSignature()
 select jwtDecoding.getPayload(), "is not verified with a cryptographic secret or public key."
diff --git a/python/ql/src/experimental/Security/CWE-522/LDAPInsecureAuth.ql b/python/ql/src/experimental/Security/CWE-522/LDAPInsecureAuth.ql
index 3557c4e33d5..88715203be8 100644
--- a/python/ql/src/experimental/Security/CWE-522/LDAPInsecureAuth.ql
+++ b/python/ql/src/experimental/Security/CWE-522/LDAPInsecureAuth.ql
@@ -14,7 +14,7 @@ import python
 import DataFlow::PathGraph
 import experimental.semmle.python.security.LDAPInsecureAuth
 
-from LDAPInsecureAuthConfig config, DataFlow::PathNode source, DataFlow::PathNode sink
+from LdapInsecureAuthConfig config, DataFlow::PathNode source, DataFlow::PathNode sink
 where config.hasFlowPath(source, sink)
 select sink.getNode(), source, sink, "$@ is authenticated insecurely.", sink.getNode(),
   "This LDAP host"
diff --git a/python/ql/src/experimental/Security/CWE-943/NoSQLInjection.ql b/python/ql/src/experimental/Security/CWE-943/NoSQLInjection.ql
index 7ee3328f6f3..cd4405d301b 100644
--- a/python/ql/src/experimental/Security/CWE-943/NoSQLInjection.ql
+++ b/python/ql/src/experimental/Security/CWE-943/NoSQLInjection.ql
@@ -13,7 +13,7 @@ import python
 import experimental.semmle.python.security.injection.NoSQLInjection
 import DataFlow::PathGraph
 
-from NoSQLInjection::Configuration config, DataFlow::PathNode source, DataFlow::PathNode sink
+from NoSqlInjection::Configuration config, DataFlow::PathNode source, DataFlow::PathNode sink
 where config.hasFlowPath(source, sink)
 select sink, source, sink, "$@ NoSQL query contains an unsanitized $@", sink, "This", source,
   "user-provided value"
diff --git a/python/ql/src/experimental/semmle/python/Concepts.qll b/python/ql/src/experimental/semmle/python/Concepts.qll
index bb83fbda583..09b44d95e89 100644
--- a/python/ql/src/experimental/semmle/python/Concepts.qll
+++ b/python/ql/src/experimental/semmle/python/Concepts.qll
@@ -15,7 +15,7 @@ private import semmle.python.dataflow.new.TaintTracking
 private import experimental.semmle.python.Frameworks
 
 /** Provides classes for modeling LDAP query execution-related APIs. */
-module LDAPQuery {
+module LdapQuery {
   /**
    * A data-flow node that collects methods executing a LDAP query.
    *
@@ -30,16 +30,19 @@ module LDAPQuery {
   }
 }
 
+/** DEPRECATED: Alias for LdapQuery */
+deprecated module LDAPQuery = LdapQuery;
+
 /**
  * A data-flow node that collect methods executing a LDAP query.
  *
  * Extend this class to refine existing API models. If you want to model new APIs,
  * extend `LDAPQuery::Range` instead.
  */
-class LDAPQuery extends DataFlow::Node {
-  LDAPQuery::Range range;
+class LdapQuery extends DataFlow::Node {
+  LdapQuery::Range range;
 
-  LDAPQuery() { this = range }
+  LdapQuery() { this = range }
 
   /**
    * Gets the argument containing the executed expression.
@@ -47,8 +50,11 @@ class LDAPQuery extends DataFlow::Node {
   DataFlow::Node getQuery() { result = range.getQuery() }
 }
 
+/** DEPRECATED: Alias for LdapQuery */
+deprecated class LDAPQuery = LdapQuery;
+
 /** Provides classes for modeling LDAP components escape-related APIs. */
-module LDAPEscape {
+module LdapEscape {
   /**
    * A data-flow node that collects functions escaping LDAP components.
    *
@@ -63,16 +69,19 @@ module LDAPEscape {
   }
 }
 
+/** DEPRECATED: Alias for LdapEscape */
+deprecated module LDAPEscape = LdapEscape;
+
 /**
  * A data-flow node that collects functions escaping LDAP components.
  *
  * Extend this class to refine existing API models. If you want to model new APIs,
  * extend `LDAPEscape::Range` instead.
  */
-class LDAPEscape extends DataFlow::Node {
-  LDAPEscape::Range range;
+class LdapEscape extends DataFlow::Node {
+  LdapEscape::Range range;
 
-  LDAPEscape() { this = range }
+  LdapEscape() { this = range }
 
   /**
    * Gets the argument containing the escaped expression.
@@ -80,8 +89,11 @@ class LDAPEscape extends DataFlow::Node {
   DataFlow::Node getAnInput() { result = range.getAnInput() }
 }
 
+/** DEPRECATED: Alias for LdapEscape */
+deprecated class LDAPEscape = LdapEscape;
+
 /** Provides classes for modeling LDAP bind-related APIs. */
-module LDAPBind {
+module LdapBind {
   /**
    * A data-flow node that collects methods binding a LDAP connection.
    *
@@ -106,16 +118,19 @@ module LDAPBind {
   }
 }
 
+/** DEPRECATED: Alias for LdapBind */
+deprecated module LDAPBind = LdapBind;
+
 /**
  * A data-flow node that collects methods binding a LDAP connection.
  *
  * Extend this class to refine existing API models. If you want to model new APIs,
  * extend `LDAPBind::Range` instead.
  */
-class LDAPBind extends DataFlow::Node {
-  LDAPBind::Range range;
+class LdapBind extends DataFlow::Node {
+  LdapBind::Range range;
 
-  LDAPBind() { this = range }
+  LdapBind() { this = range }
 
   /**
    * Gets the argument containing the binding host.
@@ -133,8 +148,11 @@ class LDAPBind extends DataFlow::Node {
   predicate useSSL() { range.useSSL() }
 }
 
+/** DEPRECATED: Alias for LdapBind */
+deprecated class LDAPBind = LdapBind;
+
 /** Provides classes for modeling SQL sanitization libraries. */
-module SQLEscape {
+module SqlEscape {
   /**
    * A data-flow node that collects functions that escape SQL statements.
    *
@@ -149,16 +167,19 @@ module SQLEscape {
   }
 }
 
+/** DEPRECATED: Alias for SqlEscape */
+deprecated module SQLEscape = SqlEscape;
+
 /**
  * A data-flow node that collects functions escaping SQL statements.
  *
  * Extend this class to refine existing API models. If you want to model new APIs,
  * extend `SQLEscape::Range` instead.
  */
-class SQLEscape extends DataFlow::Node {
-  SQLEscape::Range range;
+class SqlEscape extends DataFlow::Node {
+  SqlEscape::Range range;
 
-  SQLEscape() { this = range }
+  SqlEscape() { this = range }
 
   /**
    * Gets the argument containing the raw SQL statement.
@@ -166,8 +187,11 @@ class SQLEscape extends DataFlow::Node {
   DataFlow::Node getAnInput() { result = range.getAnInput() }
 }
 
-/** Provides a class for modeling NoSQL execution APIs. */
-module NoSQLQuery {
+/** DEPRECATED: Alias for SqlEscape */
+deprecated class SQLEscape = SqlEscape;
+
+/** Provides a class for modeling NoSql execution APIs. */
+module NoSqlQuery {
   /**
    * A data-flow node that executes NoSQL queries.
    *
@@ -175,28 +199,34 @@ module NoSQLQuery {
    * extend `NoSQLQuery` instead.
    */
   abstract class Range extends DataFlow::Node {
-    /** Gets the argument that specifies the NoSQL query to be executed. */
+    /** Gets the argument that specifies the NoSql query to be executed. */
     abstract DataFlow::Node getQuery();
   }
 }
 
+/** DEPRECATED: Alias for NoSqlQuery */
+deprecated module NoSQLQuery = NoSqlQuery;
+
 /**
  * A data-flow node that executes NoSQL queries.
  *
  * Extend this class to refine existing API models. If you want to model new APIs,
  * extend `NoSQLQuery::Range` instead.
  */
-class NoSQLQuery extends DataFlow::Node {
-  NoSQLQuery::Range range;
+class NoSqlQuery extends DataFlow::Node {
+  NoSqlQuery::Range range;
 
-  NoSQLQuery() { this = range }
+  NoSqlQuery() { this = range }
 
-  /** Gets the argument that specifies the NoSQL query to be executed. */
+  /** Gets the argument that specifies the NoSql query to be executed. */
   DataFlow::Node getQuery() { result = range.getQuery() }
 }
 
-/** Provides classes for modeling NoSQL sanitization-related APIs. */
-module NoSQLSanitizer {
+/** DEPRECATED: Alias for NoSqlQuery */
+deprecated class NoSQLQuery = NoSqlQuery;
+
+/** Provides classes for modeling NoSql sanitization-related APIs. */
+module NoSqlSanitizer {
   /**
    * A data-flow node that collects functions sanitizing NoSQL queries.
    *
@@ -204,26 +234,32 @@ module NoSQLSanitizer {
    * extend `NoSQLSanitizer` instead.
    */
   abstract class Range extends DataFlow::Node {
-    /** Gets the argument that specifies the NoSQL query to be sanitized. */
+    /** Gets the argument that specifies the NoSql query to be sanitized. */
     abstract DataFlow::Node getAnInput();
   }
 }
 
+/** DEPRECATED: Alias for NoSqlSanitizer */
+deprecated module NoSQLSanitizer = NoSqlSanitizer;
+
 /**
  * A data-flow node that collects functions sanitizing NoSQL queries.
  *
  * Extend this class to model new APIs. If you want to refine existing API models,
  * extend `NoSQLSanitizer::Range` instead.
  */
-class NoSQLSanitizer extends DataFlow::Node {
-  NoSQLSanitizer::Range range;
+class NoSqlSanitizer extends DataFlow::Node {
+  NoSqlSanitizer::Range range;
 
-  NoSQLSanitizer() { this = range }
+  NoSqlSanitizer() { this = range }
 
-  /** Gets the argument that specifies the NoSQL query to be sanitized. */
+  /** Gets the argument that specifies the NoSql query to be sanitized. */
   DataFlow::Node getAnInput() { result = range.getAnInput() }
 }
 
+/** DEPRECATED: Alias for NoSqlSanitizer */
+deprecated class NoSQLSanitizer = NoSqlSanitizer;
+
 /** Provides classes for modeling HTTP Header APIs. */
 module HeaderDeclaration {
   /**
@@ -268,7 +304,7 @@ class HeaderDeclaration extends DataFlow::Node {
 }
 
 /** Provides classes for modeling JWT encoding-related APIs. */
-module JWTEncoding {
+module JwtEncoding {
   /**
    * A data-flow node that collects methods encoding a JWT token.
    *
@@ -298,13 +334,16 @@ module JWTEncoding {
   }
 }
 
+/** DEPRECATED: Alias for JwtEncoding */
+deprecated module JWTEncoding = JwtEncoding;
+
 /**
  * A data-flow node that collects methods encoding a JWT token.
  *
  * Extend this class to refine existing API models. If you want to model new APIs,
  * extend `JWTEncoding::Range` instead.
  */
-class JWTEncoding extends DataFlow::Node instanceof JWTEncoding::Range {
+class JwtEncoding extends DataFlow::Node instanceof JwtEncoding::Range {
   /**
    * Gets the argument containing the payload.
    */
@@ -326,8 +365,11 @@ class JWTEncoding extends DataFlow::Node instanceof JWTEncoding::Range {
   string getAlgorithmString() { result = super.getAlgorithmString() }
 }
 
+/** DEPRECATED: Alias for JwtEncoding */
+deprecated class JWTEncoding = JwtEncoding;
+
 /** Provides classes for modeling JWT decoding-related APIs. */
-module JWTDecoding {
+module JwtDecoding {
   /**
    * A data-flow node that collects methods decoding a JWT token.
    *
@@ -367,13 +409,16 @@ module JWTDecoding {
   }
 }
 
+/** DEPRECATED: Alias for JwtDecoding */
+deprecated module JWTDecoding = JwtDecoding;
+
 /**
  * A data-flow node that collects methods encoding a JWT token.
  *
  * Extend this class to refine existing API models. If you want to model new APIs,
  * extend `JWTDecoding::Range` instead.
  */
-class JWTDecoding extends DataFlow::Node instanceof JWTDecoding::Range {
+class JwtDecoding extends DataFlow::Node instanceof JwtDecoding::Range {
   /**
    * Gets the argument containing the payload.
    */
@@ -404,3 +449,6 @@ class JWTDecoding extends DataFlow::Node instanceof JWTDecoding::Range {
    */
   predicate verifiesSignature() { super.verifiesSignature() }
 }
+
+/** DEPRECATED: Alias for JwtDecoding */
+deprecated class JWTDecoding = JwtDecoding;
diff --git a/python/ql/src/experimental/semmle/python/frameworks/LDAP.qll b/python/ql/src/experimental/semmle/python/frameworks/LDAP.qll
index 9286129cf6e..6085dddf5f8 100644
--- a/python/ql/src/experimental/semmle/python/frameworks/LDAP.qll
+++ b/python/ql/src/experimental/semmle/python/frameworks/LDAP.qll
@@ -60,7 +60,7 @@ private module LDAP {
      *
      * See `LDAP2QueryMethods`
      */
-    private class LDAP2Query extends DataFlow::CallCfgNode, LDAPQuery::Range {
+    private class LDAP2Query extends DataFlow::CallCfgNode, LdapQuery::Range {
       LDAP2Query() { this.getFunction() = ldapQuery() }
 
       override DataFlow::Node getQuery() {
@@ -98,7 +98,7 @@ private module LDAP {
      *
      * See `LDAP2BindMethods`
      */
-    private class LDAP2Bind extends DataFlow::CallCfgNode, LDAPBind::Range {
+    private class LDAP2Bind extends DataFlow::CallCfgNode, LdapBind::Range {
       LDAP2Bind() { this.getFunction() = ldapBind() }
 
       override DataFlow::Node getPassword() {
@@ -149,7 +149,7 @@ private module LDAP {
      *
      * See https://github.com/python-ldap/python-ldap/blob/7ce471e238cdd9a4dd8d17baccd1c9e05e6f894a/Lib/ldap/dn.py#L17
      */
-    private class LDAP2EscapeDNCall extends DataFlow::CallCfgNode, LDAPEscape::Range {
+    private class LDAP2EscapeDNCall extends DataFlow::CallCfgNode, LdapEscape::Range {
       LDAP2EscapeDNCall() { this = ldap().getMember("dn").getMember("escape_dn_chars").getACall() }
 
       override DataFlow::Node getAnInput() { result = this.getArg(0) }
@@ -160,7 +160,7 @@ private module LDAP {
      *
      * See https://www.python-ldap.org/en/python-ldap-3.3.0/reference/ldap-filter.html#ldap.filter.escape_filter_chars
      */
-    private class LDAP2EscapeFilterCall extends DataFlow::CallCfgNode, LDAPEscape::Range {
+    private class LDAP2EscapeFilterCall extends DataFlow::CallCfgNode, LdapEscape::Range {
       LDAP2EscapeFilterCall() {
         this = ldap().getMember("filter").getMember("escape_filter_chars").getACall()
       }
@@ -190,7 +190,7 @@ private module LDAP {
     /**
      * A class to find `ldap3` methods executing a query.
      */
-    private class LDAP3Query extends DataFlow::CallCfgNode, LDAPQuery::Range {
+    private class LDAP3Query extends DataFlow::CallCfgNode, LdapQuery::Range {
       LDAP3Query() {
         this.getFunction().(DataFlow::AttrRead).getObject().getALocalSource() =
           ldap3Connection().getACall() and
@@ -203,7 +203,7 @@ private module LDAP {
     /**
      * A class to find `ldap3` methods binding a connection.
      */
-    class LDAP3Bind extends DataFlow::CallCfgNode, LDAPBind::Range {
+    class LDAP3Bind extends DataFlow::CallCfgNode, LdapBind::Range {
       LDAP3Bind() { this = ldap3Connection().getACall() }
 
       override DataFlow::Node getPassword() {
@@ -241,7 +241,7 @@ private module LDAP {
      *
      * See https://github.com/cannatag/ldap3/blob/4d33166f0869b929f59c6e6825a1b9505eb99967/ldap3/utils/dn.py#L390
      */
-    private class LDAP3EscapeDNCall extends DataFlow::CallCfgNode, LDAPEscape::Range {
+    private class LDAP3EscapeDNCall extends DataFlow::CallCfgNode, LdapEscape::Range {
       LDAP3EscapeDNCall() { this = ldap3Utils().getMember("dn").getMember("escape_rdn").getACall() }
 
       override DataFlow::Node getAnInput() { result = this.getArg(0) }
@@ -252,7 +252,7 @@ private module LDAP {
      *
      * See https://github.com/cannatag/ldap3/blob/4d33166f0869b929f59c6e6825a1b9505eb99967/ldap3/utils/conv.py#L91
      */
-    private class LDAP3EscapeFilterCall extends DataFlow::CallCfgNode, LDAPEscape::Range {
+    private class LDAP3EscapeFilterCall extends DataFlow::CallCfgNode, LdapEscape::Range {
       LDAP3EscapeFilterCall() {
         this = ldap3Utils().getMember("conv").getMember("escape_filter_chars").getACall()
       }
diff --git a/python/ql/src/experimental/semmle/python/frameworks/NoSQL.qll b/python/ql/src/experimental/semmle/python/frameworks/NoSQL.qll
index 545a7e9d6a5..bdd067218b3 100644
--- a/python/ql/src/experimental/semmle/python/frameworks/NoSQL.qll
+++ b/python/ql/src/experimental/semmle/python/frameworks/NoSQL.qll
@@ -10,7 +10,7 @@ private import semmle.python.dataflow.new.RemoteFlowSources
 private import experimental.semmle.python.Concepts
 private import semmle.python.ApiGraphs
 
-private module NoSQL {
+private module NoSql {
   // API Nodes returning `Mongo` instances.
   /** Gets a reference to `pymongo.MongoClient` */
   private API::Node pyMongo() {
@@ -153,7 +153,7 @@ private module NoSQL {
    *
    * `mongo.db.user.find({'name': safe_search})` would be a collection method call, and so the result.
    */
-  private class MongoCollectionCall extends DataFlow::CallCfgNode, NoSQLQuery::Range {
+  private class MongoCollectionCall extends DataFlow::CallCfgNode, NoSqlQuery::Range {
     MongoCollectionCall() { this.getFunction() = mongoCollectionMethod() }
 
     override DataFlow::Node getQuery() { result = this.getArg(0) }
@@ -174,7 +174,7 @@ private module NoSQL {
    *
    * `Movie.objects(__raw__=json_search)` would be the result.
    */
-  private class MongoEngineObjectsCall extends DataFlow::CallCfgNode, NoSQLQuery::Range {
+  private class MongoEngineObjectsCall extends DataFlow::CallCfgNode, NoSqlQuery::Range {
     MongoEngineObjectsCall() {
       this =
         [mongoEngine(), flask_MongoEngine()]
@@ -188,7 +188,7 @@ private module NoSQL {
   }
 
   /** Gets a reference to `mongosanitizer.sanitizer.sanitize` */
-  private class MongoSanitizerCall extends DataFlow::CallCfgNode, NoSQLSanitizer::Range {
+  private class MongoSanitizerCall extends DataFlow::CallCfgNode, NoSqlSanitizer::Range {
     MongoSanitizerCall() {
       this =
         API::moduleImport("mongosanitizer").getMember("sanitizer").getMember("sanitize").getACall()
@@ -202,7 +202,7 @@ private module NoSQL {
    * If at any time ObjectId can't parse it's input (like when a tainted dict in passed in),
    * then ObjectId will throw an error preventing the query from running.
    */
-  private class BsonObjectIdCall extends DataFlow::CallCfgNode, NoSQLSanitizer::Range {
+  private class BsonObjectIdCall extends DataFlow::CallCfgNode, NoSqlSanitizer::Range {
     BsonObjectIdCall() {
       this =
         API::moduleImport(["bson", "bson.objectid", "bson.json_util"])
diff --git a/python/ql/src/experimental/semmle/python/libraries/Authlib.qll b/python/ql/src/experimental/semmle/python/libraries/Authlib.qll
index 20aa37597ce..f8121630e39 100644
--- a/python/ql/src/experimental/semmle/python/libraries/Authlib.qll
+++ b/python/ql/src/experimental/semmle/python/libraries/Authlib.qll
@@ -5,7 +5,7 @@ private import experimental.semmle.python.frameworks.JWT
 
 private module Authlib {
   /** Gets a reference to `authlib.jose.(jwt|JsonWebToken)` */
-  private API::Node authlibJWT() {
+  private API::Node authlibJwt() {
     result in [
         API::moduleImport("authlib").getMember("jose").getMember("jwt"),
         API::moduleImport("authlib").getMember("jose").getMember("JsonWebToken").getReturn()
@@ -13,10 +13,10 @@ private module Authlib {
   }
 
   /** Gets a reference to `jwt.encode` */
-  private API::Node authlibJWTEncode() { result = authlibJWT().getMember("encode") }
+  private API::Node authlibJwtEncode() { result = authlibJwt().getMember("encode") }
 
   /** Gets a reference to `jwt.decode` */
-  private API::Node authlibJWTDecode() { result = authlibJWT().getMember("decode") }
+  private API::Node authlibJwtDecode() { result = authlibJwt().getMember("decode") }
 
   /**
    * Gets a call to `authlib.jose.(jwt|JsonWebToken).encode`.
@@ -33,8 +33,8 @@ private module Authlib {
    * * `getAlgorithm()`'s result would be `"HS256"`.
    * * `getAlgorithmstring()`'s result would be `HS256`.
    */
-  private class AuthlibJWTEncodeCall extends DataFlow::CallCfgNode, JWTEncoding::Range {
-    AuthlibJWTEncodeCall() { this = authlibJWTEncode().getACall() }
+  private class AuthlibJwtEncodeCall extends DataFlow::CallCfgNode, JwtEncoding::Range {
+    AuthlibJwtEncodeCall() { this = authlibJwtEncode().getACall() }
 
     override DataFlow::Node getPayload() { result = this.getArg(1) }
 
@@ -69,8 +69,8 @@ private module Authlib {
    * * `getPayload()`'s result would be `token`.
    * * `getKey()`'s result would be `key`.
    */
-  private class AuthlibJWTDecodeCall extends DataFlow::CallCfgNode, JWTDecoding::Range {
-    AuthlibJWTDecodeCall() { this = authlibJWTDecode().getACall() }
+  private class AuthlibJwtDecodeCall extends DataFlow::CallCfgNode, JwtDecoding::Range {
+    AuthlibJwtDecodeCall() { this = authlibJwtDecode().getACall() }
 
     override DataFlow::Node getPayload() { result = this.getArg(0) }
 
diff --git a/python/ql/src/experimental/semmle/python/libraries/PyJWT.qll b/python/ql/src/experimental/semmle/python/libraries/PyJWT.qll
index b916d3be6f6..fb4764310c8 100644
--- a/python/ql/src/experimental/semmle/python/libraries/PyJWT.qll
+++ b/python/ql/src/experimental/semmle/python/libraries/PyJWT.qll
@@ -3,7 +3,7 @@ private import experimental.semmle.python.Concepts
 private import semmle.python.ApiGraphs
 private import experimental.semmle.python.frameworks.JWT
 
-private module PyJWT {
+private module PyJwt {
   /** Gets a reference to `jwt.encode` */
   private API::Node pyjwtEncode() { result = API::moduleImport("jwt").getMember("encode") }
 
@@ -25,8 +25,8 @@ private module PyJWT {
    * * `getAlgorithm()`'s result would be `"HS256"`.
    * * `getAlgorithmstring()`'s result would be `HS256`.
    */
-  private class PyJWTEncodeCall extends DataFlow::CallCfgNode, JWTEncoding::Range {
-    PyJWTEncodeCall() { this = pyjwtEncode().getACall() }
+  private class PyJwtEncodeCall extends DataFlow::CallCfgNode, JwtEncoding::Range {
+    PyJwtEncodeCall() { this = pyjwtEncode().getACall() }
 
     override DataFlow::Node getPayload() {
       result in [this.getArg(0), this.getArgByName("payload")]
@@ -63,8 +63,8 @@ private module PyJWT {
    * * `getOptions()`'s result would be `{"verify_signature": True}`.
    * * `verifiesSignature()` predicate would succeed.
    */
-  private class PyJWTDecodeCall extends DataFlow::CallCfgNode, JWTDecoding::Range {
-    PyJWTDecodeCall() { this = pyjwtDecode().getACall() }
+  private class PyJwtDecodeCall extends DataFlow::CallCfgNode, JwtDecoding::Range {
+    PyJwtDecodeCall() { this = pyjwtDecode().getACall() }
 
     override DataFlow::Node getPayload() { result in [this.getArg(0), this.getArgByName("jwt")] }
 
diff --git a/python/ql/src/experimental/semmle/python/libraries/PythonJose.qll b/python/ql/src/experimental/semmle/python/libraries/PythonJose.qll
index d91f32dd780..86efd7f86bf 100644
--- a/python/ql/src/experimental/semmle/python/libraries/PythonJose.qll
+++ b/python/ql/src/experimental/semmle/python/libraries/PythonJose.qll
@@ -5,13 +5,13 @@ private import experimental.semmle.python.frameworks.JWT
 
 private module PythonJose {
   /** Gets a reference to `jwt` */
-  private API::Node joseJWT() { result = API::moduleImport("jose").getMember("jwt") }
+  private API::Node joseJwt() { result = API::moduleImport("jose").getMember("jwt") }
 
   /** Gets a reference to `jwt.encode` */
-  private API::Node joseJWTEncode() { result = joseJWT().getMember("encode") }
+  private API::Node joseJwtEncode() { result = joseJwt().getMember("encode") }
 
   /** Gets a reference to `jwt.decode` */
-  private API::Node joseJWTDecode() { result = joseJWT().getMember("decode") }
+  private API::Node joseJwtDecode() { result = joseJwt().getMember("decode") }
 
   /**
    * Gets a call to `jwt.encode`.
@@ -28,8 +28,8 @@ private module PythonJose {
    * * `getAlgorithm()`'s result would be `"HS256"`.
    * * `getAlgorithmstring()`'s result would be `HS256`.
    */
-  private class JoseJWTEncodeCall extends DataFlow::CallCfgNode, JWTEncoding::Range {
-    JoseJWTEncodeCall() { this = joseJWTEncode().getACall() }
+  private class JoseJwtEncodeCall extends DataFlow::CallCfgNode, JwtEncoding::Range {
+    JoseJwtEncodeCall() { this = joseJwtEncode().getACall() }
 
     override DataFlow::Node getPayload() { result = this.getArg(0) }
 
@@ -64,8 +64,8 @@ private module PythonJose {
    * * `getOptions()`'s result would be none.
    * * `verifiesSignature()` predicate would succeed.
    */
-  private class JoseJWTDecodeCall extends DataFlow::CallCfgNode, JWTDecoding::Range {
-    JoseJWTDecodeCall() { this = joseJWTDecode().getACall() }
+  private class JoseJwtDecodeCall extends DataFlow::CallCfgNode, JwtDecoding::Range {
+    JoseJwtDecodeCall() { this = joseJwtDecode().getACall() }
 
     override DataFlow::Node getPayload() { result = this.getArg(0) }
 
diff --git a/python/ql/src/experimental/semmle/python/libraries/Python_JWT.qll b/python/ql/src/experimental/semmle/python/libraries/Python_JWT.qll
index 3a7bbc625bd..abfca2e6375 100644
--- a/python/ql/src/experimental/semmle/python/libraries/Python_JWT.qll
+++ b/python/ql/src/experimental/semmle/python/libraries/Python_JWT.qll
@@ -2,7 +2,7 @@ private import python
 private import experimental.semmle.python.Concepts
 private import semmle.python.ApiGraphs
 
-private module Python_JWT {
+private module Python_Jwt {
   /**
    * Gets a call to `python_jwt.process_jwt`.
    *
@@ -21,7 +21,7 @@ private module Python_JWT {
    * * `getOptions()`'s result would be `none()`.
    * * `verifiesSignature()` predicate would succeed.
    */
-  private class PythonJwtProcessCall extends DataFlow::CallCfgNode, JWTDecoding::Range {
+  private class PythonJwtProcessCall extends DataFlow::CallCfgNode, JwtDecoding::Range {
     PythonJwtProcessCall() {
       this = API::moduleImport("python_jwt").getMember("process_jwt").getACall()
     }
diff --git a/python/ql/src/experimental/semmle/python/security/LDAPInsecureAuth.qll b/python/ql/src/experimental/semmle/python/security/LDAPInsecureAuth.qll
index 442a21de30f..e8cae547c68 100644
--- a/python/ql/src/experimental/semmle/python/security/LDAPInsecureAuth.qll
+++ b/python/ql/src/experimental/semmle/python/security/LDAPInsecureAuth.qll
@@ -18,8 +18,8 @@ string getPrivateHostRegex() {
 }
 
 // "ldap://somethingon.theinternet.com"
-class LDAPFullHost extends StrConst {
-  LDAPFullHost() {
+class LdapFullHost extends StrConst {
+  LdapFullHost() {
     exists(string s |
       s = this.getText() and
       s.regexpMatch(getFullHostRegex()) and
@@ -29,27 +29,39 @@ class LDAPFullHost extends StrConst {
   }
 }
 
-class LDAPSchema extends StrConst {
-  LDAPSchema() { this.getText().regexpMatch(getSchemaRegex()) }
+/** DEPRECATED: Alias for LdapFullHost */
+deprecated class LDAPFullHost = LdapFullHost;
+
+class LdapSchema extends StrConst {
+  LdapSchema() { this.getText().regexpMatch(getSchemaRegex()) }
 }
 
-class LDAPPrivateHost extends StrConst {
-  LDAPPrivateHost() { this.getText().regexpMatch(getPrivateHostRegex()) }
+/** DEPRECATED: Alias for LdapSchema */
+deprecated class LDAPSchema = LdapSchema;
+
+class LdapPrivateHost extends StrConst {
+  LdapPrivateHost() { this.getText().regexpMatch(getPrivateHostRegex()) }
 }
 
-predicate concatAndCompareAgainstFullHostRegex(LDAPSchema schema, StrConst host) {
-  not host instanceof LDAPPrivateHost and
+/** DEPRECATED: Alias for LdapPrivateHost */
+deprecated class LDAPPrivateHost = LdapPrivateHost;
+
+predicate concatAndCompareAgainstFullHostRegex(LdapSchema schema, StrConst host) {
+  not host instanceof LdapPrivateHost and
   (schema.getText() + host.getText()).regexpMatch(getFullHostRegex())
 }
 
 // "ldap://" + "somethingon.theinternet.com"
-class LDAPBothStrings extends BinaryExpr {
-  LDAPBothStrings() { concatAndCompareAgainstFullHostRegex(this.getLeft(), this.getRight()) }
+class LdapBothStrings extends BinaryExpr {
+  LdapBothStrings() { concatAndCompareAgainstFullHostRegex(this.getLeft(), this.getRight()) }
 }
 
+/** DEPRECATED: Alias for LdapBothStrings */
+deprecated class LDAPBothStrings = LdapBothStrings;
+
 // schema + host
-class LDAPBothVar extends BinaryExpr {
-  LDAPBothVar() {
+class LdapBothVar extends BinaryExpr {
+  LdapBothVar() {
     exists(SsaVariable schemaVar, SsaVariable hostVar |
       this.getLeft() = schemaVar.getVariable().getALoad() and // getAUse is incompatible with Expr
       this.getRight() = hostVar.getVariable().getALoad() and
@@ -61,9 +73,12 @@ class LDAPBothVar extends BinaryExpr {
   }
 }
 
+/** DEPRECATED: Alias for LdapBothVar */
+deprecated class LDAPBothVar = LdapBothVar;
+
 // schema + "somethingon.theinternet.com"
-class LDAPVarString extends BinaryExpr {
-  LDAPVarString() {
+class LdapVarString extends BinaryExpr {
+  LdapVarString() {
     exists(SsaVariable schemaVar |
       this.getLeft() = schemaVar.getVariable().getALoad() and
       concatAndCompareAgainstFullHostRegex(schemaVar
@@ -74,9 +89,12 @@ class LDAPVarString extends BinaryExpr {
   }
 }
 
+/** DEPRECATED: Alias for LdapVarString */
+deprecated class LDAPVarString = LdapVarString;
+
 // "ldap://" + host
-class LDAPStringVar extends BinaryExpr {
-  LDAPStringVar() {
+class LdapStringVar extends BinaryExpr {
+  LdapStringVar() {
     exists(SsaVariable hostVar |
       this.getRight() = hostVar.getVariable().getALoad() and
       concatAndCompareAgainstFullHostRegex(this.getLeft(),
@@ -85,22 +103,28 @@ class LDAPStringVar extends BinaryExpr {
   }
 }
 
+/** DEPRECATED: Alias for LdapStringVar */
+deprecated class LDAPStringVar = LdapStringVar;
+
 /**
  * A taint-tracking configuration for detecting LDAP insecure authentications.
  */
-class LDAPInsecureAuthConfig extends TaintTracking::Configuration {
-  LDAPInsecureAuthConfig() { this = "LDAPInsecureAuthConfig" }
+class LdapInsecureAuthConfig extends TaintTracking::Configuration {
+  LdapInsecureAuthConfig() { this = "LDAPInsecureAuthConfig" }
 
   override predicate isSource(DataFlow::Node source) {
     source instanceof RemoteFlowSource or
-    source.asExpr() instanceof LDAPFullHost or
-    source.asExpr() instanceof LDAPBothStrings or
-    source.asExpr() instanceof LDAPBothVar or
-    source.asExpr() instanceof LDAPVarString or
-    source.asExpr() instanceof LDAPStringVar
+    source.asExpr() instanceof LdapFullHost or
+    source.asExpr() instanceof LdapBothStrings or
+    source.asExpr() instanceof LdapBothVar or
+    source.asExpr() instanceof LdapVarString or
+    source.asExpr() instanceof LdapStringVar
   }
 
   override predicate isSink(DataFlow::Node sink) {
-    exists(LDAPBind ldapBind | not ldapBind.useSSL() and sink = ldapBind.getHost())
+    exists(LdapBind ldapBind | not ldapBind.useSSL() and sink = ldapBind.getHost())
   }
 }
+
+/** DEPRECATED: Alias for LdapInsecureAuthConfig */
+deprecated class LDAPInsecureAuthConfig = LdapInsecureAuthConfig;
diff --git a/python/ql/src/experimental/semmle/python/security/injection/NoSQLInjection.qll b/python/ql/src/experimental/semmle/python/security/injection/NoSQLInjection.qll
index b442f6b130c..dea98168ae3 100644
--- a/python/ql/src/experimental/semmle/python/security/injection/NoSQLInjection.qll
+++ b/python/ql/src/experimental/semmle/python/security/injection/NoSQLInjection.qll
@@ -5,7 +5,7 @@ import semmle.python.dataflow.new.RemoteFlowSources
 import experimental.semmle.python.Concepts
 import semmle.python.Concepts
 
-module NoSQLInjection {
+module NoSqlInjection {
   class Configuration extends TaintTracking::Configuration {
     Configuration() { this = "NoSQLInjection" }
 
@@ -15,7 +15,7 @@ module NoSQLInjection {
     }
 
     override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) {
-      sink = any(NoSQLQuery noSQLQuery).getQuery() and
+      sink = any(NoSqlQuery noSqlQuery).getQuery() and
       state instanceof ConvertedToDict
     }
 
@@ -38,7 +38,7 @@ module NoSQLInjection {
     }
 
     override predicate isSanitizer(DataFlow::Node sanitizer) {
-      sanitizer = any(NoSQLSanitizer noSQLSanitizer).getAnInput()
+      sanitizer = any(NoSqlSanitizer noSqlSanitizer).getAnInput()
     }
   }
 
@@ -52,3 +52,6 @@ module NoSQLInjection {
     ConvertedToDict() { this = "ConvertedToDict" }
   }
 }
+
+/** DEPRECATED: Alias for NoSqlInjection */
+deprecated module NoSQLInjection = NoSqlInjection;
diff --git a/python/ql/src/experimental/semmle/python/security/injection/XSLT.qll b/python/ql/src/experimental/semmle/python/security/injection/XSLT.qll
index 56189a80891..eb696c60315 100644
--- a/python/ql/src/experimental/semmle/python/security/injection/XSLT.qll
+++ b/python/ql/src/experimental/semmle/python/security/injection/XSLT.qll
@@ -25,7 +25,7 @@ module XSLTInjection {
     ExternalXmlStringKind() { this = "etree.XML string" }
 
     override TaintKind getTaintForFlowStep(ControlFlowNode fromnode, ControlFlowNode tonode) {
-      etreeXML(fromnode, tonode) and result instanceof ExternalXmlKind
+      etreeXml(fromnode, tonode) and result instanceof ExternalXmlKind
       or
       etreeFromStringList(fromnode, tonode) and result instanceof ExternalXmlKind
       or
@@ -40,7 +40,7 @@ module XSLTInjection {
     ExternalXmlKind() { this = "lxml etree xml" }
   }
 
-  private predicate etreeXML(ControlFlowNode fromnode, CallNode tonode) {
+  private predicate etreeXml(ControlFlowNode fromnode, CallNode tonode) {
     // etree.XML("<xmlContent>")
     exists(CallNode call | call.getFunction().(AttrNode).getObject("XML").pointsTo(etree()) |
       call.getArg(0) = fromnode and
diff --git a/python/tools/recorded-call-graph-metrics/ql/lib/BytecodeExpr.qll b/python/tools/recorded-call-graph-metrics/ql/lib/BytecodeExpr.qll
index a63416ed65c..75c52925dcd 100644
--- a/python/tools/recorded-call-graph-metrics/ql/lib/BytecodeExpr.qll
+++ b/python/tools/recorded-call-graph-metrics/ql/lib/BytecodeExpr.qll
@@ -1,73 +1,106 @@
 import python
 
-abstract class XMLBytecodeExpr extends XMLElement { }
+abstract class XmlBytecodeExpr extends XMLElement { }
 
-class XMLBytecodeConst extends XMLBytecodeExpr {
-  XMLBytecodeConst() { this.hasName("BytecodeConst") }
+/** DEPRECATED: Alias for XmlBytecodeExpr */
+deprecated class XMLBytecodeExpr = XmlBytecodeExpr;
+
+class XmlBytecodeConst extends XmlBytecodeExpr {
+  XmlBytecodeConst() { this.hasName("BytecodeConst") }
 
   string get_value_data_raw() { result = this.getAChild("value").getTextValue() }
 }
 
-class XMLBytecodeVariableName extends XMLBytecodeExpr {
-  XMLBytecodeVariableName() { this.hasName("BytecodeVariableName") }
+/** DEPRECATED: Alias for XmlBytecodeConst */
+deprecated class XMLBytecodeConst = XmlBytecodeConst;
+
+class XmlBytecodeVariableName extends XmlBytecodeExpr {
+  XmlBytecodeVariableName() { this.hasName("BytecodeVariableName") }
 
   string get_name_data() { result = this.getAChild("name").getTextValue() }
 }
 
-class XMLBytecodeAttribute extends XMLBytecodeExpr {
-  XMLBytecodeAttribute() { this.hasName("BytecodeAttribute") }
+/** DEPRECATED: Alias for XmlBytecodeVariableName */
+deprecated class XMLBytecodeVariableName = XmlBytecodeVariableName;
+
+class XmlBytecodeAttribute extends XmlBytecodeExpr {
+  XmlBytecodeAttribute() { this.hasName("BytecodeAttribute") }
 
   string get_attr_name_data() { result = this.getAChild("attr_name").getTextValue() }
 
-  XMLBytecodeExpr get_object_data() { result.getParent() = this.getAChild("object") }
+  XmlBytecodeExpr get_object_data() { result.getParent() = this.getAChild("object") }
 }
 
-class XMLBytecodeSubscript extends XMLBytecodeExpr {
-  XMLBytecodeSubscript() { this.hasName("BytecodeSubscript") }
+/** DEPRECATED: Alias for XmlBytecodeAttribute */
+deprecated class XMLBytecodeAttribute = XmlBytecodeAttribute;
 
-  XMLBytecodeExpr get_key_data() { result.getParent() = this.getAChild("key") }
+class XmlBytecodeSubscript extends XmlBytecodeExpr {
+  XmlBytecodeSubscript() { this.hasName("BytecodeSubscript") }
 
-  XMLBytecodeExpr get_object_data() { result.getParent() = this.getAChild("object") }
+  XmlBytecodeExpr get_key_data() { result.getParent() = this.getAChild("key") }
+
+  XmlBytecodeExpr get_object_data() { result.getParent() = this.getAChild("object") }
 }
 
-class XMLBytecodeTuple extends XMLBytecodeExpr {
-  XMLBytecodeTuple() { this.hasName("BytecodeTuple") }
+/** DEPRECATED: Alias for XmlBytecodeSubscript */
+deprecated class XMLBytecodeSubscript = XmlBytecodeSubscript;
 
-  XMLBytecodeExpr get_elements_data(int index) {
+class XmlBytecodeTuple extends XmlBytecodeExpr {
+  XmlBytecodeTuple() { this.hasName("BytecodeTuple") }
+
+  XmlBytecodeExpr get_elements_data(int index) {
     result = this.getAChild("elements").getChild(index)
   }
 }
 
-class XMLBytecodeList extends XMLBytecodeExpr {
-  XMLBytecodeList() { this.hasName("BytecodeList") }
+/** DEPRECATED: Alias for XmlBytecodeTuple */
+deprecated class XMLBytecodeTuple = XmlBytecodeTuple;
 
-  XMLBytecodeExpr get_elements_data(int index) {
+class XmlBytecodeList extends XmlBytecodeExpr {
+  XmlBytecodeList() { this.hasName("BytecodeList") }
+
+  XmlBytecodeExpr get_elements_data(int index) {
     result = this.getAChild("elements").getChild(index)
   }
 }
 
-class XMLBytecodeCall extends XMLBytecodeExpr {
-  XMLBytecodeCall() { this.hasName("BytecodeCall") }
+/** DEPRECATED: Alias for XmlBytecodeList */
+deprecated class XMLBytecodeList = XmlBytecodeList;
 
-  XMLBytecodeExpr get_function_data() { result.getParent() = this.getAChild("function") }
+class XmlBytecodeCall extends XmlBytecodeExpr {
+  XmlBytecodeCall() { this.hasName("BytecodeCall") }
+
+  XmlBytecodeExpr get_function_data() { result.getParent() = this.getAChild("function") }
 }
 
-class XMLBytecodeUnknown extends XMLBytecodeExpr {
-  XMLBytecodeUnknown() { this.hasName("BytecodeUnknown") }
+/** DEPRECATED: Alias for XmlBytecodeCall */
+deprecated class XMLBytecodeCall = XmlBytecodeCall;
+
+class XmlBytecodeUnknown extends XmlBytecodeExpr {
+  XmlBytecodeUnknown() { this.hasName("BytecodeUnknown") }
 
   string get_opname_data() { result = this.getAChild("opname").getTextValue() }
 }
 
-class XMLBytecodeMakeFunction extends XMLBytecodeExpr {
-  XMLBytecodeMakeFunction() { this.hasName("BytecodeMakeFunction") }
+/** DEPRECATED: Alias for XmlBytecodeUnknown */
+deprecated class XMLBytecodeUnknown = XmlBytecodeUnknown;
 
-  XMLBytecodeExpr get_qualified_name_data() {
+class XmlBytecodeMakeFunction extends XmlBytecodeExpr {
+  XmlBytecodeMakeFunction() { this.hasName("BytecodeMakeFunction") }
+
+  XmlBytecodeExpr get_qualified_name_data() {
     result.getParent() = this.getAChild("qualified_name")
   }
 }
 
-class XMLSomethingInvolvingScaryBytecodeJump extends XMLBytecodeExpr {
-  XMLSomethingInvolvingScaryBytecodeJump() { this.hasName("SomethingInvolvingScaryBytecodeJump") }
+/** DEPRECATED: Alias for XmlBytecodeMakeFunction */
+deprecated class XMLBytecodeMakeFunction = XmlBytecodeMakeFunction;
+
+class XmlSomethingInvolvingScaryBytecodeJump extends XmlBytecodeExpr {
+  XmlSomethingInvolvingScaryBytecodeJump() { this.hasName("SomethingInvolvingScaryBytecodeJump") }
 
   string get_opname_data() { result = this.getAChild("opname").getTextValue() }
 }
+
+/** DEPRECATED: Alias for XmlSomethingInvolvingScaryBytecodeJump */
+deprecated class XMLSomethingInvolvingScaryBytecodeJump = XmlSomethingInvolvingScaryBytecodeJump;
diff --git a/python/tools/recorded-call-graph-metrics/ql/lib/RecordedCalls.qll b/python/tools/recorded-call-graph-metrics/ql/lib/RecordedCalls.qll
index 567996f9462..279edc5e27d 100644
--- a/python/tools/recorded-call-graph-metrics/ql/lib/RecordedCalls.qll
+++ b/python/tools/recorded-call-graph-metrics/ql/lib/RecordedCalls.qll
@@ -4,30 +4,36 @@ import semmle.python.objects.Callables
 import lib.BytecodeExpr
 
 /** The XML data for a recorded call (includes all data). */
-class XMLRecordedCall extends XMLElement {
-  XMLRecordedCall() { this.hasName("recorded_call") }
+class XmlRecordedCall extends XMLElement {
+  XmlRecordedCall() { this.hasName("recorded_call") }
 
   /** Gets the XML data for the call. */
-  XMLCall getXMLCall() { result.getParent() = this }
+  XmlCall getXmlCall() { result.getParent() = this }
+
+  /** DEPRECATED: Alias for getXmlCall */
+  deprecated XMLCall getXMLCall() { result = getXmlCall() }
 
   /** Gets a call matching the recorded information. */
-  Call getACall() { result = this.getXMLCall().getACall() }
+  Call getACall() { result = this.getXmlCall().getACall() }
 
   /** Gets the XML data for the callee. */
-  XMLCallee getXMLCallee() { result.getParent() = this }
+  XmlCallee getXmlCallee() { result.getParent() = this }
+
+  /** DEPRECATED: Alias for getXmlCallee */
+  deprecated XMLCallee getXMLCallee() { result = getXmlCallee() }
 
   /** Gets a python function matching the recorded information of the callee. */
-  Function getAPythonCallee() { result = this.getXMLCallee().(XMLPythonCallee).getACallee() }
+  Function getAPythonCallee() { result = this.getXmlCallee().(XmlPythonCallee).getACallee() }
 
   /** Gets a builtin function matching the recorded information of the callee. */
-  Builtin getABuiltinCallee() { result = this.getXMLCallee().(XMLExternalCallee).getACallee() }
+  Builtin getABuiltinCallee() { result = this.getXmlCallee().(XmlExternalCallee).getACallee() }
 
-  /** Get a different `XMLRecordedCall` with the same result-set for `getACall`. */
-  XMLRecordedCall getOtherWithSameSetOfCalls() {
+  /** Get a different `XmlRecordedCall` with the same result-set for `getACall`. */
+  XmlRecordedCall getOtherWithSameSetOfCalls() {
     // `rc` is for a different bytecode instruction on same line
-    not result.getXMLCall().get_inst_index_data() = this.getXMLCall().get_inst_index_data() and
-    result.getXMLCall().get_filename_data() = this.getXMLCall().get_filename_data() and
-    result.getXMLCall().get_linenum_data() = this.getXMLCall().get_linenum_data() and
+    not result.getXmlCall().get_inst_index_data() = this.getXmlCall().get_inst_index_data() and
+    result.getXmlCall().get_filename_data() = this.getXmlCall().get_filename_data() and
+    result.getXmlCall().get_linenum_data() = this.getXmlCall().get_linenum_data() and
     // set of calls are equal
     forall(Call call | call = this.getACall() or call = result.getACall() |
       call = this.getACall() and call = result.getACall()
@@ -37,23 +43,26 @@ class XMLRecordedCall extends XMLElement {
   override string toString() {
     exists(string path |
       path =
-        any(File file | file.getAbsolutePath() = this.getXMLCall().get_filename_data())
+        any(File file | file.getAbsolutePath() = this.getXmlCall().get_filename_data())
             .getRelativePath()
       or
       not exists(File file |
-        file.getAbsolutePath() = this.getXMLCall().get_filename_data() and
+        file.getAbsolutePath() = this.getXmlCall().get_filename_data() and
         exists(file.getRelativePath())
       ) and
-      path = this.getXMLCall().get_filename_data()
+      path = this.getXmlCall().get_filename_data()
     |
-      result = this.getName() + ": " + path + ":" + this.getXMLCall().get_linenum_data()
+      result = this.getName() + ": " + path + ":" + this.getXmlCall().get_linenum_data()
     )
   }
 }
 
+/** DEPRECATED: Alias for XmlRecordedCall */
+deprecated class XMLRecordedCall = XmlRecordedCall;
+
 /** The XML data for the call part a recorded call. */
-class XMLCall extends XMLElement {
-  XMLCall() { this.hasName("Call") }
+class XmlCall extends XMLElement {
+  XmlCall() { this.hasName("Call") }
 
   string get_filename_data() { result = this.getAChild("filename").getTextValue() }
 
@@ -68,8 +77,8 @@ class XMLCall extends XMLElement {
   }
 
   /** Holds if `expr` can be fully matched with `bytecode`. */
-  private predicate matchBytecodeExpr(Expr expr, XMLBytecodeExpr bytecode) {
-    exists(Call parent_call, XMLBytecodeCall parent_bytecode_call |
+  private predicate matchBytecodeExpr(Expr expr, XmlBytecodeExpr bytecode) {
+    exists(Call parent_call, XmlBytecodeCall parent_bytecode_call |
       parent_call
           .getLocation()
           .hasLocationInfo(this.get_filename_data(), this.get_linenum_data(), _, _, _) and
@@ -78,13 +87,13 @@ class XMLCall extends XMLElement {
       parent_bytecode_call.getAChild*() = bytecode
     ) and
     (
-      expr.(Name).getId() = bytecode.(XMLBytecodeVariableName).get_name_data()
+      expr.(Name).getId() = bytecode.(XmlBytecodeVariableName).get_name_data()
       or
-      expr.(Attribute).getName() = bytecode.(XMLBytecodeAttribute).get_attr_name_data() and
+      expr.(Attribute).getName() = bytecode.(XmlBytecodeAttribute).get_attr_name_data() and
       matchBytecodeExpr(expr.(Attribute).getObject(),
-        bytecode.(XMLBytecodeAttribute).get_object_data())
+        bytecode.(XmlBytecodeAttribute).get_object_data())
       or
-      matchBytecodeExpr(expr.(Call).getFunc(), bytecode.(XMLBytecodeCall).get_function_data())
+      matchBytecodeExpr(expr.(Call).getFunc(), bytecode.(XmlBytecodeCall).get_function_data())
       //
       // I considered allowing a partial match as well. That is, if the bytecode
       // expression information only tells us `<unknown>.foo()`, and we find an AST
@@ -101,12 +110,18 @@ class XMLCall extends XMLElement {
   }
 }
 
+/** DEPRECATED: Alias for XmlCall */
+deprecated class XMLCall = XmlCall;
+
 /** The XML data for the callee part a recorded call. */
-abstract class XMLCallee extends XMLElement { }
+abstract class XmlCallee extends XMLElement { }
+
+/** DEPRECATED: Alias for XmlCallee */
+deprecated class XMLCallee = XmlCallee;
 
 /** The XML data for the callee part a recorded call, when the callee is a Python function. */
-class XMLPythonCallee extends XMLCallee {
-  XMLPythonCallee() { this.hasName("PythonCallee") }
+class XmlPythonCallee extends XmlCallee {
+  XmlPythonCallee() { this.hasName("PythonCallee") }
 
   string get_filename_data() { result = this.getAChild("filename").getTextValue() }
 
@@ -125,9 +140,12 @@ class XMLPythonCallee extends XMLCallee {
   }
 }
 
+/** DEPRECATED: Alias for XmlPythonCallee */
+deprecated class XMLPythonCallee = XmlPythonCallee;
+
 /** The XML data for the callee part a recorded call, when the callee is a C function or builtin. */
-class XMLExternalCallee extends XMLCallee {
-  XMLExternalCallee() { this.hasName("ExternalCallee") }
+class XmlExternalCallee extends XmlCallee {
+  XmlExternalCallee() { this.hasName("ExternalCallee") }
 
   string get_module_data() { result = this.getAChild("module").getTextValue() }
 
@@ -143,6 +161,9 @@ class XMLExternalCallee extends XMLCallee {
   }
 }
 
+/** DEPRECATED: Alias for XmlExternalCallee */
+deprecated class XMLExternalCallee = XmlExternalCallee;
+
 /**
  * Helper predicate. If parent = `builtins` and qualname = `list.append`, it will
  * return the result of `builtins.list.append`.class
@@ -164,7 +185,7 @@ private Builtin traverse_qualname(Builtin parent, string qualname) {
 /**
  * A recorded call where we can identify both the `call` and the `callee` uniquely.
  */
-class IdentifiedRecordedCall extends XMLRecordedCall {
+class IdentifiedRecordedCall extends XmlRecordedCall {
   IdentifiedRecordedCall() {
     strictcount(this.getACall()) = 1 and
     (
@@ -182,7 +203,7 @@ class IdentifiedRecordedCall extends XMLRecordedCall {
     // is not recorded, we would still mark the other two recorded calls as valid
     // (which is not following the rules above). + 1 to count `this` as well.
     strictcount(this.getACall()) = strictcount(this.getOtherWithSameSetOfCalls()) + 1 and
-    forex(XMLRecordedCall rc | rc = this.getOtherWithSameSetOfCalls() |
+    forex(XmlRecordedCall rc | rc = this.getOtherWithSameSetOfCalls() |
       unique(Function f | f = this.getAPythonCallee()) =
         unique(Function f | f = rc.getAPythonCallee())
       or
@@ -214,7 +235,7 @@ class IdentifiedRecordedCall extends XMLRecordedCall {
 /**
  * A recorded call where we cannot identify both the `call` and the `callee` uniquely.
  */
-class UnidentifiedRecordedCall extends XMLRecordedCall {
+class UnidentifiedRecordedCall extends XmlRecordedCall {
   UnidentifiedRecordedCall() { not this instanceof IdentifiedRecordedCall }
 }
 
@@ -222,10 +243,10 @@ class UnidentifiedRecordedCall extends XMLRecordedCall {
  * A Recorded call made from outside the project folder. These can be ignored when evaluating
  * call-graph quality.
  */
-class IgnoredRecordedCall extends XMLRecordedCall {
+class IgnoredRecordedCall extends XmlRecordedCall {
   IgnoredRecordedCall() {
     not exists(
-      any(File file | file.getAbsolutePath() = this.getXMLCall().get_filename_data())
+      any(File file | file.getAbsolutePath() = this.getXmlCall().get_filename_data())
           .getRelativePath()
     )
   }
@@ -238,28 +259,28 @@ module PointsToBasedCallGraph {
     Value calleeValue;
 
     ResolvableRecordedCall() {
-      exists(Call call, XMLCallee xmlCallee |
+      exists(Call call, XmlCallee xmlCallee |
         call = this.getACall() and
         calleeValue.getACall() = call.getAFlowNode() and
-        xmlCallee = this.getXMLCallee() and
+        xmlCallee = this.getXmlCallee() and
         (
-          xmlCallee instanceof XMLPythonCallee and
+          xmlCallee instanceof XmlPythonCallee and
           (
             // normal function
-            calleeValue.(PythonFunctionValue).getScope() = xmlCallee.(XMLPythonCallee).getACallee()
+            calleeValue.(PythonFunctionValue).getScope() = xmlCallee.(XmlPythonCallee).getACallee()
             or
             // class instantiation -- points-to says the call goes to the class
             calleeValue.(ClassValue).lookup("__init__").(PythonFunctionValue).getScope() =
-              xmlCallee.(XMLPythonCallee).getACallee()
+              xmlCallee.(XmlPythonCallee).getACallee()
           )
           or
-          xmlCallee instanceof XMLExternalCallee and
+          xmlCallee instanceof XmlExternalCallee and
           calleeValue.(BuiltinFunctionObjectInternal).getBuiltin() =
-            xmlCallee.(XMLExternalCallee).getACallee()
+            xmlCallee.(XmlExternalCallee).getACallee()
           or
-          xmlCallee instanceof XMLExternalCallee and
+          xmlCallee instanceof XmlExternalCallee and
           calleeValue.(BuiltinMethodObjectInternal).getBuiltin() =
-            xmlCallee.(XMLExternalCallee).getACallee()
+            xmlCallee.(XmlExternalCallee).getACallee()
         )
       )
     }
diff --git a/python/tools/recorded-call-graph-metrics/ql/query/InternalMetrics.ql b/python/tools/recorded-call-graph-metrics/ql/query/InternalMetrics.ql
index fbe8758a7aa..e27f5cb0816 100644
--- a/python/tools/recorded-call-graph-metrics/ql/query/InternalMetrics.ql
+++ b/python/tools/recorded-call-graph-metrics/ql/query/InternalMetrics.ql
@@ -7,7 +7,7 @@ import lib.RecordedCalls
 
 from string text, float number, float ratio
 where
-  exists(int all_rcs | all_rcs = count(XMLRecordedCall rc) and ratio = number / all_rcs |
+  exists(int all_rcs | all_rcs = count(XmlRecordedCall rc) and ratio = number / all_rcs |
     text = "XMLRecordedCall" and number = all_rcs
     or
     text = "IdentifiedRecordedCall" and number = count(IdentifiedRecordedCall rc)
diff --git a/python/tools/recorded-call-graph-metrics/ql/query/Metrics.ql b/python/tools/recorded-call-graph-metrics/ql/query/Metrics.ql
index 2216e9dcb3d..c64cb37347e 100644
--- a/python/tools/recorded-call-graph-metrics/ql/query/Metrics.ql
+++ b/python/tools/recorded-call-graph-metrics/ql/query/Metrics.ql
@@ -3,7 +3,7 @@ import lib.RecordedCalls
 // column i is just used for sorting
 from string text, float number, float ratio, int i
 where
-  exists(int all_rcs | all_rcs = count(XMLRecordedCall rc) and ratio = number / all_rcs |
+  exists(int all_rcs | all_rcs = count(XmlRecordedCall rc) and ratio = number / all_rcs |
     text = "XMLRecordedCall" and number = all_rcs and i = 0
     or
     text = "IgnoredRecordedCall" and number = count(IgnoredRecordedCall rc) and i = 1
@@ -17,7 +17,7 @@ where
   i = 10
   or
   exists(int all_not_ignored_rcs |
-    all_not_ignored_rcs = count(XMLRecordedCall rc | not rc instanceof IgnoredRecordedCall) and
+    all_not_ignored_rcs = count(XmlRecordedCall rc | not rc instanceof IgnoredRecordedCall) and
     ratio = number / all_not_ignored_rcs
   |
     text = "IdentifiedRecordedCall" and
diff --git a/python/tools/recorded-call-graph-metrics/ql/query/UnknownOpcode.ql b/python/tools/recorded-call-graph-metrics/ql/query/UnknownOpcode.ql
index df2fe3f261f..98b65e6f8a2 100644
--- a/python/tools/recorded-call-graph-metrics/ql/query/UnknownOpcode.ql
+++ b/python/tools/recorded-call-graph-metrics/ql/query/UnknownOpcode.ql
@@ -4,6 +4,6 @@ import lib.RecordedCalls
 // Could be useful for deciding which new opcodes to support
 from string op_name, int c
 where
-  exists(XMLBytecodeUnknown unknown | unknown.get_opname_data() = op_name) and
-  c = count(XMLBytecodeUnknown unknown | unknown.get_opname_data() = op_name | 1)
+  exists(XmlBytecodeUnknown unknown | unknown.get_opname_data() = op_name) and
+  c = count(XmlBytecodeUnknown unknown | unknown.get_opname_data() = op_name | 1)
 select op_name, c order by c
diff --git a/ql/ql/src/codeql_ql/ast/Ast.qll b/ql/ql/src/codeql_ql/ast/Ast.qll
index 4f67c334d6c..26df3ea5a96 100644
--- a/ql/ql/src/codeql_ql/ast/Ast.qll
+++ b/ql/ql/src/codeql_ql/ast/Ast.qll
@@ -2299,35 +2299,38 @@ class BindingSet extends Annotation {
  */
 module YAML {
   /** A node in a YAML file */
-  class YAMLNode extends TYAMLNode, AstNode {
+  class YAMLNode extends TYamlNode, AstNode {
     /** Holds if the predicate is a root node (has no parent) */
     predicate isRoot() { not exists(this.getParent()) }
   }
 
   /** A YAML comment. */
-  class YAMLComment extends TYamlCommemt, YAMLNode {
+  class YamlComment extends TYamlCommemt, YAMLNode {
     QL::YamlComment yamlcomment;
 
-    YAMLComment() { this = TYamlCommemt(yamlcomment) }
+    YamlComment() { this = TYamlCommemt(yamlcomment) }
 
     override string getAPrimaryQlClass() { result = "YAMLComment" }
   }
 
+  /** DEPRECATED: Alias for YamlComment */
+  deprecated class YAMLComment = YamlComment;
+
   /** A YAML entry. */
-  class YAMLEntry extends TYamlEntry, YAMLNode {
+  class YamlEntry extends TYamlEntry, YAMLNode {
     QL::YamlEntry yamle;
 
-    YAMLEntry() { this = TYamlEntry(yamle) }
+    YamlEntry() { this = TYamlEntry(yamle) }
 
     /** Gets the key of this YAML entry. */
-    YAMLKey getKey() {
+    YamlKey getKey() {
       exists(QL::YamlKeyvaluepair pair |
         pair.getParent() = yamle and
         result = TYamlKey(pair.getKey())
       )
     }
 
-    YAMLListItem getListItem() { toQL(result).getParent() = yamle }
+    YamlListItem getListItem() { toQL(result).getParent() = yamle }
 
     /** Gets the value of this YAML entry. */
     YAMLValue getValue() {
@@ -2340,11 +2343,14 @@ module YAML {
     override string getAPrimaryQlClass() { result = "YAMLEntry" }
   }
 
+  /** DEPRECATED: Alias for YamlEntry */
+  deprecated class YAMLEntry = YamlEntry;
+
   /** A YAML key. */
-  class YAMLKey extends TYamlKey, YAMLNode {
+  class YamlKey extends TYamlKey, YAMLNode {
     QL::YamlKey yamlkey;
 
-    YAMLKey() { this = TYamlKey(yamlkey) }
+    YamlKey() { this = TYamlKey(yamlkey) }
 
     /**
      * Gets the value of this YAML key.
@@ -2361,7 +2367,7 @@ module YAML {
     string getNamePart(int i) {
       i = 0 and result = yamlkey.getChild(0).(QL::SimpleId).getValue()
       or
-      exists(YAMLKey child |
+      exists(YamlKey child |
         child = TYamlKey(yamlkey.getChild(1)) and
         result = child.getNamePart(i - 1)
       )
@@ -2376,11 +2382,14 @@ module YAML {
     }
   }
 
+  /** DEPRECATED: Alias for YamlKey */
+  deprecated class YAMLKey = YamlKey;
+
   /** A YAML list item. */
-  class YAMLListItem extends TYamlListitem, YAMLNode {
+  class YamlListItem extends TYamlListitem, YAMLNode {
     QL::YamlListitem yamllistitem;
 
-    YAMLListItem() { this = TYamlListitem(yamllistitem) }
+    YamlListItem() { this = TYamlListitem(yamllistitem) }
 
     /**
      * Gets the value of this YAML list item.
@@ -2390,6 +2399,9 @@ module YAML {
     override string getAPrimaryQlClass() { result = "YAMLListItem" }
   }
 
+  /** DEPRECATED: Alias for YamlListItem */
+  deprecated class YAMLListItem = YamlListItem;
+
   /** A YAML value. */
   class YAMLValue extends TYamlValue, YAMLNode {
     QL::YamlValue yamlvalue;
@@ -2414,7 +2426,7 @@ module YAML {
     QLPack() { this = MKQlPack(file) }
 
     private string getProperty(string name) {
-      exists(YAMLEntry entry |
+      exists(YamlEntry entry |
         entry.isRoot() and
         entry.getKey().getQualifiedName() = name and
         result = entry.getValue().getValue().trim() and
@@ -2436,8 +2448,8 @@ module YAML {
     /** Gets the file that this `QLPack` represents. */
     File getFile() { result = file }
 
-    private predicate isADependency(YAMLEntry entry) {
-      exists(YAMLEntry deps |
+    private predicate isADependency(YamlEntry entry) {
+      exists(YamlEntry deps |
         deps.getLocation().getFile() = file and entry.getLocation().getFile() = file
       |
         deps.isRoot() and
@@ -2446,7 +2458,7 @@ module YAML {
         entry.getLocation().getStartColumn() > deps.getLocation().getStartColumn()
       )
       or
-      exists(YAMLEntry prev | this.isADependency(prev) |
+      exists(YamlEntry prev | this.isADependency(prev) |
         prev.getLocation().getFile() = file and
         entry.getLocation().getFile() = file and
         entry.getLocation().getStartLine() = 1 + prev.getLocation().getStartLine() and
@@ -2455,7 +2467,7 @@ module YAML {
     }
 
     predicate hasDependency(string name, string version) {
-      exists(YAMLEntry entry | this.isADependency(entry) |
+      exists(YamlEntry entry | this.isADependency(entry) |
         entry.getKey().getQualifiedName().trim() = name and
         entry.getValue().getValue() = version
         or
diff --git a/ql/ql/src/codeql_ql/ast/internal/AstNodes.qll b/ql/ql/src/codeql_ql/ast/internal/AstNodes.qll
index c3d22be6346..78db2b73e73 100644
--- a/ql/ql/src/codeql_ql/ast/internal/AstNodes.qll
+++ b/ql/ql/src/codeql_ql/ast/internal/AstNodes.qll
@@ -84,7 +84,10 @@ class TCall = TPredicateCall or TMemberCall or TNoneCall or TAnyCall;
 
 class TModuleRef = TImport or TModuleExpr;
 
-class TYAMLNode = TYamlCommemt or TYamlEntry or TYamlKey or TYamlListitem or TYamlValue;
+class TYamlNode = TYamlCommemt or TYamlEntry or TYamlKey or TYamlListitem or TYamlValue;
+
+/** DEPRECATED: Alias for TYamlNode */
+deprecated class TYAMLNode = TYamlNode;
 
 private QL::AstNode toQLFormula(AST::AstNode n) {
   n = TConjunction(result) or
@@ -115,7 +118,7 @@ private QL::AstNode toQLExpr(AST::AstNode n) {
   n = TDontCare(result)
 }
 
-private QL::AstNode toGenerateYAML(AST::AstNode n) {
+private QL::AstNode toGenerateYaml(AST::AstNode n) {
   n = TYamlCommemt(result) or
   n = TYamlEntry(result) or
   n = TYamlKey(result) or
@@ -132,7 +135,7 @@ QL::AstNode toQL(AST::AstNode n) {
   or
   result = toQLFormula(n)
   or
-  result = toGenerateYAML(n)
+  result = toGenerateYaml(n)
   or
   result.(QL::ParExpr).getChild() = toQL(n)
   or
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/Files.qll b/ruby/ql/lib/codeql/ruby/frameworks/Files.qll
index 8ba0b96c2c1..888f1993d98 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/Files.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/Files.qll
@@ -69,7 +69,10 @@ abstract private class IOOrFileMethodCall extends DataFlow::CallNode {
   }
 
   /** Gets the API used to perform this call, either "IO" or "File" */
-  abstract string getAPI();
+  abstract string getApi();
+
+  /** DEPRECATED: Alias for getApi */
+  deprecated string getAPI() { result = getApi() }
 
   /** Gets a node representing the data read or written by this call */
   abstract DataFlow::Node getADataNodeImpl();
@@ -110,7 +113,10 @@ private class IOOrFileReadMethodCall extends IOOrFileMethodCall {
     )
   }
 
-  override string getAPI() { result = api }
+  override string getApi() { result = api }
+
+  /** DEPRECATED: Alias for getApi */
+  deprecated override string getAPI() { result = getApi() }
 
   override DataFlow::Node getADataNodeImpl() { result = this }
 
@@ -151,7 +157,10 @@ private class IOOrFileWriteMethodCall extends IOOrFileMethodCall {
     )
   }
 
-  override string getAPI() { result = api }
+  override string getApi() { result = api }
+
+  /** DEPRECATED: Alias for getApi */
+  deprecated override string getAPI() { result = getApi() }
 
   override DataFlow::Node getADataNodeImpl() { result = dataNode }
 
@@ -202,7 +211,7 @@ module IO {
    * that use a subclass of `IO` such as `File`.
    */
   class IOReader extends IOOrFileReadMethodCall {
-    IOReader() { this.getAPI() = "IO" }
+    IOReader() { this.getApi() = "IO" }
   }
 
   /**
@@ -221,7 +230,7 @@ module IO {
    * that use a subclass of `IO` such as `File`.
    */
   class IOWriter extends IOOrFileWriteMethodCall {
-    IOWriter() { this.getAPI() = "IO" }
+    IOWriter() { this.getApi() = "IO" }
   }
 
   /**
@@ -306,7 +315,7 @@ module File {
    * ```
    */
   class FileModuleReader extends IO::FileReader {
-    FileModuleReader() { this.getAPI() = "File" }
+    FileModuleReader() { this.getApi() = "File" }
 
     override DataFlow::Node getADataNode() { result = this.getADataNodeImpl() }
 
diff --git a/ruby/ql/lib/codeql/ruby/security/BadTagFilterQuery.qll b/ruby/ql/lib/codeql/ruby/security/BadTagFilterQuery.qll
index 51e294c4f61..e22c00ddc47 100644
--- a/ruby/ql/lib/codeql/ruby/security/BadTagFilterQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/BadTagFilterQuery.qll
@@ -176,8 +176,8 @@ private module RegexpMatching {
 }
 
 /** A class to test whether a regular expression matches certain HTML tags. */
-class HTMLMatchingRegExp extends RegexpMatching::MatchedRegExp {
-  HTMLMatchingRegExp() {
+class HtmlMatchingRegExp extends RegexpMatching::MatchedRegExp {
+  HtmlMatchingRegExp() {
     // the regexp must mention "<" and ">" explicitly.
     forall(string angleBracket | angleBracket = ["<", ">"] |
       any(RegExpConstant term | term.getValue().matches("%" + angleBracket + "%")).getRootTerm() =
@@ -204,12 +204,15 @@ class HTMLMatchingRegExp extends RegexpMatching::MatchedRegExp {
   }
 }
 
+/** DEPRECATED: Alias for HtmlMatchingRegExp */
+deprecated class HTMLMatchingRegExp = HtmlMatchingRegExp;
+
 /**
  * Holds if `regexp` matches some HTML tags, but misses some HTML tags that it should match.
  *
  * When adding a new case to this predicate, make sure the test string used in `matches(..)` calls are present in `HTMLMatchingRegExp::test` / `HTMLMatchingRegExp::testWithGroups`.
  */
-predicate isBadRegexpFilter(HTMLMatchingRegExp regexp, string msg) {
+predicate isBadRegexpFilter(HtmlMatchingRegExp regexp, string msg) {
   // CVE-2021-33829 - matching both "<!-- foo -->" and "<!-- foo --!>", but in different capture groups
   regexp.matches("<!-- foo -->") and
   regexp.matches("<!-- foo --!>") and
diff --git a/ruby/ql/lib/codeql/ruby/security/ReflectedXSSQuery.qll b/ruby/ql/lib/codeql/ruby/security/ReflectedXSSQuery.qll
index 60e152a06fc..f38a308a96d 100644
--- a/ruby/ql/lib/codeql/ruby/security/ReflectedXSSQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/ReflectedXSSQuery.qll
@@ -13,8 +13,8 @@ import codeql.ruby.TaintTracking
 /**
  * Provides a taint-tracking configuration for detecting "reflected server-side cross-site scripting" vulnerabilities.
  */
-module ReflectedXSS {
-  import XSS::ReflectedXSS
+module ReflectedXss {
+  import XSS::ReflectedXss
 
   /**
    * A taint-tracking configuration for detecting "reflected server-side cross-site scripting" vulnerabilities.
@@ -33,7 +33,10 @@ module ReflectedXSS {
     }
 
     override predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
-      isAdditionalXSSTaintStep(node1, node2)
+      isAdditionalXssTaintStep(node1, node2)
     }
   }
 }
+
+/** DEPRECATED: Alias for ReflectedXss */
+deprecated module ReflectedXSS = ReflectedXss;
diff --git a/ruby/ql/lib/codeql/ruby/security/StoredXSSQuery.qll b/ruby/ql/lib/codeql/ruby/security/StoredXSSQuery.qll
index 2a089050e5a..270e0fd63b0 100644
--- a/ruby/ql/lib/codeql/ruby/security/StoredXSSQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/StoredXSSQuery.qll
@@ -11,8 +11,8 @@ import ruby
 import codeql.ruby.DataFlow
 import codeql.ruby.TaintTracking
 
-module StoredXSS {
-  import XSS::StoredXSS
+module StoredXss {
+  import XSS::StoredXss
 
   /**
    * A taint-tracking configuration for reasoning about Stored XSS.
@@ -34,7 +34,10 @@ module StoredXSS {
     }
 
     override predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
-      isAdditionalXSSTaintStep(node1, node2)
+      isAdditionalXssTaintStep(node1, node2)
     }
   }
 }
+
+/** DEPRECATED: Alias for StoredXss */
+deprecated module StoredXSS = StoredXss;
diff --git a/ruby/ql/lib/codeql/ruby/security/XSS.qll b/ruby/ql/lib/codeql/ruby/security/XSS.qll
index 0c1c1576f2a..84c168a607c 100644
--- a/ruby/ql/lib/codeql/ruby/security/XSS.qll
+++ b/ruby/ql/lib/codeql/ruby/security/XSS.qll
@@ -245,7 +245,7 @@ private module Shared {
   /**
    * An additional step that is preserves dataflow in the context of XSS.
    */
-  predicate isAdditionalXSSFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
+  predicate isAdditionalXssFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
     isFlowFromLocals(node1, node2)
     or
     isFlowFromControllerInstanceVariable(node1, node2)
@@ -254,6 +254,9 @@ private module Shared {
     or
     isFlowFromHelperMethod(node1, node2)
   }
+
+  /** DEPRECATED: Alias for isAdditionalXssFlowStep */
+  deprecated predicate isAdditionalXSSFlowStep = isAdditionalXssFlowStep/2;
 }
 
 /**
@@ -261,7 +264,7 @@ private module Shared {
  * "reflected cross-site scripting" vulnerabilities, as well as
  * extension points for adding your own.
  */
-module ReflectedXSS {
+module ReflectedXss {
   /** A data flow source for stored XSS vulnerabilities. */
   abstract class Source extends Shared::Source { }
 
@@ -277,7 +280,10 @@ module ReflectedXSS {
   /**
    * An additional step that is preserves dataflow in the context of reflected XSS.
    */
-  predicate isAdditionalXSSTaintStep = Shared::isAdditionalXSSFlowStep/2;
+  predicate isAdditionalXssTaintStep = Shared::isAdditionalXssFlowStep/2;
+
+  /** DEPRECATED: Alias for isAdditionalXssTaintStep */
+  deprecated predicate isAdditionalXSSTaintStep = isAdditionalXssTaintStep/2;
 
   /**
    * A source of remote user input, considered as a flow source.
@@ -285,6 +291,9 @@ module ReflectedXSS {
   class RemoteFlowSourceAsSource extends Source, RemoteFlowSource { }
 }
 
+/** DEPRECATED: Alias for ReflectedXss */
+deprecated module ReflectedXSS = ReflectedXss;
+
 private module OrmTracking {
   /**
    * A data flow configuration to track flow from finder calls to field accesses.
@@ -298,7 +307,7 @@ private module OrmTracking {
     override predicate isSink(DataFlow2::Node sink) { sink instanceof DataFlow2::CallNode }
 
     override predicate isAdditionalFlowStep(DataFlow2::Node node1, DataFlow2::Node node2) {
-      Shared::isAdditionalXSSFlowStep(node1, node2)
+      Shared::isAdditionalXssFlowStep(node1, node2)
       or
       // Propagate flow through arbitrary method calls
       node2.(DataFlow2::CallNode).getReceiver() = node1
@@ -309,7 +318,7 @@ private module OrmTracking {
   }
 }
 
-module StoredXSS {
+module StoredXss {
   /** A data flow source for stored XSS vulnerabilities. */
   abstract class Source extends Shared::Source { }
 
@@ -325,7 +334,10 @@ module StoredXSS {
   /**
    * An additional step that preserves dataflow in the context of stored XSS.
    */
-  predicate isAdditionalXSSTaintStep = Shared::isAdditionalXSSFlowStep/2;
+  predicate isAdditionalXssTaintStep = Shared::isAdditionalXssFlowStep/2;
+
+  /** DEPRECATED: Alias for isAdditionalXssTaintStep */
+  deprecated predicate isAdditionalXSSTaintStep = isAdditionalXssTaintStep/2;
 
   private class OrmFieldAsSource extends Source instanceof DataFlow2::CallNode {
     OrmFieldAsSource() {
@@ -341,3 +353,6 @@ module StoredXSS {
   private class FileSystemReadAccessAsSource extends Source instanceof FileSystemReadAccess { }
   // TODO: Consider `FileNameSource` flowing to script tag `src` attributes and similar
 }
+
+/** DEPRECATED: Alias for StoredXss */
+deprecated module StoredXSS = StoredXss;
diff --git a/ruby/ql/src/queries/meta/internal/TaintMetrics.qll b/ruby/ql/src/queries/meta/internal/TaintMetrics.qll
index bfeccd53802..19e25f3a94b 100644
--- a/ruby/ql/src/queries/meta/internal/TaintMetrics.qll
+++ b/ruby/ql/src/queries/meta/internal/TaintMetrics.qll
@@ -25,7 +25,7 @@ DataFlow::Node relevantTaintSink(string kind) {
     or
     kind = "CommandInjection" and result instanceof CommandInjection::Sink
     or
-    kind = "XSS" and result instanceof ReflectedXSS::Sink
+    kind = "XSS" and result instanceof ReflectedXss::Sink
     or
     kind = "PathInjection" and result instanceof PathInjection::Sink
     or
diff --git a/ruby/ql/src/queries/security/cwe-079/ReflectedXSS.ql b/ruby/ql/src/queries/security/cwe-079/ReflectedXSS.ql
index d3f95f69fea..c66fec03340 100644
--- a/ruby/ql/src/queries/security/cwe-079/ReflectedXSS.ql
+++ b/ruby/ql/src/queries/security/cwe-079/ReflectedXSS.ql
@@ -18,7 +18,7 @@ import codeql.ruby.security.ReflectedXSSQuery
 import codeql.ruby.DataFlow
 import DataFlow::PathGraph
 
-from ReflectedXSS::Configuration config, DataFlow::PathNode source, DataFlow::PathNode sink
+from ReflectedXss::Configuration config, DataFlow::PathNode source, DataFlow::PathNode sink
 where config.hasFlowPath(source, sink)
 select sink.getNode(), source, sink, "Cross-site scripting vulnerability due to $@.",
   source.getNode(), "a user-provided value"
diff --git a/ruby/ql/src/queries/security/cwe-079/StoredXSS.ql b/ruby/ql/src/queries/security/cwe-079/StoredXSS.ql
index e473d5c31e9..dd58b0000c9 100644
--- a/ruby/ql/src/queries/security/cwe-079/StoredXSS.ql
+++ b/ruby/ql/src/queries/security/cwe-079/StoredXSS.ql
@@ -17,7 +17,7 @@ import codeql.ruby.security.StoredXSSQuery
 import codeql.ruby.DataFlow
 import DataFlow::PathGraph
 
-from StoredXSS::Configuration config, DataFlow::PathNode source, DataFlow::PathNode sink
+from StoredXss::Configuration config, DataFlow::PathNode source, DataFlow::PathNode sink
 where config.hasFlowPath(source, sink)
 select sink.getNode(), source, sink, "Cross-site scripting vulnerability due to $@",
   source.getNode(), "stored value"
diff --git a/ruby/ql/src/queries/security/cwe-089/SqlInjection.ql b/ruby/ql/src/queries/security/cwe-089/SqlInjection.ql
index dbffd00290f..c2ce3611b49 100644
--- a/ruby/ql/src/queries/security/cwe-089/SqlInjection.ql
+++ b/ruby/ql/src/queries/security/cwe-089/SqlInjection.ql
@@ -19,8 +19,8 @@ import codeql.ruby.dataflow.RemoteFlowSources
 import codeql.ruby.TaintTracking
 import DataFlow::PathGraph
 
-class SQLInjectionConfiguration extends TaintTracking::Configuration {
-  SQLInjectionConfiguration() { this = "SQLInjectionConfiguration" }
+class SqlInjectionConfiguration extends TaintTracking::Configuration {
+  SqlInjectionConfiguration() { this = "SQLInjectionConfiguration" }
 
   override predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
@@ -32,7 +32,7 @@ class SQLInjectionConfiguration extends TaintTracking::Configuration {
   }
 }
 
-from SQLInjectionConfiguration config, DataFlow::PathNode source, DataFlow::PathNode sink
+from SqlInjectionConfiguration config, DataFlow::PathNode source, DataFlow::PathNode sink
 where config.hasFlowPath(source, sink)
 select sink.getNode(), source, sink, "This SQL query depends on $@.", source.getNode(),
   "a user-provided value"
diff --git a/ruby/ql/src/queries/security/cwe-116/BadTagFilter.ql b/ruby/ql/src/queries/security/cwe-116/BadTagFilter.ql
index 47587c7af4f..80829e2f062 100644
--- a/ruby/ql/src/queries/security/cwe-116/BadTagFilter.ql
+++ b/ruby/ql/src/queries/security/cwe-116/BadTagFilter.ql
@@ -16,6 +16,6 @@
 
 import codeql.ruby.security.BadTagFilterQuery
 
-from HTMLMatchingRegExp regexp, string msg
+from HtmlMatchingRegExp regexp, string msg
 where msg = min(string m | isBadRegexpFilter(regexp, m) | m order by m.length(), m) // there might be multiple, we arbitrarily pick the shortest one
 select regexp, msg