diff --git a/ql/src/codeql_ruby/ast/Statement.qll b/ql/src/codeql_ruby/ast/Statement.qll
index 8cc65fd7d8a..79f8dc935d5 100644
--- a/ql/src/codeql_ruby/ast/Statement.qll
+++ b/ql/src/codeql_ruby/ast/Statement.qll
@@ -9,10 +9,10 @@ private import codeql_ruby.ast.internal.TreeSitter
  *
  * This is the root QL class for all statements.
  */
-class Statement extends AstNode {
-  Statement::Range range;
+class Stmt extends AstNode {
+  Stmt::Range range;
 
-  Statement() { this = range }
+  Stmt() { this = range }
 
   /** Gets a control-flow node for this statement, if any. */
   CfgNodes::AstCfgNode getAControlFlowNode() { result.getNode() = this }
@@ -36,8 +36,8 @@ class Statement extends AstNode {
  * next value
  * ```
  */
-class ReturningStatement extends Statement {
-  override ReturningStatement::Range range;
+class ReturningStmt extends Stmt {
+  override ReturningStmt::Range range;
 
   final override string toString() { result = range.toString() }
 
@@ -60,7 +60,7 @@ class ReturningStatement extends Statement {
  * return value
  * ```
  */
-class ReturnStmt extends ReturningStatement, @return {
+class ReturnStmt extends ReturningStmt, @return {
   final override ReturnStmt::Range range;
 
   final override string getAPrimaryQlClass() { result = "ReturnStmt" }
@@ -73,7 +73,7 @@ class ReturnStmt extends ReturningStatement, @return {
  * break value
  * ```
  */
-class BreakStmt extends ReturningStatement, @break {
+class BreakStmt extends ReturningStmt, @break {
   final override BreakStmt::Range range;
 
   final override string getAPrimaryQlClass() { result = "BreakStmt" }
@@ -86,7 +86,7 @@ class BreakStmt extends ReturningStatement, @break {
  * next value
  * ```
  */
-class NextStmt extends ReturningStatement, @next {
+class NextStmt extends ReturningStmt, @next {
   final override NextStmt::Range range;
 
   final override string getAPrimaryQlClass() { result = "NextStmt" }
diff --git a/ql/src/codeql_ruby/ast/internal/Statement.qll b/ql/src/codeql_ruby/ast/internal/Statement.qll
index d09b5027023..3d61261e37e 100644
--- a/ql/src/codeql_ruby/ast/internal/Statement.qll
+++ b/ql/src/codeql_ruby/ast/internal/Statement.qll
@@ -1,18 +1,18 @@
 private import codeql_ruby.AST
 private import codeql_ruby.ast.internal.TreeSitter
 
-module Statement {
+module Stmt {
   abstract class Range extends AstNode { }
 }
 
-module ReturningStatement {
-  abstract class Range extends Statement::Range {
+module ReturningStmt {
+  abstract class Range extends Stmt::Range {
     abstract Generated::ArgumentList getArgumentList();
   }
 }
 
 module ReturnStmt {
-  class Range extends ReturningStatement::Range, @return {
+  class Range extends ReturningStmt::Range, @return {
     final override Generated::Return generated;
 
     final override string toString() { result = "return" }
@@ -22,7 +22,7 @@ module ReturnStmt {
 }
 
 module BreakStmt {
-  class Range extends ReturningStatement::Range, @break {
+  class Range extends ReturningStmt::Range, @break {
     final override Generated::Break generated;
 
     final override string toString() { result = "break" }
@@ -32,7 +32,7 @@ module BreakStmt {
 }
 
 module NextStmt {
-  class Range extends ReturningStatement::Range, @next {
+  class Range extends ReturningStmt::Range, @next {
     final override Generated::Next generated;
 
     final override string toString() { result = "next" }
diff --git a/ql/src/codeql_ruby/controlflow/CfgNodes.qll b/ql/src/codeql_ruby/controlflow/CfgNodes.qll
index c0296624b3a..4cce51e6f84 100644
--- a/ql/src/codeql_ruby/controlflow/CfgNodes.qll
+++ b/ql/src/codeql_ruby/controlflow/CfgNodes.qll
@@ -108,7 +108,7 @@ class ExprCfgNode extends AstCfgNode {
 
 /** A control-flow node that wraps a return-like statement. */
 class ReturningCfgNode extends AstCfgNode {
-  ReturningStatement s;
+  ReturningStmt s;
 
   ReturningCfgNode() { s = this.getNode() }