diff --git a/generator/src/ql_gen.rs b/generator/src/ql_gen.rs
index ed6567face4..3a26c0ee018 100644
--- a/generator/src/ql_gen.rs
+++ b/generator/src/ql_gen.rs
@@ -486,7 +486,7 @@ pub fn convert_nodes<'a>(nodes: &'a node_types::NodeTypeMap) -> Vec<ql::TopLevel
                 } else {
                     fields
                         .iter()
-                        .filter(|&f| matches!(f.storage, node_types::Storage::Column{..}))
+                        .filter(|&f| matches!(f.storage, node_types::Storage::Column { .. }))
                         .count()
                 };
 
diff --git a/ql/src/codeql_ruby/ast/Expr.qll b/ql/src/codeql_ruby/ast/Expr.qll
index 6e47c15f215..ef38e6d18c3 100644
--- a/ql/src/codeql_ruby/ast/Expr.qll
+++ b/ql/src/codeql_ruby/ast/Expr.qll
@@ -165,10 +165,10 @@ class BodyStatement extends StmtSequence {
   override BodyStatement::Range range;
 
   /** Gets the `n`th rescue clause in this block. */
-  final Rescue getRescue(int n) { result = range.getRescue(n) }
+  final RescueClause getRescue(int n) { result = range.getRescue(n) }
 
   /** Gets a rescue clause in this block. */
-  final Rescue getARescue() { result = this.getRescue(_) }
+  final RescueClause getARescue() { result = this.getRescue(_) }
 
   /** Gets the `else` clause in this block, if any. */
   final StmtSequence getElse() { result = range.getElse() }
@@ -247,10 +247,10 @@ class Pair extends Expr, @pair {
  *   puts msg
  * end
  */
-class Rescue extends Expr, @rescue {
-  final override Rescue::Range range;
+class RescueClause extends Expr, @rescue {
+  final override RescueClause::Range range;
 
-  final override string getAPrimaryQlClass() { result = "Rescue" }
+  final override string getAPrimaryQlClass() { result = "RescueClause" }
 
   /**
    * Gets the `n`th exception to match, if any. For example `FirstError` or `SecondError` in:
@@ -301,13 +301,13 @@ class Rescue extends Expr, @rescue {
  * contents = read_file rescue ""
  * ```
  */
-class RescueExpr extends Expr, @rescue_modifier {
-  final override RescueExpr::Range range;
+class RescueModifierExpr extends Expr, @rescue_modifier {
+  final override RescueModifierExpr::Range range;
 
-  final override string getAPrimaryQlClass() { result = "RescueExpr" }
+  final override string getAPrimaryQlClass() { result = "RescueModifierExpr" }
 
   /**
-   * Gets the body of this `RescueExpr`.
+   * Gets the body of this `RescueModifierExpr`.
    * ```rb
    * body rescue handler
    * ```
@@ -315,7 +315,7 @@ class RescueExpr extends Expr, @rescue_modifier {
   final Stmt getBody() { result = range.getBody() }
 
   /**
-   * Gets the exception handler of this `RescueExpr`.
+   * Gets the exception handler of this `RescueModifierExpr`.
    * ```rb
    * body rescue handler
    * ```
diff --git a/ql/src/codeql_ruby/ast/internal/Expr.qll b/ql/src/codeql_ruby/ast/internal/Expr.qll
index 4963a218cbe..c395511e43f 100644
--- a/ql/src/codeql_ruby/ast/internal/Expr.qll
+++ b/ql/src/codeql_ruby/ast/internal/Expr.qll
@@ -234,7 +234,7 @@ module BodyStatement {
         )
     }
 
-    final Rescue getRescue(int n) {
+    final RescueClause getRescue(int n) {
       result = rank[n + 1](Generated::Rescue node, int i | node = getChild(i) | node order by i)
     }
 
@@ -306,7 +306,7 @@ module Ensure {
   }
 }
 
-module Rescue {
+module RescueClause {
   class Range extends Expr::Range, @rescue {
     final override Generated::Rescue generated;
 
@@ -320,7 +320,7 @@ module Rescue {
   }
 }
 
-module RescueExpr {
+module RescueModifierExpr {
   class Range extends Expr::Range, @rescue_modifier {
     final override Generated::RescueModifier generated;