diff --git a/ql/src/codeql_ruby/ast/Call.qll b/ql/src/codeql_ruby/ast/Call.qll
index 2e6ff94aa0b..c7a73c1fa7e 100644
--- a/ql/src/codeql_ruby/ast/Call.qll
+++ b/ql/src/codeql_ruby/ast/Call.qll
@@ -164,7 +164,7 @@ class BlockArgument extends Expr, @block_argument {
    * foo(&bar)
    * ```
    */
-  final Expr getExpr() { result = range.getExpr() }
+  final Expr getValue() { result = range.getValue() }
 }
 
 /**
@@ -185,7 +185,7 @@ class SplatArgument extends Expr, @splat_argument {
    * foo(*bar)
    * ```
    */
-  final Expr getExpr() { result = range.getExpr() }
+  final Expr getValue() { result = range.getValue() }
 }
 
 /**
@@ -206,5 +206,5 @@ class HashSplatArgument extends Expr, @hash_splat_argument {
    * foo(**bar)
    * ```
    */
-  final Expr getExpr() { result = range.getExpr() }
+  final Expr getValue() { result = range.getValue() }
 }
diff --git a/ql/src/codeql_ruby/ast/Control.qll b/ql/src/codeql_ruby/ast/Control.qll
index e9ff5675778..36893065fd5 100644
--- a/ql/src/codeql_ruby/ast/Control.qll
+++ b/ql/src/codeql_ruby/ast/Control.qll
@@ -151,7 +151,7 @@ class IfModifierExpr extends ConditionalExpr, @if_modifier {
    * foo if bar
    * ```
    */
-  final Stmt getExpr() { result = range.getExpr() }
+  final Stmt getBody() { result = range.getBody() }
 }
 
 /**
@@ -172,7 +172,7 @@ class UnlessModifierExpr extends ConditionalExpr, @unless_modifier {
    * foo unless bar
    * ```
    */
-  final Stmt getExpr() { result = range.getExpr() }
+  final Stmt getBody() { result = range.getBody() }
 }
 
 /**
diff --git a/ql/src/codeql_ruby/ast/internal/Call.qll b/ql/src/codeql_ruby/ast/internal/Call.qll
index a7d16a96900..697b57653e9 100644
--- a/ql/src/codeql_ruby/ast/internal/Call.qll
+++ b/ql/src/codeql_ruby/ast/internal/Call.qll
@@ -223,12 +223,12 @@ module BlockArgument {
   class Range extends Expr::Range, @block_argument {
     final override Generated::BlockArgument generated;
 
-    final Expr getExpr() { result = generated.getChild() }
+    final Expr getValue() { result = generated.getChild() }
 
     final override string toString() { result = "&..." }
 
     final override predicate child(string label, AstNode::Range child) {
-      label = "getExpr" and child = getExpr()
+      label = "getValue" and child = getValue()
     }
   }
 }
@@ -237,12 +237,12 @@ module SplatArgument {
   class Range extends Expr::Range, @splat_argument {
     final override Generated::SplatArgument generated;
 
-    final Expr getExpr() { result = generated.getChild() }
+    final Expr getValue() { result = generated.getChild() }
 
     final override string toString() { result = "*..." }
 
     final override predicate child(string label, AstNode::Range child) {
-      label = "getExpr" and child = getExpr()
+      label = "getValue" and child = getValue()
     }
   }
 }
@@ -251,12 +251,12 @@ module HashSplatArgument {
   class Range extends Expr::Range, @hash_splat_argument {
     final override Generated::HashSplatArgument generated;
 
-    final Expr getExpr() { result = generated.getChild() }
+    final Expr getValue() { result = generated.getChild() }
 
     final override string toString() { result = "**..." }
 
     final override predicate child(string label, AstNode::Range child) {
-      label = "getExpr" and child = getExpr()
+      label = "getValue" and child = getValue()
     }
   }
 }
diff --git a/ql/src/codeql_ruby/ast/internal/Control.qll b/ql/src/codeql_ruby/ast/internal/Control.qll
index adc3d4ea982..3f034ce20b3 100644
--- a/ql/src/codeql_ruby/ast/internal/Control.qll
+++ b/ql/src/codeql_ruby/ast/internal/Control.qll
@@ -108,16 +108,16 @@ module IfModifierExpr {
 
     final override Expr getCondition() { result = generated.getCondition() }
 
-    final Stmt getExpr() { result = generated.getBody() }
+    final Stmt getBody() { result = generated.getBody() }
 
-    final override Stmt getBranch(boolean cond) { cond = true and result = getExpr() }
+    final override Stmt getBranch(boolean cond) { cond = true and result = getBody() }
 
     final override string toString() { result = "... if ..." }
 
     override predicate child(string label, AstNode::Range child) {
       ConditionalExpr::Range.super.child(label, child)
       or
-      label = "getExpr" and child = getExpr()
+      label = "getBody" and child = getBody()
     }
   }
 }
@@ -128,16 +128,16 @@ module UnlessModifierExpr {
 
     final override Expr getCondition() { result = generated.getCondition() }
 
-    final Stmt getExpr() { result = generated.getBody() }
+    final Stmt getBody() { result = generated.getBody() }
 
-    final override Stmt getBranch(boolean cond) { cond = false and result = getExpr() }
+    final override Stmt getBranch(boolean cond) { cond = false and result = getBody() }
 
     final override string toString() { result = "... unless ..." }
 
     override predicate child(string label, AstNode::Range child) {
       ConditionalExpr::Range.super.child(label, child)
       or
-      label = "getExpr" and child = getExpr()
+      label = "getBody" and child = getBody()
     }
   }
 }
diff --git a/ql/test/library-tests/ast/calls/arguments.ql b/ql/test/library-tests/ast/calls/arguments.ql
index c4086e496ec..80266b3159d 100644
--- a/ql/test/library-tests/ast/calls/arguments.ql
+++ b/ql/test/library-tests/ast/calls/arguments.ql
@@ -1,10 +1,10 @@
 import ruby
 
-query predicate blockArguments(BlockArgument a, Expr e) { e = a.getExpr() }
+query predicate blockArguments(BlockArgument a, Expr e) { e = a.getValue() }
 
-query predicate splatArguments(SplatArgument a, Expr e) { e = a.getExpr() }
+query predicate splatArguments(SplatArgument a, Expr e) { e = a.getValue() }
 
-query predicate hashSplatArguments(HashSplatArgument a, Expr e) { e = a.getExpr() }
+query predicate hashSplatArguments(HashSplatArgument a, Expr e) { e = a.getValue() }
 
 query predicate keywordArguments(Pair a, Expr key, Expr value) {
   exists(Call c | c.getAnArgument() = a and key = a.getKey() and value = a.getValue())
diff --git a/ql/test/library-tests/ast/control/ConditionalExpr.ql b/ql/test/library-tests/ast/control/ConditionalExpr.ql
index 6e209b2d3fc..bd0e5fbe623 100644
--- a/ql/test/library-tests/ast/control/ConditionalExpr.ql
+++ b/ql/test/library-tests/ast/control/ConditionalExpr.ql
@@ -30,13 +30,13 @@ query predicate unlessExprs(
 query predicate ifModifierExprs(IfModifierExpr e, string pClass, Expr cond, Expr expr) {
   pClass = e.getAPrimaryQlClass() and
   cond = e.getCondition() and
-  expr = e.getExpr()
+  expr = e.getBody()
 }
 
 query predicate unlessModifierExprs(UnlessModifierExpr e, string pClass, Expr cond, Expr expr) {
   pClass = e.getAPrimaryQlClass() and
   cond = e.getCondition() and
-  expr = e.getExpr()
+  expr = e.getBody()
 }
 
 query predicate ternaryIfExprs(