diff --git a/buildSrc/src/main/kotlin/partiql.versions.kt b/buildSrc/src/main/kotlin/partiql.versions.kt
index 85147f3f9..a92ad9809 100644
--- a/buildSrc/src/main/kotlin/partiql.versions.kt
+++ b/buildSrc/src/main/kotlin/partiql.versions.kt
@@ -39,7 +39,6 @@ object Versions {
     const val kotlinxCollections = "0.3.5"
     const val picoCli = "4.7.0"
     const val kasechange = "1.3.0"
-    const val kotlinLombok = "1.9.20"
     const val kotlinxCoroutines = "1.8.1"
     const val kotlinxCoroutinesJdk8 = "1.8.1"
     const val ktlint = "0.42.1" // we're on an old version of ktlint. TODO upgrade https://github.com/partiql/partiql-lang-kotlin/issues/1418
@@ -110,6 +109,5 @@ object Plugins {
     const val detekt = "io.gitlab.arturbosch.detekt"
     const val dokka = "org.jetbrains.dokka"
     const val library = "org.gradle.java-library"
-    const val kotlinLombok = "org.jetbrains.kotlin.plugin.lombok"
     const val testFixtures = "org.gradle.java-test-fixtures"
 }
\ No newline at end of file
diff --git a/partiql-ast/api/partiql-ast.api b/partiql-ast/api/partiql-ast.api
index 3214ba3c1..2b105b863 100644
--- a/partiql-ast/api/partiql-ast.api
+++ b/partiql-ast/api/partiql-ast.api
@@ -5805,13 +5805,13 @@ public class org/partiql/ast/v1/Exclude : org/partiql/ast/v1/AstNode {
 	public final field excludePaths Ljava/util/List;
 	public fun <init> (Ljava/util/List;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/Exclude$ExcludeBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/Exclude$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/Exclude$ExcludeBuilder {
+public class org/partiql/ast/v1/Exclude$Builder {
 	public fun build ()Lorg/partiql/ast/v1/Exclude;
-	public fun excludePaths (Ljava/util/List;)Lorg/partiql/ast/v1/Exclude$ExcludeBuilder;
+	public fun excludePaths (Ljava/util/List;)Lorg/partiql/ast/v1/Exclude$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -5820,14 +5820,14 @@ public class org/partiql/ast/v1/ExcludePath : org/partiql/ast/v1/AstNode {
 	public final field root Lorg/partiql/ast/v1/expr/ExprVarRef;
 	public fun <init> (Lorg/partiql/ast/v1/expr/ExprVarRef;Ljava/util/List;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/ExcludePath$ExcludePathBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/ExcludePath$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/ExcludePath$ExcludePathBuilder {
+public class org/partiql/ast/v1/ExcludePath$Builder {
 	public fun build ()Lorg/partiql/ast/v1/ExcludePath;
-	public fun excludeSteps (Ljava/util/List;)Lorg/partiql/ast/v1/ExcludePath$ExcludePathBuilder;
-	public fun root (Lorg/partiql/ast/v1/expr/ExprVarRef;)Lorg/partiql/ast/v1/ExcludePath$ExcludePathBuilder;
+	public fun excludeSteps (Ljava/util/List;)Lorg/partiql/ast/v1/ExcludePath$Builder;
+	public fun root (Lorg/partiql/ast/v1/expr/ExprVarRef;)Lorg/partiql/ast/v1/ExcludePath$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -5839,23 +5839,23 @@ public class org/partiql/ast/v1/ExcludeStep$CollIndex : org/partiql/ast/v1/Exclu
 	public final field index I
 	public fun <init> (I)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/ExcludeStep$CollIndex$CollIndexBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/ExcludeStep$CollIndex$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/ExcludeStep$CollIndex$CollIndexBuilder {
+public class org/partiql/ast/v1/ExcludeStep$CollIndex$Builder {
 	public fun build ()Lorg/partiql/ast/v1/ExcludeStep$CollIndex;
-	public fun index (I)Lorg/partiql/ast/v1/ExcludeStep$CollIndex$CollIndexBuilder;
+	public fun index (I)Lorg/partiql/ast/v1/ExcludeStep$CollIndex$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
 public class org/partiql/ast/v1/ExcludeStep$CollWildcard : org/partiql/ast/v1/ExcludeStep {
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/ExcludeStep$CollWildcard$CollWildcardBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/ExcludeStep$CollWildcard$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/ExcludeStep$CollWildcard$CollWildcardBuilder {
+public class org/partiql/ast/v1/ExcludeStep$CollWildcard$Builder {
 	public fun build ()Lorg/partiql/ast/v1/ExcludeStep$CollWildcard;
 	public fun toString ()Ljava/lang/String;
 }
@@ -5864,23 +5864,23 @@ public class org/partiql/ast/v1/ExcludeStep$StructField : org/partiql/ast/v1/Exc
 	public final field symbol Lorg/partiql/ast/v1/Identifier;
 	public fun <init> (Lorg/partiql/ast/v1/Identifier;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/ExcludeStep$StructField$StructFieldBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/ExcludeStep$StructField$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/ExcludeStep$StructField$StructFieldBuilder {
+public class org/partiql/ast/v1/ExcludeStep$StructField$Builder {
 	public fun build ()Lorg/partiql/ast/v1/ExcludeStep$StructField;
-	public fun symbol (Lorg/partiql/ast/v1/Identifier;)Lorg/partiql/ast/v1/ExcludeStep$StructField$StructFieldBuilder;
+	public fun symbol (Lorg/partiql/ast/v1/Identifier;)Lorg/partiql/ast/v1/ExcludeStep$StructField$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
 public class org/partiql/ast/v1/ExcludeStep$StructWildcard : org/partiql/ast/v1/ExcludeStep {
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/ExcludeStep$StructWildcard$StructWildcardBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/ExcludeStep$StructWildcard$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/ExcludeStep$StructWildcard$StructWildcardBuilder {
+public class org/partiql/ast/v1/ExcludeStep$StructWildcard$Builder {
 	public fun build ()Lorg/partiql/ast/v1/ExcludeStep$StructWildcard;
 	public fun toString ()Ljava/lang/String;
 }
@@ -5890,14 +5890,14 @@ public class org/partiql/ast/v1/Explain : org/partiql/ast/v1/Statement {
 	public final field statement Lorg/partiql/ast/v1/Statement;
 	public fun <init> (Ljava/util/Map;Lorg/partiql/ast/v1/Statement;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/Explain$ExplainBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/Explain$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/Explain$ExplainBuilder {
+public class org/partiql/ast/v1/Explain$Builder {
 	public fun build ()Lorg/partiql/ast/v1/Explain;
-	public fun options (Ljava/util/Map;)Lorg/partiql/ast/v1/Explain$ExplainBuilder;
-	public fun statement (Lorg/partiql/ast/v1/Statement;)Lorg/partiql/ast/v1/Explain$ExplainBuilder;
+	public fun options (Ljava/util/Map;)Lorg/partiql/ast/v1/Explain$Builder;
+	public fun statement (Lorg/partiql/ast/v1/Statement;)Lorg/partiql/ast/v1/Explain$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -5905,13 +5905,13 @@ public class org/partiql/ast/v1/From : org/partiql/ast/v1/AstNode {
 	public final field tableRefs Ljava/util/List;
 	public fun <init> (Ljava/util/List;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/From$FromBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/From$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/From$FromBuilder {
+public class org/partiql/ast/v1/From$Builder {
 	public fun build ()Lorg/partiql/ast/v1/From;
-	public fun tableRefs (Ljava/util/List;)Lorg/partiql/ast/v1/From$FromBuilder;
+	public fun tableRefs (Ljava/util/List;)Lorg/partiql/ast/v1/From$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -5922,16 +5922,16 @@ public class org/partiql/ast/v1/FromExpr : org/partiql/ast/v1/FromTableRef {
 	public final field fromType Lorg/partiql/ast/v1/FromType;
 	public fun <init> (Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/FromType;Lorg/partiql/ast/v1/Identifier;Lorg/partiql/ast/v1/Identifier;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/FromExpr$FromExprBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/FromExpr$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/FromExpr$FromExprBuilder {
-	public fun asAlias (Lorg/partiql/ast/v1/Identifier;)Lorg/partiql/ast/v1/FromExpr$FromExprBuilder;
-	public fun atAlias (Lorg/partiql/ast/v1/Identifier;)Lorg/partiql/ast/v1/FromExpr$FromExprBuilder;
+public class org/partiql/ast/v1/FromExpr$Builder {
+	public fun asAlias (Lorg/partiql/ast/v1/Identifier;)Lorg/partiql/ast/v1/FromExpr$Builder;
+	public fun atAlias (Lorg/partiql/ast/v1/Identifier;)Lorg/partiql/ast/v1/FromExpr$Builder;
 	public fun build ()Lorg/partiql/ast/v1/FromExpr;
-	public fun expr (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/FromExpr$FromExprBuilder;
-	public fun fromType (Lorg/partiql/ast/v1/FromType;)Lorg/partiql/ast/v1/FromExpr$FromExprBuilder;
+	public fun expr (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/FromExpr$Builder;
+	public fun fromType (Lorg/partiql/ast/v1/FromType;)Lorg/partiql/ast/v1/FromExpr$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -5942,16 +5942,16 @@ public class org/partiql/ast/v1/FromJoin : org/partiql/ast/v1/FromTableRef {
 	public final field rhs Lorg/partiql/ast/v1/From;
 	public fun <init> (Lorg/partiql/ast/v1/From;Lorg/partiql/ast/v1/From;Lorg/partiql/ast/v1/JoinType;Lorg/partiql/ast/v1/expr/Expr;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/FromJoin$FromJoinBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/FromJoin$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/FromJoin$FromJoinBuilder {
+public class org/partiql/ast/v1/FromJoin$Builder {
 	public fun build ()Lorg/partiql/ast/v1/FromJoin;
-	public fun condition (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/FromJoin$FromJoinBuilder;
-	public fun joinType (Lorg/partiql/ast/v1/JoinType;)Lorg/partiql/ast/v1/FromJoin$FromJoinBuilder;
-	public fun lhs (Lorg/partiql/ast/v1/From;)Lorg/partiql/ast/v1/FromJoin$FromJoinBuilder;
-	public fun rhs (Lorg/partiql/ast/v1/From;)Lorg/partiql/ast/v1/FromJoin$FromJoinBuilder;
+	public fun condition (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/FromJoin$Builder;
+	public fun joinType (Lorg/partiql/ast/v1/JoinType;)Lorg/partiql/ast/v1/FromJoin$Builder;
+	public fun lhs (Lorg/partiql/ast/v1/From;)Lorg/partiql/ast/v1/FromJoin$Builder;
+	public fun rhs (Lorg/partiql/ast/v1/From;)Lorg/partiql/ast/v1/FromJoin$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -5976,15 +5976,15 @@ public class org/partiql/ast/v1/GroupBy : org/partiql/ast/v1/AstNode {
 	public final field strategy Lorg/partiql/ast/v1/GroupByStrategy;
 	public fun <init> (Lorg/partiql/ast/v1/GroupByStrategy;Ljava/util/List;Lorg/partiql/ast/v1/Identifier;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/GroupBy$GroupByBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/GroupBy$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/GroupBy$GroupByBuilder {
-	public fun asAlias (Lorg/partiql/ast/v1/Identifier;)Lorg/partiql/ast/v1/GroupBy$GroupByBuilder;
+public class org/partiql/ast/v1/GroupBy$Builder {
+	public fun asAlias (Lorg/partiql/ast/v1/Identifier;)Lorg/partiql/ast/v1/GroupBy$Builder;
 	public fun build ()Lorg/partiql/ast/v1/GroupBy;
-	public fun keys (Ljava/util/List;)Lorg/partiql/ast/v1/GroupBy$GroupByBuilder;
-	public fun strategy (Lorg/partiql/ast/v1/GroupByStrategy;)Lorg/partiql/ast/v1/GroupBy$GroupByBuilder;
+	public fun keys (Ljava/util/List;)Lorg/partiql/ast/v1/GroupBy$Builder;
+	public fun strategy (Lorg/partiql/ast/v1/GroupByStrategy;)Lorg/partiql/ast/v1/GroupBy$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -5993,14 +5993,14 @@ public class org/partiql/ast/v1/GroupBy$Key : org/partiql/ast/v1/AstNode {
 	public final field expr Lorg/partiql/ast/v1/expr/Expr;
 	public fun <init> (Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/Identifier;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/GroupBy$Key$KeyBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/GroupBy$Key$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/GroupBy$Key$KeyBuilder {
-	public fun asAlias (Lorg/partiql/ast/v1/Identifier;)Lorg/partiql/ast/v1/GroupBy$Key$KeyBuilder;
+public class org/partiql/ast/v1/GroupBy$Key$Builder {
+	public fun asAlias (Lorg/partiql/ast/v1/Identifier;)Lorg/partiql/ast/v1/GroupBy$Key$Builder;
 	public fun build ()Lorg/partiql/ast/v1/GroupBy$Key;
-	public fun expr (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/GroupBy$Key$KeyBuilder;
+	public fun expr (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/GroupBy$Key$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -6019,14 +6019,14 @@ public class org/partiql/ast/v1/Identifier : org/partiql/ast/v1/AstNode {
 	public final field symbol Ljava/lang/String;
 	public fun <init> (Ljava/lang/String;Z)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/Identifier$IdentifierBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/Identifier$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/Identifier$IdentifierBuilder {
+public class org/partiql/ast/v1/Identifier$Builder {
 	public fun build ()Lorg/partiql/ast/v1/Identifier;
-	public fun isDelimited (Z)Lorg/partiql/ast/v1/Identifier$IdentifierBuilder;
-	public fun symbol (Ljava/lang/String;)Lorg/partiql/ast/v1/Identifier$IdentifierBuilder;
+	public fun isDelimited (Z)Lorg/partiql/ast/v1/Identifier$Builder;
+	public fun symbol (Ljava/lang/String;)Lorg/partiql/ast/v1/Identifier$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -6035,14 +6035,14 @@ public class org/partiql/ast/v1/IdentifierChain : org/partiql/ast/v1/AstNode {
 	public final field root Lorg/partiql/ast/v1/Identifier;
 	public fun <init> (Lorg/partiql/ast/v1/Identifier;Lorg/partiql/ast/v1/IdentifierChain;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/IdentifierChain$IdentifierChainBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/IdentifierChain$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/IdentifierChain$IdentifierChainBuilder {
+public class org/partiql/ast/v1/IdentifierChain$Builder {
 	public fun build ()Lorg/partiql/ast/v1/IdentifierChain;
-	public fun next (Lorg/partiql/ast/v1/IdentifierChain;)Lorg/partiql/ast/v1/IdentifierChain$IdentifierChainBuilder;
-	public fun root (Lorg/partiql/ast/v1/Identifier;)Lorg/partiql/ast/v1/IdentifierChain$IdentifierChainBuilder;
+	public fun next (Lorg/partiql/ast/v1/IdentifierChain;)Lorg/partiql/ast/v1/IdentifierChain$Builder;
+	public fun root (Lorg/partiql/ast/v1/Identifier;)Lorg/partiql/ast/v1/IdentifierChain$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -6072,7 +6072,7 @@ public class org/partiql/ast/v1/Let : org/partiql/ast/v1/AstNode {
 	public final field bindings Ljava/util/List;
 	public fun <init> (Ljava/util/List;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/Let$LetBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/Let$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
@@ -6081,19 +6081,19 @@ public class org/partiql/ast/v1/Let$Binding : org/partiql/ast/v1/AstNode {
 	public final field expr Lorg/partiql/ast/v1/expr/Expr;
 	public fun <init> (Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/Identifier;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/Let$Binding$BindingBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/Let$Binding$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/Let$Binding$BindingBuilder {
-	public fun asAlias (Lorg/partiql/ast/v1/Identifier;)Lorg/partiql/ast/v1/Let$Binding$BindingBuilder;
+public class org/partiql/ast/v1/Let$Binding$Builder {
+	public fun asAlias (Lorg/partiql/ast/v1/Identifier;)Lorg/partiql/ast/v1/Let$Binding$Builder;
 	public fun build ()Lorg/partiql/ast/v1/Let$Binding;
-	public fun expr (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/Let$Binding$BindingBuilder;
+	public fun expr (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/Let$Binding$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
-public class org/partiql/ast/v1/Let$LetBuilder {
-	public fun bindings (Ljava/util/List;)Lorg/partiql/ast/v1/Let$LetBuilder;
+public class org/partiql/ast/v1/Let$Builder {
+	public fun bindings (Ljava/util/List;)Lorg/partiql/ast/v1/Let$Builder;
 	public fun build ()Lorg/partiql/ast/v1/Let;
 	public fun toString ()Ljava/lang/String;
 }
@@ -6122,13 +6122,13 @@ public class org/partiql/ast/v1/OrderBy : org/partiql/ast/v1/AstNode {
 	public final field sorts Ljava/util/List;
 	public fun <init> (Ljava/util/List;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/OrderBy$OrderByBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/OrderBy$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/OrderBy$OrderByBuilder {
+public class org/partiql/ast/v1/OrderBy$Builder {
 	public fun build ()Lorg/partiql/ast/v1/OrderBy;
-	public fun sorts (Ljava/util/List;)Lorg/partiql/ast/v1/OrderBy$OrderByBuilder;
+	public fun sorts (Ljava/util/List;)Lorg/partiql/ast/v1/OrderBy$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -6136,13 +6136,13 @@ public class org/partiql/ast/v1/Query : org/partiql/ast/v1/Statement {
 	public final field expr Lorg/partiql/ast/v1/expr/Expr;
 	public fun <init> (Lorg/partiql/ast/v1/expr/Expr;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/Query$QueryBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/Query$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/Query$QueryBuilder {
+public class org/partiql/ast/v1/Query$Builder {
 	public fun build ()Lorg/partiql/ast/v1/Query;
-	public fun expr (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/Query$QueryBuilder;
+	public fun expr (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/Query$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -6160,20 +6160,20 @@ public class org/partiql/ast/v1/QueryBody$SFW : org/partiql/ast/v1/QueryBody {
 	public final field where Lorg/partiql/ast/v1/expr/Expr;
 	public fun <init> (Lorg/partiql/ast/v1/Select;Lorg/partiql/ast/v1/Exclude;Lorg/partiql/ast/v1/From;Lorg/partiql/ast/v1/Let;Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/GroupBy;Lorg/partiql/ast/v1/expr/Expr;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/QueryBody$SFW$SFWBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/QueryBody$SFW$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/QueryBody$SFW$SFWBuilder {
+public class org/partiql/ast/v1/QueryBody$SFW$Builder {
 	public fun build ()Lorg/partiql/ast/v1/QueryBody$SFW;
-	public fun exclude (Lorg/partiql/ast/v1/Exclude;)Lorg/partiql/ast/v1/QueryBody$SFW$SFWBuilder;
-	public fun from (Lorg/partiql/ast/v1/From;)Lorg/partiql/ast/v1/QueryBody$SFW$SFWBuilder;
-	public fun groupBy (Lorg/partiql/ast/v1/GroupBy;)Lorg/partiql/ast/v1/QueryBody$SFW$SFWBuilder;
-	public fun having (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/QueryBody$SFW$SFWBuilder;
-	public fun let (Lorg/partiql/ast/v1/Let;)Lorg/partiql/ast/v1/QueryBody$SFW$SFWBuilder;
-	public fun select (Lorg/partiql/ast/v1/Select;)Lorg/partiql/ast/v1/QueryBody$SFW$SFWBuilder;
+	public fun exclude (Lorg/partiql/ast/v1/Exclude;)Lorg/partiql/ast/v1/QueryBody$SFW$Builder;
+	public fun from (Lorg/partiql/ast/v1/From;)Lorg/partiql/ast/v1/QueryBody$SFW$Builder;
+	public fun groupBy (Lorg/partiql/ast/v1/GroupBy;)Lorg/partiql/ast/v1/QueryBody$SFW$Builder;
+	public fun having (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/QueryBody$SFW$Builder;
+	public fun let (Lorg/partiql/ast/v1/Let;)Lorg/partiql/ast/v1/QueryBody$SFW$Builder;
+	public fun select (Lorg/partiql/ast/v1/Select;)Lorg/partiql/ast/v1/QueryBody$SFW$Builder;
 	public fun toString ()Ljava/lang/String;
-	public fun where (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/QueryBody$SFW$SFWBuilder;
+	public fun where (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/QueryBody$SFW$Builder;
 }
 
 public class org/partiql/ast/v1/QueryBody$SetOp : org/partiql/ast/v1/QueryBody {
@@ -6183,17 +6183,17 @@ public class org/partiql/ast/v1/QueryBody$SetOp : org/partiql/ast/v1/QueryBody {
 	public final field type Lorg/partiql/ast/v1/SetOp;
 	public fun <init> (Lorg/partiql/ast/v1/SetOp;ZLorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/expr/Expr;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/QueryBody$SetOp$SetOpBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/QueryBody$SetOp$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/QueryBody$SetOp$SetOpBuilder {
+public class org/partiql/ast/v1/QueryBody$SetOp$Builder {
 	public fun build ()Lorg/partiql/ast/v1/QueryBody$SetOp;
-	public fun isOuter (Z)Lorg/partiql/ast/v1/QueryBody$SetOp$SetOpBuilder;
-	public fun lhs (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/QueryBody$SetOp$SetOpBuilder;
-	public fun rhs (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/QueryBody$SetOp$SetOpBuilder;
+	public fun isOuter (Z)Lorg/partiql/ast/v1/QueryBody$SetOp$Builder;
+	public fun lhs (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/QueryBody$SetOp$Builder;
+	public fun rhs (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/QueryBody$SetOp$Builder;
 	public fun toString ()Ljava/lang/String;
-	public fun type (Lorg/partiql/ast/v1/SetOp;)Lorg/partiql/ast/v1/QueryBody$SetOp$SetOpBuilder;
+	public fun type (Lorg/partiql/ast/v1/SetOp;)Lorg/partiql/ast/v1/QueryBody$SetOp$Builder;
 }
 
 public abstract class org/partiql/ast/v1/Select : org/partiql/ast/v1/AstNode {
@@ -6211,14 +6211,14 @@ public class org/partiql/ast/v1/SelectItem$Expr : org/partiql/ast/v1/SelectItem
 	public final field expr Lorg/partiql/ast/v1/expr/Expr;
 	public fun <init> (Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/Identifier;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/SelectItem$Expr$ExprBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/SelectItem$Expr$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/SelectItem$Expr$ExprBuilder {
-	public fun asAlias (Lorg/partiql/ast/v1/Identifier;)Lorg/partiql/ast/v1/SelectItem$Expr$ExprBuilder;
+public class org/partiql/ast/v1/SelectItem$Expr$Builder {
+	public fun asAlias (Lorg/partiql/ast/v1/Identifier;)Lorg/partiql/ast/v1/SelectItem$Expr$Builder;
 	public fun build ()Lorg/partiql/ast/v1/SelectItem$Expr;
-	public fun expr (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/SelectItem$Expr$ExprBuilder;
+	public fun expr (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/SelectItem$Expr$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -6226,13 +6226,13 @@ public class org/partiql/ast/v1/SelectItem$Star : org/partiql/ast/v1/SelectItem
 	public final field expr Lorg/partiql/ast/v1/expr/Expr;
 	public fun <init> (Lorg/partiql/ast/v1/expr/Expr;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/SelectItem$Star$StarBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/SelectItem$Star$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/SelectItem$Star$StarBuilder {
+public class org/partiql/ast/v1/SelectItem$Star$Builder {
 	public fun build ()Lorg/partiql/ast/v1/SelectItem$Star;
-	public fun expr (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/SelectItem$Star$StarBuilder;
+	public fun expr (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/SelectItem$Star$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -6241,14 +6241,14 @@ public class org/partiql/ast/v1/SelectList : org/partiql/ast/v1/Select {
 	public final field setq Lorg/partiql/ast/v1/SetQuantifier;
 	public fun <init> (Ljava/util/List;Lorg/partiql/ast/v1/SetQuantifier;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/SelectList$SelectListBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/SelectList$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/SelectList$SelectListBuilder {
+public class org/partiql/ast/v1/SelectList$Builder {
 	public fun build ()Lorg/partiql/ast/v1/SelectList;
-	public fun items (Ljava/util/List;)Lorg/partiql/ast/v1/SelectList$SelectListBuilder;
-	public fun setq (Lorg/partiql/ast/v1/SetQuantifier;)Lorg/partiql/ast/v1/SelectList$SelectListBuilder;
+	public fun items (Ljava/util/List;)Lorg/partiql/ast/v1/SelectList$Builder;
+	public fun setq (Lorg/partiql/ast/v1/SetQuantifier;)Lorg/partiql/ast/v1/SelectList$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -6257,28 +6257,28 @@ public class org/partiql/ast/v1/SelectPivot : org/partiql/ast/v1/Select {
 	public final field value Lorg/partiql/ast/v1/expr/Expr;
 	public fun <init> (Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/expr/Expr;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/SelectPivot$SelectPivotBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/SelectPivot$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/SelectPivot$SelectPivotBuilder {
+public class org/partiql/ast/v1/SelectPivot$Builder {
 	public fun build ()Lorg/partiql/ast/v1/SelectPivot;
-	public fun key (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/SelectPivot$SelectPivotBuilder;
+	public fun key (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/SelectPivot$Builder;
 	public fun toString ()Ljava/lang/String;
-	public fun value (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/SelectPivot$SelectPivotBuilder;
+	public fun value (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/SelectPivot$Builder;
 }
 
 public class org/partiql/ast/v1/SelectStar : org/partiql/ast/v1/Select {
 	public final field setq Lorg/partiql/ast/v1/SetQuantifier;
 	public fun <init> (Lorg/partiql/ast/v1/SetQuantifier;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/SelectStar$SelectStarBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/SelectStar$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/SelectStar$SelectStarBuilder {
+public class org/partiql/ast/v1/SelectStar$Builder {
 	public fun build ()Lorg/partiql/ast/v1/SelectStar;
-	public fun setq (Lorg/partiql/ast/v1/SetQuantifier;)Lorg/partiql/ast/v1/SelectStar$SelectStarBuilder;
+	public fun setq (Lorg/partiql/ast/v1/SetQuantifier;)Lorg/partiql/ast/v1/SelectStar$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -6287,14 +6287,14 @@ public class org/partiql/ast/v1/SelectValue : org/partiql/ast/v1/Select {
 	public final field setq Lorg/partiql/ast/v1/SetQuantifier;
 	public fun <init> (Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/SetQuantifier;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/SelectValue$SelectValueBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/SelectValue$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/SelectValue$SelectValueBuilder {
+public class org/partiql/ast/v1/SelectValue$Builder {
 	public fun build ()Lorg/partiql/ast/v1/SelectValue;
-	public fun constructor (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/SelectValue$SelectValueBuilder;
-	public fun setq (Lorg/partiql/ast/v1/SetQuantifier;)Lorg/partiql/ast/v1/SelectValue$SelectValueBuilder;
+	public fun constructor (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/SelectValue$Builder;
+	public fun setq (Lorg/partiql/ast/v1/SetQuantifier;)Lorg/partiql/ast/v1/SelectValue$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -6303,14 +6303,14 @@ public class org/partiql/ast/v1/SetOp : org/partiql/ast/v1/AstNode {
 	public final field setq Lorg/partiql/ast/v1/SetQuantifier;
 	public fun <init> (Lorg/partiql/ast/v1/SetOpType;Lorg/partiql/ast/v1/SetQuantifier;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/SetOp$SetOpBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/SetOp$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/SetOp$SetOpBuilder {
+public class org/partiql/ast/v1/SetOp$Builder {
 	public fun build ()Lorg/partiql/ast/v1/SetOp;
-	public fun setOpType (Lorg/partiql/ast/v1/SetOpType;)Lorg/partiql/ast/v1/SetOp$SetOpBuilder;
-	public fun setq (Lorg/partiql/ast/v1/SetQuantifier;)Lorg/partiql/ast/v1/SetOp$SetOpBuilder;
+	public fun setOpType (Lorg/partiql/ast/v1/SetOpType;)Lorg/partiql/ast/v1/SetOp$Builder;
+	public fun setq (Lorg/partiql/ast/v1/SetQuantifier;)Lorg/partiql/ast/v1/SetOp$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -6338,15 +6338,15 @@ public class org/partiql/ast/v1/Sort : org/partiql/ast/v1/AstNode {
 	public final field order Lorg/partiql/ast/v1/Order;
 	public fun <init> (Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/Order;Lorg/partiql/ast/v1/Nulls;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/Sort$SortBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/Sort$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/Sort$SortBuilder {
+public class org/partiql/ast/v1/Sort$Builder {
 	public fun build ()Lorg/partiql/ast/v1/Sort;
-	public fun expr (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/Sort$SortBuilder;
-	public fun nulls (Lorg/partiql/ast/v1/Nulls;)Lorg/partiql/ast/v1/Sort$SortBuilder;
-	public fun order (Lorg/partiql/ast/v1/Order;)Lorg/partiql/ast/v1/Sort$SortBuilder;
+	public fun expr (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/Sort$Builder;
+	public fun nulls (Lorg/partiql/ast/v1/Nulls;)Lorg/partiql/ast/v1/Sort$Builder;
+	public fun order (Lorg/partiql/ast/v1/Order;)Lorg/partiql/ast/v1/Sort$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -6365,14 +6365,14 @@ public class org/partiql/ast/v1/expr/ExprAnd : org/partiql/ast/v1/expr/Expr {
 	public final field rhs Lorg/partiql/ast/v1/expr/Expr;
 	public fun <init> (Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/expr/Expr;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprAnd$ExprAndBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprAnd$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprAnd$ExprAndBuilder {
+public class org/partiql/ast/v1/expr/ExprAnd$Builder {
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprAnd;
-	public fun lhs (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprAnd$ExprAndBuilder;
-	public fun rhs (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprAnd$ExprAndBuilder;
+	public fun lhs (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprAnd$Builder;
+	public fun rhs (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprAnd$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -6380,28 +6380,28 @@ public class org/partiql/ast/v1/expr/ExprArray : org/partiql/ast/v1/expr/Expr {
 	public final field values Ljava/util/List;
 	public fun <init> (Ljava/util/List;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprArray$ExprArrayBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprArray$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprArray$ExprArrayBuilder {
+public class org/partiql/ast/v1/expr/ExprArray$Builder {
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprArray;
 	public fun toString ()Ljava/lang/String;
-	public fun values (Ljava/util/List;)Lorg/partiql/ast/v1/expr/ExprArray$ExprArrayBuilder;
+	public fun values (Ljava/util/List;)Lorg/partiql/ast/v1/expr/ExprArray$Builder;
 }
 
 public class org/partiql/ast/v1/expr/ExprBag : org/partiql/ast/v1/expr/Expr {
 	public final field values Ljava/util/List;
 	public fun <init> (Ljava/util/List;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprBag$ExprBagBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprBag$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprBag$ExprBagBuilder {
+public class org/partiql/ast/v1/expr/ExprBag$Builder {
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprBag;
 	public fun toString ()Ljava/lang/String;
-	public fun values (Ljava/util/List;)Lorg/partiql/ast/v1/expr/ExprBag$ExprBagBuilder;
+	public fun values (Ljava/util/List;)Lorg/partiql/ast/v1/expr/ExprBag$Builder;
 }
 
 public class org/partiql/ast/v1/expr/ExprBetween : org/partiql/ast/v1/expr/Expr {
@@ -6411,17 +6411,17 @@ public class org/partiql/ast/v1/expr/ExprBetween : org/partiql/ast/v1/expr/Expr
 	public final field value Lorg/partiql/ast/v1/expr/Expr;
 	public fun <init> (Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/expr/Expr;Z)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprBetween$ExprBetweenBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprBetween$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprBetween$ExprBetweenBuilder {
+public class org/partiql/ast/v1/expr/ExprBetween$Builder {
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprBetween;
-	public fun from (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprBetween$ExprBetweenBuilder;
-	public fun not (Z)Lorg/partiql/ast/v1/expr/ExprBetween$ExprBetweenBuilder;
-	public fun to (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprBetween$ExprBetweenBuilder;
+	public fun from (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprBetween$Builder;
+	public fun not (Z)Lorg/partiql/ast/v1/expr/ExprBetween$Builder;
+	public fun to (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprBetween$Builder;
 	public fun toString ()Ljava/lang/String;
-	public fun value (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprBetween$ExprBetweenBuilder;
+	public fun value (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprBetween$Builder;
 }
 
 public class org/partiql/ast/v1/expr/ExprCall : org/partiql/ast/v1/expr/Expr {
@@ -6430,15 +6430,15 @@ public class org/partiql/ast/v1/expr/ExprCall : org/partiql/ast/v1/expr/Expr {
 	public final field setq Lorg/partiql/ast/v1/SetQuantifier;
 	public fun <init> (Lorg/partiql/ast/v1/IdentifierChain;Ljava/util/List;Lorg/partiql/ast/v1/SetQuantifier;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprCall$ExprCallBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprCall$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprCall$ExprCallBuilder {
-	public fun args (Ljava/util/List;)Lorg/partiql/ast/v1/expr/ExprCall$ExprCallBuilder;
+public class org/partiql/ast/v1/expr/ExprCall$Builder {
+	public fun args (Ljava/util/List;)Lorg/partiql/ast/v1/expr/ExprCall$Builder;
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprCall;
-	public fun function (Lorg/partiql/ast/v1/IdentifierChain;)Lorg/partiql/ast/v1/expr/ExprCall$ExprCallBuilder;
-	public fun setq (Lorg/partiql/ast/v1/SetQuantifier;)Lorg/partiql/ast/v1/expr/ExprCall$ExprCallBuilder;
+	public fun function (Lorg/partiql/ast/v1/IdentifierChain;)Lorg/partiql/ast/v1/expr/ExprCall$Builder;
+	public fun setq (Lorg/partiql/ast/v1/SetQuantifier;)Lorg/partiql/ast/v1/expr/ExprCall$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -6448,7 +6448,7 @@ public class org/partiql/ast/v1/expr/ExprCase : org/partiql/ast/v1/expr/Expr {
 	public final field expr Lorg/partiql/ast/v1/expr/Expr;
 	public fun <init> (Lorg/partiql/ast/v1/expr/Expr;Ljava/util/List;Lorg/partiql/ast/v1/expr/Expr;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprCase$ExprCaseBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprCase$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
@@ -6457,22 +6457,22 @@ public class org/partiql/ast/v1/expr/ExprCase$Branch : org/partiql/ast/v1/AstNod
 	public final field expr Lorg/partiql/ast/v1/expr/Expr;
 	public fun <init> (Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/expr/Expr;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprCase$Branch$BranchBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprCase$Branch$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprCase$Branch$BranchBuilder {
+public class org/partiql/ast/v1/expr/ExprCase$Branch$Builder {
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprCase$Branch;
-	public fun condition (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprCase$Branch$BranchBuilder;
-	public fun expr (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprCase$Branch$BranchBuilder;
+	public fun condition (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprCase$Branch$Builder;
+	public fun expr (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprCase$Branch$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
-public class org/partiql/ast/v1/expr/ExprCase$ExprCaseBuilder {
-	public fun branches (Ljava/util/List;)Lorg/partiql/ast/v1/expr/ExprCase$ExprCaseBuilder;
+public class org/partiql/ast/v1/expr/ExprCase$Builder {
+	public fun branches (Ljava/util/List;)Lorg/partiql/ast/v1/expr/ExprCase$Builder;
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprCase;
-	public fun defaultExpr (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprCase$ExprCaseBuilder;
-	public fun expr (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprCase$ExprCaseBuilder;
+	public fun defaultExpr (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprCase$Builder;
+	public fun expr (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprCase$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -6481,27 +6481,27 @@ public class org/partiql/ast/v1/expr/ExprCast : org/partiql/ast/v1/expr/Expr {
 	public final field value Lorg/partiql/ast/v1/expr/Expr;
 	public fun <init> (Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/DataType;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprCast$ExprCastBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprCast$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprCast$ExprCastBuilder {
-	public fun asType (Lorg/partiql/ast/v1/DataType;)Lorg/partiql/ast/v1/expr/ExprCast$ExprCastBuilder;
+public class org/partiql/ast/v1/expr/ExprCast$Builder {
+	public fun asType (Lorg/partiql/ast/v1/DataType;)Lorg/partiql/ast/v1/expr/ExprCast$Builder;
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprCast;
 	public fun toString ()Ljava/lang/String;
-	public fun value (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprCast$ExprCastBuilder;
+	public fun value (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprCast$Builder;
 }
 
 public class org/partiql/ast/v1/expr/ExprCoalesce : org/partiql/ast/v1/expr/Expr {
 	public final field args Ljava/util/List;
 	public fun <init> (Ljava/util/List;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprCoalesce$ExprCoalesceBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprCoalesce$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprCoalesce$ExprCoalesceBuilder {
-	public fun args (Ljava/util/List;)Lorg/partiql/ast/v1/expr/ExprCoalesce$ExprCoalesceBuilder;
+public class org/partiql/ast/v1/expr/ExprCoalesce$Builder {
+	public fun args (Ljava/util/List;)Lorg/partiql/ast/v1/expr/ExprCoalesce$Builder;
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprCoalesce;
 	public fun toString ()Ljava/lang/String;
 }
@@ -6511,14 +6511,14 @@ public class org/partiql/ast/v1/expr/ExprExtract : org/partiql/ast/v1/expr/Expr
 	public final field source Lorg/partiql/ast/v1/expr/Expr;
 	public fun <init> (Lorg/partiql/ast/v1/DatetimeField;Lorg/partiql/ast/v1/expr/Expr;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprExtract$ExprExtractBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprExtract$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprExtract$ExprExtractBuilder {
+public class org/partiql/ast/v1/expr/ExprExtract$Builder {
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprExtract;
-	public fun field (Lorg/partiql/ast/v1/DatetimeField;)Lorg/partiql/ast/v1/expr/ExprExtract$ExprExtractBuilder;
-	public fun source (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprExtract$ExprExtractBuilder;
+	public fun field (Lorg/partiql/ast/v1/DatetimeField;)Lorg/partiql/ast/v1/expr/ExprExtract$Builder;
+	public fun source (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprExtract$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -6528,15 +6528,15 @@ public class org/partiql/ast/v1/expr/ExprInCollection : org/partiql/ast/v1/expr/
 	public final field rhs Lorg/partiql/ast/v1/expr/Expr;
 	public fun <init> (Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/expr/Expr;Z)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprInCollection$ExprInCollectionBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprInCollection$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprInCollection$ExprInCollectionBuilder {
+public class org/partiql/ast/v1/expr/ExprInCollection$Builder {
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprInCollection;
-	public fun lhs (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprInCollection$ExprInCollectionBuilder;
-	public fun not (Z)Lorg/partiql/ast/v1/expr/ExprInCollection$ExprInCollectionBuilder;
-	public fun rhs (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprInCollection$ExprInCollectionBuilder;
+	public fun lhs (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprInCollection$Builder;
+	public fun not (Z)Lorg/partiql/ast/v1/expr/ExprInCollection$Builder;
+	public fun rhs (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprInCollection$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -6546,16 +6546,16 @@ public class org/partiql/ast/v1/expr/ExprIsType : org/partiql/ast/v1/expr/Expr {
 	public final field value Lorg/partiql/ast/v1/expr/Expr;
 	public fun <init> (Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/DataType;Z)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprIsType$ExprIsTypeBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprIsType$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprIsType$ExprIsTypeBuilder {
+public class org/partiql/ast/v1/expr/ExprIsType$Builder {
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprIsType;
-	public fun not (Z)Lorg/partiql/ast/v1/expr/ExprIsType$ExprIsTypeBuilder;
+	public fun not (Z)Lorg/partiql/ast/v1/expr/ExprIsType$Builder;
 	public fun toString ()Ljava/lang/String;
-	public fun type (Lorg/partiql/ast/v1/DataType;)Lorg/partiql/ast/v1/expr/ExprIsType$ExprIsTypeBuilder;
-	public fun value (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprIsType$ExprIsTypeBuilder;
+	public fun type (Lorg/partiql/ast/v1/DataType;)Lorg/partiql/ast/v1/expr/ExprIsType$Builder;
+	public fun value (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprIsType$Builder;
 }
 
 public class org/partiql/ast/v1/expr/ExprLike : org/partiql/ast/v1/expr/Expr {
@@ -6565,31 +6565,31 @@ public class org/partiql/ast/v1/expr/ExprLike : org/partiql/ast/v1/expr/Expr {
 	public final field value Lorg/partiql/ast/v1/expr/Expr;
 	public fun <init> (Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/expr/Expr;Z)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprLike$ExprLikeBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprLike$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprLike$ExprLikeBuilder {
+public class org/partiql/ast/v1/expr/ExprLike$Builder {
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprLike;
-	public fun escape (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprLike$ExprLikeBuilder;
-	public fun not (Z)Lorg/partiql/ast/v1/expr/ExprLike$ExprLikeBuilder;
-	public fun pattern (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprLike$ExprLikeBuilder;
+	public fun escape (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprLike$Builder;
+	public fun not (Z)Lorg/partiql/ast/v1/expr/ExprLike$Builder;
+	public fun pattern (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprLike$Builder;
 	public fun toString ()Ljava/lang/String;
-	public fun value (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprLike$ExprLikeBuilder;
+	public fun value (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprLike$Builder;
 }
 
 public class org/partiql/ast/v1/expr/ExprLit : org/partiql/ast/v1/expr/Expr {
 	public final field value Lorg/partiql/value/PartiQLValue;
 	public fun <init> (Lorg/partiql/value/PartiQLValue;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprLit$ExprLitBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprLit$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprLit$ExprLitBuilder {
+public class org/partiql/ast/v1/expr/ExprLit$Builder {
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprLit;
 	public fun toString ()Ljava/lang/String;
-	public fun value (Lorg/partiql/value/PartiQLValue;)Lorg/partiql/ast/v1/expr/ExprLit$ExprLitBuilder;
+	public fun value (Lorg/partiql/value/PartiQLValue;)Lorg/partiql/ast/v1/expr/ExprLit$Builder;
 }
 
 public class org/partiql/ast/v1/expr/ExprMatch : org/partiql/ast/v1/expr/Expr {
@@ -6597,14 +6597,14 @@ public class org/partiql/ast/v1/expr/ExprMatch : org/partiql/ast/v1/expr/Expr {
 	public final field pattern Lorg/partiql/ast/v1/graph/GraphMatch;
 	public fun <init> (Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/graph/GraphMatch;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprMatch$ExprMatchBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprMatch$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprMatch$ExprMatchBuilder {
+public class org/partiql/ast/v1/expr/ExprMatch$Builder {
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprMatch;
-	public fun expr (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprMatch$ExprMatchBuilder;
-	public fun pattern (Lorg/partiql/ast/v1/graph/GraphMatch;)Lorg/partiql/ast/v1/expr/ExprMatch$ExprMatchBuilder;
+	public fun expr (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprMatch$Builder;
+	public fun pattern (Lorg/partiql/ast/v1/graph/GraphMatch;)Lorg/partiql/ast/v1/expr/ExprMatch$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -6612,14 +6612,14 @@ public class org/partiql/ast/v1/expr/ExprNot : org/partiql/ast/v1/expr/Expr {
 	public final field value Lorg/partiql/ast/v1/expr/Expr;
 	public fun <init> (Lorg/partiql/ast/v1/expr/Expr;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprNot$ExprNotBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprNot$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprNot$ExprNotBuilder {
+public class org/partiql/ast/v1/expr/ExprNot$Builder {
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprNot;
 	public fun toString ()Ljava/lang/String;
-	public fun value (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprNot$ExprNotBuilder;
+	public fun value (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprNot$Builder;
 }
 
 public class org/partiql/ast/v1/expr/ExprNullIf : org/partiql/ast/v1/expr/Expr {
@@ -6627,15 +6627,15 @@ public class org/partiql/ast/v1/expr/ExprNullIf : org/partiql/ast/v1/expr/Expr {
 	public final field v2 Lorg/partiql/ast/v1/expr/Expr;
 	public fun <init> (Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/expr/Expr;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprNullIf$ExprNullIfBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprNullIf$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprNullIf$ExprNullIfBuilder {
+public class org/partiql/ast/v1/expr/ExprNullIf$Builder {
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprNullIf;
 	public fun toString ()Ljava/lang/String;
-	public fun v1 (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprNullIf$ExprNullIfBuilder;
-	public fun v2 (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprNullIf$ExprNullIfBuilder;
+	public fun v1 (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprNullIf$Builder;
+	public fun v2 (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprNullIf$Builder;
 }
 
 public class org/partiql/ast/v1/expr/ExprOperator : org/partiql/ast/v1/expr/Expr {
@@ -6644,15 +6644,15 @@ public class org/partiql/ast/v1/expr/ExprOperator : org/partiql/ast/v1/expr/Expr
 	public final field symbol Ljava/lang/String;
 	public fun <init> (Ljava/lang/String;Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/expr/Expr;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprOperator$ExprOperatorBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprOperator$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprOperator$ExprOperatorBuilder {
+public class org/partiql/ast/v1/expr/ExprOperator$Builder {
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprOperator;
-	public fun lhs (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprOperator$ExprOperatorBuilder;
-	public fun rhs (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprOperator$ExprOperatorBuilder;
-	public fun symbol (Ljava/lang/String;)Lorg/partiql/ast/v1/expr/ExprOperator$ExprOperatorBuilder;
+	public fun lhs (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprOperator$Builder;
+	public fun rhs (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprOperator$Builder;
+	public fun symbol (Ljava/lang/String;)Lorg/partiql/ast/v1/expr/ExprOperator$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -6661,14 +6661,14 @@ public class org/partiql/ast/v1/expr/ExprOr : org/partiql/ast/v1/expr/Expr {
 	public final field rhs Lorg/partiql/ast/v1/expr/Expr;
 	public fun <init> (Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/expr/Expr;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprOr$ExprOrBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprOr$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprOr$ExprOrBuilder {
+public class org/partiql/ast/v1/expr/ExprOr$Builder {
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprOr;
-	public fun lhs (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprOr$ExprOrBuilder;
-	public fun rhs (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprOr$ExprOrBuilder;
+	public fun lhs (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprOr$Builder;
+	public fun rhs (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprOr$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -6679,30 +6679,30 @@ public class org/partiql/ast/v1/expr/ExprOverlay : org/partiql/ast/v1/expr/Expr
 	public final field value Lorg/partiql/ast/v1/expr/Expr;
 	public fun <init> (Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/expr/Expr;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprOverlay$ExprOverlayBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprOverlay$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprOverlay$ExprOverlayBuilder {
+public class org/partiql/ast/v1/expr/ExprOverlay$Builder {
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprOverlay;
-	public fun forLength (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprOverlay$ExprOverlayBuilder;
-	public fun from (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprOverlay$ExprOverlayBuilder;
-	public fun placing (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprOverlay$ExprOverlayBuilder;
+	public fun forLength (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprOverlay$Builder;
+	public fun from (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprOverlay$Builder;
+	public fun placing (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprOverlay$Builder;
 	public fun toString ()Ljava/lang/String;
-	public fun value (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprOverlay$ExprOverlayBuilder;
+	public fun value (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprOverlay$Builder;
 }
 
 public class org/partiql/ast/v1/expr/ExprParameter : org/partiql/ast/v1/expr/Expr {
 	public final field index I
 	public fun <init> (I)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprParameter$ExprParameterBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprParameter$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprParameter$ExprParameterBuilder {
+public class org/partiql/ast/v1/expr/ExprParameter$Builder {
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprParameter;
-	public fun index (I)Lorg/partiql/ast/v1/expr/ExprParameter$ExprParameterBuilder;
+	public fun index (I)Lorg/partiql/ast/v1/expr/ExprParameter$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -6711,14 +6711,14 @@ public class org/partiql/ast/v1/expr/ExprPath : org/partiql/ast/v1/expr/Expr {
 	public final field root Lorg/partiql/ast/v1/expr/Expr;
 	public fun <init> (Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/expr/PathStep;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprPath$ExprPathBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprPath$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprPath$ExprPathBuilder {
+public class org/partiql/ast/v1/expr/ExprPath$Builder {
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprPath;
-	public fun next (Lorg/partiql/ast/v1/expr/PathStep;)Lorg/partiql/ast/v1/expr/ExprPath$ExprPathBuilder;
-	public fun root (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprPath$ExprPathBuilder;
+	public fun next (Lorg/partiql/ast/v1/expr/PathStep;)Lorg/partiql/ast/v1/expr/ExprPath$Builder;
+	public fun root (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprPath$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -6727,14 +6727,14 @@ public class org/partiql/ast/v1/expr/ExprPosition : org/partiql/ast/v1/expr/Expr
 	public final field rhs Lorg/partiql/ast/v1/expr/Expr;
 	public fun <init> (Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/expr/Expr;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprPosition$ExprPositionBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprPosition$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprPosition$ExprPositionBuilder {
+public class org/partiql/ast/v1/expr/ExprPosition$Builder {
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprPosition;
-	public fun lhs (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprPosition$ExprPositionBuilder;
-	public fun rhs (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprPosition$ExprPositionBuilder;
+	public fun lhs (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprPosition$Builder;
+	public fun rhs (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprPosition$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -6745,16 +6745,16 @@ public class org/partiql/ast/v1/expr/ExprQuerySet : org/partiql/ast/v1/expr/Expr
 	public final field orderBy Lorg/partiql/ast/v1/OrderBy;
 	public fun <init> (Lorg/partiql/ast/v1/QueryBody;Lorg/partiql/ast/v1/OrderBy;Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/expr/Expr;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprQuerySet$ExprQuerySetBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprQuerySet$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprQuerySet$ExprQuerySetBuilder {
-	public fun body (Lorg/partiql/ast/v1/QueryBody;)Lorg/partiql/ast/v1/expr/ExprQuerySet$ExprQuerySetBuilder;
+public class org/partiql/ast/v1/expr/ExprQuerySet$Builder {
+	public fun body (Lorg/partiql/ast/v1/QueryBody;)Lorg/partiql/ast/v1/expr/ExprQuerySet$Builder;
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprQuerySet;
-	public fun limit (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprQuerySet$ExprQuerySetBuilder;
-	public fun offset (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprQuerySet$ExprQuerySetBuilder;
-	public fun orderBy (Lorg/partiql/ast/v1/OrderBy;)Lorg/partiql/ast/v1/expr/ExprQuerySet$ExprQuerySetBuilder;
+	public fun limit (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprQuerySet$Builder;
+	public fun offset (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprQuerySet$Builder;
+	public fun orderBy (Lorg/partiql/ast/v1/OrderBy;)Lorg/partiql/ast/v1/expr/ExprQuerySet$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -6762,13 +6762,13 @@ public class org/partiql/ast/v1/expr/ExprSessionAttribute : org/partiql/ast/v1/e
 	public final field sessionAttribute Lorg/partiql/ast/v1/expr/SessionAttribute;
 	public fun <init> (Lorg/partiql/ast/v1/expr/SessionAttribute;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprSessionAttribute$ExprSessionAttributeBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprSessionAttribute$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprSessionAttribute$ExprSessionAttributeBuilder {
+public class org/partiql/ast/v1/expr/ExprSessionAttribute$Builder {
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprSessionAttribute;
-	public fun sessionAttribute (Lorg/partiql/ast/v1/expr/SessionAttribute;)Lorg/partiql/ast/v1/expr/ExprSessionAttribute$ExprSessionAttributeBuilder;
+	public fun sessionAttribute (Lorg/partiql/ast/v1/expr/SessionAttribute;)Lorg/partiql/ast/v1/expr/ExprSessionAttribute$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -6776,13 +6776,13 @@ public class org/partiql/ast/v1/expr/ExprStruct : org/partiql/ast/v1/expr/Expr {
 	public final field fields Ljava/util/List;
 	public fun <init> (Ljava/util/List;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprStruct$ExprStructBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprStruct$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprStruct$ExprStructBuilder {
+public class org/partiql/ast/v1/expr/ExprStruct$Builder {
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprStruct;
-	public fun fields (Ljava/util/List;)Lorg/partiql/ast/v1/expr/ExprStruct$ExprStructBuilder;
+	public fun fields (Ljava/util/List;)Lorg/partiql/ast/v1/expr/ExprStruct$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -6791,15 +6791,15 @@ public class org/partiql/ast/v1/expr/ExprStruct$Field : org/partiql/ast/v1/AstNo
 	public final field value Lorg/partiql/ast/v1/expr/Expr;
 	public fun <init> (Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/expr/Expr;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprStruct$Field$FieldBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprStruct$Field$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprStruct$Field$FieldBuilder {
+public class org/partiql/ast/v1/expr/ExprStruct$Field$Builder {
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprStruct$Field;
-	public fun name (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprStruct$Field$FieldBuilder;
+	public fun name (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprStruct$Field$Builder;
 	public fun toString ()Ljava/lang/String;
-	public fun value (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprStruct$Field$FieldBuilder;
+	public fun value (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprStruct$Field$Builder;
 }
 
 public class org/partiql/ast/v1/expr/ExprSubstring : org/partiql/ast/v1/expr/Expr {
@@ -6808,16 +6808,16 @@ public class org/partiql/ast/v1/expr/ExprSubstring : org/partiql/ast/v1/expr/Exp
 	public final field value Lorg/partiql/ast/v1/expr/Expr;
 	public fun <init> (Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/expr/Expr;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprSubstring$ExprSubstringBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprSubstring$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprSubstring$ExprSubstringBuilder {
+public class org/partiql/ast/v1/expr/ExprSubstring$Builder {
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprSubstring;
-	public fun length (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprSubstring$ExprSubstringBuilder;
-	public fun start (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprSubstring$ExprSubstringBuilder;
+	public fun length (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprSubstring$Builder;
+	public fun start (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprSubstring$Builder;
 	public fun toString ()Ljava/lang/String;
-	public fun value (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprSubstring$ExprSubstringBuilder;
+	public fun value (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprSubstring$Builder;
 }
 
 public class org/partiql/ast/v1/expr/ExprTrim : org/partiql/ast/v1/expr/Expr {
@@ -6826,29 +6826,29 @@ public class org/partiql/ast/v1/expr/ExprTrim : org/partiql/ast/v1/expr/Expr {
 	public final field value Lorg/partiql/ast/v1/expr/Expr;
 	public fun <init> (Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/expr/TrimSpec;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprTrim$ExprTrimBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprTrim$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprTrim$ExprTrimBuilder {
+public class org/partiql/ast/v1/expr/ExprTrim$Builder {
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprTrim;
-	public fun chars (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprTrim$ExprTrimBuilder;
+	public fun chars (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprTrim$Builder;
 	public fun toString ()Ljava/lang/String;
-	public fun trimSpec (Lorg/partiql/ast/v1/expr/TrimSpec;)Lorg/partiql/ast/v1/expr/ExprTrim$ExprTrimBuilder;
-	public fun value (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprTrim$ExprTrimBuilder;
+	public fun trimSpec (Lorg/partiql/ast/v1/expr/TrimSpec;)Lorg/partiql/ast/v1/expr/ExprTrim$Builder;
+	public fun value (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprTrim$Builder;
 }
 
 public class org/partiql/ast/v1/expr/ExprValues : org/partiql/ast/v1/expr/Expr {
 	public final field rows Ljava/util/List;
 	public fun <init> (Ljava/util/List;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprValues$ExprValuesBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprValues$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprValues$ExprValuesBuilder {
+public class org/partiql/ast/v1/expr/ExprValues$Builder {
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprValues;
-	public fun rows (Ljava/util/List;)Lorg/partiql/ast/v1/expr/ExprValues$ExprValuesBuilder;
+	public fun rows (Ljava/util/List;)Lorg/partiql/ast/v1/expr/ExprValues$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -6856,14 +6856,14 @@ public class org/partiql/ast/v1/expr/ExprValues$Row : org/partiql/ast/v1/AstNode
 	public final field values Ljava/util/List;
 	public fun <init> (Ljava/util/List;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprValues$Row$RowBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprValues$Row$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprValues$Row$RowBuilder {
+public class org/partiql/ast/v1/expr/ExprValues$Row$Builder {
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprValues$Row;
 	public fun toString ()Ljava/lang/String;
-	public fun values (Ljava/util/List;)Lorg/partiql/ast/v1/expr/ExprValues$Row$RowBuilder;
+	public fun values (Ljava/util/List;)Lorg/partiql/ast/v1/expr/ExprValues$Row$Builder;
 }
 
 public class org/partiql/ast/v1/expr/ExprVarRef : org/partiql/ast/v1/expr/Expr {
@@ -6871,14 +6871,14 @@ public class org/partiql/ast/v1/expr/ExprVarRef : org/partiql/ast/v1/expr/Expr {
 	public final field scope Lorg/partiql/ast/v1/expr/Scope;
 	public fun <init> (Lorg/partiql/ast/v1/IdentifierChain;Lorg/partiql/ast/v1/expr/Scope;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprVarRef$ExprVarRefBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprVarRef$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprVarRef$ExprVarRefBuilder {
+public class org/partiql/ast/v1/expr/ExprVarRef$Builder {
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprVarRef;
-	public fun identifierChain (Lorg/partiql/ast/v1/IdentifierChain;)Lorg/partiql/ast/v1/expr/ExprVarRef$ExprVarRefBuilder;
-	public fun scope (Lorg/partiql/ast/v1/expr/Scope;)Lorg/partiql/ast/v1/expr/ExprVarRef$ExprVarRefBuilder;
+	public fun identifierChain (Lorg/partiql/ast/v1/IdentifierChain;)Lorg/partiql/ast/v1/expr/ExprVarRef$Builder;
+	public fun scope (Lorg/partiql/ast/v1/expr/Scope;)Lorg/partiql/ast/v1/expr/ExprVarRef$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -6887,16 +6887,16 @@ public class org/partiql/ast/v1/expr/ExprVariant : org/partiql/ast/v1/expr/Expr
 	public final field value Ljava/lang/String;
 	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprVariant$ExprVariantBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprVariant$Builder;
 	public synthetic fun children ()Ljava/util/Collection;
 	public fun children ()Ljava/util/List;
 }
 
-public class org/partiql/ast/v1/expr/ExprVariant$ExprVariantBuilder {
+public class org/partiql/ast/v1/expr/ExprVariant$Builder {
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprVariant;
-	public fun encoding (Ljava/lang/String;)Lorg/partiql/ast/v1/expr/ExprVariant$ExprVariantBuilder;
+	public fun encoding (Ljava/lang/String;)Lorg/partiql/ast/v1/expr/ExprVariant$Builder;
 	public fun toString ()Ljava/lang/String;
-	public fun value (Ljava/lang/String;)Lorg/partiql/ast/v1/expr/ExprVariant$ExprVariantBuilder;
+	public fun value (Ljava/lang/String;)Lorg/partiql/ast/v1/expr/ExprVariant$Builder;
 }
 
 public class org/partiql/ast/v1/expr/ExprWindow : org/partiql/ast/v1/expr/Expr {
@@ -6907,18 +6907,18 @@ public class org/partiql/ast/v1/expr/ExprWindow : org/partiql/ast/v1/expr/Expr {
 	public final field windowFunction Lorg/partiql/ast/v1/expr/WindowFunction;
 	public fun <init> (Lorg/partiql/ast/v1/expr/WindowFunction;Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/expr/Expr;Lorg/partiql/ast/v1/expr/ExprWindow$Over;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprWindow$ExprWindowBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprWindow$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprWindow$ExprWindowBuilder {
+public class org/partiql/ast/v1/expr/ExprWindow$Builder {
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprWindow;
-	public fun defaultValue (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprWindow$ExprWindowBuilder;
-	public fun expression (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprWindow$ExprWindowBuilder;
-	public fun offset (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprWindow$ExprWindowBuilder;
-	public fun over (Lorg/partiql/ast/v1/expr/ExprWindow$Over;)Lorg/partiql/ast/v1/expr/ExprWindow$ExprWindowBuilder;
+	public fun defaultValue (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprWindow$Builder;
+	public fun expression (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprWindow$Builder;
+	public fun offset (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/expr/ExprWindow$Builder;
+	public fun over (Lorg/partiql/ast/v1/expr/ExprWindow$Over;)Lorg/partiql/ast/v1/expr/ExprWindow$Builder;
 	public fun toString ()Ljava/lang/String;
-	public fun windowFunction (Lorg/partiql/ast/v1/expr/WindowFunction;)Lorg/partiql/ast/v1/expr/ExprWindow$ExprWindowBuilder;
+	public fun windowFunction (Lorg/partiql/ast/v1/expr/WindowFunction;)Lorg/partiql/ast/v1/expr/ExprWindow$Builder;
 }
 
 public class org/partiql/ast/v1/expr/ExprWindow$Over : org/partiql/ast/v1/AstNode {
@@ -6926,14 +6926,14 @@ public class org/partiql/ast/v1/expr/ExprWindow$Over : org/partiql/ast/v1/AstNod
 	public final field sorts Ljava/util/List;
 	public fun <init> (Ljava/util/List;Ljava/util/List;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprWindow$Over$OverBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/expr/ExprWindow$Over$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/expr/ExprWindow$Over$OverBuilder {
+public class org/partiql/ast/v1/expr/ExprWindow$Over$Builder {
 	public fun build ()Lorg/partiql/ast/v1/expr/ExprWindow$Over;
-	public fun partitions (Ljava/util/List;)Lorg/partiql/ast/v1/expr/ExprWindow$Over$OverBuilder;
-	public fun sorts (Ljava/util/List;)Lorg/partiql/ast/v1/expr/ExprWindow$Over$OverBuilder;
+	public fun partitions (Ljava/util/List;)Lorg/partiql/ast/v1/expr/ExprWindow$Over$Builder;
+	public fun sorts (Ljava/util/List;)Lorg/partiql/ast/v1/expr/ExprWindow$Over$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -7041,12 +7041,12 @@ public class org/partiql/ast/v1/graph/GraphLabel$Conj : org/partiql/ast/v1/graph
 	public final field args Ljava/util/List;
 	public fun <init> (Ljava/util/List;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphLabel$Conj$ConjBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphLabel$Conj$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/graph/GraphLabel$Conj$ConjBuilder {
-	public fun args (Ljava/util/List;)Lorg/partiql/ast/v1/graph/GraphLabel$Conj$ConjBuilder;
+public class org/partiql/ast/v1/graph/GraphLabel$Conj$Builder {
+	public fun args (Ljava/util/List;)Lorg/partiql/ast/v1/graph/GraphLabel$Conj$Builder;
 	public fun build ()Lorg/partiql/ast/v1/graph/GraphLabel$Conj;
 	public fun toString ()Ljava/lang/String;
 }
@@ -7055,12 +7055,12 @@ public class org/partiql/ast/v1/graph/GraphLabel$Disj : org/partiql/ast/v1/graph
 	public final field args Ljava/util/List;
 	public fun <init> (Ljava/util/List;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphLabel$Disj$DisjBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphLabel$Disj$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/graph/GraphLabel$Disj$DisjBuilder {
-	public fun args (Ljava/util/List;)Lorg/partiql/ast/v1/graph/GraphLabel$Disj$DisjBuilder;
+public class org/partiql/ast/v1/graph/GraphLabel$Disj$Builder {
+	public fun args (Ljava/util/List;)Lorg/partiql/ast/v1/graph/GraphLabel$Disj$Builder;
 	public fun build ()Lorg/partiql/ast/v1/graph/GraphLabel$Disj;
 	public fun toString ()Ljava/lang/String;
 }
@@ -7069,13 +7069,13 @@ public class org/partiql/ast/v1/graph/GraphLabel$Name : org/partiql/ast/v1/graph
 	public final field name Ljava/lang/String;
 	public fun <init> (Ljava/lang/String;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphLabel$Name$NameBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphLabel$Name$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/graph/GraphLabel$Name$NameBuilder {
+public class org/partiql/ast/v1/graph/GraphLabel$Name$Builder {
 	public fun build ()Lorg/partiql/ast/v1/graph/GraphLabel$Name;
-	public fun name (Ljava/lang/String;)Lorg/partiql/ast/v1/graph/GraphLabel$Name$NameBuilder;
+	public fun name (Ljava/lang/String;)Lorg/partiql/ast/v1/graph/GraphLabel$Name$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -7083,23 +7083,23 @@ public class org/partiql/ast/v1/graph/GraphLabel$Negation : org/partiql/ast/v1/g
 	public final field arg Lorg/partiql/ast/v1/graph/GraphLabel;
 	public fun <init> (Lorg/partiql/ast/v1/graph/GraphLabel;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphLabel$Negation$NegationBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphLabel$Negation$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/graph/GraphLabel$Negation$NegationBuilder {
-	public fun arg (Lorg/partiql/ast/v1/graph/GraphLabel;)Lorg/partiql/ast/v1/graph/GraphLabel$Negation$NegationBuilder;
+public class org/partiql/ast/v1/graph/GraphLabel$Negation$Builder {
+	public fun arg (Lorg/partiql/ast/v1/graph/GraphLabel;)Lorg/partiql/ast/v1/graph/GraphLabel$Negation$Builder;
 	public fun build ()Lorg/partiql/ast/v1/graph/GraphLabel$Negation;
 	public fun toString ()Ljava/lang/String;
 }
 
 public class org/partiql/ast/v1/graph/GraphLabel$Wildcard : org/partiql/ast/v1/graph/GraphLabel {
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphLabel$Wildcard$WildcardBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphLabel$Wildcard$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/graph/GraphLabel$Wildcard$WildcardBuilder {
+public class org/partiql/ast/v1/graph/GraphLabel$Wildcard$Builder {
 	public fun build ()Lorg/partiql/ast/v1/graph/GraphLabel$Wildcard;
 	public fun toString ()Ljava/lang/String;
 }
@@ -7109,14 +7109,14 @@ public class org/partiql/ast/v1/graph/GraphMatch : org/partiql/ast/v1/AstNode {
 	public final field selector Lorg/partiql/ast/v1/graph/GraphSelector;
 	public fun <init> (Ljava/util/List;Lorg/partiql/ast/v1/graph/GraphSelector;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphMatch$GraphMatchBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphMatch$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/graph/GraphMatch$GraphMatchBuilder {
+public class org/partiql/ast/v1/graph/GraphMatch$Builder {
 	public fun build ()Lorg/partiql/ast/v1/graph/GraphMatch;
-	public fun patterns (Ljava/util/List;)Lorg/partiql/ast/v1/graph/GraphMatch$GraphMatchBuilder;
-	public fun selector (Lorg/partiql/ast/v1/graph/GraphSelector;)Lorg/partiql/ast/v1/graph/GraphMatch$GraphMatchBuilder;
+	public fun patterns (Ljava/util/List;)Lorg/partiql/ast/v1/graph/GraphMatch$Builder;
+	public fun selector (Lorg/partiql/ast/v1/graph/GraphSelector;)Lorg/partiql/ast/v1/graph/GraphMatch$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -7133,18 +7133,18 @@ public class org/partiql/ast/v1/graph/GraphPart$Edge : org/partiql/ast/v1/graph/
 	public final field variable Ljava/lang/String;
 	public fun <init> (Lorg/partiql/ast/v1/graph/GraphDirection;Lorg/partiql/ast/v1/graph/GraphQuantifier;Lorg/partiql/ast/v1/expr/Expr;Ljava/lang/String;Lorg/partiql/ast/v1/graph/GraphLabel;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphPart$Edge$EdgeBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphPart$Edge$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/graph/GraphPart$Edge$EdgeBuilder {
+public class org/partiql/ast/v1/graph/GraphPart$Edge$Builder {
 	public fun build ()Lorg/partiql/ast/v1/graph/GraphPart$Edge;
-	public fun direction (Lorg/partiql/ast/v1/graph/GraphDirection;)Lorg/partiql/ast/v1/graph/GraphPart$Edge$EdgeBuilder;
-	public fun label (Lorg/partiql/ast/v1/graph/GraphLabel;)Lorg/partiql/ast/v1/graph/GraphPart$Edge$EdgeBuilder;
-	public fun prefilter (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/graph/GraphPart$Edge$EdgeBuilder;
-	public fun quantifier (Lorg/partiql/ast/v1/graph/GraphQuantifier;)Lorg/partiql/ast/v1/graph/GraphPart$Edge$EdgeBuilder;
+	public fun direction (Lorg/partiql/ast/v1/graph/GraphDirection;)Lorg/partiql/ast/v1/graph/GraphPart$Edge$Builder;
+	public fun label (Lorg/partiql/ast/v1/graph/GraphLabel;)Lorg/partiql/ast/v1/graph/GraphPart$Edge$Builder;
+	public fun prefilter (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/graph/GraphPart$Edge$Builder;
+	public fun quantifier (Lorg/partiql/ast/v1/graph/GraphQuantifier;)Lorg/partiql/ast/v1/graph/GraphPart$Edge$Builder;
 	public fun toString ()Ljava/lang/String;
-	public fun variable (Ljava/lang/String;)Lorg/partiql/ast/v1/graph/GraphPart$Edge$EdgeBuilder;
+	public fun variable (Ljava/lang/String;)Lorg/partiql/ast/v1/graph/GraphPart$Edge$Builder;
 }
 
 public class org/partiql/ast/v1/graph/GraphPart$Node : org/partiql/ast/v1/graph/GraphPart {
@@ -7153,29 +7153,29 @@ public class org/partiql/ast/v1/graph/GraphPart$Node : org/partiql/ast/v1/graph/
 	public final field variable Ljava/lang/String;
 	public fun <init> (Lorg/partiql/ast/v1/expr/Expr;Ljava/lang/String;Lorg/partiql/ast/v1/graph/GraphLabel;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphPart$Node$NodeBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphPart$Node$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/graph/GraphPart$Node$NodeBuilder {
+public class org/partiql/ast/v1/graph/GraphPart$Node$Builder {
 	public fun build ()Lorg/partiql/ast/v1/graph/GraphPart$Node;
-	public fun label (Lorg/partiql/ast/v1/graph/GraphLabel;)Lorg/partiql/ast/v1/graph/GraphPart$Node$NodeBuilder;
-	public fun prefilter (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/graph/GraphPart$Node$NodeBuilder;
+	public fun label (Lorg/partiql/ast/v1/graph/GraphLabel;)Lorg/partiql/ast/v1/graph/GraphPart$Node$Builder;
+	public fun prefilter (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/graph/GraphPart$Node$Builder;
 	public fun toString ()Ljava/lang/String;
-	public fun variable (Ljava/lang/String;)Lorg/partiql/ast/v1/graph/GraphPart$Node$NodeBuilder;
+	public fun variable (Ljava/lang/String;)Lorg/partiql/ast/v1/graph/GraphPart$Node$Builder;
 }
 
 public class org/partiql/ast/v1/graph/GraphPart$Pattern : org/partiql/ast/v1/graph/GraphPart {
 	public final field pattern Lorg/partiql/ast/v1/graph/GraphPattern;
 	public fun <init> (Lorg/partiql/ast/v1/graph/GraphPattern;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphPart$Pattern$PatternBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphPart$Pattern$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/graph/GraphPart$Pattern$PatternBuilder {
+public class org/partiql/ast/v1/graph/GraphPart$Pattern$Builder {
 	public fun build ()Lorg/partiql/ast/v1/graph/GraphPart$Pattern;
-	public fun pattern (Lorg/partiql/ast/v1/graph/GraphPattern;)Lorg/partiql/ast/v1/graph/GraphPart$Pattern$PatternBuilder;
+	public fun pattern (Lorg/partiql/ast/v1/graph/GraphPattern;)Lorg/partiql/ast/v1/graph/GraphPart$Pattern$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -7187,18 +7187,18 @@ public class org/partiql/ast/v1/graph/GraphPattern : org/partiql/ast/v1/AstNode
 	public final field variable Ljava/lang/String;
 	public fun <init> (Lorg/partiql/ast/v1/graph/GraphRestrictor;Lorg/partiql/ast/v1/expr/Expr;Ljava/lang/String;Lorg/partiql/ast/v1/graph/GraphQuantifier;Ljava/util/List;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphPattern$GraphPatternBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphPattern$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/graph/GraphPattern$GraphPatternBuilder {
+public class org/partiql/ast/v1/graph/GraphPattern$Builder {
 	public fun build ()Lorg/partiql/ast/v1/graph/GraphPattern;
-	public fun parts (Ljava/util/List;)Lorg/partiql/ast/v1/graph/GraphPattern$GraphPatternBuilder;
-	public fun prefilter (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/graph/GraphPattern$GraphPatternBuilder;
-	public fun quantifier (Lorg/partiql/ast/v1/graph/GraphQuantifier;)Lorg/partiql/ast/v1/graph/GraphPattern$GraphPatternBuilder;
-	public fun restrictor (Lorg/partiql/ast/v1/graph/GraphRestrictor;)Lorg/partiql/ast/v1/graph/GraphPattern$GraphPatternBuilder;
+	public fun parts (Ljava/util/List;)Lorg/partiql/ast/v1/graph/GraphPattern$Builder;
+	public fun prefilter (Lorg/partiql/ast/v1/expr/Expr;)Lorg/partiql/ast/v1/graph/GraphPattern$Builder;
+	public fun quantifier (Lorg/partiql/ast/v1/graph/GraphQuantifier;)Lorg/partiql/ast/v1/graph/GraphPattern$Builder;
+	public fun restrictor (Lorg/partiql/ast/v1/graph/GraphRestrictor;)Lorg/partiql/ast/v1/graph/GraphPattern$Builder;
 	public fun toString ()Ljava/lang/String;
-	public fun variable (Ljava/lang/String;)Lorg/partiql/ast/v1/graph/GraphPattern$GraphPatternBuilder;
+	public fun variable (Ljava/lang/String;)Lorg/partiql/ast/v1/graph/GraphPattern$Builder;
 }
 
 public class org/partiql/ast/v1/graph/GraphQuantifier : org/partiql/ast/v1/AstNode {
@@ -7206,15 +7206,15 @@ public class org/partiql/ast/v1/graph/GraphQuantifier : org/partiql/ast/v1/AstNo
 	public final field upper Ljava/lang/Long;
 	public fun <init> (Ljava/lang/Long;Ljava/lang/Long;)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphQuantifier$GraphQuantifierBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphQuantifier$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/graph/GraphQuantifier$GraphQuantifierBuilder {
+public class org/partiql/ast/v1/graph/GraphQuantifier$Builder {
 	public fun build ()Lorg/partiql/ast/v1/graph/GraphQuantifier;
-	public fun lower (Ljava/lang/Long;)Lorg/partiql/ast/v1/graph/GraphQuantifier$GraphQuantifierBuilder;
+	public fun lower (Ljava/lang/Long;)Lorg/partiql/ast/v1/graph/GraphQuantifier$Builder;
 	public fun toString ()Ljava/lang/String;
-	public fun upper (Ljava/lang/Long;)Lorg/partiql/ast/v1/graph/GraphQuantifier$GraphQuantifierBuilder;
+	public fun upper (Ljava/lang/Long;)Lorg/partiql/ast/v1/graph/GraphQuantifier$Builder;
 }
 
 public class org/partiql/ast/v1/graph/GraphRestrictor : org/partiql/ast/v1/Enum {
@@ -7236,22 +7236,22 @@ public abstract class org/partiql/ast/v1/graph/GraphSelector : org/partiql/ast/v
 
 public class org/partiql/ast/v1/graph/GraphSelector$AllShortest : org/partiql/ast/v1/graph/GraphSelector {
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphSelector$AllShortest$AllShortestBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphSelector$AllShortest$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/graph/GraphSelector$AllShortest$AllShortestBuilder {
+public class org/partiql/ast/v1/graph/GraphSelector$AllShortest$Builder {
 	public fun build ()Lorg/partiql/ast/v1/graph/GraphSelector$AllShortest;
 	public fun toString ()Ljava/lang/String;
 }
 
 public class org/partiql/ast/v1/graph/GraphSelector$Any : org/partiql/ast/v1/graph/GraphSelector {
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphSelector$Any$AnyBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphSelector$Any$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/graph/GraphSelector$Any$AnyBuilder {
+public class org/partiql/ast/v1/graph/GraphSelector$Any$Builder {
 	public fun build ()Lorg/partiql/ast/v1/graph/GraphSelector$Any;
 	public fun toString ()Ljava/lang/String;
 }
@@ -7260,23 +7260,23 @@ public class org/partiql/ast/v1/graph/GraphSelector$AnyK : org/partiql/ast/v1/gr
 	public final field k J
 	public fun <init> (J)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphSelector$AnyK$AnyKBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphSelector$AnyK$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/graph/GraphSelector$AnyK$AnyKBuilder {
+public class org/partiql/ast/v1/graph/GraphSelector$AnyK$Builder {
 	public fun build ()Lorg/partiql/ast/v1/graph/GraphSelector$AnyK;
-	public fun k (J)Lorg/partiql/ast/v1/graph/GraphSelector$AnyK$AnyKBuilder;
+	public fun k (J)Lorg/partiql/ast/v1/graph/GraphSelector$AnyK$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
 public class org/partiql/ast/v1/graph/GraphSelector$AnyShortest : org/partiql/ast/v1/graph/GraphSelector {
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphSelector$AnyShortest$AnyShortestBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphSelector$AnyShortest$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/graph/GraphSelector$AnyShortest$AnyShortestBuilder {
+public class org/partiql/ast/v1/graph/GraphSelector$AnyShortest$Builder {
 	public fun build ()Lorg/partiql/ast/v1/graph/GraphSelector$AnyShortest;
 	public fun toString ()Ljava/lang/String;
 }
@@ -7285,13 +7285,13 @@ public class org/partiql/ast/v1/graph/GraphSelector$ShortestK : org/partiql/ast/
 	public final field k J
 	public fun <init> (J)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphSelector$ShortestK$ShortestKBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphSelector$ShortestK$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/graph/GraphSelector$ShortestK$ShortestKBuilder {
+public class org/partiql/ast/v1/graph/GraphSelector$ShortestK$Builder {
 	public fun build ()Lorg/partiql/ast/v1/graph/GraphSelector$ShortestK;
-	public fun k (J)Lorg/partiql/ast/v1/graph/GraphSelector$ShortestK$ShortestKBuilder;
+	public fun k (J)Lorg/partiql/ast/v1/graph/GraphSelector$ShortestK$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -7299,13 +7299,13 @@ public class org/partiql/ast/v1/graph/GraphSelector$ShortestKGroup : org/partiql
 	public final field k J
 	public fun <init> (J)V
 	public fun accept (Lorg/partiql/ast/v1/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphSelector$ShortestKGroup$ShortestKGroupBuilder;
+	public static fun builder ()Lorg/partiql/ast/v1/graph/GraphSelector$ShortestKGroup$Builder;
 	public fun children ()Ljava/util/Collection;
 }
 
-public class org/partiql/ast/v1/graph/GraphSelector$ShortestKGroup$ShortestKGroupBuilder {
+public class org/partiql/ast/v1/graph/GraphSelector$ShortestKGroup$Builder {
 	public fun build ()Lorg/partiql/ast/v1/graph/GraphSelector$ShortestKGroup;
-	public fun k (J)Lorg/partiql/ast/v1/graph/GraphSelector$ShortestKGroup$ShortestKGroupBuilder;
+	public fun k (J)Lorg/partiql/ast/v1/graph/GraphSelector$ShortestKGroup$Builder;
 	public fun toString ()Ljava/lang/String;
 }
 
diff --git a/partiql-ast/build.gradle.kts b/partiql-ast/build.gradle.kts
index ad19f109b..ca0582aac 100644
--- a/partiql-ast/build.gradle.kts
+++ b/partiql-ast/build.gradle.kts
@@ -16,7 +16,6 @@
 plugins {
     id(Plugins.conventions)
     id(Plugins.publish)
-    id(Plugins.kotlinLombok) version Versions.kotlinLombok
 }
 
 dependencies {
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/Exclude.java b/partiql-ast/src/main/java/org/partiql/ast/v1/Exclude.java
index 824ac9969..c0cdb95a2 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/Exclude.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/Exclude.java
@@ -10,7 +10,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class Exclude extends AstNode {
     @NotNull
     public final List<ExcludePath> excludePaths;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/ExcludePath.java b/partiql-ast/src/main/java/org/partiql/ast/v1/ExcludePath.java
index aa6174c1b..560406ac2 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/ExcludePath.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/ExcludePath.java
@@ -11,7 +11,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExcludePath extends AstNode {
     @NotNull
     public final ExprVarRef root;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/ExcludeStep.java b/partiql-ast/src/main/java/org/partiql/ast/v1/ExcludeStep.java
index 12ea50993..0b769edb0 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/ExcludeStep.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/ExcludeStep.java
@@ -14,7 +14,7 @@ public abstract class ExcludeStep extends AstNode {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @Builder(builderClassName = "Builder")
     public static class StructField extends ExcludeStep {
         @NotNull
         public final Identifier symbol;
@@ -40,7 +40,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @Builder(builderClassName = "Builder")
     public static class CollIndex extends ExcludeStep {
         public final int index;
 
@@ -63,7 +63,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @Builder(builderClassName = "Builder")
     public static class StructWildcard extends ExcludeStep {
         @NotNull
         @Override
@@ -80,7 +80,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @Builder(builderClassName = "Builder")
     public static class CollWildcard extends ExcludeStep {
         @NotNull
         @Override
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/Explain.java b/partiql-ast/src/main/java/org/partiql/ast/v1/Explain.java
index 3cf82dd07..fba7392b4 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/Explain.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/Explain.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class Explain extends Statement {
     // TODO get rid of PartiQLValue once https://github.com/partiql/partiql-lang-kotlin/issues/1589 is resolved
     @NotNull
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/From.java b/partiql-ast/src/main/java/org/partiql/ast/v1/From.java
index 86955d3e3..586dbd733 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/From.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/From.java
@@ -10,7 +10,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class From extends AstNode {
     @NotNull
     public final List<FromTableRef> tableRefs;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/FromExpr.java b/partiql-ast/src/main/java/org/partiql/ast/v1/FromExpr.java
index babb98ff7..7be5325c1 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/FromExpr.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/FromExpr.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class FromExpr extends FromTableRef {
     @NotNull
     public final Expr expr;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/FromJoin.java b/partiql-ast/src/main/java/org/partiql/ast/v1/FromJoin.java
index edcf05f69..e7290cc04 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/FromJoin.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/FromJoin.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class FromJoin extends FromTableRef {
     @NotNull
     public final From lhs;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/GroupBy.java b/partiql-ast/src/main/java/org/partiql/ast/v1/GroupBy.java
index 6b3d80a15..7382d6b43 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/GroupBy.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/GroupBy.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class GroupBy extends AstNode {
     @NotNull
     public final GroupByStrategy strategy;
@@ -47,7 +47,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @lombok.Builder(builderClassName = "Builder")
     public static class Key extends AstNode {
         @NotNull
         public final Expr expr;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/Identifier.java b/partiql-ast/src/main/java/org/partiql/ast/v1/Identifier.java
index e7fef2153..36c22de6d 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/Identifier.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/Identifier.java
@@ -9,7 +9,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class Identifier extends AstNode {
     @NotNull
     public final String symbol;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/IdentifierChain.java b/partiql-ast/src/main/java/org/partiql/ast/v1/IdentifierChain.java
index 6a4a5949c..9d2f6b516 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/IdentifierChain.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/IdentifierChain.java
@@ -11,7 +11,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class IdentifierChain extends AstNode {
     @NotNull
     public final Identifier root;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/Let.java b/partiql-ast/src/main/java/org/partiql/ast/v1/Let.java
index 5c1b7e063..21526a6c5 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/Let.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/Let.java
@@ -11,7 +11,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class Let extends AstNode {
     @NotNull
     public final List<Binding> bindings;
@@ -34,7 +34,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @lombok.Builder(builderClassName = "Builder")
     public static class Binding extends AstNode {
         @NotNull
         public final Expr expr;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/OrderBy.java b/partiql-ast/src/main/java/org/partiql/ast/v1/OrderBy.java
index cdc90b56e..d6ff4828d 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/OrderBy.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/OrderBy.java
@@ -10,7 +10,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class OrderBy extends AstNode {
     @NotNull
     public final List<Sort> sorts;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/Query.java b/partiql-ast/src/main/java/org/partiql/ast/v1/Query.java
index 653bdef6e..2d9e22c39 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/Query.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/Query.java
@@ -11,7 +11,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class Query extends Statement {
     @NotNull
     public final Expr expr;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/QueryBody.java b/partiql-ast/src/main/java/org/partiql/ast/v1/QueryBody.java
index 1a3018417..4e2906e1b 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/QueryBody.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/QueryBody.java
@@ -10,7 +10,7 @@
 import java.util.List;
 
 public abstract class QueryBody extends AstNode {
-    @Builder
+    @Builder(builderClassName = "Builder")
     public static class SFW extends QueryBody {
         @NotNull
         public final Select select;
@@ -64,7 +64,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
         }
     }
 
-    @Builder
+    @Builder(builderClassName = "Builder")
     public static class SetOp extends QueryBody {
         @NotNull
         public final org.partiql.ast.v1.SetOp type;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/SelectItem.java b/partiql-ast/src/main/java/org/partiql/ast/v1/SelectItem.java
index cb2202fbb..6fad733fa 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/SelectItem.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/SelectItem.java
@@ -26,7 +26,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @Builder(builderClassName = "Builder")
     public static class Star extends SelectItem {
         @NotNull
         public final org.partiql.ast.v1.expr.Expr expr;
@@ -52,7 +52,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @Builder(builderClassName = "Builder")
     public static class Expr extends SelectItem {
         @NotNull
         public final org.partiql.ast.v1.expr.Expr expr;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/SelectList.java b/partiql-ast/src/main/java/org/partiql/ast/v1/SelectList.java
index 73d44f1a3..3db500f4b 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/SelectList.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/SelectList.java
@@ -11,7 +11,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class SelectList extends Select {
     @NotNull
     public final List<SelectItem> items;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/SelectPivot.java b/partiql-ast/src/main/java/org/partiql/ast/v1/SelectPivot.java
index 13c957673..c14470d5a 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/SelectPivot.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/SelectPivot.java
@@ -11,7 +11,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class SelectPivot extends Select {
     @NotNull
     public final Expr key;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/SelectStar.java b/partiql-ast/src/main/java/org/partiql/ast/v1/SelectStar.java
index a9b36b0c9..59b9e6ebc 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/SelectStar.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/SelectStar.java
@@ -10,7 +10,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class SelectStar extends Select {
     @Nullable
     public final SetQuantifier setq;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/SelectValue.java b/partiql-ast/src/main/java/org/partiql/ast/v1/SelectValue.java
index f04d6abfb..56cd2ecbc 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/SelectValue.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/SelectValue.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class SelectValue extends Select {
     @NotNull
     public final Expr constructor;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/SetOp.java b/partiql-ast/src/main/java/org/partiql/ast/v1/SetOp.java
index b9284535a..dbf51ffc3 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/SetOp.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/SetOp.java
@@ -10,7 +10,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class SetOp extends AstNode {
     @NotNull
     public final SetOpType setOpType;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/Sort.java b/partiql-ast/src/main/java/org/partiql/ast/v1/Sort.java
index 84cc88065..0e40fb70e 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/Sort.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/Sort.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class Sort extends AstNode {
     @NotNull
     public final Expr expr;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprAnd.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprAnd.java
index 5c54ae390..f3e4c68e4 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprAnd.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprAnd.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprAnd extends Expr {
     @NotNull
     public final Expr lhs;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprArray.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprArray.java
index 230268c30..3b8a3436d 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprArray.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprArray.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprArray extends Expr {
     @NotNull
     public final List<Expr> values;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprBag.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprBag.java
index f81a544ec..8c442c8db 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprBag.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprBag.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprBag extends Expr {
     @NotNull
     public final List<Expr> values;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprBetween.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprBetween.java
index bc08934f0..1d7db8d0b 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprBetween.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprBetween.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprBetween extends Expr {
     @NotNull
     public final Expr value;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprCall.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprCall.java
index 8e1542f6a..78a412226 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprCall.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprCall.java
@@ -15,7 +15,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprCall extends Expr {
     @NotNull
     public final IdentifierChain function;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprCase.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprCase.java
index 4ea0abc04..6c68ac97c 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprCase.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprCase.java
@@ -13,7 +13,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprCase extends Expr {
     @Nullable
     public final Expr expr;
@@ -52,7 +52,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @lombok.Builder(builderClassName = "Builder")
     public static class Branch extends AstNode {
         @NotNull
         public final Expr condition;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprCast.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprCast.java
index c4b2e618c..a69e4c4dd 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprCast.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprCast.java
@@ -13,7 +13,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprCast extends Expr {
     @NotNull
     public final Expr value;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprCoalesce.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprCoalesce.java
index 5b961aca7..3b46b4d77 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprCoalesce.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprCoalesce.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprCoalesce extends Expr {
     @NotNull
     public final List<Expr> args;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprExtract.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprExtract.java
index a47ea3e1a..f5839ff77 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprExtract.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprExtract.java
@@ -13,7 +13,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprExtract extends Expr {
     @NotNull
     public final DatetimeField field;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprInCollection.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprInCollection.java
index 9941527a1..7ac7f8fe1 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprInCollection.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprInCollection.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprInCollection extends Expr {
     @NotNull
     public final Expr lhs;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprIsType.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprIsType.java
index b5b2488f5..74749f5da 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprIsType.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprIsType.java
@@ -13,7 +13,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprIsType extends Expr {
     @NotNull
     public final Expr value;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprLike.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprLike.java
index 7eb2879b7..51916ae08 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprLike.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprLike.java
@@ -13,7 +13,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprLike extends Expr {
     @NotNull
     public final Expr value;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprLit.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprLit.java
index 75f850826..61cf39f37 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprLit.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprLit.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprLit extends Expr {
     @NotNull
     public final PartiQLValue value; // This representation be changed in https://github.com/partiql/partiql-lang-kotlin/issues/1589
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprMatch.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprMatch.java
index 59036a5eb..0340b2ce8 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprMatch.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprMatch.java
@@ -13,7 +13,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprMatch extends Expr {
     @NotNull
     public final Expr expr;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprNot.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprNot.java
index 65a0b72b3..3b580b442 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprNot.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprNot.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprNot extends Expr {
     @NotNull
     public final Expr value;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprNullIf.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprNullIf.java
index 169372c51..b6a1f38d6 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprNullIf.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprNullIf.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprNullIf extends Expr {
     @NotNull
     public final Expr v1;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprOperator.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprOperator.java
index 315958778..c20d6d0bb 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprOperator.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprOperator.java
@@ -13,7 +13,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprOperator extends Expr {
     @NotNull
     public final String symbol;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprOr.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprOr.java
index 95e7171a1..d6afed63e 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprOr.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprOr.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprOr extends Expr {
     @NotNull
     public final Expr lhs;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprOverlay.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprOverlay.java
index ce0a70d11..eb8959d6b 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprOverlay.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprOverlay.java
@@ -13,7 +13,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprOverlay extends Expr {
     @NotNull
     public final Expr value;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprParameter.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprParameter.java
index 88ee3051c..bf7d8d2a0 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprParameter.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprParameter.java
@@ -11,7 +11,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprParameter extends Expr {
     public final int index;
 
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprPath.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprPath.java
index a2bc61188..103f6fbe0 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprPath.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprPath.java
@@ -13,7 +13,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprPath extends Expr {
     @NotNull
     public final Expr root;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprPosition.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprPosition.java
index 9340f783c..4399022a9 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprPosition.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprPosition.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprPosition extends Expr {
     @NotNull
     public final Expr lhs;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprQuerySet.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprQuerySet.java
index 3dcfd3486..713143b67 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprQuerySet.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprQuerySet.java
@@ -15,7 +15,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprQuerySet extends Expr {
     @NotNull
     public final QueryBody body;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprSessionAttribute.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprSessionAttribute.java
index 449069672..1efecf407 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprSessionAttribute.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprSessionAttribute.java
@@ -11,7 +11,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprSessionAttribute extends Expr {
     @NotNull
     public final SessionAttribute sessionAttribute;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprStruct.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprStruct.java
index 6d66f0d35..08308da28 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprStruct.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprStruct.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprStruct extends Expr {
     @NotNull
     public final List<Field> fields;
@@ -35,7 +35,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @lombok.Builder(builderClassName = "Builder")
     public static class Field extends AstNode {
         @NotNull
         public final Expr name;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprSubstring.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprSubstring.java
index eb4005594..8b98c8dc4 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprSubstring.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprSubstring.java
@@ -13,7 +13,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprSubstring extends Expr {
     @NotNull
     public final Expr value;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprTrim.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprTrim.java
index 3d3573a56..36398a76a 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprTrim.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprTrim.java
@@ -13,7 +13,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprTrim extends Expr {
     @NotNull
     public final Expr value;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprValues.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprValues.java
index 94452342c..f4b4ecb57 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprValues.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprValues.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprValues extends Expr {
     @NotNull
     public final List<Row> rows;
@@ -35,7 +35,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @lombok.Builder(builderClassName = "Builder")
     public static class Row extends AstNode {
         @NotNull
         public final List<Expr> values;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprVarRef.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprVarRef.java
index e0fe32e9f..3e9cc8bb3 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprVarRef.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprVarRef.java
@@ -13,7 +13,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprVarRef extends Expr {
     @NotNull
     public final IdentifierChain identifierChain;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprVariant.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprVariant.java
index 00c2f836b..684ff98c5 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprVariant.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprVariant.java
@@ -8,7 +8,7 @@
 import java.util.Collections;
 import java.util.List;
 
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprVariant extends Expr {
     @NotNull
     public final String value;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprWindow.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprWindow.java
index 484e54f85..fa0ffa61a 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprWindow.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprWindow.java
@@ -14,7 +14,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprWindow extends Expr {
     @NotNull
     public final WindowFunction windowFunction;
@@ -62,7 +62,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @lombok.Builder(builderClassName = "Builder")
     public static class Over extends AstNode {
         @Nullable
         public final List<Expr> partitions;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/graph/GraphLabel.java b/partiql-ast/src/main/java/org/partiql/ast/v1/graph/GraphLabel.java
index fe76c0561..bdd66fe3f 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/graph/GraphLabel.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/graph/GraphLabel.java
@@ -33,7 +33,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @Builder(builderClassName = "Builder")
     public static class Name extends GraphLabel {
         @NotNull
         public final String name;
@@ -57,7 +57,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @Builder(builderClassName = "Builder")
     public static class Wildcard extends GraphLabel {
         @Override
         @NotNull
@@ -74,7 +74,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @Builder(builderClassName = "Builder")
     public static class Negation extends GraphLabel {
         @NotNull
         public final GraphLabel arg;
@@ -100,7 +100,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @Builder(builderClassName = "Builder")
     public static class Conj extends GraphLabel {
         @NotNull
         public final List<GraphLabel> args;
@@ -124,7 +124,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @Builder(builderClassName = "Builder")
     public static class Disj extends GraphLabel {
         @NotNull
         public final List<GraphLabel> args;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/graph/GraphMatch.java b/partiql-ast/src/main/java/org/partiql/ast/v1/graph/GraphMatch.java
index a9407fb41..6cbd28462 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/graph/GraphMatch.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/graph/GraphMatch.java
@@ -13,7 +13,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class GraphMatch extends AstNode {
     @NotNull
     public final List<GraphPattern> patterns;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/graph/GraphPart.java b/partiql-ast/src/main/java/org/partiql/ast/v1/graph/GraphPart.java
index 80b94c22d..0a5b20074 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/graph/GraphPart.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/graph/GraphPart.java
@@ -31,7 +31,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @Builder(builderClassName = "Builder")
     public static class Node extends GraphPart {
         @Nullable
         public final Expr prefilter;
@@ -70,7 +70,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @Builder(builderClassName = "Builder")
     public static class Edge extends GraphPart {
         @NotNull
         public final GraphDirection direction;
@@ -121,7 +121,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @Builder(builderClassName = "Builder")
     public static class Pattern extends GraphPart {
         @NotNull
         public final GraphPattern pattern;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/graph/GraphPattern.java b/partiql-ast/src/main/java/org/partiql/ast/v1/graph/GraphPattern.java
index b05115c73..940234496 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/graph/GraphPattern.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/graph/GraphPattern.java
@@ -14,7 +14,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class GraphPattern extends AstNode {
     @Nullable
     public final GraphRestrictor restrictor;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/graph/GraphQuantifier.java b/partiql-ast/src/main/java/org/partiql/ast/v1/graph/GraphQuantifier.java
index 7bf3195be..2028be86a 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/graph/GraphQuantifier.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/graph/GraphQuantifier.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class GraphQuantifier extends AstNode {
     @NotNull
     public final Long lower;
diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/graph/GraphSelector.java b/partiql-ast/src/main/java/org/partiql/ast/v1/graph/GraphSelector.java
index bee56f470..e5e1a6847 100644
--- a/partiql-ast/src/main/java/org/partiql/ast/v1/graph/GraphSelector.java
+++ b/partiql-ast/src/main/java/org/partiql/ast/v1/graph/GraphSelector.java
@@ -34,7 +34,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @Builder(builderClassName = "Builder")
     public static class AnyShortest extends GraphSelector {
         @Override
         @NotNull
@@ -51,7 +51,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @Builder(builderClassName = "Builder")
     public static class AllShortest extends GraphSelector {
         @Override
         @NotNull
@@ -68,7 +68,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @Builder(builderClassName = "Builder")
     public static class Any extends GraphSelector {
         @Override
         @NotNull
@@ -85,7 +85,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @Builder(builderClassName = "Builder")
     public static class AnyK extends GraphSelector {
         public final long k;
 
@@ -108,7 +108,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @Builder(builderClassName = "Builder")
     public static class ShortestK extends GraphSelector {
         public final long k;
 
@@ -131,7 +131,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @Builder(builderClassName = "Builder")
     public static class ShortestKGroup extends GraphSelector {
         public final long k;